Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/BOMmanage/components/routing.vue

@@ -15,11 +15,11 @@
         <template v-slot:toolbar>
           <el-button
             v-if="
-              attributeData.approvalStatus != 1 &&
-              attributeData.approvalStatus != 2 &&
-              !isWt &&
-              attributeData.parentId == '0' &&
-              attributeData.id != attributeData.resourceBomId
+              (attributeData.approvalStatus != 1 &&
+                attributeData.approvalStatus != 2 &&
+                !isWt &&
+                attributeData.parentId == '0') ||
+              !attributeData.resourceBomId
             "
             size="small"
             type="primary"
@@ -51,10 +51,11 @@
             type="danger"
             @click="handleDel(row)"
             v-if="
-              attributeData.approvalStatus != 1 &&
-              attributeData.approvalStatus != 2 &&
-              attributeData.parentId == '0' &&
-              attributeData.id != attributeData.resourceBomId
+              (attributeData.approvalStatus != 1 &&
+                attributeData.approvalStatus != 2 &&
+                !isWt &&
+                attributeData.parentId == '0') ||
+              !attributeData.resourceBomId
             "
             >删除</el-link
           >

src/views/system/dataDesensitization/components/RulesDatail.vue

@@ -9,7 +9,7 @@
         :page-size="20"
         @columns-change="handleColumnChange"
         :cache-key="cacheKeyUrl"
-        height="calc(100% - 100px)"
+       
         :needPage="false"
       >
         <!-- 表头工具栏 -->
@@ -224,7 +224,7 @@
             prop: 'fieldAlias',
             slot: 'fieldAlias',
             label: '脱敏字段名称',
-            width: 120,
+            width: 200,
             align: 'center',
             showOverflowTooltip: true,
             headerSlot: 'headerRequired'
@@ -233,7 +233,7 @@
             prop: 'fieldName',
             slot: 'fieldName',
             label: '脱敏字段key',
-            width: 120,
+            width: 200,
             align: 'center',
             showOverflowTooltip: true,
             headerSlot: 'headerRequired'
@@ -244,7 +244,7 @@
             slot: 'typeId',
             label: '脱敏规则类型',
             align: 'center',
-            width: 150,
+            width: 200,
             showOverflowTooltip: true,
             headerSlot: 'headerRequired'
           },

src/views/system/dataDesensitization/index.vue

@@ -5,7 +5,6 @@
     </div>
 
     <ele-pro-table
-      style="height: calc(100% - 120px)"
       ref="table"
       :columns="columns"
       :datasource="datasource"
@@ -14,7 +13,8 @@
       :page-size="20"
       @columns-change="handleColumnChange"
       :cache-key="cacheKeyUrl"
-      height="calc(100% - 100px)"
+      height="calc(100vh - 330px)"
+      full-height="calc(100vh - 176px)"
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>