设备网关、设备日志查询条件新增

src/views/system/device/index.vue

@@ -17,13 +17,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备分组" prop="group">
-        <el-input
-          v-model="queryParams.group"
-          placeholder="请输入设备分组"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="所属门店" prop="group">
+        <el-select v-model="queryParams.group" placeholder="请选择所属门店" clearable>
+          <el-option
+            v-for="item in options"
+            :key="item.deviceGroup"
+            :label="item.name"
+            :value="item.deviceGroup">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备类型" prop="devType">
         <el-select v-model="queryParams.devType" placeholder="请选择设备类型">
@@ -261,6 +263,7 @@
 <script>
 import {listDevice, getDevice, delDevice, addDevice, updateDevice, openOrClose} from "@/api/system/device";
 import selectStore from "./selectStore";
+import { allList } from '@/api/system/store'
 
 
 export default {
@@ -287,6 +290,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      options: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -334,9 +338,15 @@ export default {
     };
   },
   created() {
+    this.onGetAllStoreList();
     this.getList();
   },
   methods: {
+    onGetAllStoreList(){
+      allList().then(res => {
+        this.options = res.data
+      })
+    },
     /** 查询设备信息列表 */
     getList() {
       this.loading = true;

src/views/system/gateway/index.vue

@@ -17,6 +17,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="所属门店" prop="group">
+        <el-select v-model="queryParams.group" placeholder="请选择所属门店" clearable>
+          <el-option
+            v-for="item in options"
+            :key="item.deviceGroup"
+            :label="item.name"
+            :value="item.deviceGroup">
+          </el-option>
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="设备ID" prop="devId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.devId"-->
@@ -278,7 +288,8 @@
 
 <script>
 import { listGateway, getGateway, delGateway, addGateway, updateGateway, addGatewayDevice, clearGatewayDevice } from "@/api/system/gateway";
-import selectStore from "../device/selectStore.vue";
+import selectStore from "../device/selectStore";
+import { allList } from '@/api/system/store'
 
 export default {
   name: "Gateway",
@@ -304,6 +315,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      options: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -342,9 +354,15 @@ export default {
     };
   },
   created() {
+    this.onGetAllStoreList();
     this.getList();
   },
   methods: {
+    onGetAllStoreList(){
+      allList().then(res => {
+        this.options = res.data
+      })
+    },
     /** 查询设备网关信息列表 */
     getList() {
       this.loading = true;

src/views/system/log/index.vue

@@ -17,6 +17,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="门店名称" prop="storeName">
+        <el-input
+          v-model="queryParams.storeName"
+          placeholder="请输入门店名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="房间名称" prop="roomName">
+        <el-input
+          v-model="queryParams.roomName"
+          placeholder="请输入房间名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="请求的序列号" prop="seq">
         <el-input
           v-model="queryParams.seq"
@@ -25,6 +41,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="操作人" prop="createBy">
+        <el-input
+          v-model="queryParams.createBy"
+          placeholder="请输入操作人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="消息描述：开门、开灯、网关设备绑定等" prop="mqttDescribe">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.mqttDescribe"-->
@@ -246,6 +270,9 @@ export default {
         mqttDescribe: null,
         payload: null,
         topic: null,
+        createBy: null,
+        storeName: null,
+        roomName: null
       },
       // 表单参数
       form: {},

src/views/system/statusLog/index.vue

@@ -10,6 +10,23 @@
         />
       </el-form-item>
 
+      <el-form-item label="门店名称" prop="storeName">
+        <el-input
+          v-model="queryParams.storeName"
+          placeholder="请输入门店名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="房间名称" prop="roomName">
+        <el-input
+          v-model="queryParams.roomName"
+          placeholder="请输入房间名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="是否异常" prop="isAbnormal">
         <el-select v-model="queryParams.isAbnormal" placeholder="请选择">
           <el-option
@@ -43,7 +60,7 @@
     <el-table v-loading="loading" :data="logList" >
 <!--      <el-table-column type="selection" width="55" align="center" />-->
       <el-table-column label="设备ID" align="center" prop="devId" />
-      <el-table-column label="设备mac" align="center" prop="devMac" />
+<!--      <el-table-column label="设备mac" align="center" prop="devMac" />-->
       <el-table-column label="是否异常变更" align="center" prop="isAbnormal" :formatter="(row) => filedFormatter(row.isAbnormal)"/>
       <el-table-column label="变更前状态" align="center" prop="previousStatus" >
         <template slot-scope="scope">
@@ -186,7 +203,9 @@ export default {
         status: null,
         roomId: null,
         operateLogId: null,
-        isSendSms: null
+        isSendSms: null,
+        storeName: null,
+        roomName: null
       },
       // 表单参数
       form: {},