Forráskód Böngészése

工业修改历史

zhanghongrui 1 éve
szülő
commit
d7de7ec8c6

+ 17 - 0
api/common.js

@@ -1,5 +1,22 @@
 import request from '@/utils/request'
 
+// 工业工程修改
+export function Putengineering(engineering) {
+	return request({
+		'url': '/zdsz/engineeringIndustry/updateNodeByBo',
+		'method': 'put',
+		'data': engineering
+	})
+}
+
+// 获取工业历史详情
+export function getHistoryEnginprojectDetails(id, name) {
+
+	return request({
+		'url': '/zdsz/engineeringIndustry/query/' + id + '/' + name,
+		'method': 'get',
+	})
+}
 export function getHistoryByUserList(param) {
 	//type 1 = 顶管, 2=基建 3=危险 4= 市政 5= 工业
 	return request({

+ 2 - 2
config.js

@@ -2,8 +2,8 @@
 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.20:8080',
+	//baseUrl: 'http://192.168.4.23:8080',
+	 baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
 	// 应用信息

+ 10 - 7
pages.json

@@ -104,10 +104,14 @@
 			"path": "pages/statistics/historyDetailsCourtyard",
 			"style": {
 				"navigationBarTitleText": "历史详情"
-
+			}
+		}, {
+			"path": "pages/statistics/historyDetailsEnginproject",
+			"style": {
+				"navigationBarTitleText": "历史详情"
 			}
 		},
-		
+
 		{
 			"path": "pages/statistics/history_details_bottom_leg",
 			"style": {
@@ -142,11 +146,10 @@
 			}
 		},
 		{
-			"path" : "pages/gas_sealing_project/gas_sealing_project",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
+			"path": "pages/gas_sealing_project/gas_sealing_project",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
 			}
 		}
 

+ 6 - 5
pages/enginproject/enginproject.vue

@@ -217,7 +217,7 @@
 							</view>
 							<button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
 						</view>
-						<button @click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl: {
+						<button  v-if="objValue.value!='调压柜'" @click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl: {
 							inputIntegerNumberValue: '',
 							inputDecimalNumberValue: ''
 						}})" class="tj-btn">添加</button>
@@ -233,7 +233,7 @@
 								</image>
 								<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
 									<view
-										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.picUrl.substring(item.picUrl.length-4)=='jpeg'  ">
+										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,'other')">
 										</image>
@@ -252,7 +252,7 @@
 					</view>
 					<view v-else>
 						<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
-							<view class="container" style="color: #b2b2b2;">*请上传调压箱牌照片</view>
+							<view class="container" style="color: #b2b2b2;">*请上传调压箱牌照片</view>
 							<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('Box')"
@@ -1039,7 +1039,7 @@
 					if (this.objValue.value == '调压柜') {
 
 						if (this.imgBoxArr.length <= 0) {
-							this.$modal.msg('请上传调压箱牌照片')
+							this.$modal.msg('请上传调压箱牌照片')
 							return
 						}
 						if (this.imgSfhtArr.length <= 0) {
@@ -1098,8 +1098,9 @@
 						supervisionHead: this.jlfzrValue, // 监理负责人
 						supervisionPhone: this.jlPhoneValue, // 监理联系电话
 						enginClassification: this.objValue.value, // 工程分类  上一页面传过来的
+						createTime: this.createTime,
 						zEngineeringNodeBo: {
-							//createTime: this.createTime,
+							
 							type: '工业工程', // 写死
 							zEngineeringInfoBo: {
 								//engInfoId: this.infonId,

+ 942 - 0
pages/statistics/historyDetailsEnginproject.vue

@@ -0,0 +1,942 @@
+<template>
+	<scroll-view>
+		<view class="uni-media-list" v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList"
+			:key="key" v-if="isEdit(value)">
+
+			<view class="uni-media-list-body">
+				<view>
+					<view class="uni-media-list-text-top">
+						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+					</view>
+					<view class="uni-media-list-text-top">
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="tit-text" style=" font-size: 13px;color:
+									#000;margin-top: 5px;">施工内容:</text>
+							<view style="width: 100%;box-sizing: border-box;">
+								<textarea class="textarea" maxlength="255" placeholder-style="padding: 10rpx;"
+									style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+									auto-height :value="value.remark"
+									@blur="bindTextAreaBlur($event.target.value,key)"></textarea>
+							</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 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 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 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>
+								<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="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>
+						</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>
+						</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>
+						</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>
+						</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>
+
+		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
+			subtitleKey="id">
+		</SelectPicker>
+		<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
+			titleKey="dictLabel" subtitleKey="dictValue" v-model="name"></SelectPicker>
+		<view class="action-btn" v-if="hideButton==false">
+			<button @click="submit" class="btn cu-btn block bg-blue lg round">确认</button>
+		</view>
+	</scroll-view>
+</template>
+
+<script>
+	import SelectPicker from '../../components/selectPicker/select_picker.vue'
+	import {
+		getDicts
+	} from "@/api/system/dict/data";
+	import {
+		getToken
+	} from '../../utils/auth';
+	import user from '@/store/modules/user'
+	import {
+		getHistoryEnginprojectDetails,
+		getEnginMaterialQualityList,
+		Putengineering,
+		getEnginSpecificationsList
+	} from '@/api/common'
+	export default {
+		components: {
+			SelectPicker,
+		},
+		data() {
+			return {
+				// playVideo: false,//视频播放放大
+				// playVideoSrc:'',
+				selectZbfList: [],
+				dictOptions: [],
+				openDict: false,
+				dataIndex: 0, //数据用第几条
+				selectIndex: 0, //材质规格用的第几条
+				imageIndex: 0,
+				headers: {
+					Authorization: "Bearer " + getToken()
+				},
+				nodeId: '',
+				type: '',
+				title: '',
+				dataJson: '',
+				enginClassification: '',
+				enginType: '',
+				enginClassValue: '',
+				selectList: [],
+				open: false,
+				selectType: '',
+				hideButton: false,
+			}
+		},
+		onLoad(options) {
+			if ('params' in options) {
+				let e = JSON.parse(decodeURIComponent(options.params));
+				this.nodeId = e.id;
+				this.type = e.type;
+				getHistoryEnginprojectDetails(this.nodeId, this.type).then(response => {
+					if (response.data.zEngineeringNodeBo != null) {
+						this.hideButton = false;
+						this.dataJson = response.data;
+						this.title = response.data.enginClassification;
+						this.enginType = response.data.enginType;
+						this.enginClassification = response.data.enginClassification;
+
+					} else {
+						this.hideButton = true;
+						this.$modal.msg("暂无历史信息")
+					}
+				});
+
+			}
+		},
+		methods: {
+			//关闭弹窗
+			close(e) {
+				this.open = false
+			},
+			btnAdd(key, index) {
+
+				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo.push({
+
+					'materialQuality': '',
+					'materialQualityName': '',
+					'number': '',
+					'specifications': '',
+					'specificationsName': ''
+
+				});
+			},
+			btnDel(key, index) {
+				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo.splice(index, 1);
+			},
+			pickerShow(e, index, indexTwo) {
+				this.dataIndex = index;
+				this.selectIndex = indexTwo; //材质规格 第几条
+				this.selectType = e;
+				if (e == 'cz') {
+					this.open = true;
+					getEnginMaterialQualityList("工业工程").then(response => {
+						this.selectList = response.data;
+					});
+				}
+				if (e == 'gg') {
+					if (this.isEmpty(this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex]
+							.zEngineeringMaterialBo[this.selectIndex].materialQuality)) {
+						this.$modal.msg('请选择材质')
+					} else {
+						this.open = true;
+						getEnginSpecificationsList(this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex]
+							.zEngineeringMaterialBo[this.selectIndex].materialQuality).then(res => {
+							this.selectList = res.data
+						})
+					}
+				}
+			},
+			changeSelect(item, index) {
+				this.open = false;
+				if (this.selectType == 'cz') {
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex].zEngineeringMaterialBo[this
+							.selectIndex]
+						.materialQuality = item.id;
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex].zEngineeringMaterialBo[this
+							.selectIndex]
+						.materialQualityName = item.name;
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex].zEngineeringMaterialBo[this
+							.selectIndex]
+						.specifications = '';
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex].zEngineeringMaterialBo[this
+							.selectIndex]
+						.specificationsName = '';
+
+
+				} else if (this.selectType == 'gg') {
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex].zEngineeringMaterialBo[this
+							.selectIndex]
+						.specifications = item.id;
+					this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[this.dataIndex].zEngineeringMaterialBo[this
+							.selectIndex]
+						.specificationsName = item.name;
+				}
+			},
+			// 截取小数点前的字符串
+			getIntegerPart(numStr, i) {
+				return numStr.toString().split('.')[i] == undefined ? '0' : numStr.toString().split('.')[i];
+			},
+			setInfoBoNumber(key, index, number, i) {
+				let Ynumber = this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[index]
+					.number;
+				let resAry = Ynumber.toString().split('.');
+				resAry[i] = number
+				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key].zEngineeringMaterialBo[index].number = resAry
+					.join('.');
+			},
+			bindTextAreaBlur(e, index) {
+
+				this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[index].remark = e;
+
+			},
+
+			removeht(index, key, type) {
+				uni.showModal({
+					title: '提示',
+					content: '是否删除该图片或视频?',
+					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
+									.splice(index, 1)
+
+							} else if (type == 'Dtlj') {
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.bottomLeg
+									.splice(index, 1)
+							} else if (type == 'Hldmyh') {
+
+
+								this.dataJson.zEngineeringNodeBo.zEngineeringInfoBoList[key]
+									.groundHardening
+									.splice(index, 1)
+							}
+
+						}
+					}
+				})
+			},
+			remove(index, key) {
+				uni.showModal({
+					title: '提示',
+					content: '是否删除该图片或视频?',
+					success: (res) => {
+						if (res.confirm) {
+
+							this.dataJson.zEngineeringNodeBo
+								.zEngineeringInfoBoList[key]
+								.zEngiineeringPhotoBoList.splice(index, 1)
+
+						}
+					}
+				})
+			},
+
+			choose(type, index) {
+				this.dataIndex = index;
+				let _this = this;
+				uni.showActionSheet({
+					title: '上传',
+					itemList: ['图片', '视频'],
+					success: (res) => {
+						if (res.tapIndex == 0) {
+							this.chooseimage(type)
+						} else {
+							this.choosevideo(type)
+						}
+					}
+				})
+			},
+			chooseimage(e) {
+
+				let _this = this;
+				uni.chooseImage({
+					sizeType: ['album', 'camera'],
+					success(resp) {
+						resp.tempFiles.forEach((item, index) => {
+							const task = uni.uploadFile({
+								url: _this.$HTTP + `/obs`,
+								filePath: item.path,
+								name: 'file',
+								formData: {},
+								header: _this.headers,
+
+								success: res => {
+									let data = JSON.parse(res.data);
+									if (![200].includes(data.code)) {
+										_this.$modal.msg(data.msg)
+									} else {
+										if (_this.progress === 100) {
+											if (e == 'other') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.zEngiineeringPhotoBoList.push(data.data
+														.url);
+											} else if (e == 'Box') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.boxBrand.push(data.data
+														.url);
+											} else if (e == 'Sfht') {
+												_this.dataJson.zEngineeringNodeBo
+													.zEngineeringInfoBoList[_this.dataIndex]
+													.stonePowder.push(data.data
+														.url);
+											} else if (e == 'Fljd') {
+												_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
+														.url);
+											}
+
+											_this.$modal.msg('上传成功!')
+										}
+									}
+								},
+								fail: e => {
+									_this.$modal.msg('上传失败!')
+								},
+								complete: res => {
+									uni.hideLoading();
+									_this.uploading = false;
+
+								}
+							});
+							task.onProgressUpdate(res => {
+								_this.progress = res.progress;
+								uni.showLoading({
+									title: '上传中'
+								})
+								if (_this.progress != 100) {
+									_this.loading = false
+								} else {
+									_this.loading = true
+								}
+							});
+
+						})
+
+					},
+				})
+			},
+
+			choosevideo(e) {
+				let _this = this;
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					maxDuration: 30,
+					success(resp) {
+						const task = uni.uploadFile({
+							url: _this.$HTTP + `/obs`,
+							filePath: resp.tempFilePath,
+							name: 'file',
+							formData: {},
+							header: _this.headers,
+							success: res => {
+								let data = JSON.parse(res.data);
+								if (![200].includes(res.statusCode)) {
+									this.uploadError(index, data);
+								} else {
+									//上传成功
+									if (_this.progress === 100) {
+										if (e == 'other') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.zEngiineeringPhotoBoList.push(data.data.url);
+										} else if (e == 'Box') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.boxBrand.push(data.data.url);
+
+										} else if (e == 'Sfht') {
+											_this.dataJson.zEngineeringNodeBo
+												.zEngineeringInfoBoList[_this.dataIndex]
+												.stonePowder.push(data.data.url);
+										} else if (e == 'Fljd') {
+											_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.url);
+										}
+										_this.$modal.msg('上传成功!')
+									}
+								}
+							},
+							fail: e => {
+								_this.$modal.msg('上传失败!')
+								this.uploadError(index, e);
+							},
+							complete: res => {
+								uni.hideLoading();
+								_this.uploading = false;
+							}
+						});
+						task.onProgressUpdate(res => {
+							_this.progress = res.progress;
+							uni.showLoading({
+								title: '上传中'
+							})
+							if (_this.progress != 100) {
+								_this.loading = false
+							} else {
+								_this.loading = true
+							}
+						});
+
+					},
+				})
+			},
+			showPhoto(index, arr) {
+
+				let newArr = [];
+				arr.forEach((item, index) => {
+					if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
+						item.substring(item.length - 4) == 'jpeg') {
+						newArr.push(item)
+					}
+				});
+
+				uni.previewImage({
+					current: index,
+					urls: newArr,
+				})
+
+			},
+			// showVideo(arr) {
+			// 	this.playVideo = true;
+			// 	this.playVideoSrc = arr;
+			// },
+			// closeVideo(){
+			// 	this.playVideo = false;
+			// },
+
+
+
+
+			isEmpty(str) {
+
+				return (!str || 0 === str.length);
+
+			},
+
+
+
+			isEdit(item) {
+				var isShow = item.createBy == this.$user.state.name;
+
+				return isShow;
+			},
+			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) => {
+
+						res.zEngineeringMaterialBo.forEach((itme) => {
+							if (itme.specifications == '') {
+								this.$modal.msg("请选择规格");
+								isSubmit = false;
+							}
+							if (itme.number == '') {
+								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(
+
+					response => {
+						if (response.code == '200') {
+							uni.hideLoading()
+							uni.showToast({
+								title: response.msg,
+								icon: 'none',
+								duration: 2000
+							});
+							setTimeout(function() {
+								uni.navigateBack();
+							}, 1000)
+
+						}
+
+					});
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss">
+	.uni-media-list-body {
+		background: #fff;
+		border: 1px solid #eee;
+		border-radius: 40rpx;
+		margin: 20rpx;
+		padding: 10rpx 0 40rpx;
+		box-shadow: 0 0 5px #eee;
+	}
+
+	.uni-media-list-text-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px;
+		position: relative;
+
+	}
+
+
+	.to-right-icon {
+		width: 15px;
+		height: 15px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+
+	.share {
+		width: 100%;
+		height: 100%;
+
+	}
+
+	.tit-text {
+		color: #4f535a;
+		margin-right: 20rpx;
+	}
+
+	.normal-text {}
+
+	.cz-style {
+		background: #e8f4f9;
+		margin: 20rpx;
+		padding: 10rpx;
+		border-radius: 20rpx;
+		border: 1px solid #d4e3f0;
+	}
+
+	.uni-media-list-text-top {
+		font-size: 14px;
+		color: #696969;
+		padding: 20rpx 20rpx;
+		border-bottom: 1px solid #eee;
+		display: flex;
+		align-items: center;
+	}
+
+	.share-box {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0rpx;
+		left: 0rpx;
+		bottom: 0rpx;
+		right: 0rpx;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition: .3s;
+		z-index: 999;
+	}
+
+	// 进入分享动画
+	.share-show {
+		transition: all 0.3s ease;
+		transform: translateY(0%) !important;
+		border-radius: 20px 20px 0px 0px;
+	}
+
+	.scroll-Y {
+		height: 58vh;
+	}
+
+	// 离开分享动画
+	.share-item {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 70%;
+		background-color: #FFFFFF;
+		transition: all 0.3s ease;
+		transform: translateY(100%);
+		z-index: 1999;
+
+		.share-to {
+			width: 100%;
+			height: 30px;
+			display: flex;
+			justify-content: center;
+			margin: 30rpx 0;
+			align-items: center;
+
+
+		}
+
+		.content {
+			width: 100%;
+			height: auto;
+			display: flex;
+			flex-wrap: wrap;
+
+			.block {
+				width: 100%;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: left;
+				height: auto;
+
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+
+				text {
+					margin-top: 16rpx;
+					font-size: 28rpx;
+					color: #606266;
+				}
+			}
+		}
+
+		.cancel {
+			width: 100%;
+			height: 3rem;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-top: 1rpx solid #E4E7ED;
+		}
+
+
+	}
+
+	.uni-media-list-text-top {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px;
+		position: relative;
+
+	}
+
+	.uni-list {
+		border: 1xp solid #eee;
+	}
+
+	.to-right-icon {
+		width: 15px;
+		height: 15px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+
+
+	.text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.tj-btn {
+		height: 69rpx;
+		background: #3184f0;
+		border-radius: 6rpx;
+		font-size: 25rpx;
+		font-weight: 400;
+		width: 100%;
+		color: #FFFFFF;
+		line-height: 69rpx;
+		margin: 40rpx 70rpx;
+
+	}
+
+	.sc-btn {
+		height: 69rpx;
+		background: #f0686b;
+		border-radius: 6rpx;
+		font-size: 25rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 69rpx;
+		margin: 40rpx;
+
+	}
+
+	// .gesture-area {
+	// 	//加浮动弹窗
+	//   width: 100%;
+	//   height: 100%;
+	// }
+</style>

+ 11 - 0
pages/statistics/statistics.vue

@@ -726,6 +726,17 @@
 					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))
+					})
 				}
 			},
 			showHistoryList() {