From 264af985d306f9a87b3da1c34e697a28780fa581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= <m18571841023@163.com>
Date: Wed, 19 Mar 2025 11:14:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E9=80=9A=E7=9F=A5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jyh/index.ts                          | 22 ++++++++
 .../Detail/EarlyWarningOrganization.vue       | 55 +++++++++++++++----
 .../Detail/EarlyWarningPerson.vue             | 54 ++++++++++++++----
 .../Jyh/Search/Components/BatchVerify.vue     |  2 +-
 4 files changed, 111 insertions(+), 22 deletions(-)

diff --git a/src/api/jyh/index.ts b/src/api/jyh/index.ts
index c577a92..1eca924 100644
--- a/src/api/jyh/index.ts
+++ b/src/api/jyh/index.ts
@@ -171,3 +171,25 @@ export function repoImport(data: types.commonRepoReqType){
     })
   );
 }
+
+// 个人中心-获取预警列表
+export const getNoticeList = (data): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/alert/notice/list`,
+      method: 'POST',
+      data,
+    })
+  );
+}
+
+// 个人中心-获取组织级预警列表
+export const getgroupNoticeList = (data): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/alert/group/notice/list`,
+      method: 'POST',
+      data,
+    })
+  );
+}
diff --git a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue
index 70a4da5..c8c04d9 100644
--- a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue
+++ b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningOrganization.vue
@@ -2,15 +2,18 @@
   <Card simple class="jyh-card mt-3">
     <div class="card-title">组织预警通知列表</div>
     <div class="mb-3">
-      <d-table class="jyh-table jyh-table-2" :header-bg="true" :data="licenseTableData">
-        <d-column field="code" header="时间"></d-column>
+      <d-table v-if="tableData.length>0" class="jyh-table jyh-table-2" :header-bg="true" :data="tableData">
+        <d-column field="updateTime" header="时间">
+          <template #default="scope">
+            <span>{{ formatTime(scope.row.updateTime, 'YYYY-MM-DD') }}</span>
+          </template>
+        </d-column>
         <d-column field="name" header="标题">
           <template #default="scope">
             <a @click="openWarningDetail(scope.row)">{{ scope.row.name }}</a>
           </template>
         </d-column>
-        <d-column field="detail" header="详情"></d-column>
-        <d-column field="owner" header="订阅人"></d-column>
+        <d-column field="alertMsg" header="详情"></d-column>
         <d-column field="level" header="级别">
           <template #default="scope, text">
             <d-status v-if="scope.row.level === 4" type="error">危险</d-status>
@@ -26,7 +29,17 @@
           </template>
         </d-column>
       </d-table>
+      <NoData v-else :small="false"></NoData>
     </div>
+
+
+    <div class="mt-20 mb-20 flex justify-end">
+      <d-pagination size="md" :page-size-options="[10, 20, 50]" :total="pager.total"
+                    v-model:pageSize="pager.pageSize" v-model:pageIndex="pager.pageIndex" :max-items="5"
+                    :can-change-page-size="true" :can-view-total="true" total-item-text="总计" @page-index-change="changeIndex()"
+                    @page-size-change="changeSize()" />
+    </div>
+
   </Card>
 
   <d-modal class="warning-modal" v-model="warningModalVisable" title="">
@@ -35,16 +48,22 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue';
+import NoData from "@/components/NoData/NoData.vue";
+import { getgroupNoticeList, getNoticeList } from '@/api/jyh';
 
-const licenseTableData = ref([
-  { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 4, status: 1 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 3, status: 2 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 2, status: 2 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 1, status: 2 }
+const tableData = ref([
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 4, status: 1 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 3, status: 2 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 2, status: 1 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 1, status: 2 }
 ]);
-
+const pager = ref({
+  total: 0,
+  pageIndex: 1,
+  pageSize: 10
+});
 const warningModalVisable = ref(false);
 const currentWarning = ref();
 const openWarningDetail = (row) => {
@@ -54,6 +73,20 @@ const openWarningDetail = (row) => {
 const colseWarningDetail = () => {
   warningModalVisable.value = false;
 };
+
+const getList = async() => {
+  const { data, error } = await getgroupNoticeList({  current: 1,size: pager.value.pageSize  });
+  if (!error && data) {
+    tableData.value = data.data.data.records;
+    pager.value.total = data.data.data.total;
+  }
+};
+
+onMounted(async() => {
+  getList();
+});
+
+
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue
index 253f059..a08a02e 100644
--- a/src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue
+++ b/src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue
@@ -2,14 +2,18 @@
   <Card simple class="jyh-card mt-3">
     <div class="card-title">个人预警通知列表</div>
     <div class="mb-3">
-      <d-table class="jyh-table jyh-table-2" :header-bg="true" :data="licenseTableData">
-        <d-column field="code" header="时间"></d-column>
+      <d-table v-if="tableData.length>0" class="jyh-table jyh-table-2" :header-bg="true" :data="tableData">
+        <d-column field="updateTime" header="时间">
+          <template #default="scope">
+            <span>{{ formatTime(scope.row.updateTime, 'YYYY-MM-DD') }}</span>
+          </template>
+        </d-column>
         <d-column field="name" header="标题">
           <template #default="scope">
             <a @click="openWarningDetail(scope.row)">{{ scope.row.name }}</a>
           </template>
         </d-column>
-        <d-column field="detail" header="详情"></d-column>
+        <d-column field="alertMsg" header="详情"></d-column>
         <d-column field="level" header="级别">
           <template #default="scope, text">
             <d-status v-if="scope.row.level === 4" type="error">危险</d-status>
@@ -25,7 +29,17 @@
           </template>
         </d-column>
       </d-table>
+      <NoData v-else :small="false"></NoData>
     </div>
+
+
+    <div class="mt-20 mb-20 flex justify-end">
+      <d-pagination size="md" :page-size-options="[10, 20, 50]" :total="pager.total"
+                    v-model:pageSize="pager.pageSize" v-model:pageIndex="pager.pageIndex" :max-items="5"
+                    :can-change-page-size="true" :can-view-total="true" total-item-text="总计" @page-index-change="changeIndex()"
+                    @page-size-change="changeSize()" />
+    </div>
+
   </Card>
 
   <d-modal class="warning-modal" v-model="warningModalVisable" title="">
@@ -34,16 +48,22 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import EarlyWarningDetail from '@/views/Jyh/PersonalCenter/Detail/EarlyWarningDetail.vue';
+import NoData from "@/components/NoData/NoData.vue";
+import { getNoticeList } from '@/api/jyh';
 
-const licenseTableData = ref([
-  { code: '05822156', name: 'MIT License', detail: 'integer', level: 4, status: 1 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', level: 3, status: 2 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', level: 2, status: 1 },
-  { code: '05822156', name: 'MIT License', detail: 'integer', level: 1, status: 2 }
+const tableData = ref([
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 4, status: 1 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 3, status: 2 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 2, status: 1 },
+  // { code: '05822156', name: 'MIT License', detail: 'integer', level: 1, status: 2 }
 ]);
-
+const pager = ref({
+  total: 0,
+  pageIndex: 1,
+  pageSize: 10
+});
 const warningModalVisable = ref(false);
 const currentWarning = ref();
 const openWarningDetail = (row) => {
@@ -53,6 +73,20 @@ const openWarningDetail = (row) => {
 const colseWarningDetail = () => {
   warningModalVisable.value = false;
 };
+
+const getList = async() => {
+  const { data, error } = await getNoticeList({  current: 1,size: pager.value.pageSize  });
+  if (!error && data) {
+    tableData.value = data.data.data.records;
+    pager.value.total = data.data.data.total;
+  }
+};
+
+onMounted(async() => {
+  getList();
+});
+
+
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/Jyh/Search/Components/BatchVerify.vue b/src/views/Jyh/Search/Components/BatchVerify.vue
index 3ccac5f..b8b89c0 100644
--- a/src/views/Jyh/Search/Components/BatchVerify.vue
+++ b/src/views/Jyh/Search/Components/BatchVerify.vue
@@ -219,7 +219,7 @@ const currentReusltFilter = ref(null);
 // 定义 tableKey，用于强制刷新表格
 const tableKey = ref(0);
 const pager = ref({
-  total: 10,
+  total: 0,
   pageIndex: 1,
   pageSize: 10
 });