Просмотр исходного кода

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

yusheng 7 месяцев назад
Родитель
Сommit
c287f6872d

+ 7 - 4
src/views/rulesManagement/releaseRules/components/historyModal.vue

@@ -16,6 +16,7 @@
         :cache-key="cacheKeyUrl"
         max-height="600"
         :needPage="false"
+        @refresh="getHistoryList"
       >
         <template v-slot:code="{ row }">
           <el-link
@@ -49,7 +50,8 @@
         visible: false,
         title: '历史版本',
         cacheKeyUrl: 'maindata-251015-recordrules-history-index',
-        list: []
+        list: [],
+        id: ''
       };
     },
     computed: {
@@ -182,15 +184,16 @@
       open(id) {
         console.log('data', id);
         this.visible = true;
-        this.getHistoryList(id);
+        this.id = id;
+        this.getHistoryList();
       },
       // 关闭时清理表单
       handleClose() {
         this.visible = false;
       },
       /* 表格数据源 */
-      async getHistoryList(id) {
-        const data = await recordrulesGetAllUpVersionById(id);
+      async getHistoryList() {
+        const data = await recordrulesGetAllUpVersionById(this.id);
         this.list = data;
       },
       addPermit(row, type, title) {

+ 1 - 1
src/views/technology/production/components/user-setting-matter.vue

@@ -58,7 +58,7 @@
         <el-link
           type="primary"
           :underline="false"
-          icon="el-icon-edit"
+          icon="el-icon-view"
           @click="openEditMatter(row)"
         >
           详情