heyang

api/request/config.js

@@ -9,7 +9,7 @@ const config = {
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
-	 base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
+	  base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
     //base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	 //base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
       // base_url: 'https://lab.zjznai.com/labSaasSystem/', //矿大化工

pages.json

@@ -1,21 +1,22 @@
 {
 	"pages": [
 		{
-			"path": "pages/safetyExamineWorkbench",//安全检查
+			"path": "pages/home",//首页
 			"style": {
-				"navigationBarTitleText": "安全检查",
+				"navigationBarTitleText": "实验室安全智能监测与控制系统",
 				"navigationBarTextStyle": "white", //导航文字颜色
 				"navigationBarBackgroundColor": "#0183FA" //导航背景色
 			}
 		},
 		{
-			"path": "pages/home",//首页
+			"path": "pages/safetyExamineWorkbench",//安全检查
 			"style": {
-				"navigationBarTitleText": "实验室安全智能监测与控制系统",
+				"navigationBarTitleText": "安全检查",
 				"navigationBarTextStyle": "white", //导航文字颜色
 				"navigationBarBackgroundColor": "#0183FA" //导航背景色
 			}
 		},
+		
 
 
 		{

pages/safetyExamineWorkbench.vue

@@ -300,14 +300,18 @@ export default {
 	  this.currentDate=this.getNowFormatDate()
 	  
 	  this.getCheckStatusCount();
-	  this.getManageStatusCount();
+	  //this.getManageStatusCount();
 	  this.dataStatistics();
 	  this.checkClapListAllNum();//随手拍待整改总数
 	  
+	  
 	  if(this.pageType==1){//管理员
 		   this.getList();
 	  }else if(this.pageType==2){//检查者
 		   this.getList2();
+		   this.checkManageListAllNum();//检查者-待检查总数
+		   this.checkManageListAllNum2();//检查者-待整改总数
+		   this.checkHazardAppListAllNum();//检查者-待复核-总数
 	  }else if(this.pageType==3){//整改者
 		  this.checkHazardAppList();
 	  }
@@ -705,6 +709,7 @@ export default {
 	  		self.dataList2=[...self.dataList2,...data.data.records]
 	  		self.total2=data.data.total;
 			
+			
 	  	}
 	  },
 	  //待复核列表
@@ -754,7 +759,7 @@ export default {
 	  		this.total3=data.data.total;
 	  	}
 	  },
-	  //随手拍待整改总数
+	  //整改者-随手拍待整改总数
 	  async checkClapListAllNum(){
 	  	let self = this;
 	  		let obj={
@@ -767,6 +772,50 @@ export default {
 	  		this.tabTextThree[1].num=data.data.total;
 	  	}
 	  },
+	  //检查者 总数---------------------------------
+	  //待检查
+	  async checkManageListAllNum(){
+	  	let self = this;
+	  		let obj={
+	  			pageNum:this.getData2.pageNum,
+	  			pageSize:this.getData2.pageSize,
+	  			manageStatus:0,
+				checkType:'',
+	  		};
+	  	const {data} = await checkManageList(obj);
+	  	if(data.code==200){
+	  		this.tabTextTow[0].num=data.data.total;
+	  	}
+	  },
+	  //待检查
+	  async checkManageListAllNum2(){
+	  	let self = this;
+		let obj={
+			pageNum:this.getData2.pageNum,
+			pageSize:this.getData2.pageSize,
+			manageStatus:0,
+			checkType:'',
+		};
+	  	const {data} = await checkManageList(obj);
+	  	if(data.code==200){
+	  		this.tabTextTow[1].num=data.data.total;
+	  	}
+	  },
+	  //待复核
+	  async checkHazardAppListAllNum(){
+	  	let self = this;
+		let obj={
+			pageNum:this.getData2.pageNum,
+			pageSize:this.getData2.pageSize,
+			rectifyStatus:3,
+			hazardType:'',
+		};
+	  	const {data} = await checkHazardAppList(obj);
+	  	if(data.code==200){
+	  		this.tabTextTow[2].num=data.data.total;
+	  	}
+	  },
+	  
 	  
   }
 }

pages_safetyExamine/examineManage/examineAdd.vue

@@ -49,6 +49,10 @@
 				   <input type="text" v-model="form.title" placeholder="输入计划标题">
 				</view>
 			</view>
+			<view class="basics_li" style="justify-content: flex-end;">
+				<view class="custom"  @click="customFun">{{isCustom?'自定义输入':'选择计划'}}</view>
+			</view>
+			
 			<view class="basics_li">
 				<view class="basics_li_l">检查类型</view>
 				<picker @change="categoryChange" :value="categoryIndex" disabled :range="categoryArray" class="scope_r">
@@ -70,7 +74,7 @@
 					</picker>
 				</view>
 			</view>
-			<view class="custom"  @click="customFun">{{isCustom?'自定义输入':'选择计划'}}</view>
+			
 		</view>
 		<view class="inspect">
 			<view class="inspect_li">
@@ -279,23 +283,23 @@ export default {
 	    },
 		customFun(){
 			let self=this;
-			if(!self.isCustom){
-				uni.showToast({
-					title: '该实验室暂无可选择计划!',
-					icon:"none",
-					mask:true,
-					duration: 2000
-				});
-				return
-			}
-			
 			self.isCustom=!self.isCustom
 			if(self.isCustom){//自定义
+				if(self.planArray.length<=0){
+					uni.showToast({
+						title: '该实验室暂无可选择计划!',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+					return
+				}
 				self.form.title='';
 				self.form.checkType='';
 				self.form.cycleStartTime='';
 				self.form.cycleEndTime='';
 				
+				
 			}else{//选择计划
 				
 				self.form.title='';
@@ -417,9 +421,10 @@ export default {
 					for(let i=0;i<data.data.length;i++){
 						if(data.data[i].isSelfData==1){
 							_this.planArray.push(data.data[i].title)
+							_this.planList.push(data.data[i]);
 						}
 					}
-					_this.planList=data.data;	
+						
 				}else{
 					_this.isCustom=false;
 					_this.form.checkType=2;

pages_safetyExamine/examineManage/examineAddTow.vue

@@ -21,8 +21,8 @@
 						ref="uniDataPicker" :addType="true" :addIndex="index">
 							<view  class="project_r">{{item.hazardCheckName?item.hazardCheckName:'请选择检查项'}}</view>
 						</uni-data-picker> -->
-						<uni-data-picker placeholder="请选择班级" popup-title="请选择所属目录" :localdata="checkOptionList" :map="{text:'name',value:'id'}" 
-										@change="(e)=>onchange(e,index)" @nodeclick="onnodeclick">
+						<uni-data-picker :ellipsis="false" ref="uniDataPicker" placeholder="请选择" popup-title="请选择所属目录" :localdata="checkOptionList" :map="{text:'name',value:'id'}" 
+									@change="(e)=>onchange(e,index)" @nodeclick="onnodeclick">
 							<view  class="project_r">{{item.hazardCheckName?item.hazardCheckName:'请选择检查项'}}</view>			
 						</uni-data-picker>
 						

pages_safetyExamine/examineManage/examineList.vue

@@ -87,7 +87,7 @@ export default {
 			pageNum:1,
 			pageSize:20,
 		    checkType:'',//检查类型(0全部1校院巡查2实验室自查)
-			manageStatus:'',//管理状态(-1全部 0待检查，1检查中，2已检查)
+			manageStatus:-1,//管理状态(-1全部 0待检查，1检查中，2已检查)
 			searchValue:'',
 		},
 		tabTextTow:['全部','待检查','检查中','已检查'],

pages_safetyExamine/patrolPlan/patrolPlanAddLab.vue

@@ -1,23 +1,24 @@
 <!-- 安全检查-发起巡查计划-选择实验室 -->
 <template>
   <view class="examine">
+	  <view class="lab_title">
+		<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
+			<view class="lab_title_l_n">
+				<view>{{getData.deptName?getData.deptName:'选择学院'}}</view>
+				<img src="@/pages_safetyExamine/images/icon_06.png">
+			</view>
+		</picker>
+		<view class="lab_title_r">
+			<view class="lab_title_r_btn" @click="searchBtn">
+				<img src="@/pages_safetyExamine/images/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>
 	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 		<view>
-			<view class="lab_title">
-				<picker @change="collegeChange" :value="collegeIndex" :range="collegeArray" class="lab_title_l">
-					<view class="lab_title_l_n">
-						<view>{{getData.deptName?getData.deptName:'选择学院'}}</view>
-						<img src="@/pages_safetyExamine/images/icon_06.png">
-					</view>
-				</picker>
-				<view class="lab_title_r">
-					<view class="lab_title_r_btn" @click="searchBtn">
-						<img src="@/pages_safetyExamine/images/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 class="list">
 				<view class="list_li" v-for="(item,index) in  dataList" :key="index" @click="labSelete(index)">
 					<text :class="item.type?'color_B':'color_A'">{{item.subjectName}}-{{item.roomNumber}}</text>

pages_safetyExamine/snapshotManage/snapshotAdd.vue

@@ -119,7 +119,7 @@ export default {
   },
   mounted(){
 	  this.listDepartments();
-	  this.getUserCollegCheck();
+	 // this.getUserCollegCheck();
   },
   methods: {
 		//滚动事件
@@ -215,6 +215,7 @@ export default {
 				this.room = "";
 				this.roomList = [];
 				this.popupType = true;
+				this.buildBySub();
 			}else if(type == 2){
 				this.popupType = false;
 			}
@@ -222,15 +223,6 @@ export default {
 		//搜索房间接口
 		async buildBySub(){
 			let self = this;
-			if(!this.room){
-				uni.showToast({
-					title: '请输入要搜索关键词',
-					icon:"none",
-					mask:true,
-					duration: 2000
-				});
-				return
-			}
 			const {data} = await buildBySub({'searchValue':this.room,'deptId':this.form.deptId});
 			if(data.code==200){
 				if(data.data[0]){
@@ -301,6 +293,7 @@ export default {
 			if(data.code == 200){
 				this.form.deptId=data.data.dept.deptId;
 				this.form.deptName=data.data.dept.deptName;
+				
 			}
 		},
 		//查询学院列表
@@ -313,6 +306,7 @@ export default {
 					_this.collegeArray.push(data.data[i].deptName)
 				}
 				_this.collegeList=data.data;
+				
 			}
 		},
 		//添加