diff --git a/.env.development b/.env.development index 1f0b776..e91eb5c 100644 --- a/.env.development +++ b/.env.development @@ -9,7 +9,7 @@ # 只在开发模式中被载入 # 网站前缀 -VITE_BASE_API_URL = http://192.168.2.92:8089/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 diff --git a/src/assets/icons/close.svg b/src/assets/icons/close.svg new file mode 100644 index 0000000..18c637a --- /dev/null +++ b/src/assets/icons/close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/enums/dictEnum.ts b/src/enums/dictEnum.ts index d0a6a9f..c415670 100644 --- a/src/enums/dictEnum.ts +++ b/src/enums/dictEnum.ts @@ -1,4 +1,4 @@ export enum DictEnum { QUESTION_TYPE = '问题属性', - TAG_TYPE = '标签', + TAG_TYPE = '功能模块', } diff --git a/src/views/client/issue/formSchemas.tsx b/src/views/client/issue/formSchemas.tsx index a323569..28f1dce 100644 --- a/src/views/client/issue/formSchemas.tsx +++ b/src/views/client/issue/formSchemas.tsx @@ -22,6 +22,9 @@ export const getEditFormSchema: ( field: 'billcode', component: 'Input', label: '问题号', + componentProps: { + placeholder: '自动生成', + }, dynamicDisabled: true, colProps: { span: 24, @@ -32,7 +35,7 @@ export const getEditFormSchema: ( component: 'Input', componentProps: { showCount: true, - maxlength: 150, + maxlength: 50, }, label: '问题标题', colProps: { diff --git a/src/views/client/issue/index.vue b/src/views/client/issue/index.vue index 76effa3..15ad03d 100644 --- a/src/views/client/issue/index.vue +++ b/src/views/client/issue/index.vue @@ -14,29 +14,31 @@ - - - + + + + - - + + @@ -77,9 +79,10 @@ ([]); const expandAll = ref(false); - + const loading = ref(false); // 树选择状态 const selectedKeys = ref([]); const quillEditor = ref | null>(null); @@ -372,6 +375,7 @@ const initTreeData = async () => { let tree: any[] = []; + loading.value = true; // 获取产品列表 const res = await fetchProdList({}); console.log('res: ', res); @@ -435,6 +439,8 @@ } treeData.value = tree; expandAll.value = true; + loading.value = false; + console.log('treeData.value: ', treeData.value); }; initTreeData(); diff --git a/src/views/question/issue/columns.tsx b/src/views/question/issue/columns.tsx index 2d69038..70296e3 100644 --- a/src/views/question/issue/columns.tsx +++ b/src/views/question/issue/columns.tsx @@ -22,6 +22,9 @@ export const baseColumns: TableColumnItem[] = [ formItemProps: { defaultValue: '', required: false, + colProps: { + span: 6, + }, }, }, { @@ -34,10 +37,13 @@ export const baseColumns: TableColumnItem[] = [ formItemProps: { defaultValue: '', required: false, + colProps: { + span: 6, + }, }, }, { - title: '标签', + title: '功能模块', align: 'center', dataIndex: 'tags', width: 200, @@ -70,6 +76,9 @@ export const baseColumns: TableColumnItem[] = [ formItemProps: { defaultValue: '', required: false, + colProps: { + span: 6, + }, }, }, { @@ -139,6 +148,9 @@ export const baseColumns: TableColumnItem[] = [ componentProps: { valueFormat: 'YYYY-MM-DD', }, + colProps: { + span: 6, + }, }, }, // state 问题状态 @@ -155,6 +167,9 @@ export const baseColumns: TableColumnItem[] = [ componentProps: { options: stateTypeList, }, + colProps: { + span: 6, + }, }, customRender: ({ record }) => { const { label, color } = stateTypeList.find((e) => e.value === record.state); diff --git a/src/views/question/issue/data.ts b/src/views/question/issue/data.ts index 2d8cc6f..4c3cefe 100644 --- a/src/views/question/issue/data.ts +++ b/src/views/question/issue/data.ts @@ -27,6 +27,12 @@ export const stateTypeList: any = [ { label: '已解决', value: 4, - color: '#f50', + color: '#87d068', + }, + { + label: '关闭', + value: 5, + // 灰色 + color: '#d9d9d9', }, ]; diff --git a/src/views/question/issue/detail.vue b/src/views/question/issue/detail.vue index 38313b0..cf2fd5b 100644 --- a/src/views/question/issue/detail.vue +++ b/src/views/question/issue/detail.vue @@ -9,9 +9,9 @@ 修改时间: -->