From 52d4a6547335bb03b67e9df1cbc86783b8f1e0e8 Mon Sep 17 00:00:00 2001
From: 13684185576 <2731628804@qq.com>
Date: Thu, 4 Dec 2025 10:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=A1=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 28 ++++++-------------
 src/pages/clockInPage/components/Timeline.vue | 24 ++++------------
 src/pages/clockInPage/index.vue               | 10 +++----
 src/pages/collectPage/collectAndAdd.vue       |  2 --
 4 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1f3825c..91b2a75 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,14 +1,8 @@
 <template>
   <router-view v-slot="{ Component }">
     <Component :is="Component"></Component>
-    <van-popup
-      v-model:show="showAlert"
-      closeable
-      :close-on-click-overlay="false"
-      close-icon-position="top-right"
-      position="bottom"
-      @close="closePopup"
-    >
+    <van-popup v-model:show="showAlert" closeable :close-on-click-overlay="false" close-icon-position="top-right"
+      position="bottom" @close="closePopup">
       <div class="alert-content">
         <div class="alert-cnt">
           <van-icon name="warning-o" color="orange"></van-icon> {{ message }}
@@ -30,17 +24,10 @@ import watermark from "./utils/watermark.js";
 import emitter from "./utils/eventBus.js";
 import { onMounted, onUnmounted, ref, watch, reactive } from "vue";
 import { getMyTaskList, getMyTaskTotal } from "./api/rwzx.js";
-import { updateDate } from "./api/checkponit.js";
 import { getDistance, hintToast, timeValidate } from "./utils/tools";
-import { getAPPLocation } from "./api/spsApi";
 import { qcckPost, qcckGet } from "@/api/qcckApi";
 import { useRoute } from "vue-router";
-import router from "./router/index.js";
-import store from "./store";
 const route = useRoute();
-let userLocation = null; //用户位置信息
-const keepAlive = ref(false);
-const routerName = ref(""); //要跳转的路由名称
 const bbTime = ref(null); //查询报备定时函数
 let userInfo;
 let message = ref("版本已经更新，请退出重新登录!");
@@ -86,10 +73,10 @@ watch(
 );
 
 onMounted(() => {
-  getLocation(); //获取经纬度
-  setInterval(() => {
-    getLocation(); //获取经纬度
-  }, 10000);
+  // getLocation(); //获取经纬度
+  // setInterval(() => {
+  //   getLocation(); //获取经纬度
+  // }, 10000);
   //默认设置用户主题色
   if (!getStorage("themeSetting")) {
     setStorage("themeSetting", "light");
@@ -151,7 +138,7 @@ function _getTaskList() {
     pageSize: 10,
     pageCurrent: 1,
   };
-  getMyTaskList(data).then((res) => {});
+  getMyTaskList(data).then((res) => { });
 }
 onUnmounted(() => {
   clearInterval(bbTime.value);
@@ -464,6 +451,7 @@ body {
 .sticky_box {
   @include bg_color($background-color-theme);
 }
+
 .amap-icon img {
   width: 25px;
   height: 34px;
diff --git a/src/pages/clockInPage/components/Timeline.vue b/src/pages/clockInPage/components/Timeline.vue
index 7558a24..3041036 100644
--- a/src/pages/clockInPage/components/Timeline.vue
+++ b/src/pages/clockInPage/components/Timeline.vue
@@ -9,28 +9,20 @@
           <div v-if="item?.dkKsSj" class="time">
             打卡时间：<text>{{ handleTime(item?.dkKsSj) }}</text>
           </div>
-
           <div v-if="item?.imgUrlDkKsFj" class="image">
-            <van-image
-              width="80px"
-              height="90px"
-              :src="item?.imgUrlDkKsFj"
-              @click="onClickImg(item?.imgUrlDkKsFj)"
-              style="flex: 1"
-            >
+            <van-image width="80px" height="90px" :src="item?.imgUrlDkKsFj" @click="onClickImg(item?.imgUrlDkKsFj)"
+              style="flex: 1">
               <template v-slot:loading>
                 <van-loading type="spinner" size="20" />
               </template>
             </van-image>
           </div>
-
           <!--        <div class="address">-->
           <!--          <van-icon name="location-o" color="#1DB1FF" />-->
           <!--          <div class="name">四川省成都市</div>-->
           <!--        </div>-->
         </div>
       </div>
-
       <div :class="['item', { disabled: !item?.dkJsSj }]">
         <div class="point"></div>
         <div class="info-right">
@@ -38,21 +30,14 @@
           <div v-if="item?.dkJsSj" class="time">
             打卡时间：<text>{{ handleTime(item?.dkJsSj) }}</text>
           </div>
-
           <div v-if="item?.imgUrlDkJsFj" class="image">
-            <van-image
-              width="80px"
-              height="95px"
-              :src="item?.imgUrlDkJsFj"
-              @click="onClickImg(item?.imgUrlDkJsFj)"
-              style="flex: 1"
-            >
+            <van-image width="80px" height="95px" :src="item?.imgUrlDkJsFj" @click="onClickImg(item?.imgUrlDkJsFj)"
+              style="flex: 1">
               <template v-slot:loading>
                 <van-loading type="spinner" size="20" />
               </template>
             </van-image>
           </div>
-
           <!--        <div class="address">-->
           <!--          <van-icon name="location-o" color="#1DB1FF" />-->
           <!--          <div class="name">四川省成都市</div>-->
@@ -118,6 +103,7 @@ const handleTime = (time) => {
       margin-left: 5.33vw;
       font-family: PingFang HK, PingFang HK;
       margin-top: -1.33vw;
+
       .name {
         font-weight: 400;
         font-size: 3.73vw;
diff --git a/src/pages/clockInPage/index.vue b/src/pages/clockInPage/index.vue
index 0306f74..79db124 100644
--- a/src/pages/clockInPage/index.vue
+++ b/src/pages/clockInPage/index.vue
@@ -178,7 +178,7 @@ const onChange = (value) => {
 const handleNext = (index) => {
   stop();
   nextStep.value = index;
-  start(infoData?.value?.dkKsSj,activeInfoData.value.dkjgsj);
+  start(infoData?.value?.dkKsSj, activeInfoData.value.dkjgsj);
 };
 
 function setimage_base64(pzid, base64) {
@@ -267,7 +267,7 @@ const getData = async () => {
         const firstItem = data.info[nextStep.value || 0];
         if (firstItem?.dkKsSj) {
           startTime.value = infoData?.value?.dkKsSj;
-          start(startTime.value,activeInfoData.value.dkjgsj);
+          start(startTime.value, activeInfoData.value.dkjgsj);
         } else {
           start("");
         }
@@ -437,7 +437,6 @@ onMounted(() => {
           <van-tab :title="item.bddMc" />
         </template>
       </van-tabs>
-
       <div class="clockInList">
         <template v-for="(item, index) in data.info" :key="index">
           <div :class="['clockInList_item', { active: nextStep === index }]" @click="handleNext(index)">
@@ -459,7 +458,6 @@ onMounted(() => {
           </div>
         </template>
       </div>
-
       <div class="upload_box">
         <div class="image_box" v-if="baseUrl">
           <van-icon name="close" class="close_icon" @click="clearImage" color="#000" size="24px" />
@@ -479,7 +477,6 @@ onMounted(() => {
           <span style="color: red">*</span>须拍摄实景图才可进行打卡
         </div>
       </div>
-
       <div class="clockWrapper">
         <div v-if="!infoData?.dkJsSj || !infoData?.dkKsSj" class="circleWrapper" :class="{
           disabled: (!isExpired && expirationTime) || infoData?.dkJsSj,
@@ -490,7 +487,7 @@ onMounted(() => {
           <div class="title">{{ !infoData?.dkKsSj ? `开始` : `离开` }}</div>
           <div class="info">{{ `第${infoData?.count || ""}次打卡` }}</div>
         </div>
-        <div v-else class="circleWrapper" :class="{ disabled: (!isExpired && expirationTime) || infoData?.dkJsSj,}">
+        <div v-else class="circleWrapper" :class="{ disabled: (!isExpired && expirationTime) || infoData?.dkJsSj, }">
           <div class="title">已结束</div>
         </div>
         <div class="circleWrapperTip">
@@ -700,6 +697,7 @@ onMounted(() => {
         margin-right: 0 !important;
       }
     }
+
     .van-tab--active {
       background: rgba(62, 110, 232, 0.2);
       border: 0.27vw solid #3e6ee8;
diff --git a/src/pages/collectPage/collectAndAdd.vue b/src/pages/collectPage/collectAndAdd.vue
index 3188313..8f2483a 100644
--- a/src/pages/collectPage/collectAndAdd.vue
+++ b/src/pages/collectPage/collectAndAdd.vue
@@ -58,10 +58,8 @@ const getFetchTbZdxlFgdwId = async (id) => {
     const position = [[Number(x1),Number(y1)],[Number(x2),Number(y2)]]
     const text = mc
     const obj = [{ position: position, text, id, userData: res }]
-
     emitter.emit("echoPlane", { fontColor:'#12fdb8',coords: obj, type:'rectangle', flag:'addfg', color:'rgba(2,20,51,0.5)', linecolor:'#1C97FF'})
     emitter.emit("setMapCenter", { location: centerPoint, zoomLevel: 14 });
-
     emitter.emit("addPointArea", {
       coords: [{ jd: formData.value?.jd, wd: formData.value?.wd }],
       coordinates: [formData.value?.jd, formData.value?.wd],