src/layout/components/Header/RecycleModal.vue

@@ -506,17 +506,13 @@ function remove() {
   confrimModalRef?.value?.showModal()
 }
 
-function setBatch(value, isUpdate?) {
-  console.log('执行了设置夸勾选-------------')
+function setBatch(value) {
   if (value && batch.value)
     batch.value = !value
   else
     batch.value = value
-  if (!isUpdate)
-    updateHtml()
-  else
-    waterfallRef.value?.resize()
-
+  // waterfallRef.value?.resize()
+  updateHtml()
   if (value === false) {
     selectIds.value = []
     selectedApproveItems.value.forEach(item => (item.checked = false))
@@ -760,12 +756,12 @@ watch(() => show.value, async (newVal) => {
                 <div class="remove" @click="remove">
                   移除可疑文件夹
                 </div>
-                <div v-show="!showActions" class="wrapper-content-form-button" @click="setBatch(true, true)">
+                <div v-show="!showActions" class="wrapper-content-form-button" @click="setBatch(true)">
                   <SvgIcon style="margin-right: 6px;" size="14" name="tf" />
                   批量审批
                 </div>
                 <div v-show="showActions" class="batch">
-                  <n-button text style="margin-left: 20px;" @click="setBatch(false, true)">
+                  <n-button text style="margin-left: 20px;" @click="setBatch(false)">
                     <template #icon>
                       <SvgIcon name="revoke" />
                     </template>

src/store/modules/final.ts

@@ -1,10 +1,11 @@
-import { getFilter } from '@/api/home/filter';
+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 { store } from '@/store';
-import { cloneDeep } from "lodash-es";
-import { defineStore } from 'pinia';
+import { cloneDeep, isEqual } from "lodash-es";
 
-import type { AsideConfig } from '/#/api';
+import type { AsideConfig } from '/#/api'
 
 export interface ConfigState {
   systemConfig: AsideConfig | null
@@ -58,7 +59,6 @@ export const useFinalStore = defineStore({
       console.log("systemConfig----------", config);
     },
     setAsideValue(value) {
-console.log(value)
       this.asideValue = value
     },
     setListKey() {

src/views/final/aside/Aside.vue

@@ -42,11 +42,8 @@ const configFilterRef = ref<any>([]) // 获取排序的值
 initAsideValueRef.value = cloneDeep(asideMap)
 
 onBeforeMount(async () => {
-
-
   finalStore.fetchConfig()
   finalStore.fetchCustomConfig()
-
 })
 
 Object.keys(asideMap).forEach((key) => {
@@ -77,8 +74,6 @@ const mousetrap = inject('mousetrap') as any
 mousetrap.bind('[', collapseHandler)
 
 onMounted(() => {
-
-  //console.log(asideMap)
   nextTick(() => {
     computeSlideHeight()
   })
@@ -115,7 +110,9 @@ function computeSlideHeight() {
 
 useWindowSizeFn(computeSlideHeight, 280)
 
-
+onBeforeMount(async () => {
+  finalStore.fetchCustomConfig()
+})
 
 nextTick(() => {
   finalStore.$subscribe(() => {
@@ -224,7 +221,7 @@ nextTick(() => {
         }
       })
       customTempObjRef.value = customObjRef.value
-      console.log('asideValue直接处理后的结果q', asideValue)
+      console.log('asideValue直接处理后的结果', asideValue)
       console.log('customTempObjRef.value', customTempObjRef.value)
       const tempobj = cloneDeep(asideValue)
       console.log('tempObj', tempobj)
@@ -254,17 +251,12 @@ nextTick(() => {
 })
 
 watch(asideVisible, (newVal) => {
- 
   Object.keys(asideValue).forEach((key) => {
     if (newVal[key] === false)
       asideValue[key] = asideMap[key].defaultValue
   })
 })
-watch(asideValue, (newVal) => {
- 
-  console.log(newVal)
 
-})
 const asideEnter = ref(false)
 
 const showCollapse = computed(() => {
@@ -340,10 +332,10 @@ function updateComponent(key, e) {
   customObjRef.value = tempobj
   // asideValue = Object.assign({}, asideValue, tempobj);
   console.log('asideValue跟新值', tempobj)
- finalStore.setAsideValue(tempobj)
+  finalStore.setAsideValue(tempobj)
 }
 defineExpose({
-  showSearch,asideValue
+  showSearch,
 })
 useKeydown('s', () => setShowSearch(true))
 </script>

src/views/final/content/Content.vue

@@ -57,7 +57,7 @@ const props = defineProps({
     default: '',
   },
 })
-const emit = defineEmits(['changeShow','goDetailx'])
+const emit = defineEmits(['changeShow'])
 function changeContent() {
   emit('changeShow')
 }
@@ -614,8 +614,10 @@ function validate(items: any[]) {
 }
 
 function goDetail(row) {
-  emit('goDetailx',{ id: row.id, packageid: row.packageid, taskindex: row.taskNode, type: 'table' })
-
+  router.push({
+    name: 'final-detail',
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex, type: 'table' },
+  })
 }
 
 function resetHandler() {

src/views/final/content/ListContent.vue

@@ -21,12 +21,8 @@ const props = defineProps({
     type: String,
     default: '',
   },
-  asidevalue:{
-    type:Object,
-    default:{}
-  }
 })
-const emit = defineEmits(['changeShow','goDetailx'])
+const emit = defineEmits(['changeShow'])
 const aa = ref(true)
 const haeaderstore = useDataHeaderStore()
 const headerref = ref(null)
@@ -243,17 +239,10 @@ function isValidTimestamp(value) {
 
 // 查看详情页
 function goDetail(row) {
-  console.log(props.asidevalue.asideValue
-)
- const tempobj = cloneDeep(props.asidevalue.asideValue)
-      console.log('tempObj', tempobj)
-      finalStore.setAsideValue(tempobj)
- 
-   emit('goDetailx',{ id: row.id, packageid: row.packageid, taskindex: row.taskNode, type: 'card' })
- /* router.push({
+  router.push({
     name: 'final-detail',
     query: { id: row.id, packageid: row.packageid, taskindex: row.taskNode, type: 'card' },
-  })*/
+  })
 }
 // 小结批量不通过
 function repeatBatchReject(items) {

src/views/final/index.vue

@@ -4,19 +4,15 @@ import Aside from './aside/Aside.vue'
 import Content from './content/Content.vue'
 import ListContent from './content/ListContent.vue'
 import Robot from '@/components/Robot/index.vue'
-import Task from"@/views/task/content/Content.vue"
-
 
 defineOptions({
   name: 'FinalMain',
 })
 const showList = ref(true)
-const showDetail = ref(false)
 const contentRef: any = ref(null)
 const ListRef: any = ref(null)
 const asideref = ref(null)
 const taskvalue = ref('')
-const detaiitem = ref({})
 function inputChange(keyword) {
   if (asideref.value?.showSearch)
     taskvalue.value = keyword
@@ -29,50 +25,32 @@ function inputChange(keyword) {
   else
     contentRef.value.filterTableData(keyword)
 }
-function goDetailx(item){
-  detaiitem.value=item
-  showDetail.value=true
-  if (item.type == 'table'){
-    showList.value = false
-  }
-  else{
-    showList.value = true
-  }
- 
-}
-function goBack(){
-   showDetail.value=false
-}
 onMounted(() => {
-//  const searchParams = new URLSearchParams(window.location.search)
- /* const type = searchParams.get('type')
+  const searchParams = new URLSearchParams(window.location.search)
+  const type = searchParams.get('type')
   if (type == 'table')
     showList.value = false
 
   else
     showList.value = true
-*/})
+})
 </script>
 
 <template>
   <div class="main">
-
     <!-- 侧边 -->
-    <Aside v-show="!showDetail" ref="asideref" @input-change="inputChange" />
+    <Aside ref="asideref" @input-change="inputChange" />
 
     <!-- 任务管理 -->
     <!-- TODO:本地演示即可 上传注释注释 -->
-    <ListContent v-show="!showDetail" @goDetailx="goDetailx" v-if="showList" ref="ListRef" :taskvalue="taskvalue" @change-show="showList = false" :asidevalue="asideref"/>
+    <ListContent v-if="showList" ref="ListRef" :taskvalue="taskvalue" @change-show="showList = false" />
 
     <!-- 内容 -->
-    <Content v-show="!showDetail"  @goDetailx="goDetailx" v-if="!showList" ref="contentRef" :taskvalue="taskvalue" @change-show="showList = true" />
+    <Content v-if="!showList" ref="contentRef" :taskvalue="taskvalue" @change-show="showList = true" />
 
     <!-- 机器人 -->
     <Robot />
-
-  <Task  v-show="showDetail" :detaiitem="detaiitem"  @goBack="goBack"/>
   </div>
- 
 </template>
 
 <style lang="less" scoped>

src/views/home/content/Content.vue

@@ -1184,7 +1184,6 @@ defineExpose({
     }
 
     .grid{
-      padding-top: 3px;
       grid-gap: 10px 10px;
     }
 

src/views/task/content/Content.vue

@@ -2,7 +2,7 @@
 import {
   computed,
   onMounted,
-  onUnmounted,defineProps,
+  onUnmounted,
   reactive,
   ref,
   unref,
@@ -40,16 +40,7 @@ import { useKeydown } from '@/hooks/event/useKeydown'
 import CheckingTaskModal from '@/views/home/content/modal/CheckingTaskModal.vue'
 import { getCheckDuplicateStatus, getCheckDuplicateStatusx, getLastCheckNox, removeCheckDuplicate } from '@/api/home/main'
 
-const props = defineProps({
-
-  
-  detaiitem:{
-    type:Object,
-    default:{}
-  }
-})
-
-const emit = defineEmits(['setAsideItemName','goBack'])
+const emit = defineEmits(['setAsideItemName'])
 const timer = ref()
 const HeaderStore = useDataHeaderStore()
 const router = useRouter()
@@ -152,10 +143,10 @@ async function init() {
   }
 }
 onMounted(() => {
-  if (props.detaiitem.id) {
-    taskId.value = props.detaiitem.id
-    packageId.value = props.detaiitem.packageid
-    taskIndex.value = props.detaiitem.taskindex as string
+  if (route.query.id) {
+    taskId.value = route.query.id
+    packageId.value = route.query.packageid
+    taskIndex.value = route.query.taskindex as string
     isDetail.value = true
     getDetail()
   }
@@ -528,18 +519,6 @@ watch(
     }
   },
 )
-watch(
-  () => [props.detaiitem],
-  () => {
-    console.log(props.detaiitem)
-   if (props.detaiitem.id) {
-    taskId.value = props.detaiitem.id
-    packageId.value = props.detaiitem.packageid
-    taskIndex.value = props.detaiitem.taskindex as string
-    isDetail.value = true
-    getDetail()
-  }}
-)
 
 // 获取数据
 async function getDetail() {
@@ -571,14 +550,13 @@ function reloadList(param, text) {
 }
 
 function goBack() {
-  emit('goBack')
- /* const searchParams = new URLSearchParams(window.location.search)
+  const searchParams = new URLSearchParams(window.location.search)
   const type = searchParams.get('type')
   if (type)
     router.push({ name: 'final', query: { type } })
 
   else
-    router.back()*/
+    router.back()
 }
 
 function switchBatch() {

src/views/task/modal/ImgDetailModal.vue

@@ -246,9 +246,7 @@ defineExpose({
                       fontWeight: 'bold',
                     }"
                   >
-                   <n-ellipsis >
                     {{ item[0].label }}
-                   </n-ellipsis>
                   </div>
                   <div
                     :style="{