Merge pull request 'fix:顶部内容回显，快捷键c' (#241) from fix/change_task into test

Reviewed-on: #241

src/components/DataHeader/index.vue

@@ -9,7 +9,7 @@ defineProps({
   },
 });
 
-const data = ref([
+const datalist = ref([
   {
     link: "count",
     title: "任务总数",
@@ -71,7 +71,7 @@ async function getData() {
       approvedCount,
       notGoCount,
     } = data;
-    data.value = [
+    let newdata=[
       {
         link: "count",
         title: "任务总数",
@@ -109,14 +109,17 @@ async function getData() {
         title: "小结重复数",
         count: repeatedNodules,
       },
-    ];
+    ]
+    datalist.value =newdata ;
+console.log(datalist.value)
   }
 }
 </script>
-1
+
 <template>
   <div class="header_wrap" :style="hasColor ? '' : 'margin-top: 7.375rem;'">
-    <div v-for="(item, index) in data" :key="index" class="header_box">
+   
+    <div v-for="(item, index) in datalist" :key="index" class="header_box">
       <div class="header_item">
         <SvgIcon :name="item.link" :style="index == 0 ? 'margin-left:0.5rem' : ''" />
         <div class="data_wrap">
@@ -202,5 +205,5 @@ async function getData() {
   width: 0.0625rem;
   height: 1.25rem;
   background: #e8e8e8;
-}
+}//
 </style>

src/layout/components/Header/RecycleModal.vue

@@ -203,7 +203,7 @@ async function loadMore() {
 onUpdated(() => {
   if (startCalTime) {
     endTime = new Date().getTime()
-    if (endTime - startTime > 500)
+    if (endTime - startTime > 300)
       createDom()
   }
   else {
@@ -281,7 +281,7 @@ function isSelected(pictureId: number) {
 function moveHandler(e: MouseEvent) {
   if (startCalTime) {
     endTime = new Date().getTime()
-    if (endTime - startTime > 500)
+    if (endTime - startTime > 300)
       createDom()
   }
   else {
@@ -324,7 +324,7 @@ function removeDom() {
 function upHandler(event: MouseEvent) {
   endTime = new Date().getTime()
   startCalTime = false
-  if (endTime - startTime > 500)
+  if (endTime - startTime > 300)
     createDom()
   else
     removeDom()

src/views/final/content/Content.vue

@@ -415,9 +415,19 @@ async function formatColumns() {
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
+         sorter: 'default',
+      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' })
+      },
       render(row: any) {
         return row.fromusername
       },
+   
     }
   }
 
@@ -545,7 +555,7 @@ async function handleSorterChange(value) {
   else if (name === 'similarityscore')
     name = 'similarity_score'
   else if (name === 'fromusername')
-    name = 'fromuserid'
+    name = 'field1'
 
   sortname.value = name
   sortorder.value = value.order === 'ascend' ? 'asc' : 'desc'
@@ -729,7 +739,7 @@ function validate(items: any[]) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex,type:'table' },
   })
 }
 

src/views/final/content/ListContent.vue

@@ -189,7 +189,7 @@ async function query(
     ...params,
   })
   const { data, pageCount, totalCount } = result
-  // console.log(data, pageCount, totalCount);
+   console.log(data, pageCount, totalCount);
   const newlist = []
   const oldlist = tableData.value
   if (oldlist.length > 0) {
@@ -239,7 +239,7 @@ function isValidTimestamp(value) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndexm,type:'card' },
   })
 }
 // 小结批量不通过
@@ -423,6 +423,7 @@ function checkBottom() {
   if (!container)
     return
 
+
   // const { scrollTop, clientHeight, scrollHeight } = container;
   const scrollTop = window.pageYOffset || document.documentElement.scrollTop
 
@@ -434,11 +435,13 @@ function checkBottom() {
   const scrollHeight = document.documentElement.scrollHeight
 
   clearTimeout(debounceTimer)
+ // console.log(pagination)
   debounceTimer = setTimeout(() => {
-    if (scrollTop + clientHeight >= scrollHeight - 10) {
+    if (scrollTop + clientHeight >= scrollHeight -500&&!(pagination.pageCount<num)) {
       num = num + 1
       console.log(num)
-      query(num, 20,{},props.taskvalue)
+      console.log( pagination.pageCount)
+     query(num, 20,{},props.taskvalue)
       //  fetchData(); // 接近底部时加载更多数据
     }
   }, 500)

src/views/final/index.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
+import { ref , onMounted} from 'vue'
 import Aside from './aside/Aside.vue'
 import Content from './content/Content.vue'
 import ListContent from './content/ListContent.vue'
@@ -26,6 +26,15 @@ if(asideref.value?.showSearch){
   }
 
 }
+onMounted(()=>{
+   const searchParams = new URLSearchParams(window.location.search);
+  const type = searchParams.get('type');
+  if(type=='table'){
+   showList.value=false
+  }else{
+    showList.value=true
+  }
+})
 </script>
 
 <template>

src/views/home/content/Content.vue

@@ -117,19 +117,19 @@ const layout = debounce(() => {
   })
   loading.value = false
   // 暂时注释，请忽略
-  // _imagesload = imagesloaded('.grid-item')
+  _imagesload = imagesloaded('.grid-item')
 
-  // _imagesload.on('done', (instance) => {
+  _imagesload.on('done', (instance) => {
-  //   (_masonry as any).layout()
+    (_masonry as any).layout()
-  //   if (!el.value)
+    if (!el.value)
-  //     return
+      return
-  //   loading.value = false
+    loading.value = false
-  // })
+  })
 
-  // _imagesload.on('fail', (instance) => {
+  _imagesload.on('fail', (instance) => {
-  //   message.error('图片错误')
+    message.error('图片错误')
-  //   loading.value = false
+    loading.value = false
-  // })
+  })
 }, 300)
 
 useInfiniteScroll(
@@ -144,7 +144,7 @@ onUpdated(() => {
   nextTick(() => {
     setTimeout(() => {
       layout()
-    }, 1500)
+    }, 50)
   })
 })
 
@@ -304,7 +304,7 @@ const gridMinHeight = computed(() => {
   let height = ''
   if (viewMode.value === 'masonry' && loading.value)
     height = '145px'
-  else 
+  else
     height = ''
 
   return height
@@ -739,17 +739,8 @@ defineExpose({
                 :preview-src="item.imgUrl"
                 :src="item.thumburl"
                 :fallback-src="bgLoadingImg"
-                style="display: none"
+                :style="{ backgroundImage: `url(${loading ? bgLoadingImg : 'none'})` }"
               />
-              <img @click="
-                      ($event) => {
-                        previewHandler(index, $event);
-                        hideDownload($event);
-                      }
-                    " v-lazy="item.thumburl" class="img" :class="{
-                  'img-fit': viewMode === 'horizontalVersion',
-                  'img-full': viewMode === '3:4' || viewMode === 'verticalVersion',
-                }" alt="">
               <img
                 v-if="item.states == 3"
                 class="tag-status"
@@ -1076,23 +1067,30 @@ defineExpose({
         width: 6px;
         height: 6px;
         background: #f1f1f1;
-        display: none;
+        visibility: hidden;
-      }
-      &:hover {
-        &::-webkit-scrollbar {
-          display: block;
-        }
       }
       /* 定义滚动条轨道的样式 */
       &::-webkit-scrollbar-track {
         background-color: #e1e1e1;
         border-radius: 10px; /* 圆角 */
+        visibility: hidden;
+      }
+      &:hover {
+        &::-webkit-scrollbar {
+          visibility: visible;
+        }
+        &::-webkit-scrollbar-track {
+          visibility: visible;
+        }
+        &::-webkit-scrollbar-thumb {
+          visibility: visible;
+        }
       }
-
       /* 定义滚动条滑块的样式 */
       &::-webkit-scrollbar-thumb {
         background-color: #888;
         border-radius: 10px; /* 圆角 */
+        visibility: hidden;
       }
 
       /* 滑块hover时的样式 */

src/views/task/content/Content.vue

@@ -557,7 +557,13 @@ function reloadList(param, text) {
 }
 
 function goBack() {
+   const searchParams = new URLSearchParams(window.location.search);
+  const type = searchParams.get('type');
+  if(type){
+ router.push({ name: 'final', query: { type: type} }) 
+  }else{
   router.back()
+  }
 }
 
 function switchBatch() {

src/views/task/modal/CustomFieldModal.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { cloneDeep, difference } from 'lodash-es'
-import { computed, defineEmits, defineProps, onMounted, ref, watch } from 'vue'
+import { computed, defineEmits, defineProps, onMounted, ref, watch,onUnmounted } from 'vue'
 import { VueDraggable } from 'vue-draggable-plus'
 import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
 import { useUser } from '@/store/modules/user'
@@ -289,8 +289,17 @@ async function getData(type = '') {
   onShowList.value = cloneDeep(onList.value)
 }
 
-onMounted(() => getData())
+function handleKeydown(event: KeyboardEvent) {
-
+  if (event.code === 'KeyC')
+    closeModal()
+}
+onMounted(async () => {
+  getData()
+  document.addEventListener('keydown', handleKeydown)
+})
+onUnmounted(() => {
+  document.removeEventListener('keydown', handleKeydown)
+})
 const indeterminate = computed(() => {
   let baseNum = 0
   offList.value.map((v) => {