From 847cfdcb4c053808c761f39049d7ab8eeabc7031 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 12:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=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 ++++++++++++
 .../PersonalCenter/Detail/OrgSubscription.vue | 34 +++++++++++++++----
 .../Detail/PersonageSubscription.vue          | 33 +++++++++++++++---
 3 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/src/api/jyh/index.ts b/src/api/jyh/index.ts
index 1eca924..fa2abd9 100644
--- a/src/api/jyh/index.ts
+++ b/src/api/jyh/index.ts
@@ -193,3 +193,25 @@ export const getgroupNoticeList = (data): Promise<any> => {
     })
   );
 }
+
+// 个人中心-获取订阅列表
+export const getSubscribeList = (data): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/alert/subscribe/list`,
+      method: 'POST',
+      data,
+    })
+  );
+}
+
+// 个人中心-获取组织级订阅列表
+export const getGroupSubscribeList = (data): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/alert/group/subscribe/list`,
+      method: 'POST',
+      data,
+    })
+  );
+}
diff --git a/src/views/Jyh/PersonalCenter/Detail/OrgSubscription.vue b/src/views/Jyh/PersonalCenter/Detail/OrgSubscription.vue
index 73ffac6..663e99c 100644
--- a/src/views/Jyh/PersonalCenter/Detail/OrgSubscription.vue
+++ b/src/views/Jyh/PersonalCenter/Detail/OrgSubscription.vue
@@ -2,11 +2,11 @@
   <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="tableData">
-        <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="订阅时间"></d-column>
         <d-column field="name" header="软件名称"></d-column>
-        <d-column field="detail" header="版本号"></d-column>
-        <d-column field="owner" header="订阅人"></d-column>
+        <d-column field="releaseId" header="版本号"></d-column>
+        <d-column field="username" header="订阅人"></d-column>
         <d-column header="操作" width="100">
           <template #default="scope">
             <d-popover>
@@ -24,17 +24,39 @@
           </template>
         </d-column>
       </d-table>
+      <NoData v-else :small="false"></NoData>
     </div>
   </Card>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
-const tableData = ref([{ code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin' }]);
+import { onMounted, ref } from 'vue';
+import { getgroupNoticeList, getGroupSubscribeList, getSubscribeList } from '@/api/jyh';
+import NoData from "@/components/NoData/NoData.vue";
+const tableData = ref([]);
 const hidden = () => {
   // 模拟body点击操作
   document.querySelector('body')?.click();
 };
+
+const pager = ref({
+  total: 0,
+  pageIndex: 1,
+  pageSize: 10
+});
+
+const getList = async() => {
+  const { data, error } = await getGroupSubscribeList({  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/PersonageSubscription.vue b/src/views/Jyh/PersonalCenter/Detail/PersonageSubscription.vue
index 7aacbdb..d35e0b8 100644
--- a/src/views/Jyh/PersonalCenter/Detail/PersonageSubscription.vue
+++ b/src/views/Jyh/PersonalCenter/Detail/PersonageSubscription.vue
@@ -2,10 +2,11 @@
   <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="tableData">
-        <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="订阅时间"></d-column>
         <d-column field="name" header="软件名称"></d-column>
-        <d-column field="detail" header="版本号"></d-column>
+        <d-column field="releaseId" header="版本号"></d-column>
+        <d-column field="username" header="订阅人"></d-column>
         <d-column header="操作" width="100">
           <template #default="scope">
             <d-popover>
@@ -23,17 +24,39 @@
           </template>
         </d-column>
       </d-table>
+      <NoData v-else :small="false"></NoData>
     </div>
   </Card>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
-const tableData = ref([{ code: '05822156', name: 'MIT License', detail: 'integer' }]);
+import { onMounted, ref } from 'vue';
+import { getgroupNoticeList, getGroupSubscribeList, getSubscribeList } from '@/api/jyh';
+import NoData from "@/components/NoData/NoData.vue";
+const tableData = ref([]);
 const hidden = () => {
   // 模拟body点击操作
   document.querySelector('body')?.click();
 };
+
+const pager = ref({
+  total: 0,
+  pageIndex: 1,
+  pageSize: 10
+});
+
+const getList = async() => {
+  const { data, error } = await getSubscribeList({  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">