heyang 2 years ago
parent
commit
aab08992a2
5 changed files with 40 additions and 27 deletions
  1. 3 3
      .env.development
  2. 5 2
      src/api/http.js
  3. 1 1
      src/utils/request.js
  4. 25 15
      src/views/home.vue
  5. 6 6
      src/views/inspectDetail.vue

+ 3 - 3
.env.development

@@ -9,7 +9,7 @@ VUE_APP_ENV = 'development'
 # 韩
 # VUE_APP_BASE_API =  '192.168.1.20:8080'
 # 飞
-# VUE_APP_BASE_API =  '192.168.1.17:8080'
+ VUE_APP_BASE_API =  '192.168.1.17:8080'
 # 88服务器
 # VUE_APP_BASE_API = '192.168.1.88/labSystem'
 # 43服务器
@@ -26,11 +26,11 @@ VUE_APP_ENV = 'development'
 # 矿大
 # VUE_APP_BASE_API = 'lab.sxitdlc.com/labSystem/'
 
-
-VUE_APP_BASE_API = 'lab.sxitdlc.com/labAppTest/'
+#VUE_APP_BASE_API = 'lab.sxitdlc.com/labAppTest/'
 
 # ####################内网接口配置####################
 
 #VUE_APP_BASE_LOCAL_API = '192.168.1.43/labSystem/'
+VUE_APP_BASE_LOCAL_API = '192.168.1.17:8080'
 
 

+ 5 - 2
src/api/http.js

@@ -37,7 +37,10 @@ export const listCollegeTz = data => get("/laboratory/notifyplan/listCollegeTz",
 //工作计划
 export const listCollegeJh = data => get("/laboratory/notifyplan/listCollegeTz",data)
 //安全检查
-export const indexCollegeListCheck = data => get("/laboratory/checkRecord/indexCollegeListCheck",data)
+export const safetyInspectTitle = data => get("/zd-security/DataStatistics/bigViewCount",data)
+//安全检查
+export const indexCollegeListCheck = data => get("/zd-security/DataStatistics/bigViewList",data)
+
 //获取报警信息
 export const groupGetList = data => get("/laboratory/plan/group/getList",data)
 //安全准入办理
@@ -63,7 +66,7 @@ export const detailColumnar = data => get("/laboratory/violation/bigData/detail/
 //查询违规原因
 export const getDictViolation = data => get("/laboratory/violationScoreSite/getDictViolation",data)
 //安全检查-遗留问题
-export const indexCheckDetalsWzg = data => get("/laboratory/checkRecordDetails/indexCheckDetalsWzg",data)
+export const indexCheckDetalsWzg = data => get("/zd-security/DataStatistics/remainList",data)
 //安全检查-遗留问题
 export const indexCheckDetalsYzg = data => get("/laboratory/checkRecordDetails/indexCheckDetalsYzg",data)
 //进入实验室人员

+ 1 - 1
src/utils/request.js

@@ -37,7 +37,7 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-//axios.defaults.headers.common["Authorization"] = 'Bearer cca09d2e-cb74-43b0-b6ce-9f2132979297';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer 8e833652-030e-4264-b0ca-ca8fc5121faa';//`Bearer ${localStorage.getItem('access_token')`;
 axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时

+ 25 - 15
src/views/home.vue

@@ -81,11 +81,11 @@
                   </div>
                   <div class="left_t_r2_b" v-if="inspectList">
                     <li v-for='(item,index3) in inspectList' :key="index3">
-                      <i class="over">{{item.laboratoryName}}</i>
+                      <i class="over">{{item.subjectName}}</i>
                       <i>{{item.typeName}}</i>
-                      <i>{{item.typeLevel}}</i>
-                      <i>{{item.checkZs}}</i>
-                      <i>{{item.checkYzg}}</i>
+                      <i>{{item.levelName}}</i>
+                      <i>{{item.dangerNum}}</i>
+                      <i>{{item.amount}}</i>
                     </li>
                   </div>
                    <div v-if="inspectList.length<=0" style="position:relative;left: 44%; top:8%;color:#fff;">暂无数据</div>
@@ -299,7 +299,7 @@ import {
   queryHazardColumnar,
   workInfo,
   getUrlConfig,
-  requestUrl, getTypeCount, getFiedCount
+  requestUrl, getTypeCount, getFiedCount, safetyInspectTitle
 } from "../api/http"
 import Swiper from 'swiper'
 import $ from 'jquery'
@@ -343,7 +343,7 @@ export default {
       riskPlanId:'',//风险预案id
       subjectId:'',//实验室id
       sensorStr:'',//实验室id
-      laboratoryId:'',//安全检查实验室检查批次id
+      planId:'',//安全检查id
       checkedNum:0,
       //首页总数
       resultCount:'',
@@ -402,7 +402,7 @@ export default {
     },
     //安全检查
     openinspectUrl(){
-      this.$router.push({path:'./inspectDetail',query:{key:this.laboratoryId}})
+      this.$router.push({path:'./inspectDetail',query:{key:this.planId}})
 
     },
     //安全检查批次
@@ -736,20 +736,29 @@ export default {
         }
       })
     },
+    //安全检查头部信息
+    safetyInspectTitle:function () {
+      safetyInspectTitle().then((res) =>{
+        if(res.code==200){
+          let _this=this;
+          let data=res.data;
+          _this.inspecremark=data.title;
+          _this.inspeccheckWzg=data.ylTotal;
+          _this.inspeccheckYzg=data.yzgTotal;
+          _this.inspeccheckZs=data.yhTotal;
+          _this.planId=data.planId;
+
+        }
+      })
+    },
     //安全检查
     safetyInspectFun:function(){
       let _this=this;
-      indexCollegeListCheck({pageNum:1,pageSize:10}).then((res) =>{
+      indexCollegeListCheck({pageNum:1,pageSize:7}).then((res) =>{
         if(res.code==200){
           let data=res.rows;
           _this.inspectList=data
-          for (var i = 0; i < data.length; i++) {
-            _this.inspecremark=data[0].remark;
-            _this.inspeccheckWzg=data[0].listVo[0].checkWzg;
-            _this.inspeccheckYzg=data[0].listVo[0].checkYzg;
-            _this.inspeccheckZs=data[0].listVo[0].checkZs;
-            _this.laboratoryId=data[0].id;
-          }
+
         }
       })
 
@@ -1392,6 +1401,7 @@ export default {
     _this.infoFun();
     _this.workPlanFun();
     _this.safetyInspectFun();
+    _this.safetyInspectTitle();
     _this.initSwiper();
     _this.subscriptionMQTT();
     _this.timer = setInterval(() => {

+ 6 - 6
src/views/inspectDetail.vue

@@ -31,9 +31,9 @@
       <!--列表-->
       <el-table :data="tableData"  style="width: 100%" height="250" :row-class-name="tableRowClassName">
         <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="laboratoryName" label="实验室"></el-table-column>
+        <el-table-column align="center" header-align='center' prop="subjectName" label="实验室"></el-table-column>
         <el-table-column align="center" header-align='center' prop="typeName" label="安全分类"></el-table-column>
-        <el-table-column align="center" header-align='center' prop="typeLevel" label="安全分级"></el-table-column>
+        <el-table-column align="center" header-align='center' prop="levelName" label="安全分级"></el-table-column>
         <el-table-column align="center" header-align='center' prop="yhMs" label="隐患名称"></el-table-column>
         <el-table-column align="center" header-align='center' prop="remark" label="检查批次"></el-table-column>
       </el-table>
@@ -150,8 +150,8 @@ export default {
 
       //遗留问题
       let obj={
-        'laboratoryId':this.editForm.subId,
-        'id':this.codeData,
+        'subId':this.editForm.subId,
+        'planId':this.codeData,
         'pageNum':this.editForm.pageNum,
         'pageSize':this.editForm.pageSize,
       }
@@ -173,8 +173,8 @@ export default {
       let _this=this;
       //已整改的
       let obj={
-        'laboratoryId':this.editForm2.subId,
-        'id':this.codeData,
+        'subId':this.editForm2.subId,
+        'planId':this.codeData,
         'pageNum':this.editForm2.pageNum,
         'pageSize':this.editForm2.pageSize,
       }