From 2f1811774f15ea6f229d08a4d2616db754b3d6e9 Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Thu, 19 Oct 2023 20:50:39 +0800
Subject: [PATCH 01/16] second commit

---
 deliver-front/vue/src/main.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/deliver-front/vue/src/main.ts b/deliver-front/vue/src/main.ts
index 7b662cdb..9d470c42 100644
--- a/deliver-front/vue/src/main.ts
+++ b/deliver-front/vue/src/main.ts
@@ -8,8 +8,6 @@ import 'virtual:svg-icons-register';
 import setupDefaultSetting from '@/utils/setupDefaultSetting'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
-
-
 import Antd from 'ant-design-vue';
 // 用来切换主题
 import 'ant-design-vue/dist/antd.variable.min.css'
-- 
Gitee


From 53789788fd71a03a71979f36e1c743a02f7a9737 Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Tue, 7 Nov 2023 17:16:56 +0800
Subject: [PATCH 02/16] =?UTF-8?q?feat:=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E5=A4=B4=E9=83=A8=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/src/api/dashboard.ts         | 14 +++++++-------
 deliver-front/vue/src/main.ts                  |  3 +--
 deliver-front/vue/src/store/index.ts           | 11 +++--------
 .../vue/src/store/modules/dashboard.ts         | 18 ++++++++++++++++++
 .../vue/src/store/modules/types/types.ts       |  0
 .../vue/src/views/Dashboard/index.vue          | 14 ++++++++++++--
 deliver-front/vue/vite.config.ts               |  2 +-
 7 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 deliver-front/vue/src/store/modules/dashboard.ts
 create mode 100644 deliver-front/vue/src/store/modules/types/types.ts

diff --git a/deliver-front/vue/src/api/dashboard.ts b/deliver-front/vue/src/api/dashboard.ts
index c7f963ed..a60a0649 100644
--- a/deliver-front/vue/src/api/dashboard.ts
+++ b/deliver-front/vue/src/api/dashboard.ts
@@ -1,13 +1,13 @@
 import request from '@/utils/request'
 
-// interface DashboardHeadData {
-//   numberOfMessagesToday: string
-//   numberOfPlatformFiles: string
-//   accumulatedTemplateOwnership: string
-//   numberOfApps: string
-// }
+export interface DashboardHeadData {
+  numberOfMessagesToday?: string
+  numberOfPlatformFiles?: string
+  accumulatedTemplateOwnership?: string
+  numberOfApps?: string
+}
 
-export async function getDashboardHeadData(): Promise<any> {
+export async function getDashboardHeadData(): Promise<DashboardHeadData> {
   return await request({
     url: '/dashboard/getDashboardHeadData',
     method: 'post'
diff --git a/deliver-front/vue/src/main.ts b/deliver-front/vue/src/main.ts
index 3ff0f8a8..bca131b4 100644
--- a/deliver-front/vue/src/main.ts
+++ b/deliver-front/vue/src/main.ts
@@ -1,9 +1,8 @@
 import { createApp } from 'vue'
-import { createPinia } from 'pinia'
 import './style.css'
 import App from './App.vue'
 
 import router from './router'
-const pinia = createPinia()
+import pinia from './store'
 
 createApp(App).use(router).use(pinia).mount('#app')
diff --git a/deliver-front/vue/src/store/index.ts b/deliver-front/vue/src/store/index.ts
index 68ce550c..a45888d5 100644
--- a/deliver-front/vue/src/store/index.ts
+++ b/deliver-front/vue/src/store/index.ts
@@ -1,9 +1,4 @@
-import { defineStore } from 'pinia'
+import { createPinia } from 'pinia'
+const pinia = createPinia()
 
-export const useStore = defineStore('store', {
-  state: () => {
-    return {}
-  },
-  getters: {},
-  actions: {}
-})
+export default pinia
diff --git a/deliver-front/vue/src/store/modules/dashboard.ts b/deliver-front/vue/src/store/modules/dashboard.ts
new file mode 100644
index 00000000..c48dec25
--- /dev/null
+++ b/deliver-front/vue/src/store/modules/dashboard.ts
@@ -0,0 +1,18 @@
+import { defineStore } from 'pinia'
+import { getDashboardHeadData, type DashboardHeadData } from '@/api/dashboard'
+
+export const useDashboardStore = defineStore('dashboard', {
+  state: () => {
+    return {
+      num: 0
+    }
+  },
+  actions: {
+    async getDashboardHeadData() {
+      const dashboardHeadData: DashboardHeadData = await getDashboardHeadData()
+      console.log(dashboardHeadData)
+      return dashboardHeadData
+    }
+  },
+  getters: {}
+})
diff --git a/deliver-front/vue/src/store/modules/types/types.ts b/deliver-front/vue/src/store/modules/types/types.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/deliver-front/vue/src/views/Dashboard/index.vue b/deliver-front/vue/src/views/Dashboard/index.vue
index aeaed136..65f68e09 100644
--- a/deliver-front/vue/src/views/Dashboard/index.vue
+++ b/deliver-front/vue/src/views/Dashboard/index.vue
@@ -8,7 +8,9 @@ import {
 } from '@ant-design/icons-vue'
 import Echarts from '@/components/Echarts/index.vue'
 import { type EChartsOption } from 'echarts'
-import { getDashboardHeadData } from '@/api/dashboard'
+import { useDashboardStore } from '@/store/modules/dashboard'
+import { type DashboardHeadData } from '@/api/dashboard'
+import { onMounted, ref } from 'vue'
 const chartsMessageOption: EChartsOption = {
   legend: {
     top: '20%'
@@ -111,7 +113,15 @@ const chartsAccountOption: EChartsOption = {
     }
   ]
 }
-const dashboardHeadData = await getDashboardHeadData()
+const dashboardHeadData = ref<DashboardHeadData>({})
+const getDashboardHeadData = async (): Promise<void> => {
+  const dashboardStore = useDashboardStore()
+  dashboardHeadData.value = await dashboardStore.getDashboardHeadData()
+}
+
+onMounted(async () => {
+  await getDashboardHeadData()
+})
 </script>
 
 <template>
diff --git a/deliver-front/vue/vite.config.ts b/deliver-front/vue/vite.config.ts
index b9d24789..d91bd704 100644
--- a/deliver-front/vue/vite.config.ts
+++ b/deliver-front/vue/vite.config.ts
@@ -12,7 +12,7 @@ export default defineConfig({
     proxy: {
       '/admin': {
         // 请求接口中要替换的标识
-        target: 'http://localhost:9090', // 代理地址
+        target: 'http://10.100.127.154:9090', // 代理地址
         changeOrigin: true, // 是否允许跨域
         secure: true
       }
-- 
Gitee


From 15842b7017fb285be79242609362773cd7f8fb2f Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Tue, 7 Nov 2023 18:46:52 +0800
Subject: [PATCH 03/16] =?UTF-8?q?feat=EF=BC=9Aupdate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/components.d.ts             |   1 +
 .../views/Channel/components/searchForm.vue   |  99 +++++
 deliver-front/vue/src/views/Channel/index.vue | 401 +++++++++++++-----
 .../vue/src/views/Channel/type/index.ts       |   8 +
 .../views/Message/components/searchForm.vue   |  99 +++++
 deliver-front/vue/src/views/Message/index.vue | 259 ++++-------
 .../vue/src/views/Message/type/index.ts       |   8 +
 7 files changed, 581 insertions(+), 294 deletions(-)
 create mode 100644 deliver-front/vue/src/views/Channel/components/searchForm.vue
 create mode 100644 deliver-front/vue/src/views/Channel/type/index.ts
 create mode 100644 deliver-front/vue/src/views/Message/components/searchForm.vue
 create mode 100644 deliver-front/vue/src/views/Message/type/index.ts

diff --git a/deliver-front/vue/components.d.ts b/deliver-front/vue/components.d.ts
index 3aa43488..5c65a874 100644
--- a/deliver-front/vue/components.d.ts
+++ b/deliver-front/vue/components.d.ts
@@ -31,6 +31,7 @@ declare module 'vue' {
     ARow: typeof import('ant-design-vue/es')['Row']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
+    ASpace: typeof import('ant-design-vue/es')['Space']
     AStatistic: typeof import('ant-design-vue/es')['Statistic']
     ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
     ATable: typeof import('ant-design-vue/es')['Table']
diff --git a/deliver-front/vue/src/views/Channel/components/searchForm.vue b/deliver-front/vue/src/views/Channel/components/searchForm.vue
new file mode 100644
index 00000000..7a64ecda
--- /dev/null
+++ b/deliver-front/vue/src/views/Channel/components/searchForm.vue
@@ -0,0 +1,99 @@
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { DownOutlined, UpOutlined } from '@ant-design/icons-vue'
+import type { messageTemplate } from '../type'
+import type { FormInstance } from 'ant-design-vue'
+
+const expand = ref(false)
+
+const formRef = ref<FormInstance>()
+
+const searchForm: messageTemplate = reactive({
+  templateName: '',
+  pushRange: '',
+  userType: '',
+  channel: '',
+  messageType: '',
+  channelApp: ''
+})
+
+const onFinish = (): void => {
+  console.log('searchForm: ', searchForm)
+}
+
+// 等接口出来在该
+const searchMessage = (): void => {
+  console.log('查询成功')
+}
+
+const rangeOptions = [{ value: '默认标签1' }, { value: '默认标签2' }, { value: '默认标签3' }]
+const qudaoOptions = [{ value: '默认标签1' }, { value: '默认标签2' }, { value: '默认标签3' }]
+</script>
+
+<template>
+  <a-form ref="formRef" name="advanced_search" class="search" :model="searchForm" @finish="onFinish">
+    <a-row :gutter="24">
+      <a-col :span="8">
+        <a-form-item name="templateName" label="模板名">
+          <a-input v-model:value="searchForm.templateName" placeholder="请输入模板名"></a-input>
+        </a-form-item>
+      </a-col>
+      <a-col :span="8">
+        <a-form-item name="pushRange" label="推送范围">
+          <a-select v-model:value="searchForm.pushRange" placeholder="请选择推送范围">
+            <a-select-option value="范围1">范围1</a-select-option>
+            <a-select-option value="范围2">范围2</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-col>
+      <a-col :span="8" v-if="expand">
+        <a-form-item name="userType" label="用户类型">
+          <a-select v-model:value="searchForm.userType" placeholder="请选择用户类型">
+            <a-select-option value="类型1">类型1</a-select-option>
+            <a-select-option value="类型2">类型2</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-col>
+      <a-col :span="8" v-if="expand">
+        <a-form-item name="messageType" label="消息类型">
+          <a-select v-model:value="searchForm.messageType" placeholder="请选择消息类型" :options="rangeOptions" />
+        </a-form-item>
+      </a-col>
+      <a-col :span="8" v-if="expand">
+        <a-form-item name="channel" label="渠道选择">
+          <a-select v-model:value="searchForm.channel" placeholder="请选择渠道" :options="qudaoOptions" />
+        </a-form-item>
+      </a-col>
+      <a-col :span="8" v-if="expand">
+        <a-form-item name="channelApp" label="渠道App">
+          <a-select v-model:value="searchForm.channelApp" placeholder="请选择渠道App">
+            <a-select-option value="类型1">类型1</a-select-option>
+            <a-select-option value="类型2">类型2</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-col>
+      <a-col
+        :span="expand === true ? 24 : 8"
+        :style="{
+          'text-align': expand === true ? 'right' : 'center',
+          'margin-bottom': expand === true ? '24px' : '0'
+        }"
+      >
+        <a-button type="primary" html-type="submit" @click="searchMessage">查询</a-button>
+        <a-button style="margin: 0 8px" @click="() => (formRef as FormInstance).resetFields()">清空</a-button>
+        <a style="font-size: 14px" @click="expand = !expand">
+          <template v-if="expand">
+            <UpOutlined />
+            收起
+          </template>
+          <template v-else>
+            <DownOutlined />
+            展开
+          </template>
+        </a>
+      </a-col>
+    </a-row>
+  </a-form>
+</template>
+
+<style scoped></style>
diff --git a/deliver-front/vue/src/views/Channel/index.vue b/deliver-front/vue/src/views/Channel/index.vue
index 2d734683..8498bcca 100644
--- a/deliver-front/vue/src/views/Channel/index.vue
+++ b/deliver-front/vue/src/views/Channel/index.vue
@@ -1,140 +1,317 @@
 <script lang="ts" setup>
-import { reactive, type UnwrapRef } from 'vue'
-import type { TableColumnType } from 'ant-design-vue'
-interface FormState {
-  appName: string
-  channelType: string
-  status: string
+import { ReloadOutlined } from '@ant-design/icons-vue'
+import { ref, reactive, h, watch, computed } from 'vue'
+import type { UnwrapRef } from 'vue'
+import type { TableColumnsType } from 'ant-design-vue'
+import type { Rule } from 'ant-design-vue/es/form'
+import type { messageTemplate } from './type'
+import searchForm from './components/searchForm.vue'
+// import { message } from 'ant-design-vue'
+
+/// 表格部分
+// 新增
+const open = ref<boolean>(false)
+const addModules = (): void => {
+  open.value = true
 }
-interface TableDataType {
-  key: string
-  name: string
-  age: number
-  address: string
+
+const labelCol = { span: 4 }
+
+const wrapperCol = { span: 20 }
+
+const addTemplate: UnwrapRef<messageTemplate> = reactive({
+  templateName: '',
+  pushRange: '',
+  userType: '',
+  channel: '',
+  messageType: '',
+  channelApp: ''
+})
+
+const rules: Record<string, Rule[]> = {
+  templateName: [
+    { required: true, message: '请输入模板名', trigger: 'change' },
+    { min: 3, max: 20, message: '长度在 3 到 20 个字符', trigger: 'blur' }
+  ],
+  pushRange: [{ required: true, message: '请选择推送范围', trigger: 'change' }],
+  userType: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
+  messageType: [
+    {
+      required: true,
+      message: '请选择消息类型',
+      trigger: 'change'
+    }
+  ],
+  channel: [
+    {
+      required: true,
+      message: '请选择渠道',
+      trigger: 'change'
+    }
+  ],
+  channelApp: [{ required: true, message: '请选择渠道App', trigger: 'change' }]
+}
+
+const templateForm = ref()
+const handleOk = (): void => {
+  templateForm.value
+    .validate()
+    .then(() => {
+      console.log('values', addTemplate)
+      open.value = false
+    })
+    .catch(error => {
+      console.log('error', error)
+    })
+}
+const handleCancel = (): void => {
+  templateForm.value.resetFields()
 }
-const formState: UnwrapRef<FormState> = reactive({
-  appName: '',
-  channelType: '',
-  status: ''
+
+const channelData = ['默认标签1', '默认标签2', '默认标签3']
+
+const messageData = {
+  默认标签1: ['Online'],
+  默认标签2: ['Promotion'],
+  默认标签3: ['Offline']
+}
+
+const appData = {
+  默认标签1: ['IOS'],
+  默认标签2: ['安卓'],
+  默认标签3: ['MAC']
+}
+
+const mesType = computed(() => {
+  return messageData[addTemplate.channel] === undefined ? [] : messageData[addTemplate.channel]
+})
+
+const appType = computed(() => {
+  return appData[addTemplate.channel] === undefined ? [] : appData[addTemplate.channel]
 })
-// const wrapperCol = { span: 10 }
-const wrapperCol = { span: 14 }
-const columns: Array<TableColumnType<TableDataType>> = [
+
+watch(
+  () => addTemplate.channel,
+  newVal => {
+    if (messageData[newVal] !== undefined) {
+      addTemplate.messageType = messageData[newVal][0]
+    } else {
+      // 未定义或空数组的情况
+      addTemplate.messageType = ''
+      messageData[newVal] = []
+    }
+    if (appData[newVal] !== undefined) {
+      addTemplate.channelApp = appData[newVal][0]
+    } else {
+      // 处理未定义或空数组的情况
+      addTemplate.channelApp = ''
+      appData[newVal] = []
+    }
+  }
+)
+
+const columns: TableColumnsType = [
+  {
+    title: '项目名称',
+    dataIndex: 'projectName',
+    sorter: {
+      compare: (a: any, b: any) => a.projectName.localeCompare(b.projectName),
+      multiple: 3
+    },
+    key: 'projectname'
+  },
   {
-    title: 'Name',
-    dataIndex: 'name',
-    filters: [
-      {
-        text: 'Joe',
-        value: 'Joe'
-      },
-      {
-        text: 'Jim',
-        value: 'Jim'
-      },
-      {
-        text: 'Submenu',
-        value: 'Submenu',
-        children: [
-          {
-            text: 'Green',
-            value: 'Green'
-          },
-          {
-            text: 'Black',
-            value: 'Black'
-          }
-        ]
-      }
-    ],
-    // specify the condition of filtering result
-    // here is that finding the name started with `value`
-    sorter: (a: TableDataType, b: TableDataType) => a.name.length - b.name.length,
-    sortDirections: ['descend']
+    title: '管理员1',
+    dataIndex: 'admin1',
+    sorter: {
+      compare: (a: any, b: any) => a.admin1.localeCompare(b.admin1),
+      multiple: 2
+    },
+    key: 'admin1'
   },
   {
-    title: 'Age',
-    dataIndex: 'age',
-    defaultSortOrder: 'descend',
-    sorter: (a: TableDataType, b: TableDataType) => a.age - b.age
+    title: '管理员2',
+    dataIndex: 'admin2',
+    sorter: {
+      compare: (a: any, b: any) => a.admin2.localeCompare(b.admin2),
+      multiple: 1
+    },
+    key: 'admin2'
   },
   {
-    title: 'Address',
-    dataIndex: 'address',
-    filters: [
-      {
-        text: 'London',
-        value: 'London'
-      },
-      {
-        text: 'New York',
-        value: 'New York'
-      }
-    ],
-    filterMultiple: false,
-    sorter: (a: TableDataType, b: TableDataType) => a.address.length - b.address.length,
-    sortDirections: ['descend', 'ascend']
+    title: '操作',
+    key: 'operation',
+    fixed: 'right',
+    width: 180
   }
 ]
-const data: TableDataType[] = [
+// data到时候肯定是需要去接口获取到res然后渲染的
+const data = ref([
   {
     key: '1',
-    name: 'John Brown',
-    age: 32,
-    address: 'New York No. 1 Lake Park'
+    projectName: '1.txt',
+    admin1: 'a',
+    admin2: 'b'
   },
   {
     key: '2',
-    name: 'Jim Green',
-    age: 42,
-    address: 'London No. 1 Lake Park'
+    projectName: '2.txt',
+    admin1: 'c',
+    admin2: 'd'
   },
   {
     key: '3',
-    name: 'Joe Black',
-    age: 32,
-    address: 'Sidney No. 1 Lake Park'
+    projectName: '3.txt',
+    admin1: 'e',
+    admin2: 'f'
   },
   {
     key: '4',
-    name: 'Jim Red',
-    age: 32,
-    address: 'London No. 2 Lake Park'
+    projectName: '4.txt',
+    admin1: 'g',
+    admin2: 'h'
   }
-]
+])
 </script>
+
 <template>
-  <div id="channel-container">
-    <div class="channel-header">
-      <a-form :model="formState" layout="inline" :wrapper-col="wrapperCol">
-        <a-form-item label="App名">
-          <a-input v-model:value="formState.appName" />
-        </a-form-item>
-        <a-form-item label="渠道类型">
-          <a-select ref="select" v-model:value="formState.channelType" style="width: 120px">
-            <a-select-option value="jack">Jack</a-select-option>
-            <a-select-option value="lucy">Lucy</a-select-option>
-            <a-select-option value="disabled" disabled>Disabled</a-select-option>
-            <a-select-option value="Yiminghe">yiminghe</a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item label="状态">
-          <a-select ref="select" v-model:value="formState.status" style="width: 120px">
-            <a-select-option value="jack">Jack</a-select-option>
-            <a-select-option value="lucy">Lucy</a-select-option>
-            <a-select-option value="disabled" disabled>Disabled</a-select-option>
-            <a-select-option value="Yiminghe">yiminghe</a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item style="margin-left: 150px">
-          <a-button>查询</a-button>
-          <a-button type="primary" style="margin-left: 10px">新增</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-    <div class="channel-table">
-      <a-table :columns="columns" :data-source="data" @change="onChange" />
+  <!-- 搜索部分 -->
+  <searchForm />
+  <!-- 表格部分 -->
+  <div id="message-container">
+    <div class="message-section">
+      <div class="splitter">
+        <a-tooltip title="刷新">
+          <a-button shape="circle" :icon="h(ReloadOutlined)" />
+        </a-tooltip>
+        <a-button type="primary" class="addModule" @click="addModules">新增模板</a-button>
+        <a-modal v-model:open="open" title="新增模板" width="650px" :footer="null" @cancel="handleCancel">
+          <a-form
+            ref="templateForm"
+            :model="addTemplate"
+            :rules="rules"
+            :label-col="labelCol"
+            :wrapper-col="wrapperCol"
+            class="temform"
+          >
+            <a-form-item ref="templateName" label="模板名" name="templateName" class="tem-item">
+              <a-input
+                v-model:value="addTemplate.templateName"
+                placeholder="请填写长度在3到20个字符的模板名"
+                style="width: 70%"
+              />
+            </a-form-item>
+            <a-form-item label="推送范围" name="pushRange" class="tem-item">
+              <a-radio-group v-model:value="addTemplate.pushRange" button-style="solid">
+                <a-radio-button value="杭州">杭州</a-radio-button>
+                <a-radio-button value="上海">上海</a-radio-button>
+                <a-radio-button value="北京">北京</a-radio-button>
+                <a-radio-button value="成都">成都</a-radio-button>
+              </a-radio-group>
+            </a-form-item>
+            <a-form-item label="用户类型" name="userType" class="tem-item">
+              <a-radio-group v-model:value="addTemplate.userType" button-style="solid">
+                <a-radio-button value="类型1">类型1</a-radio-button>
+                <a-radio-button value="类型2">类型2</a-radio-button>
+                <a-radio-button value="类型3">类型3</a-radio-button>
+                <a-radio-button value="类型4">类型4</a-radio-button>
+              </a-radio-group>
+            </a-form-item>
+            <a-form-item label="渠道选择" name="channel" class="tem-item">
+              <a-select
+                v-model:value="addTemplate.channel"
+                :options="channelData.map(pro => ({ value: pro }))"
+                style="width: 70%"
+              />
+            </a-form-item>
+            <a-form-item label="消息类型" name="messageType" class="tem-item">
+              <a-select
+                v-model:value="addTemplate.messageType"
+                :options="mesType.map((pro: any) => ({ value: pro }))"
+                style="width: 70%"
+              />
+            </a-form-item>
+            <a-form-item label="渠道App" name="channelApp" class="tem-item">
+              <a-select
+                v-model:value="addTemplate.channelApp"
+                :options="appType.map((pro: any) => ({ value: pro }))"
+                style="width: 70%"
+              />
+            </a-form-item>
+            <a-form-item :wrapper-col="{ span: 14, offset: 4 }" class="tem-item">
+              <a-button type="primary" @click="handleOk">确认新建</a-button>
+              <a-button style="margin-left: 10px" @click="handleCancel">重置</a-button>
+            </a-form-item>
+          </a-form>
+        </a-modal>
+      </div>
+
+      <!-- 表格部分 -->
+      <a-table :columns="columns" :data-source="data" :scroll="{ x: 1200, y: 300 }" bordered>
+        <template #bodyCell="{ column }">
+          <template v-if="column.key === 'operation'">
+            <a-button type="primary" class="btn-manager">管理</a-button>
+            <a-button type="primary" danger>删除</a-button>
+          </template>
+        </template>
+      </a-table>
     </div>
+    <!-- 对表格的操作 -->
   </div>
 </template>
-<style lang="scss" scoped></style>
+
+<style lang="scss" scoped>
+#message-container {
+  height: 100%;
+  overflow: auto;
+}
+
+.search {
+  padding: 24px 24px 0 24px;
+  background: #ffffff;
+  border-radius: 6px;
+
+  .search-item:nth-child(1) {
+    margin-left: 15px;
+  }
+
+  .search-item:nth-child(2) {
+    margin-left: 30px;
+  }
+}
+
+.splitter {
+  width: 100%;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  justify-content: right;
+
+  .addModule {
+    margin: 0px 20px;
+  }
+}
+
+.temform {
+  .tem-item {
+    margin-top: 20px;
+  }
+
+  .tem-item:nth-child(7) {
+    text-align: right;
+    margin-left: 300px;
+  }
+}
+
+.message-section {
+  height: 100%;
+  border-radius: 6px;
+  margin-top: 12px;
+  background: #ffffff;
+  padding: 12px;
+
+  .btn-manager {
+    margin-right: 10px;
+  }
+}
+</style>
diff --git a/deliver-front/vue/src/views/Channel/type/index.ts b/deliver-front/vue/src/views/Channel/type/index.ts
new file mode 100644
index 00000000..22b30626
--- /dev/null
+++ b/deliver-front/vue/src/views/Channel/type/index.ts
@@ -0,0 +1,8 @@
+export interface messageTemplate {
+  templateName: string
+  pushRange: string
+  userType: string
+  channel: string
+  messageType: string
+  channelApp: string
+}
diff --git a/deliver-front/vue/src/views/Message/components/searchForm.vue b/deliver-front/vue/src/views/Message/components/searchForm.vue
new file mode 100644
index 00000000..7a64ecda
--- /dev/null
+++ b/deliver-front/vue/src/views/Message/components/searchForm.vue
@@ -0,0 +1,99 @@
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { DownOutlined, UpOutlined } from '@ant-design/icons-vue'
+import type { messageTemplate } from '../type'
+import type { FormInstance } from 'ant-design-vue'
+
+const expand = ref(false)
+
+const formRef = ref<FormInstance>()
+
+const searchForm: messageTemplate = reactive({
+  templateName: '',
+  pushRange: '',
+  userType: '',
+  channel: '',
+  messageType: '',
+  channelApp: ''
+})
+
+const onFinish = (): void => {
+  console.log('searchForm: ', searchForm)
+}
+
+// 等接口出来在该
+const searchMessage = (): void => {
+  console.log('查询成功')
+}
+
+const rangeOptions = [{ value: '默认标签1' }, { value: '默认标签2' }, { value: '默认标签3' }]
+const qudaoOptions = [{ value: '默认标签1' }, { value: '默认标签2' }, { value: '默认标签3' }]
+</script>
+
+<template>
+  <a-form ref="formRef" name="advanced_search" class="search" :model="searchForm" @finish="onFinish">
+    <a-row :gutter="24">
+      <a-col :span="8">
+        <a-form-item name="templateName" label="模板名">
+          <a-input v-model:value="searchForm.templateName" placeholder="请输入模板名"></a-input>
+        </a-form-item>
+      </a-col>
+      <a-col :span="8">
+        <a-form-item name="pushRange" label="推送范围">
+          <a-select v-model:value="searchForm.pushRange" placeholder="请选择推送范围">
+            <a-select-option value="范围1">范围1</a-select-option>
+            <a-select-option value="范围2">范围2</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-col>
+      <a-col :span="8" v-if="expand">
+        <a-form-item name="userType" label="用户类型">
+          <a-select v-model:value="searchForm.userType" placeholder="请选择用户类型">
+            <a-select-option value="类型1">类型1</a-select-option>
+            <a-select-option value="类型2">类型2</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-col>
+      <a-col :span="8" v-if="expand">
+        <a-form-item name="messageType" label="消息类型">
+          <a-select v-model:value="searchForm.messageType" placeholder="请选择消息类型" :options="rangeOptions" />
+        </a-form-item>
+      </a-col>
+      <a-col :span="8" v-if="expand">
+        <a-form-item name="channel" label="渠道选择">
+          <a-select v-model:value="searchForm.channel" placeholder="请选择渠道" :options="qudaoOptions" />
+        </a-form-item>
+      </a-col>
+      <a-col :span="8" v-if="expand">
+        <a-form-item name="channelApp" label="渠道App">
+          <a-select v-model:value="searchForm.channelApp" placeholder="请选择渠道App">
+            <a-select-option value="类型1">类型1</a-select-option>
+            <a-select-option value="类型2">类型2</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-col>
+      <a-col
+        :span="expand === true ? 24 : 8"
+        :style="{
+          'text-align': expand === true ? 'right' : 'center',
+          'margin-bottom': expand === true ? '24px' : '0'
+        }"
+      >
+        <a-button type="primary" html-type="submit" @click="searchMessage">查询</a-button>
+        <a-button style="margin: 0 8px" @click="() => (formRef as FormInstance).resetFields()">清空</a-button>
+        <a style="font-size: 14px" @click="expand = !expand">
+          <template v-if="expand">
+            <UpOutlined />
+            收起
+          </template>
+          <template v-else>
+            <DownOutlined />
+            展开
+          </template>
+        </a>
+      </a-col>
+    </a-row>
+  </a-form>
+</template>
+
+<style scoped></style>
diff --git a/deliver-front/vue/src/views/Message/index.vue b/deliver-front/vue/src/views/Message/index.vue
index f4612fb1..20d8fdec 100644
--- a/deliver-front/vue/src/views/Message/index.vue
+++ b/deliver-front/vue/src/views/Message/index.vue
@@ -1,45 +1,14 @@
 <script lang="ts" setup>
-import { DownOutlined, UpOutlined, ReloadOutlined } from '@ant-design/icons-vue'
-import { ref, reactive, h } from 'vue'
+import { ReloadOutlined } from '@ant-design/icons-vue'
+import { ref, reactive, h, watch, computed } from 'vue'
 import type { UnwrapRef } from 'vue'
-import type { FormInstance } from 'ant-design-vue'
+import type { TableColumnsType } from 'ant-design-vue'
 import type { Rule } from 'ant-design-vue/es/form'
+import type { messageTemplate } from './type'
+import searchForm from './components/searchForm.vue'
 // import { message } from 'ant-design-vue'
 
-interface messageTemplate {
-  templateName: string
-  pushRange: string
-  userType: string
-  channel: string[]
-  messageType: string[]
-  channelApp: string
-}
-
-// 搜索部分
-const expand = ref(false)
-
-const formRef = ref<FormInstance>()
-
-const searchForm: messageTemplate = reactive({
-  templateName: '',
-  pushRange: '',
-  userType: '',
-  channel: [],
-  messageType: [],
-  channelApp: ''
-})
-
-const onFinish = (): void => {
-  console.log('searchForm: ', searchForm)
-}
-
-// 等接口出来在该
-const searchMessage = (): void => {
-  console.log('查询成功')
-}
-
 /// 表格部分
-///
 // 新增
 const open = ref<boolean>(false)
 const addModules = (): void => {
@@ -54,8 +23,8 @@ const addTemplate: UnwrapRef<messageTemplate> = reactive({
   templateName: '',
   pushRange: '',
   userType: '',
-  channel: [],
-  messageType: [],
+  channel: '',
+  messageType: '',
   channelApp: ''
 })
 
@@ -68,17 +37,15 @@ const rules: Record<string, Rule[]> = {
   userType: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
   messageType: [
     {
-      type: 'array',
       required: true,
-      message: '请选择至少一个消息类型',
+      message: '请选择消息类型',
       trigger: 'change'
     }
   ],
   channel: [
     {
-      type: 'array',
       required: true,
-      message: '请选择至少一个渠道',
+      message: '请选择渠道',
       trigger: 'change'
     }
   ],
@@ -101,10 +68,49 @@ const handleCancel = (): void => {
   templateForm.value.resetFields()
 }
 
-const rangeOptions = [{ value: '默认标签1' }, { value: '默认标签2' }, { value: '默认标签3' }]
-const qudaoOptions = [{ value: '默认标签1' }, { value: '默认标签2' }, { value: '默认标签3' }]
+const channelData = ['默认标签1', '默认标签2', '默认标签3']
+
+const messageData = {
+  默认标签1: ['Online'],
+  默认标签2: ['Promotion'],
+  默认标签3: ['Offline']
+}
+
+const appData = {
+  默认标签1: ['IOS'],
+  默认标签2: ['安卓'],
+  默认标签3: ['MAC']
+}
+
+const mesType = computed(() => {
+  return messageData[addTemplate.channel] === undefined ? [] : messageData[addTemplate.channel]
+})
+
+const appType = computed(() => {
+  return appData[addTemplate.channel] === undefined ? [] : appData[addTemplate.channel]
+})
+
+watch(
+  () => addTemplate.channel,
+  newVal => {
+    if (messageData[newVal] !== undefined) {
+      addTemplate.messageType = messageData[newVal][0]
+    } else {
+      // 未定义或空数组的情况
+      addTemplate.messageType = ''
+      messageData[newVal] = []
+    }
+    if (appData[newVal] !== undefined) {
+      addTemplate.channelApp = appData[newVal][0]
+    } else {
+      // 处理未定义或空数组的情况
+      addTemplate.channelApp = ''
+      appData[newVal] = []
+    }
+  }
+)
 
-const columns = [
+const columns: TableColumnsType = [
   {
     title: '项目名称',
     dataIndex: 'projectName',
@@ -134,7 +140,9 @@ const columns = [
   },
   {
     title: '操作',
-    key: 'control'
+    key: 'operation',
+    fixed: 'right',
+    width: 180
   }
 ]
 // data到时候肯定是需要去接口获取到res然后渲染的
@@ -168,75 +176,9 @@ const data = ref([
 
 <template>
   <!-- 搜索部分 -->
+  <searchForm />
+  <!-- 表格部分 -->
   <div id="message-container">
-    <a-form ref="formRef" name="advanced_search" class="search" :model="searchForm" @finish="onFinish">
-      <a-row :gutter="24">
-        <a-col :span="8">
-          <a-form-item name="templateName" label="模板名">
-            <a-input v-model:value="searchForm.templateName" placeholder="请输入模板名"></a-input>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item name="pushRange" label="推送范围">
-            <a-select v-model:value="searchForm.pushRange" placeholder="请选择推送范围">
-              <a-select-option value="范围1">范围1</a-select-option>
-              <a-select-option value="范围2">范围2</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8" v-if="expand">
-          <a-form-item name="userType" label="用户类型">
-            <a-select v-model:value="searchForm.userType" placeholder="请选择用户类型">
-              <a-select-option value="类型1">类型1</a-select-option>
-              <a-select-option value="类型2">类型2</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8" v-if="expand">
-          <a-form-item name="messageType" label="消息类型">
-            <a-select
-              v-model:value="searchForm.messageType"
-              mode="tags"
-              placeholder="请选择消息类型"
-              :options="rangeOptions"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="8" v-if="expand">
-          <a-form-item name="channel" label="渠道选择">
-            <a-select v-model:value="searchForm.channel" mode="tags" placeholder="请选择渠道" :options="qudaoOptions" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="8" v-if="expand">
-          <a-form-item name="channelApp" label="渠道App">
-            <a-select v-model:value="searchForm.channelApp" placeholder="请选择渠道App">
-              <a-select-option value="类型1">类型1</a-select-option>
-              <a-select-option value="类型2">类型2</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col
-          :span="expand === true ? 24 : 8"
-          :style="{
-            'text-align': expand === true ? 'right' : 'right',
-            'margin-bottom': expand === true ? '24px' : '0'
-          }"
-        >
-          <a-button type="primary" html-type="submit" @click="searchMessage">查询</a-button>
-          <a-button style="margin: 0 8px" @click="() => formRef.resetFields()">清空</a-button>
-          <a style="font-size: 14px" @click="expand = !expand">
-            <template v-if="expand">
-              <UpOutlined />
-              收起
-            </template>
-            <template v-else>
-              <DownOutlined />
-              展开
-            </template>
-          </a>
-        </a-col>
-      </a-row>
-    </a-form>
     <div class="message-section">
       <div class="splitter">
         <a-tooltip title="刷新">
@@ -275,27 +217,26 @@ const data = ref([
                 <a-radio-button value="类型4">类型4</a-radio-button>
               </a-radio-group>
             </a-form-item>
-            <a-form-item label="消息类型" name="messageType" class="tem-item">
-              <a-checkbox-group v-model:value="addTemplate.messageType">
-                <a-checkbox value="1" name="type">Online</a-checkbox>
-                <a-checkbox value="2" name="type">Promotion</a-checkbox>
-                <a-checkbox value="3" name="type">Offline</a-checkbox>
-              </a-checkbox-group>
-            </a-form-item>
             <a-form-item label="渠道选择" name="channel" class="tem-item">
               <a-select
                 v-model:value="addTemplate.channel"
-                mode="tags"
-                placeholder="请选择渠道"
-                :options="rangeOptions"
+                :options="channelData.map(pro => ({ value: pro }))"
+                style="width: 70%"
+              />
+            </a-form-item>
+            <a-form-item label="消息类型" name="messageType" class="tem-item">
+              <a-select
+                v-model:value="addTemplate.messageType"
+                :options="mesType.map((pro: any) => ({ value: pro }))"
                 style="width: 70%"
               />
             </a-form-item>
             <a-form-item label="渠道App" name="channelApp" class="tem-item">
-              <a-select v-model:value="addTemplate.channelApp" style="width: 50%">
-                <a-select-option value="shanghai">渠道one</a-select-option>
-                <a-select-option value="beijing">渠道two</a-select-option>
-              </a-select>
+              <a-select
+                v-model:value="addTemplate.channelApp"
+                :options="appType.map((pro: any) => ({ value: pro }))"
+                style="width: 70%"
+              />
             </a-form-item>
             <a-form-item :wrapper-col="{ span: 14, offset: 4 }" class="tem-item">
               <a-button type="primary" @click="handleOk">确认新建</a-button>
@@ -306,30 +247,11 @@ const data = ref([
       </div>
 
       <!-- 表格部分 -->
-      <a-table :columns="columns" :data-source="data" bordered>
-        <template #headerCell="{ column }">
-          <template v-if="column.key === 'projectName'">
-            <span>{{ column.title }}</span>
-          </template>
-        </template>
-
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'projectName'">
-            <a>
-              {{ record.name }}
-            </a>
-          </template>
-          <template v-else-if="column.key === 'control'">
-            <span>
-              <a>Invite 一 {{ record.name }}</a>
-              <a-divider type="vertical" />
-              <a>Delete</a>
-              <a-divider type="vertical" />
-              <a class="ant-dropdown-link">
-                More actions
-                <down-outlined />
-              </a>
-            </span>
+      <a-table :columns="columns" :data-source="data" :scroll="{ x: 1200, y: 300 }" bordered>
+        <template #bodyCell="{ column }">
+          <template v-if="column.key === 'operation'">
+            <a-button type="primary" class="btn-manager">编辑</a-button>
+            <a-button type="primary" danger>删除</a-button>
           </template>
         </template>
       </a-table>
@@ -339,14 +261,6 @@ const data = ref([
 </template>
 
 <style lang="scss" scoped>
-// 表格斑马纹设置
-:deep(.ant-table-tbody tr:nth-child(2n)) {
-  background-color: #fafafa;
-}
-
-:deep(.ant-layout-content) {
-  background-color: aqua;
-}
 #message-container {
   height: 100%;
   overflow: auto;
@@ -362,28 +276,6 @@ const data = ref([
     margin-left: 30px;
   }
 }
-#components-form-demo-advanced-search .ant-form {
-  max-width: none;
-}
-#components-form-demo-advanced-search .search-result-list {
-  margin-top: 16px;
-  border: 1px dashed #e9e9e9;
-  border-radius: 2px;
-  background-color: #fafafa;
-  min-height: 200px;
-  text-align: center;
-  padding-top: 80px;
-}
-[data-theme='dark'] .ant-advanced-search-form {
-  background: rgba(255, 255, 255, 0.04);
-  border: 1px solid #434343;
-  padding: 24px;
-  border-radius: 2px;
-}
-[data-theme='dark'] #components-form-demo-advanced-search .search-result-list {
-  border: 1px dashed #434343;
-  background: rgba(255, 255, 255, 0.04);
-}
 
 .splitter {
   width: 100%;
@@ -411,5 +303,8 @@ const data = ref([
   margin-top: 12px;
   background: #ffffff;
   padding: 12px;
+  .btn-manager {
+    margin-right: 10px;
+  }
 }
 </style>
diff --git a/deliver-front/vue/src/views/Message/type/index.ts b/deliver-front/vue/src/views/Message/type/index.ts
new file mode 100644
index 00000000..22b30626
--- /dev/null
+++ b/deliver-front/vue/src/views/Message/type/index.ts
@@ -0,0 +1,8 @@
+export interface messageTemplate {
+  templateName: string
+  pushRange: string
+  userType: string
+  channel: string
+  messageType: string
+  channelApp: string
+}
-- 
Gitee


From 6006cd3d474a4cd342a07c17e1ce45b99fe73dba Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Wed, 8 Nov 2023 16:52:13 +0800
Subject: [PATCH 04/16] =?UTF-8?q?feat:=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B6=88=E6=81=AF=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/components.d.ts             |   1 +
 deliver-front/vue/src/api/dashboard.ts        |  18 +++
 .../vue/src/components/Echarts/index.vue      |   8 +-
 .../src/layouts/components/Header/index.vue   |   6 +-
 deliver-front/vue/src/main.ts                 |   2 +
 deliver-front/vue/src/permisson.ts            |  10 +-
 deliver-front/vue/src/router/index.ts         |  17 ++-
 .../vue/src/store/modules/dashboard.ts        | 111 +++++++++++++++-
 .../vue/src/views/Dashboard/index.vue         | 125 ++----------------
 deliver-front/vue/src/views/Welcome/index.vue |   2 +-
 10 files changed, 173 insertions(+), 127 deletions(-)

diff --git a/deliver-front/vue/components.d.ts b/deliver-front/vue/components.d.ts
index b01e80ab..97e527dc 100644
--- a/deliver-front/vue/components.d.ts
+++ b/deliver-front/vue/components.d.ts
@@ -26,6 +26,7 @@ declare module 'vue' {
     AMenu: typeof import('ant-design-vue/es')['Menu']
     AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
+    APagination: typeof import('ant-design-vue/es')['Pagination']
     ARadioButton: typeof import('ant-design-vue/es')['RadioButton']
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
     ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
diff --git a/deliver-front/vue/src/api/dashboard.ts b/deliver-front/vue/src/api/dashboard.ts
index a60a0649..ae3e5614 100644
--- a/deliver-front/vue/src/api/dashboard.ts
+++ b/deliver-front/vue/src/api/dashboard.ts
@@ -7,9 +7,27 @@ export interface DashboardHeadData {
   numberOfApps?: string
 }
 
+type barDataPoint = [string, number, number]
+interface pieDataPoint {
+  value: number
+  name: string
+}
+
+export type messageDataSource = barDataPoint[]
+export type templeteDataSource = pieDataPoint[]
+export type channelDataSource = pieDataPoint[]
+export type userDataSource = pieDataPoint[]
+
 export async function getDashboardHeadData(): Promise<DashboardHeadData> {
   return await request({
     url: '/dashboard/getDashboardHeadData',
     method: 'post'
   })
 }
+export async function getMessageInfo(data: { dateSelect: number }): Promise<messageDataSource> {
+  return await request({
+    url: '/dashboard/getMessageInfo',
+    method: 'post',
+    data
+  })
+}
diff --git a/deliver-front/vue/src/components/Echarts/index.vue b/deliver-front/vue/src/components/Echarts/index.vue
index 5e6f4091..0bde541b 100644
--- a/deliver-front/vue/src/components/Echarts/index.vue
+++ b/deliver-front/vue/src/components/Echarts/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { getCurrentInstance, onMounted, onBeforeUnmount, ref } from 'vue'
+import { getCurrentInstance, onMounted, onBeforeUnmount, ref, watch } from 'vue'
 import { type ECharts, init } from 'echarts'
 const props = defineProps(['name', 'option', 'cardName'])
 const value1 = ref<string>('a')
@@ -26,7 +26,7 @@ const cancalDebounce = debounce(resizeHandler, 500)
 const initChart = (): void => {
   const instance = getCurrentInstance()
   myChart = init(instance?.refs[props.name] as HTMLElement, null, { renderer: 'svg' })
-  myChart.setOption(props.option)
+  myChart.setOption(props.option, { notMerge: true })
   window.addEventListener('resize', cancalDebounce)
 }
 onMounted(() => {
@@ -38,6 +38,10 @@ onBeforeUnmount(() => {
   window.removeEventListener('resize', cancalDebounce)
   myChart.dispose()
 })
+
+watch(props, () => {
+  myChart.setOption(props.option, { notMerge: true })
+})
 </script>
 <template>
   <div class="echart-card">
diff --git a/deliver-front/vue/src/layouts/components/Header/index.vue b/deliver-front/vue/src/layouts/components/Header/index.vue
index 8d7aa0d3..d65d8754 100644
--- a/deliver-front/vue/src/layouts/components/Header/index.vue
+++ b/deliver-front/vue/src/layouts/components/Header/index.vue
@@ -13,7 +13,7 @@ const setShowAbout = (open: boolean): void => {
       <h1>Deliver 企业消息推送平台</h1>
     </div>
     <div class="right">
-      <RouterLink to="" style="color: #6c6c6c" @click="showAbout = true"><ExclamationCircleOutlined /></RouterLink>
+      <a style="color: #6c6c6c" @click="showAbout = true"><ExclamationCircleOutlined /></a>
       <a-modal
         v-model:open="showAbout"
         title="关于"
@@ -34,7 +34,7 @@ const setShowAbout = (open: boolean): void => {
           </div>
         </div>
       </a-modal>
-      <RouterLink to="" style="color: #6c6c6c"><QuestionCircleOutlined /></RouterLink>
+      <a href="" style="color: #6c6c6c"><QuestionCircleOutlined /></a>
       <a href="https://gitee.com/OS-Zero/deliver" target="_blank" style="color: #6c6c6c"><GithubOutlined /></a>
       <span class="avatar">
         <a-avatar style="width: 35px; height: 35px">
@@ -62,7 +62,7 @@ const setShowAbout = (open: boolean): void => {
   .right {
     font-size: 20px;
     color: #6c6c6c;
-    .router-link-active {
+    a {
       margin-right: 10px;
     }
     .avatar {
diff --git a/deliver-front/vue/src/main.ts b/deliver-front/vue/src/main.ts
index bca131b4..97070e92 100644
--- a/deliver-front/vue/src/main.ts
+++ b/deliver-front/vue/src/main.ts
@@ -5,4 +5,6 @@ import App from './App.vue'
 import router from './router'
 import pinia from './store'
 
+import './permisson'
+
 createApp(App).use(router).use(pinia).mount('#app')
diff --git a/deliver-front/vue/src/permisson.ts b/deliver-front/vue/src/permisson.ts
index 8324f09b..198cdaa9 100644
--- a/deliver-front/vue/src/permisson.ts
+++ b/deliver-front/vue/src/permisson.ts
@@ -1,4 +1,8 @@
-import { useRouter } from 'vue-router'
-const router = useRouter()
+import router from './router'
 
-router.beforeEach(async (from, to, next) => {})
+router.beforeEach(async (to, _from, next) => {
+  document.title = to.meta.title as string
+  console.log(to.meta.title)
+
+  next()
+})
diff --git a/deliver-front/vue/src/router/index.ts b/deliver-front/vue/src/router/index.ts
index c5567e62..4f38c45c 100644
--- a/deliver-front/vue/src/router/index.ts
+++ b/deliver-front/vue/src/router/index.ts
@@ -12,7 +12,7 @@ const routes: RouteRecordRaw[] = [
         component: async () => await import('@/views/Welcome/index.vue'),
         meta: {
           parent: 'welcome',
-          title: '我是登录'
+          title: '欢迎使用 Deliver'
         }
       },
       {
@@ -20,7 +20,8 @@ const routes: RouteRecordRaw[] = [
         name: 'dashboard',
         component: async () => await import('@/views/Dashboard/index.vue'),
         meta: {
-          parent: 'home'
+          parent: 'home',
+          title: '控制面板'
         }
       },
       {
@@ -28,7 +29,8 @@ const routes: RouteRecordRaw[] = [
         name: 'message',
         component: async () => await import('@/views/Message/index.vue'),
         meta: {
-          parent: 'home'
+          parent: 'home',
+          title: '消息配置'
         }
       },
       {
@@ -36,7 +38,8 @@ const routes: RouteRecordRaw[] = [
         name: 'channel',
         component: async () => await import('@/views/Channel/index.vue'),
         meta: {
-          parent: 'home'
+          parent: 'home',
+          title: '渠道 APP 配置'
         }
       },
       {
@@ -44,7 +47,8 @@ const routes: RouteRecordRaw[] = [
         name: 'log',
         component: async () => await import('@/views/Log/index.vue'),
         meta: {
-          parent: 'home'
+          parent: 'home',
+          name: '平台文件管理'
         }
       },
       {
@@ -52,7 +56,8 @@ const routes: RouteRecordRaw[] = [
         name: 'setting',
         component: async () => await import('@/views/Setting/index.vue'),
         meta: {
-          parent: 'home'
+          parent: 'home',
+          name: '系统设置'
         }
       }
     ]
diff --git a/deliver-front/vue/src/store/modules/dashboard.ts b/deliver-front/vue/src/store/modules/dashboard.ts
index c48dec25..e330e9a2 100644
--- a/deliver-front/vue/src/store/modules/dashboard.ts
+++ b/deliver-front/vue/src/store/modules/dashboard.ts
@@ -1,5 +1,107 @@
 import { defineStore } from 'pinia'
-import { getDashboardHeadData, type DashboardHeadData } from '@/api/dashboard'
+import { getDashboardHeadData, getMessageInfo, type DashboardHeadData } from '@/api/dashboard'
+import { type EChartsOption } from 'echarts'
+
+const chartsMessageOption: EChartsOption = {
+  legend: {
+    top: '20%'
+  },
+  tooltip: {},
+  dataset: {
+    dimensions: ['product', '成功', '失败'],
+    source: [
+      ['0-4', 650, 20],
+      ['4-8', 650, 20],
+      ['8-12', 140, 100],
+      ['12-16', 86.4, 65.2],
+      ['16-20', 72.4, 53.9],
+      ['20-24', 650, 20]
+    ]
+  },
+  grid: {
+    top: '30%',
+    bottom: '10%'
+  },
+  xAxis: { type: 'category' },
+  yAxis: {},
+  series: [
+    { type: 'bar', color: '#5470C6' },
+    { type: 'bar', color: '#a90000' }
+  ]
+}
+// const chartsTemplateOption = {
+//   tooltip: {
+//     trigger: 'item'
+//   },
+//   series: [
+//     {
+//       name: 'Access From',
+//       type: 'pie',
+//       radius: '50%',
+//       center: ['50%', '60%'],
+//       data: [
+//         { value: 1048, name: 'Search Engine' },
+//         { value: 735, name: 'Direct' },
+//         { value: 580, name: 'Email' },
+//         { value: 484, name: 'Union Ads' },
+//         { value: 300, name: 'Video Ads' }
+//       ]
+//     }
+//   ]
+// }
+// const chartsChannelOption = {
+//   tooltip: {
+//     trigger: 'item'
+//   },
+//   series: [
+//     {
+//       name: 'Access From',
+//       type: 'pie',
+//       radius: '50%',
+//       center: ['50%', '60%'],
+//       data: [
+//         { value: 1048, name: 'Search Engine' },
+//         { value: 735, name: 'Direct' },
+//         { value: 580, name: 'Email' },
+//         { value: 484, name: 'Union Ads' },
+//         { value: 300, name: 'Video Ads' }
+//       ],
+//       emphasis: {
+//         itemStyle: {
+//           shadowBlur: 10,
+//           shadowOffsetX: 0,
+//           shadowColor: 'rgba(0, 0, 0, 0.5)'
+//         }
+//       }
+//     }
+//   ]
+// }
+// const chartsAccountOption = {
+//   tooltip: {
+//     trigger: 'item'
+//   },
+//   series: [
+//     {
+//       name: 'Access From',
+//       type: 'pie',
+//       radius: ['50%', '60%'],
+//       center: ['50%', '60%'],
+//       avoidLabelOverlap: false,
+//       itemStyle: {
+//         borderRadius: 10,
+//         borderColor: '#fff',
+//         borderWidth: 2
+//       },
+//       data: [
+//         { value: 1048, name: 'Search Engine' },
+//         { value: 735, name: 'Direct' },
+//         { value: 580, name: 'Email' },
+//         { value: 484, name: 'Union Ads' },
+//         { value: 300, name: 'Video Ads' }
+//       ]
+//     }
+//   ]
+// }
 
 export const useDashboardStore = defineStore('dashboard', {
   state: () => {
@@ -12,6 +114,13 @@ export const useDashboardStore = defineStore('dashboard', {
       const dashboardHeadData: DashboardHeadData = await getDashboardHeadData()
       console.log(dashboardHeadData)
       return dashboardHeadData
+    },
+    async getMessageInfo(dateSelect: number): Promise<EChartsOption> {
+      const messageData: messageDataSource = await getMessageInfo({ dateSelect })
+      if (chartsMessageOption.dataset !== undefined) {
+        chartsMessageOption.dataset.source = messageData
+      }
+      return chartsMessageOption
     }
   },
   getters: {}
diff --git a/deliver-front/vue/src/views/Dashboard/index.vue b/deliver-front/vue/src/views/Dashboard/index.vue
index 65f68e09..eb1680ac 100644
--- a/deliver-front/vue/src/views/Dashboard/index.vue
+++ b/deliver-front/vue/src/views/Dashboard/index.vue
@@ -7,120 +7,23 @@ import {
   QuestionCircleTwoTone
 } from '@ant-design/icons-vue'
 import Echarts from '@/components/Echarts/index.vue'
-import { type EChartsOption } from 'echarts'
 import { useDashboardStore } from '@/store/modules/dashboard'
 import { type DashboardHeadData } from '@/api/dashboard'
 import { onMounted, ref } from 'vue'
-const chartsMessageOption: EChartsOption = {
-  legend: {
-    top: '20%'
-  },
-  tooltip: {},
-  dataset: {
-    source: [
-      ['product', '成功', '失败'],
-      ['0-4', 650, 20],
-      ['4-8', 650, 20],
-      ['8-12', 140, 100],
-      ['12-16', 86.4, 65.2],
-      ['16-20', 72.4, 53.9],
-      ['20-24', 650, 20]
-    ]
-  },
-  grid: {
-    top: '30%',
-    bottom: '10%'
-  },
-  xAxis: { type: 'category' },
-  yAxis: {},
-  // Declare several bar series, each will be mapped
-  // to a column of dataset.source by default.
-  series: [
-    { type: 'bar', color: '#5470C6' },
-    { type: 'bar', color: '#a90000' }
-  ]
-}
-const chartsTemplateOption: EChartsOption = {
-  tooltip: {
-    trigger: 'item'
-  },
-  series: [
-    {
-      name: 'Access From',
-      type: 'pie',
-      radius: '50%',
-      center: ['50%', '60%'],
-      data: [
-        { value: 1048, name: 'Search Engine' },
-        { value: 735, name: 'Direct' },
-        { value: 580, name: 'Email' },
-        { value: 484, name: 'Union Ads' },
-        { value: 300, name: 'Video Ads' }
-      ]
-    }
-  ]
-}
-const chartsChannelOption: EChartsOption = {
-  tooltip: {
-    trigger: 'item'
-  },
-  series: [
-    {
-      name: 'Access From',
-      type: 'pie',
-      radius: '50%',
-      center: ['50%', '60%'],
-      data: [
-        { value: 1048, name: 'Search Engine' },
-        { value: 735, name: 'Direct' },
-        { value: 580, name: 'Email' },
-        { value: 484, name: 'Union Ads' },
-        { value: 300, name: 'Video Ads' }
-      ],
-      emphasis: {
-        itemStyle: {
-          shadowBlur: 10,
-          shadowOffsetX: 0,
-          shadowColor: 'rgba(0, 0, 0, 0.5)'
-        }
-      }
-    }
-  ]
-}
-const chartsAccountOption: EChartsOption = {
-  tooltip: {
-    trigger: 'item'
-  },
-  series: [
-    {
-      name: 'Access From',
-      type: 'pie',
-      radius: ['50%', '60%'],
-      center: ['50%', '60%'],
-      avoidLabelOverlap: false,
-      itemStyle: {
-        borderRadius: 10,
-        borderColor: '#fff',
-        borderWidth: 2
-      },
-      data: [
-        { value: 1048, name: 'Search Engine' },
-        { value: 735, name: 'Direct' },
-        { value: 580, name: 'Email' },
-        { value: 484, name: 'Union Ads' },
-        { value: 300, name: 'Video Ads' }
-      ]
-    }
-  ]
-}
+import { type EChartsOption } from 'echarts'
+const dashboardStore = useDashboardStore()
 const dashboardHeadData = ref<DashboardHeadData>({})
+const chartsMessageOption = ref<EChartsOption>({})
 const getDashboardHeadData = async (): Promise<void> => {
-  const dashboardStore = useDashboardStore()
   dashboardHeadData.value = await dashboardStore.getDashboardHeadData()
 }
-
+const getMessageInfo = async (dataselect: number): Promise<void> => {
+  chartsMessageOption.value = await dashboardStore.getMessageInfo(dataselect)
+  console.log(chartsMessageOption.value)
+}
 onMounted(async () => {
   await getDashboardHeadData()
+  await getMessageInfo(1)
 })
 </script>
 
@@ -206,24 +109,24 @@ onMounted(async () => {
       <a-row justify="space-between" align="middle" :gutter="[24, 24]">
         <a-col :span="12">
           <a-card>
-            <Echarts cardName="消息量" name="chartsMessage" :option="chartsMessageOption"></Echarts>
+            <Echarts cardName="消息详情" name="chartsMessage" :option="chartsMessageOption"></Echarts>
           </a-card>
         </a-col>
-        <a-col :span="12">
+        <!-- <a-col :span="12">
           <a-card>
-            <Echarts cardName="模板使用Top5" name="chartsTemplate" :option="chartsTemplateOption"></Echarts>
+            <Echarts cardName="模板使用 TOP5" name="chartsTemplate" :option="chartsTemplateOption"></Echarts>
           </a-card>
         </a-col>
         <a-col :span="12">
           <a-card>
-            <Echarts cardName="渠道使用Top5" name="chartsChannel" :option="chartsChannelOption"></Echarts>
+            <Echarts cardName="渠道使用 TOP5" name="chartsChannel" :option="chartsChannelOption"></Echarts>
           </a-card>
         </a-col>
         <a-col :span="12">
           <a-card>
-            <Echarts cardName="用户数" name="chartsAccount" :option="chartsAccountOption"></Echarts>
+            <Echarts cardName="推送用户 TOP5" name="chartsAccount" :option="chartsAccountOption"></Echarts>
           </a-card>
-        </a-col>
+        </a-col> -->
       </a-row>
     </div>
   </div>
diff --git a/deliver-front/vue/src/views/Welcome/index.vue b/deliver-front/vue/src/views/Welcome/index.vue
index 54df7b4a..f71f30a1 100644
--- a/deliver-front/vue/src/views/Welcome/index.vue
+++ b/deliver-front/vue/src/views/Welcome/index.vue
@@ -39,7 +39,7 @@ const cards = ref<Card[]>([
       是一个面向企业的全面消息推送平台，旨在提供企业内部沟通和协作的便捷解决方案。它以轻量级部署、简单易用、支持多种通信渠道为特点，为企业提供高效的消息传递和通知功能。
     </p>
     <a-row :gutter="[16, 16]">
-      <a-col class="gutter-row" :span="8" v-for="item in cards" :key="item">
+      <a-col class="gutter-row" :span="8" v-for="item in cards" :key="item.title">
         <a-card style="height: 100%">
           <a-card-meta :title="item.title" :description="item.desc" style="height: 100px">
             <template #avatar>
-- 
Gitee


From 380ec90c1cf58c7e7090beb8ef8ab434776e1c0e Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Wed, 8 Nov 2023 16:54:49 +0800
Subject: [PATCH 05/16] =?UTF-8?q?feat:=E7=BB=84=E4=BB=B6=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/components.d.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/deliver-front/vue/components.d.ts b/deliver-front/vue/components.d.ts
index 81d88c2d..a87e6976 100644
--- a/deliver-front/vue/components.d.ts
+++ b/deliver-front/vue/components.d.ts
@@ -11,14 +11,7 @@ declare module 'vue' {
     ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
     AButton: typeof import('ant-design-vue/es')['Button']
     ACard: typeof import('ant-design-vue/es')['Card']
-    ACardMeta: typeof import('ant-design-vue/es')['CardMeta']
-    ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
-    ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
     ACol: typeof import('ant-design-vue/es')['Col']
-    ADivider: typeof import('ant-design-vue/es')['Divider']
-    AForm: typeof import('ant-design-vue/es')['Form']
-    AFormItem: typeof import('ant-design-vue/es')['FormItem']
-    AInput: typeof import('ant-design-vue/es')['Input']
     ALayout: typeof import('ant-design-vue/es')['Layout']
     ALayoutContent: typeof import('ant-design-vue/es')['LayoutContent']
     ALayoutHeader: typeof import('ant-design-vue/es')['LayoutHeader']
@@ -26,15 +19,11 @@ declare module 'vue' {
     AMenu: typeof import('ant-design-vue/es')['Menu']
     AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
-    APagination: typeof import('ant-design-vue/es')['Pagination']
     ARadioButton: typeof import('ant-design-vue/es')['RadioButton']
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
     ARow: typeof import('ant-design-vue/es')['Row']
-    ASelect: typeof import('ant-design-vue/es')['Select']
-    ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     AStatistic: typeof import('ant-design-vue/es')['Statistic']
     ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
-    ATable: typeof import('ant-design-vue/es')['Table']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
-- 
Gitee


From 51c606be0fb4c05330149f7d5d91db69f44b23ae Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Wed, 8 Nov 2023 16:55:45 +0800
Subject: [PATCH 06/16] =?UTF-8?q?feat:=E7=BB=84=E4=BB=B6=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/components.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/deliver-front/vue/components.d.ts b/deliver-front/vue/components.d.ts
index a87e6976..2cc346f5 100644
--- a/deliver-front/vue/components.d.ts
+++ b/deliver-front/vue/components.d.ts
@@ -12,6 +12,9 @@ declare module 'vue' {
     AButton: typeof import('ant-design-vue/es')['Button']
     ACard: typeof import('ant-design-vue/es')['Card']
     ACol: typeof import('ant-design-vue/es')['Col']
+    AForm: typeof import('ant-design-vue/es')['Form']
+    AFormItem: typeof import('ant-design-vue/es')['FormItem']
+    AInput: typeof import('ant-design-vue/es')['Input']
     ALayout: typeof import('ant-design-vue/es')['Layout']
     ALayoutContent: typeof import('ant-design-vue/es')['LayoutContent']
     ALayoutHeader: typeof import('ant-design-vue/es')['LayoutHeader']
@@ -22,8 +25,11 @@ declare module 'vue' {
     ARadioButton: typeof import('ant-design-vue/es')['RadioButton']
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
     ARow: typeof import('ant-design-vue/es')['Row']
+    ASelect: typeof import('ant-design-vue/es')['Select']
+    ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     AStatistic: typeof import('ant-design-vue/es')['Statistic']
     ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
+    ATable: typeof import('ant-design-vue/es')['Table']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
-- 
Gitee


From 7b42cf72d5cb85ed718c711b7571ffa47bded3bc Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Wed, 8 Nov 2023 17:04:34 +0800
Subject: [PATCH 07/16] =?UTF-8?q?style:=E6=A8=AA=E5=B9=85=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/src/views/Banner/index.vue | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/deliver-front/vue/src/views/Banner/index.vue b/deliver-front/vue/src/views/Banner/index.vue
index 921a805a..70c0a1fd 100644
--- a/deliver-front/vue/src/views/Banner/index.vue
+++ b/deliver-front/vue/src/views/Banner/index.vue
@@ -15,17 +15,13 @@
       );
     "
   >
-    <div data-v-05bfc04b="" class="ant-alert-content">
-      <div data-v-05bfc04b="" class="ant-alert-message">
-        <div
-          data-v-05bfc04b=""
-          style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: center; color: black"
-        >
-          <span data-v-05bfc04b="">⭐️ 如果你喜欢 Deliver 消息推送平台，请给它一个 Star </span
-          ><a data-v-05bfc04b="" target="_blank" rel="noopener noreferrer" href="https://gitee.com/OS-Zero/deliver"
-            >Gitee</a
-          ><span data-v-05bfc04b=""
-            >,你的支持将是我们前行的动力，项目正在积极开发，欢迎大家提交 PR、提供建设,共建社区生态。👏🏻</span
+    <div>
+      <div>
+        <div style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: center; color: black">
+          <span
+            >⭐️ 如果你喜欢 Deliver 消息推送平台，请给它一个 Star
+            <a target="_blank" rel="noopener noreferrer" href="https://gitee.com/OS-Zero/deliver">Gitee</a>
+            ,你的支持将是我们前行的动力，项目正在积极开发，欢迎大家提交 PR、提供建设,共建社区生态。👏🏻</span
           >
         </div>
       </div>
-- 
Gitee


From a60d8129ce184d7e71b792ddb2232be91a7ebbcf Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Wed, 8 Nov 2023 22:41:53 +0800
Subject: [PATCH 08/16] =?UTF-8?q?feat(dashboard):=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/components.d.ts             |   1 +
 deliver-front/vue/src/api/dashboard.ts        |  23 +-
 .../vue/src/components/Echarts/index.vue      |  40 +++-
 deliver-front/vue/src/permisson.ts            |   2 -
 .../vue/src/store/modules/dashboard.ts        | 210 +++++++++++-------
 .../vue/src/views/Dashboard/index.vue         |  24 +-
 6 files changed, 200 insertions(+), 100 deletions(-)

diff --git a/deliver-front/vue/components.d.ts b/deliver-front/vue/components.d.ts
index 2cc346f5..ea3b1da5 100644
--- a/deliver-front/vue/components.d.ts
+++ b/deliver-front/vue/components.d.ts
@@ -11,6 +11,7 @@ declare module 'vue' {
     ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
     AButton: typeof import('ant-design-vue/es')['Button']
     ACard: typeof import('ant-design-vue/es')['Card']
+    ACardMeta: typeof import('ant-design-vue/es')['CardMeta']
     ACol: typeof import('ant-design-vue/es')['Col']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
diff --git a/deliver-front/vue/src/api/dashboard.ts b/deliver-front/vue/src/api/dashboard.ts
index ae3e5614..cb7263ff 100644
--- a/deliver-front/vue/src/api/dashboard.ts
+++ b/deliver-front/vue/src/api/dashboard.ts
@@ -24,10 +24,31 @@ export async function getDashboardHeadData(): Promise<DashboardHeadData> {
     method: 'post'
   })
 }
-export async function getMessageInfo(data: { dateSelect: number }): Promise<messageDataSource> {
+export async function getMessageInfo(data: { dateSelect: number }): Promise<any> {
   return await request({
     url: '/dashboard/getMessageInfo',
     method: 'post',
     data
   })
 }
+export async function getTemplateInfo(data: { dateSelect: number }): Promise<any> {
+  return await request({
+    url: '/dashboard/getTemplateInfo',
+    method: 'post',
+    data
+  })
+}
+export async function getAppInfo(data: { dateSelect: number }): Promise<any> {
+  return await request({
+    url: '/dashboard/getAppInfo',
+    method: 'post',
+    data
+  })
+}
+export async function getPushUserInfo(data: { dateSelect: number }): Promise<any> {
+  return await request({
+    url: '/dashboard/getPushUserInfo',
+    method: 'post',
+    data
+  })
+}
diff --git a/deliver-front/vue/src/components/Echarts/index.vue b/deliver-front/vue/src/components/Echarts/index.vue
index 0bde541b..e456c209 100644
--- a/deliver-front/vue/src/components/Echarts/index.vue
+++ b/deliver-front/vue/src/components/Echarts/index.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup>
 import { getCurrentInstance, onMounted, onBeforeUnmount, ref, watch } from 'vue'
 import { type ECharts, init } from 'echarts'
+import { useDashboardStore } from '@/store/modules/dashboard'
 const props = defineProps(['name', 'option', 'cardName'])
-const value1 = ref<string>('a')
+const selectValue = ref<number>(1)
 let myChart: ECharts
 // 重绘图表函数
 const resizeHandler = (): void => {
@@ -29,6 +30,27 @@ const initChart = (): void => {
   myChart.setOption(props.option, { notMerge: true })
   window.addEventListener('resize', cancalDebounce)
 }
+
+const dashboardStore = useDashboardStore()
+const selectChange = async (e: any): Promise<void> => {
+  switch (e.target.name) {
+    case 'chartsMessage':
+      myChart.setOption(await dashboardStore.getMessageInfo(e.target.value), { notMerge: true })
+      break
+    case 'chartsTemplate':
+      myChart.setOption(await dashboardStore.getTemplateInfo(e.target.value), { notMerge: true })
+      break
+    case 'chartsChannel':
+      myChart.setOption(await dashboardStore.getAppInfo(e.target.value), { notMerge: true })
+      break
+    case 'chartsAccount':
+      myChart.setOption(await dashboardStore.getPushUserInfo(e.target.value), { notMerge: true })
+      break
+    default:
+      break
+  }
+}
+
 onMounted(() => {
   initChart()
 })
@@ -47,11 +69,17 @@ watch(props, () => {
   <div class="echart-card">
     <div class="echart-header">
       <span class="card-name">{{ cardName }}</span>
-      <a-radio-group v-model:value="value1" button-style="solid" style="height: 25px">
-        <a-radio-button value="a">今日</a-radio-button>
-        <a-radio-button value="b">本周</a-radio-button>
-        <a-radio-button value="c">本月</a-radio-button>
-        <a-radio-button value="d">本年</a-radio-button>
+      <a-radio-group
+        :name="name"
+        v-model:value="selectValue"
+        button-style="solid"
+        style="height: 25px"
+        @change="selectChange"
+      >
+        <a-radio-button :value="1">今日</a-radio-button>
+        <a-radio-button :value="2">本周</a-radio-button>
+        <a-radio-button :value="3">本月</a-radio-button>
+        <a-radio-button :value="4">本年</a-radio-button>
       </a-radio-group>
     </div>
     <div class="echart" :ref="name"></div>
diff --git a/deliver-front/vue/src/permisson.ts b/deliver-front/vue/src/permisson.ts
index 198cdaa9..9dc11eba 100644
--- a/deliver-front/vue/src/permisson.ts
+++ b/deliver-front/vue/src/permisson.ts
@@ -2,7 +2,5 @@ import router from './router'
 
 router.beforeEach(async (to, _from, next) => {
   document.title = to.meta.title as string
-  console.log(to.meta.title)
-
   next()
 })
diff --git a/deliver-front/vue/src/store/modules/dashboard.ts b/deliver-front/vue/src/store/modules/dashboard.ts
index e330e9a2..62681df0 100644
--- a/deliver-front/vue/src/store/modules/dashboard.ts
+++ b/deliver-front/vue/src/store/modules/dashboard.ts
@@ -1,7 +1,13 @@
 import { defineStore } from 'pinia'
-import { getDashboardHeadData, getMessageInfo, type DashboardHeadData } from '@/api/dashboard'
+import {
+  getDashboardHeadData,
+  getMessageInfo,
+  getTemplateInfo,
+  getAppInfo,
+  getPushUserInfo,
+  type DashboardHeadData
+} from '@/api/dashboard'
 import { type EChartsOption } from 'echarts'
-
 const chartsMessageOption: EChartsOption = {
   legend: {
     top: '20%'
@@ -9,14 +15,7 @@ const chartsMessageOption: EChartsOption = {
   tooltip: {},
   dataset: {
     dimensions: ['product', '成功', '失败'],
-    source: [
-      ['0-4', 650, 20],
-      ['4-8', 650, 20],
-      ['8-12', 140, 100],
-      ['12-16', 86.4, 65.2],
-      ['16-20', 72.4, 53.9],
-      ['20-24', 650, 20]
-    ]
+    source: []
   },
   grid: {
     top: '30%',
@@ -29,79 +28,97 @@ const chartsMessageOption: EChartsOption = {
     { type: 'bar', color: '#a90000' }
   ]
 }
-// const chartsTemplateOption = {
-//   tooltip: {
-//     trigger: 'item'
-//   },
-//   series: [
-//     {
-//       name: 'Access From',
-//       type: 'pie',
-//       radius: '50%',
-//       center: ['50%', '60%'],
-//       data: [
-//         { value: 1048, name: 'Search Engine' },
-//         { value: 735, name: 'Direct' },
-//         { value: 580, name: 'Email' },
-//         { value: 484, name: 'Union Ads' },
-//         { value: 300, name: 'Video Ads' }
-//       ]
-//     }
-//   ]
-// }
-// const chartsChannelOption = {
-//   tooltip: {
-//     trigger: 'item'
-//   },
-//   series: [
-//     {
-//       name: 'Access From',
-//       type: 'pie',
-//       radius: '50%',
-//       center: ['50%', '60%'],
-//       data: [
-//         { value: 1048, name: 'Search Engine' },
-//         { value: 735, name: 'Direct' },
-//         { value: 580, name: 'Email' },
-//         { value: 484, name: 'Union Ads' },
-//         { value: 300, name: 'Video Ads' }
-//       ],
-//       emphasis: {
-//         itemStyle: {
-//           shadowBlur: 10,
-//           shadowOffsetX: 0,
-//           shadowColor: 'rgba(0, 0, 0, 0.5)'
-//         }
-//       }
-//     }
-//   ]
-// }
-// const chartsAccountOption = {
-//   tooltip: {
-//     trigger: 'item'
-//   },
-//   series: [
-//     {
-//       name: 'Access From',
-//       type: 'pie',
-//       radius: ['50%', '60%'],
-//       center: ['50%', '60%'],
-//       avoidLabelOverlap: false,
-//       itemStyle: {
-//         borderRadius: 10,
-//         borderColor: '#fff',
-//         borderWidth: 2
-//       },
-//       data: [
-//         { value: 1048, name: 'Search Engine' },
-//         { value: 735, name: 'Direct' },
-//         { value: 580, name: 'Email' },
-//         { value: 484, name: 'Union Ads' },
-//         { value: 300, name: 'Video Ads' }
-//       ]
-//     }
-//   ]
-// }
+const chartsTemplateOption: EChartsOption = {
+  tooltip: {
+    trigger: 'item'
+  },
+  series: [
+    {
+      name: 'TemplateId',
+      type: 'pie',
+      radius: '50%',
+      center: ['50%', '60%'],
+      label: {
+        alignTo: 'edge',
+        formatter: '{name|{b}}\n{value|计数:{c}}',
+        minMargin: 5,
+        lineHeight: 15,
+        rich: {
+          time: {
+            fontSize: 10,
+            color: '#999'
+          }
+        }
+      },
+      data: []
+    }
+  ]
+}
+const chartsChannelOption: EChartsOption = {
+  tooltip: {
+    trigger: 'item'
+  },
+  series: [
+    {
+      name: 'AppId',
+      type: 'pie',
+      radius: '50%',
+      center: ['50%', '60%'],
+      label: {
+        alignTo: 'edge',
+        formatter: '{name|{b}}\n{value|计数:{c}}',
+        minMargin: 5,
+        lineHeight: 15,
+        rich: {
+          time: {
+            fontSize: 10,
+            color: '#999'
+          }
+        }
+      },
+      data: [],
+      emphasis: {
+        itemStyle: {
+          shadowBlur: 10,
+          shadowOffsetX: 0,
+          shadowColor: 'rgba(0, 0, 0, 0.5)'
+        }
+      }
+    }
+  ]
+}
+const chartsAccountOption: EChartsOption = {
+  tooltip: {
+    trigger: 'item'
+  },
+  series: [
+    {
+      name: 'UserId',
+      type: 'pie',
+      radius: ['50%', '60%'],
+      center: ['50%', '60%'],
+      avoidLabelOverlap: false,
+      label: {
+        alignTo: 'edge',
+        formatter: '{name|{b}}\n{value|计数:{c}}',
+        minMargin: 5,
+        lineHeight: 15,
+        rich: {
+          time: {
+            fontSize: 10,
+            color: '#999'
+          }
+        }
+      },
+      itemStyle: {
+        borderRadius: 10,
+        borderColor: '#fff',
+        borderWidth: 2
+      },
+      data: []
+    }
+  ]
+}
 
 export const useDashboardStore = defineStore('dashboard', {
   state: () => {
@@ -112,15 +129,36 @@ export const useDashboardStore = defineStore('dashboard', {
   actions: {
     async getDashboardHeadData() {
       const dashboardHeadData: DashboardHeadData = await getDashboardHeadData()
-      console.log(dashboardHeadData)
       return dashboardHeadData
     },
     async getMessageInfo(dateSelect: number): Promise<EChartsOption> {
-      const messageData: messageDataSource = await getMessageInfo({ dateSelect })
+      const messageData = await getMessageInfo({ dateSelect })
       if (chartsMessageOption.dataset !== undefined) {
-        chartsMessageOption.dataset.source = messageData
+        chartsMessageOption.dataset.source = messageData.messageInfoList
+        console.log(chartsMessageOption)
       }
       return chartsMessageOption
+    },
+    async getTemplateInfo(dateSelect: number): Promise<EChartsOption> {
+      const messageData = await getTemplateInfo({ dateSelect })
+      if (chartsTemplateOption.series !== undefined) {
+        chartsTemplateOption.series[0].data = messageData?.dashboardInfoList
+      }
+      return chartsTemplateOption
+    },
+    async getAppInfo(dateSelect: number): Promise<EChartsOption> {
+      const messageData = await getAppInfo({ dateSelect })
+      if (chartsChannelOption.series !== undefined) {
+        chartsChannelOption.series[0].data = messageData?.dashboardInfoList
+      }
+      return chartsChannelOption
+    },
+    async getPushUserInfo(dateSelect: number): Promise<EChartsOption> {
+      const messageData = await getPushUserInfo({ dateSelect })
+      if (chartsAccountOption.series !== undefined) {
+        chartsAccountOption.series[0].data = messageData?.dashboardInfoList
+      }
+      return chartsAccountOption
     }
   },
   getters: {}
diff --git a/deliver-front/vue/src/views/Dashboard/index.vue b/deliver-front/vue/src/views/Dashboard/index.vue
index eb1680ac..684583d1 100644
--- a/deliver-front/vue/src/views/Dashboard/index.vue
+++ b/deliver-front/vue/src/views/Dashboard/index.vue
@@ -14,16 +14,30 @@ import { type EChartsOption } from 'echarts'
 const dashboardStore = useDashboardStore()
 const dashboardHeadData = ref<DashboardHeadData>({})
 const chartsMessageOption = ref<EChartsOption>({})
+const chartsTemplateOption = ref<EChartsOption>({})
+const chartsApplOption = ref<EChartsOption>({})
+const chartsUserOption = ref<EChartsOption>({})
 const getDashboardHeadData = async (): Promise<void> => {
   dashboardHeadData.value = await dashboardStore.getDashboardHeadData()
 }
 const getMessageInfo = async (dataselect: number): Promise<void> => {
   chartsMessageOption.value = await dashboardStore.getMessageInfo(dataselect)
-  console.log(chartsMessageOption.value)
+}
+const getTemplateInfo = async (dataselect: number): Promise<void> => {
+  chartsTemplateOption.value = await dashboardStore.getTemplateInfo(dataselect)
+}
+const getAppInfo = async (dataselect: number): Promise<void> => {
+  chartsApplOption.value = await dashboardStore.getAppInfo(dataselect)
+}
+const getPushUserInfo = async (dataselect: number): Promise<void> => {
+  chartsUserOption.value = await dashboardStore.getPushUserInfo(dataselect)
 }
 onMounted(async () => {
   await getDashboardHeadData()
   await getMessageInfo(1)
+  await getTemplateInfo(1)
+  await getAppInfo(1)
+  await getPushUserInfo(1)
 })
 </script>
 
@@ -112,21 +126,21 @@ onMounted(async () => {
             <Echarts cardName="消息详情" name="chartsMessage" :option="chartsMessageOption"></Echarts>
           </a-card>
         </a-col>
-        <!-- <a-col :span="12">
+        <a-col :span="12">
           <a-card>
             <Echarts cardName="模板使用 TOP5" name="chartsTemplate" :option="chartsTemplateOption"></Echarts>
           </a-card>
         </a-col>
         <a-col :span="12">
           <a-card>
-            <Echarts cardName="渠道使用 TOP5" name="chartsChannel" :option="chartsChannelOption"></Echarts>
+            <Echarts cardName="渠道 APP 使用 TOP5" name="chartsChannel" :option="chartsApplOption"></Echarts>
           </a-card>
         </a-col>
         <a-col :span="12">
           <a-card>
-            <Echarts cardName="推送用户 TOP5" name="chartsAccount" :option="chartsAccountOption"></Echarts>
+            <Echarts cardName="推送用户 TOP5" name="chartsAccount" :option="chartsUserOption"></Echarts>
           </a-card>
-        </a-col> -->
+        </a-col>
       </a-row>
     </div>
   </div>
-- 
Gitee


From 0248abf1a3786b9ad42cd0660a0205f4be571fa7 Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Wed, 8 Nov 2023 23:01:15 +0800
Subject: [PATCH 09/16] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/components.d.ts             |   5 +-
 deliver-front/vue/src/api/message.ts          |  10 +
 deliver-front/vue/src/utils/date.ts           |  10 +
 .../views/Message/components/searchForm.vue   |  62 ++-
 deliver-front/vue/src/views/Message/index.vue | 375 +++++++++++-------
 .../vue/src/views/Message/type/index.ts       |  78 +++-
 deliver-front/vue/vite.config.ts              |   2 +-
 7 files changed, 356 insertions(+), 186 deletions(-)
 create mode 100644 deliver-front/vue/src/api/message.ts
 create mode 100644 deliver-front/vue/src/utils/date.ts

diff --git a/deliver-front/vue/components.d.ts b/deliver-front/vue/components.d.ts
index 81d88c2d..1f81a82c 100644
--- a/deliver-front/vue/components.d.ts
+++ b/deliver-front/vue/components.d.ts
@@ -8,14 +8,13 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     AAvatar: typeof import('ant-design-vue/es')['Avatar']
+    ABadge: typeof import('ant-design-vue/es')['Badge']
     ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
     AButton: typeof import('ant-design-vue/es')['Button']
     ACard: typeof import('ant-design-vue/es')['Card']
     ACardMeta: typeof import('ant-design-vue/es')['CardMeta']
-    ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
-    ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
     ACol: typeof import('ant-design-vue/es')['Col']
-    ADivider: typeof import('ant-design-vue/es')['Divider']
+    ADropdown: typeof import('ant-design-vue/es')['Dropdown']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
     AInput: typeof import('ant-design-vue/es')['Input']
diff --git a/deliver-front/vue/src/api/message.ts b/deliver-front/vue/src/api/message.ts
new file mode 100644
index 00000000..97b96536
--- /dev/null
+++ b/deliver-front/vue/src/api/message.ts
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import type { searchMessage } from '@/views/Message/type'
+
+export async function getTemplatePages(data: searchMessage): Promise<any> {
+  return await request({
+    url: '/template/search',
+    method: 'post',
+    data
+  })
+}
diff --git a/deliver-front/vue/src/utils/date.ts b/deliver-front/vue/src/utils/date.ts
new file mode 100644
index 00000000..ca7b5b97
--- /dev/null
+++ b/deliver-front/vue/src/utils/date.ts
@@ -0,0 +1,10 @@
+export const getDate = (d): string => {
+  const date = new Date(d)
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  const hour = String(date.getHours()).padStart(2, '0')
+  const minute = String(date.getMinutes()).padStart(2, '0')
+  const second = String(date.getSeconds()).padStart(2, '0')
+  return `${year}-${month}-${day} ${hour}:${minute}:${second}`
+}
diff --git a/deliver-front/vue/src/views/Message/components/searchForm.vue b/deliver-front/vue/src/views/Message/components/searchForm.vue
index 7a64ecda..c2cc71fa 100644
--- a/deliver-front/vue/src/views/Message/components/searchForm.vue
+++ b/deliver-front/vue/src/views/Message/components/searchForm.vue
@@ -1,74 +1,58 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
 import { DownOutlined, UpOutlined } from '@ant-design/icons-vue'
-import type { messageTemplate } from '../type'
+import type { searchMessage } from '../type'
 import type { FormInstance } from 'ant-design-vue'
 
 const expand = ref(false)
 
 const formRef = ref<FormInstance>()
 
-const searchForm: messageTemplate = reactive({
+const searchPage: searchMessage = reactive({
   templateName: '',
-  pushRange: '',
-  userType: '',
-  channel: '',
-  messageType: '',
-  channelApp: ''
+  pushRange: undefined,
+  usersType: undefined,
+  currentPage: 1,
+  pageSize: 10
 })
 
-const onFinish = (): void => {
-  console.log('searchForm: ', searchForm)
+const searchMes = (): void => {
+  console.log(123123)
 }
 
-// 等接口出来在该
-const searchMessage = (): void => {
+const onFinish = (): void => {
+  console.log('searchPage: ', searchPage)
   console.log('查询成功')
 }
 
-const rangeOptions = [{ value: '默认标签1' }, { value: '默认标签2' }, { value: '默认标签3' }]
-const qudaoOptions = [{ value: '默认标签1' }, { value: '默认标签2' }, { value: '默认标签3' }]
+defineExpose({
+  searchPage
+})
 </script>
 
 <template>
-  <a-form ref="formRef" name="advanced_search" class="search" :model="searchForm" @finish="onFinish">
+  <a-form ref="formRef" name="advanced_search" class="search" :model="searchPage" @finish="onFinish">
     <a-row :gutter="24">
       <a-col :span="8">
         <a-form-item name="templateName" label="模板名">
-          <a-input v-model:value="searchForm.templateName" placeholder="请输入模板名"></a-input>
+          <a-input v-model:value="searchPage.templateName" placeholder="请输入模板名"></a-input>
         </a-form-item>
       </a-col>
       <a-col :span="8">
         <a-form-item name="pushRange" label="推送范围">
-          <a-select v-model:value="searchForm.pushRange" placeholder="请选择推送范围">
+          <a-select v-model:value="searchPage.pushRange" placeholder="请选择推送范围">
             <a-select-option value="范围1">范围1</a-select-option>
             <a-select-option value="范围2">范围2</a-select-option>
           </a-select>
         </a-form-item>
       </a-col>
       <a-col :span="8" v-if="expand">
-        <a-form-item name="userType" label="用户类型">
-          <a-select v-model:value="searchForm.userType" placeholder="请选择用户类型">
-            <a-select-option value="类型1">类型1</a-select-option>
-            <a-select-option value="类型2">类型2</a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-col>
-      <a-col :span="8" v-if="expand">
-        <a-form-item name="messageType" label="消息类型">
-          <a-select v-model:value="searchForm.messageType" placeholder="请选择消息类型" :options="rangeOptions" />
-        </a-form-item>
-      </a-col>
-      <a-col :span="8" v-if="expand">
-        <a-form-item name="channel" label="渠道选择">
-          <a-select v-model:value="searchForm.channel" placeholder="请选择渠道" :options="qudaoOptions" />
-        </a-form-item>
-      </a-col>
-      <a-col :span="8" v-if="expand">
-        <a-form-item name="channelApp" label="渠道App">
-          <a-select v-model:value="searchForm.channelApp" placeholder="请选择渠道App">
-            <a-select-option value="类型1">类型1</a-select-option>
-            <a-select-option value="类型2">类型2</a-select-option>
+        <a-form-item name="usersType" label="用户类型">
+          <a-select v-model:value="searchPage.usersType" placeholder="请选择用户类型">
+            <a-select-option value="1">类型1</a-select-option>
+            <a-select-option value="2">类型2</a-select-option>
+            <a-select-option value="3">类型3</a-select-option>
+            <a-select-option value="4">类型4</a-select-option>
           </a-select>
         </a-form-item>
       </a-col>
@@ -79,7 +63,7 @@ const qudaoOptions = [{ value: '默认标签1' }, { value: '默认标签2' }, {
           'margin-bottom': expand === true ? '24px' : '0'
         }"
       >
-        <a-button type="primary" html-type="submit" @click="searchMessage">查询</a-button>
+        <a-button type="primary" html-type="submit" @click="searchMes">查询</a-button>
         <a-button style="margin: 0 8px" @click="() => (formRef as FormInstance).resetFields()">清空</a-button>
         <a style="font-size: 14px" @click="expand = !expand">
           <template v-if="expand">
diff --git a/deliver-front/vue/src/views/Message/index.vue b/deliver-front/vue/src/views/Message/index.vue
index c025e599..6dab8b22 100644
--- a/deliver-front/vue/src/views/Message/index.vue
+++ b/deliver-front/vue/src/views/Message/index.vue
@@ -1,145 +1,170 @@
 <script lang="ts" setup>
 import { ReloadOutlined } from '@ant-design/icons-vue'
-import { ref, reactive, h, watch, computed } from 'vue'
+import { ref, reactive, h, onMounted } from 'vue' // watch, computed,
 import type { UnwrapRef } from 'vue'
+// import type { Rule } from 'ant-design-vue/es/form'
 import type { TableColumnsType } from 'ant-design-vue'
-import type { Rule } from 'ant-design-vue/es/form'
-import type { messageTemplate } from './type'
+import type { messageTemplate, searchMessage } from './type'
 import searchForm from './components/searchForm.vue'
+import { getTemplatePages } from '@/api/message'
+import { getDate } from '@/utils/date'
 // import { message } from 'ant-design-vue'
 
-/// 表格部分
+/// 增删改查
+const searchform = ref()
 // 新增
 const open = ref<boolean>(false)
 const addModules = (): void => {
   open.value = true
 }
 
-const labelCol = { span: 4 }
+// const labelCol = { span: 4 }
 
-const wrapperCol = { span: 20 }
+// const wrapperCol = { span: 20 }
+// const sea = ref()
 
-const addTemplate: UnwrapRef<messageTemplate> = reactive({
-  templateName: '',
-  pushRange: '',
-  userType: '',
-  channel: '',
-  messageType: '',
-  channelApp: ''
-})
+const templateTable: UnwrapRef<messageTemplate[]> = reactive([])
 
-const rules: Record<string, Rule[]> = {
-  templateName: [
-    { required: true, message: '请输入模板名', trigger: 'change' },
-    { min: 3, max: 20, message: '长度在 3 到 20 个字符', trigger: 'blur' }
-  ],
-  pushRange: [{ required: true, message: '请选择推送范围', trigger: 'change' }],
-  userType: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
-  messageType: [
-    {
-      required: true,
-      message: '请选择消息类型',
-      trigger: 'change'
-    }
-  ],
-  channel: [
-    {
-      required: true,
-      message: '请选择渠道',
-      trigger: 'change'
-    }
-  ],
-  channelApp: [{ required: true, message: '请选择渠道App', trigger: 'change' }]
-}
+const searchItem: searchMessage = reactive({
+  templateName: undefined,
+  pushRange: undefined,
+  usersType: undefined,
+  currentPage: 1,
+  pageSize: 10
+})
 
-const templateForm = ref()
-const handleOk = (): void => {
-  templateForm.value
-    .validate()
-    .then(() => {
-      console.log('values', addTemplate)
-      open.value = false
+const searchTemplate = (): void => {
+  getTemplatePages(searchItem)
+    .then(res => {
+      templateTable.length = 0
+      if (res.records.length > 0) {
+        res.records.forEach((item: any, index: number) => {
+          item.channelType = JSON.parse(item.pushWays).channelType
+          item.messageType = JSON.parse(item.pushWays).messageType
+          item.createTime = getDate(item.createTime)
+          item.key = index
+          templateTable.push(item)
+        })
+        console.warn(templateTable)
+      }
     })
-    .catch(error => {
-      console.log('error', error)
+    .catch(err => {
+      console.error('An error occurred:', err)
     })
 }
-const handleCancel = (): void => {
-  templateForm.value.resetFields()
-}
+// const rules: Record<string, Rule[]> = {
+//   templateName: [
+//     { required: true, message: '请输入模板名', trigger: 'change' },
+//     { min: 3, max: 20, message: '长度在 3 到 20 个字符', trigger: 'blur' }
+//   ],
+//   pushRange: [{ required: true, message: '请选择推送范围', trigger: 'change' }],
+//   usersType: [{ required: true, message: '请选择用户类型', trigger: 'change' }],
+//   messageType: [
+//     {
+//       required: true,
+//       message: '请选择消息类型',
+//       trigger: 'change'
+//     }
+//   ],
+//   channel: [
+//     {
+//       required: true,
+//       message: '请选择渠道',
+//       trigger: 'change'
+//     }
+//   ],
+//   channelApp: [{ required: true, message: '请选择渠道App', trigger: 'change' }]
+// }
 
-const channelData = ['默认标签1', '默认标签2', '默认标签3']
+// const templateForm = ref()
+// const handleOk = (): void => {
+//   templateForm.value
+//     .validate()
+//     .then(() => {
+//       console.log('values', templateTable)
+//       open.value = false
+//     })
+//     .catch(error => {
+//       console.log('error', error)
+//     })
+// }
+// const handleCancel = (): void => {
+//   templateForm.value.resetFields()
+// }
 
-const messageData = {
-  默认标签1: ['Online'],
-  默认标签2: ['Promotion'],
-  默认标签3: ['Offline']
-}
+// const channelData = ['默认标签1', '默认标签2', '默认标签3']
 
-const appData = {
-  默认标签1: ['IOS'],
-  默认标签2: ['安卓'],
-  默认标签3: ['MAC']
-}
+// const messageData = {
+//   默认标签1: ['Online'],
+//   默认标签2: ['Promotion'],
+//   默认标签3: ['Offline']
+// }
 
-const mesType = computed(() => {
-  return messageData[addTemplate.channel] === undefined ? [] : messageData[addTemplate.channel]
-})
+// const appData = {
+//   默认标签1: ['IOS'],
+//   默认标签2: ['安卓'],
+//   默认标签3: ['MAC']
+// }
 
-const appType = computed(() => {
-  return appData[addTemplate.channel] === undefined ? [] : appData[addTemplate.channel]
-})
+// const mesType = computed(() => {
+//   return messageData[templateTable.channel] === undefined ? [] : messageData[templateTable.channel]
+// })
 
-watch(
-  () => addTemplate.channel,
-  newVal => {
-    if (messageData[newVal] !== undefined) {
-      addTemplate.messageType = messageData[newVal][0]
-    } else {
-      // 未定义或空数组的情况
-      addTemplate.messageType = ''
-      messageData[newVal] = []
-    }
-    if (appData[newVal] !== undefined) {
-      addTemplate.channelApp = appData[newVal][0]
-    } else {
-      // 处理未定义或空数组的情况
-      addTemplate.channelApp = ''
-      appData[newVal] = []
-    }
-  }
-)
+// const appType = computed(() => {
+//   return appData[templateTable.channel] === undefined ? [] : appData[templateTable.channel]
+// })
+
+// watch(
+//   () => templateTable.channel,
+//   newVal => {
+//     if (messageData[newVal] !== undefined) {
+//       templateTable.messageType = messageData[newVal][0]
+//     } else {
+//       // 未定义或空数组的情况
+//       templateTable.messageType = ''
+//       messageData[newVal] = []
+//     }
+//     if (appData[newVal] !== undefined) {
+//       templateTable.channelApp = appData[newVal][0]
+//     } else {
+//       // 处理未定义或空数组的情况
+//       templateTable.channelApp = ''
+//       appData[newVal] = []
+//     }
+//   }
+// )
 
+// 表格数据
 const columns: TableColumnsType = [
   {
     title: '模版 ID',
-    dataIndex: 'projectName',
-    key: 'projectname'
+    dataIndex: 'templateId',
+    key: 'templateId'
   },
   {
     title: '模板名',
-    dataIndex: 'admin1',
-    key: 'admin1'
+    dataIndex: 'templateName',
+    key: 'templateName'
   },
   {
     title: '推送范围',
-    dataIndex: 'admin2',
-    key: 'admin2'
+    dataIndex: 'pushRange',
+    key: 'pushRange'
   },
   {
     title: '用户类型',
-    dataIndex: 'admin2',
-    key: 'admin2'
+    dataIndex: 'usersType',
+    key: 'usersType'
   },
   {
     title: '模板累计使用数',
-    dataIndex: 'admin2',
-    key: 'admin2'
+    dataIndex: 'useCount',
+    key: 'useCount'
   },
   {
     title: '模板状态',
-    dataIndex: 'admin2',
-    key: 'admin2'
+    dataIndex: 'templateStatus',
+    key: 'templateStatus'
   },
   {
     title: '操作',
@@ -148,20 +173,81 @@ const columns: TableColumnsType = [
     width: 180
   }
 ]
-// data到时候肯定是需要去接口获取到res然后渲染的
-const data = ref([
+
+const innerColumns = [
+  {
+    title: '渠道选择',
+    dataIndex: 'channelType',
+    key: 'channelType'
+  },
+  {
+    title: '消息类型',
+    dataIndex: 'messageType',
+    key: 'messageType'
+  },
+  {
+    title: '创建用户',
+    dataIndex: 'createUser',
+    key: 'createUser'
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime'
+  },
+  {
+    title: '渠道App ID',
+    dataIndex: 'appId',
+    key: 'appId'
+  },
   {
-    key: '1',
-    projectName: '1.txt',
-    admin1: 'a',
-    admin2: 'b'
+    title: '渠道App名称',
+    dataIndex: 'appName',
+    key: 'appName'
+  }
+]
+
+// 渲染 data
+const innertemplatedata: UnwrapRef<messageTemplate[]> = reactive([])
+
+const expandedRowKeys: number[] = reactive([])
+
+const getInnerData = (expanded, record): void => {
+  // 判断是否点开
+  expandedRowKeys.length = 0
+  if (expanded === true) {
+    const b = record.key.toString()
+    expandedRowKeys.push(Number(b.slice(-1)))
+    innertemplatedata.length = 0
+    innertemplatedata.push(record)
+  } else {
+    expandedRowKeys.length = 0
   }
-])
+}
+
+onMounted(() => {
+  getTemplatePages(searchItem)
+    .then(res => {
+      if (res.records.length > 0) {
+        res.records.forEach((item: any, index: number) => {
+          item.channelType = JSON.parse(item.pushWays).channelType
+          item.messageType = JSON.parse(item.pushWays).messageType
+          item.createTime = getDate(item.createTime)
+          item.key = index
+          templateTable.push(item)
+        })
+        console.warn(templateTable)
+      }
+    })
+    .catch(err => {
+      console.error('An error occurred:', err)
+    })
+})
 </script>
 
 <template>
   <!-- 搜索部分 -->
-  <searchForm />
+  <searchForm ref="searchform" @searchMes="searchTemplate" />
   <!-- 表格部分 -->
   <div id="message-container">
     <div class="message-section">
@@ -171,30 +257,20 @@ const data = ref([
         </a-tooltip>
         <a-button type="primary" class="addModule" @click="addModules">新增模板</a-button>
         <a-modal v-model:open="open" title="新增模板" width="650px" :footer="null" @cancel="handleCancel">
-          <a-form
-            ref="templateForm"
-            :model="addTemplate"
-            :rules="rules"
-            :label-col="labelCol"
-            :wrapper-col="wrapperCol"
-            class="temform"
-          >
+          <!-- <a-form ref="templateForm" :model="templateTable" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol"
+            class="temform">
             <a-form-item ref="templateName" label="模板名" name="templateName" class="tem-item">
-              <a-input
-                v-model:value="addTemplate.templateName"
-                placeholder="请填写长度在3到20个字符的模板名"
-                style="width: 70%"
-              />
+              <a-input v-model:value="templateTable.templateName" placeholder="请填写长度在3到20个字符的模板名" style="width: 70%" />
             </a-form-item>
             <a-form-item label="推送范围" name="pushRange" class="tem-item">
-              <a-radio-group v-model:value="addTemplate.pushRange" button-style="solid">
+              <a-radio-group v-model:value="templateTable.pushRange" button-style="solid">
                 <a-radio-button :value="0">不限</a-radio-button>
                 <a-radio-button :value="1">企业内部</a-radio-button>
                 <a-radio-button :value="2">企业外部</a-radio-button>
               </a-radio-group>
             </a-form-item>
-            <a-form-item label="用户类型" name="userType" class="tem-item">
-              <a-radio-group v-model:value="addTemplate.userType" button-style="solid">
+            <a-form-item label="用户类型" name="usersType" class="tem-item">
+              <a-radio-group v-model:value="templateTable.usersType" button-style="solid">
                 <a-radio-button :value="1">企业账号</a-radio-button>
                 <a-radio-button :value="2">电话</a-radio-button>
                 <a-radio-button :value="3">邮箱</a-radio-button>
@@ -202,42 +278,56 @@ const data = ref([
               </a-radio-group>
             </a-form-item>
             <a-form-item label="渠道选择" name="channel" class="tem-item">
-              <a-select
-                v-model:value="addTemplate.channel"
-                :options="channelData.map(pro => ({ value: pro }))"
-                style="width: 70%"
-              />
+              <a-select v-model:value="templateTable.channel" :options="channelData.map(pro => ({ value: pro }))"
+                style="width: 70%" />
             </a-form-item>
             <a-form-item label="消息类型" name="messageType" class="tem-item">
-              <a-select
-                v-model:value="addTemplate.messageType"
-                :options="mesType.map((pro: any) => ({ value: pro }))"
-                style="width: 70%"
-              />
+              <a-select v-model:value="templateTable.messageType" :options="mesType.map((pro: any) => ({ value: pro }))"
+                style="width: 70%" />
             </a-form-item>
             <a-form-item label="渠道App" name="channelApp" class="tem-item">
-              <a-select
-                v-model:value="addTemplate.channelApp"
-                :options="appType.map((pro: any) => ({ value: pro }))"
-                style="width: 70%"
-              />
+              <a-select v-model:value="templateTable.channelApp" :options="appType.map((pro: any) => ({ value: pro }))"
+                style="width: 70%" />
             </a-form-item>
             <a-form-item :wrapper-col="{ span: 14, offset: 4 }" class="tem-item">
               <a-button type="primary" @click="handleOk">确认新建</a-button>
               <a-button style="margin-left: 10px" @click="handleCancel">重置</a-button>
             </a-form-item>
-          </a-form>
+          </a-form> -->
         </a-modal>
       </div>
 
       <!-- 表格部分 -->
-      <a-table :columns="columns" :data-source="data" :scroll="{ x: 1200, y: 300 }" bordered>
-        <template #bodyCell="{ column }">
+      <a-table
+        :columns="columns"
+        :data-source="templateTable"
+        :scroll="{ x: 1200, y: 900 }"
+        bordered
+        class="components-table-demo-nested"
+        @expand="getInnerData"
+        :expandedRowKeys="expandedRowKeys"
+      >
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'templateStatus'">
+            <span v-if="record.templateStatus === 1">
+              <a-button type="primary" style="background-color: rgb(102, 193, 58)" @click="record.templateStatus = 0">
+                启用
+              </a-button>
+            </span>
+            <span v-else>
+              <a-button type="primary" danger @click="record.templateStatus = 1">禁用</a-button>
+            </span>
+          </template>
           <template v-if="column.key === 'operation'">
             <a-button type="primary" class="btn-manager">编辑</a-button>
             <a-button type="primary" danger>删除</a-button>
           </template>
         </template>
+        <template #expandedRowRender>
+          <a-table :columns="innerColumns" :data-source="innertemplatedata" :pagination="false">
+            <template #bodyCell></template>
+          </a-table>
+        </template>
       </a-table>
     </div>
     <!-- 对表格的操作 -->
@@ -249,13 +339,16 @@ const data = ref([
   height: 100%;
   overflow: auto;
 }
+
 .search {
   padding: 24px 24px 0 24px;
   background: #ffffff;
   border-radius: 6px;
+
   .search-item:nth-child(1) {
     margin-left: 15px;
   }
+
   .search-item:nth-child(2) {
     margin-left: 30px;
   }
@@ -267,6 +360,7 @@ const data = ref([
   display: flex;
   align-items: center;
   justify-content: right;
+
   .addModule {
     margin: 0px 20px;
   }
@@ -276,17 +370,20 @@ const data = ref([
   .tem-item {
     margin-top: 20px;
   }
+
   .tem-item:nth-child(7) {
     text-align: right;
     margin-left: 300px;
   }
 }
+
 .message-section {
   height: 100%;
   border-radius: 6px;
   margin-top: 12px;
   background: #ffffff;
   padding: 12px;
+
   .btn-manager {
     margin-right: 10px;
   }
diff --git a/deliver-front/vue/src/views/Message/type/index.ts b/deliver-front/vue/src/views/Message/type/index.ts
index 22b30626..d4af1cd5 100644
--- a/deliver-front/vue/src/views/Message/type/index.ts
+++ b/deliver-front/vue/src/views/Message/type/index.ts
@@ -1,8 +1,78 @@
 export interface messageTemplate {
+  /**
+   * 模板id
+   */
+  templateId: string
+  /**
+   * 模板名
+   */
   templateName: string
-  pushRange: string
-  userType: string
-  channel: string
+  /**
+   * 推送范围
+   */
+  pushRange: number
+  /**
+   * 用户类型
+   */
+  usersType: number
+  // /**
+  //  * 推送方式
+  //  */
+  pushWays?: string
+  /**
+   * 渠道选择
+   */
+  channelType: number
+  /**
+   * 消息类型
+   */
   messageType: string
-  channelApp: string
+  /**
+   * 模板累计使用数
+   */
+  useCount: number
+  /**
+   * 模板状态
+   */
+  templateStatus: number
+  /**
+   * 创建用户
+   */
+  createUser: string
+  /**
+   * 创建时间
+   */
+  createTime: string
+  /**
+   * Appid
+   */
+  appId: number
+  /**
+   * App名称
+   */
+  appName: string
+}
+
+// 搜索框接口
+export interface searchMessage {
+  /**
+   * 模板名
+   */
+  templateName?: string
+  /**
+   * 推送范围
+   */
+  pushRange?: number
+  /**
+   * 用户类型
+   */
+  usersType?: number
+  /**
+   * 当前页面序号
+   */
+  currentPage: number
+  /**
+   * 页面大小
+   */
+  pageSize: number
 }
diff --git a/deliver-front/vue/vite.config.ts b/deliver-front/vue/vite.config.ts
index b9d24789..d91bd704 100644
--- a/deliver-front/vue/vite.config.ts
+++ b/deliver-front/vue/vite.config.ts
@@ -12,7 +12,7 @@ export default defineConfig({
     proxy: {
       '/admin': {
         // 请求接口中要替换的标识
-        target: 'http://localhost:9090', // 代理地址
+        target: 'http://10.100.127.154:9090', // 代理地址
         changeOrigin: true, // 是否允许跨域
         secure: true
       }
-- 
Gitee


From 94d7d49174cebc40b41f02277761bc04dc90a15c Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Fri, 10 Nov 2023 20:00:03 +0800
Subject: [PATCH 10/16] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/index.html                  | 81 ++++++++++++++++---
 deliver-front/vue/package-lock.json           | 24 ++++++
 deliver-front/vue/package.json                |  2 +
 .../src/layouts/components/ItemLink/index.vue |  8 +-
 deliver-front/vue/src/permisson.ts            |  5 ++
 deliver-front/vue/src/utils/nprogreess.ts     | 21 +++++
 6 files changed, 127 insertions(+), 14 deletions(-)
 create mode 100644 deliver-front/vue/src/utils/nprogreess.ts

diff --git a/deliver-front/vue/index.html b/deliver-front/vue/index.html
index 03b05335..35eec1db 100644
--- a/deliver-front/vue/index.html
+++ b/deliver-front/vue/index.html
@@ -1,13 +1,72 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/head.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Deliver</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/head.ico" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Deliver</title>
+  <style>
+    .loading {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+    }
+
+    .loading-bar {
+      display: inline-block;
+      width: 4px;
+      height: 18px;
+      border-radius: 4px;
+      animation: loading 1s ease-in-out infinite;
+    }
+
+    .loading-bar:nth-child(1) {
+      background-color: #3498db;
+      animation-delay: 0;
+    }
+
+    .loading-bar:nth-child(2) {
+      background-color: #c0392b;
+      animation-delay: 0.09s;
+    }
+
+    .loading-bar:nth-child(3) {
+      background-color: #f1c40f;
+      animation-delay: .18s;
+    }
+
+    .loading-bar:nth-child(4) {
+      background-color: #27ae60;
+      animation-delay: .27s;
+    }
+
+    @keyframes loading {
+      0% {
+        transform: scale(1);
+      }
+
+      20% {
+        transform: scale(1, 2.2);
+      }
+
+      40% {
+        transform: scale(1);
+      }
+    }
+  </style>
+</head>
+
+<body>
+  <div id="app">
+    <div class="loading">
+      <div class="loading-bar"></div>
+      <div class="loading-bar"></div>
+      <div class="loading-bar"></div>
+      <div class="loading-bar"></div>
+    </div>
+  </div>
+  <script type="module" src="/src/main.ts"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/deliver-front/vue/package-lock.json b/deliver-front/vue/package-lock.json
index 09274b13..8544c01b 100644
--- a/deliver-front/vue/package-lock.json
+++ b/deliver-front/vue/package-lock.json
@@ -11,12 +11,14 @@
         "ant-design-vue": "^4.0.6",
         "axios": "^1.5.1",
         "echarts": "^5.4.3",
+        "nprogress": "^0.2.0",
         "pinia": "^2.1.7",
         "vue": "^3.3.4",
         "vue-router": "^4.2.5"
       },
       "devDependencies": {
         "@types/node": "^20.8.7",
+        "@types/nprogress": "^0.2.3",
         "@typescript-eslint/eslint-plugin": "^6.8.0",
         "@vitejs/plugin-vue": "^4.2.3",
         "eslint": "^8.52.0",
@@ -719,6 +721,12 @@
         "undici-types": "~5.25.1"
       }
     },
+    "node_modules/@types/nprogress": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmmirror.com/@types/nprogress/-/nprogress-0.2.3.tgz",
+      "integrity": "sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==",
+      "dev": true
+    },
     "node_modules/@types/semver": {
       "version": "7.5.4",
       "resolved": "https://registry.npmmirror.com/@types/semver/-/semver-7.5.4.tgz",
@@ -3354,6 +3362,11 @@
         "node": ">=12"
       }
     },
+    "node_modules/nprogress": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz",
+      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
+    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz",
@@ -5130,6 +5143,12 @@
         "undici-types": "~5.25.1"
       }
     },
+    "@types/nprogress": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmmirror.com/@types/nprogress/-/nprogress-0.2.3.tgz",
+      "integrity": "sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==",
+      "dev": true
+    },
     "@types/semver": {
       "version": "7.5.4",
       "resolved": "https://registry.npmmirror.com/@types/semver/-/semver-7.5.4.tgz",
@@ -7228,6 +7247,11 @@
         }
       }
     },
+    "nprogress": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz",
+      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
+    },
     "nth-check": {
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz",
diff --git a/deliver-front/vue/package.json b/deliver-front/vue/package.json
index e561739f..bcde3b2b 100644
--- a/deliver-front/vue/package.json
+++ b/deliver-front/vue/package.json
@@ -14,12 +14,14 @@
     "ant-design-vue": "^4.0.6",
     "axios": "^1.5.1",
     "echarts": "^5.4.3",
+    "nprogress": "^0.2.0",
     "pinia": "^2.1.7",
     "vue": "^3.3.4",
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
     "@types/node": "^20.8.7",
+    "@types/nprogress": "^0.2.3",
     "@typescript-eslint/eslint-plugin": "^6.8.0",
     "@vitejs/plugin-vue": "^4.2.3",
     "eslint": "^8.52.0",
diff --git a/deliver-front/vue/src/layouts/components/ItemLink/index.vue b/deliver-front/vue/src/layouts/components/ItemLink/index.vue
index 6d7b6c4d..8f78ba4f 100644
--- a/deliver-front/vue/src/layouts/components/ItemLink/index.vue
+++ b/deliver-front/vue/src/layouts/components/ItemLink/index.vue
@@ -3,9 +3,11 @@ defineProps(['itemKey', 'info', 'to'])
 </script>
 <template>
   <div class="item-link">
-    <a-menu-item :key="itemKey">
-      <RouterLink :to="to">{{ info }}</RouterLink>
-    </a-menu-item>
+    <RouterLink :to="to">
+      <KeepAlive
+        ><a-menu-item :key="itemKey">{{ info }} </a-menu-item>
+      </KeepAlive>
+    </RouterLink>
   </div>
 </template>
 <style lang="scss" scoped></style>
diff --git a/deliver-front/vue/src/permisson.ts b/deliver-front/vue/src/permisson.ts
index 9dc11eba..f87ea36c 100644
--- a/deliver-front/vue/src/permisson.ts
+++ b/deliver-front/vue/src/permisson.ts
@@ -1,6 +1,11 @@
 import router from './router'
+import { start, close } from './utils/nprogreess'
 
 router.beforeEach(async (to, _from, next) => {
+  start()
   document.title = to.meta.title as string
   next()
 })
+router.afterEach(() => {
+  close()
+})
diff --git a/deliver-front/vue/src/utils/nprogreess.ts b/deliver-front/vue/src/utils/nprogreess.ts
new file mode 100644
index 00000000..1e1f8557
--- /dev/null
+++ b/deliver-front/vue/src/utils/nprogreess.ts
@@ -0,0 +1,21 @@
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+
+NProgress.configure({
+  easing: 'ease', // 动画方式
+  speed: 1000, // 递增进度条的速度
+  showSpinner: false, // 是否显示加载ico
+  trickleSpeed: 200, // 自动递增间隔
+  minimum: 0.3, // 更改启动时使用的最小百分比
+  parent: 'body' // 指定进度条的父容器
+})
+
+// 开启进度条
+export const start = (): void => {
+  NProgress.start()
+}
+
+// 关闭进度条
+export const close = (): void => {
+  NProgress.done()
+}
-- 
Gitee


From fa66574f37e145438d636cff77e507211f83d73d Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Sun, 12 Nov 2023 15:21:43 +0800
Subject: [PATCH 11/16] =?UTF-8?q?feat:=20=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/Message/components/searchForm.vue   | 30 +++++++++++--------
 deliver-front/vue/src/views/Message/index.vue | 20 +++++++++----
 .../vue/src/views/Message/type/index.ts       |  7 ++++-
 deliver-front/vue/vite.config.ts              |  2 +-
 4 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/deliver-front/vue/src/views/Message/components/searchForm.vue b/deliver-front/vue/src/views/Message/components/searchForm.vue
index cafa5a8c..be708a17 100644
--- a/deliver-front/vue/src/views/Message/components/searchForm.vue
+++ b/deliver-front/vue/src/views/Message/components/searchForm.vue
@@ -7,48 +7,52 @@ import type { searchMessage } from '../type'
 import type { FormInstance } from 'ant-design-vue'
 import type { Dayjs } from 'dayjs'
 
+interface DelayLoading {
+  delay: number
+}
+
 const expand = ref(false)
 
 const formRef = ref<FormInstance>()
 
-const searchPage: searchMessage = reactive({
+const searchPage = reactive<searchMessage>({
   templateName: undefined,
   pushRange: undefined,
   usersType: undefined,
   currentPage: 1,
   pageSize: 10,
   startTime: undefined,
-  endTime: undefined
+  endTime: undefined,
+  perid: undefined
 })
 
 const selectedRange = ref<Array<Dayjs | null>>([null, null])
 
-// 在 setup 函数中定义 clearForm 函数
+const iconLoading = ref<boolean | DelayLoading>(false)
+
 const clearForm = (): void => {
-  // 重置日期选择框的内容为null
   selectedRange.value = [null, null]
-  // 使用 ant-design-vue 提供的方法重置其他表单项的内容
   formRef.value?.resetFields()
 }
 
 const onRangeChange = (value: [Dayjs, Dayjs] | [string, string], dateString: [string, string]): void => {
   if (Array.isArray(value)) {
-    console.log('Selected Time: ', value)
-  } else {
-    console.log('Formatted Selected Time: ', value)
+    searchPage.startTime = dateString[0] + ' 00:00:00'
+    searchPage.endTime = dateString[1] + ' 23:59:59'
   }
-  console.log('Formatted Selected Time: ', dateString)
 }
 
 // 新增自定义事件，当查询按钮被点击时，可以立即告知父组件
 const $emit = defineEmits(['mes'])
 
 const searchMes = (): void => {
+  iconLoading.value = true
   $emit('mes')
 }
 
 defineExpose({
-  searchPage
+  searchPage,
+  iconLoading
 })
 </script>
 
@@ -79,10 +83,10 @@ defineExpose({
         </a-form-item>
       </a-col>
       <a-col :span="16" v-if="expand">
-        <a-form-item name="useType" label="起始日期-结束日期">
+        <a-form-item name="perid" label="起始日期-结束日期">
           <a-range-picker
             :locale="locale"
-            v-model:value="selectedRange"
+            v-model:value="searchPage.perid"
             @change="onRangeChange"
             format="YYYY-MM-DD"
             :placeholder="['起始日期', '结束日期']"
@@ -96,7 +100,7 @@ defineExpose({
           'margin-bottom': expand === true ? '24px' : '0'
         }"
       >
-        <a-button type="primary" html-type="submit" @click="searchMes">查询</a-button>
+        <a-button type="primary" html-type="submit" @click="searchMes" :loading="iconLoading">查询</a-button>
         <a-button style="margin: 0 8px" @click="clearForm">清空</a-button>
         <a style="font-size: 14px" @click="expand = !expand">
           <template v-if="expand">
diff --git a/deliver-front/vue/src/views/Message/index.vue b/deliver-front/vue/src/views/Message/index.vue
index 79adbf8a..84254f64 100644
--- a/deliver-front/vue/src/views/Message/index.vue
+++ b/deliver-front/vue/src/views/Message/index.vue
@@ -232,9 +232,11 @@ const locale = {
   next_page: '下一页' // 下一页按钮文字描述
 }
 
+// 条件查询
 const searchTemplate = (page?: number, pageSize?: number): void => {
   // 对象解构
-  const searchNeedMes = { ...searchform.value.searchPage }
+  const { perid, ...rest } = searchform.value.searchPage
+  const searchNeedMes = { ...rest }
   console.warn(searchNeedMes)
   searchNeedMes.currentPage = page
   searchNeedMes.pageSize = pageSize
@@ -247,15 +249,21 @@ const searchTemplate = (page?: number, pageSize?: number): void => {
           item.channelType = JSON.parse(item.pushWays).channelType
           item.messageType = JSON.parse(item.pushWays).messageType
           item.createTime = getDate(item.createTime)
-          // item.templateStatus = item.templateStatus === 1 ? true : false
+          // eslint-disable-next-line
+          item.templateStatus = item.templateStatus === 1 ? true : false
           item.key = index
           templateTable.push(item)
         })
-        void message.success('查询成功~ (*^_^*)')
+        void message.success('查询成功~ (*^▽^*)')
+        console.warn('查询数据', templateTable)
+      } else {
+        void message.success('未查询到任何数据   ≧ ﹏ ≦')
         console.warn('查询数据', templateTable)
       }
+      searchform.value.iconLoading = false
     })
     .catch(err => {
+      searchform.value.iconLoading = false
       void message.error('查询失败~ (＞︿＜)')
       console.error('An error occurred:', err)
     })
@@ -270,6 +278,8 @@ onMounted(() => {
           item.channelType = JSON.parse(item.pushWays).channelType
           item.messageType = JSON.parse(item.pushWays).messageType
           item.createTime = getDate(item.createTime)
+          // eslint-disable-next-line
+          item.templateStatus = item.templateStatus === 1 ? true : false
           item.key = index
           templateTable.push(item)
         })
@@ -351,8 +361,8 @@ onMounted(() => {
             </span>
           </template>
           <template v-if="column.key === 'operation'">
-            <a-button type="primary" class="btn-manager" size="small">编辑</a-button>
-            <a-button type="primary" danger size="small">删除</a-button>
+            <a-button type="primary" class="btn-manager" size="small" style="font-size: 13px">编辑</a-button>
+            <a-button type="primary" danger size="small" style="font-size: 13px">删除</a-button>
           </template>
         </template>
         <template #expandedRowRender>
diff --git a/deliver-front/vue/src/views/Message/type/index.ts b/deliver-front/vue/src/views/Message/type/index.ts
index c7c30a3a..4241a229 100644
--- a/deliver-front/vue/src/views/Message/type/index.ts
+++ b/deliver-front/vue/src/views/Message/type/index.ts
@@ -1,3 +1,4 @@
+import type { Dayjs } from 'dayjs'
 export interface messageTemplate {
   /**
    * 模板id
@@ -34,7 +35,7 @@ export interface messageTemplate {
   /**
    * 模板状态
    */
-  templateStatus: number
+  templateStatus: number | boolean
   /**
    * 创建用户
    */
@@ -83,4 +84,8 @@ export interface searchMessage {
    * 结束日期
    */
   endTime?: string
+  /**
+   * 时间段
+   */
+  perid?: [Dayjs, Dayjs]
 }
diff --git a/deliver-front/vue/vite.config.ts b/deliver-front/vue/vite.config.ts
index d91bd704..60ff9055 100644
--- a/deliver-front/vue/vite.config.ts
+++ b/deliver-front/vue/vite.config.ts
@@ -12,7 +12,7 @@ export default defineConfig({
     proxy: {
       '/admin': {
         // 请求接口中要替换的标识
-        target: 'http://10.100.127.154:9090', // 代理地址
+        target: 'http://10.90.118.84:9090', // 代理地址
         changeOrigin: true, // 是否允许跨域
         secure: true
       }
-- 
Gitee


From 77055ba7e9f789ba5335ad4e51d1265fb7f26ca0 Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Sun, 12 Nov 2023 15:33:24 +0800
Subject: [PATCH 12/16] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dechart=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/src/store/modules/dashboard.ts   | 12 ++++++------
 deliver-front/vue/src/store/modules/types/types.ts |  0
 deliver-front/vue/vite.config.ts                   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 deliver-front/vue/src/store/modules/types/types.ts

diff --git a/deliver-front/vue/src/store/modules/dashboard.ts b/deliver-front/vue/src/store/modules/dashboard.ts
index 62681df0..ae509200 100644
--- a/deliver-front/vue/src/store/modules/dashboard.ts
+++ b/deliver-front/vue/src/store/modules/dashboard.ts
@@ -13,10 +13,7 @@ const chartsMessageOption: EChartsOption = {
     top: '20%'
   },
   tooltip: {},
-  dataset: {
-    dimensions: ['product', '成功', '失败'],
-    source: []
-  },
+  dataset: {},
   grid: {
     top: '30%',
     bottom: '10%'
@@ -133,9 +130,12 @@ export const useDashboardStore = defineStore('dashboard', {
     },
     async getMessageInfo(dateSelect: number): Promise<EChartsOption> {
       const messageData = await getMessageInfo({ dateSelect })
+
       if (chartsMessageOption.dataset !== undefined) {
-        chartsMessageOption.dataset.source = messageData.messageInfoList
-        console.log(chartsMessageOption)
+        chartsMessageOption.dataset = {
+          dimensions: ['product', '成功', '失败'],
+          source: messageData.messageInfoList
+        }
       }
       return chartsMessageOption
     },
diff --git a/deliver-front/vue/src/store/modules/types/types.ts b/deliver-front/vue/src/store/modules/types/types.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/deliver-front/vue/vite.config.ts b/deliver-front/vue/vite.config.ts
index d91bd704..60ff9055 100644
--- a/deliver-front/vue/vite.config.ts
+++ b/deliver-front/vue/vite.config.ts
@@ -12,7 +12,7 @@ export default defineConfig({
     proxy: {
       '/admin': {
         // 请求接口中要替换的标识
-        target: 'http://10.100.127.154:9090', // 代理地址
+        target: 'http://10.90.118.84:9090', // 代理地址
         changeOrigin: true, // 是否允许跨域
         secure: true
       }
-- 
Gitee


From 178031766e34e383284b36e93150fa9b345ef8d8 Mon Sep 17 00:00:00 2001
From: hzhfsa <1957214281@qq.com>
Date: Sun, 12 Nov 2023 15:58:37 +0800
Subject: [PATCH 13/16] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=88=86=E9=A1=B5=E9=87=8D=E5=A4=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue/src/views/Message/components/searchForm.vue | 13 +++++++------
 deliver-front/vue/src/views/Message/index.vue       | 10 ++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/deliver-front/vue/src/views/Message/components/searchForm.vue b/deliver-front/vue/src/views/Message/components/searchForm.vue
index be708a17..21b5d2e4 100644
--- a/deliver-front/vue/src/views/Message/components/searchForm.vue
+++ b/deliver-front/vue/src/views/Message/components/searchForm.vue
@@ -67,18 +67,19 @@ defineExpose({
       <a-col :span="8">
         <a-form-item name="pushRange" label="推送范围">
           <a-select v-model:value="searchPage.pushRange" placeholder="请选择推送范围">
-            <a-select-option value="0">范围0</a-select-option>
-            <a-select-option value="1">范围1</a-select-option>
+            <a-select-option value="0">不限</a-select-option>
+            <a-select-option value="1">企业内部</a-select-option>
+            <a-select-option value="2">企业外部</a-select-option>
           </a-select>
         </a-form-item>
       </a-col>
       <a-col :span="8" v-if="expand">
         <a-form-item name="usersType" label="用户类型">
           <a-select v-model:value="searchPage.usersType" placeholder="请选择用户类型">
-            <a-select-option value="1">类型1</a-select-option>
-            <a-select-option value="2">类型2</a-select-option>
-            <a-select-option value="3">类型3</a-select-option>
-            <a-select-option value="4">类型4</a-select-option>
+            <a-select-option value="1">企业账号</a-select-option>
+            <a-select-option value="2">电话</a-select-option>
+            <a-select-option value="3">邮箱</a-select-option>
+            <a-select-option value="4">平台 UserId</a-select-option>
           </a-select>
         </a-form-item>
       </a-col>
diff --git a/deliver-front/vue/src/views/Message/index.vue b/deliver-front/vue/src/views/Message/index.vue
index 84254f64..495b82b6 100644
--- a/deliver-front/vue/src/views/Message/index.vue
+++ b/deliver-front/vue/src/views/Message/index.vue
@@ -17,7 +17,7 @@ const templateTable: UnwrapRef<messageTemplate[]> = reactive([])
 // 表格数据
 const columns: TableColumnsType = [
   {
-    title: '模版 ID',
+    title: 'TemplateId',
     dataIndex: 'templateId',
     key: 'templateId'
   },
@@ -76,12 +76,12 @@ const innerColumns = [
     key: 'createTime'
   },
   {
-    title: '渠道App ID',
+    title: '渠道 AppId',
     dataIndex: 'appId',
     key: 'appId'
   },
   {
-    title: '渠道App名称',
+    title: '渠道 App 名',
     dataIndex: 'appName',
     key: 'appName'
   }
@@ -252,7 +252,8 @@ const searchTemplate = (page?: number, pageSize?: number): void => {
           // eslint-disable-next-line
           item.templateStatus = item.templateStatus === 1 ? true : false
           item.key = index
-          templateTable.push(item)
+          const i = item
+          templateTable.push(i)
         })
         void message.success('查询成功~ (*^▽^*)')
         console.warn('查询数据', templateTable)
@@ -352,6 +353,7 @@ onMounted(() => {
         bordered
         class="components-table-demo-nested"
         @expand="getInnerData"
+        :pagination="false"
         :expandedRowKeys="expandedRowKeys"
       >
         <template #bodyCell="{ column, record }">
-- 
Gitee


From d75b6e0f536d6a898a27e3910d10184ebcc8d517 Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Sun, 12 Nov 2023 16:02:11 +0800
Subject: [PATCH 14/16] =?UTF-8?q?update:=E9=A1=B9=E7=9B=AE=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/index.html                     |   2 +-
 deliver-front/vue/public/head.ico                | Bin 2499 -> 0 bytes
 deliver-front/vue/public/head.png                | Bin 6696 -> 0 bytes
 deliver-front/vue/public/logo.png                | Bin 0 -> 5696 bytes
 .../vue/src/layouts/components/Header/index.vue  |   5 ++---
 deliver-front/vue/src/store/modules/dashboard.ts |   1 -
 6 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 deliver-front/vue/public/head.ico
 delete mode 100644 deliver-front/vue/public/head.png
 create mode 100644 deliver-front/vue/public/logo.png

diff --git a/deliver-front/vue/index.html b/deliver-front/vue/index.html
index 35eec1db..24ec9c73 100644
--- a/deliver-front/vue/index.html
+++ b/deliver-front/vue/index.html
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="UTF-8" />
-  <link rel="icon" type="image/svg+xml" href="/head.ico" />
+  <link rel="icon" type="image/svg+xml" href="/logo.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Deliver</title>
   <style>
diff --git a/deliver-front/vue/public/head.ico b/deliver-front/vue/public/head.ico
deleted file mode 100644
index d30793792733f7d167180113d77f6161b335472c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2499
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
N002ovPDHLkV1ikjwdMc-

diff --git a/deliver-front/vue/public/head.png b/deliver-front/vue/public/head.png
deleted file mode 100644
index 62c0dacebee1ae650e70591519467f3820cc216c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6696
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

diff --git a/deliver-front/vue/public/logo.png b/deliver-front/vue/public/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd2522311154beddd148c43defb17f0bb08451bc
GIT binary patch
literal 5696
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

literal 0
HcmV?d00001

diff --git a/deliver-front/vue/src/layouts/components/Header/index.vue b/deliver-front/vue/src/layouts/components/Header/index.vue
index d65d8754..10c24e79 100644
--- a/deliver-front/vue/src/layouts/components/Header/index.vue
+++ b/deliver-front/vue/src/layouts/components/Header/index.vue
@@ -9,7 +9,7 @@ const setShowAbout = (open: boolean): void => {
 <template>
   <a-layout-header class="header">
     <div class="left">
-      <RouterLink to="/"><img src="vite.svg" alt="空" /></RouterLink>
+      <RouterLink to="/"><img src="logo.png" style="height: 100%" alt="空" /></RouterLink>
       <h1>Deliver 企业消息推送平台</h1>
     </div>
     <div class="right">
@@ -52,11 +52,10 @@ const setShowAbout = (open: boolean): void => {
   height: 60px;
   background-color: #ffffff;
   .left {
-    height: 100%;
+    display: flex;
     h1 {
       height: 60px;
       line-height: 60px;
-      display: inline-block;
     }
   }
   .right {
diff --git a/deliver-front/vue/src/store/modules/dashboard.ts b/deliver-front/vue/src/store/modules/dashboard.ts
index ae509200..064f6383 100644
--- a/deliver-front/vue/src/store/modules/dashboard.ts
+++ b/deliver-front/vue/src/store/modules/dashboard.ts
@@ -130,7 +130,6 @@ export const useDashboardStore = defineStore('dashboard', {
     },
     async getMessageInfo(dateSelect: number): Promise<EChartsOption> {
       const messageData = await getMessageInfo({ dateSelect })
-
       if (chartsMessageOption.dataset !== undefined) {
         chartsMessageOption.dataset = {
           dimensions: ['product', '成功', '失败'],
-- 
Gitee


From 4c9c71674211ee8268bc98c12a5ab8680335494b Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Sun, 12 Nov 2023 16:08:45 +0800
Subject: [PATCH 15/16] =?UTF-8?q?update(welcome):=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=86=E8=A7=A3=E6=9B=B4=E5=A4=9A=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/src/views/Welcome/index.vue | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/deliver-front/vue/src/views/Welcome/index.vue b/deliver-front/vue/src/views/Welcome/index.vue
index f71f30a1..67ab1751 100644
--- a/deliver-front/vue/src/views/Welcome/index.vue
+++ b/deliver-front/vue/src/views/Welcome/index.vue
@@ -3,31 +3,38 @@ import { ref } from 'vue'
 interface Card {
   title: string
   desc: string
+  link: string
 }
 const cards = ref<Card[]>([
   {
     title: '社区官网',
-    desc: '欢迎访问 OSZero 官方网站，Open Source Zero（零号开源）由一群充满技术热情的开发者创建。加入我们，一同探索开源世界！'
+    desc: '欢迎访问 OSZero 官方网站，Open Source Zero（零号开源）由一群充满技术热情的开发者创建。加入我们，一同探索开源世界！',
+    link: 'https://os-zero.gitee.io/website/'
   },
   {
     title: '快速开始',
-    desc: '立即启动 Deliver 企业消息推送平台，发送属于您的首条消息~'
+    desc: '立即启动 Deliver 企业消息推送平台，发送属于您的首条消息~',
+    link: 'https://os-zero.gitee.io/website/project/deliver/start.html'
   },
   {
     title: '开发者文档',
-    desc: '探索开发者专属的设计和二次开发文档，创建您独一无二的企业消息推送平台！'
+    desc: '探索开发者专属的设计和二次开发文档，创建您独一无二的企业消息推送平台！',
+    link: 'https://os-zero.gitee.io/website/project/deliver/developer.html'
   },
   {
     title: '用户指南',
-    desc: '在这里，您将学会如何创建消息模板、配置必要信息以及发送各种类型的消息。现在就开始吧~'
+    desc: '在这里，您将学会如何创建消息模板、配置必要信息以及发送各种类型的消息。现在就开始吧~',
+    link: 'https://os-zero.gitee.io/website/project/deliver/guide.html'
   },
   {
     title: '运维部署',
-    desc: '支持多种部署方式（本地、Docker、Linux Shell），简单快捷的部署方式，让我们开始搭建吧！'
+    desc: '支持多种部署方式（本地、Docker、Linux Shell），简单快捷的部署方式，让我们开始搭建吧！',
+    link: 'https://os-zero.gitee.io/website/project/deliver/deploy.html'
   },
   {
     title: '交流讨论',
-    desc: '欢迎加入我们的社区官方交流讨论群，快速获得答疑解惑，赶紧一起加入吧~'
+    desc: '欢迎加入我们的社区官方交流讨论群，快速获得答疑解惑，赶紧一起加入吧~',
+    link: 'https://os-zero.gitee.io/website/community/communicate.html'
   }
 ])
 </script>
@@ -49,7 +56,7 @@ const cards = ref<Card[]>([
             </template>
           </a-card-meta>
           <template #actions>
-            <a-button type="link">了解更多</a-button>
+            <a-button type="link" :href="item.link">了解更多</a-button>
           </template>
         </a-card>
       </a-col>
-- 
Gitee


From 942a16e6a87e790578b0a0f0a120808bde17154d Mon Sep 17 00:00:00 2001
From: dengyu <3233891353@qq.com>
Date: Sun, 12 Nov 2023 17:10:21 +0800
Subject: [PATCH 16/16] =?UTF-8?q?style(welcome):=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deliver-front/vue/src/views/Welcome/index.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/deliver-front/vue/src/views/Welcome/index.vue b/deliver-front/vue/src/views/Welcome/index.vue
index 67ab1751..22f9ebf9 100644
--- a/deliver-front/vue/src/views/Welcome/index.vue
+++ b/deliver-front/vue/src/views/Welcome/index.vue
@@ -51,12 +51,14 @@ const cards = ref<Card[]>([
           <a-card-meta :title="item.title" :description="item.desc" style="height: 100px">
             <template #avatar>
               <a-avatar
-                src="data:image/jpeg;base64,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"
+                :size="40"
+                class="avatar"
+                src="https://gw.alipayobjects.com/zos/bmw-prod/daaf8d50-8e6d-4251-905d-676a24ddfa12.svg"
               />
             </template>
           </a-card-meta>
           <template #actions>
-            <a-button type="link" :href="item.link">了解更多</a-button>
+            <a style="color: #1677ff" :href="item.link" target="_blank">了解更多></a>
           </template>
         </a-card>
       </a-col>
@@ -79,5 +81,8 @@ const cards = ref<Card[]>([
     margin-top: 16px;
     margin-bottom: 32px;
   }
+  a:hover {
+    color: #6ea2d7 !important;
+  }
 }
 </style>
-- 
Gitee