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

src/views/appUpdate/index.vue

@@ -21,7 +21,6 @@
             icon="el-icon-plus"
             class="ele-btn-icon"
             @click="openEdit('', 'add')"
-            v-if="$hasPermission('main:version:save')"
           >
             新建
           </el-button>
@@ -88,6 +87,13 @@
             showOverflowTooltip: true,
             align: 'center'
           },
+          {
+            prop: 'createTime',
+            label: '发布时间',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+
           {
             columnKey: 'action',
             label: '操作',

src/views/rulesManagement/earlyWarningRules/components/matter-add.vue

@@ -642,6 +642,7 @@
         console.log(form, 'form');
         if (form.actionList.length < 1) {
           this.$message.error('请添加预警内容！');
+          return;
         }
         let actionListLen = form.actionList.filter((item) => item.matterRuleId);
         if (actionListLen?.length != form.actionList.length) {

src/views/rulesManagement/earlyWarningRules/index.vue

@@ -65,7 +65,7 @@
           </el-link>
           <el-popconfirm
             class="ele-action"
-            title="确定要删除此角色吗？"
+            title="确定要删除此规则吗？"
             @confirm="remove(row)"
             v-if="$hasPermission('main:warnrule:delete')"
           >

src/views/rulesManagement/matterRules/index.vue

@@ -206,6 +206,8 @@ export default {
       removeRule([row.id]).then((res) => {
         this.$message.success('删除成功！');
         this.reload();
+      }).catch((err) => {
+        // this.$message.error(err.message);
       });
     },