heyang 2 년 전
부모
커밋
83118b8972

+ 1 - 1
src/views/emergencyManagement/distribution/index.vue

@@ -11,7 +11,7 @@
           <span v-if="scope.row.distrName=='关联失败'" class="fail_color">关联失败</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
     </el-table>
     <pagination :page-sizes="[20, 30, 40, 50]"
       v-show="total>0"

+ 21 - 1
src/views/emergencyManagement/plan_log/index.vue

@@ -77,7 +77,7 @@
         </el-form-item>
       </el-form>
 
-      <el-table v-loading="loading" border :data="logList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" border :data="logList"  @selection-change="handleSelectionChange">
         <el-table-column label="风险" align="left" prop="riskPlanName" />
         <el-table-column label="实验室名称" align="left" prop="subjectName" />
         <el-table-column label="学院" align="left" prop="deptName" />
@@ -777,6 +777,26 @@ export default {
           },
         }]
       };
+      myChart.on('legendselectchanged', (e) => {
+        total=0;
+        //循环取value值
+        echartData.forEach(function(item) {
+          //根据选中状态总和计算total
+          for(let i in e.selected){
+            if(e.selected[i]==true){
+                if(item.name==i){
+                  total+=item.value
+                }
+            }
+          }
+          //重新渲染title
+          myChart.setOption({
+            title: [{
+              text: '{name|' + title + '}\n{val|' + formatNumber(total) + '}',
+            }],
+          })
+        })
+      })
       myChart.setOption(option);
     },
     //eCharts方法

+ 3 - 2
src/views/emergencyManagement/smartLoT/sensor/index.vue

@@ -50,7 +50,7 @@
       <el-table-column label="实验室" align="left" prop="subjectName" />
       <el-table-column label="路由" align="left" prop="routeNum" />
       <el-table-column label="状态" align="left" prop="senseState">
-        <template slot-scope="scope">{{scope.row.senseState.name}}</template>
+        <template slot-scope="scope">{{scope.row.senseState==null?'-':scope.row.senseState.name}}</template>
       </el-table-column>
       <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
         <template slot-scope="scope">
@@ -215,7 +215,8 @@ export default {
         ],
         gatewayId:[
           {required: true, message: '网关不能为空', trigger: 'blur'},
-          { required: true, message: "网关不能为空", validator: this.spaceJudgment, trigger: "blur" }
+          { required: true, message: "网关不能为空", validator: this.spaceJudgment, trigger: "blur" },
+          { pattern:/^(192\.168(\.(\d|([1-9]\d)|(1\d{2})|(2[0-4]\d)|(25[0-5]))){2})$/, message: "请输入正确的网关", trigger: "blur" }
         ],
         senseData:[
           {required: true, message: '检测数据不能为空', trigger: 'blur'},

+ 1 - 1
src/views/secureAccess/approval/passed.vue

@@ -10,7 +10,7 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="检查时间" label-width="70px">
+      <el-form-item label="时间" label-width="70px">
         <el-date-picker
           :clearable="false"
           v-model="dateRange"

+ 1 - 0
src/views/secureAccess/whitelist/addPage.vue

@@ -281,6 +281,7 @@ import {
         this.dialogForm.name = '';
         this.dialogForm.floorId = '';
         this.dialogForm.buildId = '';
+        this.floorList=[];
         this.onSearch();
       },
       //新增准入实验室