Leo_Ding/JinShan_admin
1
0
Fork 0
generated from Leo_Ding/web-template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.guxuan.icu/Leo_Ding/JinShan_admin

Browse Source
This commit is contained in:
qiuyuan 2025-12-22 14:39:10 +08:00
commit 96999caa3b
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.prod
View File

@ -4,7 +4,7 @@ NODE_ENV=production
# app # app
VITE_TITLE=JinShan-Admin VITE_TITLE=JinShan-Admin
VITE_PUBLIC_PATH=/ VITE_PUBLIC_PATH=/
VITE_OUT_DIR=dist VITE_OUT_DIR=index
VITE_PERMISSION=true VITE_PERMISSION=true
# router # router

1
.gitignore vendored
View File

@ -9,6 +9,7 @@ lerna-debug.log*
node_modules node_modules
dist dist
index
dist-ssr dist-ssr
*.local *.local
*/.vitepress/cache/**/* */.vitepress/cache/**/*

2
src/locales/lang/zh-CN/menu.js
View File

@ -52,5 +52,5 @@ export default {
aiHelper:'AI助手', aiHelper:'AI助手',
abbreviation:'活动报名', abbreviation:'活动报名',
orderArea:'工单区域管理', orderArea:'工单区域管理',
vote:'信息登记' vote:'信息登记',
} }

6
src/router/routes/pages.js
View File

@ -249,16 +249,16 @@ export default [
permission: '*', permission: '*',
}, },
}, },
{ {
path: 'vote/index', path: 'vote/index',
name: 'vote', name: 'vote',
component: 'pages/vote/index.vue', component: 'pages/vote/index.vue',
meta: { meta: {
icon: 'icon-huodongliebiao-copy', icon: 'icon-yonghu',
title: '信息登记', title: '信息登记',
isMenu: true, isMenu: true,
keepAlive: true, keepAlive: true,
permission: '*', permission: '*',
}, },
} },
] ]

9
src/views/pages/mettingMgt/mettingYuYue/index.vue
View File

@ -50,7 +50,10 @@
<template v-if="'applyTheme' === column.dataIndex"> <template v-if="'applyTheme' === column.dataIndex">
<span>{{ applyThemeMap[record.applyTheme] || '未知' }}</span> <span>{{ applyThemeMap[record.applyTheme] || '未知' }}</span>
</template> </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'"> <template v-if="column.dataIndex === 'applySign'">
<a-image :width="60" <a-image :width="60"
:src="record.applySign ? config('http.apiBasic') + record.applySign : errImg" /> :src="record.applySign ? config('http.apiBasic') + record.applySign : errImg" />
@ -63,8 +66,8 @@
<span v-else>无</span> <span v-else>无</span>
</template> </template>
<template v-if="column.dataIndex === 'applyPdf'"> <template v-if="column.dataIndex === 'applyPdf'">
<a v-if="record.applyPdf" target="_blank" <a v-if="record.applyPdf" target="_blank" :href="config('http.apiBasic') + record.applyPdf"
:href="config('http.apiBasic') + record.applyPdf" rel="noopener noreferrer"> rel="noopener noreferrer">
查看申请报表 查看申请报表
</a> </a>
<span v-else>无</span> <span v-else>无</span>

4
src/views/pages/vote/index.vue
View File

@ -102,7 +102,7 @@ import apis from '@/apis'
import { config } from '@/config' import { config } from '@/config'
import { usePagination } from '@/hooks' import { usePagination } from '@/hooks'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import EditDialog from './components/EditDialog.vue' // import EditDialog from './components/EditDialog.vue'
import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue' import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { orderStatus } from '@/enums/index.js' import { orderStatus } from '@/enums/index.js'
@ -285,4 +285,4 @@ async function onOk() {
} }
</script> </script>
<style lang="less" scoped></style> <style lang="less" scoped></style>