Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -367,7 +367,8 @@ export default {
       } else {
         this.$nextTick(() => {
           this.isCompany = true;
-          this.currentPath.pathName = 'overview';
+          // this.currentPath.pathName = 'overview';
+          this.currentPath.pathName = this.$routes.query.path;
         });
       }
     },

dsk-operate-ui/src/views/detail/party-a/opport/MajorProject.vue

@@ -6,7 +6,7 @@
     <tables v-else :tableLoading="tableLoading" :tableData="tableData" :forData="forData" :tableDataTotal="tableDataTotal" :queryParams="queryParams"
       @handle-current-change="handleCurrentChange" @sort-change="sortChange">
       <template slot="projectName" slot-scope="scope">
-        <router-link :to="`/radar/Land/details/${scope.row.id}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName "
+        <router-link :to="`/radar/MajorProject/details/${scope.row.md5Id}`" tag="a" class="a-link" v-if="scope.row.md5Id&&scope.row.projectName "
           v-html="scope.row.projectName"></router-link>
         <div v-else v-html="scope.row.projectName  || '--'"></div>
       </template>