From be48542f290455ef94e2237bd0d8be030b7cc7f1 Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Fri, 26 Jul 2024 16:51:55 +0800
Subject: [PATCH] 1

---
 pages/index/detail.vue                        | 24 ++++++-
 pages/index/index.vue                         |  2 +-
 .../components/problem-tree-item.vue          | 12 ++--
 pages/investigation/task.vue                  | 69 ++++++++++++++-----
 pages/map/index.vue                           |  1 +
 5 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/pages/index/detail.vue b/pages/index/detail.vue
index 9832908..55efec1 100644
--- a/pages/index/detail.vue
+++ b/pages/index/detail.vue
@@ -237,7 +237,7 @@ export default {
     // params.roadName = "023县道";
     // params.taskId = "000001";
     // params.userId = "admin1";
-    // this.params = params;
+    this.params = params;
     let str = "";
     if (params.roadName) {
       str += "路段名：" + params.roadName;
@@ -378,7 +378,25 @@ export default {
     async queryChat(voiceText) {
       // console.log(voiceText,"voiceText");
       this.loading = true;
-
+console.log({
+          voiceText,
+          sceneFlag: "",
+          sessionId: "",
+          multiType: "",
+          userId: this.params.userId,
+          deptId: this.params.deptId,
+          stream: false,
+          type: "1",
+          id: this.params.id,
+          taskId: this.params.taskId,
+          sectionId: this.params.sectionId,
+          sectionType: this.params.sectionType,
+          // "user_id": "zzp",
+          // "kb_ids": ["KBa80ea15e786241eca70a20f136f4e34c"],
+          // "question": "隐患排查流程是什么",
+          // "streaming": true,
+          // "history": []
+        })
       const [err, res] = await uni.request({
         // url: 'http://10.16.3.159:8777/api/local_doc_qa/local_doc_chat',
         url: $.chatUrl + "/chat",
@@ -401,6 +419,8 @@ export default {
           id: this.params.id,
           taskId: this.params.taskId,
           sectionId: this.params.sectionId,
+          
+          sectionType: this.params.sectionType,
           // "user_id": "zzp",
           // "kb_ids": ["KBa80ea15e786241eca70a20f136f4e34c"],
           // "question": "隐患排查流程是什么",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3ac5f88..ab82fa3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -172,7 +172,7 @@
 				if(row.pcType == 2) {
 					this.$.open("/pages/investigation/task" + "?id=" + this.businessId);
 				} else {
-					this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode + '&deptId=' + row.handleDept + '&taskName=' + row.name + '&pcType' + row.pcType)
+					this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId='+ row.sectionCode + '&operator=' + row.operator +'&deptId=' + row.handleDept + '&taskName=' + row.name + '&pcType' + row.pcType)
 				}
 			},
 			konw() {
diff --git a/pages/investigation/components/problem-tree-item.vue b/pages/investigation/components/problem-tree-item.vue
index 0dab9a3..0ad61d2 100644
--- a/pages/investigation/components/problem-tree-item.vue
+++ b/pages/investigation/components/problem-tree-item.vue
@@ -1,24 +1,25 @@
 <template>
   <view>
-    <view class="breadcrumb" style="min-height: 120rpx">
+    <view class="breadcrumb">
       <!--      <uni-breadcrumb separator=">" style="overflow-x: auto">-->
       <!--        <uni-breadcrumb-item >-->
       <!--          {{route.itemname}}-->
       <!--        </uni-breadcrumb-item>-->
       <!--      </uni-breadcrumb>-->
 
-      <scroll-view class="breadcrumb">
+      <view class="breadcrumb" :style="problemTreeSelectConfirmList.length > 0 ? 'padding:40rpx;': ''">
         <view
-          class="item"
           v-for="(route, index) in problemTreeSelectConfirmList"
           :key="index"
           @click="handleClick(route)"
+          style="display: inline-block;"
         >
           {{ route.itemname }}
           {{ index === problemTreeSelectConfirmList.length - 1 ? "" : ">" }}
         </view>
-      </scroll-view>
+      </view>
     </view>
+    <view v-if="problemTreeSelectConfirmList.length > 0" style="margin:0 0 0 40rpx; width:calc(100% - 80rpx); height: 1px; background: #cdd0d3;box-sizing: border-box;"></view>
     <scroll-view style="max-height: 400px;" :scroll-top="0" scroll-y="true" show-scrollbar="true">
     <view
       class="investigation-item"
@@ -170,11 +171,10 @@ page {
 }
 .breadcrumb {
   width: 100%;
-  padding: 20rpx;
   box-sizing: border-box;
   display: flex;
   align-items: center;
-  justify-content: center;
+  justify-content: left;
   overflow-x: auto;
   flex-wrap: nowrap;
 }
diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index 4df08f1..839dfc1 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -1,5 +1,5 @@
 <template>
-	<view id="page">
+	<view id="page"  :style="{ height: boxHeight + 'px' }">
 		<view class="Width100 Box BorderBox">
 			<view class="Content BorderBox Width100">
 				<top-title :is-show-left="true" :title="'排查'" :rightWidth="40" class="custom_bg">
@@ -36,7 +36,7 @@
 					<uni-forms-item label="道路类型">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
-								v-model="formData.roadType" placeholder="请输入道路类型" />
+								v-model="formData.roadType" placeholder="请输入道路类型" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.roadType }}</view>
 							<view class="Height100"></view>
 						</view>
@@ -44,7 +44,7 @@
 					<uni-forms-item label="道路宽度">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.roadWidth" placeholder="请输入道路宽度" />
+								v-model="formData.roadWidth" placeholder="请输入道路宽度" @focus="focus"/>
 							<view class="Height100" v-else>{{ formData.roadWidth }}</view>
 							<view class="Height100">米</view>
 						</view>
@@ -52,7 +52,7 @@
 					<uni-forms-item label="车辆数">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.laneCount" placeholder="请输入车辆数" />
+								v-model="formData.laneCount" placeholder="请输入车辆数" @focus="focus"/>
 							<view class="Height100" v-else>{{ formData.laneCount }}</view>
 							<view class="Height100">辆</view>
 						</view>
@@ -60,7 +60,7 @@
 					<uni-forms-item label="路面结构">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
-								v-model="formData.roadStructure" placeholder="请输入路面结构" />
+								v-model="formData.roadStructure" placeholder="请输入路面结构" @focus="focus"/>
 							<view class="Height100" v-else>{{ formData.roadStructure }}</view>
 							<view class="Height100"></view>
 						</view>
@@ -68,7 +68,7 @@
 					<uni-forms-item label="路侧防护">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
-								v-model="formData.sideProtec" placeholder="请输入路侧防护" />
+								v-model="formData.sideProtec" placeholder="请输入路侧防护" @focus="focus"/>
 							<view class="Height100" v-else>{{ formData.sideProtec }}</view>
 							<view class="Height100"></view>
 						</view>
@@ -76,7 +76,7 @@
 					<uni-forms-item label="中央隔离">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="text" class="BorderNone Height100 formInput"
-								v-model="formData.centerSeparate" placeholder="请输入中央隔离" />
+								v-model="formData.centerSeparate" placeholder="请输入中央隔离" @focus="focus"/>
 							<view class="Height100" v-else>{{ formData.centerSeparate }}</view>
 							<view class="Height100"></view>
 						</view>
@@ -84,7 +84,7 @@
 					<uni-forms-item label="设计时速">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.designSpeed" placeholder="请输入设计时速" />
+								v-model="formData.designSpeed" placeholder="请输入设计时速" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.designSpeed }}</view>
 							<view class="Height100">Km/h</view>
 						</view>
@@ -92,7 +92,7 @@
 					<uni-forms-item label="限速">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEdit" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.limitSpeed" placeholder="请输入限速" />
+								v-model="formData.limitSpeed" placeholder="请输入限速" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.limitSpeed }}</view>
 							<view class="Height100">Km/h</view>
 						</view>
@@ -110,7 +110,7 @@
 					<uni-forms-item label="最大流量">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.maxTraffic" placeholder="请输入最大流量" />
+								v-model="formData.maxTraffic" placeholder="请输入最大流量" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.maxTraffic }}</view>
 							<view class="Height100">辆</view>
 						</view>
@@ -118,7 +118,7 @@
 					<uni-forms-item label="高峰流量">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.peakTraffic" placeholder="请输入高峰流量" />
+								v-model="formData.peakTraffic" placeholder="请输入高峰流量" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.peakTraffic }}</view>
 							<view class="Height100">辆</view>
 						</view>
@@ -126,7 +126,7 @@
 					<uni-forms-item label="高峰时段">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.peakHours" placeholder="请输入高峰时段" />
+								v-model="formData.peakHours" placeholder="请输入高峰时段" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.peakHours }}</view>
 							<view class="Height100"></view>
 						</view>
@@ -134,7 +134,7 @@
 					<uni-forms-item label="平峰流量">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.normalTraffic" placeholder="请输入高峰时段" />
+								v-model="formData.normalTraffic" placeholder="请输入高峰时段" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.normalTraffic }}</view>
 							<view class="Height100">辆</view>
 						</view>
@@ -143,7 +143,7 @@
 					<uni-forms-item label="大车占比">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.largeVehicleRate" placeholder="请输入大车占比" />
+								v-model="formData.largeVehicleRate" placeholder="请输入大车占比" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.largeVehicleRate }}</view>
 							<view class="Height100">%</view>
 						</view>
@@ -151,7 +151,7 @@
 					<uni-forms-item label="非机动车流量">
 						<view class="Height100 Flex Flex_end Flex_C_S-Center" style="line-height: 37px; ">
 							<input v-if="isEditStep2" type="number" class="BorderNone Height100 formInput"
-								v-model="formData.nonvehicleTraffic" placeholder="请输入非机动车流量" />
+								v-model="formData.nonvehicleTraffic" placeholder="请输入非机动车流量" @focus="focus" />
 							<view class="Height100" v-else>{{ formData.nonvehicleTraffic }}</view>
 							<view class="Height100">辆</view>
 						</view>
@@ -388,6 +388,7 @@
 			this.getChartsData();
 		},
 		onLoad(e) {
+			this.boxHeight = uni.getSystemInfoSync().windowHeight;
 			if (e.id) {
 				this.businessId = e.id;
 
@@ -565,9 +566,22 @@
 				extraConfigs: [],
 				describeArr: [],
 				temporary: '',
-				type: 'edit'
+				type: 'edit',
+				boxHeight: 773
 			};
 		},
+		watch: {
+			isEdit(t){
+				if(!t) {
+					this.boxHeight = uni.getSystemInfoSync().windowHeight;
+				}
+			},
+			isEditStep2(t) {
+			if(!t) {
+				this.boxHeight = uni.getSystemInfoSync().windowHeight;
+			}
+			},
+		},
 		methods: {
 			showInvestigationTag(v) {
 				console.log(v)
@@ -1342,9 +1356,26 @@
 							this.$.toast(res.msg);
 						}
 					});
-			}
-		},
-	};
+			},
+			focus(){
+				const query = uni.createSelectorQuery().in(this);
+      
+      // 选择我们想要的元素
+			query.select('#page').boundingClientRect(data => {
+				// data是选中元素的大小及位置信息
+				if (data) {
+				// 元素的高度
+				const height = data.height;
+				if(this.isEdit) {
+
+					this.boxHeight = height + 200
+				}
+				console.log('盒子的高度:', height);
+				}
+			}).exec(); // 执行查询
+					}
+				},
+			};
 </script>
 
 <style lang="scss">
diff --git a/pages/map/index.vue b/pages/map/index.vue
index 545066c..acf8a92 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -637,6 +637,7 @@
           y: this.latitude,
           search: this.search,
         };
+        console.log(data)
         if (!this.search) delete data.search;
         this.$request
           .globalRequest("/hiddenDanger/highDanger/getNearRoadInfo", data, "POST")