From 0ae00153d1e376638678de0138d2dd34f1470cf1 Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Thu, 18 Sep 2025 18:51:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.prod                      |   2 +-
 .gitignore                     |   1 +
 src/apis/modules/vote.js       |  18 +++
 src/locales/lang/zh-CN/menu.js |   3 +-
 src/router/routes/pages.js     |  12 ++
 src/utils/request.js           |   2 +-
 src/views/pages/vote/index.vue | 288 +++++++++++++++++++++++++++++++++
 7 files changed, 323 insertions(+), 3 deletions(-)
 create mode 100644 src/apis/modules/vote.js
 create mode 100644 src/views/pages/vote/index.vue

diff --git a/.env.prod b/.env.prod
index 5fc0520..b8db962 100644
--- a/.env.prod
+++ b/.env.prod
@@ -4,7 +4,7 @@ NODE_ENV=production
 # app
 VITE_TITLE=JinShan-Admin
 VITE_PUBLIC_PATH=/
-VITE_OUT_DIR=dist
+VITE_OUT_DIR=index
 VITE_PERMISSION=true
 
 # router
diff --git a/.gitignore b/.gitignore
index d57ef41..9628b4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ lerna-debug.log*
 
 node_modules
 dist
+index
 dist-ssr
 *.local
 */.vitepress/cache/**/*
diff --git a/src/apis/modules/vote.js b/src/apis/modules/vote.js
new file mode 100644
index 0000000..d9b10de
--- /dev/null
+++ b/src/apis/modules/vote.js
@@ -0,0 +1,18 @@
+/**
+ *  区域模块接口
+ */
+import request from '@/utils/request'
+// 获取项目列表
+export const getElectionList = (params) => request.basic.get('/api/v1/election-registrations', params)
+// 获取单挑数据
+export const getItem = (id) => request.basic.get(`/api/v1/activities/${id}`)
+// 添加条目
+export const createProject = (params) => request.basic.post('/api/v1/activities', params)
+// 更新role
+export const updateItem = (id, params) => request.basic.put(`/api/v1/activities/${id}`, params)
+// 删除数据
+export const delItem = (id) => request.basic.delete(`/api/v1/activities/${id}`)
+//获取活动报名列表
+export const getActivityList = (params) => request.basic.get('/api/v1/activity-registers', params)
+// 导出文件
+export const exportFile = (params) => request.basic.get('/api/v1/election-registrations/export', params, { responseType: 'blob' })
\ No newline at end of file
diff --git a/src/locales/lang/zh-CN/menu.js b/src/locales/lang/zh-CN/menu.js
index 886c528..0c4770c 100644
--- a/src/locales/lang/zh-CN/menu.js
+++ b/src/locales/lang/zh-CN/menu.js
@@ -51,5 +51,6 @@ export default {
     customer:'用户管理',
     aiHelper:'AI助手',
     abbreviation:'活动报名',
-    orderArea:'工单区域管理'
+    orderArea:'工单区域管理',
+    vote:'信息登记',
 }
diff --git a/src/router/routes/pages.js b/src/router/routes/pages.js
index d16ecfa..8c5a395 100644
--- a/src/router/routes/pages.js
+++ b/src/router/routes/pages.js
@@ -249,4 +249,16 @@ export default [
             permission: '*',
         },
     },
+     {
+        path: 'vote/index',
+        name: 'vote',
+        component: 'pages/vote/index.vue',
+        meta: {
+            icon: 'icon-yonghu',
+            title: '信息登记',
+            isMenu: true,
+            keepAlive: true,
+            permission: '*',
+        },
+    },
 ]
diff --git a/src/utils/request.js b/src/utils/request.js
index 125f4ee..d4bbaa1 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -21,7 +21,7 @@ const options = {
     },
     interceptorRequestCatch: () => {},
     interceptorResponse: (response) => {
-        const list=['/api/v1/activity-registers/export', '/api/v1/captcha/image']
+        const list=['/api/v1/activity-registers/export', '/api/v1/captcha/image','/api/v1/election-registrations/export']
         // 错误处理
         const { success, msg = 'Network Error' } = response.data || {}
         if (![true].includes(success) && !list.includes(response.config.url)) {
diff --git a/src/views/pages/vote/index.vue b/src/views/pages/vote/index.vue
new file mode 100644
index 0000000..ce98121
--- /dev/null
+++ b/src/views/pages/vote/index.vue
@@ -0,0 +1,288 @@
+<template>
+    <x-search-bar class="mb-24-2">
+        <template #default="{ gutter, colSpan }">
+            <a-form :model="searchFormData" layout="inline">
+                <a-row :gutter="gutter">
+                    <a-col v-bind="colSpan">
+                        <a-form-item label="用户名" name="name">
+                            <a-input placeholder="请输入用户名" v-model:value="searchFormData.name"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col v-bind="colSpan">
+                        <a-form-item label="联系电话" name="phone">
+                            <a-input placeholder="请输入联系电话" v-model:value="searchFormData.phone"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col v-bind="colSpan">
+                        <a-form-item label="身份证号" name="iDCard">
+                            <a-input placeholder="请输入身份证号" v-model:value="searchFormData.iDCard"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col v-bind="colSpan">
+                        <a-form-item label="住址" name="address">
+                            <a-input placeholder="请输入住址" v-model:value="searchFormData.address"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col class="align-right" v-bind="colSpan">
+                        <a-space>
+                            <a-button @click="handleExport">导出文件</a-button>
+                            <a-button @click="handleResetSearch">{{ $t('button.reset') }}</a-button>
+                            <a-button ghost type="primary" @click="handleSearch">
+                                {{ $t('button.search') }}
+                            </a-button>
+                        </a-space>
+                    </a-col>
+                </a-row>
+            </a-form>
+        </template>
+    </x-search-bar>
+    <a-row :gutter="8" :wrap="false">
+        <a-col flex="auto">
+            <a-card type="flex">
+                <a-table :columns="columns" :data-source="listData" bordered="true" :loading="loading"
+                    :pagination="paginationState" @change="onTableChange">
+                    <template #bodyCell="{ column, record }">
+                        <template v-if="'createdAt' === column.dataIndex">
+                            {{ dayjs(record.createdAt).format('YYYY-MM-DD') }}
+                        </template>
+                        <template v-if="'ActivityCover' === column.dataIndex">
+                            <a-image :width="60"
+                                :src="record.ActivityCover ? config('http.apiBasic') + record.ActivityCover : errImg" />
+                        </template>
+                    </template>
+                </a-table>
+            </a-card>
+        </a-col>
+    </a-row>
+    <a-modal v-model:open="open" :title="'审核'" @ok="handleClick">
+        <a-card class="mb-8-2">
+
+            <a-form-item label="审核" name="">
+                <a-radio-group v-model:value="auditStatus">
+                    <a-radio :value="2">通过</a-radio>
+                    <a-radio :value="99">不通过</a-radio>
+                </a-radio-group>
+            </a-form-item>
+
+            <a-form-item label="备注" name="">
+                <a-textarea :placeholder="'请输入审核备注'" v-model:value="remark"
+                    :auto-size="{ minRows: 2, maxRows: 5 }"></a-textarea>
+            </a-form-item>
+
+        </a-card>
+    </a-modal>
+    <a-modal v-model:open="imgOpen" :title="'图片/视频'" @ok="imgOpen = false">
+        <a-card class="mb-8-2">
+            <a-form-item :label="'图片'" name="images">
+                <template v-if="currentInfo.images && currentInfo.images.length > 0">
+                    <a-image-preview-group>
+                        <a-image v-for="item in currentInfo.images" :width="200"
+                            :src="config('http.apiBasic') + item" />
+                    </a-image-preview-group>
+                </template>
+                <template v-else>暂无</template>
+
+            </a-form-item>
+            <a-form-item label="视频" name="video">
+                <template v-if="currentInfo.videos && currentInfo.videos.length > 0">
+                    <video width="320" height="240" controls>
+                        <source v-for="item in currentInfo.videos" :src="config('http.apiBasic') + item">
+                    </video>
+                </template>
+                <template>暂无</template>
+            </a-form-item>
+        </a-card>
+    </a-modal>
+</template>
+
+<script setup>
+import { message, Modal } from 'ant-design-vue'
+import { ref } from 'vue'
+import apis from '@/apis'
+import { config } from '@/config'
+import { usePagination } from '@/hooks'
+import dayjs from 'dayjs'
+// import EditDialog from './components/EditDialog.vue'
+import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
+import { useI18n } from 'vue-i18n'
+import { orderStatus } from '@/enums/index.js'
+import { status } from 'nprogress'
+defineOptions({
+    name: 'orderList',
+})
+const { t } = useI18n() // 解构出t方法
+const columns = [
+    { title: '用户名', dataIndex: 'name' },
+    { title: '身份证号', dataIndex: 'iDCard' },
+    { title: '联系电话', dataIndex: 'phone' },
+    { title: '联系地址', dataIndex: 'address', width: 300 },
+    { title: '报名时间', dataIndex: 'createdAt', width: 300 },
+
+]
+const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination()
+const remark = ref('')
+const currentInfo = ref({})
+const auditStatus = ref(2)
+const editDialogRef = ref()
+const open = ref(false)
+const imgOpen = ref(false)
+const activityList = ref([])
+
+getPageList()
+getActiveList()
+/**
+ * 获取活动报名列表
+ * @returns {Promise<void>}
+ */
+async function getPageList() {
+    try {
+        showLoading()
+        const { pageSize, current } = paginationState
+        const { success, data, total } = await apis.vote
+            .getElectionList({
+                pageSize,
+                current: current,
+                ...searchFormData.value,
+            })
+            .catch(() => {
+                throw new Error()
+            })
+        hideLoading()
+        if (config('http.code.success') === success) {
+            listData.value = data.map(item => ({
+                ...item,
+                key: item.value,
+            }))
+            paginationState.total = total
+        }
+    } catch (error) {
+        hideLoading()
+    }
+}
+// 获取活动列表
+async function getActiveList() {
+    try {
+        showLoading()
+        const { success, data } = await apis.activity
+            .getProjectList({
+                pageSize: 99,
+                current: 1,
+            })
+            .catch(() => {
+                throw new Error()
+            })
+        hideLoading()
+        if (config('http.code.success') === success) {
+            activityList.value = data.map(item => ({ id: item.id, title: item.title }))
+        }
+    } catch (error) {
+        hideLoading()
+    }
+}
+/**
+ * 下载文件
+ */
+async function handleExport() {
+    try {
+        const response = await apis.vote.exportFile()
+        console.log(response)
+        const url = window.URL.createObjectURL(new Blob([response]))
+        const link = document.createElement('a')
+        link.href = url
+        link.setAttribute('download', '报名表.xlsx') // 设置下载文件名
+        document.body.appendChild(link)
+        link.click()
+        document.body.removeChild(link)
+        window.URL.revokeObjectURL(url)
+    } catch (error) {
+        message.error('导出失败：' + (error.message || '未知错误'))
+        console.error('导出文件出错:', error)
+    }
+}
+const handleClick = async () => {
+    try {
+        const params = {
+            ...currentInfo.value,
+            status: auditStatus.value,
+            remark: remark.value
+        }
+        const result = await apis.orderList.updateMenu(currentInfo.value.id, params).catch(() => {
+            throw new Error(error)
+        })
+        if (config('http.code.success') === result?.success) {
+            message.success('已审核')
+            open.value = false
+            getPageList()
+        }
+    } catch (error) {
+        message.error({ content: error.message })
+        hideLoading()
+    }
+}
+/**
+ * 删除
+ */
+function handleDelete(value) {
+    Modal.confirm({
+        title: '确定撤销该工单吗',
+        content: t('button.confirm'),
+        okText: t('button.confirm'),
+        onOk: () => {
+            return new Promise((resolve, reject) => {
+                ; (async () => {
+                    try {
+                        const params = {
+                            ...value,
+                            status: 98
+                        }
+                        console.log(params)
+                        const { success } = await apis.orderList.updateMenu(value.id, params).catch(() => {
+                            throw new Error()
+                        })
+                        if (config('http.code.success') === success) {
+                            resolve()
+                            message.success('撤销成功')
+                            await getPageList()
+                        }
+                    } catch (error) {
+                        reject()
+                    }
+                })()
+            })
+        },
+    })
+}
+
+/**
+ * 分页
+ */
+function onTableChange({ current, pageSize }) {
+    paginationState.current = current
+    paginationState.pageSize = pageSize
+    getPageList()
+}
+
+/**
+ * 搜索
+ */
+function handleSearch() {
+    resetPagination()
+    getPageList()
+}
+/**
+ * 重置
+ */
+function handleResetSearch() {
+    searchFormData.value = {}
+    resetPagination()
+    getPageList()
+}
+/**
+ * 编辑完成
+ */
+async function onOk() {
+    await getPageList()
+}
+</script>
+
+<style lang="less" scoped></style>

From f72a65b86d7ff6537e41307f9644fcdff7b4be1c Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Fri, 19 Sep 2025 18:18:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/mettingMgt/mettingYuYue/index.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/pages/mettingMgt/mettingYuYue/index.vue b/src/views/pages/mettingMgt/mettingYuYue/index.vue
index 294b2e8..9a648b2 100644
--- a/src/views/pages/mettingMgt/mettingYuYue/index.vue
+++ b/src/views/pages/mettingMgt/mettingYuYue/index.vue
@@ -50,7 +50,10 @@
                         <template v-if="'applyTheme' === column.dataIndex">
                             <span>{{ applyThemeMap[record.applyTheme] || '未知' }}</span>
                         </template>
-
+                        <template v-if="'userName' === column.dataIndex">
+                            <span v-if="record.applyType === 2">{{ record.userName}}</span>
+                            <span v-if="record.applyType === 1">{{ record.companyName}}</span>
+                        </template>
                         <template v-if="column.dataIndex === 'applySign'">
                             <a-image :width="60"
                                 :src="record.applySign ? config('http.apiBasic') + record.applySign : errImg" />
@@ -63,8 +66,8 @@
                             <span v-else>无</span>
                         </template>
                         <template v-if="column.dataIndex === 'applyPdf'">
-                            <a v-if="record.applyPdf" target="_blank"
-                                :href="config('http.apiBasic') + record.applyPdf" rel="noopener noreferrer">
+                            <a v-if="record.applyPdf" target="_blank" :href="config('http.apiBasic') + record.applyPdf"
+                                rel="noopener noreferrer">
                                 查看申请报表
                             </a>
                             <span v-else>无</span>