-
|
通过 |
diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue
index e10429e..6340e5c 100644
--- a/src/layout/components/Header/UserSettings.vue
+++ b/src/layout/components/Header/UserSettings.vue
@@ -1,92 +1,92 @@
@@ -119,24 +119,28 @@ const options = computed(() => {
{{ currentCompanyName }}
-
+
AI设置开关
- 联系我们
+
+ 联系我们
+
- 退出登录
+
+ 退出登录
+
{{ option.label }}
diff --git a/src/layout/components/IconGroup/index.vue b/src/layout/components/IconGroup/index.vue
index a173c8f..50ae568 100644
--- a/src/layout/components/IconGroup/index.vue
+++ b/src/layout/components/IconGroup/index.vue
@@ -36,7 +36,7 @@ function getSvgName(item: MenuMixedOption) {
class="icon-button" :class="{ 'icon-button--selected': isSelect(item) }"
@click="handleClick(item)"
>
-
+
{{ item.title }}
diff --git a/src/layout/components/Menu/index.vue b/src/layout/components/Menu/index.vue
index 5126514..edf26a4 100644
--- a/src/layout/components/Menu/index.vue
+++ b/src/layout/components/Menu/index.vue
@@ -1,57 +1,57 @@
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 4165bfe..3ee76e2 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,17 +1,17 @@
diff --git a/src/main.ts b/src/main.ts
index a146104..8c166af 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,7 +16,7 @@ async function bootstrap() {
setupGlobalProperties(app)
setupRouter(app)
await router.isReady()
-const meta = document.createElement('meta')
+ const meta = document.createElement('meta')
meta.name = 'naive-ui-style'
document.head.appendChild(meta)
app.mount('#app', true)
diff --git a/src/router/modules/map.ts b/src/router/modules/map.ts
index 51dc66a..7bf6257 100644
--- a/src/router/modules/map.ts
+++ b/src/router/modules/map.ts
@@ -1,5 +1,5 @@
-import { Layout } from '@/router/constant'
import type { RouteRecordRaw } from 'vue-router'
+import { Layout } from '@/router/constant'
/**
* @param name 路由名称, 必须设置,且不能重名
@@ -36,7 +36,7 @@ const routes: Array = [
},
component: () => import('@/views/map/index.vue'),
},
-
+
],
},
]
diff --git a/src/store/modules/asideConfig.ts b/src/store/modules/asideConfig.ts
index 4fb75fb..7f61c64 100644
--- a/src/store/modules/asideConfig.ts
+++ b/src/store/modules/asideConfig.ts
@@ -21,7 +21,7 @@ export const useAsideConfigStore = defineStore({
systemConfig: null,
customConfig: null,
asideValue: null,
- searchValue: "",
+ searchValue: '',
isAllowDownload: true,
timeNum: 0,
filterConfig: [],
diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts
index e912b35..df74443 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, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizstatusList, getizApprovalStatusList } from '@/api/dictionary'
+import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizApprovalStatusList, getizstatusList } from '@/api/dictionary'
export interface DictionaryState {
regionList: any
@@ -104,32 +104,32 @@ export const useDictionaryStore = defineStore({
},
getizApprovalStatus: (state) => {
return state.izApprovalStatusList
- }
+ },
},
actions: {
- initData(){
+ initData() {
// this.fetchRegionList(); //废弃
- this.fetchPictureTypeList();
- this.fetchPersionList();
- this.fetchPlanList();
- this.fetchTFList();
+ this.fetchPictureTypeList()
+ this.fetchPersionList()
+ this.fetchPlanList()
+ this.fetchTFList()
// this.fetchIzShowList(); //废弃
- this.fetchIzProjectList();
- this.fetchIztaskrromList();
- this.fetchIztaskstatusList();
- this.fetchIzvisitproList();
- this.fetchIzfirmList();
- this.fetchIzproductnameList();
- this.fetchizcustomnameList();
- this.fetchIzCustomtypeList();
- this.fetchIzcustomlevelList();
- this.fetchizizprojecttypeList();
- this.fetchizvisitcityList();
- this.fetchRejectList();
- this.fetchBackList();
- this.fetchRelationTypeList();
- this.fetchizstatusListt();
- this.fetchizApprovalStatusList();
+ this.fetchIzProjectList()
+ this.fetchIztaskrromList()
+ this.fetchIztaskstatusList()
+ this.fetchIzvisitproList()
+ this.fetchIzfirmList()
+ this.fetchIzproductnameList()
+ this.fetchizcustomnameList()
+ this.fetchIzCustomtypeList()
+ this.fetchIzcustomlevelList()
+ this.fetchizizprojecttypeList()
+ this.fetchizvisitcityList()
+ this.fetchRejectList()
+ this.fetchBackList()
+ this.fetchRelationTypeList()
+ this.fetchizstatusListt()
+ this.fetchizApprovalStatusList()
},
settfList(config) {
this.tfList = config
diff --git a/src/store/modules/final.ts b/src/store/modules/final.ts
index e0b3ddb..49ee281 100644
--- a/src/store/modules/final.ts
+++ b/src/store/modules/final.ts
@@ -2,8 +2,8 @@ import { defineStore } from 'pinia'
import { store } from '@/store'
import { getFilter } from '@/api/home/filter'
import { getConfig } from '@/api/system/user'
-import { asideMap } from "@/config/final";
-import { cloneDeep, isEqual } from "lodash-es";
+import { asideMap } from '@/config/final'
+import { cloneDeep, isEqual } from 'lodash-es'
import type { AsideConfig } from '/#/api'
@@ -25,7 +25,7 @@ export const useFinalStore = defineStore({
customConfig: null,
asideValue: null,
listKey: 0,
- searchValue: "",
+ searchValue: '',
isAllowDownload: true,
timeNum: 0,
filterConfig: [],
@@ -56,7 +56,7 @@ export const useFinalStore = defineStore({
actions: {
setSystemConfig(config: AsideConfig) {
this.systemConfig = config
- console.log("systemConfig----------", config);
+ console.log('systemConfig----------', config)
},
setAsideValue(value) {
this.asideValue = value
@@ -86,21 +86,21 @@ export const useFinalStore = defineStore({
// console.log("response.data----------", response.data);
// this.setSystemConfig(response.data)
// return response.data
- let list: any = {};
- let tempAsideMap = cloneDeep(asideMap);
- Object.keys(tempAsideMap).map(key => {
- list[key] = "Y";
- });
- console.log("setSystemConfig---------------", list);
- this.setSystemConfig(list);
- return list
+ const list: any = {}
+ const tempAsideMap = cloneDeep(asideMap)
+ Object.keys(tempAsideMap).map((key) => {
+ list[key] = 'Y'
+ })
+ console.log('setSystemConfig---------------', list)
+ this.setSystemConfig(list)
+ return list
},
// // 获取终审个性化配置
async fetchCustomConfig() {
const res = await getFilter(1)
const { data } = res
- const list = data && data.searchcount ? data.searchcount.split(',') : [];
- console.log("listkey---------------", list);
+ const list = data && data.searchcount ? data.searchcount.split(',') : []
+ console.log('listkey---------------', list)
this.customConfig = list
return list
},
diff --git a/src/store/modules/task.ts b/src/store/modules/task.ts
index 658dccd..82909ce 100644
--- a/src/store/modules/task.ts
+++ b/src/store/modules/task.ts
@@ -12,7 +12,7 @@ export const useTaskStore = defineStore({
packageid: '',
immersion: false,
inFile: false, // 是否进入文件夹
- inFileId:"",
+ inFileId: '',
}),
getters: {
getActiveId: (state: TaskState) => state.activeId,
@@ -49,7 +49,7 @@ export const useTaskStore = defineStore({
back() {
if (this.currentIndex === 0)
return
-
+
this.setActive(--this.currentIndex)
},
async fetchApprovalList(pagination) {
diff --git a/src/store/modules/workOrder.ts b/src/store/modules/workOrder.ts
index a729454..e371169 100644
--- a/src/store/modules/workOrder.ts
+++ b/src/store/modules/workOrder.ts
@@ -28,7 +28,7 @@ export const useWorkOrderStore = defineStore({
this.currentIndex = index
const order = this.packageList[index]
this.activeId = orderId || order?.checkDuplicateId
- this.dataId = dataId || order.id;
+ this.dataId = dataId || order.id
},
forward() {
const len = this.packageList.length
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index e819c07..86a3dfc 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -201,7 +201,7 @@ const transform: AxiosTransform = {
// eslint-disable-next-line ts/no-use-before-define
const instance = http.getAxios()
const config = response.config
- const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token','/api/web/smslogin/login','/api/web/smslogin/sendcode','/api/ocr/sUser/selectSUser']
+ const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token', '/api/web/smslogin/login', '/api/web/smslogin/sendcode', '/api/ocr/sUser/selectSUser']
const expirationTime = storage.get(TOKEN_EXPIRATION_TIME)
// console.log('剩余失效时间(分):', (expirationTime - Date.now()) / 1000 / 60, config.url)
diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index 7a743c6..9bbe0e9 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -10,109 +10,110 @@ import {
shallowRef,
unref,
watch,
-} from "vue";
-import { CustomFilterModalVue, FilterModal, NewFilterModal } from "@/views/final/comp";
-import Search from "@/views/home/aside/comp/Search.vue";
-import AdvanceFilter from "@/views/home/aside/comp/AdvanceFilter.vue";
-import { getViewportOffset } from "@/utils/domUtils";
-import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
-import { useFinal } from "@/store/modules/final";
-import type { Filter } from "/#/home";
-import type { AsideEntity } from "@/config/aside";
-import { asideMap } from "@/config/final";
-import type { AsideConfig } from "/#/api";
-import emitter from "@/utils/mitt";
-import { getFilterList } from "@/api/home/main";
-import { cloneDeep, isEqual } from "lodash-es";
-
-const emit = defineEmits(["inputChange"]);
-const finalStore = useFinal();
+} from 'vue'
+import { cloneDeep, isEqual } from 'lodash-es'
+import { CustomFilterModalVue, FilterModal, NewFilterModal } from '@/views/final/comp'
+import Search from '@/views/home/aside/comp/Search.vue'
+import AdvanceFilter from '@/views/home/aside/comp/AdvanceFilter.vue'
+import { getViewportOffset } from '@/utils/domUtils'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
+import { useFinal } from '@/store/modules/final'
+import type { Filter } from '/#/home'
+import type { AsideEntity } from '@/config/aside'
+import { asideMap } from '@/config/final'
+import type { AsideConfig } from '/#/api'
+import emitter from '@/utils/mitt'
+import { getFilterList } from '@/api/home/main'
+
+const emit = defineEmits(['inputChange'])
+const finalStore = useFinal()
// 所有左侧模块的值
-const asideValue: Record = reactive({});
+const asideValue: Record = reactive({})
// 左侧某个模块是否显示: 个人配置
-const asideVisible: Partial> = reactive({});
+const asideVisible: Partial> = reactive({})
// 当前显示的模块，按照数组顺序显示
-const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
-const initAsideValueRef = ref(null); // 所有左侧模块的值(初始值)
-const customObjRef = ref(null); // 获取高级筛选获取的值
-const customTempObjRef = ref(null); // 获取高级筛选获取的值(作对比)
-const configFilterRef = ref([]); // 获取排序的值
+const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
+const initAsideValueRef = ref(null) // 所有左侧模块的值(初始值)
+const customObjRef = ref(null) // 获取高级筛选获取的值
+const customTempObjRef = ref(null) // 获取高级筛选获取的值(作对比)
+const configFilterRef = ref([]) // 获取排序的值
-initAsideValueRef.value = cloneDeep(asideMap);
+initAsideValueRef.value = cloneDeep(asideMap)
onBeforeMount(async () => {
- finalStore.fetchConfig();
- finalStore.fetchCustomConfig();
-});
+ finalStore.fetchConfig()
+ finalStore.fetchCustomConfig()
+})
Object.keys(asideMap).forEach((key) => {
- const { defaultValue, inFilterList } = asideMap[key];
- if (inFilterList !== false) asideValue[key] = defaultValue;
-});
+ const { defaultValue, inFilterList } = asideMap[key]
+ if (inFilterList !== false)
+ asideValue[key] = defaultValue
+})
-const filterModalRef:any = ref(null);
-const newFilterModalRef = ref(null);
-const customModalRef = ref(null);
-const AdvanceFilterRef: any = ref(null);
+const filterModalRef: any = ref(null)
+const newFilterModalRef = ref(null)
+const customModalRef = ref(null)
+const AdvanceFilterRef: any = ref(null)
function showModal(modalRef: any) {
- const modal = unref(modalRef)! as any;
- modal.showModal();
+ const modal = unref(modalRef)! as any
+ modal.showModal()
}
-const newFilterOk = () => {
+function newFilterOk() {
filterModalRef.value.query(
filterModalRef.value.pagination.page,
- filterModalRef.value.pagination.pageSize
- );
- filterModalRef.value.showModal();
-};
+ filterModalRef.value.pagination.pageSize,
+ )
+ filterModalRef.value.showModal()
+}
-const mousetrap = inject("mousetrap") as any;
-mousetrap.bind("[", collapseHandler);
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
onMounted(() => {
nextTick(() => {
- computeSlideHeight();
- });
-});
+ computeSlideHeight()
+ })
+})
-const collapse = ref(false);
+const collapse = ref(false)
function collapseHandler() {
- collapse.value = !collapse.value;
+ collapse.value = !collapse.value
}
const asideWidth = computed(() => {
- return collapse.value ? 0 : 308;
-});
+ return collapse.value ? 0 : 308
+})
-const asideHeight = ref(500);
+const asideHeight = ref(500)
const asideStyle = computed(() => {
return {
width: `${asideWidth.value}px`,
height: `${asideHeight.value}px`,
- };
-});
+ }
+})
const collapseIcon = computed(() => {
- return collapse.value ? "expand-cir" : "collapse-cir";
-});
+ return collapse.value ? 'expand-cir' : 'collapse-cir'
+})
function computeSlideHeight() {
- const headEl = document.querySelector(".aside-header")!;
- const { bottomIncludeBody } = getViewportOffset(headEl);
- const height = bottomIncludeBody;
- asideHeight.value = height - 24;
+ const headEl = document.querySelector('.aside-header')!
+ const { bottomIncludeBody } = getViewportOffset(headEl)
+ const height = bottomIncludeBody
+ asideHeight.value = height - 24
}
-useWindowSizeFn(computeSlideHeight, 280);
+useWindowSizeFn(computeSlideHeight, 280)
onBeforeMount(async () => {
- finalStore.fetchCustomConfig();
-});
+ finalStore.fetchCustomConfig()
+})
-nextTick(()=>{
+nextTick(() => {
finalStore.$subscribe(() => {
// const customConfig = finalStore.getCustomConfig;
// console.log("customConfig订阅aside---------------", customConfig);
@@ -144,17 +145,18 @@ nextTick(()=>{
// }, []);
// console.log("showItems111111111---------------", items);
// showItems.value = items;
- const config = finalStore.getSystemConfig;
- const customConfig = finalStore.getCustomConfig;
+ const config = finalStore.getSystemConfig
+ const customConfig = finalStore.getCustomConfig
if (
- configFilterRef.value.length > 0 &&
- isEqual(configFilterRef.value, finalStore.getFilterConfig) &&
- customObjRef.value &&
- isEqual(customObjRef.value, customTempObjRef.value)
- ) {
- return;
- }
- if (config == null || customConfig == null) return;
+ configFilterRef.value.length > 0
+ && isEqual(configFilterRef.value, finalStore.getFilterConfig)
+ && customObjRef.value
+ && isEqual(customObjRef.value, customTempObjRef.value)
+ )
+ return
+
+ if (config == null || customConfig == null)
+ return
// console.log("config", config, "customConfig", customConfig);
/* rao
const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// 获取customConfig 非isDefaultFilter的选项
@@ -162,166 +164,171 @@ nextTick(()=>{
showKeys.unshift(...defaultKeys)
*/
- let sortKeyList: any = [];
+ const sortKeyList: any = []
finalStore.getFilterConfig.map((item: any) => {
- sortKeyList.push(item?.id);
- });
- const showKeys = [...sortKeyList];
+ sortKeyList.push(item?.id)
+ })
+ const showKeys = [...sortKeyList]
Object.keys(config).forEach((key) => {
- if (key.startsWith("iz") && asideMap[key] !== undefined)
- asideVisible[key] =
- (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === "Y";
- });
+ if (key.startsWith('iz') && asideMap[key] !== undefined) {
+ asideVisible[key]
+ = (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === 'Y'
+ }
+ })
if (customObjRef.value) {
// 赋值
Object.keys(customObjRef.value).map((key) => {
if (asideMap.hasOwnProperty(key)) {
- const str = key.toLowerCase();
+ const str = key.toLowerCase()
// console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
- if (str == "izsimilarity") {
- if (typeof customObjRef.value[str] == "string") {
- customObjRef.value[str] = customObjRef.value[str].split(",");
- }
- asideValue[key] = customObjRef.value[str]; // 赋值
- console.log("相似度2222222222", asideValue[key]);
- } else if (str == "izyear") {
- if (typeof customObjRef.value[str] == "string") {
- let time = customObjRef.value[str].split("-");
- time[0] = new Date(time[0]).getTime();
- time[1] = new Date(time[1]).getTime();
- customObjRef.value[str] = time;
+ if (str == 'izsimilarity') {
+ if (typeof customObjRef.value[str] == 'string')
+ customObjRef.value[str] = customObjRef.value[str].split(',')
+
+ asideValue[key] = customObjRef.value[str] // 赋值
+ console.log('相似度2222222222', asideValue[key])
+ }
+ else if (str == 'izyear') {
+ if (typeof customObjRef.value[str] == 'string') {
+ const time = customObjRef.value[str].split('-')
+ time[0] = new Date(time[0]).getTime()
+ time[1] = new Date(time[1]).getTime()
+ customObjRef.value[str] = time
}
- asideValue[key] = customObjRef.value[str]; // 赋值
- console.log("时间2222222222", asideValue[key]);
- } else if (customObjRef.value[str]) {
- console.log("customObjRef.value[str]222222", customObjRef.value[str]);
+ asideValue[key] = customObjRef.value[str] // 赋值
+ console.log('时间2222222222', asideValue[key])
+ }
+ else if (customObjRef.value[str]) {
+ console.log('customObjRef.value[str]222222', customObjRef.value[str])
// let list = customObjRef.value[str].split(',');
// console.log("list222222", list);
- if (typeof customObjRef.value[str] == "string") {
- customObjRef.value[str] = customObjRef.value[str].split(",");
- asideValue[key] = customObjRef.value[str]; // 赋值
- }else {
- asideValue[key] = customObjRef.value[str]; // 赋值
+ if (typeof customObjRef.value[str] == 'string') {
+ customObjRef.value[str] = customObjRef.value[str].split(',')
+ asideValue[key] = customObjRef.value[str] // 赋值
}
- } else {
- asideValue[key] = null;
+ else {
+ asideValue[key] = customObjRef.value[str] // 赋值
+ }
+ }
+ else {
+ asideValue[key] = null
}
// asideMap[str].defaultValue = customObjRef.value[str];// 赋值
}
- });
- customTempObjRef.value = customObjRef.value;
- console.log("asideValue直接处理后的结果", asideValue);
- console.log("customTempObjRef.value", customTempObjRef.value);
- let tempobj = cloneDeep(asideValue);
- console.log("tempObj", tempobj);
- finalStore.setAsideValue(tempobj);
+ })
+ customTempObjRef.value = customObjRef.value
+ console.log('asideValue直接处理后的结果', asideValue)
+ console.log('customTempObjRef.value', customTempObjRef.value)
+ const tempobj = cloneDeep(asideValue)
+ console.log('tempObj', tempobj)
+ finalStore.setAsideValue(tempobj)
}
// console.log("showKeys", showKeys);
const items = showKeys.reduce((acc, key) => {
- const currentData = asideMap[key];
- const render = currentData?.render;
+ const currentData = asideMap[key]
+ const render = currentData?.render
if (render !== false) {
- const str = key?.toLowerCase();
+ const str = key?.toLowerCase()
const o = {
key: str,
config: asideMap[str],
- };
- return [...acc, o];
- } else {
- return acc;
+ }
+ return [...acc, o]
+ }
+ else {
+ return acc
}
- }, []);
- console.log("showItems=================================", items);
- showItems.value = items;
- configFilterRef.value = finalStore.getFilterConfig;
- });
+ }, [])
+ console.log('showItems=================================', items)
+ showItems.value = items
+ configFilterRef.value = finalStore.getFilterConfig
+ })
})
watch(asideVisible, (newVal) => {
Object.keys(asideValue).forEach((key) => {
- if (newVal[key] === false) asideValue[key] = asideMap[key].defaultValue;
- });
-});
+ if (newVal[key] === false)
+ asideValue[key] = asideMap[key].defaultValue
+ })
+})
-const asideEnter = ref(false);
+const asideEnter = ref(false)
const showCollapse = computed(() => {
- return collapse.value ? true : asideEnter.value;
-});
+ return collapse.value ? true : asideEnter.value
+})
-const showSearch = ref(false);
+const showSearch = ref(false)
function setShowSearch(value: boolean) {
- showSearch.value = value;
- if(!value){
+ showSearch.value = value
+ if (!value)
inputChange('')
- }
}
// 滚动容器，让key对应模块处于可视区域
function scrollHandler(key: string) {
- const element = document.querySelector(`#${key}`);
- element?.scrollIntoView(true);
+ const element = document.querySelector(`#${key}`)
+ element?.scrollIntoView(true)
}
async function filterHandler(searchId: string) {
- emitter.emit("filter-final", searchId);
- const res = await getFilterList({ userSearchId: searchId });
+ emitter.emit('filter-final', searchId)
+ const res = await getFilterList({ userSearchId: searchId })
// console.log("顾虑结果", res);
- if (res.code == "OK") {
- let obj = res.data;
- customObjRef.value = res.data;
- let showKeys: any[] = [];
+ if (res.code == 'OK') {
+ const obj = res.data
+ customObjRef.value = res.data
+ const showKeys: any[] = []
Object.keys(obj).map((key) => {
- if (asideMap.hasOwnProperty(key)) {
- showKeys.push(key);
- }
- });
- console.log("showKeys1111111111111111", showKeys);
- finalStore.setCustomConfig(showKeys);
+ if (asideMap.hasOwnProperty(key))
+ showKeys.push(key)
+ })
+ console.log('showKeys1111111111111111', showKeys)
+ finalStore.setCustomConfig(showKeys)
}
}
function editFilter(filter: any) {
- const modal = unref(newFilterModalRef)! as any;
- modal.showModal();
- modal.edit(filter);
+ const modal = unref(newFilterModalRef)! as any
+ modal.showModal()
+ modal.edit(filter)
}
// watch(asideValue, (newVal) => {
// finalStore.setAsideValue(newVal);
// });
-const inputChange = (keyword) => {
- emit("inputChange", keyword);
-};
-const handleOk = (item: any) => {
- console.log("handleOk", item);
+function inputChange(keyword) {
+ emit('inputChange', keyword)
+}
+function handleOk(item: any) {
+ console.log('handleOk', item)
if (item) {
- AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname);
- filterHandler(item.id);
- } else {
- AdvanceFilterRef.value.setCurrentlySelectedAdvanced("高级筛选");
- filterHandler("");
+ AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname)
+ filterHandler(item.id)
}
-};
+ else {
+ AdvanceFilterRef.value.setCurrentlySelectedAdvanced('高级筛选')
+ filterHandler('')
+ }
+}
function updateComponent(key, e) {
- console.log("跟新值", key, e);
- console.log("tempAsideValue跟新值", finalStore.getAsideValue, asideValue);
+ console.log('跟新值', key, e)
+ console.log('tempAsideValue跟新值', finalStore.getAsideValue, asideValue)
// let tempAsideValue = finalStore.getAsideValue || asideValue;
- let tempobj = cloneDeep(asideValue);
- console.log(tempobj, "tempobj");
- tempobj[key] = e;
- console.log(tempobj, "tempobj After");
- customObjRef.value = tempobj;
+ const tempobj = cloneDeep(asideValue)
+ console.log(tempobj, 'tempobj')
+ tempobj[key] = e
+ console.log(tempobj, 'tempobj After')
+ customObjRef.value = tempobj
// asideValue = Object.assign({}, asideValue, tempobj);
- console.log("asideValue跟新值", tempobj);
- finalStore.setAsideValue(tempobj);
+ console.log('asideValue跟新值', tempobj)
+ finalStore.setAsideValue(tempobj)
}
-
@@ -343,18 +350,18 @@ function updateComponent(key, e) {
v-show="showSearch"
@select="scrollHandler"
@close="setShowSearch(false)"
- @inputChange="inputChange"
- @showSearch="setShowSearch(true)"
+ @input-change="inputChange"
+ @show-search="setShowSearch(true)"
/>
@@ -375,10 +382,10 @@ function updateComponent(key, e) {
ref="filterModalRef"
@edit-filter="editFilter"
@show-new-filter="showModal(newFilterModalRef)"
- @handleOk="handleOk"
+ @handle-ok="handleOk"
/>
-
+
diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue
index 146a805..ffe1e56 100644
--- a/src/views/final/comp/CustomFilterModalVue.vue
+++ b/src/views/final/comp/CustomFilterModalVue.vue
@@ -1,25 +1,23 @@
@@ -331,9 +335,9 @@ const showSearch = computed(() => {
v-model:show="show"
transform-origin="center"
display-directive="if"
- @after-leave="afterLeave"
:mask-closable="false"
class="modal_wrapper"
+ @after-leave="afterLeave"
>
{
'font-size': '16px',
'font-weight': '600',
}"
- >基本信息
+ >基本信息
-
diff --git a/src/views/final/comp/ImportExcelModal.vue b/src/views/final/comp/ImportExcelModal.vue
index f8009e6..1fea0a3 100644
--- a/src/views/final/comp/ImportExcelModal.vue
+++ b/src/views/final/comp/ImportExcelModal.vue
@@ -1,188 +1,192 @@
@@ -218,7 +222,7 @@ function afterLeave() {
type="file"
accept=".xlsx, .xls,.csv"
@change="handleClick"
- />
+ >
点击或拖拽审批文件到这里上传
- 支持上传格式：.xls .xlsx .csv的文件
+ 支持上传格式：.xls .xlsx .csv的文件
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 5687a90..f81c3bf 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -1,108 +1,108 @@
基本信息
+ >基本信息
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 9e38ddf..d14ba80 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,4 +1,5 @@
@@ -48,11 +48,11 @@ onMounted(() => {
-
-
+
+
{
-
任务ID：{{ item.title }}
-
{{ item.date }}
+
+ 任务ID：{{ item.title }}
+
+
+ {{ item.date }}
+
{{ index == 1 ? "待确认" : "张思" }}
@@ -76,8 +80,12 @@ onMounted(() => {
-
通过
-
不通过
+
+ 通过
+
+
+ 不通过
+
diff --git a/src/views/final/index.vue b/src/views/final/index.vue
index 20d020f..45d2e42 100644
--- a/src/views/final/index.vue
+++ b/src/views/final/index.vue
@@ -5,7 +5,6 @@ import Content from './content/Content.vue'
import ListContent from './content/ListContent.vue'
import Robot from '@/components/Robot/index.vue'
-
defineOptions({
name: 'FinalMain',
})
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index a6b2249..c5145c6 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -10,263 +10,268 @@ import {
shallowRef,
unref,
watch,
-} from "vue";
-import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from "./comp/modals";
-import Search from "./comp/Search.vue";
-import AdvanceFilter from "./comp/AdvanceFilter.vue";
-import { getViewportOffset } from "@/utils/domUtils";
-import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
-import { useConfig } from "@/store/modules/asideConfig";
-import type { Filter } from "/#/home";
-import type { AsideEntity } from "@/config/aside";
-import { asideMap } from "@/config/aside";
-import type { AsideConfig } from "/#/api";
-import emitter from "@/utils/mitt";
-import { getFilterList } from "@/api/home/main";
-import dayjs from "dayjs";
-import { cloneDeep, isEqual } from "lodash-es";
-
-const configStore = useConfig();
+} from 'vue'
+import dayjs from 'dayjs'
+import { cloneDeep, isEqual } from 'lodash-es'
+import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from './comp/modals'
+import Search from './comp/Search.vue'
+import AdvanceFilter from './comp/AdvanceFilter.vue'
+import { getViewportOffset } from '@/utils/domUtils'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
+import { useConfig } from '@/store/modules/asideConfig'
+import type { Filter } from '/#/home'
+import type { AsideEntity } from '@/config/aside'
+import { asideMap } from '@/config/aside'
+import type { AsideConfig } from '/#/api'
+import emitter from '@/utils/mitt'
+import { getFilterList } from '@/api/home/main'
+
+const configStore = useConfig()
// 所有左侧模块的值
-let asideValue: Record
= reactive({});
+const asideValue: Record = reactive({})
// 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置
-const asideVisible: Partial> = reactive({});
+const asideVisible: Partial> = reactive({})
// 当前显示的模块，按照数组顺序显示
-const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
+const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
Object.keys(asideMap).forEach((key) => {
- const entity = asideMap[key];
- const { defaultValue } = entity;
- asideValue[key] = defaultValue;
-});
-
-const filterModalRef: any = ref(null);
-const newFilterModalRef = ref(null);
-const customModalRef = ref(null);
-const customObjRef = ref(null); // 获取高级筛选获取的值
-const customTempObjRef = ref(null); // 获取高级筛选获取的值(作对比)
-const configFilterRef = ref([]); // 获取排序的值
-const AdvanceFilterRef: any = ref(null);
+ const entity = asideMap[key]
+ const { defaultValue } = entity
+ asideValue[key] = defaultValue
+})
+
+const filterModalRef: any = ref(null)
+const newFilterModalRef = ref(null)
+const customModalRef = ref(null)
+const customObjRef = ref(null) // 获取高级筛选获取的值
+const customTempObjRef = ref(null) // 获取高级筛选获取的值(作对比)
+const configFilterRef = ref([]) // 获取排序的值
+const AdvanceFilterRef: any = ref(null)
function showModal(modalRef: any) {
- const modal = unref(modalRef)! as any;
- modal.showModal();
+ const modal = unref(modalRef)! as any
+ modal.showModal()
}
onMounted(() => {
nextTick(() => {
- computeSlideHeight();
- let tempAsideValue = cloneDeep(asideValue);
+ computeSlideHeight()
+ const tempAsideValue = cloneDeep(asideValue)
// configStore.setAsideValue(tempAsideValue);
- console.log("asideMap和asideValue", tempAsideValue);
- });
-});
+ console.log('asideMap和asideValue', tempAsideValue)
+ })
+})
-const collapse = ref(false);
-const mousetrap = inject("mousetrap") as any;
-mousetrap.bind("[", collapseHandler);
+const collapse = ref(false)
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
function collapseHandler() {
- collapse.value = !collapse.value;
+ collapse.value = !collapse.value
}
const asideWidth = computed(() => {
- return collapse.value ? 0 : 308;
-});
+ return collapse.value ? 0 : 308
+})
-const asideHeight = ref(500);
+const asideHeight = ref(500)
const asideStyle = computed(() => {
return {
width: `${asideWidth.value}px`,
height: `${asideHeight.value}px`,
- };
-});
+ }
+})
const collapseIcon = computed(() => {
- return collapse.value ? "expand-cir" : "collapse-cir";
-});
+ return collapse.value ? 'expand-cir' : 'collapse-cir'
+})
function computeSlideHeight() {
- const headEl = document.querySelector(".aside-header")!;
- const { bottomIncludeBody } = getViewportOffset(headEl);
- const height = bottomIncludeBody;
- asideHeight.value = height - 24;
+ const headEl = document.querySelector('.aside-header')!
+ const { bottomIncludeBody } = getViewportOffset(headEl)
+ const height = bottomIncludeBody
+ asideHeight.value = height - 24
}
-useWindowSizeFn(computeSlideHeight, 280);
+useWindowSizeFn(computeSlideHeight, 280)
onBeforeMount(async () => {
- configStore.fetchConfig();
- configStore.fetchCustomConfig();
-});
+ configStore.fetchConfig()
+ configStore.fetchCustomConfig()
+})
-nextTick(()=>{
+nextTick(() => {
configStore.$subscribe(() => {
- const config = configStore.getConfig;
- const customConfig = configStore.getCustomConfig;
- if (
- configFilterRef.value.length > 0 &&
- isEqual(configFilterRef.value, configStore.getFilterConfig) &&
- customObjRef.value &&
- isEqual(customObjRef.value, customTempObjRef.value)
- ) {
- return;
- }
- if (config == null || customConfig == null) return;
- // console.log("config", config, "customConfig", customConfig);
- /* rao
+ const config = configStore.getConfig
+ const customConfig = configStore.getCustomConfig
+ if (
+ configFilterRef.value.length > 0
+ && isEqual(configFilterRef.value, configStore.getFilterConfig)
+ && customObjRef.value
+ && isEqual(customObjRef.value, customTempObjRef.value)
+ )
+ return
+
+ if (config == null || customConfig == null)
+ return
+ // console.log("config", config, "customConfig", customConfig);
+ /* rao
const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// 获取customConfig 非isDefaultFilter的选项
const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)// 获取asideMap isDefaultFilter的选项
showKeys.unshift(...defaultKeys)
*/
- let sortKeyList: any = [];
- configStore.getFilterConfig.map((item: any) => {
- sortKeyList.push(item?.id);
- });
- const showKeys = [...sortKeyList];
-
- Object.keys(config).forEach((key) => {
- if (key.startsWith("iz") && asideMap[key] !== undefined)
- asideVisible[key] =
- (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === "Y";
- });
- if (customObjRef.value) {
+ const sortKeyList: any = []
+ configStore.getFilterConfig.map((item: any) => {
+ sortKeyList.push(item?.id)
+ })
+ const showKeys = [...sortKeyList]
+
+ Object.keys(config).forEach((key) => {
+ if (key.startsWith('iz') && asideMap[key] !== undefined) {
+ asideVisible[key]
+ = (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === 'Y'
+ }
+ })
+ if (customObjRef.value) {
// 赋值
- Object.keys(customObjRef.value).map((key) => {
- if (asideMap.hasOwnProperty(key)) {
- const str = key.toLowerCase();
- // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
- if (str == "izsimilarity") {
- if (typeof customObjRef.value[str] == "string") {
- customObjRef.value[str] = customObjRef.value[str].split(",");
+ Object.keys(customObjRef.value).map((key) => {
+ if (asideMap.hasOwnProperty(key)) {
+ const str = key.toLowerCase()
+ // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
+ if (str == 'izsimilarity') {
+ if (typeof customObjRef.value[str] == 'string')
+ customObjRef.value[str] = customObjRef.value[str].split(',')
+
+ asideValue[key] = customObjRef.value[str] // 赋值
+ console.log('相似度2222222222', asideValue[key])
}
- asideValue[key] = customObjRef.value[str]; // 赋值
- console.log("相似度2222222222", asideValue[key]);
- } else if (str == "izyear") {
- if (typeof customObjRef.value[str] == "string") {
- let time = customObjRef.value[str].split("-");
- time[0] = new Date(time[0]).getTime();
- time[1] = new Date(time[1]).getTime();
- customObjRef.value[str] = time;
+ else if (str == 'izyear') {
+ if (typeof customObjRef.value[str] == 'string') {
+ const time = customObjRef.value[str].split('-')
+ time[0] = new Date(time[0]).getTime()
+ time[1] = new Date(time[1]).getTime()
+ customObjRef.value[str] = time
+ }
+ asideValue[key] = customObjRef.value[str] // 赋值
+ console.log('时间2222222222', asideValue[key])
+ }
+ else if (str != 'izsimilarity' && str != 'izyear' && customObjRef.value[str]) {
+ console.log('customObjRef.value[str]222222', customObjRef.value[str])
+ // let list = customObjRef.value[str].split(',');
+ // console.log("list222222", list);
+ asideValue[key] = customObjRef.value[str] // 赋值
+ }
+ else {
+ asideValue[key] = null
}
- asideValue[key] = customObjRef.value[str]; // 赋值
- console.log("时间2222222222", asideValue[key]);
- } else if (str != "izsimilarity" && str != "izyear" && customObjRef.value[str]) {
- console.log("customObjRef.value[str]222222", customObjRef.value[str]);
- // let list = customObjRef.value[str].split(',');
- // console.log("list222222", list);
- asideValue[key] = customObjRef.value[str]; // 赋值
- } else {
- asideValue[key] = null;
- }
// asideMap[str].defaultValue = customObjRef.value[str];// 赋值
- }
- });
- customTempObjRef.value = customObjRef.value;
- console.log("asideValue直接处理后的结果", asideValue);
- console.log("customTempObjRef.value", customTempObjRef.value);
- let tempobj = cloneDeep(asideValue);
- console.log("tempObj", tempobj);
- configStore.setAsideValue(tempobj);
- }
- // console.log("showKeys", showKeys);
- const items = showKeys.reduce((acc, key) => {
- const currentData = asideMap[key];
- const render = currentData?.render;
- if (render !== false) {
- const str = key?.toLowerCase();
-
- const o = {
- key: str,
- config: asideMap[str],
- };
- return [...acc, o];
- } else {
- return acc;
+ }
+ })
+ customTempObjRef.value = customObjRef.value
+ console.log('asideValue直接处理后的结果', asideValue)
+ console.log('customTempObjRef.value', customTempObjRef.value)
+ const tempobj = cloneDeep(asideValue)
+ console.log('tempObj', tempobj)
+ configStore.setAsideValue(tempobj)
}
- }, []);
- console.log("showItems=================================", items);
- showItems.value = items;
- configFilterRef.value = configStore.getFilterConfig;
-});
-
+ // console.log("showKeys", showKeys);
+ const items = showKeys.reduce((acc, key) => {
+ const currentData = asideMap[key]
+ const render = currentData?.render
+ if (render !== false) {
+ const str = key?.toLowerCase()
+
+ const o = {
+ key: str,
+ config: asideMap[str],
+ }
+ return [...acc, o]
+ }
+ else {
+ return acc
+ }
+ }, [])
+ console.log('showItems=================================', items)
+ showItems.value = items
+ configFilterRef.value = configStore.getFilterConfig
+ })
})
-const asideEnter = ref(false);
+const asideEnter = ref(false)
const showCollapse = computed(() => {
- return collapse.value ? true : asideEnter.value;
-});
+ return collapse.value ? true : asideEnter.value
+})
-const showSearch = ref(false);
+const showSearch = ref(false)
function setShowSearch(value: boolean) {
- showSearch.value = value;
+ showSearch.value = value
}
-const newFilterOk = () => {
+function newFilterOk() {
filterModalRef.value.query(
filterModalRef.value.pagination.page,
- filterModalRef.value.pagination.pageSize
- );
- filterModalRef.value.showModal();
-};
+ filterModalRef.value.pagination.pageSize,
+ )
+ filterModalRef.value.showModal()
+}
// 滚动容器，让key对应模块处于可视区域
function scrollHandler(key: string) {
- const element = document.querySelector(`#${key}`);
- element?.scrollIntoView(true);
+ const element = document.querySelector(`#${key}`)
+ element?.scrollIntoView(true)
}
// 选择某个过滤配置，刷新图片墙 -> 筛选搜索条件
async function filterHandler(searchId: string) {
// emitter.emit('filter', searchId)
- const res = await getFilterList({ userSearchId: searchId });
+ const res = await getFilterList({ userSearchId: searchId })
// console.log("顾虑结果", res);
- if (res.code == "OK") {
- let obj = res.data;
- customObjRef.value = res.data;
- let showKeys: any[] = [];
+ if (res.code == 'OK') {
+ const obj = res.data
+ customObjRef.value = res.data
+ const showKeys: any[] = []
Object.keys(obj).map((key) => {
- if (asideMap.hasOwnProperty(key)) {
- showKeys.push(key);
- }
- });
+ if (asideMap.hasOwnProperty(key))
+ showKeys.push(key)
+ })
// console.log(showKeys);
- configStore.setCustomConfig(showKeys);
+ configStore.setCustomConfig(showKeys)
}
}
function editFilter(filter: any) {
- const modal = unref(newFilterModalRef)! as any;
- modal.showModal();
- modal.edit(filter);
+ const modal = unref(newFilterModalRef)! as any
+ modal.showModal()
+ modal.edit(filter)
}
function updateComponent(key, e) {
- console.log("跟新值", key, e);
- console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue);
+ console.log('跟新值', key, e)
+ console.log('tempAsideValue跟新值', configStore.getAsideValue, asideValue)
// let tempAsideValue = configStore.getAsideValue || asideValue;
- let tempobj = cloneDeep(asideValue);
- console.log(tempobj, "tempobj");
- tempobj[key] = e;
- console.log(tempobj, "tempobj After");
- customObjRef.value = tempobj;
+ const tempobj = cloneDeep(asideValue)
+ console.log(tempobj, 'tempobj')
+ tempobj[key] = e
+ console.log(tempobj, 'tempobj After')
+ customObjRef.value = tempobj
// asideValue = Object.assign({}, asideValue, tempobj);
- console.log("asideValue跟新值", tempobj);
- configStore.setAsideValue(tempobj);
+ console.log('asideValue跟新值', tempobj)
+ configStore.setAsideValue(tempobj)
}
-const handleOk = (item: any) => {
- console.log("handleOk", item);
+function handleOk(item: any) {
+ console.log('handleOk', item)
if (item) {
- AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname);
- filterHandler(item.id);
- } else {
- AdvanceFilterRef.value.setCurrentlySelectedAdvanced("高级筛选");
- filterHandler("");
+ AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname)
+ filterHandler(item.id)
+ }
+ else {
+ AdvanceFilterRef.value.setCurrentlySelectedAdvanced('高级筛选')
+ filterHandler('')
}
-};
+}
// watch(asideValue, (newVal) => {
// console.log("asideValue处理后", newVal);
@@ -297,12 +302,12 @@ const handleOk = (item: any) => {
@@ -321,10 +326,10 @@ const handleOk = (item: any) => {
ref="filterModalRef"
@edit-filter="editFilter"
@show-new-filter="showModal(newFilterModalRef)"
- @handleOk="handleOk"
+ @handle-ok="handleOk"
/>
-
+
diff --git a/src/views/home/aside/comp/Action.vue b/src/views/home/aside/comp/Action.vue
index af0ad94..d94bea7 100644
--- a/src/views/home/aside/comp/Action.vue
+++ b/src/views/home/aside/comp/Action.vue
@@ -1,8 +1,8 @@
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 0be9cfe..820b219 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -1,14 +1,14 @@
@@ -284,8 +286,7 @@ defineExpose({
font-size: 17px;
font-weight: 600;
"
- >{{ currentlySelectedAdvanced }}
+ >{{ currentlySelectedAdvanced }}
-
+
@@ -354,23 +355,23 @@ defineExpose({
style="margin-right: 3px"
@click="favoriteHandler($event, item)"
/>
-
+
-
+
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 05278a0..56efc78 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -1,16 +1,12 @@
-
+
@@ -101,12 +100,14 @@ const handleDrop = async (e) => {
上传格式为：.png .jpg .bmp 20M以内
diff --git a/src/views/home/aside/comp/items/IzApprovalStatus.vue b/src/views/home/aside/comp/items/IzApprovalStatus.vue
index 287bc64..8a0776d 100644
--- a/src/views/home/aside/comp/items/IzApprovalStatus.vue
+++ b/src/views/home/aside/comp/items/IzApprovalStatus.vue
@@ -4,22 +4,6 @@ import type { FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izApprovalStatus'] && typeof asideValue['izApprovalStatus'] == "string") {
- let list = asideValue['izApprovalStatus'].split(',');
- formValue.value.plans = list;
- console.log("formValue.value.izApprovalStatus", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -29,12 +13,29 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izApprovalStatus && typeof asideValue.izApprovalStatus == 'string') {
+ const list = asideValue.izApprovalStatus.split(',')
+ formValue.value.plans = list
+ console.log('formValue.value.izApprovalStatus', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -58,7 +59,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -66,8 +67,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue
index 61313d5..345e48e 100644
--- a/src/views/home/aside/comp/items/IzCustomlevel.vue
+++ b/src/views/home/aside/comp/items/IzCustomlevel.vue
@@ -4,27 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izcustomlevel']) {
- if(typeof asideValue['izcustomlevel'] == "string") {
- let list = asideValue['izcustomlevel'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izcustomlevel'];
- }
- console.log("formValue.value.izcustomlevel", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
-
const props = defineProps<{
value: string[] | null
label: string
@@ -34,15 +13,38 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izcustomlevel) {
+ if (typeof asideValue.izcustomlevel == 'string') {
+ const list = asideValue.izcustomlevel.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izcustomlevel
+ }
+ console.log('formValue.value.izcustomlevel', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
+
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
-console.log("formValue.value.izcustomlevel22222", formValue.value.plans);
+console.log('formValue.value.izcustomlevel22222', formValue.value.plans)
const rules: FormRules = {
plans: [
@@ -66,7 +68,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -74,8 +76,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzCustomname.vue b/src/views/home/aside/comp/items/IzCustomname.vue
index f932cc1..465c00c 100644
--- a/src/views/home/aside/comp/items/IzCustomname.vue
+++ b/src/views/home/aside/comp/items/IzCustomname.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izcustomname']) {
- if(typeof asideValue['izcustomname'] == "string") {
- let list = asideValue['izcustomname'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izcustomname'];
- }
- console.log("formValue.value.izcustomname", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izcustomname) {
+ if (typeof asideValue.izcustomname == 'string') {
+ const list = asideValue.izcustomname.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izcustomname
+ }
+ console.log('formValue.value.izcustomname', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -63,7 +65,7 @@ onBeforeMount(async () => {
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -71,8 +73,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzCustomtype.vue b/src/views/home/aside/comp/items/IzCustomtype.vue
index 0648505..ba149ac 100644
--- a/src/views/home/aside/comp/items/IzCustomtype.vue
+++ b/src/views/home/aside/comp/items/IzCustomtype.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izcustomtype']) {
- if(typeof asideValue['izcustomtype'] == "string") {
- let list = asideValue['izcustomtype'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izcustomtype'];
- }
- console.log("formValue.value.izcustomtype", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izcustomtype) {
+ if (typeof asideValue.izcustomtype == 'string') {
+ const list = asideValue.izcustomtype.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izcustomtype
+ }
+ console.log('formValue.value.izcustomtype', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -62,7 +64,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -70,8 +72,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzCustomtypes.vue b/src/views/home/aside/comp/items/IzCustomtypes.vue
index c1f7b43..8a446a0 100644
--- a/src/views/home/aside/comp/items/IzCustomtypes.vue
+++ b/src/views/home/aside/comp/items/IzCustomtypes.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izcustomtypes']) {
- if(typeof asideValue['izcustomtypes'] == "string") {
- let list = asideValue['izcustomtypes'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izcustomtypes'];
- }
- console.log("formValue.value.izcustomtypes", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izcustomtypes) {
+ if (typeof asideValue.izcustomtypes == 'string') {
+ const list = asideValue.izcustomtypes.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izcustomtypes
+ }
+ console.log('formValue.value.izcustomtypes', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -68,7 +70,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -76,8 +78,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue
index b399179..c42458e 100644
--- a/src/views/home/aside/comp/items/IzProduct.vue
+++ b/src/views/home/aside/comp/items/IzProduct.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izproductname']) {
- if(typeof asideValue['izproductname'] == "string") {
- let list = asideValue['izproductname'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izproductname'];
- }
- console.log("formValue.value.izproductname", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izproductname) {
+ if (typeof asideValue.izproductname == 'string') {
+ const list = asideValue.izproductname.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izproductname
+ }
+ console.log('formValue.value.izproductname', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -62,7 +64,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -70,8 +72,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzProject.vue b/src/views/home/aside/comp/items/IzProject.vue
index 3b5f6dd..9f3fb8c 100644
--- a/src/views/home/aside/comp/items/IzProject.vue
+++ b/src/views/home/aside/comp/items/IzProject.vue
@@ -5,62 +5,66 @@ import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
import { useFinal } from '@/store/modules/final'
+const props = defineProps<{
+ value: string[] | null
+ label: string
+}>()
+
+const emit = defineEmits<{
+ (e: 'update:value', value: string[]): void
+}>()
+
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izproject']) {
- if(typeof asideValue['izproject'] == "string") {
- let list = asideValue['izproject'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izproject'];
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izproject) {
+ if (typeof asideValue.izproject == 'string') {
+ const list = asideValue.izproject.split(',')
+ formValue.value.plans = list
}
- console.log("formValue.value.izproject", formValue.value.plans);
- }else {
- formValue.value.plans = [];
+ else {
+ formValue.value.plans = asideValue.izproject
+ }
+ console.log('formValue.value.izproject', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
}
-});
+})
const finalStore = useFinal()
finalStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- let asideValue = finalStore.getAsideValue;
- if(asideValue && asideValue['izproject']) {
- if(typeof asideValue['izproject'] == "string") {
- let list = asideValue['izproject'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izproject'];
+ const asideValue = finalStore.getAsideValue
+ if (asideValue && asideValue.izproject) {
+ if (typeof asideValue.izproject == 'string') {
+ const list = asideValue.izproject.split(',')
+ formValue.value.plans = list
}
- console.log("formValue.value.izproject", formValue.value.plans);
- }else {
- formValue.value.plans = [];
+ else {
+ formValue.value.plans = asideValue.izproject
+ }
+ console.log('formValue.value.izproject', formValue.value.plans)
}
-});
-
-const props = defineProps<{
- value: string[] | null
- label: string
-}>()
-
-const emit = defineEmits<{
- (e: 'update:value', value: string[]): void
-}>()
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -76,7 +80,7 @@ const options = ref([])
const configStore = useDictionary()
const labStyle = {
fontWeight: 'bold',
- color: '#333333'
+ color: '#333333',
}
onBeforeMount(async () => {
@@ -85,7 +89,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -93,8 +97,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzProjecttype.vue b/src/views/home/aside/comp/items/IzProjecttype.vue
index a29b725..43c48b3 100644
--- a/src/views/home/aside/comp/items/IzProjecttype.vue
+++ b/src/views/home/aside/comp/items/IzProjecttype.vue
@@ -1,30 +1,9 @@
@@ -71,8 +72,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzSearch.vue b/src/views/home/aside/comp/items/IzSearch.vue
index 1ffede6..6cb32fd 100644
--- a/src/views/home/aside/comp/items/IzSearch.vue
+++ b/src/views/home/aside/comp/items/IzSearch.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izsearch']) {
- if(typeof asideValue['izsearch'] == "string") {
- let list = asideValue['izsearch'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izsearch'];
- }
- console.log("formValue.value.izsearch", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izsearch) {
+ if (typeof asideValue.izsearch == 'string') {
+ const list = asideValue.izsearch.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izsearch
+ }
+ console.log('formValue.value.izsearch', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -68,7 +70,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -76,8 +78,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzSearchManager.vue b/src/views/home/aside/comp/items/IzSearchManager.vue
index de6a3f9..a1c3dbd 100644
--- a/src/views/home/aside/comp/items/IzSearchManager.vue
+++ b/src/views/home/aside/comp/items/IzSearchManager.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izsearchmanager']) {
- if(typeof asideValue['izsearchmanager'] == "string") {
- let list = asideValue['izsearchmanager'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izsearchmanager'];
- }
- console.log("formValue.value.izsearchmanager", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izsearchmanager) {
+ if (typeof asideValue.izsearchmanager == 'string') {
+ const list = asideValue.izsearchmanager.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izsearchmanager
+ }
+ console.log('formValue.value.izsearchmanager', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -68,7 +70,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -76,8 +78,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzShow.vue b/src/views/home/aside/comp/items/IzShow.vue
index a034ff3..47ebc5d 100644
--- a/src/views/home/aside/comp/items/IzShow.vue
+++ b/src/views/home/aside/comp/items/IzShow.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izshow']) {
- if(typeof asideValue['izshow'] == "string") {
- let list = asideValue['izshow'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izshow'];
- }
- console.log("formValue.value.izshow", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izshow) {
+ if (typeof asideValue.izshow == 'string') {
+ const list = asideValue.izshow.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izshow
+ }
+ console.log('formValue.value.izshow', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -62,7 +64,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -70,8 +72,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue
index 18ca338..1c2a66b 100644
--- a/src/views/home/aside/comp/items/IzStatus.vue
+++ b/src/views/home/aside/comp/items/IzStatus.vue
@@ -5,62 +5,66 @@ import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
import { useFinal } from '@/store/modules/final'
+const props = defineProps<{
+ value: string[] | null
+ label: string
+}>()
+
+const emit = defineEmits<{
+ (e: 'update:value', value: string[]): void
+}>()
+
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izstatus']) {
- if(typeof asideValue['izstatus'] == "string") {
- let list = asideValue['izstatus'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izstatus'];
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izstatus) {
+ if (typeof asideValue.izstatus == 'string') {
+ const list = asideValue.izstatus.split(',')
+ formValue.value.plans = list
}
- console.log("formValue.value.izstatus", formValue.value.plans);
- }else {
- formValue.value.plans = [];
+ else {
+ formValue.value.plans = asideValue.izstatus
+ }
+ console.log('formValue.value.izstatus', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
}
-});
+})
const finalStore = useFinal()
finalStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- let asideValue = finalStore.getAsideValue;
- if(asideValue && asideValue['izstatus']) {
- if(typeof asideValue['izstatus'] == "string") {
- let list = asideValue['izstatus'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izstatus'];
+ const asideValue = finalStore.getAsideValue
+ if (asideValue && asideValue.izstatus) {
+ if (typeof asideValue.izstatus == 'string') {
+ const list = asideValue.izstatus.split(',')
+ formValue.value.plans = list
}
- console.log("formValue.value.izstatus", formValue.value.plans);
- }else {
- formValue.value.plans = [];
+ else {
+ formValue.value.plans = asideValue.izstatus
+ }
+ console.log('formValue.value.izstatus', formValue.value.plans)
}
-});
-
-const props = defineProps<{
- value: string[] | null
- label: string
-}>()
-
-const emit = defineEmits<{
- (e: 'update:value', value: string[]): void
-}>()
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -84,7 +88,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -92,8 +96,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/IzVisitcity.vue b/src/views/home/aside/comp/items/IzVisitcity.vue
index fc4db74..81f8e3f 100644
--- a/src/views/home/aside/comp/items/IzVisitcity.vue
+++ b/src/views/home/aside/comp/items/IzVisitcity.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izvisitcity']) {
- if(typeof asideValue['izvisitcity'] == "string") {
- let list = asideValue['izvisitcity'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izvisitcity'];
- }
- console.log("formValue.value.izvisitcity", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izvisitcity) {
+ if (typeof asideValue.izvisitcity == 'string') {
+ const list = asideValue.izvisitcity.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izvisitcity
+ }
+ console.log('formValue.value.izvisitcity', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -62,7 +64,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -70,8 +72,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/Izfiled17.vue b/src/views/home/aside/comp/items/Izfiled17.vue
index 0153d71..419ba82 100644
--- a/src/views/home/aside/comp/items/Izfiled17.vue
+++ b/src/views/home/aside/comp/items/Izfiled17.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izfiled17']) {
- if(typeof asideValue['izfiled17'] == "string") {
- let list = asideValue['izfiled17'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izfiled17'];
- }
- console.log("formValue.value.izfiled17", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izfiled17) {
+ if (typeof asideValue.izfiled17 == 'string') {
+ const list = asideValue.izfiled17.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izfiled17
+ }
+ console.log('formValue.value.izfiled17', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -68,7 +70,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -76,8 +78,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/Izfiled2.vue b/src/views/home/aside/comp/items/Izfiled2.vue
index 63066be..b2daea2 100644
--- a/src/views/home/aside/comp/items/Izfiled2.vue
+++ b/src/views/home/aside/comp/items/Izfiled2.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izfiled2']) {
- if(typeof asideValue['izfiled2'] == "string") {
- let list = asideValue['izfiled2'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izfiled2'];
- }
- console.log("formValue.value.izfiled2", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izfiled2) {
+ if (typeof asideValue.izfiled2 == 'string') {
+ const list = asideValue.izfiled2.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izfiled2
+ }
+ console.log('formValue.value.izfiled2', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -68,7 +70,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -76,8 +78,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/Izfiled3.vue b/src/views/home/aside/comp/items/Izfiled3.vue
index cb5ad4a..a3a7a39 100644
--- a/src/views/home/aside/comp/items/Izfiled3.vue
+++ b/src/views/home/aside/comp/items/Izfiled3.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izfiled3']) {
- if(typeof asideValue['izfiled3'] == "string") {
- let list = asideValue['izfiled3'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izfiled3'];
- }
- console.log("formValue.value.izfiled3", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izfiled3) {
+ if (typeof asideValue.izfiled3 == 'string') {
+ const list = asideValue.izfiled3.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izfiled3
+ }
+ console.log('formValue.value.izfiled3', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -68,7 +70,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -76,8 +78,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/Izfiled6.vue b/src/views/home/aside/comp/items/Izfiled6.vue
index 606dda4..256f2b7 100644
--- a/src/views/home/aside/comp/items/Izfiled6.vue
+++ b/src/views/home/aside/comp/items/Izfiled6.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izfiled6']) {
- if(typeof asideValue['izfiled6'] == "string") {
- let list = asideValue['izfiled6'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izfiled6'];
- }
- console.log("formValue.value.izfiled6", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izfiled6) {
+ if (typeof asideValue.izfiled6 == 'string') {
+ const list = asideValue.izfiled6.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izfiled6
+ }
+ console.log('formValue.value.izfiled6', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -68,7 +70,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -76,8 +78,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/Izfirm.vue b/src/views/home/aside/comp/items/Izfirm.vue
index 7ff4fab..c2664f3 100644
--- a/src/views/home/aside/comp/items/Izfirm.vue
+++ b/src/views/home/aside/comp/items/Izfirm.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izfirm']) {
- if(typeof asideValue['izfirm'] == "string") {
- let list = asideValue['izfirm'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izfirm'];
- }
- console.log("formValue.value.izfirm", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izfirm) {
+ if (typeof asideValue.izfirm == 'string') {
+ const list = asideValue.izfirm.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izfirm
+ }
+ console.log('formValue.value.izfirm', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -62,7 +64,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -70,8 +72,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/Iztaskrrom.vue b/src/views/home/aside/comp/items/Iztaskrrom.vue
index 08059de..955dc1a 100644
--- a/src/views/home/aside/comp/items/Iztaskrrom.vue
+++ b/src/views/home/aside/comp/items/Iztaskrrom.vue
@@ -5,64 +5,67 @@ import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
import { useFinal } from '@/store/modules/final'
+const props = defineProps<{
+ value: string[] | null
+ label: string
+}>()
+
+const emit = defineEmits<{
+ (e: 'update:value', value: string[]): void
+}>()
+
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
- console.log("isLoadValue.value", isLoadValue.value,
- "configUseStore.getAsideValue", configUseStore.getAsideValue);
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ console.log('isLoadValue.value', isLoadValue.value, 'configUseStore.getAsideValue', configUseStore.getAsideValue)
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['iztaskrrom']) {
- if(typeof asideValue['iztaskrrom'] == "string") {
- let list = asideValue['iztaskrrom'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['iztaskrrom'];
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.iztaskrrom) {
+ if (typeof asideValue.iztaskrrom == 'string') {
+ const list = asideValue.iztaskrrom.split(',')
+ formValue.value.plans = list
}
- console.log("formValue.value.iztaskrrom", formValue.value.plans);
- }else {
- formValue.value.plans = [];
+ else {
+ formValue.value.plans = asideValue.iztaskrrom
+ }
+ console.log('formValue.value.iztaskrrom', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
}
-});
+})
const finalStore = useFinal()
finalStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- let asideValue = finalStore.getAsideValue;
- if(asideValue && asideValue['iztaskrrom']) {
- if(typeof asideValue['iztaskrrom'] == "string") {
- let list = asideValue['iztaskrrom'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['iztaskrrom'];
+ const asideValue = finalStore.getAsideValue
+ if (asideValue && asideValue.iztaskrrom) {
+ if (typeof asideValue.iztaskrrom == 'string') {
+ const list = asideValue.iztaskrrom.split(',')
+ formValue.value.plans = list
}
- console.log("formValue.value.iztaskrrom", formValue.value.plans);
- }else {
- formValue.value.plans = [];
+ else {
+ formValue.value.plans = asideValue.iztaskrrom
+ }
+ console.log('formValue.value.iztaskrrom', formValue.value.plans)
}
-});
-
-const props = defineProps<{
- value: string[] | null
- label: string
-}>()
-
-const emit = defineEmits<{
- (e: 'update:value', value: string[]): void
-}>()
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -86,7 +89,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -94,8 +97,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue
index 99859df..95269b1 100644
--- a/src/views/home/aside/comp/items/Iztaskstatus.vue
+++ b/src/views/home/aside/comp/items/Iztaskstatus.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['iztaskstatus']) {
- if(typeof asideValue['iztaskstatus'] == "string") {
- let list = asideValue['iztaskstatus'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['iztaskstatus'];
- }
- console.log("formValue.value.iztaskstatus", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.iztaskstatus) {
+ if (typeof asideValue.iztaskstatus == 'string') {
+ const list = asideValue.iztaskstatus.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.iztaskstatus
+ }
+ console.log('formValue.value.iztaskstatus', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -62,7 +64,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -70,8 +72,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/Izvisitpro.vue b/src/views/home/aside/comp/items/Izvisitpro.vue
index 5481374..08d7ddd 100644
--- a/src/views/home/aside/comp/items/Izvisitpro.vue
+++ b/src/views/home/aside/comp/items/Izvisitpro.vue
@@ -4,26 +4,6 @@ import type { FormItemRule, FormRules } from 'naive-ui'
import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
-const configUseStore = useConfig()
-
-configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
- return
- }
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izvisitpro']) {
- if(typeof asideValue['izvisitpro'] == "string") {
- let list = asideValue['izvisitpro'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izvisitpro'];
- }
- console.log("formValue.value.izvisitpro", formValue.value.plans);
- }else {
- formValue.value.plans = [];
- }
-});
const props = defineProps<{
value: string[] | null
label: string
@@ -33,12 +13,34 @@ const emit = defineEmits<{
(e: 'update:value', value: string[]): void
}>()
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+ if (isLoadValue.value) {
+ isLoadValue.value = false
+ return
+ }
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izvisitpro) {
+ if (typeof asideValue.izvisitpro == 'string') {
+ const list = asideValue.izvisitpro.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izvisitpro
+ }
+ console.log('formValue.value.izvisitpro', formValue.value.plans)
+ }
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value,
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -62,7 +64,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -70,8 +72,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/PictureDownload.vue b/src/views/home/aside/comp/items/PictureDownload.vue
index afbdd32..fbfdfb5 100644
--- a/src/views/home/aside/comp/items/PictureDownload.vue
+++ b/src/views/home/aside/comp/items/PictureDownload.vue
@@ -2,8 +2,6 @@
import { ref } from 'vue'
import { useConfig } from '@/store/modules/asideConfig'
-const configStore = useConfig()
-
const props = defineProps({
value: {
type: Boolean,
@@ -19,11 +17,13 @@ const emit = defineEmits<{
(e: 'update:value', value: boolean): void
}>()
+const configStore = useConfig()
+
const download = ref(props.value)
function onChange(value: boolean) {
emit('update:value', value)
- configStore.setIsAllowDownload(value);
+ configStore.setIsAllowDownload(value)
}
diff --git a/src/views/home/aside/comp/items/Plan.vue b/src/views/home/aside/comp/items/Plan.vue
index 714b74d..73a5694 100644
--- a/src/views/home/aside/comp/items/Plan.vue
+++ b/src/views/home/aside/comp/items/Plan.vue
@@ -5,62 +5,66 @@ import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
import { useFinal } from '@/store/modules/final'
+const props = defineProps<{
+ value: string[] | null
+ label: string
+}>()
+
+const emit = defineEmits<{
+ (e: 'update:value', value: string[]): void
+}>()
+
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- let asideValue = configUseStore.getAsideValue;
- if(asideValue['izplan']) {
- if(typeof asideValue['izplan'] == "string") {
- let list = asideValue['izplan'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izplan'];
- }
- console.log("formValue.value.izplan", formValue.value.plans);
- }else {
- formValue.value.plans = [];
+ const asideValue = configUseStore.getAsideValue
+ if (asideValue.izplan) {
+ if (typeof asideValue.izplan == 'string') {
+ const list = asideValue.izplan.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izplan
+ }
+ console.log('formValue.value.izplan', formValue.value.plans)
}
-});
+ else {
+ formValue.value.plans = []
+ }
+})
const finalStore = useFinal()
finalStore.$subscribe(() => {
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- let asideValue = finalStore.getAsideValue;
- if(asideValue && asideValue['izplan']) {
- if(typeof asideValue['izplan'] == "string") {
- let list = asideValue['izplan'].split(',');
- formValue.value.plans = list;
- }else {
- formValue.value.plans = asideValue['izplan'];
- }
- console.log("formValue.value.izplan", formValue.value.plans);
- }else {
- formValue.value.plans = [];
+ const asideValue = finalStore.getAsideValue
+ if (asideValue && asideValue.izplan) {
+ if (typeof asideValue.izplan == 'string') {
+ const list = asideValue.izplan.split(',')
+ formValue.value.plans = list
+ }
+ else {
+ formValue.value.plans = asideValue.izplan
+ }
+ console.log('formValue.value.izplan', formValue.value.plans)
}
-});
-
-const props = defineProps<{
- value: string[] | null
- label: string
-}>()
-
-const emit = defineEmits<{
- (e: 'update:value', value: string[]): void
-}>()
+ else {
+ formValue.value.plans = []
+ }
+})
const formValue = ref({
plans: props.value || [],
})
-if(typeof formValue.value.plans == "string") {
- let list = formValue.value.plans.split(',');
- formValue.value.plans = list;
+if (typeof formValue.value.plans == 'string') {
+ const list = formValue.value.plans.split(',')
+ formValue.value.plans = list
}
const rules: FormRules = {
plans: [
@@ -84,7 +88,7 @@ onBeforeMount(async () => {
})
const isLoadValue = ref(false)
function onChange(value: Array) {
- isLoadValue.value = true;
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -92,8 +96,9 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/ReportUser.vue b/src/views/home/aside/comp/items/ReportUser.vue
index 356daf6..652a9d7 100644
--- a/src/views/home/aside/comp/items/ReportUser.vue
+++ b/src/views/home/aside/comp/items/ReportUser.vue
@@ -5,66 +5,70 @@ import { useDictionary } from '@/store/modules/dictonary'
import { useConfig } from '@/store/modules/asideConfig'
import { useFinal } from '@/store/modules/final'
+const props = defineProps<{
+ value: string[] | null
+ label: string
+}>()
+
+const emit = defineEmits<{
+ (e: 'update:value', value: string[]): void
+}>()
+
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
- let asideValue = configUseStore.getAsideValue;
- console.log("asideValue接受到的", asideValue);
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ const asideValue = configUseStore.getAsideValue
+ console.log('asideValue接受到的', asideValue)
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- if(asideValue['izupuser']) {
- if(typeof asideValue['izupuser'] == "string") {
- let list = asideValue['izupuser'].split(',');
- formValue.value.users = list;
- }else {
- formValue.value.users = asideValue['izupuser'];
+ if (asideValue.izupuser) {
+ if (typeof asideValue.izupuser == 'string') {
+ const list = asideValue.izupuser.split(',')
+ formValue.value.users = list
+ }
+ else {
+ formValue.value.users = asideValue.izupuser
}
- console.log("formValue.value.users1111111111", formValue.value.users);
- }else {
- formValue.value.users = [];
+ console.log('formValue.value.users1111111111', formValue.value.users)
}
-});
+ else {
+ formValue.value.users = []
+ }
+})
const finalStore = useFinal()
finalStore.$subscribe(() => {
- let asideValue = finalStore.getAsideValue;
- console.log("asideValue接受到的", asideValue);
- if(isLoadValue.value) {
- isLoadValue.value = false;
+ const asideValue = finalStore.getAsideValue
+ console.log('asideValue接受到的', asideValue)
+ if (isLoadValue.value) {
+ isLoadValue.value = false
return
}
- if(asideValue && asideValue['izupuser']) {
- if(typeof asideValue['izupuser'] == "string") {
- let list = asideValue['izupuser'].split(',');
- formValue.value.users = list;
- }else {
- formValue.value.users = asideValue['izupuser'];
+ if (asideValue && asideValue.izupuser) {
+ if (typeof asideValue.izupuser == 'string') {
+ const list = asideValue.izupuser.split(',')
+ formValue.value.users = list
+ }
+ else {
+ formValue.value.users = asideValue.izupuser
}
- console.log("formValue.value.users222222222222222", formValue.value.users);
- }else {
- formValue.value.users = [];
+ console.log('formValue.value.users222222222222222', formValue.value.users)
}
-});
-
-const props = defineProps<{
- value: string[] | null
- label: string
-}>()
-
-const emit = defineEmits<{
- (e: 'update:value', value: string[]): void
-}>()
+ else {
+ formValue.value.users = []
+ }
+})
const formValue = ref({
users: props.value || [],
})
-if(typeof formValue.value.users == "string") {
- let list = formValue.value.users.split(',');
- formValue.value.users = list;
+if (typeof formValue.value.users == 'string') {
+ const list = formValue.value.users.split(',')
+ formValue.value.users = list
}
-console.log("formValue.value.users2222222222222", formValue.value.users);
+console.log('formValue.value.users2222222222222', formValue.value.users)
const rules: FormRules = {
users: [
{
@@ -88,8 +92,8 @@ onBeforeMount(async () => {
const isLoadValue = ref(false)
function onChange(value: Array) {
- console.log("user选中 ", value);
- isLoadValue.value = true;
+ console.log('user选中 ', value)
+ isLoadValue.value = true
emit('update:value', value)
}
@@ -97,9 +101,10 @@ function onChange(value: Array) {
-
diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue
index f6ddbb4..19a5a49 100644
--- a/src/views/home/aside/comp/items/Similarity.vue
+++ b/src/views/home/aside/comp/items/Similarity.vue
@@ -1,47 +1,47 @@
diff --git a/src/views/home/aside/comp/items/Time.vue b/src/views/home/aside/comp/items/Time.vue
index fe64b69..add80e7 100644
--- a/src/views/home/aside/comp/items/Time.vue
+++ b/src/views/home/aside/comp/items/Time.vue
@@ -1,71 +1,67 @@
@@ -77,10 +73,12 @@ onMounted(() => {
v-model:value="time"
type="daterange"
:clearable="false"
- @update:value="onChange"
placeholder="请选择"
+ @update:value="onChange"
>
- 至
+
+ 至
+
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index a28f155..4336371 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -8,132 +8,137 @@ import {
reactive,
ref,
unref,
-} from "vue";
-import { NDataTable } from "naive-ui";
-import type { DataTableColumns, DataTableRowKey } from "naive-ui";
-import type { SortableEvent } from "sortablejs";
-import Sortable from "sortablejs";
-import { debounce } from "lodash-es";
-import Action from "../Action.vue";
-import { deleteCondition, getConditionList, sort } from "@/api/home/filter";
-import type { FilterSearchParam } from "/#/api";
-import selection from "naive-ui/es/_internal/selection";
-import SvgIcon from "@/components/Icon/SvgIcon.vue";
-
-import { useModal } from "naive-ui";
-const modal = useModal();
-
-defineOptions({ name: "FilterModal" });
-const $message = window["$message"];
+} from 'vue'
+import { NDataTable, useModal } from 'naive-ui'
+import type { DataTableColumns, DataTableRowKey } from 'naive-ui'
+import type { SortableEvent } from 'sortablejs'
+import Sortable from 'sortablejs'
+import { debounce } from 'lodash-es'
+import selection from 'naive-ui/es/_internal/selection'
+import Action from '../Action.vue'
+import { deleteCondition, getConditionList, sort } from '@/api/home/filter'
+import type { FilterSearchParam } from '/#/api'
+import SvgIcon from '@/components/Icon/SvgIcon.vue'
+
+defineOptions({ name: 'FilterModal' })
const props = defineProps({
type: {
type: Number,
default: () => 0,
},
-});
+})
const emit = defineEmits<{
- (e: "showNewFilter"): void;
- (e: "editFilter", filter: any): void;
- (e: "handleOk", item: any): void;
-}>();
+ (e: 'showNewFilter'): void
+ (e: 'editFilter', filter: any): void
+ (e: 'handleOk', item: any): void
+}>()
-const show = ref(false);
+const modal = useModal()
+
+const $message = window.$message
+
+const show = ref(false)
const cardStyle = {
- width: "808px",
- height: "840px",
- "--n-padding-bottom": "10px",
- "--n-padding-left": "10px",
-};
+ 'width': '808px',
+ 'height': '840px',
+ '--n-padding-bottom': '10px',
+ '--n-padding-left': '10px',
+}
interface RowData {
- id: string;
- searchname: string;
- createby: string;
- createtime: string;
- updateby: string;
- updatetime: string;
+ id: string
+ searchname: string
+ createby: string
+ createtime: string
+ updateby: string
+ updatetime: string
}
function sortData(row) {
- console.log("sortData", row);
- if (row.order == "descend") {
+ console.log('sortData', row)
+ if (row.order == 'descend') {
tableData.value.sort(
(a, b) =>
- new Date(a[row.columnKey]).getTime() - new Date(b[row.columnKey]).getTime()
- );
- } else if (row.order == "ascend") {
+ new Date(a[row.columnKey]).getTime() - new Date(b[row.columnKey]).getTime(),
+ )
+ }
+ else if (row.order == 'ascend') {
tableData.value.sort(
(a, b) =>
- new Date(b[row.columnKey]).getTime() - new Date(a[row.columnKey]).getTime()
- );
- } else {
+ new Date(b[row.columnKey]).getTime() - new Date(a[row.columnKey]).getTime(),
+ )
+ }
+ else {
tableData.value.sort(
- (a, b) => Number((a as any).reorder) - Number((b as any).reorder)
- );
+ (a, b) => Number((a as any).reorder) - Number((b as any).reorder),
+ )
}
}
const columns: DataTableColumns = [
{
- type: "selection",
+ type: 'selection',
},
{
- title: "操作",
- key: "action",
+ title: '操作',
+ key: 'action',
render(row) {
return h(Action, {
options: [
- { label: "编辑", key: 1 },
- { label: "删除", key: 2 },
+ { label: '编辑', key: 1 },
+ { label: '删除', key: 2 },
],
id: row.id,
select,
- });
+ })
},
},
// j
{
- title: "名称",
- key: "searchname",
+ title: '名称',
+ key: 'searchname',
ellipsis: {
tooltip: true,
},
},
{
- title: "创建者",
- key: "createby",
+ title: '创建者',
+ key: 'createby',
},
{
- title: "创建时间",
- key: "createtime",
+ title: '创建时间',
+ key: 'createtime',
width: 180,
renderSorterIcon: ({ order }) => {
- if (order === false) return h(SvgIcon, { name: "sort-2" });
- if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
- if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+ if (order === false)
+ return h(SvgIcon, { name: 'sort-2' })
+ if (order === 'ascend')
+ return h(SvgIcon, { name: 'sort-1' })
+ if (order === 'descend')
+ return h(SvgIcon, { name: 'sort-3' })
},
sorter: (row1, row2) => {
// tableData.value.sort(
// (a, b) => new Date(a?.createtime).getTime() - new Date(b?.createtime).getTime()
// );
- return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime();
+ return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime()
},
},
{
- title: "更新者",
- key: "updateby",
+ title: '更新者',
+ key: 'updateby',
},
{
- title: "更新时间",
- key: "updatetime",
+ title: '更新时间',
+ key: 'updatetime',
width: 180,
},
-];
-const total = ref(0);
-const loading = ref(true);
+]
+const total = ref(0)
+const loading = ref(true)
const pagination = reactive({
page: 1,
pageCount: 1,
@@ -141,83 +146,83 @@ const pagination = reactive({
showSizePicker: true,
pageSizes: [
{
- label: "10 每页",
+ label: '10 每页',
value: 10,
},
{
- label: "15 每页",
+ label: '15 每页',
value: 15,
},
{
- label: "30 每页",
+ label: '30 每页',
value: 30,
},
{
- label: "50 每页",
+ label: '50 每页',
value: 50,
},
],
showQuickJumper: true,
prefix: () => `共 ${total.value} 条数据`,
-});
-const tableData = ref>([]);
-const keyword = ref("");
+})
+const tableData = ref>([])
+const keyword = ref('')
async function query(page: number, pageSize: number) {
const searchParam: FilterSearchParam = {
- search_searchname: { value: keyword.value, op: "like", type: "string" },
- };
+ search_searchname: { value: keyword.value, op: 'like', type: 'string' },
+ }
const result = await getConditionList(
{ pageNo: page, pageSize },
searchParam,
- props.type
- );
- const { data, pageCount, total: totalCount } = result;
- tableData.value = data;
- pagination.page = page;
- total.value = totalCount;
- pagination.pageCount = pageCount;
- loading.value = false;
+ props.type,
+ )
+ const { data, pageCount, total: totalCount } = result
+ tableData.value = data
+ pagination.page = page
+ total.value = totalCount
+ pagination.pageCount = pageCount
+ loading.value = false
}
function afterLeave() {
- pagination.page = 1;
- pagination.pageCount = 1;
- pagination.pageSize = 10;
+ pagination.page = 1
+ pagination.pageCount = 1
+ pagination.pageSize = 10
}
-const selectionIds = ref([]);
+const selectionIds = ref([])
-const rowKey = (row: RowData) => row.id;
+const rowKey = (row: RowData) => row.id
function rowProps(row: RowData) {
return {
- "data-id": row.id,
- };
+ 'data-id': row.id,
+ }
}
function handleCheck(rowKeys: DataTableRowKey[]) {
- selectionIds.value = rowKeys;
+ selectionIds.value = rowKeys
}
function select(key: number, id: string) {
switch (key) {
case 1:
- editSelection(id);
- break;
+ editSelection(id)
+ break
case 2:
const modalInst = modal.create({
- title: "确认提示",
- content: "确认删除该条过滤条件吗?",
- positiveText: "确定",
- negativeText: "取消",
- preset: "dialog",
+ title: '确认提示',
+ content: '确认删除该条过滤条件吗?',
+ positiveText: '确定',
+ negativeText: '取消',
+ preset: 'dialog',
onPositiveClick: () => deleteSelection(id),
onNegativeClick: () => modalInst.destroy(),
- });
- break;
+ })
+ break
default:
- break;
+ break
}
}
@@ -227,145 +232,149 @@ function editSelection(id) {
// $message.error("请选中一条过滤");
// return;
// }
- const selectedId = id;
+ const selectedId = id
const selectedFilter = tableData.value.find((item: any) => {
- return item.id === selectedId;
- });
+ return item.id === selectedId
+ })
- emit("editFilter", selectedFilter);
- closeModal();
+ emit('editFilter', selectedFilter)
+ closeModal()
}
-function deleteSelection(id = "") {
+function deleteSelection(id = '') {
if (selectionIds.value.length === 0) {
deleteCondition({ ids: id }).then(() => {
- query(pagination.page, pagination.pageSize);
- });
- return;
+ query(pagination.page, pagination.pageSize)
+ })
+ return
}
const modalInst = modal.create({
- title: "确认提示",
- content: "确认删除所选过滤条件吗?",
- positiveText: "确定",
- negativeText: "取消",
- preset: "dialog",
+ title: '确认提示',
+ content: '确认删除所选过滤条件吗?',
+ positiveText: '确定',
+ negativeText: '取消',
+ preset: 'dialog',
onPositiveClick: () =>
- deleteCondition({ ids: selectionIds.value.join(",") }).then(() => {
- selectionIds.value = [];
- query(pagination.page, pagination.pageSize);
+ deleteCondition({ ids: selectionIds.value.join(',') }).then(() => {
+ selectionIds.value = []
+ query(pagination.page, pagination.pageSize)
}),
onNegativeClick: () => modalInst.destroy(),
- });
+ })
}
async function handlePageChange(currentPage) {
- if (loading.value) return;
- pagination.page = currentPage;
- const { pageSize } = pagination;
- await query(currentPage, pageSize);
+ if (loading.value)
+ return
+ pagination.page = currentPage
+ const { pageSize } = pagination
+ await query(currentPage, pageSize)
}
async function handlePageSizeChange(currentPageSize) {
- if (loading.value) return;
+ if (loading.value)
+ return
- const { page } = pagination;
- pagination.pageSize = currentPageSize;
- await query(page, currentPageSize);
+ const { page } = pagination
+ pagination.pageSize = currentPageSize
+ await query(page, currentPageSize)
}
function handleClick() {
- emit("showNewFilter");
- closeModal();
+ emit('showNewFilter')
+ closeModal()
}
-let sortTable: Sortable | null = null;
-const tableRef = ref>();
+let sortTable: Sortable | null = null
+const tableRef = ref>()
async function showModal() {
- show.value = true;
+ show.value = true
- const { page, pageSize } = pagination;
- await query(page, pageSize);
+ const { page, pageSize } = pagination
+ await query(page, pageSize)
nextTick(() => {
- if (sortTable !== null) destory();
-
- const el: HTMLDivElement = tableRef.value?.$el;
- const tbody: HTMLElement | null = el.querySelector("tbody.n-data-table-tbody")!;
- if (tbody) sortTable = Sortable.create(tbody, { onEnd, onMove });
- });
+ if (sortTable !== null)
+ destory()
+
+ const el: HTMLDivElement = tableRef.value?.$el
+ const tbody: HTMLElement | null = el.querySelector('tbody.n-data-table-tbody')!
+ if (tbody)
+ sortTable = Sortable.create(tbody, { onEnd, onMove })
+ })
}
-let relatedId = "";
-let insertafter = false;
+let relatedId = ''
+let insertafter = false
// TODO: 有bug，需跟后端联调
function onEnd(event: SortableEvent) {
- const data = unref(tableData);
- const oldElem = data[event.oldIndex!];
- data.splice(event.oldIndex!, 1);
- data.splice(event.newIndex!, 0, oldElem);
+ const data = unref(tableData)
+ const oldElem = data[event.oldIndex!]
+ data.splice(event.oldIndex!, 1)
+ data.splice(event.newIndex!, 0, oldElem)
- const dragId = oldElem.id;
+ const dragId = oldElem.id
const index = data.findIndex((item) => {
- return item.id === relatedId;
- });
+ return item.id === relatedId
+ })
// 插入到元素后，索引-1；插入到元素前，索引+1
- const order = insertafter ? index - 1 : index + 1;
+ const order = insertafter ? index - 1 : index + 1
// console.log('dragid:', dragId, 'order:', order)
- sort(dragId, order);
+ sort(dragId, order)
}
function onMove(evt: any) {
- relatedId = evt.related?.dataset?.id;
- insertafter = evt.willInsertAfter;
+ relatedId = evt.related?.dataset?.id
+ insertafter = evt.willInsertAfter
// console.log(`你正在拖动：${evt.dragged.dataset.id},替换了：${evt.related}`, 'insertafter', evt.willInsertAfter)
}
function destory() {
- sortTable && sortTable.destroy();
- sortTable = null;
+ sortTable && sortTable.destroy()
+ sortTable = null
}
onUnmounted(() => {
- destory();
-});
+ destory()
+})
function closeModal() {
- selectionIds.value = [];
- show.value = false;
+ selectionIds.value = []
+ show.value = false
}
defineExpose({
showModal,
query,
pagination,
-});
+})
const inputHandler = debounce((word) => {
- keyword.value = word;
- query(1, 5);
-}, 300);
+ keyword.value = word
+ query(1, 5)
+}, 300)
const showSearch = computed(() => {
- return selectionIds.value.length > 0;
-});
+ return selectionIds.value.length > 0
+})
-const handleOk = () => {
+function handleOk() {
if (selectionIds.value.length > 1) {
- $message.error("只能选择一条筛选条件");
- return;
+ $message.error('只能选择一条筛选条件')
+ return
}
if (selectionIds.value.length == 1) {
- const selectedId = selectionIds.value[0];
- let item = tableData.value.find((v) => v.id == selectedId);
- emit("handleOk", item);
- }
- if (selectionIds.value.length == 0) {
- emit("handleOk", "");
+ const selectedId = selectionIds.value[0]
+ const item = tableData.value.find(v => v.id == selectedId)
+ emit('handleOk', item)
}
- closeModal();
-};
+ if (selectionIds.value.length == 0)
+ emit('handleOk', '')
+
+ closeModal()
+}
@@ -374,9 +383,9 @@ const handleOk = () => {
v-model:show="show"
transform-origin="center"
display-directive="if"
- @after-leave="afterLeave"
:mask-closable="false"
class="modal_wrapper"
+ @after-leave="afterLeave"
>
{
'font-weight': '600',
}"
class="wrapper-info-title"
- >基本信息
+ >基本信息
@@ -429,13 +437,11 @@ const handleOk = () => {
-
已选中
+ 已选中
{{
selectionIds.length
}}
- 项
+ 项
清空
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 467e92d..5842e1d 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -1,14 +1,14 @@
@@ -19,7 +19,7 @@ function setAsideItemName(text) {
-
+
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index e1e14c7..def23c3 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -254,18 +254,15 @@ function afterLeave() {
onMounted(() => {
show.value && addListeners()
- window.addEventListener("keydown", handleKeydown);
+ window.addEventListener('keydown', handleKeydown)
})
-
// 键盘左右箭头快捷切换
function handleKeydown(event) {
-
// 在这里执行右箭头的逻辑
- if (event.keyCode === 67) {
-show.value=false
- // batchModalRef.value.closeModal()
- }
+ if (event.keyCode === 67)
+ show.value = false
+ // batchModalRef.value.closeModal()
}
function showModal(value) {
taskId.value = value
@@ -408,7 +405,8 @@ const gridHeight = computed(() => {
defineExpose({
showModal,
- reload,closeModal
+ reload,
+ closeModal,
})
@@ -544,40 +542,40 @@ defineExpose({
:style="{ height: gridHeight }"
class="grid-item"
>
-
-
-
-
-
- {{ formatToDateHMS(Number(item.photoDateTimestamp) || 0) }}
-
-
-
- {{ formatToDateHMS(Number(item.submitDateTimestamp) || 0) }}
-
+ :src="item.serverThumbnailUrl"
+ />
+
+
+
+
+ {{ formatToDateHMS(Number(item.photoDateTimestamp) || 0) }}
-
-
-
-
+
+
+ {{ formatToDateHMS(Number(item.submitDateTimestamp) || 0) }}
-
- {{ item.similarityScore }}%
-
+
+
+
+
+
+
+
+ {{ item.similarityScore }}%
+
diff --git a/src/views/task/modal/ConfrimModal.vue b/src/views/task/modal/ConfrimModal.vue
index 05bfc6e..11ff738 100644
--- a/src/views/task/modal/ConfrimModal.vue
+++ b/src/views/task/modal/ConfrimModal.vue
@@ -63,13 +63,10 @@ onBeforeMount(async () => {
// })
})
-async function selectChange(id){
- console.log(id,'selectChange')
- selectItem.value = reasonOptions.value.find(v=>v.id == id);
-
-
+async function selectChange(id) {
+ console.log(id, 'selectChange')
+ selectItem.value = reasonOptions.value.find(v => v.id == id)
}
-
@@ -86,22 +83,19 @@ async function selectChange(id){
+ 
- 
+ 
- 
- 
- 
- 
+ 
- 
- 
+ 
+ 
- 
- 
- 
- 
- 
+ 
+ >
+ >