From a9feca013194609cf25fbb757d0fc1b91ee4f87c Mon Sep 17 00:00:00 2001
From: limingtao <@ming_tao_li>
Date: Thu, 25 Jul 2024 11:35:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/bottom-button/index.vue | 178 +++++++++++++++++------------
 components/bottom-button/three.vue | 128 ++++++++++++---------
 pages/investigation/index.vue      |   8 +-
 pages/investigation/task.vue       |  11 +-
 pages/map/index.vue                |  22 +++-
 5 files changed, 206 insertions(+), 141 deletions(-)

diff --git a/components/bottom-button/index.vue b/components/bottom-button/index.vue
index 686489b..d1fec06 100644
--- a/components/bottom-button/index.vue
+++ b/components/bottom-button/index.vue
@@ -1,74 +1,80 @@
 <template>
   <!--顶部-->
   <view class="bottom">
-    <view class="trapezoidal first" @click="$emit('cancel')">
+    <view class="trapezoidal first" @click="$emit('cancel')" v-show="type=='edit'">
       <text>{{ cancelText }}</text>
     </view>
-    <view class="trapezoidal last" @click="$emit('confirm')">
-      <text>确认</text>
+    <view class="trapezoidal last" @click="$emit('confirm')" :class="type=='view'?'view-btn':''">
+      <text>{{type=='view'?'下一步':'下一步'}}</text>
     </view>
   </view>
 </template>
 
 <script>
-export default {
-  name: "no-data",
-  props: {
-    marginTop:{
-      type:Number,
-      default:300
+  export default {
+    name: "no-data",
+    props: {
+      marginTop: {
+        type: Number,
+        default: 300
+      },
+      cancelText: {
+        type: String,
+        default: '取消'
+      },
+      type: {
+        type: String,
+        default: 'edit'
+      }
     },
-    cancelText:{
-      type:String,
-      default: '取消'
-    }
-  },
-  data() {
-    return {
-      $:this.$,
-    }
-  },
-  mounted(){
-  },
-  computed:{
-  },
-  methods: {
-    // 获取url
-    getCurPage() {
-      let pages = getCurrentPages();
-      let curPage = pages[pages.length - 1];
-      return curPage
+    data() {
+      return {
+        $: this.$,
+      }
     },
-    // 返回
-    backPage(){
-      this.$emit('backPage')
+    mounted() {
     },
-    // 跳转页面
-    skipPage(item) {
-      this.$emit('skipPage', item.pageUrl)
+    computed: {
     },
-  },
-}
+    methods: {
+      // 获取url
+      getCurPage() {
+        let pages = getCurrentPages();
+        let curPage = pages[pages.length - 1];
+        return curPage
+      },
+      // 返回
+      backPage() {
+        this.$emit('backPage')
+      },
+      // 跳转页面
+      skipPage(item) {
+        this.$emit('skipPage', item.pageUrl)
+      },
+    },
+  }
 </script>
 
 <style scoped lang="scss">
-.bottom {
-  position: fixed;
-  bottom: 0;
-  width: calc(100% - 40rpx);
-  padding: 18rpx 20rpx;
-  height: 80rpx;
-  background: #FFFFFF;
-  border-top: 1px solid #cccccc;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-  .Img{
+  .bottom {
+    position: fixed;
+    bottom: 0;
+    width: calc(100% - 40rpx);
+    padding: 18rpx 20rpx;
+    height: 80rpx;
+    background: #FFFFFF;
+    border-top: 1px solid #cccccc;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .Img {
     width: 512rpx;
     height: 440rpx;
     margin: 0 auto;
   }
+
   .trapezoidal {
     position: relative;
     display: inline-block;
@@ -80,6 +86,7 @@ export default {
     border-radius: 10rpx;
     line-height: 60rpx;
   }
+
   .trapezoidal::before,
   .trapezoidal::after {
     content: '';
@@ -103,32 +110,53 @@ export default {
     background-color: #E9EDF5;
     border-left: 0 none;
   }
-.first {
-  margin-right: 40rpx;
-  text {
-    position: relative;
-    left: 12.5%;
+
+  .first {
+    margin-right: 40rpx;
+
+    text {
+      position: relative;
+      left: 12.5%;
+    }
   }
-}
-.last {
-  background: #2663BF;
-  flex: 1;
-  margin-left: 60rpx;
-  color: #FFFFFF;
-  text {
-    position: relative;
-    left: -10%;
+
+  .last {
+    background: #2663BF;
+    flex: 1;
+    margin-left: 60rpx;
+    color: #FFFFFF;
+
+    text {
+      position: relative;
+      left: -10%;
+    }
   }
-}
 
-.last::after {
-  width: 0;
-}
-.last::before {
-  width: 30%;
-  left: -10rpx;
-  transform: skew(17deg);
-  background-color: #2663BF;
-}
+  .last::after {
+    width: 0;
+  }
+
+  .last::before {
+    width: 30%;
+    left: -10rpx;
+    transform: skew(17deg);
+    background-color: #2663BF;
+  }
 
-</style>
+  .view-btn {
+    margin-left: 0;
+    padding: 8rpx 0rpx 8rpx 0rpx;
+
+     uni-text {
+      position: relative;
+      left: auto;
+    }
+  }
+
+  .view-btn::before {
+    width: 0%;
+    left: -10rpx;
+    transform: skew(0deg);
+    background-color: #2663BF;
+  }
+</style>
\ No newline at end of file
diff --git a/components/bottom-button/three.vue b/components/bottom-button/three.vue
index cb07693..8a3133a 100644
--- a/components/bottom-button/three.vue
+++ b/components/bottom-button/three.vue
@@ -1,73 +1,88 @@
 <template>
   <!--顶部-->
   <view class="bottom">
-    <view class="trapezoidal first" :class="{primary: firstPrimary}" style="margin-right: 30rpx" @click="$emit('first')">
+    <view class="trapezoidal first" :class="{primary: firstPrimary}" :style="{marginRight:type=='view'?'45rpx':'30rpx'}" 
+      @click="$emit('first')">
       <text>{{ firstText }}</text>
     </view>
-    <view class="trapezoidal min" :class="{primary: secondPrimary}" style="margin:0 30rpx" @click="$emit('second')">
+    <view v-show="type=='edit'" class="trapezoidal min" :class="{primary: secondPrimary}" style="margin:0 30rpx" @click="$emit('second')">
       <text>{{ secondText }}</text>
     </view>
-    <view class="trapezoidal last" :class="{primary: thirdPrimary}" style="margin-left:30rpx" @click="$emit('last')">
-      <text>{{ thirdText }}</text>
+    <view class="trapezoidal last" :class="{primary: thirdPrimary}" :style="{marginLeft:type=='view'?'45rpx':'30rpx'}"  @click="$emit('last')">
+      <text>{{isSubmit?(type=='view'?'关闭':thirdText):nextText}}</text>
     </view>
   </view>
 </template>
 
 <script>
-export default {
-  name: "no-data",
-  props: {
-    firstText:{
-      type:String,
-      default:'上一步'
+  export default {
+    name: "no-data",
+    props: {
+      firstText: {
+        type: String,
+        default: '上一步'
+      },
+      secondText: {
+        type: String,
+        default: '取消'
+      },
+      nextText: {
+        type: String,
+        default: '下一步'
+      },
+      thirdText: {
+        type: String,
+        default: '完成'
+      },
+      firstPrimary: Boolean,
+      secondPrimary: Boolean,
+      thirdPrimary: {
+        type: Boolean,
+        default: true
+      },
+      isSubmit: {
+        type: Boolean,
+        default: false
+      },
+      type: {
+        type: String,
+        default: 'edit'
+      }
+    },
+    data() {
+      return {
+        $: this.$,
+      }
     },
-    secondText: {
-      type:String,
-      default: '取消'
+    mounted() {
     },
-    thirdText:{
-      type:String,
-      default: '完成'
+    computed: {
     },
-    firstPrimary: Boolean,
-    secondPrimary: Boolean,
-    thirdPrimary: {
-      type: Boolean,
-      default: true
+    methods: {
     },
-  },
-  data() {
-    return {
-      $:this.$,
-    }
-  },
-  mounted(){
-  },
-  computed:{
-  },
-  methods: {
-  },
-}
+  }
 </script>
 
 <style scoped lang="scss">
-.bottom {
-  position: fixed;
-  bottom: 0;
-  width: calc(100% - 40rpx);
-  padding: 18rpx 20rpx;
-  height: 80rpx;
-  background: #FFFFFF;
-  border-top: 1px solid #cccccc;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-  .Img{
+  .bottom {
+    position: fixed;
+    bottom: 0;
+    width: calc(100% - 40rpx);
+    padding: 18rpx 20rpx;
+    height: 80rpx;
+    background: #FFFFFF;
+    border-top: 1px solid #cccccc;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .Img {
     width: 512rpx;
     height: 440rpx;
     margin: 0 auto;
   }
+
   .trapezoidal {
     position: relative;
     display: inline-flex;
@@ -80,16 +95,18 @@ export default {
     text-align: center;
     border-radius: 10rpx;
     line-height: 60rpx;
-    
+
     &.primary {
       background: #2663BF;
       color: #fff;
-      
-      &::after, &::before {
+
+      &::after,
+      &::before {
         background: #2663BF;
       }
     }
   }
+
   .trapezoidal::before,
   .trapezoidal::after {
     content: '';
@@ -113,17 +130,18 @@ export default {
     background-color: #E9EDF5;
     border-left: 0 none;
   }
+
   .first::before {
     width: 50%;
     left: 70%;
   }
 
-.min::before {
-  right: -20%;
-}
+  .min::before {
+    right: -20%;
+  }
+
   .min::after {
     transform: skew(17deg);
     //right: 10%;
   }
-
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue
index 5e1b59e..ceacc3c 100644
--- a/pages/investigation/index.vue
+++ b/pages/investigation/index.vue
@@ -190,10 +190,14 @@
 					})
 			},
 			handleClick(row) {
-				console.log(row)
+				// console.log(row)
 				if (this.tab === 1) {
-					this.$.open('/pages/map/index?businessId=' + row.businessId)
+					this.$.open('/pages/map/index?businessId=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' : 'view'))
+					// this.$.open('/pages/map/index?businessId=' + row.businessId)
+				}else{
+					this.$.open('/pages/investigation/task?id=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' : 'view'))
 				}
+				
 			},
 			// 跳转页面
 			skipPage(even) {
diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index 75bcfb0..4fb21cd 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -342,13 +342,13 @@
 			</view>
 			<view class="blank" />
 		</view>
-		<bottom-button-two v-if="active === 1" @cancel="isEdit = !isEdit" :cancelText="isEdit?'取消':'更改'" @confirm="
+		<bottom-button-two :type="type" v-if="active === 1" @cancel="isEdit = !isEdit" :cancelText="isEdit?'取消':'更改'" @confirm="
         isEdit = false;
         active = 2;
       " />
-		<bottom-button v-else-if="active === 2" :secondText="isEditStep2?'取消':'更改'" @second="isEditStep2 = !isEditStep2"
+		<bottom-button :type="type" v-else-if="active === 2" :secondText="isEditStep2?'取消':'更改'" @second="isEditStep2 = !isEditStep2"
 			@first="active = 1" @last="active = 3" />
-		<bottom-button v-else-if="active === 3" :secondText="'暂存'" @first="active = 2" @second="submit(false)"
+		<bottom-button isSubmit  :type="type" v-else-if="active === 3" :secondText="'暂存'" @first="active = 2" @second="submit(false)"
 			@last="submit(true)" />
 		<u-modal
 			:show="modalShow"
@@ -393,6 +393,8 @@
 		onLoad(e) {
 			if (e.id) {
 				this.businessId = e.id;
+				
+				this.type = e.type;
 				this.getBaseData(e.id);
 			}
 		},
@@ -565,7 +567,8 @@
 				modalShow: false,
 				extraConfigs: [],
 				describeArr: [],
-				temporary: ''
+				temporary: '',
+				type:''
 			};
 		},
 		methods: {
diff --git a/pages/map/index.vue b/pages/map/index.vue
index bc2de59..30f622b 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -35,17 +35,19 @@
         </view>
       </view>
       <view class="btn-box">
-        <view @click="handleCheck(1)" class="btn btn1"> 智能排查 </view>
-        <view @click="handleCheck(2)" class="btn btn2"> 人工排查 </view>
+        <view @click="handleCheck(1)" class="btn btn1" v-show="type=='edit'"> 智能排查 </view>
+        <view @click="handleCheck(2)" class="btn btn2" v-show="type=='edit'"> 人工排查 </view>
+        <view @click="handleCheck(2)" class="btn btn8" v-show="type=='view'"> 查看排查详情 </view>
       </view>
     </view>
     <view class="dialog dialog-two" v-if="pageType == 2">
       <view class="two-f1">根据当前定位信息，您要排查的是这条路吗？</view>
       <view class="two-f2">{{ rname }}</view>
       <view class="btn-box">
-        <view @click="onJump(3)" class="btn btn3"> 更换 </view>
-        <view @click="handleCheck(1)" class="btn btn4"> 智能排查 </view>
-        <view @click="handleCheck(2)" class="btn btn5"> 人工排查 </view>
+        <view @click="onJump(3)" class="btn btn3" v-show="type=='edit'"> 更换 </view>
+        <view @click="handleCheck(1)" class="btn btn4" v-show="type=='edit'"> 智能排查 </view>
+        <view @click="handleCheck(2)" class="btn btn5" v-show="type=='edit'"> 人工排查 </view>
+        <view @click="handleCheck(2)" class="btn btn8" v-show="type=='view'"> 查看排查详情 </view>
       </view>
     </view>
     <view class="dialog dialog-three" v-if="pageType == 3">
@@ -202,12 +204,14 @@ export default {
       name3: "",
       name4: "",
       show: false,
+      type:''
     };
   },
   onLoad(options) {
     console.log(options);
     // this.businessId = "RX202310210238";
     this.businessId = options.businessId;
+    this.type = options.type;
     this.pageHeight = uni.getSystemInfoSync().windowHeight;
 
     this.pageType = 1;
@@ -743,6 +747,14 @@ export default {
         background-size: 100% 100%;
         background-repeat: no-repeat;
       }
+      .btn8 {
+        width: 100%;
+        /* background: url(../../static/map/rr.png);
+        background-size: 100% 100%;
+        background-repeat: no-repeat; */
+        background-color: rgb(53, 103, 193);
+        border-radius:9px;
+      }
     }
   }
   .dialog-one {