dedsudiyu hace 1 mes
padre
commit
f348554d12

+ 2 - 2
api/request/config.js

@@ -2,13 +2,13 @@ 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.8/api',//1.8服务器
 	// 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',//小飞
 	// base_url: 'http://192.168.1.43/api',//小飞
-	// base_url: 'http://192.168.1.20:8080',//志伟
+	base_url: 'http://192.168.1.20:8080',//志伟
 	// base_url: 'http://192.168.1.39:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',

+ 8 - 0
pages_safetyCheck/api/index.js

@@ -654,4 +654,12 @@ export const securityAppCheckPlanScanCode = (data) => {
         method: 'POST',
         data: {...data}
     })
+};
+//安全检查-查询可用楼栋楼层级联数据
+export const securityAppCheckDangerBuildAndFloorList = (data) => {
+    return apiResquest({
+        url: '/security/appCheckDanger/buildAndFloorList',
+        method: 'POST',
+        data: {...data}
+    })
 };

+ 22 - 8
pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -55,7 +55,8 @@
 							<img :src="imagesUrl('commonality/icon_aqjc_ss.png')" @click="searchBtn">
 							<input type="text" v-model="searchValue" placeholder="实验室名称或房间号" name="search"
 								@confirm='searchBtn' confirm-type='search' maxlength="50"
-								placeholder-style="color: #333333;font-size:24rpx;">
+								style="color:#333"
+								placeholder-style="color: #999;font-size:24rpx;">
 							<!-- <view v-if="searchValue" class="left-icons" @click="delSearchValue()">
 								<uni-icons color="#0183FA" type="clear" size="20"></uni-icons>
 							</view> -->
@@ -126,6 +127,7 @@
 		securityAppCheckDangerGetCheckDangerSubList,
 		securityAppCheckDangerReviewSubList,
 		securityAppCheckSetOptionList,
+		securityAppCheckDangerBuildAndFloorList,
 	} from '@/pages_safetyCheck/api/index.js'
 	import {
 		scanCodeCheck
@@ -178,7 +180,7 @@
 				//楼栋楼层绑定数据
 				classes:[],
 				//楼栋楼层ID
-				buildingId:'',
+				buildId:'',
 				floorId:'',
 			}
 		},
@@ -201,6 +203,7 @@
 		mounted() {
 			let self = this;
 			setTimeout(() => {
+				self.securityAppCheckDangerBuildAndFloorList();
 				self.getList();
 			}, 100);
 		},
@@ -211,11 +214,11 @@
 				let self = this;
 				if(!e.detail.value[0]){
 					//清除
-					this.$set(this,'buildingId','');
+					this.$set(this,'buildId','');
 					this.$set(this,'floorId','');
 				}else{
 					//选中
-					this.$set(this,'buildingId',e.detail.value[0].value);
+					this.$set(this,'buildId',e.detail.value[0].value);
 					this.$set(this,'floorId',e.detail.value[1].value);
 				}
 				this.$set(this.queryParams, 'page', 1);
@@ -278,7 +281,7 @@
 				this.$set(this, 'dataList', []);
 				this.$set(this, 'total', 0);
 				this.$set(this, 'classes', []);
-				this.$set(this, 'buildingId', '');
+				this.$set(this, 'buildId', '');
 				this.$set(this, 'floorId', '');
 				this.$set(this, 'tabIndexTow', index);
 				this.$nextTick(() => {
@@ -300,7 +303,7 @@
 				this.$set(this, 'dataList', []);
 				this.$set(this, 'total', 0);
 				this.$set(this, 'classes', []);
-				this.$set(this, 'buildingId', '');
+				this.$set(this, 'buildId', '');
 				this.$set(this, 'floorId', '');
 				this.$nextTick(() => {
 					this.getList();
@@ -362,7 +365,18 @@
 					}
 				}
 			},
-
+			async securityAppCheckDangerBuildAndFloorList(){
+				let obj = {
+					planId:this.optionData.planId,
+					planSetId:this.planSetId,
+				}
+				const {
+					data
+				} = await securityAppCheckDangerBuildAndFloorList(obj);
+				if(data.code == 200){
+					this.$set(this,'dataListTow',data.data);
+				}
+			},
 			//查询检查项
 			async securityAppCheckSetOptionList(item) {
 				let self = this;
@@ -675,7 +689,7 @@
 				} else if (this.tabIndexTow == 1) {
 					//复查计划
 					obj.planId = this.optionData.planId;
-					obj.buildingId = this.buildingId;
+					obj.buildId = this.buildId;
 					obj.floorId = this.floorId;
 					const {
 						data