Merge branch 'zdsz3.0' of http://192.168.10.18:3000/wangtong/zd_wechatApp into zdsz3.0

api/common.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 
 
 // 获取公告列表
-export function getNoticeList(noticeType,pageNum,pageSize) {
+export function getNoticeList(noticeType, pageNum, pageSize) {
 	const data = {
 		noticeType,
 		pageNum,
@@ -51,6 +51,7 @@ export function updateDangerousWorkProject(param) {
 	return request({
 		'url': '/zdsz/engineeringDangerous',
 		'method': 'put',
+		'data': param,
 	})
 }
 

config.js

@@ -3,7 +3,7 @@ module.exports = {
   
 
   // baseUrl: 'http://192.168.4.11:8080',
-  //baseUrl: 'http://192.168.4.20:8080',
+  // baseUrl: 'http://192.168.4.20:8080',
     baseUrl: 'http://192.168.4.6:8080',
 
    // baseUrl: 'http://192.168.4.14:8089',

pages/TopPipeWork/TopPipeWork.vue

@@ -603,7 +603,6 @@
 						}
 					},
 					fail: error => {
-						debugger
 						console.log("ddd", error)
 					}
 

pages/dangerous/dangerous.vue

@@ -366,7 +366,6 @@
 	import {
 		getToken
 	} from '../../utils/auth';
-
 	import {
 		getDangerousWorkProjectList,
 		getDangerousWorkProjectDetails,
@@ -381,43 +380,10 @@
 				headers: {
 					Authorization: "Bearer " + getToken()
 				},
-				projectValue: {},
-				projectId: "",
-				projectName: "",
-				projectPosition: "",
-				projectInfoContent: "",
-
-				projectTime: "",
-				pipeSize: "",
-				pipeMaterial: "",
 				isBushing: false,
 				bushingText: "否",
-				pipePressure: "",
-				direction: "",
-				workPosition: "",
-				valvePosition: "",
-				stressReport: "",
-				supervisionSiteRecord: "",
-				workContactForm: "",
-				linePatrolForm: "",
-				workHoleLong: "",
-				workHoleWide: "",
-				workHoleHeight: "",
 				isNeedSupport: false,
 				needSupportText: "否",
-				otherPipelineCondition: "",
-				siteLeaderName: "",
-				siteLeaderPhone: "",
-				workPersonInfo: "",
-				inspectionPort: "",
-				pipelineOil: "", //管道刷油
-				pipelineCorrosion: "", //管道腐蚀
-				masonryValveWell: "", //砌筑阀门井
-				protectionWell: "", //保护井
-				pipeProtectionwellMasonry: "", //管件保护井砌筑
-				backfill: "", //回填
-				tamp: "", //夯实
-				levelSite: "", //平整场地
 				file: [], // 附件
 				pics: [], // 附件返回
 				rows: [],
@@ -425,6 +391,7 @@
 				projectObj: {},
 				currentTime: "",
 				fileArr: [],
+				projectTime: "",
 			}
 		},
 		created() {
@@ -462,15 +429,19 @@
 					this.isNeedSupport = this.projectObj.needSupport == "1";
 					if (this.isNeedSupport) {
 						this.needSupportText = "是";
+						this.projectObj.needSupport="1";
 					} else {
 						this.needSupportText = "否";
+						this.projectObj.needSupport="0";
 					}
 
 					this.isBushing = this.projectObj.casingPresent == "1";
 					if (this.isBushing) {
 						this.bushingText = "是";
+						this.projectObj.casingPresent = "1";
 					} else {
 						this.bushingText = "否";
+						this.projectObj.casingPresent = "0";
 					}
 
 					this.fileArr = this.projectObj.pics;
@@ -490,10 +461,10 @@
 			switchChangeSupport(e) {
 				this.isNeedSupport = e.detail.value;
 				if (this.isNeedSupport) {
-					this.projectObj.needSupport = '1';
+					this.projectObj.needSupport = "1";
 					this.needSupportText = "是";
 				} else {
-					this.projectObj.needSupport = '0';
+					this.projectObj.needSupport = "0";
 					this.needSupportText = "否";
 				}
 				console.log("bush:" + this.isNeedSupport + this.needSupportText)
@@ -529,8 +500,6 @@
 												'fileName': item.name,
 												'picUrl': data.data.url,
 											})
-											debugger
-											console.log("xxx_" + data.data.url);
 											_this.$modal.msg('上传成功！')
 										}
 									}
@@ -580,12 +549,130 @@
 				})
 			},
 			submit() {
+				if (this.isEmpty(this.projectObj.pipeDiameter)) {
+					this.$modal.msg('请输入管径')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.tubularProduct)) {
+					this.$modal.msg('请输入管材')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.pipePressure)) {
+					this.$modal.msg('请输入管道压力')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.gasSourceDirection)) {
+					this.$modal.msg('请输入气源方向')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.taskPosition)) {
+					this.$modal.msg('请输入作业位置')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.valvePosition)) {
+					this.$modal.msg('请输入作业相关阀门位置')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.stressReport)) {
+					this.$modal.msg('请输入压力报告')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.supervisionRecord)) {
+					this.$modal.msg('请输入监理旁站记录')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.workContactForm)) {
+					this.$modal.msg('请输入工作联系单')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.linePatrolConfirmationForm)) {
+					this.$modal.msg('请输入巡线确认单')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.hazardousWorkPitsLong)) {
+					this.$modal.msg('请输入危险作业坑长度')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.hazardousWorkPitsWide)) {
+					this.$modal.msg('请输入危险作业坑宽度')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.hazardousWorkPitsDeep)) {
+					this.$modal.msg('请输入危险作业坑深度')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.otherPipelineConditionsWorkPit)) {
+					this.$modal.msg('请输入作业坑内其他管道情况')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.siteHead)) {
+					this.$modal.msg('请输入现场负责人')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.siteHeadPhone)) {
+					this.$modal.msg('请输入现场负责人联系方式')
+					return;
+				} else {
+					if (!this.$validation.mobile(this.projectObj.siteHeadPhone)) {
+						this.$modal.msg('请输入正确的联系方式');
+						return;
+					}
+				}
+				if (this.isEmpty(this.projectObj.operatorInformation)) {
+					this.$modal.msg('请输入作业人员信息')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.inspectionPort)) {
+					this.$modal.msg('请输入检口')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.pipelinePainting)) {
+					this.$modal.msg('请输入管道刷油')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.pipelineCorrosionProtection)) {
+					this.$modal.msg('请输入管道防腐')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.pipelineSupport)) {
+					this.$modal.msg('请输入管道支护')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.masonryValveWell)) {
+					this.$modal.msg('请输入砌筑阀门井')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.protectionWell)) {
+					this.$modal.msg('请输入保护井')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.pipeProtectionWelMasonry)) {
+					this.$modal.msg('请输入管件保护井砌筑')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.backfill)) {
+					this.$modal.msg('请输入回填')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.tamp)) {
+					this.$modal.msg('请输入夯实')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.levelingTheSite)) {
+					this.$modal.msg('请输入平整场地')
+					return;
+				}
+				if (this.isEmpty(this.projectObj.remark)) {
+					this.$modal.msg('请输入备注')
+					return;
+				}
 				if (this.fileArr.length <= 0) {
 					this.$modal.msg('请选择附件')
 					return;
 				}
 				this.projectObj.enginTime = this.projectTime;
 				this.projectObj.pics = this.fileArr;
+				
 				updateDangerousWorkProject(this.projectObj).then(res => {
 					this.$modal.msg(res.msg);
 					uni.navigateBack();

pages/infrastructure/infrastructure.vue

@@ -614,7 +614,6 @@
 						}
 					},
 					fail: error => {
-						debugger
 						console.log("ddd", error)
 					}