Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

@@ -64,8 +64,7 @@ export const getQualityTableRule = (params) => request({
 /** 删除质检表规则 */
 export const deleteQualityTableRule = (params) => request({
     url: `${import.meta.env.VITE_APP_QUALITY_BASEURL}/quality-model/conf/del?ruleConfGuid=${params}`,
-    method: 'delete',
-    data: params
+    method: 'delete'
 })
 
 /** 更新质检表规则的禁用和启用状态 */

@@ -432,10 +432,12 @@ const open = (msg, type, isBatch = false) => {
       if (res.code == proxy.$passCode) {
         page.value.curr = 1;
         getTableData();
-        // let node = qualityModelTreeRef.value.treeRef.store.nodesMap[currTableData.value.modelGroupGuid];
-        // node.loaded = false;
-        // node.expand();
         getQualityGroupTreeData();
+        nextTick(() => {
+          let node = qualityModelTreeRef.value.treeRef.store.nodesMap[currTableData.value.modelGroupGuid];
+         node.loaded = false;
+         node.expand();
+        })
         ElMessage.success('删除成功');
       } else {
         ElMessage.error(res.msg);
@@ -599,7 +601,7 @@ const ruleTableBtnClick = (scope, btn) => {
       }
     });
   } else if (type == "delete") {
-    ruleOpen("此操作将永久删除该质检表, 是否继续?", "warning");
+    ruleOpen("此操作将永久删除该质检规则, 是否继续?", "warning");
   }
 };
 
@@ -613,11 +615,10 @@ const ruleOpen = (msg, type, isBatch = false) => {
     deleteQualityTableRule(guids).then((res: any) => {
       if (res.code == proxy.$passCode) {
         getRuleTableData();
-        // let node = qualityModelTreeRef.value.treeRef.store.nodesMap[lastSelectNode.value.data.guid];
-        // node.loaded = false;
-        // node.expand();
-        getQualityGroupTreeData();
-        ElMessage.success('删除质检表成功');
+        let node = qualityModelTreeRef.value.treeRef.store.nodesMap[lastSelectNode.value.data.guid];
+        node.loaded = false;
+        node.expand();
+        ElMessage.success('删除质检规则成功');
       } else {
         ElMessage.error(res.msg);
       }
@@ -883,9 +884,11 @@ onActivated(async () => {
       if (lastSelectNode.value && lastSelectNode.value.data.guid == dataQualityStore.modelGroupGuid) {
         getTableData();
       }
-      // let node = qualityModelTreeRef.value.treeRef.store.nodesMap[dataQualityStore.modelGroupGuid];
-      // node.expand();
       getQualityGroupTreeData();
+      nextTick(() => {
+        let node = qualityModelTreeRef.value.treeRef.store.nodesMap[dataQualityStore.modelGroupGuid];
+        node.expand();
+      })
       dataQualityStore.set(null);
     }
   }
@@ -921,7 +924,7 @@ onBeforeMount(() => {
         d.label = d.ruleName;
         d.value = d.ruleCode;
         return d;
-      }) || [];
+      })?.filter(d => d.ruleCode != 'rows_check' && d.ruleCode != 'volatility_check') || [];
       searchItemList.value[2].options = ruleTypeList.value;
     } else {
       ElMessage.error(res.msg);

@@ -158,7 +158,7 @@ onBeforeMount(() => {
         d.label = d.ruleName;
         d.value = d.ruleCode;
         return d;
-      }) || [];
+      })?.filter(d => d.ruleCode != 'rows_check' && d.ruleCode != 'volatility_check') || [];
     } else {
       ElMessage.error(res.msg);
     }

@@ -241,7 +241,7 @@ onBeforeMount(() => {
         d.label = d.ruleName;
         d.value = d.ruleCode;
         return d;
-      }) || [];
+      })?.filter(d => d.ruleCode != 'rows_check' && d.ruleCode != 'volatility_check') || [];
     } else {
       ElMessage.error(res.msg);
     }

@@ -248,7 +248,7 @@ onBeforeMount(() => {
         d.label = d.ruleName;
         d.value = d.ruleCode;
         return d;
-      }) || [];
+      })?.filter(d => d.ruleCode != 'rows_check' && d.ruleCode != 'volatility_check') || []; //先隐藏掉表行数检查和表行数波动率
     } else {
       ElMessage.error(res.msg);
     }