工业工程新版 新增、历史、修改

api/common.js

@@ -1,5 +1,76 @@
 import request from '@/utils/request'
-getByUserListAndDicts
+
+// 工业工程修改(最新)
+export function PutengineeringNew(engineering) {
+	return request({
+		'url': '/zdsz/engineeringGY',
+		'method': 'put',
+		'data': engineering
+	})
+}
+
+// 工业工程新增
+export function SubmitengineeringNew(engineering) {
+	return request({
+		'url': '/zdsz/engineeringGY',
+		'method': 'post',
+		'data': engineering
+	})
+}
+// 工业工程   详情  根据id 查询
+export function getEngineeringDetailsNew(id) {
+
+	return request({
+		'url': '/zdsz/engineeringGY/' + id,
+		'method': 'get',
+
+	})
+}
+// 工业工程  根据工程类型查询工程列表
+export function getengineeringNameListNew(enginType,enginClassification) {
+	const data = {
+
+		enginType,
+		enginClassification
+	}
+	return request({
+		'url': '/zdsz/engineeringGY/queryByType',
+		'method': 'get',
+		'data': data
+	})
+}
+// 获取碰口历史详情
+export function getHistoryMouthDetails(id, type) {
+
+	return request({
+		'url': '/zdsz/touchOperationEngineering/query/' + id + '/' + type,
+		'method': 'get',
+	})
+}
+// 碰口工程新增/修改
+export function SubmitMouth(type, param) {
+	let method = type == 'new' ? 'post' : 'put'
+	return request({
+		'url': '/zdsz/touchOperationEngineering',
+		'method': method,
+		'data': param
+	})
+}
+
+// 碰口工程获取项目名称列表
+export function getProjectName(modeOperation, pageSize, pageNumber) {
+	const data = {
+		modeOperation,
+		pageSize,
+		pageNumber
+	}
+	return request({
+		'url': '/zdsz/touchOperationEngineering/list',
+		'method': 'get',
+		'data': data
+	})
+}
+
 // 获取节点类型
 export function getByUserListAndDicts(id) {
 
@@ -282,11 +353,11 @@ export function getDangerousWorkProjectDetails(id) {
 	})
 }
 
-// 获取工业工程历史2
-export function getEngineeringHistoryList2(id, type) {
+// 获取工业工程历史new
+export function getEngineeringHistoryListNew(id, type) {
 
 	return request({
-		'url': '/zdsz/engineeringIndustry/query/' + id + '/' + type,
+		'url': '/zdsz/engineeringGY/' + id + '/' + type,
 		'method': 'get',
 	})
 }

components/bottomSheet/bottomSheetMoreNew.vue

@@ -19,7 +19,14 @@
 								<view class="tit-text">施工时间:</view>
 								<view class="normal-text">{{value.constructTime}}</view>
 							</view>
-
+							<view class="uni-media-list-text-top" v-if="title=='管道压力'">
+								<view class="tit-text">管道压力:</view>
+								<view class="normal-text">{{value.constructAccordingDrawings}}</view>
+							</view>
+							<view class="uni-media-list-text-top" v-if="title=='原有管线压力'">
+								<view class="tit-text">原有管线压力:</view>
+								<view class="normal-text">{{value.constructAddre}}</view>
+							</view>
 							<view class="uni-media-list-text-top">
 								<view class="uni-common-mt" style="width: 100%;">
 									<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
@@ -33,8 +40,7 @@
 								</view>
 							</view>
 							<view class="cz-style" v-for="(a,index) in value.zEngineeringMaterialBo" :key="index"
-								v-if="title=='焊接、防腐'||title=='下管'||title=='沟下连头'">
-
+								v-if="title=='焊接、防腐'||title=='下管'||title=='沟下连头'||title=='架空管线'||title=='焊接'">
 								<view class="uni-media-list-text-top" style=" ">
 									<view class="tit-text">材质:</view>
 									<view class="normal-text">{{a.materialQualityName}}</view>

config.js

@@ -3,7 +3,7 @@ module.exports = {
 
 	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	//baseUrl: 'http://192.168.4.88:8080',
-	// baseUrl: 'http://192.168.4.23:8080',
+	 //baseUrl: 'http://192.168.4.23:8080',
 	//baseUrl: 'http://192.168.4.20:8080',
 	baseUrl: 'http://192.168.4.6:8080',
 
@@ -30,5 +30,4 @@ module.exports = {
 		]
 	},
 
-}
-
+}

pages/collision/collisionMouth.vue

@@ -7,13 +7,12 @@
 						<view>
 							工程名称
 						</view>
-						<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
-							@click="pickerShow('gcmc',0)">
+						<view v-if="this.isEmpty(this.projectName)" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
 							<span style="color: darkgray;">请选择工程名称</span>
 							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 						</view>
 						<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('gcmc',0)">
-							<span style="color: black;">{{projectName.name}}</span>
+							<span style="color: black;">{{projectName}}</span>
 							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 						</view>
 					</view>
@@ -30,7 +29,7 @@
 					<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 
 						<text>地点</text>
-						<input class="uni-input" type="number" v-model="address" disabled="true" maxlength="11"
+						<input class="uni-input" v-model="locations" disabled="true"
 							style="margin-left: 10px;text-align: right;"></input>
 					</view>
 				</view>
@@ -135,13 +134,15 @@
 
 	<script>
 		import SelectPicker from '../../components/selectPicker/select_picker.vue'
-		import bottomSheet from '../../components/bottomSheet/bottomSheetMore.vue'
+		import bottomSheet from '../../components/bottomSheet/bottomSheetMoreNew.vue'
 
 		import {
 			getDicts
 		} from "@/api/system/dict/data";
 		import {
-			Submitengineering,
+			SubmitMouth,
+			getProjectName,
+			getHistoryMouthDetails,
 		} from '@/api/common'
 		import {
 			getToken
@@ -189,6 +190,18 @@
 					imgHthArr: [],
 					pipePressure: '',
 					placeholder: '',
+					//新
+					createBy: '',
+					createTime: '',
+					updateBy: '',
+					updateTime: '',
+					updateInfoTime: '',
+					id: '',
+					modeOperation: '',
+					enginName: '',
+					locations: '',
+					remark: '',
+
 
 
 				}
@@ -255,9 +268,9 @@
 
 						this.open = true;
 						//请求
-						getengineeringNameList(this.projectType.dictValue, "1", this.objValue.value).then(response => {
-
-							this.selectList = response.data;
+						getProjectName(this.objValue.title, "1", '999999').then(response => {
+							let result = JSON.parse(JSON.stringify(response.rows).replace(/enginName/g, 'name'));
+							this.selectList = result;
 						});
 
 
@@ -434,8 +447,8 @@
 
 				changeSelectDict(item, index) {
 					this.openDict = false;
-					this.projectName = ''; //重置工程名称
-					this.createTime = '';
+					// this.projectName = ''; //重置工程名称
+					// this.createTime = '';
 
 
 				},
@@ -443,17 +456,17 @@
 					this.open = false;
 
 					if (this.type == 'gcmc') {
-						this.projectName = item
-						//根据工程id  获取工程信息
-						uni.showLoading({
-							title: '加载中'
-						})
-						getEngineeringDetails(item.id).then(response => {
-							uni.hideLoading();
-
-							this.createTime = response.data.createTime;
-
-						});
+						this.projectName = item.name;
+						this.createBy = item.createBy;
+						this.createTime = item.createTime;
+						this.updateBy = item.updateBy;
+						this.updateTime = item.updateTime;
+						this.updateInfoTime = item.updateInfoTime;
+						this.id = item.id;
+						this.modeOperation = item.modeOperation;
+						this.enginName = item.name;
+						this.locations = item.locations;
+						this.remark = item.remark;
 					}
 				},
 				//关闭弹窗
@@ -468,11 +481,11 @@
 				//历史
 				history() {
 
-					if (this.isEmpty(this.projectName.id)) {
+					if (this.isEmpty(this.projectName)) {
 						this.$modal.msg('请选择工程名称')
 						return
 					}
-					getEngineeringHistoryList2(this.enginId, this.objValue.value).then(response => {
+					getHistoryMouthDetails(this.id, this.objValue.value).then(response => {
 
 						this.historyList = response.data
 						if (response.data.zEngineeringNodeBo != null) {
@@ -488,13 +501,11 @@
 
 
 
-					if (this.isEmpty(this.projectName.id)) {
+					if (this.isEmpty(this.projectName)) {
 						this.$modal.msg('请选择工程名称')
 						return
 					}
 
-
-
 					if (this.imgArr.length <= 0) {
 						this.$modal.msg('请上传照片或视频')
 						return
@@ -505,32 +516,33 @@
 					}
 
 					let param = {
-						id: this.enginId, //工程id
-						type: '1', // 用来区分工业工程=1、市政工程=2
-
-						enginName: this.projectName.name, //工程名称
-
-						enginClassification: this.objValue.value, // 工程分类  上一页面传过来的
+						createBy: this.createBy,
 						createTime: this.createTime,
-						zEngineeringNodeBo: {
-
-							type: '工业工程', // 写死
+						updateBy: this.updateBy,
+						updateTime: this.updateTime,
+						updateInfoTime: this.updateInfoTime,
+						id: this.id,
+						modeOperation: this.modeOperation,
+						enginName: this.projectName,
+						locations: this.locations,
+						remark: this.remark,
+						zEngineeringNodeBoList: [{
+							type: this.objValue.value,
 							zEngineeringInfoBo: {
-								//engInfoId: this.infonId,
-								remark: this.projectContent, //施工内容
-								boxBrand: this.imgBoxArr,
-								stonePowder: this.imgSfhtArr,
-								lightning: this.imgFljdArr,
-								bottomLeg: this.imgDtljArr,
-								groundHardening: this.imgHldmyhArr,
-								constructTime: this.time, //施工时间
+								constructTime: this.time,
 								zEngiineeringPhotoBoList: this.imgArr, //照片集合
+								remark: this.projectContent,
+								constructAccordingDrawings: this.pipePressure,
+								constructAddre: this.pipePressure,
+
+
 							}
-						}
+
+						}]
 
 					}
 					uni.showLoading()
-					Submitengineering(param).then(res => {
+					SubmitMouth('new', param).then(res => {
 						if (res.code == '200') {
 							uni.hideLoading()
 							uni.showToast({

pages/enginproject/enginproject.vue

@@ -355,7 +355,7 @@
 
 	<script>
 		import SelectPicker from '../../components/selectPicker/select_picker.vue'
-		import bottomSheet from '../../components/bottomSheet/bottomSheetMore.vue'
+		import bottomSheet from '../../components/bottomSheet/bottomSheetMoreNew.vue'
 		import mypopup from '../../components/mypopup/mypopup.vue'
 
 		import {
@@ -366,10 +366,10 @@
 			getEnginSpecificationsList,
 			getRoomProjectList,
 			getRoomProjectId,
-			Submitengineering,
-			getengineeringNameList,
-			getEngineeringDetails,
-			getEngineeringHistoryList2,
+			SubmitengineeringNew,
+			getengineeringNameListNew,
+			getEngineeringDetailsNew,
+			getEngineeringHistoryListNew,
 		} from '@/api/common'
 		import {
 			getToken
@@ -447,11 +447,6 @@
 					createTime: '',
 					infonId: '', //info id
 
-					// imgSfhtArr: [],
-					// imgFljdArr: [],
-					// imgBoxArr: [],
-					// imgDtljArr: [],
-					// imgHldmyhArr: [],
 					imgHtqArr: [],
 					imgJspsArr: [],
 					imgHthArr: [],
@@ -546,7 +541,7 @@
 						}
 						this.open = true;
 						//请求
-						getengineeringNameList(this.projectType.dictValue, "1", this.objValue.value).then(response => {
+						getengineeringNameListNew(this.projectType.dictValue).then(response => {
 
 							this.selectList = response.data;
 						});
@@ -791,7 +786,7 @@
 						uni.showLoading({
 							title: '加载中'
 						})
-						getEngineeringDetails(item.id).then(response => {
+						getEngineeringDetailsNew(item.id).then(response => {
 							uni.hideLoading();
 							//	this.enginList = response.data
 							this.jlPhoneValue = response.data.supervisionPhone; //监理电话
@@ -918,7 +913,7 @@
 						this.$modal.msg('请选择工程名称')
 						return
 					}
-					getEngineeringHistoryList2(this.enginId, this.objValue.value).then(response => {
+					getEngineeringHistoryListNew(this.enginId, this.objValue.value).then(response => {
 
 						this.historyList = response.data
 						if (response.data.zEngineeringNodeBo != null) {
@@ -1013,9 +1008,7 @@
 					}
 
 					let param = {
-						//files: this.fileArr, //文件
 						id: this.enginId, //工程id
-						type: '1', // 用来区分工业工程=1、市政工程=2
 
 						enginName: this.projectName.name, //工程名称
 						enginType: this.projectType.dictValue, // 工程类型
@@ -1028,28 +1021,26 @@
 						supervisionUnit: this.jldwValue, // 监理单位
 						supervisionHead: this.jlfzrValue, // 监理负责人
 						supervisionPhone: this.jlPhoneValue, // 监理联系电话
-						enginClassification: this.objValue.value, // 工程分类  上一页面传过来的
+						enginClassification: this.objValue.title, // 工程分类  上一页面传过来的
 						createTime: this.createTime,
 						zEngineeringNodeBo: {
 
-							type: '工业工程', // 写死
+							type: this.objValue.value,
 							zEngineeringInfoBo: {
 								//engInfoId: this.infonId,
 								remark: this.projectContent, //施工内容
-								boxBrand: this.imgBoxArr,
-								stonePowder: this.imgSfhtArr,
-								lightning: this.imgFljdArr,
-								bottomLeg: this.imgDtljArr,
-								groundHardening: this.imgHldmyhArr,
 								constructTime: this.time, //施工时间
 								zEngiineeringPhotoBoList: this.imgArr, //照片集合
+								zEngiineeringPhotoBoListOne: this.imgHtqArr,
+								zEngiineeringPhotoBoListTwo: this.imgJspsArr,
+								zEngiineeringPhotoBoListThree: this.imgHthArr,
 								zEngineeringMaterialBo: this.zEngineeringMaterialBo // 用料对象
 							}
 						}
 
 					}
 					uni.showLoading()
-					Submitengineering(param).then(res => {
+					SubmitengineeringNew(param).then(res => {
 						if (res.code == '200') {
 							uni.hideLoading()
 							uni.showToast({

pages/statistics/historyDetailMunicipal.vue

@@ -597,7 +597,6 @@
 				let isSubmit = true;
 
 
-				console.log("参数", this.dataJson);
 				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
 					if (res.createBy == this.$user.state.name) {
 						if (this.title == '焊接、防腐' || this.title == '下管' || this.title ==

pages/statistics/historyDetailsEnginproject.vue

@@ -20,215 +20,170 @@
 							</view>
 						</view>
 					</view>
-					<view v-if="title=='表组'||title=='室内管线'||title=='室外管线'">
-						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-							<image :src="loadImgSrc('updateimg.png')" mode=""
-								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('other',key)">
-							</image>
-							<view v-for="(item,index) in  value.zEngiineeringPhotoBoList" :key="index"
-								style="position: relative;">
-								<view
-									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-										@click="showPhoto(index,value.zEngiineeringPhotoBoList)">
-									</image>
-								</view>
-								<view v-else>
-									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-								</view>
-								<view @click="remove(index,key)"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-									</image>
-								</view>
-							</view>
 
 
 
-							<view class="cz-style" v-for="(a,index) in value.zEngineeringMaterialBo" :key="index">
-								<view class="uni-media-list-text-top" style=" ">
-									<view class="tit-text">材质:</view>
+					<view v-if="title=='焊接、防腐'||title=='架空管线'||title=='下管'||title=='沟下连头'||title=='焊接'">
 
-									<view class="uni-list-cell-db" style="margin-top: 10;"
-										@click="pickerShow('cz',key,index)">
-										<span
-											style="color: black;">{{a.materialQualityName==''?'请选择材质':a.materialQualityName}}</span>
+						<view class="cz-style" v-for="(a,index) in value.zEngineeringMaterialBo" :key="index">
+							<view class="uni-media-list-text-top" style=" ">
+								<view class="tit-text">材质:</view>
+
+								<view class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('cz',key,index)">
+									<span
+										style="color: black;">{{a.materialQualityName==''?'请选择材质':a.materialQualityName}}</span>
 
-									</view>
 								</view>
+							</view>
 
-								<view class="uni-media-list-text-top" style=" ">
-									<view class="tit-text">规格:</view>
-									<view class="uni-list-cell-db" style="margin-top: 10;"
-										@click="pickerShow('gg',key,index)">
-										<span
-											style="color: black;">{{a.specificationsName==''?'请选择规格':a.specificationsName}}</span>
+							<view class="uni-media-list-text-top" style=" ">
+								<view class="tit-text">规格:</view>
+								<view class="uni-list-cell-db" style="margin-top: 10;"
+									@click="pickerShow('gg',key,index)">
+									<span
+										style="color: black;">{{a.specificationsName==''?'请选择规格':a.specificationsName}}</span>
 
-									</view>
 								</view>
+							</view>
 
-								<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
-									<text class="tit-text">米 数</text>
-									<view style="display: flex; justify-content: right; width: 70%;">
-										<input class="uni-input" type="number" :value="getIntegerPart(a.number,0)"
-											@change="setInfoBoNumber(key,index,$event.target.value,0)" maxlength="6"
-											style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
-										<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
-
-										<input class="uni-input" type="number" :value="getIntegerPart(a.number,1)"
-											@change="setInfoBoNumber(key,index,$event.target.value,1)" maxlength="1"
-											style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
-									</view>
+							<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
+								<text class="tit-text">米 数</text>
+								<view style="display: flex; justify-content: right; width: 70%;">
+									<input class="uni-input" type="number" :value="getIntegerPart(a.number,0)"
+										@change="setInfoBoNumber(key,index,$event.target.value,0)" maxlength="6"
+										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+									<text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
+
+									<input class="uni-input" type="number" :value="getIntegerPart(a.number,1)"
+										@change="setInfoBoNumber(key,index,$event.target.value,1)" maxlength="1"
+										style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 								</view>
-								<button v-if="index!=0" @click="btnDel(key,index)" class="sc-btn">删除</button>
-
 							</view>
-							<button @click="btnAdd(key,index)" class="tj-btn">添加</button>
+							<button v-if="index!=0" @click="btnDel(key,index)" class="sc-btn">删除</button>
+
 						</view>
+						<button @click="btnAdd(key,index)" class="tj-btn">添加</button>
 					</view>
+				</view>
+				<view v-if="title!='回填、撤场'">
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('other',key)">
+						</image>
+						<view v-for="(item,index) in  value.zEngiineeringPhotoBoList" :key="index"
+							style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.zEngiineeringPhotoBoList)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="remove(index,key)"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
+							</view>
+						</view>
 
+					</view>
+				</view>
+				<view v-else>
 
-					<view v-if="title=='调压柜'">
-
-						<view class="uni-common-mt" style="width: 100%;">
-							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-											#000;margin-top: 5px; margin-left: 8px;">调压箱铭牌照片:</text>
-						</view>
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px; margin-left: 8px;">回填前照片:</text>
+					</view>
 
-						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
-							<image :src="loadImgSrc('updateimg.png')" mode=""
-								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Box',key)">
-							</image>
-							<view v-for="(item,index) in value.boxBrand" :key="index" style="position: relative;">
-								<view
-									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
-									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-										@click="showPhoto(index,value.boxBrand)">
-									</image>
-								</view>
-								<view v-else>
-									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-								</view>
-								<view @click="removeht(index,key,'Box')"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-									</image>
-								</view>
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('htq',key)">
+						</image>
+						<view v-for="(item,index) in value.zEngiineeringPhotoBoListOne" :key="index"
+							style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.zEngiineeringPhotoBoListOne)">
+								</image>
 							</view>
-						</view>
-
-						<view class="uni-common-mt" style="width: 100%;">
-							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-											#000;margin-top: 5px;margin-left: 8px;">调压箱内石粉回填照片:</text>
-						</view>
-						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
-							<image :src="loadImgSrc('updateimg.png')" mode=""
-								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Sfht',key)">
-							</image>
-							<view v-for="(item,index) in value.stonePowder" :key="index" style="position: relative;">
-								<view
-									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
-									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-										@click="showPhoto(index,value.stonePowder)">
-									</image>
-								</view>
-								<view v-else>
-									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-								</view>
-								<view @click="removeht(index,key,'Sfht')"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-									</image>
-								</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'htq')"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
 							</view>
 						</view>
+					</view>
 
-						<view class="uni-common-mt" style="width: 100%;">
-							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-											#000;margin-top: 5px;margin-left: 8px;">调压箱防雷接地照片:</text>
-						</view>
-						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
-							<image :src="loadImgSrc('updateimg.png')" mode=""
-								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Fljd',key)">
-							</image>
-							<view v-for="(item,index) in value.lightning" :key="index" style="position: relative;">
-								<view
-									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
-									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-										@click="showPhoto(index,value.lightning)">
-									</image>
-								</view>
-								<view v-else>
-									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-								</view>
-								<view @click="removeht(index,key,'Fljd')"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-									</image>
-								</view>
-
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">警示带铺设照片:</text>
+					</view>
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('jsdps',key)">
+						</image>
+						<view v-for="(item,index) in value.zEngiineeringPhotoBoListTwo" :key="index"
+							style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.zEngiineeringPhotoBoListTwo)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'jsdps')"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
 							</view>
 						</view>
+					</view>
 
-						<view class="uni-common-mt" style="width: 100%;">
-							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-											#000;margin-top: 5px;margin-left: 8px;">调压箱底腿连接照片:</text>
-						</view>
-						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
-							<image :src="loadImgSrc('updateimg.png')" mode=""
-								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Dtlj',key)">
-							</image>
-							<view v-for="(item,index) in value.bottomLeg" :key="index" style="position: relative;">
-								<view
-									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
-									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-										@click="showPhoto(index,value.bottomLeg)">
-									</image>
-								</view>
-								<view v-else>
-									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-								</view>
-								<view @click="removeht(index,key,'Dtlj')"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-									</image>
-								</view>
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+											#000;margin-top: 5px;margin-left: 8px;">回填后照片:</text>
+					</view>
+					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
+						<image :src="loadImgSrc('updateimg.png')" mode=""
+							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('hth',key)">
+						</image>
+						<view v-for="(item,index) in value.zEngiineeringPhotoBoListThree" :key="index"
+							style="position: relative;">
+							<view
+								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
+								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+									@click="showPhoto(index,value.zEngiineeringPhotoBoListThree)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+							</view>
+							<view @click="removeht(index,key,'hth')"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+								</image>
 							</view>
+
 						</view>
+					</view>
 
 
-						<view class="uni-common-mt" style="width: 100%;">
-							<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-											#000;margin-top: 5px;margin-left: 8px;">调压箱护栏及地面硬化（远景）照片:</text>
-						</view>
-						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px;">
-							<image :src="loadImgSrc('updateimg.png')" mode=""
-								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('Hldmyh',key)">
-							</image>
-							<view v-for="(item,index) in value.groundHardening" :key="index"
-								style="position: relative;">
-								<view
-									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
-									<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-										@click="showPhoto(index,value.groundHardening)">
-									</image>
-								</view>
-								<view v-else>
-									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-								</view>
-								<view @click="removeht(index,key,'Hldmyh')"
-									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-									</image>
-								</view>
-							</view>
-						</view>
 
-					</view>
 
 				</view>
+
 			</view>
 		</view>
+		</view>
 
 		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
 			subtitleKey="id">
@@ -251,9 +206,9 @@
 	} from '../../utils/auth';
 	import user from '@/store/modules/user'
 	import {
-		getHistoryEnginprojectDetails,
+		getEngineeringHistoryListNew,
 		getEnginMaterialQualityList,
-		Putengineering,
+		PutengineeringNew,
 		getEnginSpecificationsList
 	} from '@/api/common'
 	export default {
@@ -291,11 +246,11 @@
 				let e = JSON.parse(decodeURIComponent(options.params));
 				this.nodeId = e.id;
 				this.type = e.type;
-				getHistoryEnginprojectDetails(this.nodeId, this.type).then(response => {
+				getEngineeringHistoryListNew(this.nodeId, this.type).then(response => {
 					if (response.data.zEngineeringNodeBo != null) {
 						this.hideButton = false;
 						this.dataJson = response.data;
-						this.title = response.data.enginClassification;
+						this.title = response.data.zEngineeringNodeBo.type;
 						this.enginType = response.data.enginType;
 						this.enginClassification = response.data.enginClassification;
 
@@ -401,28 +356,21 @@
 					success: (res) => {
 						if (res.confirm) {
 
-							if (type == 'Box') {
-								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].boxBrand
-									.splice(index, 1)
-
-							} else if (type == 'Sfht') {
-								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].stonePowder
-									.splice(index, 1)
-
-							} else if (type == 'Fljd') {
-								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].lightning
+							if (type == 'htq') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.zEngiineeringPhotoBoListOne
 									.splice(index, 1)
 
-							} else if (type == 'Dtlj') {
+							} else if (type == 'jsdps') {
 								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
-									.bottomLeg
+									.zEngiineeringPhotoBoListTwo
 									.splice(index, 1)
-							} else if (type == 'Hldmyh') {
-
 
+							} else if (type == 'hth') {
 								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
-									.groundHardening
+									.zEngiineeringPhotoBoListThree
 									.splice(index, 1)
+
 							}
 
 						}
@@ -485,35 +433,23 @@
 													.zEngineeringInfoBoList[_this.dataIndex]
 													.zEngiineeringPhotoBoList.push(data.data
 														.url);
-											} else if (e == 'Box') {
+											} else if (e == 'htq') {
 												_this.dataJson.zEngineeringNodeBo
 													.zEngineeringInfoBoList[_this.dataIndex]
-													.boxBrand.push(data.data
+													.zEngiineeringPhotoBoListOne.push(data.data
 														.url);
-											} else if (e == 'Sfht') {
+											} else if (e == 'jsdps') {
 												_this.dataJson.zEngineeringNodeBo
 													.zEngineeringInfoBoList[_this.dataIndex]
-													.stonePowder.push(data.data
+													.zEngiineeringPhotoBoListTwo.push(data.data
 														.url);
-											} else if (e == 'Fljd') {
+											} else if (e == 'hth') {
 												_this.dataJson.zEngineeringNodeBo
 													.zEngineeringInfoBoList[_this.dataIndex]
-													.lightning.push(data.data
-														.url);
-											} else if (e == 'Dtlj') {
-
-												_this.dataJson.zEngineeringNodeBo
-													.zEngineeringInfoBoList[_this.dataIndex]
-													.bottomLeg.push(data.data
-														.url);
-											} else if (e == 'Hldmyh') {
-
-												_this.dataJson.zEngineeringNodeBo
-													.zEngineeringInfoBoList[_this.dataIndex]
-													.groundHardening.push(data.data
+													.zEngiineeringPhotoBoListThree.push(data
+														.data
 														.url);
 											}
-
 											_this.$modal.msg('上传成功！')
 										}
 									}
@@ -568,27 +504,19 @@
 											_this.dataJson.zEngineeringNodeBo
 												.zEngineeringInfoBoList[_this.dataIndex]
 												.zEngiineeringPhotoBoList.push(data.data.url);
-										} else if (e == 'Box') {
+										} else if (e == 'htq') {
 											_this.dataJson.zEngineeringNodeBo
 												.zEngineeringInfoBoList[_this.dataIndex]
-												.boxBrand.push(data.data.url);
+												.zEngiineeringPhotoBoListOne.push(data.data.url);
 
-										} else if (e == 'Sfht') {
-											_this.dataJson.zEngineeringNodeBo
-												.zEngineeringInfoBoList[_this.dataIndex]
-												.stonePowder.push(data.data.url);
-										} else if (e == 'Fljd') {
+										} else if (e == 'jsdps') {
 											_this.dataJson.zEngineeringNodeBo
 												.zEngineeringInfoBoList[_this.dataIndex]
-												.lightning.push(data.data.url);
-										} else if (e == 'Dtlj') {
+												.zEngiineeringPhotoBoListTwo.push(data.data.url);
+										} else if (e == 'hth') {
 											_this.dataJson.zEngineeringNodeBo
 												.zEngineeringInfoBoList[_this.dataIndex]
-												.bottomLeg.push(data.data.url);
-										} else if (e == 'Hldmyh') {
-											_this.dataJson.zEngineeringNodeBo
-												.zEngineeringInfoBoList[_this.dataIndex]
-												.groundHardening.push(data.data.url);
+												.zEngiineeringPhotoBoListThree.push(data.data.url);
 										}
 										_this.$modal.msg('上传成功！')
 									}
@@ -660,62 +588,91 @@
 			},
 			submit() {
 				let isSubmit = true;
-				if (this.title == '调压柜') {
-					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
-						if (res.boxBrand.length == 0) {
-							this.$modal.msg("请上传调压箱铭牌照片");
-							isSubmit = false;
-						}
-						if (res.stonePowder.length == 0) {
-							this.$modal.msg("请上传调压箱内石粉回填照片");
-							isSubmit = false;
-						}
-						if (res.lightning.length == 0) {
-							this.$modal.msg("请上传调压箱防雷接地照片");
-							isSubmit = false;
-						}
-						if (res.bottomLeg.length == 0) {
-							this.$modal.msg("请上传调压箱底腿连接照片");
-							isSubmit = false;
-						}
-						if (res.groundHardening.length == 0) {
-							this.$modal.msg("请上传调压箱护栏及地面硬化（远景）照片");
-							isSubmit = false;
-						}
-					})
-
-				} else {
-
-
-					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+				// if (this.title == '调压柜') {
+				// 	this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+				// 		if (res.boxBrand.length == 0) {
+				// 			this.$modal.msg("请上传调压箱铭牌照片");
+				// 			isSubmit = false;
+				// 		}
+				// 		if (res.stonePowder.length == 0) {
+				// 			this.$modal.msg("请上传调压箱内石粉回填照片");
+				// 			isSubmit = false;
+				// 		}
+				// 		if (res.lightning.length == 0) {
+				// 			this.$modal.msg("请上传调压箱防雷接地照片");
+				// 			isSubmit = false;
+				// 		}
+				// 		if (res.bottomLeg.length == 0) {
+				// 			this.$modal.msg("请上传调压箱底腿连接照片");
+				// 			isSubmit = false;
+				// 		}
+				// 		if (res.groundHardening.length == 0) {
+				// 			this.$modal.msg("请上传调压箱护栏及地面硬化（远景）照片");
+				// 			isSubmit = false;
+				// 		}
+				// 	})
+
+				// } else {
+
+
+				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+
+					if (res.createBy == this.$user.state.name) {
+						if (this.title == '焊接、防腐' || this.title == '架空管线' || this.title ==
+							'下管' || this.title == '沟下连头' || this.title == '焊接') {
+							res.zEngineeringMaterialBo.forEach((itme) => {
+								if (itme.specifications == '') {
+									this.$modal.msg("请选择规格");
+									isSubmit = false;
+								}
+								if (itme.number == '') {
+									this.$modal.msg("请输入米数");
+									isSubmit = false;
+								}
+								if (this.getIntegerPart(itme.number, 0) == '') {
+									this.$modal.msg("请输入米数");
+									isSubmit = false;
+								}
+							})
 
-						res.zEngineeringMaterialBo.forEach((itme) => {
-							if (itme.specifications == '') {
-								this.$modal.msg("请选择规格");
+						}
+						if (this.title == '回填、撤场') {
+							if (res.zEngiineeringPhotoBoListOne.length <= 0) {
+								this.$modal.msg('请上传回填前照片')
 								isSubmit = false;
 							}
-							if (itme.number == '') {
-								this.$modal.msg("请输入米数");
+							if (res.zEngiineeringPhotoBoListTwo.length <= 0) {
+								this.$modal.msg('请上传警示带铺设照片')
 								isSubmit = false;
 							}
-						})
+							if (res.zEngiineeringPhotoBoListThree.length <= 0) {
+								this.$modal.msg('请上传回填后照片')
+								isSubmit = false;
+							}
+						} else {
+							if (res.zEngiineeringPhotoBoList.length == 0) {
+								this.$modal.msg("请上传照片");
+								isSubmit = false;
+							}
+						}
 
-					})
+					}
+				})
 
 
-					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
-						if (res.zEngiineeringPhotoBoList.length == 0) {
-							this.$modal.msg("请上传照片");
-							isSubmit = false;
-						}
+				// this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList.forEach((res) => {
+				// 	if (res.zEngiineeringPhotoBoList.length == 0) {
+				// 		this.$modal.msg("请上传照片");
+				// 		isSubmit = false;
+				// 	}
 
-					})
-				}
+				// })
+				//}
 				if (!isSubmit) {
 					return
 				}
 
-				Putengineering(this.dataJson).then(
+				PutengineeringNew(this.dataJson).then(
 
 					response => {
 						if (response.code == '200') {

pages/statistics/statistics.vue

@@ -462,15 +462,14 @@
 							</view>
 						</view>
 						<view
-							v-if="EngineeringValue=='顶管工程'||EngineeringValue=='基建工程'||EngineeringValue=='危险工程'||EngineeringValue=='市政工程'||EngineeringValue=='工业工程'||EngineeringValue=='带气封堵施工'">
+							v-if="EngineeringValue=='顶管工程'||EngineeringValue=='基建工程'||EngineeringValue=='碰口作业'||EngineeringValue=='市政工程'||EngineeringValue=='工业工程'||EngineeringValue=='带气封堵施工'">
 							<view class="font-forty">
 								工程名称：{{item.enginName}}
 							</view>
 							<view class="font-twenty-eight gray" v-for="(state,stateIndex) in item.status"
 								:key="stateIndex">
-								<view v-if="EngineeringValue=='工业工程'">{{state.reviewStatus}}</view>
 
-								<view v-else>{{state.type}}-{{state.reviewStatus}}</view>
+								<view>{{state.type}}-{{state.reviewStatus}}</view>
 							</view>
 						</view>
 
@@ -687,6 +686,7 @@
 
 
 			chooseNode(item) {
+				console.log("ddd")
 				if (this.EngineeringValue == '民用工程') {
 					this.typeList = item.nodeReViewStateList
 					this.nodeId = item.id;
@@ -720,23 +720,25 @@
 								obj))
 					})
 				} else if (this.EngineeringValue == '市政工程' || this.EngineeringValue == '基建工程' || this.EngineeringValue ==
-					'顶管工程') {
+					'顶管工程' || this.EngineeringValue == '工业工程') {
 					this.nodeId = item.id;
 					let result = JSON.parse(JSON.stringify(item.status).replace(/type/g, 'Type'));
 					this.typeList = result;
 					this.handleShowSheet();
-				} else if (this.EngineeringValue == '工业工程') {
-					this.nodeId = item.id;
-					let obj = {
-						id: this.nodeId,
-						type: '历史数据'
-					};
-					uni.navigateTo({
-						url: '/pages/statistics/historyDetailsEnginproject?params=' + encodeURIComponent(JSON
-							.stringify(
-								obj))
-					})
-				} else if (this.EngineeringValue == '带气封堵施工') {
+				}
+				// else if (this.EngineeringValue == '工业工程') {
+				// 	this.nodeId = item.id;
+				// 	let obj = {
+				// 		id: this.nodeId,
+				// 		type: '历史数据'
+				// 	};
+				// 	uni.navigateTo({
+				// 		url: '/pages/statistics/historyDetailsEnginproject?params=' + encodeURIComponent(JSON
+				// 			.stringify(
+				// 				obj))
+				// 	})
+				// }
+				else if (this.EngineeringValue == '带气封堵施工') {
 					this.nodeId = item.id;
 					let obj = {
 						id: this.nodeId,
@@ -853,6 +855,18 @@
 									obj))
 						})
 						this.handleHiddenShare();
+					} else if (this.EngineeringValue == '工业工程') {
+						let obj = {
+							id: this.nodeId,
+							type: item.Type,
+						};
+						uni.navigateTo({
+							url: '/pages/statistics/historyDetailsEnginproject?params=' + encodeURIComponent(JSON
+								.stringify(
+									obj))
+						})
+						this.handleHiddenShare();
+
 					}
 				}
 			},
@@ -865,10 +879,10 @@
 
 						// if (item != '危险作业工程') {
 						// 	console.log("===", item)
-							this.EngineeringList.push({
-								'id': index,
-								'name': item
-							})
+						this.EngineeringList.push({
+							'id': index,
+							'name': item
+						})
 						//}
 					});
 
@@ -974,17 +988,17 @@
 				} else if (e == 'xq') {
 					// if (this.isEmpty(this.XZQValue.dictValue)) {
 					// 	this.$modal.msg('请选择行政区')
-          //
+					//
 					// } else {
-          this.XQValue = '';
-          this.LDValue = '';
-          this.DYValue = '';
-          this.FJValue = '';
-          getAreaList('').then(res => {
-            this.XQList = res.data;
-            this.open = true;
-            this.selectList = this.XQList;
-          })
+					this.XQValue = '';
+					this.LDValue = '';
+					this.DYValue = '';
+					this.FJValue = '';
+					getAreaList('').then(res => {
+						this.XQList = res.data;
+						this.open = true;
+						this.selectList = this.XQList;
+					})
 
 					// }
 				} else if (e == 'ld') {
@@ -1023,17 +1037,17 @@
 				} else if (e == 'xq2') {
 					// if (this.isEmpty(this.XZQValue2.dictValue)) {
 					// 	this.$modal.msg('请选择行政区')
-          //
+					//
 					// } else {
-          this.XQValue2 = '';
-          this.LDValue2 = '';
-          this.DYValue2 = '';
-          this.FJValue2 = '';
-          getAreaList('').then(res => {
-            this.XQList2 = res.data;
-            this.open = true;
-            this.selectList = this.XQList2;
-          })
+					this.XQValue2 = '';
+					this.LDValue2 = '';
+					this.DYValue2 = '';
+					this.FJValue2 = '';
+					getAreaList('').then(res => {
+						this.XQList2 = res.data;
+						this.open = true;
+						this.selectList = this.XQList2;
+					})
 					// }
 				} else if (e == 'ld2') {
 
@@ -1056,17 +1070,17 @@
 				} else if (e == 'xq3') {
 					// if (this.isEmpty(this.XZQValue3.dictValue)) {
 					// 	this.$modal.msg('请选择行政区')
-          //
+					//
 					// } else {
-          this.XQValue3 = '';
-          this.LDValue3 = '';
-          this.DYValue3 = '';
-          this.FJValue3 = '';
-          getAreaList('').then(res => {
-            this.XQList3 = res.data;
-            this.open = true;
-            this.selectList = this.XQList3;
-          })
+					this.XQValue3 = '';
+					this.LDValue3 = '';
+					this.DYValue3 = '';
+					this.FJValue3 = '';
+					getAreaList('').then(res => {
+						this.XQList3 = res.data;
+						this.open = true;
+						this.selectList = this.XQList3;
+					})
 					// }
 				} else if (e == 'ld3') {
 
@@ -1111,7 +1125,6 @@
 				}
 			},
 			clear() {
-				console.log("111")
 				//清空所有筛选项
 				this.XZQValue3 = '';
 				this.XQValue3 = '';
@@ -1219,7 +1232,10 @@
 						this.XQList3 = res.data;
 					})
 				} else if (this.type == 'xq2') {
-          this.XZQValue2 = {dictValue:item.district,dictLabel:item.districtName};
+					this.XZQValue2 = {
+						dictValue: item.district,
+						dictLabel: item.districtName
+					};
 					this.XQValue2 = item;
 
 					this.LDValue2 = '';
@@ -1229,7 +1245,10 @@
 						this.LDList2 = res.data
 					})
 				} else if (this.type == 'xq3') {
-          this.XZQValue3 = {dictValue:item.district,dictLabel:item.districtName};
+					this.XZQValue3 = {
+						dictValue: item.district,
+						dictLabel: item.districtName
+					};
 					this.XQValue3 = item;
 
 					this.LDValue3 = '';
@@ -1303,7 +1322,10 @@
 					realityQuality: this.materialValue.id,
 					realitySpecifications: this.specificationValue.id,
 				};
-        this.XZQValue = {dictValue:this.XQValue.district,dictLabel:this.XQValue.districtName};
+				this.XZQValue = {
+					dictValue: this.XQValue.district,
+					dictLabel: this.XQValue.districtName
+				};
 				getMunicipalStatisticsData(param).then(res => {
 					this.materialUsageList = res.data;
 				})
@@ -1365,7 +1387,6 @@
 				});
 			},
 			changeTab() {
-				console.log("222")
 				this.pageSize = 10;
 				this.totalNum = '';
 				this.pageNum = 1;
@@ -1482,7 +1503,7 @@
 
 					})
 				} else if (this.EngineeringValue == '顶管工程' || this.EngineeringValue == '基建工程' || this.EngineeringValue ==
-					'危险作业工程' || this.EngineeringValue == '市政工程' || this.EngineeringValue == '工业工程' || this
+					'碰口作业' || this.EngineeringValue == '市政工程' || this.EngineeringValue == '工业工程' || this
 					.EngineeringValue == '带气封堵施工') {
 					//type 1 = 顶管， 2=基建 3=危险 4= 市政 5= 工业 type=6   是带气封堵
 					let chooseType = '';
@@ -1493,8 +1514,8 @@
 						case '基建工程':
 							chooseType = '2';
 							break
-						case '危险作业工程':
-							chooseType = '3';
+						case '碰口作业':
+							chooseType = '7';
 							break
 						case '市政工程':
 							chooseType = '4';
@@ -1928,4 +1949,4 @@
 
 
 	}
-</style>
+</style>

pages/work/index.vue

@@ -13,11 +13,11 @@
 					<image class="icon-item" :src="loadImgSrc('mygc.png')" v-if="item.title == '民用工程'"></image>
 					<image class="icon-item" :src="loadImgSrc('gygc.png')" v-if="item.title == '工业工程'"></image>
 					<image class="icon-item" :src="loadImgSrc('szgc.png')" v-if="item.title == '市政工程'"></image>
-					<image class="icon-item" :src="loadImgSrc('wxzy.png')" v-if="item.title == '危险作业工程'"></image>
+					<image class="icon-item" :src="loadImgSrc('wxzy.png')" v-if="item.title == '碰口作业'"></image>
 					<image class="icon-item" :src="loadImgSrc('dggc.png')" v-if="item.title == '顶管工程'"></image>
 					<image class="icon-item" :src="loadImgSrc('jjgc.png')" v-if="item.title == '基建工程'"></image>
 					<image class="icon-item" :src="loadImgSrc('open_bolt.png')" v-if="item.title == '开栓'"></image>
-					<image class="icon-item" :src="loadImgSrc('gas_sealing.png')" v-if="item.title == '带气封堵施工'"></image>
+					<!-- 	<image class="icon-item" :src="loadImgSrc('gas_sealing.png')" v-if="item.title == '带气封堵施工'"></image> -->
 					<view class="GStitle">{{ item.title }}</view>
 				</view>
 			</view>
@@ -143,6 +143,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 				enginClassValue: '', //二次节点  数据字典
 				current: 0,
 				swiperDotIndex: 0,
+				title_lebel: '',
 				List: [{
 						id: 1,
 						img: '/static/logo.png',
@@ -161,7 +162,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					{
 						id: 4,
 						img: '/static/logo.png',
-						title: '危险作业工程'
+						title: '碰口作业'
 					},
 					{
 						id: 5,
@@ -464,6 +465,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 								break
 						}
 						this.handleHiddenShare();
+						this.title_lebel = item.dictValue;
 						getDicts(label).then(response => {
 
 							this.typeList = response.data;
@@ -472,7 +474,8 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						this.handleShowSheet();
 					} else {
 						let obj = {
-							value: item.dictValue
+							value: item.dictValue,
+							title: this.title_lebel
 						};
 
 						uni.navigateTo({
@@ -507,6 +510,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 						}
 						this.handleHiddenShare();
+						this.title_lebel = item.dictValue;
 						getDicts(label).then(response => {
 
 							this.typeList = response.data;
@@ -517,7 +521,8 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					} else {
 						let obj = {
 							value: item.dictValue,
-							label: item.dictLabel
+							label: item.dictLabel,
+							title: this.title_lebel,
 						};
 						uni.navigateTo({
 							url: '/pages/collision/collisionMouth?params=' + encodeURIComponent(JSON