报警管理-修改设备下拉框

imt-ui/src/views/system/alarm/alarmrules/index.vue

@@ -42,23 +42,13 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item
+          <el-form-item label="机床设备" prop="equipId">
-            label="机床设备"
+            <el-cascader
-            prop="equipId"
+              v-model="cascaderValue"
-          >
+              :options="equipCascader"
-            <el-select
+              :props="{ value: 'id',label: 'name',children: 'children'}"
-              v-model="queryParams.equipId"
-              placeholder="请选择机床设备"
               clearable
-              size="small"
+              @change="cascaderChange"></el-cascader>
-            >
-              <el-option
-                v-for="item in equipSelection"
-                :key="item.equipId"
-                :label="item.equipNo"
-                :value="item.equipId"
-              />
-            </el-select>
           </el-form-item>
           <el-form-item
             label="等级"
@@ -293,23 +283,13 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item
+          <el-form-item label="机床设备" prop="equipId">
-            label="机床设备"
+            <el-cascader
-            prop="equipId"
+              v-model="cascaderValue"
-          >
+              :options="equipCascader"
-            <el-select
+              :props="{ value: 'id',label: 'name',children: 'children'}"
-              v-model="queryParams.equipId"
-              placeholder="请选择机床设备"
               clearable
-              size="small"
+              @change="cascaderChange"></el-cascader>
-            >
-              <el-option
-                v-for="item in equipSelection"
-                :key="item.equipId"
-                :label="item.equipNo"
-                :value="item.equipId"
-              />
-            </el-select>
           </el-form-item>
           <el-form-item
             label="等级"
@@ -605,7 +585,7 @@
 <script>
 import * as AlarmRulesApi from "@/api/system/alarm/alarmrules";
 import AlarmRulesForm from "./AlarmRulesForm.vue";
-import { getEquipSelection } from "@/api/system/equip/equipInfo";
+import {getEquipCascader, getEquipSelection} from "@/api/system/equip/equipInfo";
 export default {
   name: "AlarmRules",
   components: {
@@ -613,6 +593,8 @@ export default {
   },
   data() {
     return {
+      cascaderValue:[],
+      equipCascader: [],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -710,13 +692,27 @@ export default {
         this.loading = true;
         this.queryParams.type = this.activeName === "threshold" ? 0 : 1;
         const res = await AlarmRulesApi.getAlarmRulesPage(this.queryParams);
-        this.equipSelection = await getEquipSelection();
+        await getEquipCascader().then(res=>{
+          res.forEach(item=>{
+            if (item.children == null){
+              item.disabled = true;
+            }
+          })
+          this.equipCascader = res;
+        })
         this.list = res.data.list;
         this.total = res.data.total;
       } finally {
         this.loading = false;
       }
     },
+    cascaderChange(value){
+      if (value.length > 0){
+        this.queryParams.equipId = value[1];
+      }else {
+        this.queryParams.equipId = null;
+      }
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
@@ -724,7 +720,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.cascaderValue = [];
       this.resetForm("queryForm");
+      this.queryParams.equipId = null;
       this.handleQuery();
     },
     /** 添加/修改操作 */

imt-ui/src/views/system/alarm/equipalarmdata/index.vue

@@ -10,23 +10,13 @@
       label-width="68px"
       style="text-align:right"
     >
-      <el-form-item
+      <el-form-item label="机床设备" prop="equipId">
-        label="机床设备"
+        <el-cascader
-        prop="equipId"
+          v-model="cascaderValue"
-      >
+          :options="equipCascader"
-        <el-select
+          :props="{ value: 'id',label: 'name',children: 'children'}"
-          v-model="queryParams.equipId"
-          placeholder="请选择机床设备"
           clearable
-          size="small"
+          @change="cascaderChange"></el-cascader>
-        >
-          <el-option
-            v-for="item in equipSelection"
-            :key="item.equipId"
-            :label="item.equipNo"
-            :value="item.equipId"
-          />
-        </el-select>
       </el-form-item>
       <!-- <el-form-item
         label="机床组件id"
@@ -294,7 +284,7 @@
   <script>
 import * as EquipAlarmDataApi from "@/api/system/alarm/equipalarmdata";
 import EquipAlarmDataForm from "./EquipAlarmDataForm.vue";
-import { getEquipSelection } from "@/api/system/equip/equipInfo";
+import {getEquipCascader, getEquipSelection} from "@/api/system/equip/equipInfo";
 export default {
   name: "EquipAlarmData",
   components: {
@@ -302,6 +292,8 @@ export default {
   },
   data() {
     return {
+      cascaderValue:[],
+      equipCascader: [],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -337,6 +329,13 @@ export default {
     this.getList();
   },
   methods: {
+    cascaderChange(value){
+      if (value.length > 0){
+        this.queryParams.equipId = value[1];
+      }else {
+        this.queryParams.equipId = null;
+      }
+    },
     /** 查询列表 */
     async getList() {
       try {
@@ -344,7 +343,14 @@ export default {
         const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
           this.queryParams
         );
-        this.equipSelection = await getEquipSelection();
+        await getEquipCascader().then(res=>{
+          res.forEach(item=>{
+            if (item.children == null){
+              item.disabled = true;
+            }
+          })
+          this.equipCascader = res;
+        })
         this.list = res.data.list;
         this.total = res.data.total;
       } finally {
@@ -358,7 +364,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.cascaderValue = [];
       this.resetForm("queryForm");
+      this.queryParams.equipId = null;
       this.handleQuery();
     },
     /** 添加/修改操作 */
@@ -394,4 +402,3 @@ export default {
   },
 };
 </script>
-  

imt-ui/src/views/system/alarm/equiptrendalarm/index.vue

@@ -10,23 +10,13 @@
       label-width="68px"
       style="text-align:right"
     >
-      <el-form-item
+      <el-form-item label="机床设备" prop="equipId">
-        label="机床设备"
+        <el-cascader
-        prop="equipId"
+          v-model="cascaderValue"
-      >
+          :options="equipCascader"
-        <el-select
+          :props="{ value: 'id',label: 'name',children: 'children'}"
-          v-model="queryParams.equipId"
-          placeholder="请选择机床设备"
           clearable
-          size="small"
+          @change="cascaderChange"></el-cascader>
-        >
-          <el-option
-            v-for="item in equipSelection"
-            :key="item.equipId"
-            :label="item.equipNo"
-            :value="item.equipId"
-          />
-        </el-select>
       </el-form-item>
       <!-- <el-form-item
         label="机床组件id"
@@ -285,7 +275,7 @@
   <script>
 import * as EquipAlarmDataApi from "@/api/system/alarm/equipalarmdata";
 import EquipAlarmDataForm from "./EquipAlarmDataForm.vue";
-import { getEquipSelection } from "@/api/system/equip/equipInfo";
+import {getEquipCascader, getEquipSelection} from "@/api/system/equip/equipInfo";
 export default {
   name: "EquipAlarmData",
   components: {
@@ -293,6 +283,8 @@ export default {
   },
   data() {
     return {
+      cascaderValue:[],
+      equipCascader: [],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -329,6 +321,13 @@ export default {
     this.getList();
   },
   methods: {
+    cascaderChange(value){
+      if (value.length > 0){
+        this.queryParams.equipId = value[1];
+      }else {
+        this.queryParams.equipId = null;
+      }
+    },
     /** 查询列表 */
     async getList() {
       try {
@@ -336,7 +335,14 @@ export default {
         const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
           this.queryParams
         );
-        this.equipSelection = await getEquipSelection();
+        await getEquipCascader().then(res=>{
+          res.forEach(item=>{
+            if (item.children == null){
+              item.disabled = true;
+            }
+          })
+          this.equipCascader = res;
+        })
         this.list = res.data.list;
         this.total = res.data.total;
       } finally {
@@ -350,7 +356,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.cascaderValue = [];
       this.resetForm("queryForm");
+      this.queryParams.equipId = null;
       this.handleQuery();
     },
     /** 添加/修改操作 */
@@ -386,4 +394,3 @@ export default {
   },
 };
 </script>
-