From 9df5bff199fa5c1a367566bbf55ea21e6d066e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=99=E6=88=91?= <2731628804@qq.com>
Date: Fri, 19 Dec 2025 15:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/service/dailyTaskPackage.js           |  2 +-
 .../CustomTaskPackage/editAddFormDialog.vue   | 19 ++++++++-----------
 .../taskPage/CustomTaskPackage/index.vue      | 13 ++++---------
 .../taskPage/dailyTaskPackage/index.vue       |  1 +
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/api/service/dailyTaskPackage.js b/src/api/service/dailyTaskPackage.js
index b99fcc4..e19d8e1 100644
--- a/src/api/service/dailyTaskPackage.js
+++ b/src/api/service/dailyTaskPackage.js
@@ -13,7 +13,7 @@ export function getSelectPage(params) {
 // 自定义分页查询
 export function selectPagezdy(params) {
   return request({
-    url: api + 'tbZdxlFgxlrw/selectPagezdy',
+    url: api + '/tbZdxlFgxlrw/selectPagezdy',
     method: 'GET',
     params
   })
diff --git a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue
index 4979c45..2eaa584 100644
--- a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue
+++ b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/editAddFormDialog.vue
@@ -21,20 +21,17 @@
           <el-descriptions-item label="预警等级">
             <dict-tag :options="D_ZDXL_FGXLRW_YJDJ" :value="form?.fgYjdj" :tag="false" />
           </el-descriptions-item>
-          <el-descriptions-item label="警情数量">
-            {{ form?.fgYjjqsl }}
+          <el-descriptions-item label="任务标题">
+            {{ form?.fgRwbt }}
           </el-descriptions-item>
-          <el-descriptions-item label="高发时段">
-            {{ form?.fgYjgfsd }}
-          </el-descriptions-item>
-          <el-descriptions-item label="高发类型">
-            {{ form?.fgJqtjLx }}
+          <el-descriptions-item label="任务内容">
+            {{ form?.fgRwnr }}
           </el-descriptions-item>
           <el-descriptions-item label="任务日期">
             {{ form?.rwRq }}
           </el-descriptions-item>
-          <el-descriptions-item label="小时统计">
-            {{ form?.fgJqtjXsLabel }}
+          <el-descriptions-item label="时间范围">
+            {{ form?.xlghSjKs }}-{{form?.xlghSjJs}}
           </el-descriptions-item>
         </el-descriptions>
 
@@ -56,10 +53,10 @@
               v-model="form.xlghXllc"></el-input-number>
             <el-tag size="small" type="warning">公里</el-tag>
           </el-form-item>
-          <el-form-item label="下发巡组:">
+          <!-- <el-form-item label="下发巡组:">
             <el-input placeholder="请填写下发巡组" clearable :disabled="disabled" v-model="form.xfbbName"
               @click="visible = true" readonly></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <div v-if="form?.rwZt !== '01'" style="flex: 1; display: flex; justify-content: flex-end">
             <el-button :disabled="isButtonDisabled" @click="checkInCardOpen">追加打卡</el-button>
           </div>
diff --git a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue
index b7c1a7d..bcca2e4 100644
--- a/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue
+++ b/src/views/backOfficeSystem/service/taskPage/CustomTaskPackage/index.vue
@@ -6,9 +6,9 @@ import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
-import EditAddFormDialog from "@/views/backOfficeSystem/service/taskPage/dailyTaskPackage/editAddFormDialog.vue";
+import EditAddFormDialog from "./editAddFormDialog.vue";
 import Export from "@/components/export/index.vue";
-import { fetchIssueData, selectPagezdy } from "@/api/service/dailyTaskPackage";
+import { fetchIssueData, getSelectPage } from "@/api/service/dailyTaskPackage";
 
 const searchConfiger = reactive([
   {
@@ -85,10 +85,6 @@ const pageData = reactive({
       prop: "xlghXllc",
       showSolt:true
     },
-    {
-      label: "下发巡组",
-      prop: "xfxz",
-    },
     {
       label: "每个打卡点",
       prop: "bddListLabel",
@@ -129,9 +125,7 @@ const handleIssueAll = () => {
 const handleIssue = async (ids = []) => {
   try {
     await proxy.$confirm("是否进行下发操作", "警告", {type: "warning"})
-
     const res = await fetchIssueData({ ids: ids?.join(',') })
-
     if (res) {
       proxy.$message({type: "success", message: "下发成功" });
       handleFilter()
@@ -198,7 +192,8 @@ const parseAndJoinLx = (jsonString, type = 'lx') => {
 const getListData = async (params = {}) => {
   pageData.tableConfiger.loading = true
   try {
-    const res = await selectPagezdy({
+    const res = await getSelectPage({
+      rwlx:'2',
       ...pageData.pageConfiger,
       ...params
     })
diff --git a/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue b/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue
index f119cd1..64bab75 100644
--- a/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue
+++ b/src/views/backOfficeSystem/service/taskPage/dailyTaskPackage/index.vue
@@ -208,6 +208,7 @@ const getListData = async (params = {}) => {
   pageData.tableConfiger.loading = true
   try {
     const res = await getSelectPage({
+      rwlx:'1',
       ...pageData.pageConfiger,
       ...params
     })