heyang

api/index.js

@@ -84,7 +84,7 @@ export const getAllSubNum  = (data) => {
         data: data,
     })
 };
-//巡查计划--检查计划id查询巡查管理列表(分页)
+//巡查计划--添加
 export const findByCheckPlanId  = (data) => {
     return apiResquest({
         url: `/zd-security/checkManage/findByCheckPlanId`,

pages/pages_safetyExamine/patrolPlan/patrolPlanAddLab.vue

@@ -6,7 +6,7 @@
 			<view class="lab_title">
 				<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
 					<view class="lab_title_l_n">
-						<view>{{collegeArray[collegeIndex]}}</view>
+						<view>{{getData.deptName?getData.deptName:'选择学院'}}</view>
 						<img src="@/images/Version3.3.3/icon_06.png">
 					</view>
 				</picker>
@@ -47,6 +47,7 @@ export default {
         pageNum:1,
         pageSize:20,
 		deptId:'',//学院id
+		deptName:'',
 		searchValue:'',
 		selectedSubIds:[],
 		subIds:[],
@@ -91,6 +92,7 @@ export default {
 	  collegeChange(e){
 		  this.collegeIndex = e.target.value;
 		  this.getData.deptId=this.collegeList[e.target.value].deptId
+		  this.getData.deptName=this.collegeList[e.target.value].deptName
 		  this.dataList=[];
 		  this.getList();
 	  },
@@ -120,6 +122,7 @@ export default {
 		  this.getData.pageNum=1;
 		  this.collegeIndex=0;
 		  this.getData.deptId='';
+		  this.getData.deptName='';
 		  this.getData.searchValue='';
 		  this.dataList=[];
 		  this.getList();

pages/pages_safetyExamine/patrolPlan/patrolPlanEdit.vue

@@ -18,7 +18,7 @@
 		<view class="lab_title">
 			<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
 				<view class="lab_title_l_n">
-					<view>{{collegeArray[collegeIndex]}}</view>
+					<view>{{getData.deptName?getData.deptName:'选择学院'}}</view>
 					<img src="@/images/Version3.3.3/icon_06.png">
 				</view>
 			</picker>
@@ -27,6 +27,7 @@
 					<img src="@/images/Version3.3.3/icon_aqjc_ss.png"/>
 				</view>
 				<input type="text" v-model="getData.searchValue" placeholder="请输入实验室名称" maxlength="50" placeholder-style="color: #CCCCCC;font-size:26rpx;">
+				<view class="clear" @click="clearBtn">清除</view>
 			</view>
 		</view>
 	</view>
@@ -108,25 +109,29 @@
 				<view class="list_three_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'detail')">
 					<view class="list_three_li_t">
 						<view class="list_three_li_t_l">
-							<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+							<img v-if="item.checkRange==1" src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+							<img v-if="item.checkRange==2" src="@/images/Version3.3.3/icon_xyxc_xy.png"/>
+							<img v-if="item.checkRange==3" src="@/images/Version3.3.3/icon_xyxc_sys.png"/>
 							<text></text>
 						</view>
-						<view class="list_three_li_t_c">实验室名称-房间号</view>
-						<view class="list_three_li_t_c2">已逾期</view>
+						<view class="list_three_li_t_c">{{item.subjectName}}-{{item.roomNumber}}</view>
+						<view class="list_three_li_t_c2" v-if="item.isOverdue==1">已逾期</view>
 						<view class="list_three_li_t_r"></view>
 					</view>
 					<view class="list_three_li_m">
-						<view class="list_three_li_m_t">计划标题计划标题计划标题计划标题计划标题计划...</view>
+						<view class="list_three_li_m_t">{{item.title}}</view>
 						<view class="list_three_li_m_b">
-							<text class="blue_color">未开始</text>
-							<text>校院巡查</text>
-							<text>环境与测绘学院</text>
+							<text class="blue_color" v-if="item.manageStatus==1">未开始</text>
+							<text class="red_color" v-if="item.manageStatus==2">进行中</text>
+							<text class="green_color" v-if="item.manageStatus==3">已结束</text>
+							<text>{{item.checkType==1?'校院巡查':'实验室自查'}}</text>
+							<text>{{item.collegeName}}</text>
 						</view>
 					</view>
-					<view class="list_three_li_b">
+					<view class="list_three_li_b" >
 						<img src="@/images/Version3.3.3/icon_djcsys.png"/>
 						<text>整改进度：</text>
-						<text>待检查22/待复核1/已完成/暂无法整改</text>
+						<text>{{item.rectifySchedule}}</text>
 					</view>
 				</view>
 			</view>
@@ -168,7 +173,9 @@ export default {
 		 pageSize:20,
 		 checkPlanId:'',
 		 deptId:'',
+		 deptName:'',
 		 searchValue:'',
+		 manageStatus:'',
 		},
 		inspectState:0,//检查状态 0 未开始 1进行中
 		tabText:['检查计划','检查管理'],
@@ -179,7 +186,7 @@ export default {
 			id:'',
 			title:'',
 			checkType:'1',//1校院巡查 2实验室自查
-			checkTypeName:'校院巡查',//1校院巡查 2实验室自查
+			checkTypeName:'',//1校院巡查 2实验室自查
 			cycleStartTime:'',
 			cycleEndTime:'',
 			checkRange:0,//检查范围 1全校 2学院 3实验室
@@ -203,7 +210,7 @@ export default {
 		collegeList:[],
 		collegeIndex :0,
 		collegeArray:[],
-		dataList:[{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',},{name:'计划标题计划标题计划标题计划标题',}],
+		dataList:[],
 	}
   },
   onLoad(option) {
@@ -217,6 +224,7 @@ export default {
 	 if(option.id){
 		 
 		 this.id=option.id
+		 this.getData.checkPlanId=option.id
 		 this.checkPlanById()
 	 }
 	 if(option.pageType){
@@ -234,6 +242,7 @@ export default {
   },
   mounted(){
 	  this.conditionCollegeInfo();
+	  this.getList();
   },
   methods: {
 		//顶部tab点击
@@ -244,11 +253,24 @@ export default {
 		//顶部tab点击
 		tabClickTow(index) {
 			this.curTabTow = index;
+			if(index==0){
+				this.getData.manageStatus=''
+			}else if(index==1){//待检查
+				this.getData.manageStatus=0;
+			}else if(index==2){//检查中
+				this.getData.manageStatus=1;
+			}else if(index==3){//已检查
+				this.getData.manageStatus=2;
+			}
+			this.getData.pageNum=1;
+			this.dataList=[];
+			this.getList()
 		},
 		//选择学院
 		collegeChange(e){
 			this.collegeIndex = e.target.value;
 			this.getData.deptId=this.collegeList[e.target.value].deptId
+			this.getData.deptName=this.collegeList[e.target.value].deptName
 			this.dataList=[];
 			this.getList(); 
 		},
@@ -257,10 +279,20 @@ export default {
 			this.dataList=[];
 			this.getList();
 		},
+		//清除
+		clearBtn(){
+			  this.getData.pageNum=1;
+			  this.collegeIndex=0;
+			  this.getData.deptId='';
+			  this.getData.deptName='';
+			  this.getData.searchValue='';
+			  this.dataList=[];
+			  this.getList();
+		},
 		//滚动事件
 		scrollGet(){
 			let self=this;
-			if(self.total<=self.getData.pageNum){
+			if(self.total/self.getData.pageSize<=self.getData.pageNum){
 			    console.log('没有更多数据!')
 			}else{
 					setTimeout(function(){
@@ -530,7 +562,7 @@ export default {
 		    const {data} = await findByCheckPlanId(this.getData);
 		    if(data.code==200){
 					this.total=data.total;
-					this.dataList=[...this.dataList,...data.data]
+					this.dataList=[...this.dataList,...data.data.records]
 			}
 		},
 	  
@@ -1150,12 +1182,24 @@ export default {
 					}
 				}
 				>input{
-					width: 360rpx;
+					width: 274rpx;
 					height: 60rpx;
 					position: absolute;
 					top: 0rpx;
 					left: 60rpx;
 				}
+				.clear{
+					width: 60rpx;
+					height: 60rpx;
+					position: absolute;
+					top: 0rpx;
+					right:20rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #0183FA;
+					line-height: 60rpx;
+				}
 			}
 		}
 		
@@ -1254,6 +1298,8 @@ export default {
 				}
 				.list_three_li_m_b{
 					margin-top:26rpx;
+					display: flex;
+					justify-content: flex-start;
 					>text:nth-of-type(1){
 						font-size: 26rpx;
 						font-family: PingFang SC-Medium, PingFang SC;
@@ -1291,6 +1337,7 @@ export default {
 			}
 			.list_three_li_b{
 				height: 80rpx;
+				width: 100%;
 				position: absolute;
 				top: 278rpx;
 				left: 0;

pages/pages_safetyExamine/patrolPlan/patrolPlanList.vue

@@ -19,7 +19,9 @@
 				<view class="list_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'edit')">
 					<view class="list_li_t">
 						<view class="list_li_t_l">
-							<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+							<img v-if="item.checkRange==1" src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+							<img v-if="item.checkRange==2" src="@/images/Version3.3.3/icon_xyxc_xy.png"/>
+							<img v-if="item.checkRange==3" src="@/images/Version3.3.3/icon_xyxc_sys.png"/>
 							<text></text>
 						</view>
 						<view class="list_li_t_c">{{item.title}}</view>
@@ -37,8 +39,10 @@
 					</view>
 					<view class="list_li_b">
 						<img src="@/images/Version3.3.3/icon_djcsys.png"/>
-						<text>待检查实验室：</text>
-						<text>{{item.subjectNum}}间</text>
+						<text v-if="item.checkStatus==1">待检查实验室：</text>
+						<text v-if="item.checkStatus==1">{{item.subjectNum}}间</text>
+						<text v-if="item.checkStatus==2 || item.checkStatus==3">检查进度：</text>
+						<text v-if="item.checkStatus==2 || item.checkStatus==3">{{item.checkSchedule}}间</text>
 					</view>
 				</view>
 			</view>

pages/safetyExamineWorkbench.vue

@@ -41,7 +41,9 @@
 					<view class="list_li" v-for="(item,index) in  dataList" :key="index" @click="handleClick(item,'edit')">
 						<view class="list_li_t">
 							<view class="list_li_t_l">
-								<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+								<img v-if="item.checkRange==1" src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
+								<img v-if="item.checkRange==2" src="@/images/Version3.3.3/icon_xyxc_xy.png"/>
+								<img v-if="item.checkRange==3" src="@/images/Version3.3.3/icon_xyxc_sys.png"/>
 								<text></text>
 							</view>
 							<view class="list_li_t_c">{{item.title}}</view>
@@ -57,8 +59,10 @@
 						</view>
 						<view class="list_li_b">
 							<img src="@/images/Version3.3.3/icon_djcsys.png"/>
-							<text>待检查实验室：</text>
-							<text>{{item.subjectNum}}间</text>
+							<text v-if="item.checkStatus==1">待检查实验室：</text>
+							<text v-if="item.checkStatus==1">{{item.subjectNum}}间</text>
+							<text v-if="item.checkStatus==2">检查进度：</text>
+							<text v-if="item.checkStatus==2">{{item.checkSchedule}}间</text>
 						</view>
 					</view>
 				</view>
@@ -275,7 +279,7 @@ export default {
 			  });
 		  }else if(doType=='edit'){//编辑
 			  uni.navigateTo({
-			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanEdit'
+			      url: '/pages/pages_safetyExamine/patrolPlan/patrolPlanEdit?pageType='+row.checkType+'&id='+row.id
 			  });
 		  }else if(doType=='snapshot'){//随手拍
 			  uni.navigateTo({