|
@@ -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.subjectName}}</i>
|
|
|
+ <i class="over">{{item.laboratoryName}}</i>
|
|
|
<i>{{item.typeName}}</i>
|
|
|
- <i>{{item.levelName}}</i>
|
|
|
- <i>{{item.dangerNum}}</i>
|
|
|
- <i>{{item.amount}}</i>
|
|
|
+ <i>{{item.typeLevel}}</i>
|
|
|
+ <i>{{item.checkZs}}</i>
|
|
|
+ <i>{{item.checkYzg}}</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, safetyInspectTitle
|
|
|
+ requestUrl, getTypeCount, getFiedCount,
|
|
|
} from "../api/http"
|
|
|
import Swiper from 'swiper'
|
|
|
import $ from 'jquery'
|
|
@@ -402,7 +402,7 @@ export default {
|
|
|
},
|
|
|
//安全检查
|
|
|
openinspectUrl(){
|
|
|
- this.$router.push({path:'./inspectDetail',query:{key:this.planId}})
|
|
|
+ this.$router.push({path:'./inspectDetail',query:{key:this.laboratoryId}})
|
|
|
|
|
|
},
|
|
|
//安全检查批次
|
|
@@ -736,29 +736,20 @@ 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:7}).then((res) =>{
|
|
|
+ indexCollegeListCheck({pageNum:1,pageSize:10}).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;
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
|
|
@@ -1401,7 +1392,6 @@ export default {
|
|
|
_this.infoFun();
|
|
|
_this.workPlanFun();
|
|
|
_this.safetyInspectFun();
|
|
|
- _this.safetyInspectTitle();
|
|
|
_this.initSwiper();
|
|
|
_this.subscriptionMQTT();
|
|
|
_this.timer = setInterval(() => {
|