From a1fdf7645eff0479374cc328e86a4bd8dae91a42 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Thu, 13 Nov 2025 13:49:42 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/footers/footers.vue                |   8 +
 components/tree-node/areaIndex.vue            | 252 +++++++++---------
 .../workTicketManage/addWorkTicket.vue        |  24 +-
 .../workTicketManage/workTicketDetail.vue     |  13 +-
 .../workTicketManage/workTicketList.vue       |  13 +-
 5 files changed, 178 insertions(+), 132 deletions(-)

diff --git a/components/footers/footers.vue b/components/footers/footers.vue
index 45b21bf8..0e857649 100644
--- a/components/footers/footers.vue
+++ b/components/footers/footers.vue
@@ -166,6 +166,14 @@
 									appShow: 1,
 									isShow: true,
 								})
+								// that.tabList.push({
+								// 	appName: '高风险',
+								// 	moduleIcon2: 'highRisk-icon',
+								// 	moduleIcon: 'highRisk-icon_active',
+								// 	plugin: 'highRisk',
+								// 	appShow: 1,
+								// 	isShow: true,
+								// })
 								that.tabList.push({
 									appName: '高风险',
 									moduleIcon2: 'highRisk-icon',
diff --git a/components/tree-node/areaIndex.vue b/components/tree-node/areaIndex.vue
index fb62244e..1d343e70 100644
--- a/components/tree-node/areaIndex.vue
+++ b/components/tree-node/areaIndex.vue
@@ -1,134 +1,134 @@
- <template>
- 	<view class="tree-content-compontent">
- 		<view class="content-box" :class="{'content-box_project': item.projectSn}" :style="`padding-left: ${treeIndex * 30}rpx;`" @click="toggleNodes(item)">
- 			<text class="box-text">
-				<image v-if="item.projectSn" class="img" src="/static/file-icon.png" mode=""></image>
-				{{ item.name }}
-			</text>
- 			<view @click.stop="expandFn">
-				<template v-if="pageType == 'video'">
-					<text v-if="item.projectNum || item.projectNum == 0" class="box-text1">{{ item.projectNum || '' }}</text>
-					<text v-else class="box-text1">({{ item.onlineVideoNum || 0 }}/{{ item.videoNum || 0 }})</text>
-				</template>
-				<text v-else class="box-text1">{{ item.projectNum || '' }}</text>
- 				
- 				<!-- <u-icon name="arrow-right" color="#B3B3B3" size="40"
-					v-if="!expanded && item.list && item.list.length" style="margin-right: 10rpx;"></u-icon>
-				<u-icon name="arrow-down" color="#B3B3B3" size="40"
-					v-if="expanded && item.list && item.list.length" style="margin-right: 10rpx;"></u-icon> -->
- 				<u-icon v-if="!expanded && item.list && item.list.length" name="arrow-right" color="#B3B3B3"
- 					size="40"></u-icon>
- 				<u-icon v-if="expanded && item.list && item.list.length" name="arrow-down" color="#B3B3B3"
- 					size="40"></u-icon>
- 			</view>
- 			<image v-if="(!item.list || !item.list.length) && !iconShow" style="width:55rpx;height:40rpx;"
- 				src="../../static/videoControlIcon/videoIcon1.png" mode="">
- 			</image>
- 			<!-- <image style="width:80rpx;height:80rpx;float:left" src="../../static/icon-down-black.png" mode="">
-			</image> -->
- 		</view>
- 		<view class="sub-component">
- 			<view :class="{'expandedStyle': expanded == true}"
- 				v-if="item.list && item.list.length && expanded">
- 				<TreeMenu :pageType="pageType" :iconShow="iconShow" v-for="(child, index) in item.list" :key="child.companyId || child.projectId" :item="child"
- 					:treeIndex="treeIndex + 1" :expandedIndex="index" @clickItem="clickTreeItem"></TreeMenu>
- 			</view>
- 		</view>
- 	</view>
- </template>
+<template>
+    <view class="tree-content-compontent">
+        <view class="content-box" :class="{'content-box_project': item.projectSn}" :style="`padding-left: ${treeIndex * 30}rpx;`" @click="toggleNodes(item)">
+            <text class="box-text">
+               <image v-if="item.projectSn" class="img" src="/static/file-icon.png" mode=""></image>
+               {{ item.name }}
+           </text>
+            <view @click.stop="expandFn">
+               <template v-if="pageType == 'video'">
+                   <text v-if="item.projectNum || item.projectNum == 0" class="box-text1">{{ item.projectNum || '' }}</text>
+                   <text v-else class="box-text1">({{ item.onlineVideoNum || 0 }}/{{ item.videoNum || 0 }})</text>
+               </template>
+               <text v-else class="box-text1">{{ item.projectNum || '' }}</text>
+                
+                <!-- <u-icon name="arrow-right" color="#B3B3B3" size="40"
+                   v-if="!expanded && item.list && item.list.length" style="margin-right: 10rpx;"></u-icon>
+               <u-icon name="arrow-down" color="#B3B3B3" size="40"
+                   v-if="expanded && item.list && item.list.length" style="margin-right: 10rpx;"></u-icon> -->
+                <u-icon v-if="!expanded && item.list && item.list.length" name="arrow-right" color="#B3B3B3"
+                    size="40"></u-icon>
+                <u-icon v-if="expanded && item.list && item.list.length" name="arrow-down" color="#B3B3B3"
+                    size="40"></u-icon>
+            </view>
+            <image v-if="(!item.list || !item.list.length) && !iconShow" style="width:55rpx;height:40rpx;"
+                src="../../static/videoControlIcon/videoIcon1.png" mode="">
+            </image>
+            <!-- <image style="width:80rpx;height:80rpx;float:left" src="../../static/icon-down-black.png" mode="">
+           </image> -->
+        </view>
+        <view class="sub-component">
+            <view :class="{'expandedStyle': expanded == true}"
+                v-if="item.list && item.list.length && expanded">
+                <TreeMenu :pageType="pageType" :iconShow="iconShow" v-for="(child, index) in item.list" :key="child.companyId || child.projectId" :item="child"
+                    :treeIndex="treeIndex + 1" :expandedIndex="index" @clickItem="clickTreeItem"></TreeMenu>
+            </view>
+        </view>
+    </view>
+</template>
 
- <script>
- 	import TreeMenu from './areaIndex.vue';
- 	export default {
- 		name: 'TreeMenu',
- 		components: {
- 			TreeMenu
- 		},
- 		props: ['item', 'pageType', 'treeIndex', 'iconShow', 'expandedIndex'],
- 		data() {
- 			return {
- 				expanded: false,
- 			};
- 		},
- 		mounted() {
- 			if (this.expandedIndex == 0) {
- 				this.expanded = true;
- 			}
- 		},
- 		methods: {
- 			clickTreeItem(item) {
- 				console.log(item, 777888)
-				if(!item.projectSn) return;
-				this.$emit('clickItem', item);
- 				// uni.navigateTo({
- 				// 	url: `/pages/videoManage/videoGroup?&sn=${item.projectSn}`
- 				// })
- 			},
- 			expandFn(e) {
- 				console.log(e, 666)
- 				this.expanded = !this.expanded;
- 			},
- 			toggleNodes(item) {
- 				this.$emit('clickItem', item);
- 			}
- 		},
- 	}
- </script>
+<script>
+    import TreeMenu from './areaIndex.vue';
+    export default {
+        name: 'TreeMenu',
+        components: {
+            TreeMenu
+        },
+        props: ['item', 'pageType', 'treeIndex', 'iconShow', 'expandedIndex'],
+        data() {
+            return {
+                expanded: false,
+            };
+        },
+        mounted() {
+            if (this.expandedIndex == 0) {
+                this.expanded = true;
+            }
+        },
+        methods: {
+            clickTreeItem(item) {
+                console.log(item, 777888)
+               if(!item.projectSn) return;
+               this.$emit('clickItem', item);
+                // uni.navigateTo({
+                // 	url: `/pages/videoManage/videoGroup?&sn=${item.projectSn}`
+                // })
+            },
+            expandFn(e) {
+                console.log(e, 666)
+                this.expanded = !this.expanded;
+            },
+            toggleNodes(item) {
+                this.$emit('clickItem', item);
+            }
+        },
+    }
+</script>
 
- <style lang="scss" scoped>
- 	.tree-content-compontent {
- 		background: white;
- 		border-bottom: 2rpx solid #F7F7F7;
+<style lang="scss" scoped>
+    .tree-content-compontent {
+        background: white;
+        border-bottom: 2rpx solid #F7F7F7;
 
- 		.content-box {
- 			display: flex;
- 			align-items: center;
- 			justify-content: start;
- 			padding: 16rpx 26rpx;
- 			position: relative;
+        .content-box {
+            display: flex;
+            align-items: center;
+            justify-content: start;
+            padding: 16rpx 26rpx;
+            position: relative;
 
- 			// border-bottom: 2px solid #D6D6D6;
- 			>.box-text {
- 				font-family: PingFang SC, PingFang SC;
- 				font-weight: 500;
- 				font-size: 30rpx;
- 				color: #1A1A1A;
- 				margin-right: auto;
- 				display: inline-block;
- 				flex: 1;
- 				white-space: nowrap;
- 				overflow: hidden;
- 				text-overflow: ellipsis;
-				.img {
-					width: 28rpx;
-					height: 24rpx;
-					margin-right: 10rpx;
-				}
- 			}
+            // border-bottom: 2px solid #D6D6D6;
+            >.box-text {
+                font-family: PingFang SC, PingFang SC;
+                font-weight: 500;
+                font-size: 30rpx;
+                color: #1A1A1A;
+                margin-right: auto;
+                display: inline-block;
+                flex: 1;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+               .img {
+                   width: 28rpx;
+                   height: 24rpx;
+                   margin-right: 10rpx;
+               }
+            }
 
- 			.box-text1 {
- 				font-weight: 500;
- 				font-size: 28rpx;
- 				color: #B3B3B3;
- 				padding: 0 28rpx;
- 			}
- 		}
+            .box-text1 {
+                font-weight: 500;
+                font-size: 28rpx;
+                color: #B3B3B3;
+                padding: 0 28rpx;
+            }
+        }
 
-		.content-box_project {
-			background-color:  #F2F3F7;
-			border-bottom: 1px solid #fff;
-		}
- 		.sub-component {
- 			background: #FFFFFF;
+       .content-box_project {
+           background-color:  #F2F3F7;
+           border-bottom: 1px solid #fff;
+       }
+        .sub-component {
+            background: #FFFFFF;
 
- 			.tree-content-compontent {
- 				background: #FFFFFF;
- 				border: none;
- 			}
- 		}
+            .tree-content-compontent {
+                background: #FFFFFF;
+                border: none;
+            }
+        }
 
- 		.expandedStyle {
- 			// padding-left: 60rpx;
- 		}
- 	}
- </style>
\ No newline at end of file
+        .expandedStyle {
+            // padding-left: 60rpx;
+        }
+    }
+</style>
diff --git a/pages/projectEnd/workTicketManage/addWorkTicket.vue b/pages/projectEnd/workTicketManage/addWorkTicket.vue
index 3d1d25ad..8f4a48ce 100644
--- a/pages/projectEnd/workTicketManage/addWorkTicket.vue
+++ b/pages/projectEnd/workTicketManage/addWorkTicket.vue
@@ -24,6 +24,26 @@
 								:border="true" /></view>
 					</view>
 					<view class="box1">
+						<view>施工区域:</view>
+						<view @click="onClickType(1)">
+							<u-input disabled style="pointer-events:none" :value="workTicketInfo.constructionAreasName"
+								type="text" :border="true" placeholder="请选择" />
+						</view>
+					</view>
+					<view class="box1">
+						<view>施工地点:</view>
+						<view><u-input v-model="workTicketInfo.constructionAddr" placeholder="请输入" type="text"
+								:border="true" /></view>
+					</view>
+					<view class="box1">
+						<view>申请单位:</view>
+						<view @click="onClickType(2)">
+							<u-input disabled style="pointer-events:none" :value="workTicketInfo.applicantsName"
+								type="text" :border="true" placeholder="请选择" />
+						</view>
+					</view>
+					<!-- 敦煌升级 -->
+					<!-- <view class="box1">
 						<view><text>*</text>施工区域:</view>
 						<view @click="onClickType(1)">
 							<u-input disabled style="pointer-events:none" :value="workTicketInfo.constructionAreasName"
@@ -593,12 +613,12 @@
 							if (res.result) {
 								const resultInfo = JSON.parse(res.result);
 								const find = that.policeCameraItemList.find(item => item
-									.devSn == resultInfo);
+									.devSn == resultInfo.devSn);
 								if (find) {
 									that.policeCameraItemInfo = find;
 									that.submitShow = true;
 								}
-								that.showToast('该设备识别失败，请手动绑定', 'warning');
+								that.showToast('该设备识别失败，请手动绑定!', 'warning');
 							}
 						}
 					})
diff --git a/pages/projectEnd/workTicketManage/workTicketDetail.vue b/pages/projectEnd/workTicketManage/workTicketDetail.vue
index 7b90ee5c..30890be1 100644
--- a/pages/projectEnd/workTicketManage/workTicketDetail.vue
+++ b/pages/projectEnd/workTicketManage/workTicketDetail.vue
@@ -189,7 +189,7 @@
 				</view>
 				<view v-if="workTicketInfo.status == 2" @click="onStateShow(2)">暂停作业</view>
 				<view v-if="workTicketInfo.status == 3" @click="onChangeState(3)">继续作业</view>
-				<view v-if="workTicketInfo.status == 4" @click="onChangeState(3)">重新开始</view>
+				<view v-if="workTicketInfo.status == 4" @click="onStateShow(3)">重新开始</view>
 				<view v-if="workTicketInfo.status == 2 || workTicketInfo.status == 3" @click="onStateShow(4)"
 					class="btn-error">结束作业</view>
 				<view @click="onDelete" class="btn-error">删除</view>
@@ -198,7 +198,7 @@
 		</view>
 		<u-toast ref="uToast" />
 		<u-modal @cancel="onStateCancel" @confirm="onStateConfirm" v-model="stateShow"
-			:confirm-text="stateType == 2 ? '是,立即暂停' : '是，立即结束'" :show-cancel-button="true" cancel-text="不,继续作业">
+			:confirm-text="stateType == 2 ? '是,立即暂停' : stateType == 3 ? '是,重新开始' : '是，立即结束'" :show-cancel-button="true" :cancel-text="stateType == 3 ? '取消' :  '不,继续作业'">
 			<view class="slot-content">
 				<view class="content_main-box1" v-if="stateType == 2">
 					<view>
@@ -209,6 +209,15 @@
 						<view>点击暂停作业后，需要到执法记录仪上手动结束工单。结束后录像将会自动上传到平台，可在历史回放中查看。</view>
 					</view>
 				</view>
+				<view class="content_main-box1" v-if="stateType == 3">
+					<view>
+						作业已完成，点击重新开始作业
+					</view>
+					<view>
+						<!-- <u-icon name="info-circle"></u-icon>
+						<view>点击结束作业后，需要到执法记录仪上手动结束工单，结束后录像将会自动上传到平台，可在历史回放中查看</view> -->
+					</view>
+				</view>
 				<view class="content_main-box1" v-else-if="stateType == 4">
 					<view>
 						作业已全部施工完成，点击结束作业
diff --git a/pages/projectEnd/workTicketManage/workTicketList.vue b/pages/projectEnd/workTicketManage/workTicketList.vue
index 9718189b..71b98ab4 100644
--- a/pages/projectEnd/workTicketManage/workTicketList.vue
+++ b/pages/projectEnd/workTicketManage/workTicketList.vue
@@ -103,7 +103,7 @@
 						<view @click.stop="onStateShow(4, item)" class="btn-error">结束作业</view>
 					</view>
 					<view class="box-bottom" v-else>
-						<view @click.stop="onChangeState(3, item)">重新开始</view>
+						<view @click.stop="onStateShow(3, item)">重新开始</view>
 					</view>
 				</view>
 			</view>
@@ -144,7 +144,7 @@
 			</view>
 		</u-popup>
 		<u-modal @cancel="onStateCancel" @confirm="onStateConfirm" v-model="stateShow"
-			:confirm-text="stateType == 2 ? '是,立即暂停' : '是，立即结束'" :show-cancel-button="true" cancel-text="不,继续作业">
+			:confirm-text="stateType == 2 ? '是,立即暂停' : stateType == 3 ? '是,重新开始' : '是，立即结束'" :show-cancel-button="true" :cancel-text="stateType == 3 ? '取消' :  '不,继续作业'">
 			<view class="slot-content">
 				<view class="content_main-box1" v-if="stateType == 2">
 					<view>
@@ -155,6 +155,15 @@
 						<view>点击暂停作业后，需要到执法记录仪上手动结束工单，结束后录像将会自动上传到平台，可在历史回放中查看</view>
 					</view>
 				</view>
+				<view class="content_main-box1" v-if="stateType == 3">
+					<view>
+						作业已完成，点击重新开始作业
+					</view>
+					<view>
+						<!-- <u-icon name="info-circle"></u-icon>
+						<view>点击结束作业后，需要到执法记录仪上手动结束工单，结束后录像将会自动上传到平台，可在历史回放中查看</view> -->
+					</view>
+				</view>
 				<view class="content_main-box1" v-else-if="stateType == 4">
 					<view>
 						作业已全部施工完成，点击结束作业