zc

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/',

pages_basics/views/photoInspection.vue

@@ -73,6 +73,7 @@
 		onLoad(option) {
 			if(option.item){
 				let obj = JSON.parse(decodeURIComponent(option.item))
+				console.log('obj',obj)
 				this.$set(this,'isotope',true);
 				this.$set(this,'subList',[obj]);
 				this.$set(this,'subListIndex','0');

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -37,11 +37,17 @@
 						<view :class="manageStatus == 2 ?'level-r-B':'level-r-A'" @click="checkFlagChange(2)">已检查</view>
 					</view>
 				</view>
-				<view class="level">
+				<view class="level" v-if="tabIndexTow != 1">
 					<view class="level-li"
 						:style="levelId==item.levelId?'border:1rpx solid '+item.levelColor+';background:'+item.levelColorTow+';':'levelColor-B'"
 						@click="levelClick(item.levelId)" v-for="(item,index) in levelList">{{item.levelName}}</view>
 				</view>
+				<view class="uni-data-picker-box" v-if="tabIndexTow == 1">
+					<uni-data-picker 
+					placeholder="请选择楼栋/楼层" v-model="classes"
+					@change="bindPickerChange" :localdata="dataListTow" ref='picker'>
+					</uni-data-picker>
+				</view>
 				<!-- 搜索 -->
 				<view class="header">
 					<view class="search">
@@ -167,6 +173,13 @@
 				manageStatus: null,
 				securityCheck:false,
 				subjectData: {},
+				//楼栋楼层数据
+				dataListTow: [],
+				//楼栋楼层绑定数据
+				classes:[],
+				//楼栋楼层ID
+				buildingId:'',
+				floorId:'',
 			}
 		},
 		onLoad(option) {
@@ -192,6 +205,22 @@
 			}, 100);
 		},
 		methods: {
+			//楼栋楼层选择
+			bindPickerChange: function(e) {
+				console.log('e',e.detail.value)
+				let self = this;
+				if(!e.detail.value[0]){
+					//清除
+					this.$set(this,'buildingId','');
+					this.$set(this,'floorId','');
+				}else{
+					//选中
+					this.$set(this,'buildingId',e.detail.value[0].value);
+					this.$set(this,'floorId',e.detail.value[1].value);
+				}
+				this.$set(this.queryParams, 'page', 1);
+				this.getList();
+			},
 			//实验室搜索
 			searchBtn() {
 				this.$set(this.queryParams, 'page', 1);
@@ -248,6 +277,9 @@
 				this.$set(this, 'getDataType', false);
 				this.$set(this, 'dataList', []);
 				this.$set(this, 'total', 0);
+				this.$set(this, 'classes', []);
+				this.$set(this, 'buildingId', '');
+				this.$set(this, 'floorId', '');
 				this.$set(this, 'tabIndexTow', index);
 				this.$nextTick(() => {
 					this.getList();
@@ -267,6 +299,9 @@
 				this.$set(this, 'getDataType', false);
 				this.$set(this, 'dataList', []);
 				this.$set(this, 'total', 0);
+				this.$set(this, 'classes', []);
+				this.$set(this, 'buildingId', '');
+				this.$set(this, 'floorId', '');
 				this.$nextTick(() => {
 					this.getList();
 				})
@@ -640,6 +675,8 @@
 				} else if (this.tabIndexTow == 1) {
 					//复查计划
 					obj.planId = this.optionData.planId;
+					obj.buildingId = this.buildingId;
+					obj.floorId = this.floorId;
 					const {
 						data
 					} = await securityAppCheckDangerReviewSubList(obj);
@@ -1054,7 +1091,31 @@
 			}
 
 		}
-
+		.uni-data-picker-box{
+			background-color: #fff;
+			padding:10rpx 20rpx 0 30rpx;
+			/deep/.input-value-border{
+				border-radius:50rpx!important;
+				padding-right:12rpx!important;
+			}
+			/deep/.input-value{
+				font-size:24rpx!important;
+				line-height:60rpx!important;
+			}
+			/deep/.selected-area{
+				padding-left:18rpx!important;
+			}
+			/deep/.placeholder{
+				color:#999!important;
+			}
+			/deep/.icon-clear{
+				line-height:40rpx;
+			}
+			/deep/.uni-icons{
+				font-size:34rpx!important;
+				color:#999!important;
+			}
+		}
 		.list {
 			width: 750rpx;
 			padding: 0 30rpx;