up

src/views/fault/activityWarning/index.vue

@@ -26,15 +26,15 @@
             <el-col :span="6">
               <el-form-item label="产品名称">
                 <el-select v-model="queryParams.productId" clearable placeholder="请选择">
-                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option v-for="item in queryProductSelectList" :key="item.id" :label="item.productName" :value="item.productId">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="所属客户">
-                <el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
+                <el-select v-model="queryParams.userId" clearable placeholder="请选择" @change="queryUserIdChange">
-                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option v-for="item in queryUserSelectList" :key="item.id" :label="item.nickName" :value="item.userId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -45,7 +45,7 @@
             <el-col :span="6">
               <el-form-item label="所属项目">
                 <el-select v-model="queryParams.projectId" clearable placeholder="请选择">
-                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option v-for="item in queryProjectSelectList" :key="item.id" :label="item.projectName" :value="item.projectId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -129,6 +129,9 @@
 <script>
 import Region from '@/components/Region';
 import { list } from '@/api/fault/warning';
+import { select as productSelect } from "@/api/hardware/product";
+import { userSelect } from "@/api/system/user";
+import { select as projectSelect } from "@/api/hardware/project";
 export default {
   name: 'activeAdmin',
   components: {
@@ -136,6 +139,9 @@ export default {
   },
   data () {
     return {
+      queryProductSelectList: [], // 产品名称
+      queryUserSelectList: [], // 客户
+      queryProjectSelectList: [], // 项目
       dateRange: [],
       signalLevelList: [
         { label: '一级', value: '1' },
@@ -174,6 +180,17 @@ export default {
         this.loading = false;
       });
     },
+    // 根据客户id获取项目
+    queryUserIdChange (userId) {
+      delete this.queryParams.projectId;
+      projectSelect({ userId }).then(({ code, msg, select }) => {
+        if (code == 200) {
+          this.queryProjectSelectList = select;
+        } else {
+          this.$message.error(msg);
+        }
+      })
+    },
     // 搜索按钮操作
     handleQuery () {
       this.queryParams.pageNum = 1;
@@ -192,6 +209,20 @@ export default {
   watch: {},
   created () {
     this.getList();
+    productSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.queryProductSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
+    userSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.queryUserSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
   }
 };
 </script>

src/views/hardware/device/list.vue

@@ -6,8 +6,12 @@
       </el-col>
       <el-col :span="20">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="名称">
+          <el-form-item label="产品SN">
-            <el-input v-model="queryParams.deviceName" placeholder="请输入名称" clearable size="small" style="width: 240px"
+            <el-input v-model="queryParams.productId" placeholder="请输入产品SN" clearable size="small" style="width: 240px"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="设备名称">
+            <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable size="small" style="width: 240px"
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="设备类型">

src/views/workOrderManage/orderList/index.vue

@@ -20,21 +20,21 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="告警名称">
-                <el-input v-model="queryParams.deviceName" placeholder="请输入告警名称" clearable @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.warningName" placeholder="请输入告警名称" clearable @keyup.enter.native="handleQuery" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="产品名称">
                 <el-select v-model="queryParams.productId" clearable placeholder="请选择">
-                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option v-for="item in queryProductSelectList" :key="item.id" :label="item.productName" :value="item.productId">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="所属客户">
-                <el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
+                <el-select v-model="queryParams.userId" clearable placeholder="请选择" @change="queryUserIdChange">
-                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option v-for="item in queryUserSelectList" :key="item.id" :label="item.nickName" :value="item.userId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -45,7 +45,7 @@
             <el-col :span="6">
               <el-form-item label="所属项目">
                 <el-select v-model="queryParams.projectId" clearable placeholder="请选择">
-                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option v-for="item in queryProjectSelectList" :key="item.id" :label="item.projectName" :value="item.projectId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -163,6 +163,9 @@
 <script>
 import Region from '@/components/Region';
 import { list } from '@/api/work/order';
+import { select as productSelect } from "@/api/hardware/product";
+import { userSelect } from "@/api/system/user";
+import { select as projectSelect } from "@/api/hardware/project";
 export default {
   name: 'workOrder',
   components: {
@@ -170,6 +173,9 @@ export default {
   },
   data () {
     return {
+      queryProductSelectList: [], // 产品名称
+      queryUserSelectList: [], // 客户
+      queryProjectSelectList: [], // 项目
       dateRange: [],
       signalLevelList: [
         { label: '一级', value: '1' },
@@ -213,6 +219,17 @@ export default {
         this.loading = false;
       });
     },
+    // 根据客户id获取项目
+    queryUserIdChange (userId) {
+      delete this.queryParams.projectId;
+      projectSelect({ userId }).then(({ code, msg, select }) => {
+        if (code == 200) {
+          this.queryProjectSelectList = select;
+        } else {
+          this.$message.error(msg);
+        }
+      })
+    },
     // 搜索按钮操作
     handleQuery () {
       this.queryParams.pageNum = 1;
@@ -231,6 +248,20 @@ export default {
   watch: {},
   created () {
     this.getList();
+    productSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.queryProductSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
+    userSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.queryUserSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
   }
 };
 </script>