From da468db98b5b12112b3b08179016965f04ff6713 Mon Sep 17 00:00:00 2001 From: raofuzi <2641346316@qq.com> Date: Mon, 1 Apr 2024 10:37:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 3 --- src/views/home/aside/Aside.vue | 4 +-- .../home/aside/comp/items/IzCustomlevel.vue | 27 ++++++++++++++----- .../home/aside/comp/items/IzCustomname.vue | 25 ++++++++++++----- .../home/aside/comp/items/IzCustomtype.vue | 25 ++++++++++++----- .../home/aside/comp/items/IzCustomtypes.vue | 25 ++++++++++++----- src/views/home/aside/comp/items/IzProduct.vue | 25 ++++++++++++----- src/views/home/aside/comp/items/IzProject.vue | 25 ++++++++++++----- .../home/aside/comp/items/IzProjecttype.vue | 26 ++++++++++++------ src/views/home/aside/comp/items/IzSearch.vue | 25 ++++++++++++----- .../home/aside/comp/items/IzSearchManager.vue | 25 ++++++++++++----- src/views/home/aside/comp/items/IzShow.vue | 25 ++++++++++++----- src/views/home/aside/comp/items/IzStatus.vue | 25 ++++++++++++----- .../home/aside/comp/items/IzVisitcity.vue | 25 ++++++++++++----- src/views/home/aside/comp/items/Izfiled17.vue | 25 ++++++++++++----- src/views/home/aside/comp/items/Izfiled2.vue | 25 ++++++++++++----- src/views/home/aside/comp/items/Izfiled3.vue | 26 +++++++++++++----- src/views/home/aside/comp/items/Izfiled6.vue | 25 ++++++++++++----- src/views/home/aside/comp/items/Izfirm.vue | 25 ++++++++++++----- .../home/aside/comp/items/Iztaskrrom.vue | 25 ++++++++++++----- .../home/aside/comp/items/Iztaskstatus.vue | 25 ++++++++++++----- .../home/aside/comp/items/Izvisitpro.vue | 25 ++++++++++++----- src/views/home/aside/comp/items/Plan.vue | 27 +++++++++++++------ .../home/aside/comp/items/ReportUser.vue | 10 +++---- .../home/aside/comp/items/Similarity.vue | 13 ++++++++- src/views/home/aside/comp/items/Time.vue | 19 +++++++------ 26 files changed, 412 insertions(+), 168 deletions(-) diff --git a/components.d.ts b/components.d.ts index f08bf82..d6fb45b 100644 --- a/components.d.ts +++ b/components.d.ts @@ -22,12 +22,10 @@ declare module 'vue' { NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] NEllipsis: typeof import('naive-ui')['NEllipsis'] - NEllipsis: typeof import('naive-ui')['NEllipsis'] NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] NGi: typeof import('naive-ui')['NGi'] - NGi: typeof import('naive-ui')['NGi'] NGrid: typeof import('naive-ui')['NGrid'] NGridItem: typeof import('naive-ui')['NGridItem'] NImage: typeof import('naive-ui')['NImage'] @@ -37,7 +35,6 @@ declare module 'vue' { NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] NPopconfirm: typeof import('naive-ui')['NPopconfirm'] - NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] NPopselect: typeof import('naive-ui')['NPopselect'] NProgress: typeof import('naive-ui')['NProgress'] diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index f900d17..c21fd47 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -106,7 +106,7 @@ configStore.$subscribe(() => { Object.keys(customObjRef.value).map(key => { if(asideMap.hasOwnProperty(key)) { const str = key.toLowerCase() - console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]); + // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]); if(str == "izsimilarity" && typeof customObjRef.value[str] == "string") { customObjRef.value[str] = customObjRef.value[str].split(','); asideValue[key] = customObjRef.value[str];// 赋值 @@ -123,7 +123,7 @@ configStore.$subscribe(() => { console.log("list222222", list); asideValue[key] = customObjRef.value[str];// 赋值 }else { - asideValue[key] = ""; + asideValue[key] = null; } // asideMap[str].defaultValue = customObjRef.value[str];// 赋值 } diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue index 9b61489..9e909df 100644 --- a/src/views/home/aside/comp/items/IzCustomlevel.vue +++ b/src/views/home/aside/comp/items/IzCustomlevel.vue @@ -2,6 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' + +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izcustomlevel']) { + let list = asideValue['izcustomlevel'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izcustomlevel", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null @@ -16,6 +30,12 @@ const formValue = ref({ plans: props.value, }) +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} +console.log("formValue.value.izcustomlevel22222", formValue.value.plans); + const rules: FormRules = { plans: [ { @@ -31,12 +51,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzcustomlevelList() options.value = list diff --git a/src/views/home/aside/comp/items/IzCustomname.vue b/src/views/home/aside/comp/items/IzCustomname.vue index 746c480..4145b71 100644 --- a/src/views/home/aside/comp/items/IzCustomname.vue +++ b/src/views/home/aside/comp/items/IzCustomname.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izcustomname']) { + let list = asideValue['izcustomname'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izcustomname", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchizcustomnameList() options.value = list diff --git a/src/views/home/aside/comp/items/IzCustomtype.vue b/src/views/home/aside/comp/items/IzCustomtype.vue index 3eee2c3..993cf5f 100644 --- a/src/views/home/aside/comp/items/IzCustomtype.vue +++ b/src/views/home/aside/comp/items/IzCustomtype.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izcustomtype']) { + let list = asideValue['izcustomtype'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izcustomtype", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzCustomtypeList() options.value = list diff --git a/src/views/home/aside/comp/items/IzCustomtypes.vue b/src/views/home/aside/comp/items/IzCustomtypes.vue index fd8ab6c..607c6e6 100644 --- a/src/views/home/aside/comp/items/IzCustomtypes.vue +++ b/src/views/home/aside/comp/items/IzCustomtypes.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izcustomtypes']) { + let list = asideValue['izcustomtypes'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izcustomtypes", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -37,12 +53,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzCustomtypeList() options.value = list diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue index f508b90..6beb0e2 100644 --- a/src/views/home/aside/comp/items/IzProduct.vue +++ b/src/views/home/aside/comp/items/IzProduct.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izproduct']) { + let list = asideValue['izproduct'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izproduct", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzproductnameList() options.value = list diff --git a/src/views/home/aside/comp/items/IzProject.vue b/src/views/home/aside/comp/items/IzProject.vue index 43e26c1..34306d4 100644 --- a/src/views/home/aside/comp/items/IzProject.vue +++ b/src/views/home/aside/comp/items/IzProject.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izproject']) { + let list = asideValue['izproject'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izproject", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -32,12 +48,7 @@ const labStyle = { fontWeight: 'bold', color: '#333333' } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzProjectList() options.value = list diff --git a/src/views/home/aside/comp/items/IzProjecttype.vue b/src/views/home/aside/comp/items/IzProjecttype.vue index 229317a..08f9dd3 100644 --- a/src/views/home/aside/comp/items/IzProjecttype.vue +++ b/src/views/home/aside/comp/items/IzProjecttype.vue @@ -3,7 +3,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' import { onUpdated } from 'vue'; +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izprojecttype']) { + let list = asideValue['izprojecttype'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izprojecttype", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -16,7 +29,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -32,13 +48,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - console.log("formValue.value.plans", formValue.value.plans); - } -}) + onBeforeMount(async () => { const list = await configStore.fetchizizprojecttypeList() options.value = list diff --git a/src/views/home/aside/comp/items/IzSearch.vue b/src/views/home/aside/comp/items/IzSearch.vue index f2cb276..092c794 100644 --- a/src/views/home/aside/comp/items/IzSearch.vue +++ b/src/views/home/aside/comp/items/IzSearch.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izsearch']) { + let list = asideValue['izsearch'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izsearch", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -37,12 +53,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzSearchList() options.value = list diff --git a/src/views/home/aside/comp/items/IzSearchManager.vue b/src/views/home/aside/comp/items/IzSearchManager.vue index aee80bf..5684982 100644 --- a/src/views/home/aside/comp/items/IzSearchManager.vue +++ b/src/views/home/aside/comp/items/IzSearchManager.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izsearchmanager']) { + let list = asideValue['izsearchmanager'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izsearchmanager", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -37,12 +53,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzsSearchManagerList() options.value = list diff --git a/src/views/home/aside/comp/items/IzShow.vue b/src/views/home/aside/comp/items/IzShow.vue index 04f6044..78069f3 100644 --- a/src/views/home/aside/comp/items/IzShow.vue +++ b/src/views/home/aside/comp/items/IzShow.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izshow']) { + let list = asideValue['izshow'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izshow", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzShowList() options.value = list diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue index 143c089..3b50147 100644 --- a/src/views/home/aside/comp/items/IzStatus.vue +++ b/src/views/home/aside/comp/items/IzStatus.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izstatus']) { + let list = asideValue['izstatus'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izstatus", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchizstatusListt() options.value = list diff --git a/src/views/home/aside/comp/items/IzVisitcity.vue b/src/views/home/aside/comp/items/IzVisitcity.vue index db026b7..16ac3f3 100644 --- a/src/views/home/aside/comp/items/IzVisitcity.vue +++ b/src/views/home/aside/comp/items/IzVisitcity.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izvisitcity']) { + let list = asideValue['izvisitcity'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izvisitcity", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchizvisitcityList() options.value = list diff --git a/src/views/home/aside/comp/items/Izfiled17.vue b/src/views/home/aside/comp/items/Izfiled17.vue index 8205625..f8c216a 100644 --- a/src/views/home/aside/comp/items/Izfiled17.vue +++ b/src/views/home/aside/comp/items/Izfiled17.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izfiled17']) { + let list = asideValue['izfiled17'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izfiled17", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -37,12 +53,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzfiled17List() options.value = list diff --git a/src/views/home/aside/comp/items/Izfiled2.vue b/src/views/home/aside/comp/items/Izfiled2.vue index e3117b5..8016f07 100644 --- a/src/views/home/aside/comp/items/Izfiled2.vue +++ b/src/views/home/aside/comp/items/Izfiled2.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izfiled2']) { + let list = asideValue['izfiled2'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izfiled2", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -37,12 +53,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzfiled2List() options.value = list diff --git a/src/views/home/aside/comp/items/Izfiled3.vue b/src/views/home/aside/comp/items/Izfiled3.vue index e850731..aa98ce9 100644 --- a/src/views/home/aside/comp/items/Izfiled3.vue +++ b/src/views/home/aside/comp/items/Izfiled3.vue @@ -2,7 +2,21 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + console.log("asideValue", asideValue); + if(asideValue['izfiled3']) { + let list = asideValue['izfiled3'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izfiled3", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +29,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -37,12 +54,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzfiled2List() options.value = list diff --git a/src/views/home/aside/comp/items/Izfiled6.vue b/src/views/home/aside/comp/items/Izfiled6.vue index fb49822..3d7cbd5 100644 --- a/src/views/home/aside/comp/items/Izfiled6.vue +++ b/src/views/home/aside/comp/items/Izfiled6.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izfiled6']) { + let list = asideValue['izfiled6'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izfiled6", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -37,12 +53,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzfiled6List() options.value = list diff --git a/src/views/home/aside/comp/items/Izfirm.vue b/src/views/home/aside/comp/items/Izfirm.vue index d2b7e05..d9afb15 100644 --- a/src/views/home/aside/comp/items/Izfirm.vue +++ b/src/views/home/aside/comp/items/Izfirm.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izfirm']) { + let list = asideValue['izfirm'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izfirm", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzfirmList() options.value = list diff --git a/src/views/home/aside/comp/items/Iztaskrrom.vue b/src/views/home/aside/comp/items/Iztaskrrom.vue index 0848430..988504a 100644 --- a/src/views/home/aside/comp/items/Iztaskrrom.vue +++ b/src/views/home/aside/comp/items/Iztaskrrom.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import { type FormItemRule, type FormRules, faIR } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['iztaskrrom']) { + let list = asideValue['iztaskrrom'].split(','); + formValue.value.plans = list; + console.log("formValue.value.iztaskrrom", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIztaskrromList() options.value = list diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue index 35f648e..e4ec175 100644 --- a/src/views/home/aside/comp/items/Iztaskstatus.vue +++ b/src/views/home/aside/comp/items/Iztaskstatus.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['iztaskstatus']) { + let list = asideValue['iztaskstatus'].split(','); + formValue.value.plans = list; + console.log("formValue.value.iztaskstatus", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIztaskstatusList() options.value = list diff --git a/src/views/home/aside/comp/items/Izvisitpro.vue b/src/views/home/aside/comp/items/Izvisitpro.vue index 28467f2..e8b1a46 100644 --- a/src/views/home/aside/comp/items/Izvisitpro.vue +++ b/src/views/home/aside/comp/items/Izvisitpro.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izvisitpro']) { + let list = asideValue['izvisitpro'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izvisitpro", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -15,7 +28,10 @@ const emit = defineEmits<{ const formValue = ref({ plans: props.value, }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const list = await configStore.fetchIzvisitproList() options.value = list diff --git a/src/views/home/aside/comp/items/Plan.vue b/src/views/home/aside/comp/items/Plan.vue index 3ad2fb6..944cf8b 100644 --- a/src/views/home/aside/comp/items/Plan.vue +++ b/src/views/home/aside/comp/items/Plan.vue @@ -2,7 +2,20 @@ import { onBeforeMount, onMounted, ref } from 'vue' import type { FormItemRule, FormRules } from 'naive-ui' import { useDictionary } from '@/store/modules/dictonary' +import { useConfig } from '@/store/modules/asideConfig' +const configUseStore = useConfig() + +configUseStore.$subscribe(() => { + let asideValue = configUseStore.getAsideValue; + if(asideValue['izplan']) { + let list = asideValue['izplan'].split(','); + formValue.value.plans = list; + console.log("formValue.value.izplan", formValue.value.plans); + }else { + formValue.value.plans = []; + } +}); const props = defineProps<{ value: string[] | null label: string @@ -13,9 +26,12 @@ const emit = defineEmits<{ }>() const formValue = ref({ - plans: props.value, + plans: props.value || [], }) - +if(typeof formValue.value.plans == "string") { + let list = formValue.value.plans.split(','); + formValue.value.plans = list; +} const rules: FormRules = { plans: [ { @@ -31,12 +47,7 @@ const configStore = useDictionary() const labStyle = { fontWeight: 'bold', } -onMounted(() => { - if(props.value) { - let list = props.value.split(','); - formValue.value.plans = list; - } -}) + onBeforeMount(async () => { const planList = await configStore.fetchPlanList() planOptons.value = planList diff --git a/src/views/home/aside/comp/items/ReportUser.vue b/src/views/home/aside/comp/items/ReportUser.vue index 0bf6f6e..7588591 100644 --- a/src/views/home/aside/comp/items/ReportUser.vue +++ b/src/views/home/aside/comp/items/ReportUser.vue @@ -10,11 +10,9 @@ configUseStore.$subscribe(() => { let asideValue = configUseStore.getAsideValue; console.log("asideValue", asideValue); if(asideValue['izupuser']) { - setTimeout(() => { - let list = asideValue['izupuser'].split(','); - formValue.value.users = list; - console.log("formValue.value.users1111111111", formValue.value.users); - }, 1000); + let list = asideValue['izupuser'].split(','); + formValue.value.users = list; + console.log("formValue.value.users1111111111", formValue.value.users); }else { formValue.value.users = []; } @@ -30,7 +28,7 @@ const emit = defineEmits<{ }>() const formValue = ref({ - users: props.value, + users: props.value || [], }) if(typeof formValue.value.users == "string") { let list = formValue.value.users.split(','); diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue index d94c5ae..05e24e3 100644 --- a/src/views/home/aside/comp/items/Similarity.vue +++ b/src/views/home/aside/comp/items/Similarity.vue @@ -1,6 +1,17 @@