|
@@ -8,7 +8,7 @@
|
|
<view class="basics_li_r lab_r">
|
|
<view class="basics_li_r lab_r">
|
|
<input class="picker-text" @click="popupClick(1)" type="text" disabled v-model="form.subjectName" placeholder="请选择房间" placeholder-style="font-size: 30rpx;color:#333;">
|
|
<input class="picker-text" @click="popupClick(1)" type="text" disabled v-model="form.subjectName" placeholder="请选择房间" placeholder-style="font-size: 30rpx;color:#333;">
|
|
<view class="img-box" @click.stop="saoCode">
|
|
<view class="img-box" @click.stop="saoCode">
|
|
- <img src="@/images/Version3.3.3/icon_aqjc_sm.png">
|
|
|
|
|
|
+ <img src="@/pages_safetyExamine/images/icon_aqjc_sm.png">
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -17,7 +17,7 @@
|
|
<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="scope_r">
|
|
<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="scope_r">
|
|
<view class="basics_li_r college_r">
|
|
<view class="basics_li_r college_r">
|
|
<view>{{form.collegeName?form.collegeName:'选择学院'}}</view>
|
|
<view>{{form.collegeName?form.collegeName:'选择学院'}}</view>
|
|
- <img src="@/images/Version3.3.3/icon_06.png">
|
|
|
|
|
|
+ <img src="@/pages_safetyExamine/images/icon_06.png">
|
|
</view>
|
|
</view>
|
|
</picker>
|
|
</picker>
|
|
</view>
|
|
</view>
|
|
@@ -32,7 +32,7 @@
|
|
<picker @change="buildingChange" :value="collegeIndex" :range="buildingArray" class="scope_r">
|
|
<picker @change="buildingChange" :value="collegeIndex" :range="buildingArray" class="scope_r">
|
|
<view class="basics_li_r college_r">
|
|
<view class="basics_li_r college_r">
|
|
<view>{{form.buildName?form.buildName:'选择楼栋'}}</view>
|
|
<view>{{form.buildName?form.buildName:'选择楼栋'}}</view>
|
|
- <img src="@/images/Version3.3.3/icon_06.png">
|
|
|
|
|
|
+ <img src="@/pages_safetyExamine/images/icon_06.png">
|
|
</view>
|
|
</view>
|
|
</picker>
|
|
</picker>
|
|
</view>
|
|
</view>
|
|
@@ -42,7 +42,7 @@
|
|
<picker @change="planChange" :value="planIndex" :range="planArray" class="scope_r">
|
|
<picker @change="planChange" :value="planIndex" :range="planArray" class="scope_r">
|
|
<view class="basics_li_r college_r">
|
|
<view class="basics_li_r college_r">
|
|
<view>{{form.title?form.title:'选择计划标题'}}</view>
|
|
<view>{{form.title?form.title:'选择计划标题'}}</view>
|
|
- <img src="@/images/Version3.3.3/icon_06.png">
|
|
|
|
|
|
+ <img src="@/pages_safetyExamine/images/icon_06.png">
|
|
</view>
|
|
</view>
|
|
</picker>
|
|
</picker>
|
|
</view>
|
|
</view>
|
|
@@ -51,7 +51,7 @@
|
|
<picker @change="categoryChange" :value="categoryIndex" :disabled="isCustom" :range="categoryArray" class="scope_r">
|
|
<picker @change="categoryChange" :value="categoryIndex" :disabled="isCustom" :range="categoryArray" class="scope_r">
|
|
<view class="basics_li_r college_r">
|
|
<view class="basics_li_r college_r">
|
|
<view>{{form.checkType?(form.checkType==1?'校院巡查':'实验室自查'):'选择检查类型'}}</view>
|
|
<view>{{form.checkType?(form.checkType==1?'校院巡查':'实验室自查'):'选择检查类型'}}</view>
|
|
- <img src="@/images/Version3.3.3/icon_06.png">
|
|
|
|
|
|
+ <img src="@/pages_safetyExamine/images/icon_06.png">
|
|
</view>
|
|
</view>
|
|
</picker>
|
|
</picker>
|
|
</view>
|
|
</view>
|
|
@@ -75,7 +75,7 @@
|
|
<picker @change="resultChange" :value="resultIndex" :range="resultArray" class="scope_r">
|
|
<picker @change="resultChange" :value="resultIndex" :range="resultArray" class="scope_r">
|
|
<view class="inspect_li_r college_r">
|
|
<view class="inspect_li_r college_r">
|
|
<view>{{form.checkResult==1?'符合':'不符合'}}</view>
|
|
<view>{{form.checkResult==1?'符合':'不符合'}}</view>
|
|
- <img src="@/images/Version3.3.3/icon_06.png">
|
|
|
|
|
|
+ <img src="@/pages_safetyExamine/images/icon_06.png">
|
|
</view>
|
|
</view>
|
|
</picker>
|
|
</picker>
|
|
</view>
|
|
</view>
|
|
@@ -84,7 +84,7 @@
|
|
<picker mode="date" @change="rectifyDeadline(form,$event)">
|
|
<picker mode="date" @change="rectifyDeadline(form,$event)">
|
|
<view class="inspect_li_r date_r">
|
|
<view class="inspect_li_r date_r">
|
|
<input disabled class="picker-text" type="text" v-model="form.rectifyDeadline" placeholder="请选择日期" placeholder-style="font-size: 30rpx;color:#333;">
|
|
<input disabled class="picker-text" type="text" v-model="form.rectifyDeadline" placeholder="请选择日期" placeholder-style="font-size: 30rpx;color:#333;">
|
|
- <img src="@/images/Version3.3.3/icon_rl.png">
|
|
|
|
|
|
+ <img src="@/pages_safetyExamine/images/icon_rl.png">
|
|
</view>
|
|
</view>
|
|
</picker>
|
|
</picker>
|
|
</view>
|
|
</view>
|
|
@@ -171,7 +171,7 @@ export default {
|
|
checkHazardDtoList:[
|
|
checkHazardDtoList:[
|
|
{
|
|
{
|
|
voiceRemark:[],//语音备忘存储
|
|
voiceRemark:[],//语音备忘存储
|
|
- hazardLevel:'0',//隐患等级
|
|
|
|
|
|
+ hazardLevel:2,//隐患等级
|
|
hazardLevelName:'一般隐患',//隐患等级
|
|
hazardLevelName:'一般隐患',//隐患等级
|
|
hazardCheckCode:'', //检查项目code序号
|
|
hazardCheckCode:'', //检查项目code序号
|
|
hazardCheckName:'', //检查项目名称
|
|
hazardCheckName:'', //检查项目名称
|
|
@@ -204,7 +204,8 @@ export default {
|
|
isCustom:true,
|
|
isCustom:true,
|
|
buildingArray:[],
|
|
buildingArray:[],
|
|
buildingList:[],
|
|
buildingList:[],
|
|
-
|
|
|
|
|
|
+ //扫一扫进入
|
|
|
|
+ laboratoryList:[],
|
|
}
|
|
}
|
|
},
|
|
},
|
|
onLoad(option) {
|
|
onLoad(option) {
|
|
@@ -217,7 +218,9 @@ export default {
|
|
}
|
|
}
|
|
//通过实验室id查询计划
|
|
//通过实验室id查询计划
|
|
if(option.subId){
|
|
if(option.subId){
|
|
|
|
+ this.form.subId=option.subId
|
|
this.getCheckPlanBySubId(option.subId)
|
|
this.getCheckPlanBySubId(option.subId)
|
|
|
|
+ this.getByIdLaboratoryList();
|
|
}
|
|
}
|
|
|
|
|
|
},
|
|
},
|
|
@@ -226,6 +229,7 @@ export default {
|
|
},
|
|
},
|
|
mounted(){
|
|
mounted(){
|
|
this.listDepartments();
|
|
this.listDepartments();
|
|
|
|
+
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
//滚动事件
|
|
//滚动事件
|
|
@@ -234,7 +238,7 @@ export default {
|
|
let self=this;
|
|
let self=this;
|
|
if( doType=='nextStep'){//下一步
|
|
if( doType=='nextStep'){//下一步
|
|
uni.redirectTo({
|
|
uni.redirectTo({
|
|
- url: '/pages/pages_safetyExamine/examineManage/examineAddTow?form='+encodeURIComponent(JSON.stringify(this.form))
|
|
|
|
|
|
+ url: '/pages_safetyExamine/examineManage/examineAddTow?form='+encodeURIComponent(JSON.stringify(this.form))
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -268,7 +272,7 @@ export default {
|
|
},
|
|
},
|
|
//开始时间选中事件
|
|
//开始时间选中事件
|
|
startChange(form,e){
|
|
startChange(form,e){
|
|
- if(new Date(e.target.value).getTime()>=new Date(form.cycleEndTime).getTime()){
|
|
|
|
|
|
+ if(new Date(e.target.value).getTime()>new Date(form.cycleEndTime).getTime()){
|
|
uni.showToast({
|
|
uni.showToast({
|
|
title: '结束时间不能小于开始时间',
|
|
title: '结束时间不能小于开始时间',
|
|
icon:"none",
|
|
icon:"none",
|
|
@@ -310,11 +314,22 @@ export default {
|
|
this.form.buildId=data.data.buildId;
|
|
this.form.buildId=data.data.buildId;
|
|
this.form.buildName=data.data.buildName;
|
|
this.form.buildName=data.data.buildName;
|
|
this.form.checkType=data.data.checkType;
|
|
this.form.checkType=data.data.checkType;
|
|
|
|
+ this.form.roomNumber=data.data.roomNumber;
|
|
this.form.checkResult=data.data.checkResult==null?'1':data.data.checkResult;
|
|
this.form.checkResult=data.data.checkResult==null?'1':data.data.checkResult;
|
|
this.form.rectifyDeadline=data.data.rectifyDeadline;
|
|
this.form.rectifyDeadline=data.data.rectifyDeadline;
|
|
this.form.rectifyNotice=data.data.rectifyNotice==null?'1':data.data.rectifyNotice;
|
|
this.form.rectifyNotice=data.data.rectifyNotice==null?'1':data.data.rectifyNotice;
|
|
if(data.data.checkHazardDtoList.length>0){//隐患项
|
|
if(data.data.checkHazardDtoList.length>0){//隐患项
|
|
this.form.checkHazardDtoList=data.data.checkHazardDtoList;
|
|
this.form.checkHazardDtoList=data.data.checkHazardDtoList;
|
|
|
|
+ //语音备注
|
|
|
|
+ for(let i=0;i<this.form.checkHazardDtoList.length;i++){
|
|
|
|
+ if(this.form.checkHazardDtoList[i].voiceRemark){
|
|
|
|
+ this.form.checkHazardDtoList[i].voiceRemark=JSON.parse(this.form.checkHazardDtoList[i].voiceRemark)
|
|
|
|
+ }else{
|
|
|
|
+ this.form.checkHazardDtoList[i].voiceRemark=[];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ this.form.checkHazardDtoList[0].voiceRemark=[];
|
|
}
|
|
}
|
|
this.form.id=data.data.id;
|
|
this.form.id=data.data.id;
|
|
//根据实验室id查询实验室计划
|
|
//根据实验室id查询实验室计划
|
|
@@ -323,6 +338,7 @@ export default {
|
|
this.form.cycleEndTime=data.data.cycleEndTime;
|
|
this.form.cycleEndTime=data.data.cycleEndTime;
|
|
this.getCheckPlanBySubId(data.data.subId)
|
|
this.getCheckPlanBySubId(data.data.subId)
|
|
}
|
|
}
|
|
|
|
+ console.log(this.form)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
//查询学院列表
|
|
//查询学院列表
|
|
@@ -442,6 +458,33 @@ export default {
|
|
this.popupType = false;
|
|
this.popupType = false;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ //扫一扫进入通过id查询实验室列表
|
|
|
|
+ async getByIdLaboratoryList(){
|
|
|
|
+ let self = this;
|
|
|
|
+ const {data} = await buildBySub({'name':this.room});
|
|
|
|
+ if(data.code==200){
|
|
|
|
+ if(data.data[0]){
|
|
|
|
+ this.laboratoryList = data.data;
|
|
|
|
+ data.data.forEach(function(item){
|
|
|
|
+ if(self.form.subId==item.id){
|
|
|
|
+ self.form.subjectName=item.name;
|
|
|
|
+ self.form.deptId=item.deptId;
|
|
|
|
+ self.form.buildId=item.buildId;
|
|
|
|
+ self.form.roomNumber=item.room;
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ //获取学院名称
|
|
|
|
+ for(let i=0;i<this.collegeList.length;i++){
|
|
|
|
+ if(this.collegeList[i].deptId==self.form.deptId){
|
|
|
|
+ this.$set(this.form,"collegeName",this.collegeList[i].deptName)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ //请求楼栋数据
|
|
|
|
+ this.getBuildingList(self.form.deptId)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ },
|
|
//搜索房间接口
|
|
//搜索房间接口
|
|
async buildBySub(){
|
|
async buildBySub(){
|
|
let self = this;
|
|
let self = this;
|
|
@@ -454,7 +497,7 @@ export default {
|
|
});
|
|
});
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- const {data} = await buildBySub(this.room);
|
|
|
|
|
|
+ const {data} = await buildBySub({'name':this.room});
|
|
if(data.code==200){
|
|
if(data.code==200){
|
|
if(data.data[0]){
|
|
if(data.data[0]){
|
|
this.roomList = data.data;
|
|
this.roomList = data.data;
|
|
@@ -535,7 +578,7 @@ export default {
|
|
duration: 2000
|
|
duration: 2000
|
|
});
|
|
});
|
|
uni.redirectTo({
|
|
uni.redirectTo({
|
|
- url: '/pages/pages_safetyExamine/examineManage/examineList'
|
|
|
|
|
|
+ url: '/pages_safetyExamine/examineManage/examineList'
|
|
});
|
|
});
|
|
}
|
|
}
|
|
},
|
|
},
|