Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/views/iot/iotmanager/dashboard.vue

@@ -451,7 +451,7 @@ export default defineComponent({
 		};
 		// 告警信息-更多信息
 		const toMore = () => {
-			router.push({ path: '/monitor/notice' });
+			router.push({ path: '/iotmanager/alarm/log' });
 		};
 		// 页面加载时
 		onMounted(() => {

src/views/iot/ota-update/update/component/deviceBind.vue

@@ -3,7 +3,7 @@
     <el-dialog title="选择设备" v-model="isShowDialog" width="90%">
       <el-form :model="ruleForm" ref="formRef" :rules="rules" size="small" label-width="110px">
         <el-form-item label="设备名称" prop="name">
-          <el-input v-model="tableData.param.name" placeholder="请输入设备名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+          <el-input v-model="tableData.param.name" placeholder="请输入设备名称" clearable size="default" style="width: 240px" @keyup.enter.native="getDeviceList" />
           <el-button style="margin-left: 20px;" type="primary" @click="getDeviceList()">查询</el-button>
 
           <el-button style="margin-left: 20px;" :disabled="!deviceKeyList.length" type="danger" @click="confirmBind()">确定选择</el-button>
@@ -95,11 +95,12 @@ export default defineComponent({
     })
 
     const getDeviceList = () => {
-      if (!state.ruleForm.productId) {
-        state.tableData.data = [];
-        state.tableData.total = 0;
-        return;
-      }
+      // if (!state.ruleForm.productId) {
+      //   state.tableData.data = [];
+      //   state.tableData.total = 0;
+      //   return;
+      // }
+      state.isShowDialog = true;
       state.tableData.loading = true;
       api.instance.getList(state.tableData.param).then((res: any) => {
         state.tableData.data = res.device;
@@ -115,13 +116,12 @@ export default defineComponent({
         state.productData = productDataList;
         state.ruleForm.productId = state.productData[0].id
         getDeviceList()
-        state.isShowDialog = true;
       });
     };
 
     const openDialog = (checkIdData: any) => {
       state.checkIdList = checkIdData;
-      getProductList()
+      getDeviceList()
     };
 
     // 多选框选中数据

src/views/iot/ota-update/update/component/deviceList.vue

@@ -32,13 +32,18 @@
             <el-tag size="small" v-if="scope.row.status == 5">已取消</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="step" label="升级进度" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="step" label="升级进度" show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag size="small" type="success" v-if="scope.row.step > 0">{{ scope.row.step }}%</el-tag>
+            <el-tag size="small" v-else>{{ scope.row.step }}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="fail" label="失败原因" width="100" align="center">
           <template #default="scope">
-            <el-tag size="small" v-if="scope.row.fail == -1">升级失败</el-tag>
-            <el-tag size="small" v-if="scope.row.fail == -2">下载失败</el-tag>
-            <el-tag size="small" v-if="scope.row.fail == -3">校验失败</el-tag>
-            <el-tag size="small" v-if="scope.row.fail == -4">烧写失败</el-tag>
+            <el-tag size="small" type="danger" v-if="scope.row.fail == -1">升级失败</el-tag>
+            <el-tag size="small" type="danger" v-if="scope.row.fail == -2">下载失败</el-tag>
+            <el-tag size="small" type="danger" v-if="scope.row.fail == -3">校验失败</el-tag>
+            <el-tag size="small" type="danger" v-if="scope.row.fail == -4">烧写失败</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="createdAt" label="时间" min-width="100" align="center"></el-table-column>

src/views/system/assess/totalIndex/component/addSign.vue

@@ -141,7 +141,7 @@ export default defineComponent({
 						let item = state.ruleForm.ranges[state.ruleForm.ranges.length-1]
 						const { start_value, end_value, base_value } = item
 						if(!start_value || !end_value || !base_value.toString()) {
-							ElMessage.error('请完善表单');
+							ElMessage.error('取值范围不能为空');
 							return
 						}
 						if(start_value >= end_value) {