zc

api/request/config.js

@@ -1,12 +1,12 @@
 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',//小飞
 	// 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/views/login/login.vue

@@ -51,9 +51,8 @@
 		data() {
 			return {
 				identityStatus: 1,
-				// username:"dedsudiyu",//学生
-				username: "01", //教职工
-				password: "zd123456",
+				username: "",
+				password: "",
 				checkedType: false,
 				loginBanner: uni.getStorageSync('loginBanner'),
 				infoList: [], //模板消息Id

pages_safetyCheck/api/index.js

@@ -8,6 +8,14 @@ export const securityCheckOptionList = (data) => {
        data: { ...data }
     })
 };
+//项目检查库-树状列表-包含被删除的数据
+export const securityCheckOptionSelAllList = (data) => {
+    return apiResquest({
+        url: '/security/checkOption/selAllList',
+       method: 'POST',
+       data: { ...data }
+    })
+};
 //随手拍-上报
 export const securityAppCheckPhotoMyAdd = (data) => {
 	return apiResquest({
@@ -128,6 +136,22 @@ export const securityAppCheckDangerGetCheckDangerSubId = (data) => {
        data: { ...data }
     })
 };
+//实验室下-复查验证-检查项查询
+export const securityAppCheckSetOptionGetReviewList = (data) => {
+    return apiResquest({
+        url: '/security/appCheckSetOption/getReviewList',
+       method: 'POST',
+       data: { ...data }
+    })
+};
+//实验室下-隐患整改-检查项查询
+// export const securityAppCheckDangerGetCheckDangerSubId = (data) => {
+//     return apiResquest({
+//         url: '/security/appCheckDanger/getCheckDangerSubId',
+//        method: 'POST',
+//        data: { ...data }
+//     })
+// };
 //查询计划内实验室下-未检查的检查项
 export const securityCheckSetOptionUnCheckList = (data) => {
     return apiResquest({

pages_safetyCheck/component/checkItemModule.vue

@@ -115,9 +115,9 @@
 
 <script>
 	import {
-		securityCheckOptionList,
+		securityCheckOptionSelAllList,
 		securityAppCheckSetOptionList,
-		securityAppCheckDangerReviewList,
+		securityAppCheckSetOptionGetReviewList,
 		securityAppCheckDangerGetCheckDangerSubId,
 	} from '@/pages_safetyCheck/api/index.js'
 	export default {
@@ -150,8 +150,9 @@
 		},
 		mounted() {
 			this.$set(this, 'optionData', JSON.parse(JSON.stringify(this.propsData)));
+			console.log('optionData',this.optionData)
 			this.$nextTick(() => {
-				this.securityCheckOptionList();
+				this.securityCheckOptionSelAllList();
 			})
 		},
 		methods: {
@@ -162,7 +163,7 @@
 					this.securityAppCheckSetOptionList();
 				} else if (this.optionData.infoType == 1) {
 					//复查
-					this.securityAppCheckDangerReviewList();
+					this.securityAppCheckSetOptionGetReviewList();
 				} else if (this.optionData.infoType == 2) {
 					//整改
 					this.securityAppCheckDangerGetCheckDangerSubId();
@@ -214,19 +215,19 @@
 				this.$parent.checkItemModuleButton('submit',item);
 			},
 			//基础检查项检查
-			async securityCheckOptionList() {
+			async securityCheckOptionSelAllList() {
 				let self = this;
 				const {
 					data
-				} = await securityCheckOptionList({});
+				} = await securityCheckOptionSelAllList({});
 				if (data.code == 200) {
 					let maxList = this.getCascaderData(JSON.parse(JSON.stringify(data.data)), 2)
 					this.$nextTick(() => {
-						if(this.pageType == 1){
+						if(this.optionData.infoType == 0){
 							this.securityAppCheckSetOptionList(maxList);
-						}else if(this.pageType == 2){
-							this.securityAppCheckDangerReviewList(maxList);
-						}else if(this.pageType == 3){
+						}else if(this.optionData.infoType == 1){
+							this.securityAppCheckSetOptionGetReviewList(maxList);
+						}else if(this.optionData.infoType == 2){
 							this.securityAppCheckDangerGetCheckDangerSubId(maxList);
 						}
 					})
@@ -253,11 +254,11 @@
 				}
 			},
 			/********************** 复查相关查询 **********************/
-			async securityAppCheckDangerReviewList(maxList) {
+			async securityAppCheckSetOptionGetReviewList(maxList) {
 				let self = this;
 				const {
 					data
-				} = await securityAppCheckDangerReviewList({
+				} = await securityAppCheckSetOptionGetReviewList({
 					planId: this.optionData.planId,
 					planSetId: this.optionData.planSetId,
 					subId: this.optionData.subId,

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -52,11 +52,11 @@
 						<img src="@/pages_safetyCheck/images/icon_ssp_gd@1x.png">
 					</view>
 					<view class="hidden-li-r" :class="item.manageStatus == 2?'manageClass':''" v-if="tabIndexTow==1">
-						{{item.overCheck?'已检查':'待复查'+item.stayExamineCheckNum+'项'}}
+						{{item.overCheck?'已复查':'待复查'+item.stayExamineCheckNum+'项'}}
 						<img src="@/pages_safetyCheck/images/icon_ssp_gd@1x.png">
 					</view>
 					<view class="hidden-li-r" :class="item.manageStatus == 2?'manageClass':''" v-if="tabIndexTow==2">
-						{{item.overCheck?'已检查':'待整改'+item.stayExamineCheckNum+'项'}}
+						{{item.overCheck?'已整改':'待整改'+item.stayExamineCheckNum+'项'}}
 						<img src="@/pages_safetyCheck/images/icon_ssp_gd@1x.png">
 					</view>
 				</view>

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -188,7 +188,6 @@
 			},
 			//顶部tab点击
 			tabClickTow(value) {
-				this.$set(this, 'hazardCheckPro', null);
 				this.$set(this, 'checkFlag', null);
 				this.$set(this.queryParams, 'page', 1);
 				this.$set(this, 'curTabTow', value);
@@ -222,8 +221,8 @@
 						obj.manageId = this.newData.manageId
 					} else if (this.curTabTow != 0) {
 						//复查/整改
-						obj.planId = this.newData.planId;
-						obj.planSetId = this.newData.planSetId;
+						obj.planId = this.newData.checkPlanSetVoList.planId;
+						obj.planSetId = this.newData.checkPlanSetVoList.planSetId;
 						obj.subId = this.newData.subId;
 					}
 					this.$set(this, 'propsData', obj);
@@ -311,10 +310,11 @@
 					}
 				} else if (this.pageType == 1) {
 					//复查验证
-					obj.planId = this.newData.planId;
-					obj.planSetId = this.newData.planSetId;
+					obj.planId = this.newData.checkPlanSetVoList.planId;
+					obj.planSetId = this.newData.checkPlanSetVoList.planSetId;
 					obj.subId = this.newData.subId;
 					obj.appReviewStatus = this.curTabTow;
+					obj.pageFlag = true;
 					const {
 						data
 					} = await securityAppCheckDangerReviewList(obj);
@@ -335,10 +335,11 @@
 					}
 				} else if (this.pageType == 2) {
 					//隐患整改
-					obj.planId = this.newData.planId;
-					obj.planSetId = this.newData.planSetId;
+					obj.planId = this.newData.checkPlanSetVoList.planId;
+					obj.planSetId = this.newData.checkPlanSetVoList.planSetId;
 					obj.subId = this.newData.subId;
 					obj.appReviewStatus = this.curTabTow;
+					obj.pageFlag = true;
 					const {
 						data
 					} = await securityAppCheckDangerGetCheckDangerSubId(obj);