From 874b4a59946c9b3a100264ee0b382348f7011bfb Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Sat, 19 Jul 2025 15:49:31 +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/components/aboutTable/Search.vue                      | 8 ++++++++
 .../ResearchJudgment/DatAcquisition/index.vue             | 4 ++--
 .../ResearchJudgment/MoralAnalysis/index.vue              | 5 +++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/aboutTable/Search.vue b/src/components/aboutTable/Search.vue
index ca2e351..4462e9c 100644
--- a/src/components/aboutTable/Search.vue
+++ b/src/components/aboutTable/Search.vue
@@ -63,6 +63,14 @@
           value-format="YYYY-MM-DD"
         >
         </el-date-picker>
+        <el-date-picker
+          v-else-if="item.showType === 'datetime'"
+          v-model="searchObj[item.prop]"
+          type="datetime"
+          :placeholder="item.placeholder"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        >
+        </el-date-picker>
 
         <!-- checkbox -->
         <template v-else-if="item.showType === 'department'">
diff --git a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
index 978ea1e..d1eb251 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
@@ -114,8 +114,8 @@ const searchConfiger = ref([
   { label: "内容关键字", prop: 'xsNr', placeholder: "请输入语义关键字", showType: "input" },
   { label: "线索类型", prop: 'xlLx', placeholder: "请选择线索类型", showType: "select",options:D_GS_XS_LX },
   { label: "线索来源", prop: 'qbLy', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
-  { label: "开始时间", prop: 'zxkssj', placeholder: "请选择开始时间", showType: "date" },
-  { label: "结束时间", prop: 'zxjssj', placeholder: "请选择结束时间", showType: "date" },
+  { label: "开始时间", prop: 'kssj', placeholder: "请选择开始时间", showType: "datetime" },
+  { label: "结束时间", prop: 'jssj', placeholder: "请选择结束时间", showType: "datetime" },
   { label: "指向地点", prop: 'zxdz', placeholder: "请输入指向地点", showType: "input" },
 ]);
 const chooseRow = ref({})
diff --git a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue
index c27d17e..b4f0569 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue
@@ -66,7 +66,7 @@
             @changeNo="changeNo"
             @changeSize="changeSize"
             :tableHeight="pageData.tableHeight"
-            :pageConfigerR="{ ...pageData.pageConfigerR, total: pageData.total }"
+            :pageConfiger="{ ...pageData.pageConfigerR }"
           />
         </div>
       </div>
@@ -158,8 +158,8 @@ const pageData = reactive({
     showSelectType: null,
     loading: false
   },
-  total: 0,
   pageConfigerR: {
+    total: 0,
     pageSize: 20,
     pageCurrent: 1
   }, //分页
@@ -210,6 +210,7 @@ const getjxListR = () => {
   pageData.tableConfigerR.loading = true;
   qcckGet(queryFromR.value,'/mosty-gsxt/qbcj/selectPage').then((res)=>{
     pageData.tableDataR = res.records || [];
+    pageData.pageConfigerR.total = res.total;
     pageData.tableConfigerR.loading = false;
   }).catch(()=>{
     pageData.tableConfigerR.loading = false;