diff --git a/src/assets/icons/error_icon.svg b/src/assets/icons/error_icon.svg new file mode 100644 index 0000000..d772a90 --- /dev/null +++ b/src/assets/icons/error_icon.svg @@ -0,0 +1,17 @@ + + + 形状 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/right_arrow.svg b/src/assets/icons/right_arrow.svg new file mode 100644 index 0000000..c3da58b --- /dev/null +++ b/src/assets/icons/right_arrow.svg @@ -0,0 +1,18 @@ + + + 右箭头 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue index ebd6294..729f970 100644 --- a/src/components/Search/Search.vue +++ b/src/components/Search/Search.vue @@ -31,7 +31,7 @@ async function handlerSearch(value) { if (res.code === 'OK') { state.resultList = [ { - title: 'AI工单管理', + title: '图检审批', path: 'worksheet', data: res.data.ai, }, diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index d3a551e..c5e7fe5 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -173,15 +173,14 @@ function imUpdateSelectIds(x: number, y: number, w: number, h: number) { items.forEach((item: HTMLDivElement) => { const rect = item.getBoundingClientRect() const index = selectIds.value.indexOf(item.dataset.id!) - if (rect.right > x && rect.bottom > y && rect.left < x + w && rect.top < y + h) index === -1 && selectIds.value.push(item.dataset.id!) else index !== -1 && selectIds.value.splice(index, 1) }) } -function isSelected(id: number) { - return selectIds.value.includes(String(id)) +function isSelected(pictureId: number) { + return selectIds.value.includes(String(pictureId)) } function moveHandler(e: MouseEvent) { @@ -241,6 +240,7 @@ onMounted(() => { async function showModal() { show.value = true + reset() pagination.pageNo = 1 const list = await featchList() listData.value = list @@ -296,7 +296,6 @@ defineExpose({ const notPassModalRef = ref(null) const showActions = computed(() => { - console.log('selectedApproveItems', selectedApproveItems) return selectedApproveItems.value.length > 0 && batch; }); @@ -318,6 +317,7 @@ function reset() { batch.value = false; pagination.pageNo = 1; pagination.pageSize = 20; + selectIds.value = []; selectedApproveItems.value.length = 0; loading = false; canloadMore = true; @@ -457,8 +457,8 @@ async function refreshHandler() {
-
diff --git a/src/router/modules/final.ts b/src/router/modules/final.ts index 9ede89c..98a65a2 100644 --- a/src/router/modules/final.ts +++ b/src/router/modules/final.ts @@ -38,7 +38,7 @@ const routes: Array = [ path: 'final-detail', name: 'final-detail', meta: { - title: '任务终审详情', + title: '任务详情', }, component: () => import('@/views/task/content/Content.vue'), }, diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts index c43121e..e912b35 100644 --- a/src/store/modules/dictonary.ts +++ b/src/store/modules/dictonary.ts @@ -108,12 +108,12 @@ export const useDictionaryStore = defineStore({ }, actions: { initData(){ - this.fetchRegionList(); + // this.fetchRegionList(); //废弃 this.fetchPictureTypeList(); this.fetchPersionList(); this.fetchPlanList(); this.fetchTFList(); - this.fetchIzShowList(); + // this.fetchIzShowList(); //废弃 this.fetchIzProjectList(); this.fetchIztaskrromList(); this.fetchIztaskstatusList(); diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue index d8fa596..9148a2d 100644 --- a/src/views/final/aside/Aside.vue +++ b/src/views/final/aside/Aside.vue @@ -138,6 +138,9 @@ const showSearch = ref(false); function setShowSearch(value: boolean) { showSearch.value = value; + if(!value){ + inputChange('') + } } // 滚动容器，让key对应模块处于可视区域 @@ -161,7 +164,6 @@ watch(asideValue, (newVal) => { }); const inputChange = (keyword) => { - console.log("Search Component", keyword); emit("inputChange", keyword); }; diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue index bd752d9..085ccd9 100644 --- a/src/views/final/comp/CustomTabelModal.vue +++ b/src/views/final/comp/CustomTabelModal.vue @@ -433,13 +433,13 @@ const indeterminate = computed(() => { > {{ item.name }} - + /> -->
不固定
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue index d8bc149..ad249c2 100644 --- a/src/views/final/comp/FilterModal.vue +++ b/src/views/final/comp/FilterModal.vue @@ -299,6 +299,7 @@ const showSearch = computed(() => { transform-origin="center" display-directive="if" @after-leave="afterLeave" + :mask-closable="false" > { diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index ad6e08a..0928ad9 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -92,14 +92,6 @@ onBeforeMount(async () => { configStore.$subscribe(() => { const config = configStore.getConfig 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)) { return } @@ -157,6 +149,7 @@ configStore.$subscribe(() => { 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); @@ -235,7 +228,9 @@ function updateComponent(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; // asideValue = Object.assign({}, asideValue, tempobj); console.log("asideValue跟新值", tempobj); diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue index 53a80ad..df4acad 100644 --- a/src/views/home/aside/comp/Search.vue +++ b/src/views/home/aside/comp/Search.vue @@ -58,6 +58,7 @@ const searchName = () => { const close = () => { searchKeyword.value = ""; + configStore.setSearchValue(searchKeyword.value); emit('close'); } diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue index f45a497..800dc4e 100644 --- a/src/views/home/aside/comp/modals/FilterModal.vue +++ b/src/views/home/aside/comp/modals/FilterModal.vue @@ -332,6 +332,7 @@ const showSearch = computed(() => { transform-origin="center" display-directive="if" @after-leave="afterLeave" + :mask-closable="false" > { return { type: item.searchfield, @@ -301,7 +298,7 @@ defineExpose({