From 06d7283f03075dde39b22dfd74e80f87114547f7 Mon Sep 17 00:00:00 2001 From: elseif Date: Sun, 17 Mar 2024 00:02:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E5=85=B8=EF=BC=8C=E8=B0=83=E6=95=B4=E8=BF=87=E6=BB=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dictionary/index.ts | 22 +- src/api/home/filter.ts | 3 +- src/assets/images/avatar.jpg | Bin 0 -> 25832 bytes src/config/1.json | 52 +++ src/config/aside.ts | 14 +- src/config/final.ts | 57 +++ src/store/modules/asideConfig.ts | 15 +- src/store/modules/dictonary.ts | 67 +-- src/store/modules/final.ts | 42 ++ src/store/modules/task.ts | 4 +- src/views/final/aside/Aside.vue | 62 ++- src/views/final/comp/CustomFilterModalVue.vue | 417 ++++++++++++++++++ src/views/final/comp/index.ts | 3 +- src/views/final/content/Content.vue | 2 +- src/views/home/aside/Aside.vue | 8 +- src/views/home/aside/comp/Search.vue | 3 +- .../aside/comp/modals/CustomFilterModal.vue | 19 +- src/views/home/content/Content.vue | 12 +- src/views/login/components/Forget.vue | 19 - src/views/login/components/Login.vue | 47 +- src/views/login/index.vue | 5 - src/views/login/index1.vue | 17 - src/views/task/aside/Aside.vue | 96 ++-- src/views/task/aside/TaskList.vue | 114 ++++- src/views/worksheet/aside/Aside.vue | 3 + src/views/worksheet/aside/WorkSheetList.vue | 2 +- types/api.d.ts | 7 + 27 files changed, 873 insertions(+), 239 deletions(-) create mode 100644 src/assets/images/avatar.jpg create mode 100644 src/config/1.json create mode 100644 src/store/modules/final.ts create mode 100644 src/views/final/comp/CustomFilterModalVue.vue diff --git a/src/api/dictionary/index.ts b/src/api/dictionary/index.ts index 91bfe28..73fae5e 100644 --- a/src/api/dictionary/index.ts +++ b/src/api/dictionary/index.ts @@ -1,5 +1,5 @@ import { http } from '@/utils/http/axios' -import type { PageParam } from '/#/api' +import type { BusinessParam, PageParam } from '/#/api' /** * 获取地区列表 @@ -315,3 +315,23 @@ export async function getBackList() { const list = res.data return list } + +/** + * 业务字典查询接口 + * @returns + */ +export async function getBusinessList(field: string, page: PageParam = { pageNo: 1, pageSize: 200 }) { + const res = await http.request({ + url: `/ocr/dictionary/getDictionaryByField`, + method: 'get', + params: { ...page, field }, + }) + + const { otherMessage: { records } } = res + return records.map((record) => { + return { + label: record.lable || 'todo', + value: record.value || 'todo', + } + }) +} diff --git a/src/api/home/filter.ts b/src/api/home/filter.ts index 7287f1b..6d072c0 100644 --- a/src/api/home/filter.ts +++ b/src/api/home/filter.ts @@ -65,10 +65,11 @@ export async function deleteCondition(params: { ids: string }) { * 获取设置为显示的筛选 * @returns */ -export async function getFilter(): Promise { +export async function getFilter(type: number): Promise { return http.request({ url: `/ocr/ocrSearchmanager/query`, method: 'get', + params: { type }, }) } diff --git a/src/assets/images/avatar.jpg b/src/assets/images/avatar.jpg new file mode 100644 index 0000000000000000000000000000000000000000..428ae6e69f87aeb478401d826246b3969f074759 GIT binary patch literal 25832 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 literal 0 HcmV?d00001 diff --git a/src/config/1.json b/src/config/1.json new file mode 100644 index 0000000..911d159 --- /dev/null +++ b/src/config/1.json @@ -0,0 +1,52 @@ +export const asideMap: Recordable = { + izupuser: { + label: '提报人', + defaultValue: null, + isDefaultFilter: true, + key: 'izupuser', + component: ReportUserVue, + }, + izproject: { + label: '所属项目', + defaultValue: null, + isDefaultFilter: true, + key: 'izproject', + component: IzProjectVue, + }, + izplan: { + label: '所属计划', + defaultValue: null, + isDefaultFilter: true, + key: 'izplan', + component: PlanVue, + }, + izstatus: { + label: '审批状态', + defaultValue: null, + isDefaultFilter: false, + key: 'izstatus', + component: PlanVue, // todo + }, + izuptime: { + label: '提报时间', + defaultValue: null, + isDefaultFilter: false, + key: 'izuptime', + component: TimeVue, + }, + iztaskrrom: { + label: '任务来源', + defaultValue: null, + isDefaultFilter: false, + key: 'iztaskrrom', + component: IztaskrromVue, + }, + izshowall: { + label: '显示全部任务数据', + defaultValue: true, + isDefaultFilter: false, + key: 'izshowall', + component: PictureDownloadVue, + inFilterList: false, + }, +} diff --git a/src/config/aside.ts b/src/config/aside.ts index 96d5bc2..257039f 100644 --- a/src/config/aside.ts +++ b/src/config/aside.ts @@ -42,13 +42,13 @@ export const asideMap: Recordable = { key: 'izplan', component: PlanVue, }, - // izsimilarity: { - // label: '相似度阈值', - // defaultValue: [0,100], - // isDefaultFilter: false, - // key: 'izsimilarity', - // component: SimilarityVue, - // }, + izsimilarity: { + label: '相似度阈值', + defaultValue: [0, 100], + isDefaultFilter: false, + key: 'izsimilarity', + component: SimilarityVue, + }, izyear: { label: '年份', defaultValue: null, diff --git a/src/config/final.ts b/src/config/final.ts index 4edf17d..e338520 100644 --- a/src/config/final.ts +++ b/src/config/final.ts @@ -1,3 +1,6 @@ +import type { AsideEntity } from './aside' +import { IzProjectVue, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items' + export interface RowData { id: string fromtaskname: string @@ -72,3 +75,57 @@ export function findKey(columns: any[], header: string) { const item = columns.find((column) => { return (column as any).title === header }) return (item as any).key } + +// 终审左侧配置 +export const asideMap: Recordable = { + izupuser: { + label: '提报人', + defaultValue: null, + isDefaultFilter: true, + key: 'izupuser', + component: ReportUserVue, + }, + izproject: { + label: '所属项目', + defaultValue: null, + isDefaultFilter: true, + key: 'izproject', + component: IzProjectVue, + }, + izplan: { + label: '所属计划', + defaultValue: null, + isDefaultFilter: true, + key: 'izplan', + component: PlanVue, + }, + izstatus: { + label: '审批状态', + defaultValue: null, + isDefaultFilter: false, + key: 'izstatus', + component: PlanVue, // todo + }, + izuptime: { + label: '提报时间', + defaultValue: null, + isDefaultFilter: false, + key: 'izuptime', + component: TimeVue, + }, + iztaskrrom: { + label: '任务来源', + defaultValue: null, + isDefaultFilter: false, + key: 'iztaskrrom', + component: IztaskrromVue, + }, + izshowall: { + label: '显示全部任务数据', + defaultValue: true, + isDefaultFilter: false, + key: 'izshowall', + component: PictureDownloadVue, + inFilterList: false, + }, +} diff --git a/src/store/modules/asideConfig.ts b/src/store/modules/asideConfig.ts index 90e765f..721eb2a 100644 --- a/src/store/modules/asideConfig.ts +++ b/src/store/modules/asideConfig.ts @@ -7,7 +7,7 @@ import type { AsideConfig } from '/#/api' export interface ConfigState { systemConfig: AsideConfig | null - customConfig: any + customConfig: string[] | null asideValue: any } @@ -22,7 +22,7 @@ export const useAsideConfigStore = defineStore({ getConfig(): AsideConfig | null { return this.systemConfig }, - getCustomConfig(): any { + getCustomConfig(): string[] | null { return this.customConfig }, getAsideValue(): any { @@ -33,9 +33,6 @@ export const useAsideConfigStore = defineStore({ setConfig(config: AsideConfig) { this.systemConfig = config }, - setCustomConfig(config: any) { - this.customConfig = config - }, setAsideValue(value) { this.asideValue = value }, @@ -47,9 +44,11 @@ export const useAsideConfigStore = defineStore({ }, // 获取个性化配置 async fetchCustomConfig() { - const response = await getFilter() - this.setCustomConfig(response.data) - return response.data + const res = await getFilter(0) + const { data } = res + const list = data && data.searchcount ? data.searchcount.split(',') : [] + this.customConfig = list + return list }, }, }) diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts index 391ec58..4a9a30d 100644 --- a/src/store/modules/dictonary.ts +++ b/src/store/modules/dictonary.ts @@ -1,6 +1,6 @@ import { defineStore } from 'pinia' import { store } from '@/store' -import { getBackList, getIzCustomtypeList, getIzProjectList, getIzShowList, getIzcustomlevel, getIzfirmList, getIzproductnameList, getIzprojecttypeList, getIztaskrromList, getIztaskstatusList, getIzvisitcityList, getIzvisitproList, getPersonList, getPictureTypeList, getPlanList, getRegionList, getRejectList, getTFList, getizcustomnameList } from '@/api/dictionary' +import { getBackList, getBusinessList, getIzShowList, getPictureTypeList, getRegionList, getRejectList, getTFList } from '@/api/dictionary' export interface DictionaryState { regionList: any @@ -112,14 +112,14 @@ export const useDictionaryStore = defineStore({ }, // 获取提报人列表 async fetchPersionList() { - const list = await getPersonList() - this.personList = generateOptions(list, 'id', 'upname') + const list = await getBusinessList('person') + this.personList = list return this.personList }, // 获取计划列表 async fetchPlanList() { - const list = await getPlanList() - this.planList = generateOptions(list, 'id', 'planname') + const list = await getBusinessList('plan') + this.planList = list return this.planList }, // 获取图片真假原因 @@ -134,59 +134,70 @@ export const useDictionaryStore = defineStore({ this.izShowList = generateOptions2(list, 'id', 'classname') return this.izShowList }, + // 所属项目 async fetchIzProjectList() { - const list = await getIzProjectList() - this.izProjectList = generateOptions(list, 'id', 'categoryname') + const list = await getBusinessList('project') + this.izProjectList = list return this.izProjectList }, + // 任务来源 async fetchIztaskrromList() { - const list = await getIztaskrromList('1') - this.izCustomtypeList = generateOptions(list) - return this.izCustomtypeList + const list = await getBusinessList('iztaskrrom') + this.iztaskrromList = list + return this.iztaskrromList }, + // 任务状态 async fetchIztaskstatusList() { - const list = await getIztaskstatusList('1') - this.iztaskstatusList = generateOptions(list) + const list = await getBusinessList('iztaskstatus') + this.iztaskstatusList = list return this.iztaskstatusList }, + // 地区(省信息) async fetchIzvisitproList() { - const list = await getIzvisitproList() - this.izvisitproList = generateOptions(list, 'id', 'proname') + const list = await getBusinessList('izvisitpro') + this.izvisitproList = list return this.izvisitproList }, + // 厂商 async fetchIzfirmList() { - const list = await getIzfirmList('1') - this.izfirmList = generateOptions(list) + const list = await getBusinessList('izfirm') + this.izfirmList = list return this.izfirmList }, + // 产品名称 async fetchIzproductnameList() { - const list = await getIzproductnameList('1') - this.izproductnameList = generateOptions(list) + const list = await getBusinessList('izproductname') + this.izproductnameList = list return this.izproductnameList }, + // 客户名称 async fetchizcustomnameList() { - const list = await getizcustomnameList('1') - this.izcustomnameList = generateOptions(list) + const list = await getBusinessList('izcustomname') + this.izcustomnameList = list return this.izcustomnameList }, + // 客户类型 async fetchIzCustomtypeList() { - const list = await getIzCustomtypeList() - this.izCustomtypeList = generateOptions(list) + const list = await getBusinessList('izcustomtype') + this.izCustomtypeList = list return this.izCustomtypeList }, + // 客户级别 async fetchIzcustomlevelList() { - const list = await getIzcustomlevel('1') - this.izcustomlevelList = generateOptions(list) + const list = await getBusinessList('izcustomlevel') + this.izcustomlevelList = list return this.izcustomlevelList }, + // 项目类别 async fetchizizprojecttypeList() { - const list = await getIzprojecttypeList('1') - this.izizprojecttypeList = generateOptions(list) + const list = await getBusinessList('izprojecttype') + this.izizprojecttypeList = list return this.izizprojecttypeList }, + // 发布地区 async fetchizvisitcityList() { - const list = await getIzvisitcityList() - this.izvisitcityList = generateOptions(list) + const list = await getBusinessList('izvisitcity') + this.izvisitcityList = list return this.izvisitcityList }, async fetchRejectList() { diff --git a/src/store/modules/final.ts b/src/store/modules/final.ts new file mode 100644 index 0000000..909ff65 --- /dev/null +++ b/src/store/modules/final.ts @@ -0,0 +1,42 @@ +import { defineStore } from 'pinia' +import { store } from '@/store' +import { getFilter } from '@/api/home/filter' + +export interface ConfigState { + customConfig: string[] | null + asideValue: any +} + +export const useFinalStore = defineStore({ + id: 'app-final', + state: (): ConfigState => ({ + customConfig: null, + asideValue: null, + }), + getters: { + getCustomConfig(): string[] | null { + return this.customConfig + }, + getAsideValue(): any { + return this.asideValue + }, + }, + actions: { + setAsideValue(value) { + this.asideValue = value + }, + // 获取终审个性化配置 + async fetchCustomConfig() { + const res = await getFilter(1) + const { data } = res + const list = data && data.searchcount ? data.searchcount.split(',') : [] + this.customConfig = list + return list + }, + }, +}) + +// Need to be used outside the setup +export function useFinal() { + return useFinalStore(store) +} diff --git a/src/store/modules/task.ts b/src/store/modules/task.ts index 26253d8..869f655 100644 --- a/src/store/modules/task.ts +++ b/src/store/modules/task.ts @@ -45,15 +45,15 @@ export const useTaskStore = defineStore({ }, async fetchApprovalList(pagination, id, refresh?: boolean) { const res = await getApprovalList(pagination, id) - this.setApprovalList(res.data) if (res.data.length > 0) { + this.setApprovalList(res.data) this.setActive(0) // 审批操作完成后，需要刷新，为防止activeId在刷新后值不变，通过此值刷新 this.refresh = !this.refresh } - return res.data + return res }, updateImmersion() { this.immersion = !this.immersion diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue index d4efaf5..70ae259 100644 --- a/src/views/final/aside/Aside.vue +++ b/src/views/final/aside/Aside.vue @@ -1,21 +1,21 @@ @@ -179,10 +179,6 @@ watch(asideValue, (newVal) => { v-model:value="asideValue[item.key]" :label="item.config.label" /> - - - - @@ -217,7 +213,7 @@ watch(asideValue, (newVal) => { height: 100%; background: #507afd; position: absolute; - right: 0; + right: -2px; top: 0; z-index: 18; } diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue new file mode 100644 index 0000000..1d8a67c --- /dev/null +++ b/src/views/final/comp/CustomFilterModalVue.vue @@ -0,0 +1,417 @@ + + + + + diff --git a/src/views/final/comp/index.ts b/src/views/final/comp/index.ts index b4cd4cb..26f47eb 100644 --- a/src/views/final/comp/index.ts +++ b/src/views/final/comp/index.ts @@ -4,5 +4,6 @@ import RepeatModal from './RepeatModal.vue' import RepeatTaskTableModal from './RepeatTaskTableModal.vue' import Action from './Action.vue' import RejectModal from './RejectModal.vue' +import CustomFilterModalVue from './CustomFilterModalVue.vue' -export { CustomTabelModal, ImportExcelModal, RepeatModal, RepeatTaskTableModal, Action, RejectModal } +export { CustomTabelModal, ImportExcelModal, RepeatModal, RepeatTaskTableModal, Action, RejectModal, CustomFilterModalVue } diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index 61e66a2..4cf33b9 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -454,7 +454,7 @@ function reload() {