Merge branch 'test' into fix/updatesyspic

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/ShortcutModal.vue

@@ -151,6 +151,17 @@ defineExpose({
                 <td>打开上一条/下一条信息切换</td>
               </tr>
             </table>
+            
+          </div>
+          <div class="wrapper-request">
+            <table style="margin-left: 47px; width: 180px">
+              <tr>
+                <td style="text-align: left; width: 53px">
+                  <div class="key" data-key="k k" />
+                </td>
+                <td>开启沉浸模式</td>
+              </tr>
+            </table>
           </div>
         </div>
         <!-- <n-divider /> -->

src/views/task/content/Content.vue

@@ -493,7 +493,12 @@ function immersionHandler() {
   // taskStore.updateImmersion()
   toggleFullScreen()
 }
-useKeydown('k k', immersionHandler)
+useKeydown('k k', () => {
+  if (isFullScreen.value) return
+  isFullScreen.value = true
+  fetchData()
+  window.addEventListener('scroll', checkBottom)
+})
 // 切换全屏状态
 function toggleFullScreen() {
   isFullScreen.value = !isFullScreen.value

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) => {

src/views/worksheet/content/Content.vue

@@ -339,7 +339,9 @@ function onEsc(event: KeyboardEvent) {
     else keyXLastTime = currentKTime
   }
 }
-useKeydown('k k', immersionHandler)
+useKeydown('k k', () => {
+  isFullScreen.value = true
+})
 onUnmounted(() => {
   workStore.reset()
   document.removeEventListener('keydown', onEsc)