Merge remote-tracking branch 'origin/test-dev' into test-dev

src/views/codeRule/ruleManage.vue

@@ -15,7 +15,7 @@
                         :default-expanded-keys="defaultExpandedKeys"
                         :current-node-key="curreenttid"
                         highlight-current
-                        node-key="id"
+                        node-key="primaryKeyId"
                         ref="tree"
                         ></el-tree>
                     </el-scrollbar>
@@ -173,7 +173,7 @@
                     </div>
                     <div  class="box-card-content1-right">
                         <el-button type="danger" size="small" @click="previewRes">效果预览</el-button>
-                        <el-button type="warning" size="small">规范更新</el-button>
+                        <el-button type="warning" size="small" @click="refreshRule">规范更新</el-button>
                     </div>
                 </div>
                 <div class="box-card-content2">
@@ -614,7 +614,7 @@ import { getStore, setStore } from "@/util/store";
         this.getExpandedKeys(node);
         setStore({
           name: 'curreenttid',
-          content: data.id,
+          content: data.primaryKeyId,
           type: true, //sessionStorage
         });
           this.isShowList = true;
@@ -623,7 +623,7 @@ import { getStore, setStore } from "@/util/store";
      getExpandedKeys(node) {
       let expandedKeys = [];
       while (node.parent) {
-        expandedKeys.push(node.data.id);
+        expandedKeys.push(node.data.primaryKeyId);
         node = node.parent;
       }
       setStore({
@@ -1315,6 +1315,9 @@ import { getStore, setStore } from "@/util/store";
     //效果预览
     previewRes() {
       this.$refs.previewResultRef.show()
+    },
+    refreshRule(){
+      
     }
   }
   }

src/views/manager/projectinfo/codeSet.vue

@@ -363,35 +363,12 @@ export default {
       return;
     }
      row.isEdit = false;
-        // row.loading = true;
-        // const apiMethod = row.id ? update : save;
-        // const params = {
-        //   ...row,
-        //   type: this.activeName,
-        //   projectId: this.projectId,
-        //   contractId: 0
-        // };
-
-        // apiMethod(params).then((res) => {
-        //   if (res.data.code === 200) {
-        //     this.dataNumber = res.data.data;
-        //     this.$message.success(res.data.msg);
-        //     this.getTableData();
-        //   } else {
-        //     this.dataNumber = '';
-        //     this.$message.error(res.data.msg);
-        //   }
-        // }).catch(() => {
-        //   this.$message.error('操作失败');
-        // }).finally(() => {
-        //   row.loading = false;
-        //   row.isEdit = false;
-        // });
+ 
     },
     saveCodeSet(){
           for (let row of this.tableData) {
             row.projectId = this.projectId;
-
+            row.type=this.activeName;
               // 检查 row.rule 是否有值
               if (!row.rule) {
                   // 显示警告信息