From 68747319e6a24d9f2906fcd733fb182b075ad2e5 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Sat, 11 May 2024 18:31:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=B1=E5=A4=A7?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8BBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |  4 +--
 .../addConstructionStation.vue                | 32 ++++++++++++++++---
 pages/projectEnd/dangerBigProject/addPlan.vue | 29 ++++++++++++++---
 .../dangerBigProject/engineeringData.vue      | 27 ++++++++++++----
 .../dangerBigProject/finallyAcceptance.vue    |  2 +-
 pages/projectEnd/dangerBigProject/index.vue   |  4 ++-
 6 files changed, 80 insertions(+), 18 deletions(-)

diff --git a/main.js b/main.js
index 22876536..a722b9a1 100644
--- a/main.js
+++ b/main.js
@@ -37,8 +37,8 @@ if (process.env.NODE_ENV === 'development') {
   console.log('开发环境')
   // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
   // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
-  // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
-  Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
+  Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
+  // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
   // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
   // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
   // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
diff --git a/pages/projectEnd/dangerBigProject/addConstructionStation.vue b/pages/projectEnd/dangerBigProject/addConstructionStation.vue
index 40cd9e63..bfeda70c 100644
--- a/pages/projectEnd/dangerBigProject/addConstructionStation.vue
+++ b/pages/projectEnd/dangerBigProject/addConstructionStation.vue
@@ -8,16 +8,16 @@
 		<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
 			<view class="plan-form">
 				<view class="form-item b-bottom">
-					<view class="form-lable"><text class="tag">*</text>检查部位</view>
-					<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入检查部位" />
+					<view class="form-lable"><text class="tag">*</text>施工部位</view>
+					<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入施工部位" />
 				</view>
 				<view class="form-item f-column b-bottom">
-					<view class="form-lable">旁站记录</view>
+					<view class="form-lable"><text class="tag">*</text>旁站记录</view>
 					 <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入旁站记录" />
 					<view class="txt-length">{{textareaLengh}}/50</view>
 				</view>
 				<view class="form-item f-column">
-					<view class="form-lable">现场照片</view>
+					<view class="form-lable"><text class="tag">*</text>现场照片</view>
 					<view class="uni-form-input imgBox_wrap">
 						<view class="addImgBox" @click="uploadImg" v-show="formData.imgFileList.length == 0">
 							<image src="/static/safeMange/upload_image.png" class="icon-add" color="#F56C6C"></image>
@@ -135,6 +135,30 @@
 			},
 			saveForm(){
 				console.log(this.formData)
+				if(!this.formData.sideStationAddr){
+					uni.showToast({
+						icon: 'none',
+						title: '请输入施工部位',
+						duration: 2000
+					})
+					return
+				}
+				if(!this.formData.buildSituation){
+					uni.showToast({
+						icon: 'none',
+						title: '请输入旁站记录',
+						duration: 2000
+					})
+					return
+				}
+				if(!this.formData.imgFileList.length > 0){
+					uni.showToast({
+						icon: 'none',
+						title: '请上传图片',
+						duration: 2000
+					})
+					return
+				}
 				let data = {
 					sideStationAddr: this.formData.sideStationAddr,
 					buildSituation: this.formData.buildSituation,
diff --git a/pages/projectEnd/dangerBigProject/addPlan.vue b/pages/projectEnd/dangerBigProject/addPlan.vue
index 216a9864..72772b32 100644
--- a/pages/projectEnd/dangerBigProject/addPlan.vue
+++ b/pages/projectEnd/dangerBigProject/addPlan.vue
@@ -12,12 +12,12 @@
 					<input class="from-input" :maxlength="22" type="text" :value="formData.dutyRegion" @blur="bindInputBlur" placeholder="请输入责任区域" />
 				</view>
 				<view class="form-item f-column b-bottom">
-					<view class="form-lable">进度描述</view>
+					<view class="form-lable"><text class="tag">*</text>进度描述</view>
 					 <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.progressDescribe" placeholder="请输入进度描述" />
 					<view class="txt-length">{{textareaLengh}}/50</view>
 				</view>
 				<view class="form-item f-column">
-					<view class="form-lable">现场照片</view>
+					<view class="form-lable"><text class="tag">*</text>现场照片</view>
 					<view class="uni-form-input imgBox_wrap">
 						<view class="addImgBox" @click="uploadImg" v-show="formData.imgFileList.length == 0">
 							<image src="/static/safeMange/upload_image.png" class="icon-add" color="#F56C6C"></image>
@@ -150,9 +150,25 @@
 					arr.push(item.url)
 				})
 				data.imageUrl = arr.join(',')
-				if(data.dutyRegion == ""){
+				if(!data.dutyRegion){
 					uni.showToast({
-					    title: '请输入责任区域！',
+					    title: '请输入责任区域',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if(!data.progressDescribe){
+					uni.showToast({
+					    title: '请输入进度描述',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if(!data.imageUrl){
+					uni.showToast({
+					    title: '请上传图片',
 						icon: "none",
 						duration: 2000
 					});
@@ -180,9 +196,13 @@
 </script>
 
 <style lang="scss" scoped>
+	
 .addPlan{
 	min-height: 100%;
 	background: #F6F6F6;
+	/deep/ .uni-input-wrapper{
+		font-size: 14px;
+	}
 	.fixedheader{
 		position: fixed;
 		top: 0;
@@ -305,6 +325,7 @@
 					overflow: auto;
 				}
 			}
+			font-size: 14px;
 		}
 	}
 }
diff --git a/pages/projectEnd/dangerBigProject/engineeringData.vue b/pages/projectEnd/dangerBigProject/engineeringData.vue
index 01a27175..54375b2a 100644
--- a/pages/projectEnd/dangerBigProject/engineeringData.vue
+++ b/pages/projectEnd/dangerBigProject/engineeringData.vue
@@ -10,11 +10,16 @@
 					:key="index"
 					@click="previewFile(item)">
 					<view class="img-box">
-						<image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
+						<!-- <image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
 						<image v-if="item.iconType == 'excel'" src="../../../static/excel.png"></image>
 						<image v-if="item.iconType == 'pdf'" src="../../../static/pdf.png"></image>
 						<image v-if="item.iconType == 'ppt'" src="../../../static/ppt.png"></image>
-						<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image>
+						<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image> -->
+						<image v-if="item.iconType.includes('word')" src="../../../static/word.png"></image>
+						<image v-if="item.iconType.includes('excel')" src="../../../static/excel.png"></image>
+						<image v-if="item.iconType.includes('pdf')" src="../../../static/pdf.png"></image>
+						<image v-if="item.iconType.includes('ppt')" src="../../../static/ppt.png"></image>
+						<image v-if="item.iconType.includes('image')" src="../../../static/icon-image.png"></image>
 					</view>
 					<view class="item-content">{{item.name}}</view>
 					<uni-icons type="arrowright"></uni-icons>
@@ -29,11 +34,16 @@
 					:key="index"
 					@click="previewFile(item)">
 					<view class="img-box">
-						<image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
+						<!-- <image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
 						<image v-if="item.iconType == 'excel'" src="../../../static/excel.png"></image>
 						<image v-if="item.iconType == 'pdf'" src="../../../static/pdf.png"></image>
 						<image v-if="item.iconType == 'ppt'" src="../../../static/ppt.png"></image>
-						<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image>
+						<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image> -->
+						<image v-if="item.iconType.includes('word')" src="../../../static/word.png"></image>
+						<image v-if="item.iconType.includes('excel')" src="../../../static/excel.png"></image>
+						<image v-if="item.iconType.includes('pdf')" src="../../../static/pdf.png"></image>
+						<image v-if="item.iconType.includes('ppt')" src="../../../static/ppt.png"></image>
+						<image v-if="item.iconType.includes('image')" src="../../../static/icon-image.png"></image>
 					</view>
 					<view class="item-content">{{item.name}}</view>
 					<uni-icons type="arrowright"></uni-icons>
@@ -48,11 +58,16 @@
 					:key="index"
 					@click="previewFile(item)">
 					<view class="img-box">
-						<image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
+						<!-- <image v-if="item.iconType == 'word'" src="../../../static/word.png"></image>
 						<image v-if="item.iconType == 'excel'" src="../../../static/excel.png"></image>
 						<image v-if="item.iconType == 'pdf'" src="../../../static/pdf.png"></image>
 						<image v-if="item.iconType == 'ppt'" src="../../../static/ppt.png"></image>
-						<image v-if="item.iconType == 'image'" src="../../../static/icon-image.png"></image>
+						<image v-if="item.iconType == 'image/png'" src="../../../static/icon-image.png"></image> -->
+						<image v-if="item.iconType.includes('word')" src="../../../static/word.png"></image>
+						<image v-if="item.iconType.includes('excel')" src="../../../static/excel.png"></image>
+						<image v-if="item.iconType.includes('pdf')" src="../../../static/pdf.png"></image>
+						<image v-if="item.iconType.includes('ppt')" src="../../../static/ppt.png"></image>
+						<image v-if="item.iconType.includes('image')" src="../../../static/icon-image.png"></image>
 					</view>
 					<view class="item-content">{{item.name}}</view>
 					<uni-icons type="arrowright"></uni-icons>
diff --git a/pages/projectEnd/dangerBigProject/finallyAcceptance.vue b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue
index ccda0f3b..d86f13c1 100644
--- a/pages/projectEnd/dangerBigProject/finallyAcceptance.vue
+++ b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue
@@ -6,7 +6,7 @@
 					<text style="font-weight: bold;">危大工程名称：</text>{{item.engineeringName}}
 				</view>
 				<view style="padding:10px;">
-					<text style="font-weight: bold;">计划时间：</text>{{item.planTime}}
+					<text style="font-weight: bold;">验收时间：</text>{{item.planTime}}
 				</view>
 				<view style="padding:10px;">
 					<text style="font-weight: bold;">验收人：</text>{{item.acceptanceUserName}}
diff --git a/pages/projectEnd/dangerBigProject/index.vue b/pages/projectEnd/dangerBigProject/index.vue
index b953cc32..263299ef 100644
--- a/pages/projectEnd/dangerBigProject/index.vue
+++ b/pages/projectEnd/dangerBigProject/index.vue
@@ -14,7 +14,9 @@
 							<text class="tag" v-if="item.hiddenDangerNum > 0">未销项{{item.hiddenDangerNum}}</text>
 							{{item.engineeringName}}
 						</view>
-						<view :class="{'status1': item.engineeringState == 2,'status2': item.engineeringState == 3}">{{item.engineeringState == 2 ? "在施":item.engineeringState == 3 ? "已完工":""}}</view>
+						<view :class="{'status1': item.engineeringState == 2,'status2': item.engineeringState == 3 || item.finalAcceptanceStatus == 2}">
+							{{item.finalAcceptanceStatus === 2 ? '已完工' : item.engineeringState == 2 ? "在施":item.engineeringState == 3 ? "已完工":""}}
+						</view>
 					</view>
 					<view class="list-content">
 						<view class="list-info">

From 651bd673213c821949400bb4928626718b1bd058 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Sun, 12 May 2024 01:40:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=B1=E5=A4=A7?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8BBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/projectEnd/dangerBigProject/details.vue | 3 ++-
 pages/projectEnd/dangerBigProject/index.vue   | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pages/projectEnd/dangerBigProject/details.vue b/pages/projectEnd/dangerBigProject/details.vue
index df1241f4..0b1852f9 100644
--- a/pages/projectEnd/dangerBigProject/details.vue
+++ b/pages/projectEnd/dangerBigProject/details.vue
@@ -66,7 +66,8 @@
 							<finally-acceptance ref="list" v-if="componentName =='finallyAcceptance'" :detailId="detailId" :info="detailData" ></finally-acceptance>
 						</view>
 					</view>
-					<view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) 
+					<!-- <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) -->
+					<view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 
 					&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
 					@click="addForm">
 						<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
diff --git a/pages/projectEnd/dangerBigProject/index.vue b/pages/projectEnd/dangerBigProject/index.vue
index 263299ef..a3a912e2 100644
--- a/pages/projectEnd/dangerBigProject/index.vue
+++ b/pages/projectEnd/dangerBigProject/index.vue
@@ -14,8 +14,11 @@
 							<text class="tag" v-if="item.hiddenDangerNum > 0">未销项{{item.hiddenDangerNum}}</text>
 							{{item.engineeringName}}
 						</view>
-						<view :class="{'status1': item.engineeringState == 2,'status2': item.engineeringState == 3 || item.finalAcceptanceStatus == 2}">
-							{{item.finalAcceptanceStatus === 2 ? '已完工' : item.engineeringState == 2 ? "在施":item.engineeringState == 3 ? "已完工":""}}
+						<!-- <view :class="{'status1': item.engineeringState == 2,'status2': item.engineeringState == 3}">
+							{{item.engineeringState == 2 ? "在施" : item.engineeringState == 3 ? "已完工" : ""}}
+						</view> -->
+						<view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
+							{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}
 						</view>
 					</view>
 					<view class="list-content">