From 4e03c45e476b2d363aefa28554ccda77cfd610a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=7E=E6=B5=B7=7E=E7=88=B1=E6=B5=B7=E7=88=B1?=
 =?UTF-8?q?=E6=B5=B7=7E=E5=8F=B3?= <1828712314@qq.com>
Date: Thu, 20 Feb 2025 17:39:28 +0800
Subject: [PATCH] 2025/2/20

---
 pages/index.vue                             | 15 +++++------
 sub/task/locate.vue                         | 30 ++++++++++++++-------
 uni_modules/s-components/s-tabber/index.vue | 12 ++++++++-
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index 911ddcf..0b444ed 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -76,6 +76,7 @@
             type="ring"
             :opts="opts"
             :chartData="chartData"
+            :canvas2d="true"
             style="height: 144px"
           ></qiun-data-charts>
           <view class="wd-flex" style="gap: 12px; flex-wrap: wrap">
@@ -294,28 +295,24 @@ export default {
         return res
       })
       this.detail.legendData = data
-      this.setPieData(data)
+      this.setPieData(data, this.detail.taskCompletionRate)
       this.getList()
     },
     async getList() {
       const res = await HomeApi.getListData(this.queryParams)
       this.list = res.data
     },
-    setPieData(data) {
-      const isMax = data.reduce(
-        (pre, cur) => pre + Number(cur.pieValue),
-        0
-      )
+    setPieData(data, max) {
       const pieData = data.map(i => {
         return {
           name: i.name,
           value: Number(i.pieValue)
         }
       })
-      if (isMax < 100) {
+      if (Number(max) < 100) {
         pieData.push({
           name: '',
-          value: 100 - isMax,
+          value: 100 - Number(max),
           color: '#fff'
         })
       }
@@ -330,7 +327,7 @@ export default {
         dataLabel: false,
         enableScroll: false,
         title: {
-          name: `${isMax}%`,
+          name: `${max}%`,
           fontSize: 24,
           color: '#071437',
           fontWeight: 'bold'
diff --git a/sub/task/locate.vue b/sub/task/locate.vue
index 4d83e59..a9ae260 100644
--- a/sub/task/locate.vue
+++ b/sub/task/locate.vue
@@ -74,7 +74,7 @@
     </view>
 
     <cs-bottom-wrapper v-if="!isLocate">
-      <view class="operation" v-if="distance < 30">
+      <view class="operation">
         <button
           class="btn green"
           v-if="distance < radius"
@@ -155,8 +155,8 @@ export default {
       miniCode: '',
       enterpriseGps: '',
       location: {},
-      distance: '',
-      radius: 1000000, // 打卡范围
+      distance: 10000,
+      radius: 30, // 打卡范围
       showTip: false,
       list: [],
       loading: false,
@@ -166,7 +166,7 @@ export default {
         imageUrl: ''
       },
       isLeadLocate: false,
-      isLocate: false,
+      isLocate: true,
       timer: null,
       time: 0
     }
@@ -191,10 +191,8 @@ export default {
       imageUrl:
         'http://82.156.141.150:9001/api/v1/download-shared-object/aHR0cDovL2xvY2FsaG9zdDo5MDAwL2h1YW5iYW8vbWluaWFwcC9pbnZhdGUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUQxODY1RVA2NEczMEdEUUhDVTglMkYyMDI1MDIxOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMThUMDcyMDI0WiZYLUFtei1FeHBpcmVzPTQzMTk5JlgtQW16LVNlY3VyaXR5LVRva2VuPWV5SmhiR2NpT2lKSVV6VXhNaUlzSW5SNWNDSTZJa3BYVkNKOS5leUpoWTJObGMzTkxaWGtpT2lKQlJERTROalZGVURZMFJ6TXdSMFJSU0VOVk9DSXNJbVY0Y0NJNk1UY3pPVGt3TmpJME55d2ljR0Z5Wlc1MElqb2lZV1J0YVc0aWZRLmp6djBhdEY5QVBYXzVjYWg4c18yeXhVV3oxek9BekFzSVdzemVrUmZwcXlHd0RPWkptazlUSGJRUnBDdVNmLVMyU0otWTI1cldUd2hpNUlrY0xBSThRJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZ2ZXJzaW9uSWQ9bnVsbCZYLUFtei1TaWduYXR1cmU9MjcxZTkzOTE1MDkwYzUzYmRjYTg0MjQ1MTJhYjk3ZWQxZWMyN2QzM2MwM2U3NGUwYmRhNTBmYjQyNWI0N2MyOQ'
     }
-    this.init()
-  },
-  onReady() {
     this.useAuth()
+    this.init()
   },
   onShareAppMessage() {
     return this.share
@@ -203,8 +201,8 @@ export default {
     return this.share
   },
   onShow() {
-    this.refresh()
-    this.echoQueset()
+    // this.refresh()
+    // this.echoQueset()
   },
   onHide() {
     this.timer && clearInterval(this.timer)
@@ -230,7 +228,7 @@ export default {
         scene: `aId=${this.inspectionsId}&bId=${this.enterpriseId}`,
         path: 'sub/task/locate',
         checkPath: false,
-        envVersion: 'develop',
+        envVersion: 'trial',
         isHyaline: true
       })
       this.miniCode = `data:image/jpeg;base64,${res.data}`
@@ -254,7 +252,10 @@ export default {
         this.isLocate = true
         // 专管员签到状态
         if (locate.isInspect) this.isLeadLocate = true
+      } else {
+        this.isLocate = false
       }
+      console.log(this.isLocate, this.isLeadLocate)
       this.list = res.data
     },
     useAuth() {
@@ -265,6 +266,13 @@ export default {
           res.authSetting['scope.userLocation']
             ? _getLocation()
             : _getAuth()
+        },
+        fail: err => {
+          uni.showToast({
+            icon: 'none',
+            title: '获取设置失败'
+          })
+          console.log(err)
         }
       })
       /**
@@ -285,6 +293,7 @@ export default {
         uni.getLocation({
           type: 'gcj02',
           success: res => {
+            console.log('location', res)
             that.location = {
               latitude: res.latitude,
               longitude: res.longitude
@@ -322,6 +331,7 @@ export default {
         to: this.enterpriseGps,
         success: res => {
           that.distance = res.result.elements[0].distance
+          console.log('distance', that.distance)
         }
       })
     },
diff --git a/uni_modules/s-components/s-tabber/index.vue b/uni_modules/s-components/s-tabber/index.vue
index 7025e52..b945c65 100644
--- a/uni_modules/s-components/s-tabber/index.vue
+++ b/uni_modules/s-components/s-tabber/index.vue
@@ -13,7 +13,12 @@
           height="42px"
           v-if="tab.type == 'middle'"
         ></u--image>
-        <u--image :src="selected == tab.code ? tab.selectIcon : tab.icon" width="24px" height="24px" v-else></u--image>
+        <u--image
+          :src="selected == tab.code ? tab.selectIcon : tab.icon"
+          width="24px"
+          height="24px"
+          v-else
+        ></u--image>
         <view class="name">
           {{ tab.name }}
         </view>
@@ -109,7 +114,12 @@ export default {
   border-top: 1px solid #f1f1f4;
   padding: 12px 32px 0px 32px;
   .tab {
+    display: flex;
+    flex-flow: column nowrap;
+    justify-content: center;
+    align-items: center;
     transition: 0.2s all;
+    gap: 2px;
   }
   .isActive {
     color: #22c55e;