Merge pull request 'fix:尧勇军 一件查重功能修复' (#50) from fix/updatecontent into test

Reviewed-on: #50
pull/56/head
yaoshuli 1 year ago
commit d38b169c5e

@ -13,6 +13,7 @@ import type { AsideConfig } from '/#/api'
import emitter from '@/utils/mitt'
import { getFilterList } from '@/api/home/main'
import dayjs from 'dayjs'
import { cloneDeep } from 'lodash-es'
const configStore = useConfig()
@ -27,6 +28,7 @@ Object.keys(asideMap).forEach((key) => {
const entity = asideMap[key]
const { defaultValue } = entity
asideValue[key] = defaultValue
console.log("asideMap和asideValue", asideValue);
})
const filterModalRef = ref(null)
@ -119,8 +121,8 @@ configStore.$subscribe(() => {
console.log("时间2222222222", customObjRef.value[str]);
}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);
// let list = customObjRef.value[str].split(',');
// console.log("list222222", list);
asideValue[key] = customObjRef.value[str];//
}else {
asideValue[key] = null;
@ -194,6 +196,14 @@ function editFilter(filter: any) {
modal.edit(filter)
}
function updateComponent(key, e) {
console.log("跟新值", key, e);
let tempobj = cloneDeep(asideValue);
tempobj[key] = e;
customObjRef.value = tempobj;
Object.assign(asideValue, tempobj);
}
watch(asideValue, (newVal) => {
console.log("asideValue处理后", newVal);
configStore.setAsideValue(newVal)
@ -220,7 +230,7 @@ watch(asideValue, (newVal) => {
<component
:is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="index" v-model:value="asideValue[item.key]"
:label="item.config.label"
:label="item.config.label" @update:value="e=>updateComponent(item.key, e)"
/>
<!-- 过滤列表 -->

@ -7,8 +7,12 @@ 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(asideValue['izcustomlevel'] && typeof asideValue['izcustomlevel'] == "string") {
let list = asideValue['izcustomlevel'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izcustomlevel", formValue.value.plans);
@ -56,8 +60,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzcustomlevelList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izcustomname'] && typeof asideValue['izcustomname'] == "string") {
let list = asideValue['izcustomname'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izcustomname", formValue.value.plans);
@ -53,7 +57,9 @@ onBeforeMount(async () => {
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izcustomtype'] && typeof asideValue['izcustomtype'] == "string") {
let list = asideValue['izcustomtype'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izcustomtype", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzCustomtypeList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izcustomtypes'] && typeof asideValue['izcustomtypes'] == "string") {
let list = asideValue['izcustomtypes'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izcustomtypes", formValue.value.plans);
@ -58,8 +62,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzCustomtypeList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izproduct']) {
if(asideValue['izproduct'] && typeof asideValue['izproduct'] == "string") {
let list = asideValue['izproduct'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izproduct", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzproductnameList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izproject']) {
if(asideValue['izproject'] && typeof asideValue['izproject'] == "string") {
let list = asideValue['izproject'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izproject", formValue.value.plans);
@ -53,8 +57,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzProjectList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -8,8 +8,12 @@ import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izprojecttype']) {
if(asideValue['izprojecttype'] && typeof asideValue['izprojecttype'] == "string") {
let list = asideValue['izprojecttype'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izprojecttype", formValue.value.plans);
@ -53,8 +57,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchizizprojecttypeList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izsearch'] && typeof asideValue['izsearch'] == "string") {
let list = asideValue['izsearch'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izsearch", formValue.value.plans);
@ -58,8 +62,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzSearchList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izsearchmanager'] && typeof asideValue['izsearchmanager'] == "string") {
let list = asideValue['izsearchmanager'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izsearchmanager", formValue.value.plans);
@ -58,8 +62,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzsSearchManagerList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izshow'] && typeof asideValue['izshow'] == "string") {
let list = asideValue['izshow'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izshow", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzShowList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izstatus']) {
if(asideValue['izstatus'] && typeof asideValue['izstatus'] == "string") {
let list = asideValue['izstatus'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izstatus", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchizstatusListt()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izvisitcity'] && typeof asideValue['izvisitcity'] == "string") {
let list = asideValue['izvisitcity'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izvisitcity", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchizvisitcityList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izfiled17'] && typeof asideValue['izfiled17'] == "string") {
let list = asideValue['izfiled17'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izfiled17", formValue.value.plans);
@ -58,8 +62,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzfiled17List()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izfiled2'] && typeof asideValue['izfiled2'] == "string") {
let list = asideValue['izfiled2'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izfiled2", formValue.value.plans);
@ -58,8 +62,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzfiled2List()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,9 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
console.log("asideValue", asideValue);
if(asideValue['izfiled3']) {
if(asideValue['izfiled3'] && typeof asideValue['izfiled3'] == "string") {
let list = asideValue['izfiled3'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izfiled3", formValue.value.plans);
@ -59,8 +62,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzfiled2List()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izfiled6'] && typeof asideValue['izfiled6'] == "string") {
let list = asideValue['izfiled6'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izfiled6", formValue.value.plans);
@ -58,8 +62,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzfiled6List()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izfirm'] && typeof asideValue['izfirm'] == "string") {
let list = asideValue['izfirm'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izfirm", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzfirmList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['iztaskrrom']) {
if(asideValue['iztaskrrom'] && typeof asideValue['iztaskrrom'] == "string") {
let list = asideValue['iztaskrrom'].split(',');
formValue.value.plans = list;
console.log("formValue.value.iztaskrrom", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIztaskrromList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['iztaskstatus'] && typeof asideValue['iztaskstatus'] == "string") {
let list = asideValue['iztaskstatus'].split(',');
formValue.value.plans = list;
console.log("formValue.value.iztaskstatus", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIztaskstatusList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ 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(asideValue['izvisitpro'] && typeof asideValue['izvisitpro'] == "string") {
let list = asideValue['izvisitpro'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izvisitpro", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const list = await configStore.fetchIzvisitproList()
options.value = list
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izplan']) {
if(asideValue['izplan'] && typeof asideValue['izplan'] == "string") {
let list = asideValue['izplan'].split(',');
formValue.value.plans = list;
console.log("formValue.value.izplan", formValue.value.plans);
@ -52,8 +56,9 @@ onBeforeMount(async () => {
const planList = await configStore.fetchPlanList()
planOptons.value = planList
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -8,8 +8,12 @@ const configUseStore = useConfig()
configUseStore.$subscribe(() => {
let asideValue = configUseStore.getAsideValue;
console.log("asideValue", asideValue);
if(asideValue['izupuser']) {
console.log("asideValue接受到的", asideValue);
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
if(asideValue['izupuser'] && typeof asideValue['izupuser'] == "string") {
let list = asideValue['izupuser'].split(',');
formValue.value.users = list;
console.log("formValue.value.users1111111111", formValue.value.users);
@ -56,7 +60,10 @@ onBeforeMount(async () => {
personOptions.value = personList
})
const isLoadValue = ref(false)
function onChange(value: Array<string>) {
console.log("user选中 ", value);
isLoadValue.value = true;
emit('update:value', value)
}
</script>

@ -5,8 +5,12 @@ import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izsimilarity']) {
if(asideValue['izsimilarity'] && typeof asideValue['izsimilarity'] == "string") {
range.value = asideValue['izsimilarity']
}else {
range.value = [0, 100];
@ -28,8 +32,9 @@ const marks = {
50: '50',
100: '100',
}
const isLoadValue = ref(false)
function onChange(value: number & number[]) {
isLoadValue.value = true;
let valueStr = value.join('-');
emit('update:value', valueStr)
}

@ -7,6 +7,10 @@ import { useConfig } from '@/store/modules/asideConfig'
const configUseStore = useConfig()
configUseStore.$subscribe(() => {
if(isLoadValue.value) {
isLoadValue.value = false;
return
}
let asideValue = configUseStore.getAsideValue;
if(asideValue['izyear']) {
time.value = asideValue['izyear']
@ -24,8 +28,9 @@ const emit = defineEmits<{
}>()
const time = ref<[number, number] | null>(props.value)
const isLoadValue = ref(false)
function onChange(value: [number, number]) {
isLoadValue.value = true;
emit('update:value', value)
}
onMounted(() => {

@ -49,7 +49,7 @@ const allCount = computed(() => {
})
const selectCount = computed(() => {
return `筛选(共${onList.value.length}个)`
return `筛选(共${onList.value.length}个)`
})
defineExpose({

@ -251,7 +251,9 @@ const gridHeight = computed(() => {
async function oneCheck() {
const asideVal = cloneDeep(configStore.getAsideValue)
asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
if(asideVal.izyear && asideVal.izyear.length == 2) {
asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
}
const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
console.log('calNum.value111111111111111', calNum.value, checkTaskStatus.value);

Loading…
Cancel
Save