heayng

api/request/config.js

@@ -20,9 +20,10 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/api/', //暨大化材
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
     //base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
+	 base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'http://172.16.0.65/api/', //西北农林
-	base_url: 'https://lab.zjznai.com/labapp/', //43测试
+	//base_url: 'https://lab.zjznai.com/labapp/', //43测试
 }
 export {
 	config

manifest.json

@@ -54,7 +54,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx60e12abd2e79c618",
+        "appid" : "wxc9180acf05b65dee",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

pages_safetyCheck/views/inspectManage/conductInspections.vue

@@ -339,6 +339,7 @@
 						});
 					}
 					let infoData = this.optionData;
+					infoData.setOptionId = this.setOptionId,
 					infoData.itemsStatus = status == 1 ? 2 : 0;
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +

pages_safetyCheck/views/inspectManage/inspectAdd.vue

@@ -769,7 +769,7 @@
 
 			.describe {
 				width: 636rpx;
-				height: 120rpx;
+				height: 180rpx;
 				border-radius: 10rpx 10rpx 10rpx 10rpx;
 				border: 1rpx solid #E0E0E0;
 				margin: 20rpx 0 0 28rpx;

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -21,9 +21,8 @@
 			</view>
 			<view>
 				<view class="level">
-					<view class="level-li" 
+					<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="srearch">
@@ -31,11 +30,10 @@
 						<view class="srearch-l">
 							<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
 						</view>
-						<input class="srearch-c" type="text"  v-model="searchValue"
-							placeholder="搜索实验室" disabled />
+						<input class="srearch-c" type="text" v-model="searchValue" placeholder="搜索实验室" disabled />
 					</view>
 				</view>
-				
+
 			</view>
 			<view class="hidden">
 				<view class="lab-info" @click="listClick(item)" v-for="(item,index) in dataList">
@@ -47,7 +45,8 @@
 								:style="'border:1rpx solid '+item.classLevelColor+';background:'+item.classLevelColorTow+';'">
 								<text
 									:style="'border-right:1rpx solid '+item.classLevelColor+';color:'+item.classLevelColor+';'">{{item.classLevelName?item.classLevelName:''}}</text>
-								<text :style="'color:'+item.classLevelColor+';'">{{item.classTypeNames?item.classTypeNames:''}}</text>
+								<text
+									:style="'color:'+item.classLevelColor+';'">{{item.classTypeNames?item.classTypeNames:''}}</text>
 							</view>
 						</view>
 						<view class="lab-info-c-b">
@@ -58,8 +57,7 @@
 				</view>
 				<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 			</view>
-			<img class="saoCode" @click="saoCode()"
-				src="@/pages_safetyCheck/images/icon_aqjc_saoma.png">
+			<img class="saoCode" @click="saoCode()" src="@/pages_safetyCheck/images/icon_aqjc_saoma.png">
 		</scroll-view>
 	</view>
 </template>
@@ -188,7 +186,7 @@
 				})
 			},
 			//实验室搜索框跳转
-			srearchClick(){
+			srearchClick() {
 				let infoData = {};
 				infoData.pageType = this.tabIndexTow;
 				infoData.laboratoryStatus = this.tabIndexTow;
@@ -440,14 +438,14 @@
 			},
 			//获取分级
 			async laboratoryLevelConfigGetWebLevelTitleList() {
-				let self=this;
+				let self = this;
 				const {
 					data
 				} = await laboratoryLevelConfigGetWebLevelTitleList({});
 				if (data.code == 200) {
 					data.data.forEach(function(item) {
 						item.levelName = item.levelName.split('/')[0]
-						if(item.levelColor){
+						if (item.levelColor) {
 							item.levelColorTow = self.hexToRgb(item.levelColor, 0.2)
 						}
 					})
@@ -476,10 +474,10 @@
 					if (data.code == 200) {
 
 						data.data.records.forEach(function(item) {
-							if(item.classLevelColor){
+							if (item.classLevelColor) {
 								item.classLevelColorTow = self.hexToRgb(item.classLevelColor, 0.2)
 							}
-							
+
 						})
 						if (self.queryParams.page == 1) {
 							this.dataList = data.data.records;
@@ -763,6 +761,7 @@
 			padding: 30rpx 30rpx 0;
 			box-sizing: border-box;
 			margin-top: 20rpx;
+
 			.level-li {
 				width: 100rpx;
 				height: 50rpx;
@@ -953,6 +952,7 @@
 							width: 180rpx;
 							height: 40rpx;
 							margin-left: 10rpx;
+
 							>text {
 								display: inline-block;
 								flex: 1;
@@ -974,6 +974,9 @@
 							color: #666666;
 							line-height: 30rpx;
 							text-align: left;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
 						}
 
 						>text:nth-of-type(2) {
@@ -981,6 +984,9 @@
 							color: #666666;
 							line-height: 30rpx;
 							text-align: left;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
 						}
 					}
 				}
@@ -1024,7 +1030,8 @@
 		#color-C {
 			color: #16B531;
 		}
-		.saoCode{
+
+		.saoCode {
 			position: fixed;
 			left: 288rpx;
 			bottom: 20rpx;

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -322,7 +322,9 @@
 						});
 					}else if(this.pageType==1){
 						//复核
-						let infoData = {
+						let infoData=this.optionData
+						infoData.editStatus=true;
+						/* let infoData = {
 							subId: this.subId,
 							hazardCheckPro: this.hazardCheckPro,
 							checkCategory:this.optionData.checkCategory,
@@ -330,7 +332,7 @@
 							itemsStatus: this.itemsStatus,
 							checkPlanSetVoList: this.optionData.checkPlanSetVoList,
 							editStatus:true,
-						};
+						}; */
 						uni.redirectTo({
 							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' + encodeURIComponent(
 								JSON
@@ -338,7 +340,9 @@
 						});
 					}else if(this.pageType==2){
 						//整改
-						let infoData = {
+						let infoData=this.optionData
+						infoData.editStatus=true;
+						/* let infoData = {
 							subId: this.subId,
 							hazardCheckPro: this.hazardCheckPro,
 							checkCategory:this.optionData.checkCategory,
@@ -346,7 +350,7 @@
 							itemsStatus: this.itemsStatus,
 							checkPlanSetVoList: this.optionData.checkPlanSetVoList,
 							editStatus:true,
-						};
+						}; */
 						uni.redirectTo({
 							url: '/pages_safetyCheck/views/itemsManage/hiddenDangerRectification?infoData=' + encodeURIComponent(
 								JSON

pages_safetyCheck/views/itemsManage/hiddenDangerRectification.vue

@@ -208,7 +208,7 @@
 				} = await securityAppCheckDangerGetCheckProDetail(obj);
 				if (data.code == 200) {
 					uni.setNavigationBarTitle({
-						title: data.data.subName + '(' + data.data.roomNum?data.data.roomNum:'-' + ')'
+						title: data.data.subName+'(' + data.data.roomNum + ')'
 					})
 					data.data.checkCollapse=false;
 					data.data.inspectDot=false;

pages_safetyCheck/views/snapshotManage/laboratorySearch.vue

@@ -30,7 +30,8 @@
 							</view>
 						</view>
 						<view class="lab-info-c-b">
-							<text>{{item.roomNum?item.roomNum:'-'}}房间＆{{item.buildName}}</text>
+							<text v-if="laboratoryStatus==0">{{item.roomNum?item.roomNum:'-'}}房间＆{{item.buildName}}</text>
+							<text v-if="laboratoryStatus==1 || laboratoryStatus==2">{{item.subRoom?item.subRoom:'-'}}房间＆{{item.buildName}}</text>
 							<text>{{item.deptName}}</text>
 						</view>
 					</view>