设备信息增加所属门店与房间字段,设备网关信息页面，增加所属门店

src/views/system/device/index.vue

@@ -118,6 +118,8 @@
 
     <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="70" align="center"/>
+      <el-table-column label="所属门店" align="center" prop="storeName"/>
+      <el-table-column label="所属房间" align="center" prop="roomName"/>
       <!--      <el-table-column label="${comment}" align="center" prop="id" />-->
       <el-table-column label="设备名称" align="center" prop="devName" width="210px"/>
 <!--      <el-table-column label="设备MAC" align="center" prop="devMac"/>-->

src/views/system/gateway/index.vue

@@ -155,6 +155,7 @@
     <el-table v-loading="loading" :data="gatewayList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="${comment}" align="center" prop="id" />-->
+      <el-table-column label="所属门店" align="center" prop="storeName"/>
       <el-table-column label="设备名称" align="center" prop="devName" width="240px"/>
       <el-table-column label="设备MAC" align="center" prop="devMac" width="130px"/>
       <el-table-column label="设备ID" align="center" prop="devId" width="130px"/>

src/views/system/log/index.vue

@@ -126,9 +126,9 @@
 <!--      <el-table-column type="selection" width="55" align="center" />-->
 <!--      <el-table-column label="主键" align="center" prop="id" />-->
 <!--      <el-table-column label="设备mac" align="center" prop="devMac" />-->
+      <el-table-column label="所属门店" align="center" prop="storeName"/>
+      <el-table-column label="所属房间" align="center" prop="roomName"/>
       <el-table-column label="设备id" align="center" prop="devId" />
-      <el-table-column label="门店名称" align="center" prop="storeName" />
-      <el-table-column label="房间名称" align="center" prop="roomName" />
       <el-table-column label="请求序列号" align="center" prop="seq" width="180"/>
       <el-table-column label="消息类型" align="center" prop="mqttType" :formatter="(row) => filedFormatter(row.mqttType)"/>
       <el-table-column label="消息描述" align="center" prop="mqttDescribe" />

src/views/system/order/index.vue

@@ -590,10 +590,17 @@ export default {
       this.repealOpen = true;
     },
     submitFormRepeal(){
-      repealOrder(this.repealForm).then(res=>{
-        this.$modal.msgSuccess("操作成功");
-        this.cancel()
-      })
+      this.$refs["repealForm"].validate(valid => {
+        if (valid) {
+          repealOrder(this.repealForm).then(res => {
+            this.$modal.msgSuccess("操作成功");
+            this.repealOpen = false;
+            this.open = false;
+            this.reset();
+            this.getList();
+          })
+        }
+      });
     },
     onGetAllStoreList(){
       allList().then(res => {
@@ -686,6 +693,7 @@ export default {
         preEndDate: null
       };
       this.resetForm("form");
+      this.resetForm("repealForm");
     },
     /** 搜索按钮操作 */
     handleQuery() {

src/views/system/statusLog/index.vue

@@ -79,6 +79,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="logList" >
+      <el-table-column label="所属门店" align="center" prop="storeName"/>
+      <el-table-column label="所属房间" align="center" prop="roomName"/>
 <!--      <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" />-->
@@ -93,8 +95,6 @@
           <dict-tag :options="dict.type.device_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="门店名称" align="center" prop="storeName" />
-      <el-table-column label="房间名称" align="center" prop="roomName" />
       <el-table-column label="电量\电压" align="center" prop="voltage" />
       <el-table-column label="信号值" align="center" prop="signalValue" />
 <!--      <el-table-column label="备注" align="center" prop="remark" />-->