调整&修复bug

src/layout/index.vue

@@ -7,7 +7,7 @@
         <navbar />
         <tags-view v-if="needTagsView" />
       </div>
-      <app-main />
+      <app-main v-if="timingReload" />
       <right-panel v-if="showSettings">
         <settings />
       </right-panel>
@@ -23,6 +23,11 @@ import { mapState } from 'vuex'
 
 export default {
   name: 'Layout',
+  data() {
+    return {
+      timingReload: true
+    }
+  },
   components: {
     AppMain,
     Navbar,
@@ -52,7 +57,17 @@ export default {
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    },
+    reload (){ 
+      this.timingReload = false; 
+      this.$nextTick(() => { 
+        this.timingReload = true; 
+      });
     } 
+  },
+  mounted() {
+    // 定时刷新
+    setInterval(()=> this.reload(),10 * 6e4)
   }
 }
 </script>

src/views/fault/activityWarning/index.vue

@@ -199,7 +199,10 @@ export default {
     },
     // 重置按钮操作
     resetQuery () {
-      this.queryParams = {};
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10
+      };
       this.resetForm('queryForm');
       this.dateRange = [];
       this.handleQuery();

src/views/firmware/firmwareUpdate/index.vue

@@ -47,6 +47,8 @@
         <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column align="center" type="selection" width="55">
           </el-table-column>
+          <el-table-column align="center" prop="nodeName" label="节点名称">
+          </el-table-column>
           <el-table-column align="center" prop="nodeId" label="节点SN">
           </el-table-column>
           <el-table-column align="center" prop="deviceId" label="设备SN">
@@ -57,15 +59,23 @@
           </el-table-column>
           <el-table-column align="center" prop="projectName" label="所属项目">
           </el-table-column>
+          <el-table-column align="center" label="设备类型">
+            <template slot-scope="scope">
+              {{ scope.row.deviceType ? deviceTypeList.find(v=> v.value == scope.row.deviceType).label : '' }}
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="nowVersion" label="当前软件版本">
           </el-table-column>
           <el-table-column align="center" prop="version" label="可升级软件版本">
           </el-table-column>
-          <el-table-column align="center" prop="onUpdateTime" label="上次升级时间">
+          <el-table-column align="center" label="上次升级时间">
+            <template slot-scope="scope">
+              {{ scope.row.onUpdateTime | formatDate }}
+            </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" @click="handleOneOTAUpdate(scope.row)">
+              <el-button v-if="scope.row.deviceType != 'tt'" size="mini" type="text" @click="handleOneOTAUpdate(scope.row)">
                 升级
               </el-button>
             </template>
@@ -113,6 +123,10 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      deviceTypeList: [
+        { 'label': '锐能设备', 'value': 'rn', },
+        { 'label': '铁塔设备', 'value': 'tt', },
+      ],
     }
   },
   created () {

src/views/hardware/device/list.vue

@@ -511,7 +511,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery () {
-      this.queryParams = {};
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10
+      };
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -677,6 +680,8 @@ export default {
 
     // 节点提交
     saveNode: function () {
+      this.$refs["nodeForm"].validate((valid)=>{
+        if(valid) {
           deviceNodeSave(this.nodeForm).then((res) => {
             if (200 == res.code) {
               let msgDict = {
@@ -691,6 +696,8 @@ export default {
               this.msgError(res.msg);
             }
           });
+        }
+      })
     },
 
     /** 删除按钮操作 */

src/views/signal/signalList/index.vue

@@ -4,23 +4,23 @@
       <el-col :span="24">
         <el-form :size="size" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
           <el-form-item label="信号编码">
-            <el-input v-model="queryParams.signalCode" placeholder="请输入信号编码" clearable style="width: 200px"
+            <el-input v-model="queryParams.signalCode" placeholder="请输入信号编码" clearable
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="信号名称">
-            <el-input v-model="queryParams.signalName" placeholder="请输入信号名称" clearable style="width: 200px"
+            <el-input v-model="queryParams.signalName" placeholder="请输入信号名称" clearable
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="信号量">
-            <el-input v-model="queryParams.signalValue" placeholder="请输入信号量" clearable style="width: 200px"
+            <el-input v-model="queryParams.signalValue" placeholder="请输入信号量" clearable
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="信号量范围">
-            <el-input v-model="queryParams.signalValueRange" placeholder="信号量范围" clearable style="width: 200px"
+            <el-input v-model="queryParams.signalValueRange" placeholder="信号量范围" clearable
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="类型">
-            <el-input v-model="queryParams.signalType" placeholder="类型" clearable style="width: 200px"
+            <el-input v-model="queryParams.signalType" placeholder="类型" clearable
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item>
@@ -226,7 +226,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery () {
-      this.queryParams = {};
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10
+      };
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/system/area/index.vue

@@ -1,14 +1,14 @@
 <template>
   <section class="app-container">
-    <el-row>
+    <el-row class="mb8">
       <el-button type="primary" icon="el-icon-plus" size="mini" @click="addArea" v-hasPermi="['system:role:select']">添加</el-button>
       <el-button type="danger" icon="el-icon-delete" size="mini" @click="delArea" v-hasPermi="['system:area:remove']">批量删除</el-button>
     </el-row>
     <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55">
       </el-table-column>
-      <el-table-column prop="id" label="大区ID">
+      <!-- <el-table-column prop="id" label="大区ID">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="areaName" label="大区名称">
       </el-table-column>
       <el-table-column prop="ordinal" label="序数">
@@ -244,8 +244,12 @@ export default {
         ...this.row,
         "provinceIds": [code]
       }).then(res => {
-        this.getProvinceByArea(this.row.id)
+        if(res.result == 1) {
+          this.getProvinceByArea(this.row.id);
           this.$forceUpdate();
+        } else {
+          this.msgError('已被占用，添加失败');
+        }
       })
     },
     handleDelAreaProvince ({ id }) {

src/views/topic/topicList/index.vue

@@ -217,7 +217,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery () {
-      this.queryParams = {};
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10
+      };
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/workOrderManage/orderList/index.vue

@@ -238,7 +238,10 @@ export default {
     },
     // 重置按钮操作
     resetQuery () {
-      this.queryParams = {};
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10
+      };
       this.resetForm('queryForm');
       this.dateRange = [];
       this.handleQuery();