From aed0ed60ba7b443a084d3822ab536c37ff002793 Mon Sep 17 00:00:00 2001
From: maojiacai <you@example.com>
Date: Thu, 18 Sep 2025 18:36:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B7=A1=E9=80=BB=E6=89=93?=
 =?UTF-8?q?=E5=8D=A1=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=20=E5=A4=84=E7=90=86=E6=97=B6=E9=97=B4=E8=BD=B4=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=B1=95=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/lz/dingwei.png                     | Bin 0 -> 595 bytes
 src/assets/lz/peoplePolice.png                | Bin 0 -> 3039 bytes
 src/components/SelectTime.vue                 |  13 +++-
 src/components/SxPopup.vue                    |  54 ++++++-------
 src/pages/clockInPage/components/Timeline.vue |   4 +-
 src/pages/clockInPage/index.vue               |  30 ++++---
 src/pages/collectPage/index.vue               |   1 +
 src/pages/patrolList/index.vue                |  73 +++++++++++++++---
 8 files changed, 124 insertions(+), 51 deletions(-)
 create mode 100644 src/assets/lz/dingwei.png
 create mode 100644 src/assets/lz/peoplePolice.png

diff --git a/src/assets/lz/dingwei.png b/src/assets/lz/dingwei.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfcba6f78e96d86ccf23073b4fb2931683c2cb87
GIT binary patch
literal 595
zcmeAS@N?(olHy`uVBq!ia0vp^AT}Qd8;}%R+`Ae`F%}28J29*~C-V}>aY>EvO!M_+
z&;qhK7#Q0#8CXC{fLIEM85o!sFfuR$X-1IP0w%aD*8*lZn-8S$+z&ZZpt8N5E{-7@
zqPBsC*&&Vs^Jd=tes6DsoR@$OPgz;u7SD(L8w?t)i_^1}uQfF-auwm}VtFINy}IG!
zJB~>vleDHT@f2=ZZR#4}XDG1u`@6U2EIxDa)x7!e)?EJn8zq_W<>eJt4&N9A-f1wf
z-m}n*|FZjRyjmbv!annPo^yUbn3ST|mLOvBUNP*dpXlSWXY>B`I<VLt+H`*MP6N$-
z3dghAUiWUczMSBGm+6Gw(wkd+PMxbN&r0Zf8@ID#<@?V|WGWA6vuK(!7M{{;{V-*2
zm{ZL6jw#Fmm#e4CwFLaTu;aO?e^m2+^^oPQ-vh!ECIn7QXa7<s=dQ7-YlX?B$mvhC
z*<Qbn6}*?bsx4<)ZL;g;Hw%je)LnUtwv}#tyYu5EldT_;x$BJ&)F#TwTQ?txaG7@e
zuU_AO?&;G^s<`4+k0|~U(eP}vT$2{TYi(PocI4Zw`KRC9HR6mBo#3oswRqKhkAH0i
zHESdHzg};nQn<y{W4gl+u^q>BjO?#AK7XD2U$S-n%9}dge_GZa{2|D6_v+m5Qzc$?
z%QU{Q=9*LTMDN9go>_ZV{r~mr*2SYLzWL0@S!FHKXNGL>e`2OJZM$^$&3pFwhDR$x
S)DAxcMX0B%pUXO@geCyp5$>Y^

literal 0
HcmV?d00001

diff --git a/src/assets/lz/peoplePolice.png b/src/assets/lz/peoplePolice.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1a4fc73f731fd78c37f7ab3e2e87f08ddab4617
GIT binary patch
literal 3039
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

literal 0
HcmV?d00001

diff --git a/src/components/SelectTime.vue b/src/components/SelectTime.vue
index da37882..8d0b887 100644
--- a/src/components/SelectTime.vue
+++ b/src/components/SelectTime.vue
@@ -3,14 +3,14 @@
     <van-datetime-picker
       v-model="presentTime"
       type="date"
-      :title="timeType == 'start' ? '选择开始日期' : '选择结束日期'"
+      :title="title"
       @cancel="onCancel"
       @confirm="onTimeConfirm"
     ></van-datetime-picker>
   </van-dialog>
 </template>
 <script setup>
-import { ref, defineProps, onMounted, defineEmits, watch } from "vue";
+import {ref, defineProps, onMounted, defineEmits, watch, computed} from "vue";
 import { dateFormat } from "../utils/tools.js";
 const props = defineProps({
   timeType: String,
@@ -19,6 +19,15 @@ const emits = defineEmits(["update:time"]);
 const show = ref(true);
 const presentTime = ref(new Date()); //选择器默认时间
 
+const title = computed(() => {
+  if (props.timeType == 'start') {
+    return '选择开始日期'
+  } else if (props.timeType == 'end') {
+    return '选择结束日期'
+  } else {
+    return props.timeType
+  }
+})
 function onTimeConfirm(val) {
   emits("update:time", dateFormat("", val));
 }
diff --git a/src/components/SxPopup.vue b/src/components/SxPopup.vue
index df3bdc9..adf3d60 100644
--- a/src/components/SxPopup.vue
+++ b/src/components/SxPopup.vue
@@ -17,28 +17,30 @@
           </template>
         </div>
 
-        <div v-show="showTime" class="other_type_title" style="margin-left: 3vw">自定义时间</div>
-        <div v-show="showTime" class="time_box">
-          <van-field
-            v-model="startTime"
-            label-width="60px"
-            placeholder="开始日期"
-            input-align="left"
-            right-icon="arrow-down"
-            readonly
-            @click.stop="onClickTime('start')"
-          ></van-field>
-          <div class="relevance">至</div>
-          <van-field
-            v-model="endTime"
-            label-width="60px"
-            input-align="left"
-            right-icon="arrow-down"
-            placeholder="结束日期"
-            @click.stop="onClickTime('end')"
-            readonly
-          ></van-field>
-        </div>
+        <slot>
+          <div v-show="showTime" class="other_type_title" style="margin-left: 3vw">自定义时间</div>
+          <div v-show="showTime" class="time_box">
+            <van-field
+                v-model="startTime"
+                label-width="60px"
+                placeholder="开始日期"
+                input-align="left"
+                right-icon="arrow-down"
+                readonly
+                @click.stop="onClickTime('start')"
+            ></van-field>
+            <div class="relevance">至</div>
+            <van-field
+                v-model="endTime"
+                label-width="60px"
+                input-align="left"
+                right-icon="arrow-down"
+                placeholder="结束日期"
+                @click.stop="onClickTime('end')"
+                readonly
+            ></van-field>
+          </div>
+        </slot>
         <div class="but_box">
           <van-button round block type="primary" size="small" @click.stop="onConfirm" style="margin: 0 3vw 0 0vw">确定</van-button>
           <van-button round block type="warning" size="small" @click.stop="onReset" style="margin: 0 0 0 3vw">重置 </van-button>
@@ -175,10 +177,10 @@ function onHide() {
 }
 //确认选中数据
 function onConfirm() {
-  const list = JSON.parse(JSON.stringify(props.list));
+  const list = props?.list ? JSON.parse(JSON.stringify(props?.list)) : [];
   let array = [];
   //筛选出按时间的筛选条件
-  for (let i = 0; i < list.length; i++) {
+  for (let i = 0; i < list?.length; i++) {
     if (list[i].title != "按时间") {
       array.push(list[i]);
     }
@@ -197,8 +199,8 @@ function onConfirm() {
 }
 //重置选项
 function onReset() {
-  props.list.forEach((item) => {
-    item.array.forEach((_item) => {
+  props.list?.forEach((item) => {
+    item.array?.forEach((_item) => {
       _item.isCheck = false;
     });
   });
diff --git a/src/pages/clockInPage/components/Timeline.vue b/src/pages/clockInPage/components/Timeline.vue
index 6229c37..5194704 100644
--- a/src/pages/clockInPage/components/Timeline.vue
+++ b/src/pages/clockInPage/components/Timeline.vue
@@ -9,7 +9,7 @@
           <div v-if="item?.dkKsSj" class="time">打卡时间：<text>{{ handleTime(item?.dkKsSj) }}</text></div>
 
           <div v-if="item?.imgUrlDkKsFj" class="image">
-            <van-image width="80px" :src="item?.imgUrlDkKsFj" @click="onClickImg(item?.imgUrlDkKsFj)" style="flex: 1">
+            <van-image width="80px" height="95px" :src="item?.imgUrlDkKsFj" @click="onClickImg(item?.imgUrlDkKsFj)" style="flex: 1">
               <template v-slot:loading>
                 <van-loading type="spinner" size="20" />
               </template>
@@ -30,7 +30,7 @@
           <div v-if="item?.dkJsSj" class="time">打卡时间：<text>{{ handleTime(item?.dkJsSj) }}</text></div>
 
           <div v-if="item?.imgUrlDkJsFj" class="image">
-            <van-image width="80px" :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>
diff --git a/src/pages/clockInPage/index.vue b/src/pages/clockInPage/index.vue
index 39f5148..2e4321f 100644
--- a/src/pages/clockInPage/index.vue
+++ b/src/pages/clockInPage/index.vue
@@ -22,7 +22,7 @@ const baseUrl = ref("")
 const fileId = ref("")
 
 
-const startTime = ref("2025-09-08 15:29:00");
+const startTime = ref("2025-09-18 18:15:00");
 
 const useCountdownFromTime = (minutes = 10) => {
   const timeLeft = ref(0); // 剩余毫秒数
@@ -162,13 +162,21 @@ const photoFn = () => {
   }
 }
 
-const count = (item) => {
-  if (!item || !item.dkSx) return undefined;
+// 支持更大数字的转换
+const getChineseNumber = (num) => {
+  const numbers = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十'];
 
-  const numbers = ['一', '二', '三', '四'];
-  const index = item.dkSx - 1; // 假设 dkSx 是从1开始的数字
-
-  return numbers[index];
+  if (num <= 10) {
+    return numbers[num - 1];
+  } else if (num <= 19) {
+    return `十${numbers[num - 11] || ''}`;
+  } else if (num <= 99) {
+    const tens = Math.floor(num / 10);
+    const units = num % 10;
+    return `${numbers[tens - 1]}十${units > 0 ? numbers[units - 1] : ''}`;
+  } else {
+    return num.toString(); // 超过99返回阿拉伯数字
+  }
 };
 
 const onChange = (value) => {
@@ -249,14 +257,16 @@ const getData = async () => {
       });
 
       // 设置数据
-      data.info = res.map(item => ({
+      data.info = res.map((item, index) => ({
         ...item,
-        count: count(item),
+        count: getChineseNumber(index + 1),
         imgUrlDkJsFj: item?.dkJsFj ? imageMap.get(item.dkJsFj) : null,
         imgUrlDkKsFj: item?.dkKsFj ? imageMap.get(item.dkKsFj) : null,
       }));
 
+      // 打卡结束经纬度
       const dkJs = res?.map(i => ({ jd: i?.dkJsJd, wd: i?.dkJsWd }))
+      // 打卡开始经纬度
       const dkKs = res?.map(i => ({ jd: i?.dkKsJd, wd: i?.dkKsWd }))
 
       // 删除标注
@@ -287,7 +297,7 @@ const getData = async () => {
       //地图撒点然后移动
       emitter.emit("addPointArea", {
         coords: [{ jd, wd }],
-        icon: require("../../assets/lz/dw.png"),
+        icon: require("../../assets/lz/peoplePolice.png"),
         flag: "checkPoint",
       });
     }
diff --git a/src/pages/collectPage/index.vue b/src/pages/collectPage/index.vue
index 0926b49..8750728 100644
--- a/src/pages/collectPage/index.vue
+++ b/src/pages/collectPage/index.vue
@@ -37,6 +37,7 @@ const onRefresh = () => {
 }
 
 const getData = async () => {
+  loading.value = true;
   try {
     const { total, ...ret }  = pageData
     const res = await getSelectPage({ ...ret, bddMc: searchValue.value })
diff --git a/src/pages/patrolList/index.vue b/src/pages/patrolList/index.vue
index 81e1685..887ca5c 100644
--- a/src/pages/patrolList/index.vue
+++ b/src/pages/patrolList/index.vue
@@ -6,7 +6,11 @@ import PatrolWrapper from "@/pages/patrolList/copmonents/patrolWrapper.vue";
 import {fetchPatrolList} from "@/api/patrolList";
 import {getDictListByCode} from "@/api/common";
 import router from "@/router";
+import SxPopup from "@/components/SxPopup.vue";
+import SelectTime from "@/components/SelectTime.vue";
 
+const showPopup = ref(false);
+const timeShow = ref(false);
 const finished = ref(false);
 const loading = ref(false);
 const loadingRefresh = ref(false);
@@ -19,7 +23,9 @@ const pageData = reactive({
 })
 
 const data = reactive({
-  list: []
+  list: [],
+  dictList: [],
+  startTime: ''
 })
 
 const onSearch = () => {
@@ -79,19 +85,20 @@ const parseAndJoinLx = (jsonString, type = 'lx') => {
 };
 
 const getData = async () => {
-
   const { total, ...ret }  = pageData
+  loading.value = true;
   try {
-    const res = await fetchPatrolList({ ...ret, fgMc: searchValue.value })
+    const res = await fetchPatrolList({ ...ret, fgMc: searchValue.value, rwRq: data.startTime })
     if (res?.records.length > 0) {
       data.list = data.list.concat(res?.records)?.map((item) => ({
         ...item,
-        fgJqtjLx: parseAndJoinLx(item?.fgJqtjLx, 'lx')
+        fgJqtjLx: parseAndJoinLx(item?.fgJqtjLx, 'lx'),
+        fgYjdjLabel: data.dictList?.find(i => i.dm === item.fgYjdj)?.zdmc || item.fgYjdj
       })) || []
+
       pageData.total = res?.total
       loading.value = false;
 
-      await getDictList()
     }
     loadingRefresh.value = false;
 
@@ -103,15 +110,36 @@ const getData = async () => {
 
 const getDictList = async () => {
   const res = await getDictListByCode({ dictCode: 'D_ZDXL_FGXLRW_YJDJ' })
-
-  data.list = (data.list || []).map(item => ({
-    ...item,
-    fgYjdjLabel: (res?.itemList || []).find(i => i.dm === item.fgYjdj)?.zdmc || item.fgYjdj
-  }));
+  if (res && res?.itemList?.length > 0) {
+    data.dictList = res?.itemList
+  }
 }
 
-onMounted(() => {
+const onSelectTime = (val) => {
+  data.startTime = val;
+  timeShow.value = false
+}
+
+const onClickTime = () => {
+  timeShow.value = true;
+}
+
+const onConfirm = () => {
+  pageData.pageCurrent = 1;
+  data.list = []
   getData()
+  showPopup.value = false;
+}
+
+const handleReset = () => {
+  data.startTime = ""
+  onConfirm()
+}
+
+
+onMounted(async () => {
+  await getDictList()
+  await getData()
 })
 </script>
 
@@ -122,13 +150,32 @@ onMounted(() => {
     <van-sticky>
       <div class="header">
         <search
+          :isSx="true"
           placeholder="请输入方格名称进行查询"
           v-model="searchValue"
+          @update:sx="showPopup = !showPopup"
           @update:modelValue="onSearch"
         />
       </div>
     </van-sticky>
 
+    <sx-popup :showPopup="showPopup" :p_top="110" @update:close="showPopup = false"
+              @update:onConfirm="onConfirm" @reset="handleReset">
+      <div class="time_box">
+        <van-field
+          v-model="data.startTime"
+          label-width="60px"
+          placeholder="请选择时间"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          @click.stop="onClickTime"
+        />
+      </div>
+    </sx-popup>
+
+    <select-time v-if="timeShow" time-type="选择任务日期" @update:time="onSelectTime" @update:cancelTime="timeShow = false" />
+
     <div class="content">
       <van-pull-refresh v-model="loadingRefresh" @refresh="onRefresh">
         <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="onLoad" offset="1" :immediate-check="false">
@@ -142,6 +189,10 @@ onMounted(() => {
 </template>
 
 <style scoped lang="scss">
+.time_box {
+  padding: 0 3vw 3vw;
+}
+
 .header {
   margin-top: 13vw;
 }