11

api/request/config.js

@@ -1,7 +1,7 @@
 const config = {
 	// base_url: 'http://192.168.1.43/api', //43服务器
 	//base_url: 'http://192.168.1.8/api',//1.8服务器
-	 base_url: 'http://192.168.1.9:8080',//柴
+	// base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	//base_url: 'http://192.168.1.17:8080',//小飞
@@ -11,7 +11,7 @@ const config = {
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
-	// base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
+	 base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
 	// base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
 	// base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	// base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址

pages_manage/api/index.js

@@ -222,9 +222,9 @@ export function systemSubjectGetAppSubject(data) {
 	})
 }
 //授权开门-查询被授权人
-export function systemUserGetUserInfo(data) {
+export function laboratoryApplyGetUserInfo(data) {
 	return apiResquest({
-		url: '/system/user/getUserInfo',
+		url: '/laboratory/apply/getUserInfo',
 		method: 'post',
 		data: {
 			...data

pages_manage/views/accessControl/empowerOpen.vue

@@ -8,7 +8,7 @@
 					<view class="header-r" v-if="getData.searchValue" @click="clearSearch()" >
 						<img src="@/pages/images/clear.png" />
 					</view>
-					
+
 				</view>
 			</view>
 			<view class="list">
@@ -69,7 +69,7 @@
 	} from '@/api/request/config.js'
 	import {
 		systemSubjectGetAppSubject,
-		systemUserGetUserInfo,
+    laboratoryApplyGetUserInfo,
 		laboratoryApplyAddAddApply
 	} from '@/pages_manage/api/index.js'
 	export default {
@@ -145,7 +145,7 @@
 				self.dataListTow = []
 				const {
 					data
-				} = await systemUserGetUserInfo(this.getDataTow)
+				} = await laboratoryApplyGetUserInfo(this.getDataTow)
 				if (data.code == 200) {
 					data.data.forEach(function(item) {
 						self.dataListTow.push({
@@ -255,7 +255,7 @@
 				padding: 20rpx 30rpx;
 				box-sizing: border-box;
 				border-bottom: 1rpx solid #D8D8D8;
-				
+
 				.header-n{
 					position: relative;
 					width: 690rpx;
@@ -282,7 +282,7 @@
 						}
 					}
 				}
-				
+
 			}
 
 			.list {
@@ -367,7 +367,7 @@
 							color: #333333;
 							line-height: 80rpx;
 							text-align: center;
-						
+
 						}
 
 						.time-c {
@@ -493,7 +493,7 @@
 		line-height: 74rpx !important;
 		font-size: 28rpx !important;
 	}
-	
+
 	.uni-date__icon-clear{
 		height: 74rpx !important;
 		font-size: 28rpx !important;

pages_manage/views/laboratory/infoPage.vue

@@ -4,7 +4,7 @@
 		<view class="title">
 			<view class="title-t">
 				<view :style="'border:1rpx solid '+newData.levelColor+';color:'+newData.levelColor+';'">
-					{{newData.levelName}}
+					{{newData.levelName?newData.levelName:''}}
 				</view>
 				<view>{{newData.subName}}</view>
 			</view>
@@ -17,7 +17,7 @@
 			</view>
 			<view class="title-b">
 				<img src="@/pages_manage/images/icon_14.png">
-				<view>{{newData.buildName}}{{newData.floorName}}{{newData.subName}}{{ newData.roomNum}}</view>
+				<view>{{newData.buildName}}{{newData.floorName}}{{newData.subName}}{{ newData.roomNum?newData.roomNum:''}}</view>
 			</view>
 		</view>
 		<view class="tab-btn">

pages_safetyExamine/api/index.js

@@ -40,6 +40,14 @@ export const laboratorySubRelInfoGetRelList = (data) => {
 		data: { ...data }
 	})
 };
+//根据学院id查询实验室列表-带权限
+export const laboratorySubRelInfoGetRelListByCondition = (data) => {
+	return apiResquest({
+		url: `/laboratory/subRelInfo/getRelListByCondition`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
 //字典
 export const getDicts = (dictType) => {
 	return apiResquest({

pages_safetyExamine/views/examineManage/examineAddTow.vue

@@ -265,12 +265,25 @@
 			this.currentDate = this.getNowFormatDate()
 			if (option.form) {
 				this.form = JSON.parse(decodeURIComponent(option.form));
+				if(this.form.checkHazardDtoList.length==0){
+					this.form.checkHazardDtoList=[
+						{
+							voiceRemark: [], //语音备忘存储
+							hazardLevel: 2, //隐患等级
+							hazardCheckCode: '', //检查项目code序号
+							hazardCheckName: '', //检查项目名称
+							hazardCheckPro: '', //最后一级的id
+							hazardCheckPoint: '', // 检查要点
+							hazardDescribe: '', //隐患描述
+							uploadDtoList: [], //隐患照片
+						}
+					]
+				}
 			}
 			if (option.joinHazardIds) {
 				this.getHazardInfoByJoinIds(this.form.subIds, option.joinHazardIds)
 				this.form.joinHazardIds = option.joinHazardIds
 			}
-			console.log(this.form.isCustom)
 		},
 		onShow() {
 			this.getCheckOptionList();

pages_safetyExamine/views/patrolPlan/patrolPlanAddLab.vue

@@ -22,7 +22,7 @@
 
 				<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.subName}}-{{item.roomNum}}</text>
+						<text :class="item.type?'color_B':'color_A'">{{item.subName}}-{{item.roomNum?item.roomNum:''}}</text>
 						<img v-if="item.type" src="@/pages_safetyExamine/images/icon_xzwt_xz.png">
 					</view>
 				</view>
@@ -39,7 +39,8 @@
 	} from '@/api/request/config.js'
 	import {
 		systemDeptDropList,
-		laboratorySubRelInfoGetRelList
+		laboratorySubRelInfoGetRelList,
+		laboratorySubRelInfoGetRelListByCondition
 	} from '@/pages_safetyExamine/api/index.js'
 	export default {
 		name: "rectifyList",
@@ -187,13 +188,13 @@
 				let _this = this;
 				const {
 					data
-				} = await laboratorySubRelInfoGetRelList(_this.getData);
+				} = await laboratorySubRelInfoGetRelListByCondition(_this.getData);
 				if (data.code == 200) {
-					data.data.forEach(function(item) {
+					data.data.records.forEach(function(item) {
 						item.type = false;
 					})
-					this.dataList = [...this.dataList, ...data.data]
-					_this.total = data.total;
+					this.dataList = [...this.dataList, ...data.data.records]
+					_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.subId === this.dataList[i].subId) != -
@@ -218,7 +219,7 @@
 		.info-max-box {
 			flex: 1;
 			overflow: scroll;
-			padding: 120rpx 0rpx 30rpx;
+			padding: 120rpx 0rpx 120rpx;
 			box-sizing: border-box;
 		}
 

pages_safetyExamine/views/safetyExamineWorkbench.vue

@@ -376,6 +376,7 @@
 
 		},
 		mounted() {
+	
 			if (uni.getStorageSync('gentleIdentifier')[0]) {
 				this.pageType = uni.getStorageSync('gentleIdentifier')[0].pageType
 			}
@@ -385,13 +386,9 @@
 			this.collegeGentle = uni.getStorageSync('gentleIdentifierData').collegeGentle
 			//获取当前日期
 			this.currentDate = this.getNowFormatDate()
-
-			//this.getCheckStatusCount();
-			//this.getManageStatusCount();
+			
 			this.dataStatistics(this.pageType);
 			this.checkClapListAllNum(); //随手拍待整改总数
-
-
 			if (this.pageType == 1) { //管理员
 				this.getList();
 				this.checkPlanListAllNum(); //管理员-未开始
@@ -455,6 +452,14 @@
 				this.curTabIdentity = index;
 				this.pageType = item.pageType;
 				this.dataStatistics(this.pageType);
+				//每次切换数据清空
+				this.dataList=[];
+				this.dataList2=[];
+				this.dataList3=[];
+				this.curTab=0;
+				this.curTabTow=0;
+				this.curTabThree=0;
+				
 				if (this.pageType == 1) { //管理员
 					this.getList();
 					this.checkPlanListAllNum(); //管理员-未开始
@@ -907,7 +912,6 @@
 						hazardType: '',
 						rectifyStatus: '3',
 					};
-					this.dataList2=[];
 				} else if (this.pageType == 3) { //整改者
 					obj = {
 						page: this.getData3.page,