From 5a38d92edf475b958c6e759f6a11aa982bbff59f Mon Sep 17 00:00:00 2001 From: AaronWu <2463371514@qq.com> Date: Tue, 6 May 2025 17:28:17 +0800 Subject: [PATCH] fix: bug fix commit --- .env.development | 4 +- src/locales/lang/en-US/routes/question.ts | 1 + src/locales/lang/zh-CN/routes/question.ts | 1 + src/router/staticModules/question.ts | 11 +++ src/views/client/knowledgeBase/index.vue | 11 ++- src/views/question/issue/formSchemas.tsx | 85 +++++++++++------------ src/views/question/issue/index.vue | 44 ++++++------ src/views/question/knowledge/detail.vue | 43 +----------- src/views/question/knowledge/index.vue | 2 +- 9 files changed, 90 insertions(+), 112 deletions(-) diff --git a/.env.development b/.env.development index e91eb5c..3cd8bf0 100644 --- a/.env.development +++ b/.env.development @@ -9,8 +9,8 @@ # 只在开发模式中被载入 # 网站前缀 -VITE_BASE_API_URL = http://192.168.2.217:8089/server/ -# VITE_BASE_API_URL = http://43.137.2.78:8085/server/ +# VITE_BASE_API_URL = http://192.168.2.217:8089/server/ +VITE_BASE_API_URL = http://43.137.2.78:8085/server/ # base api VITE_BASE_API = '/server/' diff --git a/src/locales/lang/en-US/routes/question.ts b/src/locales/lang/en-US/routes/question.ts index b9a54f8..0d5e49f 100644 --- a/src/locales/lang/en-US/routes/question.ts +++ b/src/locales/lang/en-US/routes/question.ts @@ -11,4 +11,5 @@ export default { issue: 'Issue', issueDetail: 'Issue Detail', knowledge: 'Knowledge Base', + knowledgeDetail: 'Knowledge Base Detail', }; diff --git a/src/locales/lang/zh-CN/routes/question.ts b/src/locales/lang/zh-CN/routes/question.ts index a97634b..b23c0b7 100644 --- a/src/locales/lang/zh-CN/routes/question.ts +++ b/src/locales/lang/zh-CN/routes/question.ts @@ -11,4 +11,5 @@ export default { issue: '工单管理', issueDetail: '工单详情', knowledge: '知识库', + knowledgeDetail: '知识库详情', }; diff --git a/src/router/staticModules/question.ts b/src/router/staticModules/question.ts index ed6bf28..1a87d15 100644 --- a/src/router/staticModules/question.ts +++ b/src/router/staticModules/question.ts @@ -48,6 +48,17 @@ const routes: Array = [ component: () => import(/* webpackChunkName: "question-knowledge" */ '@/views/question/knowledge/index.vue'), }, + { + path: 'knowledgeDetail', + name: `${moduleName}-knowledgeDetail`, + meta: { + title: t('routes.question.knowledgeDetail'), + icon: 'icon-icon_shiyongwendang', + hideInMenu: true, + }, + component: () => + import(/* webpackChunkName: "question-knowledge" */ '@/views/question/knowledge/detail.vue'), + }, ], }, ]; diff --git a/src/views/client/knowledgeBase/index.vue b/src/views/client/knowledgeBase/index.vue index 7b3f038..e20c5c9 100644 --- a/src/views/client/knowledgeBase/index.vue +++ b/src/views/client/knowledgeBase/index.vue @@ -41,9 +41,9 @@

{{ curRowDetail.title }}

- 更新时间：2024-01-09 + 更新时间：{{ curRowDetail.createTime }} | - 阅读：123 + 阅读：123
@@ -85,6 +85,11 @@ } from '@ant-design/icons-vue'; import { fetchKnowledgeBaseList, findOneById } from '@/api/knowledgeBase'; import { useRoute, useRouter } from 'vue-router'; + import { useUserStore } from '@/store/modules/user'; + + const userStore = useUserStore(); + + const isAdmin = userStore.userInfo.isAdmin; const router = useRouter(); const route = useRoute(); @@ -99,10 +104,12 @@ title: string; tags: string; solution: string; + createTime: string; }>({ title: '', tags: '', solution: '', + createTime: '', }); const goBack = () => { diff --git a/src/views/question/issue/formSchemas.tsx b/src/views/question/issue/formSchemas.tsx index 8baaa6e..a9b3f2d 100644 --- a/src/views/question/issue/formSchemas.tsx +++ b/src/views/question/issue/formSchemas.tsx @@ -62,6 +62,47 @@ export const getEditFormSchema: ( }, rules: [{ required: true, type: 'array' }], }, + { + field: 'contacts', + component: 'Input', + label: '联系人', + colProps: { + span: 8, + }, + rules: [{ required: true, type: 'string' }], + }, + { + field: 'contactsMobile', + component: 'Input', + label: '手机号', + colProps: { + span: 8, + }, + rules: [ + { + required: true, + message: '请输入正确格式的电话号码', + pattern: + /^(1(3[0-9]|4[01456879]|5[0-3,5-9]|6[2567]|7[0-8]|8[0-9]|9[0-3,5-9])\d{8})$|^0\d{2,3}-?\d{7,8}$/, + }, + ], + }, + + { + field: 'contactsEmail', + component: 'Input', + label: '邮箱', + colProps: { + span: 8, + }, + rules: [ + { + required: true, + message: '请输入正确格式的邮箱', + pattern: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, + }, + ], + }, { field: 'customer', @@ -138,47 +179,6 @@ export const getEditFormSchema: ( }, }, - { - field: 'contacts', - component: 'Input', - label: '联系人', - colProps: { - span: 8, - }, - rules: [{ required: true, type: 'string' }], - }, - { - field: 'contactsEmail', - component: 'Input', - label: '邮箱', - colProps: { - span: 8, - }, - rules: [ - { - required: true, - message: '请输入正确格式的邮箱', - pattern: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, - }, - ], - }, - { - field: 'contactsMobile', - component: 'Input', - label: '手机号', - colProps: { - span: 8, - }, - rules: [ - { - required: true, - message: '请输入正确格式的电话号码', - pattern: - /^(1(3[0-9]|4[01456879]|5[0-3,5-9]|6[2567]|7[0-8]|8[0-9]|9[0-3,5-9])\d{8})$|^0\d{2,3}-?\d{7,8}$/, - }, - ], - }, - { field: 'agent', component: 'Input', @@ -195,7 +195,6 @@ export const getEditFormSchema: ( colProps: { span: 6, }, - }, { field: 'zentaoNos', @@ -244,7 +243,7 @@ export const getEditFormSchema: ( rows: 4, placeholder: '请输入问题描述', showCount: true, - maxlength: 150, + maxlength: 200, }, label: '问题描述', colProps: { diff --git a/src/views/question/issue/index.vue b/src/views/question/issue/index.vue index 0fcc688..a5c15ce 100644 --- a/src/views/question/issue/index.vue +++ b/src/views/question/issue/index.vue @@ -57,6 +57,7 @@ :mask-closable="false" :destroyOnClose="true" :getContainer="() => issueContainerRef" + :forceRender="true" >