heyang

api/request/config.js

@@ -21,9 +21,9 @@ const config = {
 	// 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: '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

pages_safetyCheck/component/checkItemModule.vue

@@ -100,14 +100,18 @@
 					<view class="for-box-n" v-html="brightenKeyword(item.hazardCheckCode2,item.hazardCheckName2,searchValue)">
 						{{item.hazardCheckCode2}}{{item.hazardCheckName2}}
 					</view>
-					<view class="for-box-n" v-html="brightenKeyword(item.hazardCheckCode,item.hazardCheckName,searchValue)">
-						{{item.hazardCheckCode}}{{item.hazardCheckName}}
-					</view>
-					<view class="for-box-n" @click="checkItemButton(item,item2)"
-						v-for="(item2,index2) in item.hazardCheckPointList" v-html="brightenKeyword('',item2,searchValue)">
-						{{item2}}
+					<view v-for="(item2,index2) in item.data">
+						<view  class="for-box-n" v-html="brightenKeyword(item2.hazardCheckCode,item2.hazardCheckName,searchValue)">
+							{{item2.hazardCheckCode}}{{item2.hazardCheckName}}
+						</view>
+						<view class="for-box-n" @click="checkItemButton(item2,item3)"
+							v-for="(item3,index3) in item2.hazardCheckPointList" v-html="brightenKeyword('',item3,searchValue)">
+							{{item3}}
+						</view>
 					</view>
+					
 				</view>
+				
 				<view class="for-box" @click="checkItemButton(item,'')" v-for="(item,index) in dataList" :key="index"
 					v-if="optionData.infoType==1 || optionData.infoType==2">
 					<view class="for-box-n">
@@ -305,9 +309,28 @@
 						})
 					}
 					//查询数据
-					this.$set(this, 'dataList', JSON.parse(JSON.stringify(data.data)));
+					let map = new Map();
+					for (let item of data.data) {
+					    let hazardCheckCode2 = item.hazardCheckCode2;
+					    if (!map.has(hazardCheckCode2)) {
+					        map.set(hazardCheckCode2, {
+					            hazardCheckCode2: hazardCheckCode2,
+					            hazardCheckName2: item.hazardCheckName2,
+					            hazardCheckCode1: item.hazardCheckCode1,
+					            hazardCheckName1: item.hazardCheckName1,
+					            data: [item]
+					        });
+					    } else {
+					        map.get(hazardCheckCode2).data.push(item);
+					    }
+					}
+					let finalResult = Array.from(map.values());
+					this.$set(this, 'dataList', finalResult);
+					
 				}
 			},
+			
+			
 			/********************** 复查相关查询 **********************/
 			async securityAppCheckSetOptionGetReviewList(maxList) {
 				let self = this;