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

修改物联概览告警更多信息跳转错误,ota升级包验证选择设备去掉多余接口

Xiahai 1 год назад
Родитель
Сommit
3b6d55cb0d

+ 1 - 1
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(() => {

+ 8 - 8
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()
     };
 
     // 多选框选中数据