Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

pages/investigation/task.vue

@@ -17,7 +17,7 @@
                   stepCircleActive: item.i === active,
                   stepCircle: true,
                 }">
-								{{ item.i }}
+								{{ item.i == 3 ? item.i - 1 : item.i }}
 							</view>
 							<view class="stepText PositionA"
 								:style="{ color: item.i === active ? '#000000' : '#bcc3cd' }">
@@ -90,7 +90,7 @@
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
 								v-model="formData.laneCount" placeholder="请输入车道数" @focus="focus" @blur="blur" />
 							<view class="Height100" v-else>{{ formData.laneCount }}</view>
-							<view class="Height100">道</view>
+							<view class="Height100">车道</view>
 						</view>
 					</uni-forms-item>
 					<uni-forms-item label="路面结构">
@@ -461,8 +461,9 @@
 
 		<bottom-button :type="type" v-else-if="active === 2" :secondText="isEditStep2?'取消':'更改'"
 			@second="isEditStep2 = !isEditStep2" @first="active = 1;pageScrollTo()" @last="active = 3;pageScrollTo()" />
-		<bottom-button isSubmit :type="type" v-else-if="active === 3" :secondText="'暂存'"
-			@first="active = 2;pageScrollTo()" @second="submit(false)" @last="submit(true)" />
+		<!-- 下面原本active = 2 -->
+		<bottom-button isSubmit :type="type" v-else-if="active === 3" :secondText="'暂存'" @first="active = 1;pageScrollTo()"
+			@second="submit(false)" @last="submit(true)" />
 		<u-modal :show="modalShow" content="您未录入任何隐患问题，该点段将以“无隐患”结论提交结果，请确认是否提交？" confirm-text="确定" cancel-text="取消"
 			:showConfirmButton="true" :showCancelButton="true" @confirm="postSaveManualInvestigation"
 			@cancel="modalShow = false" :closeOnClickOverlay="false"></u-modal>
@@ -483,6 +484,7 @@
 	import InvestigationItem2 from "./components/investigation-item2.vue";
 	import ProblemTreeItem from "./components/problem-tree-item.vue";
 	import ProblemBox from "./components/problem-box.vue";
+	import $ from '@/common/globalJs/globalJs.js'
 	export default {
 		components: {
 			TopTitle,
@@ -581,15 +583,15 @@
 						title: "基本信息",
 						type: "point"
 					},
-					{
-						title: "统计信息",
-						type: "item",
-						i: 2
-					},
-					{
-						title: "统计信息",
-						type: "point"
-					},
+					// {
+					// 	title: "统计信息",
+					// 	type: "item",
+					// 	i: 2
+					// },
+					// {
+					// 	title: "统计信息",
+					// 	type: "point"
+					// },
 					{
 						title: "隐患排查",
 						type: "item",
@@ -839,7 +841,7 @@
 				if (!t) {
 					this.boxHeight = uni.getSystemInfoSync().windowHeight;
 				}
-			},
+			}
 		},
 		computed: {
 			reversedTroubleshootingData() {
@@ -1161,9 +1163,10 @@
 					hdTerm: "",
 					hdDesc: "",
 					hdPic: "",
-					hdInfo: "",
+					hdInfo: ""
 				};
 				this.fileList = [];
+				console.log('123123', this.describe)
 			},
 			addFL() {
 				if (this.type == 'add') {
@@ -1560,6 +1563,7 @@
 						hdTermName: this.hiddenDangerList2[2].itemname,
 						hdDesc: this.describe.hdDesc,
 						hdPic: hdPic,
+						nid: $.createUUID(),
 						hdInfo: this.describe.hdInfo,
 						dangerProblem: this.hiddenDangerList2[0].itemname + '/' + this.hiddenDangerList2[1].itemname +
 							'/' + this.hiddenDangerList2[2].itemname
@@ -1569,6 +1573,7 @@
 					} else {
 						this.$set(this.hiddenDangerList, this.addInvestigationInfo.index, form)
 					}
+					console.log(this.hiddenDangerList)
 				}
 
 				this.showProblem = false;
@@ -1695,7 +1700,7 @@
 				}
 				this.pageScrollTo()
 				this.isEdit = false;
-				this.active = 2;
+				this.active = 3;
 			},
 			submit(temporary) {
 				//查看情况下 直接返回上一页
@@ -2069,6 +2074,7 @@
 				}
 			},
 			delYH() {
+				console.log('this.hiddenDangerList', this.hiddenDangerList, this.nidYH)
 				this.hiddenDangerList = this.hiddenDangerList.filter(r => {
 					if (r.nid != this.nidYH) {
 						return r