3 years ago · 672fd7e64d
--- a/.env.development
+++ b/.env.development
@@ -6,15 +6,18 @@ NODE_ENV=development
 
				 VUE_APP_ENV = 'development'
			
 
				 
			
 
				 # ####################接口配置####################
			
 
				-
			
 
				+# 韩
			
 
				+#VUE_APP_BASE_API =  'http://192.168.1.20:8080'
			
 
				+# 飞
			
 
				+#VUE_APP_BASE_API =  'http://192.168.1.17:8080'
			
 
				 # 88服务器
			
 
				 #VUE_APP_BASE_API = 'http://192.168.1.88/labSystem'
			
 
				 # 柴
			
 
				 # VUE_APP_BASE_API = 'http://192.168.1.9:8080'
			
 
				 # 暨大
			
 
				-#VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
			
 
				+VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
			
 
				 # 矿大-文昌
			
 
				-VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
			
 
				+#VUE_APP_BASE_API = 'http://lab.sxitdlc.com/kdwclabSystem/'
			
 
				 
			
 
				 
			
 
				 
			
@@ -31,9 +34,9 @@ VUE_APP_BASE_VIDEO_API = 'https://lab.sxitdlc.com'
 
				 #VUE_APP_BASE_MQTT_API = 'ws://192.168.1.43:1884'
			
 
				 # 暨大MQTT地址
			
 
				 #VUE_APP_BASE_MQTT_API = 'ws://192.168.8.3:1884'
			
 
				-#VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
			
 
				+VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
			
 
				 #矿大-文昌
			
 
				-VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
			
 
				+#VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/kdwcmqtt'
			
 
				 VUE_APP_BASE_MQTT_USERNAME = 'mqtt'
			
 
				 VUE_APP_BASE_MQTT_PASSWORD = 'mqtt@zd1883'
			
 
				 
			
--- a/.env.production
+++ b/.env.production
@@ -12,8 +12,8 @@ VUE_APP_ENV = 'development'
 
				 # 柴
			
 
				 #VUE_APP_BASE_API = 'http://192.168.1.9:8080'
			
 
				 # 暨大
			
 
				-#VUE_APP_BASE_API = 'http://192.168.8.3/labSystem/'
			
 
				-VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
			
 
				+VUE_APP_BASE_API = 'http://192.168.8.3/labSystem/'
			
 
				+#VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
			
 
				 # 矿大
			
 
				 #VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
			
 
				 # 矿大-文昌
			
@@ -26,8 +26,8 @@ VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
 
				 # MQTT地址
			
 
				 #VUE_APP_BASE_MQTT_API = 'ws://192.168.1.43:1884'
			
 
				 # 暨大MQTT地址
			
 
				-#VUE_APP_BASE_MQTT_API = 'ws://192.168.8.3:1884'
			
 
				-VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
			
 
				+VUE_APP_BASE_MQTT_API = 'ws://192.168.8.3:1884'
			
 
				+#VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
			
 
				 #矿大
			
 
				 #VUE_APP_BASE_MQTT_API = 'ws://192.168.1.248:1884'
			
 
				 #矿大-文昌
			
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 
				 .DS_Store
			
 
				-node_modules
			
 
				-/dist
			
 
				+node_modules/
			
 
				+dist/
			
 
				 
			
 
				 
			
 
				 # local env files
			
--- a/bigData/favicon.ico
+++ b/bigData/favicon.ico
--- a/bigData/index.html
+++ b/bigData/index.html
@@ -0,0 +1,17 @@
 
				+<!DOCTYPE html>
			
 
				+<html lang="">
			
 
				+  <head>
			
 
				+    <meta charset="utf-8">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
			
 
				+    <link rel="icon" href="favicon.ico">
			
 
				+    <title></title>
			
 
				+  <script defer src="static/js/chunk-vendors.js"></script><script defer src="static/js/app.js"></script></head>
			
 
				+  <body>
			
 
				+    <noscript>
			
 
				+      <strong>We're sorry but  doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
			
 
				+    </noscript>
			
 
				+    <div id="app"></div>
			
 
				+    <!-- built files will be auto injected -->
			
 
				+  </body>
			
 
				+</html>
			
--- a/bigData/static/img/bg.06b1a9c0.png
+++ b/bigData/static/img/bg.06b1a9c0.png
--- a/bigData/static/img/img_sysbjt.f49c1e0e.png
+++ b/bigData/static/img/img_sysbjt.f49c1e0e.png
--- a/bigData/static/img/index_icon10.4808fd96.png
+++ b/bigData/static/img/index_icon10.4808fd96.png
--- a/bigData/static/img/index_icon11.dd5c922b.png
+++ b/bigData/static/img/index_icon11.dd5c922b.png
--- a/bigData/static/img/index_icon2.428f1b2b.png
+++ b/bigData/static/img/index_icon2.428f1b2b.png
--- a/bigData/static/img/index_icon6.6f81fe21.png
+++ b/bigData/static/img/index_icon6.6f81fe21.png
--- a/bigData/static/img/index_icon7.3651e467.png
+++ b/bigData/static/img/index_icon7.3651e467.png
--- a/bigData/static/img/index_icon9.536f2339.png
+++ b/bigData/static/img/index_icon9.536f2339.png
--- a/bigData/static/img/index_zw.360001e2.png
+++ b/bigData/static/img/index_zw.360001e2.png
--- a/bigData/static/js/app.js
+++ b/bigData/static/js/app.js
--- a/bigData/static/js/chunk-vendors.js
+++ b/bigData/static/js/chunk-vendors.js
--- a/bigData/static/js/node_modules__echarts_5_4_0_echarts_index_js-node_modules__jquery_3_6_1_jquery_dist_jquery_js-2f7d1b.js
+++ b/bigData/static/js/node_modules__echarts_5_4_0_echarts_index_js-node_modules__jquery_3_6_1_jquery_dist_jquery_js-2f7d1b.js
--- a/bigData/static/js/src_views_admittanceDetail_vue.js
+++ b/bigData/static/js/src_views_admittanceDetail_vue.js
--- a/bigData/static/js/src_views_classifyGradeDetail_vue.js
+++ b/bigData/static/js/src_views_classifyGradeDetail_vue.js
--- a/bigData/static/js/src_views_controlDetail_vue.js
+++ b/bigData/static/js/src_views_controlDetail_vue.js
--- a/bigData/static/js/src_views_dangerDetail_vue.js
+++ b/bigData/static/js/src_views_dangerDetail_vue.js
--- a/bigData/static/js/src_views_home_vue.js
+++ b/bigData/static/js/src_views_home_vue.js
--- a/bigData/static/js/src_views_illegalDetail_vue.js
+++ b/bigData/static/js/src_views_illegalDetail_vue.js
--- a/bigData/static/js/src_views_inspectDetail2_vue.js
+++ b/bigData/static/js/src_views_inspectDetail2_vue.js
--- a/bigData/static/js/src_views_inspectDetail_vue.js
+++ b/bigData/static/js/src_views_inspectDetail_vue.js
--- a/bigData/static/js/src_views_labPersonDetail_vue.js
+++ b/bigData/static/js/src_views_labPersonDetail_vue.js
--- a/bigData/static/js/src_views_planDetail_vue.js
+++ b/bigData/static/js/src_views_planDetail_vue.js
--- a/bigData/static/js/src_views_riskDetail_vue.js
+++ b/bigData/static/js/src_views_riskDetail_vue.js
--- a/bigData/static/js/src_views_warningDetail_vue.js
+++ b/bigData/static/js/src_views_warningDetail_vue.js
--- a/bigData/static/js/src_views_workInfoDetail_vue.js
+++ b/bigData/static/js/src_views_workInfoDetail_vue.js
--- a/bigData/static/js/src_views_workPlanDetail_vue.js
+++ b/bigData/static/js/src_views_workPlanDetail_vue.js
--- a/src/api/http.js
+++ b/src/api/http.js
@@ -4,7 +4,6 @@ let {get, post,baseUrl} = axios
 
				 //基础
			
 
				 export const requestUrl = baseUrl;
			
 
				 
			
 
				-export let base_url = 'http://192.168.1.88/labSystem'
			
 
				 //获取logo图片
			
 
				 export const getLogoInfo = data => get("/system/logo/config/getLogoInfo",data)
			
 
				 
			
@@ -89,7 +88,7 @@ export const mangerControl = data => post("/laboratory/subject/manger/control/"+
 
				 //预案- 获取开关状态
			
 
				 export const controllerList = data => get("/laboratory/onemachine/"+data+'/controller/list',)
			
 
				 //预案-获取摄像头列表
			
 
				-export const startListDeviceIds = data => get("/wenchang/api/play/startList",data,'video')
			
 
				+export const startListDeviceIds = data => get("/jinandaxue/api/play/startList",data,'video')
			
 
				 //预案-获取报警详情
			
 
				 export const abnormalLogOrderByList = data => get("/laboratory/plan/log/abnormalLogOrderByList",data)
			
 
				 //预案-实验室简要信息
			
--- a/src/assets/image/icon_zwsj.png
+++ b/src/assets/image/icon_zwsj.png
--- a/src/assets/image/img_sysbjt.png
+++ b/src/assets/image/img_sysbjt.png
--- a/src/assets/styles/.sass-cache/511d0b51ee71585ba64d5ff24edd08270b726996/publicEle.scssc
+++ b/src/assets/styles/.sass-cache/511d0b51ee71585ba64d5ff24edd08270b726996/publicEle.scssc
--- a/src/assets/styles/publicEle.css
+++ b/src/assets/styles/publicEle.css
@@ -1,4 +1,28 @@
 
				 @charset "UTF-8";
			
 
				+.el-table__empty-text {
			
 
				+  color: rgba(0, 0, 0, 0);
			
 
				+  width: 100%;
			
 
				+  height: 100%;
			
 
				+  background: url("../image/icon_zwsj.png") no-repeat 50% 50%; }
			
 
				+
			
 
				+::-webkit-scrollbar {
			
 
				+  /*滚动条整体样式*/
			
 
				+  width: 1px;
			
 
				+  /*高宽分别对应横竖滚动条的尺寸*/
			
 
				+  height: 1px; }
			
 
				+
			
 
				+::-webkit-scrollbar-thumb {
			
 
				+  /*滚动条里面小方块*/
			
 
				+  border-radius: 3px;
			
 
				+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
			
 
				+  background: none; }
			
 
				+
			
 
				+::-webkit-scrollbar-track {
			
 
				+  /*滚动条里面轨道*/
			
 
				+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
			
 
				+  border-radius: 3px;
			
 
				+  background: none; }
			
 
				+
			
 
				 /*查询条件*/
			
 
				 .form-box {
			
 
				   margin-top: 26px; }
			
--- a/src/assets/styles/publicEle.css.map
+++ b/src/assets/styles/publicEle.css.map
--- a/src/assets/styles/publicEle.scss
+++ b/src/assets/styles/publicEle.scss
@@ -8,6 +8,13 @@
 
				   @return $px*100/1080 *1vh;
			
 
				 }
			
 
				 
			
 
				+.el-table__empty-text{
			
 
				+  color:rgba(0,0,0,0);
			
 
				+  width:100%;
			
 
				+  height:100%;
			
 
				+  background: url("../image/icon_zwsj.png") no-repeat 50% 50%;
			
 
				+}
			
 
				+
			
 
				 ::-webkit-scrollbar {/*滚动条整体样式*/
			
 
				   width:1px;     /*高宽分别对应横竖滚动条的尺寸*/
			
 
				   height:1px;
			
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -15,7 +15,7 @@ axios.defaults.withCredentials = false;
 
				 
			
 
				 // 允许跨域
			
 
				 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
			
 
				-//axios.defaults.headers.common["Authorization"] = 'Bearer 01b39db3-8642-494e-9f9e-6e6d27e6e856';//`Bearer ${localStorage.getItem('access_token')`;
			
 
				+//axios.defaults.headers.common["Authorization"] = 'Bearer 7b18686e-0d1f-483b-b3f2-814e4a60e467';//`Bearer ${localStorage.getItem('access_token')`;
			
 
				 axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
			
 
				 
			
 
				 //设置超时
			
--- a/src/views/admittanceDetail.vue
+++ b/src/views/admittanceDetail.vue
@@ -26,7 +26,7 @@
 
				                             v-model="dateRange"
			
 
				                             size="small"
			
 
				                             style="width: 240px"
			
 
				-                            value-format="yyyy-MM-dd"
			
 
				+                           value-format="YYYY-MM-DD"
			
 
				                             type="daterange"
			
 
				                             range-separator="-"
			
 
				                             start-placeholder="开始日期"
			
--- a/src/views/controlDetail.vue
+++ b/src/views/controlDetail.vue
@@ -28,11 +28,12 @@
 
				                             v-model="dateRange"
			
 
				                             size="small"
			
 
				                             style="width: 240px"
			
 
				-                            value-format="yyyy-MM-dd"
			
 
				+                            value-format="YYYY-MM-DD"
			
 
				                             type="daterange"
			
 
				                             range-separator="-"
			
 
				                             start-placeholder="开始日期"
			
 
				                             end-placeholder="结束日期"
			
 
				+                            @change="ceshi"
			
 
				                     ></el-date-picker>
			
 
				                 </el-form-item>
			
 
				                 <el-form-item label-width="0">
			
@@ -98,6 +99,9 @@ export default {
 
				     }
			
 
				   },
			
 
				   methods: {
			
 
				+    ceshi(){
			
 
				+      console.log(this.dateRange)
			
 
				+    },
			
 
				     back(){
			
 
				       this.$router.push('/')
			
 
				     },
			
--- a/src/views/dangerDetail.vue
+++ b/src/views/dangerDetail.vue
@@ -37,7 +37,7 @@
 
				                                 v-model="dateRange"
			
 
				                                 size="small"
			
 
				                                 style="width: 240px"
			
 
				-                                value-format="yyyy-MM-dd"
			
 
				+                                value-format="YYYY-MM-DD"
			
 
				                                 type="daterange"
			
 
				                                 range-separator="-"
			
 
				                                 start-placeholder="开始日期"
			
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -6,7 +6,7 @@
 
				       <div class="header_c">实验室安全智能监测与控制系统</div>
			
 
				       <div class="header_r1">
			
 
				         <img class="header_r1_l" src="@/assets/image/index_icon3.png"/>
			
 
				-        <i>环境学院</i>
			
 
				+        <i>环境与气候研究院</i>
			
 
				         <img class="header_r1_r" src="@/assets/image/index_icon4.png" @click="openBackManageUrl()"/>
			
 
				       </div>
			
 
				     </div>
			
@@ -67,9 +67,9 @@
 
				                     <img src="@/assets/image/index_icon8.png" @click="openinspectUrl()"/>
			
 
				                   </div>
			
 
				                   <div class="left_t_r2_t2">
			
 
				-                    <i>隐患排查数：{{inspeccheckZs}}</i>
			
 
				+                    <i>本次隐患排查数：{{inspeccheckZs}}</i>
			
 
				                     <i>历史遗留：{{inspeccheckWzg}}</i>
			
 
				-                    <i>已整改：{{inspeccheckYzg}}</i>
			
 
				+                    <i>本次已整改：{{inspeccheckYzg}}</i>
			
 
				                   </div>
			
 
				                   <div class="left_t_r2_m">
			
 
				                     <i>实验室</i>
			
@@ -87,7 +87,7 @@
 
				                       <i>{{item.checkYzg}}</i>
			
 
				                     </li>
			
 
				                   </div>
			
 
				-
			
 
				+                   <div v-if="inspectList.length<=0" style="position:relative;left: 44%; top:8%;color:#fff;">暂无数据</div>
			
 
				                 </div>
			
 
				               </div>
			
 
				               <div class="swiper-slide">
			
@@ -122,6 +122,7 @@
 
				                     </li>
			
 
				                   </div>
			
 
				 
			
 
				+                  <div v-if="controlList.length<=0" style="position:relative;left: 44%; top:20%;color:#fff;">暂无数据</div>
			
 
				                 </div>
			
 
				               </div>
			
 
				             </div>
			
@@ -158,16 +159,18 @@
 
				         <!---->
			
 
				         <div class="left_b_b" >
			
 
				           <ul id="move_ani" :style="`animation-duration: ${labInfoList.length/0.1}s;height:${labInfoList.length*66*1.7}px;`">
			
 
				-            <li v-for='(item,index8) in labInfoList' :key="index8">
			
 
				-              <div class="left_b_b_t">
			
 
				-                <i>{{item.room}}</i>
			
 
				-                <i>{{item.address}}</i>
			
 
				-                <!--<i>正常</i>-->
			
 
				-              </div>
			
 
				-              <div class="left_b_b_b">
			
 
				-                <i v-for='(item2,index) in item.sensorFunctionStatusList' :key="index">{{item2.funcName}}：{{item2.formatVal}}</i>
			
 
				-              </div>
			
 
				-            </li>
			
 
				+            <template v-for='(item,index8) in labInfoList' :key="index8">
			
 
				+              <li v-if="item.sensorFunctionStatusList.length>0">
			
 
				+                <div class="left_b_b_t">
			
 
				+                  <i>{{item.room}}</i>
			
 
				+                  <i>{{item.address}}</i>
			
 
				+                  <!--<i>正常</i>-->
			
 
				+                </div>
			
 
				+                <div class="left_b_b_b">
			
 
				+                  <i v-for='(item2,index) in item.sensorFunctionStatusList' :key="index">{{item2.funcName}}：{{item2.formatVal}}</i>
			
 
				+                </div>
			
 
				+              </li>
			
 
				+             </template>
			
 
				           </ul>
			
 
				 
			
 
				         </div>
			
@@ -253,7 +256,9 @@
 
				             <div class="right_b_l_b_b" v-if="labList">
			
 
				               <li  v-for='(item,index10) in labList' :key="index10"><i>{{item.name}}</i><i>{{item.online}}</i></li>
			
 
				             </div>
			
 
				+            <div v-if="labList.length<=0" style="position:absolute;left: 36%; top:38%;color:#fff;">暂无数据</div>
			
 
				           </div>
			
 
				+
			
 
				         </div>
			
 
				         <div class="right_b_r">
			
 
				              <!--公共小标题-->
			
@@ -279,7 +284,6 @@
 
				 <script>
			
 
				 
			
 
				 import {
			
 
				-  base_url,
			
 
				   getLogoInfo,
			
 
				   getYearControlInfo,
			
 
				   groupGetList,
			
@@ -488,9 +492,19 @@ export default {
 
				           let illegalData=[];
			
 
				           let data=res.data.list;
			
 
				           _this.resultCount=res.data.resultCount;//总数
			
 
				-          for (var i = 0; i <4; i++) {
			
 
				-            illegalX.push( data[i].content)
			
 
				-            illegalData.push(data[i].count)
			
 
				+
			
 
				+          if(data.length<=0){
			
 
				+            for (let i = 0; i <4; i++) {
			
 
				+              illegalX.push('其他')
			
 
				+              illegalData.push(0)
			
 
				+            }
			
 
				+          }else{
			
 
				+            data.forEach(function (item) {
			
 
				+              console.log(item.content)
			
 
				+              illegalX.push(item.content)
			
 
				+              illegalData.push(item.count)
			
 
				+            })
			
 
				+
			
 
				           }
			
 
				           this.illegalFun(illegalX,illegalData)
			
 
				 
			
@@ -559,7 +573,12 @@ export default {
 
				           let dataX=[];
			
 
				           let data=res.data;
			
 
				           data.forEach(function (item) {
			
 
				-            dataX.push({value:item.totalNum, name:item.dictLabel+' '+item.totalNum})
			
 
				+            if(item.totalNum==0){
			
 
				+              dataX.push({value:'', name:item.dictLabel+' '+item.totalNum})
			
 
				+            }else{
			
 
				+              dataX.push({value:item.totalNum, name:item.dictLabel+' '+item.totalNum})
			
 
				+            }
			
 
				+
			
 
				           })
			
 
				           this.riskFun(dataX)
			
 
				 
			
@@ -1208,7 +1227,7 @@ export default {
 
				     },
			
 
				     /*实验室分级统计*/
			
 
				     classifyFun(dataX){
			
 
				-      var colorList = ['#E9BA44', '#0086F1', '#21B532','#1B96EA'];
			
 
				+      var colorList = ['#d02c2c', '#ff9b17', '#0183fa','#0a9419'];
			
 
				       let classifyOption = {
			
 
				         series: [{
			
 
				           type: 'pie',
			
@@ -2289,6 +2308,7 @@ export default {
 
				           }
			
 
				         }
			
 
				         .right_b_l_b{
			
 
				+          position: relative;
			
 
				           .right_b_l_b_t{
			
 
				             height: rh(48);
			
 
				             display: flex;
			
--- a/src/views/illegalDetail.vue
+++ b/src/views/illegalDetail.vue
@@ -38,7 +38,7 @@
 
				                             v-model="dateRange"
			
 
				                             size="small"
			
 
				                             style="width: 240px"
			
 
				-                            value-format="yyyy-MM-dd"
			
 
				+                            value-format="YYYY-MM-DD"
			
 
				                             type="daterange"
			
 
				                             range-separator="-"
			
 
				                             start-placeholder="开始日期"
			
@@ -100,7 +100,6 @@ export default {
 
				       editForm:{
			
 
				         deptLevel:'',//这个是登陆后，刘波给你的院校的类型
			
 
				         subId:'',//实验室
			
 
				-        schoolDeptId:'',//院系id
			
 
				         violationType:'',//违规类型
			
 
				         beginTimeStr:'',//开始时间
			
 
				         endTimeStr:'',//结束时间
			
@@ -162,7 +161,6 @@ export default {
 
				       let obj={
			
 
				         'deptLevel':localStorage.getItem('deptLevel'),
			
 
				         'subjectId':this.editForm.subId,
			
 
				-        'schoolDeptId':this.editForm.schoolDeptId,
			
 
				         'violationType':this.editForm.violationType,
			
 
				         'beginTimeStr':this.editForm.beginTimeStr,
			
 
				         'endTimeStr':this.editForm.endTimeStr,
			
@@ -222,7 +220,6 @@ export default {
 
				     resetForm(formName) {
			
 
				 
			
 
				       this.editForm.subId = "";
			
 
				-      this.editForm.schoolDeptId = "";
			
 
				       this.editForm.violationType = "";
			
 
				       this.editForm.beginTimeStr = "";
			
 
				       this.editForm.endTimeStr = "";
			
--- a/src/views/inspectDetail2.vue
+++ b/src/views/inspectDetail2.vue
@@ -9,7 +9,7 @@
 
				             </div>
			
 
				         </div>
			
 
				 
			
 
				-        <div class="main_b" v-if="tableData.length>0">
			
 
				+        <div class="main_b">
			
 
				             <div class="main_b_title">遗留问题</div>
			
 
				             <!--查询条件-->
			
 
				             <el-form :model="editForm" ref="queryParams" class="form-box" :inline="true" style="margin:20px;">
			
@@ -48,7 +48,7 @@
 
				                     :total="totalNum">
			
 
				             </el-pagination>
			
 
				         </div>
			
 
				-        <div class="main_b2" v-if="tableData2.length>0">
			
 
				+        <div class="main_b2">
			
 
				             <div class="main_b_title">本次检查问题</div>
			
 
				             <!--查询条件-->
			
 
				             <el-form :model="editForm2" ref="queryParams" class="form-box" :inline="true" style="margin:20px;">
			
@@ -177,7 +177,7 @@ export default {
 
				       let _this=this;
			
 
				       //已整改的
			
 
				       let obj={
			
 
				-        'laboratoryId':this.editForm.subId,
			
 
				+        'laboratoryId':this.editForm2.subId,
			
 
				         'id':this.codeData,
			
 
				         'pageNum':this.editForm.pageNum,
			
 
				         'pageSize':this.editForm.pageSize,
			
--- a/src/views/planDetail.vue
+++ b/src/views/planDetail.vue
@@ -28,7 +28,7 @@
 
				                             v-model="dateRange"
			
 
				                             size="small"
			
 
				                             style="width: 240px"
			
 
				-                            value-format="yyyy-MM-dd"
			
 
				+                            value-format="YYYY-MM-DD"
			
 
				                             type="daterange"
			
 
				                             range-separator="-"
			
 
				                             start-placeholder="开始日期"
			
--- a/src/views/riskDetail.vue
+++ b/src/views/riskDetail.vue
@@ -27,7 +27,7 @@
 
				                         <el-option
			
 
				                                 v-for="item in riskList"
			
 
				                                 :key="item.id"
			
 
				-                                :label="item.chName"
			
 
				+                                :label="item.anotherName"
			
 
				                                 :value="item.id">
			
 
				                         </el-option>
			
 
				                     </el-select>
			
@@ -42,7 +42,6 @@
 
				                 <el-table-column align="center" header-align='center' type="index" :index="indexMethod" label="序号" width="60"></el-table-column>
			
 
				                 <el-table-column align="center" header-align='center' prop="chName" label="危险源"></el-table-column>
			
 
				                 <el-table-column align="center" header-align='center' prop="num" label="数量"></el-table-column>
			
 
				-                <el-table-column align="center" header-align='center' prop="unit" label="单位"></el-table-column>
			
 
				                 <el-table-column align="center" header-align='center' prop="percentageNum" label="占比" width="420">
			
 
				                     <template  #default="{row}">
			
 
				                         <el-progress  :percentage="Number(row.percentageNum)" :stroke-width="20"></el-progress>
			
@@ -156,10 +155,10 @@ export default {
 
				         if(res.code==200){
			
 
				           let data = res.rows;
			
 
				           if(data && data.length>0){
			
 
				-            //_this.tableData = data;
			
 
				+            _this.tableData = data;
			
 
				             _this.totalNum = parseInt(res.total);
			
 
				           }else{
			
 
				-            //_this.tableData = [];
			
 
				+            _this.tableData = [];
			
 
				             _this.totalNum = 0;
			
 
				           }
			
 
				         }
			
@@ -190,6 +189,7 @@ export default {
 
				       //查询危险源
			
 
				       queryHazardOption({}).then((res) =>{
			
 
				         if(res.code==200){
			
 
				+
			
 
				           let data=res.data;
			
 
				           _this.riskList=data
			
 
				 
			
@@ -334,7 +334,7 @@ export default {
 
				             },
			
 
				             type:'bar',
			
 
				             barWidth: '60%',
			
 
				-            barMaxWidth: '10%',
			
 
				+            barMaxWidth: '5%',
			
 
				             data:dataValue
			
 
				           }
			
 
				         ]