Merge pull request 'fix:接口报错修复' (#73) from fix/api_error into test

Reviewed-on: #73
pull/75/head
刘释隆 1 year ago
commit e304a3b1e0

@ -108,12 +108,12 @@ export const useDictionaryStore = defineStore({
}, },
actions: { actions: {
initData(){ initData(){
this.fetchRegionList(); // this.fetchRegionList(); //废弃
this.fetchPictureTypeList(); this.fetchPictureTypeList();
this.fetchPersionList(); this.fetchPersionList();
this.fetchPlanList(); this.fetchPlanList();
this.fetchTFList(); this.fetchTFList();
this.fetchIzShowList(); // this.fetchIzShowList(); //废弃
this.fetchIzProjectList(); this.fetchIzProjectList();
this.fetchIztaskrromList(); this.fetchIztaskrromList();
this.fetchIztaskstatusList(); this.fetchIztaskstatusList();

@ -184,8 +184,6 @@ async function getColumns() {
const useList = res.data const useList = res.data
const userFieldFixed = useList.userFieldFixed?.split(',') const userFieldFixed = useList.userFieldFixed?.split(',')
const userFieldUnFixed = useList.userFieldUnFixed?.split(',') const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
console.log(userFieldFixed, userFieldUnFixed, 'userFieldUnFixed')
console.log(allList, 'allList')
allList?.map((v) => { allList?.map((v) => {
if (!userFieldFixed?.length && !userFieldUnFixed?.length) { if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
if (v.isrequired == 2) { if (v.isrequired == 2) {

@ -92,14 +92,6 @@ onBeforeMount(async () => {
configStore.$subscribe(() => { configStore.$subscribe(() => {
const config = configStore.getConfig const config = configStore.getConfig
const customConfig = configStore.getCustomConfig const customConfig = configStore.getCustomConfig
console.log("config", config);
console.log("customConfig", customConfig);
console.log("customObjRef.value", customObjRef.value);
console.log("customTempObjRef.value", customTempObjRef.value, );
console.log("getFilterConfig", configStore.getFilterConfig,);
console.log("isEqual(asideValue, configStore.getAsideValue)", isEqual(asideValue, configStore.getAsideValue), );
console.log("configStore的getAsideValue", configStore.getAsideValue, );
console.log( "getAsideValue", asideValue);
if((configFilterRef.value.length > 0 && isEqual(configFilterRef.value, configStore.getFilterConfig)) && customObjRef.value && isEqual(customObjRef.value, customTempObjRef.value)) { if((configFilterRef.value.length > 0 && isEqual(configFilterRef.value, configStore.getFilterConfig)) && customObjRef.value && isEqual(customObjRef.value, customTempObjRef.value)) {
return return
} }
@ -157,6 +149,7 @@ configStore.$subscribe(() => {
console.log("asideValue直接处理后的结果", asideValue); console.log("asideValue直接处理后的结果", asideValue);
console.log("customTempObjRef.value", customTempObjRef.value); console.log("customTempObjRef.value", customTempObjRef.value);
let tempobj = cloneDeep(asideValue); let tempobj = cloneDeep(asideValue);
console.log("tempObj", tempobj);
configStore.setAsideValue(tempobj); configStore.setAsideValue(tempobj);
} }
// console.log("showKeys", showKeys); // console.log("showKeys", showKeys);
@ -235,7 +228,9 @@ function updateComponent(key, e) {
console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue); console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue);
// let tempAsideValue = configStore.getAsideValue || asideValue; // let tempAsideValue = configStore.getAsideValue || asideValue;
let tempobj = cloneDeep(asideValue); let tempobj = cloneDeep(asideValue);
console.log(tempobj,'tempobj')
tempobj[key] = e; tempobj[key] = e;
console.log(tempobj, 'tempobj After')
customObjRef.value = tempobj; customObjRef.value = tempobj;
// asideValue = Object.assign({}, asideValue, tempobj); // asideValue = Object.assign({}, asideValue, tempobj);
console.log("asideValue跟新值", tempobj); console.log("asideValue跟新值", tempobj);

@ -152,7 +152,7 @@ function unformatValue(searchfield: string, searchvalue: any) {
} }
// 80,90 // 80,90
if (searchfield === "izsimilarity") return searchvalue.split(","); // if (searchfield === "izsimilarity") return searchvalue.split(",");
return searchvalue; return searchvalue;
} }
@ -191,15 +191,15 @@ const logicOptions = ref([]);
const similarityOptions = [ const similarityOptions = [
{ {
label: "80%-90%", label: "80%-90%",
value: [80, 90], value: '80,90',
}, },
{ {
label: "95%-100%", label: "95%-100%",
value: [95, 100], value: '95,100',
}, },
{ {
label: "100%-100%", label: "100%-100%",
value: [100, 100], value: '100,100',
}, },
]; ];
@ -255,7 +255,6 @@ watch(
function getOptions(key: string) { function getOptions(key: string) {
if (key === "izsimilarity") return similarityOptions; if (key === "izsimilarity") return similarityOptions;
const getterName = `get${key}`; const getterName = `get${key}`;
const options = unref(dicStore[getterName]); const options = unref(dicStore[getterName]);
return options || []; return options || [];
@ -277,7 +276,7 @@ function leaveHandler() {
function edit(editFilter: any) { function edit(editFilter: any) {
currentStatus.value = "edit"; currentStatus.value = "edit";
console.log(editFilter,'editFilter')
const { searchname, ocrUsersearchchildList, id } = editFilter; const { searchname, ocrUsersearchchildList, id } = editFilter;
currentEditId = id; currentEditId = id;
formValue.name = searchname; formValue.name = searchname;

Loading…
Cancel
Save