修改

pages.json

@@ -31,8 +31,8 @@
       "style": {
         "navigationBarTitleText": "排查选择",
         "navigationStyle": "default",
-        "navigationBarBackgroundColor": "#FFFFFF",
+        "navigationBarBackgroundColor": "#3567c1",
-        "navigationBarTextStyle": "black",
+        "navigationBarTextStyle": "white",
         "enablePullDownRefresh": false
       }
     },
@@ -40,9 +40,9 @@
       "path": "pages/index/detail",
       "style": {
         "navigationBarTitleText": "智慧排查",
-        "navigationStyle": "custom",
+        "navigationStyle": "default",
-        "navigationBarBackgroundColor": "#FFFFFF",
+        "navigationBarBackgroundColor": "#3567c1",
-        "navigationBarTextStyle": "black",
+        "navigationBarTextStyle": "white",
         "enablePullDownRefresh": false
       }
     },
@@ -127,8 +127,8 @@
       "style": {
         "navigationBarTitleText": "知识库",
         "navigationStyle": "default",
-        "navigationBarBackgroundColor": "#F6F8FA",
+        "navigationBarBackgroundColor": "#3567c1",
-        "navigationBarTextStyle": "black"
+        "navigationBarTextStyle": "white"
       }
     },
     {
@@ -184,9 +184,9 @@
   "globalStyle": {
     "navigationBarTextStyle": "white",
     "navigationBarTitleText": "app",
-    "navigationBarBackgroundColor": "#2294E6",
+    "navigationBarBackgroundColor": "#2294E6",
-	"pullToRefresh":{
+	"pullToRefresh":{
-		"color": "#2294E6"
+		"color": "#2294E6"
 	}
     // "backgroundColor": "#F8F8F8"
   },

pages/index/index.vue

@@ -1,12 +1,16 @@
 <template>
 	<view id="page">
+		<view style="
+		position: sticky;
+		top: 0;
+		z-index: 999;">
 		<view class="header Box">
 			<view class="title">道路交通安全隐患</view>
 			<view class="title">排查助手</view>
 			<view class="desc">洞察隐患 智能守护 科技之眼照亮安全之路</view>
 			<view class="total Flex Flex_C_S-B PositionR">
 				<view class="left Flex">
-					<view class="info" @click="jump">
+					<view class="info" @click="jump(1)">
 						<view class="name">待办</view>
 						<view class="number">{{ totalData.UnderInvestigation }}</view>
 					</view>
@@ -29,7 +33,7 @@
 						<text class="name">本月上报</text>
 						<text class="number">{{ totalData.MonthReport }}</text>
 					</view>
-					<view class="finish Flex Flex_C_S-B blur">
+					<view class="finish Flex Flex_C_S-B blur" @click="jump(2)">
 						<image style="width: 80rpx" mode="widthFix" :src="$.imgSrc + '/finish.png'" class="video">
 						</image>
 						<text class="name">已完成</text>
@@ -48,6 +52,7 @@
 				</view>
 			</view>
 		</view>
+	</view>
 		<view class="Width100 Box BorderBox">
 			<view class="list_title">待办任务</view>
 			<view class="Content MarginAuto BorderBox">
@@ -107,7 +112,13 @@
 		},
 		// 页面加载
 		onLoad(e) {
+			// this.getData()
+			// this.getList()
+		},
+		onShow(e) {
 			this.getData()
+			this.list = []
+			this.page = 1
 			this.getList()
 		},
 		// 计算属性
@@ -157,7 +168,7 @@
 			},
 			handleClick(row) {
 				console.log(row)
-				this.$.open('/pages/map/index?businessId=' + row.businessId)
+				this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId='+row.sectionCode + '&deptId=' +row.deptId + '&taskName=' + row.name)
 			},
 			konw() {
 				this.$.open('/pages/knowledge/index')
@@ -166,8 +177,14 @@
 			skipPage(even) {
 				// this.$.open(even)
 			},
-		jump() {
+		jump(v) {
-			this.$.setData('pageStatus','1')
+			if(v == 1) {
+				this.$.setData('pageStatus',1)
+			}
+			if(v == 2) {
+				this.$.setData('pageStatus',3)
+			}
+			
 			this.$.openTab('/pages/investigation/index')
 		}
 		},
@@ -206,7 +223,6 @@
 		height: 500rpx;
 		color: #FFFFFF;
 		padding: calc(var(--status-bar-height) + 40rpx) 20rpx 20rpx;
-
 		.title {
 			font-family: Tensentype MeiHeiJ, Tensentype MeiHeiJ;
 			font-weight: bold;
@@ -346,10 +362,14 @@
 
 	.list_title {
 		font-size: 20px;
-		background: linear-gradient(180deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%);
+		// background: linear-gradient(180deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%);
-		border-radius: 24px 24px 0px 0px;
+		background: #f8fafb;
+		// border-radius: 24px 24px 0px 0px;
 		padding: 20rpx 30rpx 0;
-		font-family: Source Han Sans CN, Source Han Sans CN;
+		font-family: Source Han Sans CN, Source Han Sans CN;    
+		position: sticky;
+		top: 418px;
+		z-index: 99;
 	}
 
 	.Box {
@@ -411,7 +431,7 @@
 		background-size: 100% 100%;
 		display: flex;
 		align-items: center;
-
+		background: #f8fafb;
 		.bg {
 			position: absolute;
 			top: 0;

pages/investigation/index.vue

@@ -89,12 +89,18 @@
 			this.getList()
 		},
 
-		onShow: function() {
+		onShow() {
 			this.getData()
 			let pageStatus = this.$.getData('pageStatus')
+			console.log(pageStatus)
 			if(pageStatus == 1){
 				this.handleTabClick(1)
 				this.$.setData('pageStatus','0')
+			} else if(pageStatus == 3) {
+				this.handleTabClick(3)
+				this.$.setData('pageStatus','0')
+			} else {
+				this.handleTabClick(1)
 			}
 		},
 		// 计算属性

pages/knowledge/index.vue

@@ -105,8 +105,8 @@ import zeroMarkdownView from '../../components/zeroMarkdownView/zeroMarkdownView
 			// params = JSON.parse(decodeURIComponent(this.$route.query.params))
 			// this.sessionId = params.sessionId
 			// this.id = '37020017407'
-			this.sessionId = '12121212'
+			this.sessionId = '37020000000'
-			this.id = '12121212'
+			this.id = '37020017407'
 			// console.log(params.roadName,"5555");
 			let str = '';
 			if (params.roadName) {
@@ -129,7 +129,7 @@ import zeroMarkdownView from '../../components/zeroMarkdownView/zeroMarkdownView
 				this.loading = true;
 				const [err, res] = await uni.request({
 					// url: 'http://10.16.3.159:8777/api/local_doc_qa/local_doc_chat',
-					url: 'http://219.147.31.25:30001/hitap/chat',
+					url: this.$.chatUrl+'/chat',
 					dataType: 'json',
 					method: 'POST',
 					// responseType: 'arraybuffer',

pages/map/index.vue

@@ -20,7 +20,12 @@
       <view class="status" v-if="pageType1Result.deadlineType == 2">延期</view>
       <!-- <view class="status" v-if="pageType1Result.deadlineType == 3">正常</view> -->
       <view class="top">
-        <image src="/static/logo.png" mode="" style="width: 120px;height: 90px;" class="mimg"></image>
+        <image
+          src="/static/logo.png"
+          mode=""
+          style="width: 120px; height: 90px"
+          class="mimg"
+        ></image>
         <view class="font">
           <view class="tit">{{ pageType1Result.name }}</view>
           <view class="desc">
@@ -104,7 +109,7 @@
           />
         </view>
       </view>
-      <view class="form-item" v-if="ftype==1">
+      <view class="form-item" v-if="ftype == 1">
         <view class="form-label">起始路口</view>
         <view class="form-tent">
           <input
@@ -115,7 +120,7 @@
           />
         </view>
       </view>
-      <view class="form-item" v-if="ftype==1">
+      <view class="form-item" v-if="ftype == 1">
         <view class="form-label">终止路口</view>
         <view class="form-tent">
           <input
@@ -126,7 +131,7 @@
           />
         </view>
       </view>
-      <view class="form-item" v-if="ftype==2">
+      <view class="form-item" v-if="ftype == 2">
         <view class="form-label">路口名称</view>
         <view class="form-tent">
           <input
@@ -137,19 +142,30 @@
           />
         </view>
       </view>
-      <view class="btn-box" :style="ftype == 1 ? 'margin-top: 18px' : 'margin-top: 80px'">
+      <view
+        class="btn-box"
+        :style="ftype == 1 ? 'margin-top: 18px' : 'margin-top: 80px'"
+      >
         <view @click="onJump(3)" class="btn btn6"> 取消 </view>
         <view @click="handleSubmit" class="btn btn7"> 确定 </view>
       </view>
     </view>
-   <u-modal :show="show" content="新增成功" confirm-text="人工排查" cancel-text="智能排查" :showConfirmButton='true'
+    <u-modal
-   	:showCancelButton='true' @confirm="handleCheck(2)" @cancel="handleCheck(1)"
+      :show="show"
-   	:closeOnClickOverlay="false"></u-modal>
+      content="新增成功"
+      confirm-text="人工排查"
+      cancel-text="智能排查"
+      :showConfirmButton="true"
+      :showCancelButton="true"
+      @confirm="handleCheck(2)"
+      @cancel="handleCheck(1)"
+      :closeOnClickOverlay="false"
+    ></u-modal>
   </view>
 </template>
 <script>
 import TopTitle from "../../components/top-title.vue";
-import {wgs84LL2gcjLL2} from './c.js';
+import { wgs84LL2gcjLL2 } from "./c.js";
 export default {
   components: { TopTitle },
   data() {
@@ -166,11 +182,14 @@ export default {
       max: 0,
       polyline: [],
       pageType: 1,
-      ftype: '1',
+      ftype: "1",
       faddress: "",
       fcoordinate: "",
       businessId: "",
-      pageType1Result: null,
+      pageType1Result: {
+        deadlineType: 3,
+      },
+      pageType2Result: null,
       rname: "",
       search: "",
       name1: "",
@@ -321,6 +340,7 @@ export default {
           console.log(res);
           if (res.code === 200) {
             this.data = res.result;
+            this.pageType2Result = this.data[0]
             this.rname = this.data[0].name;
             this.polyline = [
               {
@@ -352,19 +372,48 @@ export default {
       // this.data = this.data.concat(data);
     },
     handleCheck(v) {
-	 this.show = false
+      this.show = false;
-      let url = v == 1 ? "/pages/index/detail" : "/pages/investigation/task";
+      if (v == 1) {
-      this.$.open(url + "?id=" + this.businessId);
+        let json = this.pageType == 1 ? this.pageType1Result : this.pageType2Result;
+        // let json = {
+        //   name: "023县道",
+        //   operator: "admin1",
+        //   deptId: "3702000000",
+        //   sectionCode: "37020017609",
+        //   businessId: "000001",
+        //   pointType: '1'
+        // };
+        this.$.open(
+          "/pages/index/detail?taskId=" +
+            json.businessId +
+            "&id=" +
+            json.sectionCode +
+            "&sectionId=" +
+            json.sectionCode +
+            "&roadName=" +
+            json.name +
+            "&userId=" +
+            json.operator +
+            "&deptId=" +
+            json.deptId +
+            "&sectionType=" +
+            json.pointType
+        );
+      }
+      if (v == 2) {
+        this.$.open("/pages/investigation/task" + "?id=" + this.businessId);
+      }
+
       // this.$.open(url + "?id=" + 'RX202310210236');
     },
     handleSubmit() {
-      let address = ''
+      let address = "";
-      if(this.ftype == 1) {
+      if (this.ftype == 1) {
         address = `${this.name1}（${this.name2}-${this.name3}）`;
       } else {
         address = `${this.name1}（${this.name4}）`;
       }
-      
+
       this.$request
         .globalRequest(
           "/hiddenDanger/highDanger/saveSectionOrCrossing",
@@ -401,6 +450,7 @@ export default {
     onList(e, i) {
       this.pageType = 2;
       this.idx = i;
+      this.pageType2Result = e
       if (e && e.name && e.position) {
         this.rname = e.name;
         this.polyline = [
@@ -432,13 +482,13 @@ export default {
     },
     // 确认授权后，获取用户位置
     getLocationInfo() {
-		console.log('getLocationInfo')
+      console.log("getLocationInfo");
       uni.getLocation({
         type: "wgs84",
         success: (res) => {
           console.log(res);
-          const coord = wgs84LL2gcjLL2(res.longitude, res.latitude)
+          const coord = wgs84LL2gcjLL2(res.longitude, res.latitude);
-          console.log(coord)
+          console.log(coord);
           this.longitude = coord[0]; //118.787575;
           this.latitude = coord[1]; //32.05024;
           //   this.longitude = 120.38771;
@@ -548,7 +598,7 @@ export default {
     top: calc(50vh + 80px);
     background: #fff;
     border-radius: 16px;
-	z-index: 99999;
+    z-index: 99999;
     cover-image {
       width: 32px;
       height: 32px;
@@ -571,7 +621,7 @@ export default {
       width: 50px;
       height: 28px;
       line-height: 28px;
-	  font-size: 22rpx;
+      font-size: 22rpx;
       background: #cc2936;
       color: #fff;
       text-align: center;