heyang

api/index.js

@@ -126,7 +126,41 @@ export const checkClapById  = (data) => {
         data: data,
     })
 };
+//随手拍--整改
+export const checkClapRectify  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/clapApprove`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//根据名称查询实验室
+export const subjectList = (data) => {
+    return apiResquestForm({
+        url: '/laboratory/subject/list/listAdmin',
+        method: 'GET',
+        data: data
+    })
+};
 
+//开展检查-------------------------------------------	
+
+//开展检查--新增
+export const checkOptionAdd  = (data) => {
+    return apiResquest({
+        url: `/security/checkOption/add`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//开展检查-根据实验室id查询该实验室有关计划
+export const getCheckPlanBySubId = (data) => {
+    return apiResquestForm({
+        url: '/zd-security/checkManage/getCheckPlanBySubId',
+        method: 'GET',
+        data: data
+    })
+};
 
 
 
@@ -1466,7 +1500,6 @@ export const RecordDettailsListNew = (data) => {
 export const getSelectInfoByRoom = (data) => {
     return apiResquestForm({
         url: '/laboratory/checkRecord/selectInfoByRoom?room='+data,
-        method: 'GET',
     })
 };
 
@@ -1673,14 +1706,7 @@ export const teacherApply = (data) => {
     })
 };
 
-//根据名称查询实验室
-export const subjectList = (data) => {
-    return apiResquestForm({
-        url: '/laboratory/subject/list/listAdmin',
-        method: 'GET',
-        data: data
-    })
-};
+
 
 //安全准入提交接口
 export const materialAdd  = (data) => {

api/request/config.js

@@ -1,8 +1,8 @@
 const config = {
-	base_url: 'http://192.168.1.9:8080',//柴
+	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	 //base_url: 'http://192.168.1.17:8080',//小飞
-	 //base_url: 'http://192.168.1.20:8080',//志伟
+	 base_url: 'http://192.168.1.20:8080',//志伟
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
     // base_url: 'http://192.168.1.43:9800',//43服务器

pages/pages_safetyExamine/examineManage/examineAdd.vue

@@ -4,15 +4,6 @@
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<view class="basics">
 			<view class="basics_li">
-				<view class="basics_li_l">学院</view>
-				<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="scope_r">
-					<view class="basics_li_r college_r">
-						<view>{{collegeArray[collegeIndex]}}</view>
-						<img src="@/images/Version3.3.3/icon_06.png">
-					</view>
-				</picker>
-			</view>
-			<view class="basics_li">
 				<view class="basics_li_l">实验室</view>
 				<view class="basics_li_r lab_r">
 					<input class="picker-text" @click="popupClick(1)" type="text" disabled v-model="form.fjNumber" placeholder="请选择房间" placeholder-style="font-size: 30rpx;color:#333;">
@@ -22,6 +13,15 @@
 				</view>
 			</view>
 			<view class="basics_li">
+				<view class="basics_li_l">学院</view>
+				<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="scope_r">
+					<view class="basics_li_r college_r">
+						<view>{{form.deptName?form.deptName:'选择学院'}}</view>
+						<img src="@/images/Version3.3.3/icon_06.png">
+					</view>
+				</picker>
+			</view>
+			<view class="basics_li">
 				<view class="basics_li_l">楼栋</view>
 				<view class="basics_li_r building_r">
 					<input class="picker-text"  type="text" disabled v-model="form.fjNumber" placeholder="选择实验室后自动匹配" placeholder-style="font-size: 30rpx;color:#333;">
@@ -109,7 +109,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { getSelectInfoByRoom} from '@/api/index.js'
+import { getSelectInfoByRoom,conditionCollegeInfo,subjectList,getCheckPlanBySubId} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -129,11 +129,12 @@ export default {
 			inspectResult:0,//检查结果
 		},
 		collegeIndex :0,
-		collegeArray:['选择学院','学院名称1','学院名称2','学院名称3',],
+		collegeArray:[],
 		categoryIndex :0,
 		categoryArray:['校级巡查','院级巡查'],
 		planIndex :0,
-		planArray:['请选择巡查计划标题','2023年3月份校级督导检查','2023年4月份校级督导检查'],
+		planArray:[],
+		planList:[],
 		resultIndex :0,
 		resultArray:['不符合','符合'],
 		informIndex:0,
@@ -155,7 +156,7 @@ export default {
 	  
   },
   mounted(){
-	  
+	   this.conditionCollegeInfo();
   },
   methods: {
 		//滚动事件
@@ -171,8 +172,35 @@ export default {
 		  }
 		  
 	    },
+		//查询学院列表
+		async conditionCollegeInfo(){
+			let _this = this;
+			const {data} = await conditionCollegeInfo();
+			if(data.code == 200){
+					
+				for(let i=0;i<data.data.length;i++){
+					_this.collegeArray.push(data.data[i].deptName)
+				}
+				_this.collegeList=data.data;
+			}
+		},
+		//根据实验室id查询该实验室有关计划
+		async getCheckPlanBySubId(subId){
+			let _this = this;
+			const {data} = await getCheckPlanBySubId({'subId':subId});
+			if(data.code == 200){
+				for(let i=0;i<data.data.length;i++){
+					_this.planArray.push(data.data[i].title)
+				}
+				_this.planList=data.data;	
+			}
+		},
+		
+		
 		collegeChange(e){
 			this.collegeIndex = e.target.value;
+			 this.form.deptId=this.collegeList[e.target.value].deptId
+			 this.form.deptName=this.collegeList[e.target.value].deptName
 		},
 		categoryChange(e){
 			this.categoryIndex = e.target.value;
@@ -242,6 +270,8 @@ export default {
 			this.$set(this.form,"fzrName",item.safeUserName)
 			this.$set(this.form,"fzrLxfs",item.safeUserPhone)
 			this.popupType = false;
+			
+			this.getCheckPlanBySubId(item.id)
 		},
 		//调用摄像头
 		saoCode(){

pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab.vue

@@ -181,7 +181,7 @@ export default {
 				  item.type=false;
 			  })
 			  this.dataList=[...this.dataList,...data.rows]
-			  this.total=data.total;
+			  this.total=data.data.total;
 			  if(this.seleteListLab.length>0){//如果有选中的数据
 			  		for(let i=0;i<this.dataList.length;i++){
 			  			if(this.seleteListLab.findIndex((item)=>item.id===this.dataList[i].id) !=-1){//不等于-1说明数组里有当前元素,可以改为选中

pages/pages_safetyExamine/patrolPlan/patrolPlanAddMember.vue

@@ -153,7 +153,7 @@ export default {
 						}
 					}
 			  }
-			  this.total=data.total;
+			  this.total=data.data.total;
 		  }
       }
   }

pages/pages_safetyExamine/patrolPlan/patrolPlanEdit.vue

@@ -560,7 +560,7 @@ export default {
 		    let self = this;
 		    const {data} = await findByCheckPlanId(this.getData);
 		    if(data.code==200){
-					this.total=data.total;
+					this.total=data.data.total;
 					this.dataList=[...this.dataList,...data.data.records]
 			}
 		},
@@ -1237,7 +1237,7 @@ export default {
 					}
 				}
 				.list_three_li_t_c{
-					width: 630rpx;
+					width: 570rpx;
 					height: 110rpx;
 					position: absolute;
 					left: 30rpx;

pages/pages_safetyExamine/snapshotManage/snapshotAdd.vue

@@ -66,7 +66,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { getSelectInfoByRoom,conditionCollegeInfo,checkClapAdd } from '@/api/index.js'
+import { getSelectInfoByRoom,conditionCollegeInfo,checkClapAdd,subjectList} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -305,9 +305,9 @@ export default {
 			        mask:true,
 			        duration: 2000
 			    });
-				// uni.redirectTo({
-				// 	url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanList?pageType='+this.form.checkType
-				// });
+				uni.redirectTo({
+					  url: '/pages/pages_safetyExamine/snapshotManage/snapshotList?pageType=2'
+				});
 			   
 			}
 		},

pages/pages_safetyExamine/snapshotManage/snapshotDetail.vue

@@ -31,7 +31,7 @@
 			</view>
 		</view>
 		<!-- 待整改 -->
-		<view v-if="rectifyStatus==0">
+		<view v-if="rectifyStatus==0 && item.rectifyGentle">
 			<view class="await">
 				<view class="result">
 					<view class="result_l">整改结果</view>
@@ -43,17 +43,17 @@
 					</view>
 				</view>
 				<view class="describe">
-					<view class="describe_l">原因描述：</view>
-					<textarea class="describe_r" type="text" v-model="form.yhMs" maxlength="50" placeholder="请输入原因描述" placeholder-style="font-size:28rpx;color:#999;"></textarea>
+					<view class="describe_l">{{describeTitle}}：</view>
+					<textarea class="describe_r" type="text" v-model="form.rectifyDescribe" maxlength="50" placeholder="请输入描述内容" placeholder-style="font-size:28rpx;color:#999;"></textarea>
 				</view>
 				<view class="check-for-img-max-box">
 					<view class="left-title-p">隐患照片（最多上传5张）：</view>
 					<view class="right-img-box">
-						<view class="img-box" v-for="(imgUrl,imgIndex) in form.yhImg" :key="imgIndex">
+						<view class="img-box" v-for="(imgUrl,imgIndex) in form.imgDtoList" :key="imgIndex">
 							<img class="img-data" :src="configURL+imgUrl">
 							<img class="position-img" src="@/pages_manage/images/icon_ssp_closure.png" @click="delImg(imgIndex)">
 						</view>
-						<img class="add-button" src="@/pages_manage/images/icon_07.png" @click="selectImage()" v-if="form.yhImg.length<5">
+						<img class="add-button" src="@/pages_manage/images/icon_07.png" @click="selectImage()" v-if="form.imgDtoList.length<5">
 					</view>
 				</view>
 			</view>
@@ -63,39 +63,36 @@
 			<view class="small_title">隐患整改</view>
 			<view class="grade">
 				<text>整改结果：</text>
-				<text style="color: #0183FA;">已整改</text>
+				<text style="color: #0183FA;">{{item.rectifyStatus==1?'已整改':'暂无法整改'}}</text>
 			</view>
 			<view class="project">
 				<view class="project_t">整改措施：</view>
-				<view class="project_b">隐患描述隐患描述隐患描述隐患描述隐患描述描述隐患描述隐患描述隐患描述隐患描述隐患描述隐患描述</view>
+				<view class="project_b">{{item.rectifyDescribe}}</view>
 			</view>
 			<view class="picture">
 				<view class="picture_t">上传照片：</view>
 				<view class="picture_b">
-					<img  src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
-					<img  src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
-					<img  src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
-					<img  src="@/images/Version3.3.3/icon_xyxc_syszc.png"/>
+					<img  :src="item.fileUrl" v-for="(item,index) in item.zgDtoList"/>
 				</view>
 			</view>
 			<view class="grade">
 				<text>整改时间：</text>
-				<text>2023-04-0614:00</text>
+				<text>{{item.rectifyTime}}</text>
 			</view>
 			<view class="grade" style="border:none;">
 				<text>整改人：</text>
-				<text >李腾</text>
+				<text >{{item.rectifyPeople}}</text>
 			</view>
 		</view>
 	</scroll-view>
-	<view v-if="pageType==0" class="bottom_btn" @click="handleClick('subBtn')">提交</view>
+	<view v-if="rectifyStatus==0 && item.rectifyGentle" class="bottom_btn" @click="submitForm()">提交</view>
   </view>
 
 </template>
 
 <script>
 import { config } from '@/api/request/config.js'
-import { getSelectInfoByRoom,checkClapById} from '@/api/index.js'
+import { getSelectInfoByRoom,checkClapById,checkClapRectify} from '@/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -108,11 +105,13 @@ export default {
 		rectifyStatus:'',//整改状态，0是待整改，1是已整改，2是暂无法整改
 		pageType:2,
 		form:{
-			yhMs:'',
-			yhImg:[],
-			opinion:'',
+			id:'',
+			rectifyStatus:1,//0待整改 1已整改 2暂无法整改
+			rectifyDescribe:'',
+			imgDtoList:[],
 		},
 		item:{},
+		describeTitle:'整改措施',
 		resultIndex:0,
 		resultArray:['已整改','暂无法整改'],
 	}
@@ -151,6 +150,13 @@ export default {
 		//整改结果
 		tabClick(index) {
 			this.resultIndex = index;
+			if(index==0){
+				this.describeTitle='整改措施';
+				this.form.rectifyStatus=1;
+			}else if(index==1){
+				this.describeTitle='原因描述';
+				this.form.rectifyStatus=2;
+			}
 		},
 		//滚动事件
 		scrollGet(){},
@@ -165,7 +171,7 @@ export default {
 		// 图片上传
 		selectImage() {
 		    let self = this;
-		    if(this.form.yhImg.length>4){
+		    if(this.form.imgDtoList.length>4){
 		        uni.showToast({
 		            title: '最多上传5张图片',
 		            icon:"none",
@@ -201,7 +207,7 @@ export default {
 		        success: (uploadFileRes) => {
 		            let res = JSON.parse(uploadFileRes.data);
 					if(res.code == 200){
-						this.form.yhImg.push(res.data.url);
+						this.form.imgDtoList.push({'fileUrl':res.data.url,'fileName':res.data.name});
 						console.log(res.data.url)
 					}else{
 						uni.showToast({
@@ -220,7 +226,7 @@ export default {
 		},
 		//删除图片
 		delImg(minIndex){
-		    this.form.yhImg.splice(minIndex,1);
+		     this.form.imgDtoList.splice(minIndex,1);
 			this.$forceUpdate();
 		},
 		//随手拍详情
@@ -229,9 +235,29 @@ export default {
 			const {data} = await checkClapById({id:this.id});
 			if(data.code == 200){
 					_this.item=data.data;
+					_this.form.id=data.data.id;
 			
 			}
 		},
+		//提交
+		async submitForm(){
+			let _this = this;
+			const {data} = await checkClapRectify(_this.form);
+			if(data.code == 200){
+			    uni.showToast({
+			        title: '提交成功',
+			        icon:"none",
+			        mask:true,
+			        duration: 2000
+			    }); 
+				uni.redirectTo({
+					url: '/pages/pages_safetyExamine/snapshotManage/snapshotList?pageType=2'
+				});
+			   
+			}
+		},
+		
+		
 	  
   }
 }

pages/pages_safetyExamine/snapshotManage/snapshotList.vue

@@ -142,13 +142,13 @@ export default {
 			if(this.pageType==1){//随手拍管理
 				const {data} = await checkClapList(this.getData);
 				if(data.code==200){
-					  this.total=data.total;
+					  this.total=data.data.total;
 					  this.dataList=[...this.dataList,...data.data.records]
 				}
 			}else if(this.pageType==2){//随手拍记录
 				const {data} = await checkClapMylist(this.getData);
 				if(data.code==200){
-					  this.total=data.total;
+					  this.total=data.data.total;
 					  this.dataList=[...this.dataList,...data.data.records]
 				}
 			}