feat: 修改文件冲突

src/layout/components/Header/ShortcutModal.vue

@@ -1,28 +1,28 @@
 <script lang="ts" setup>
-import { defineOptions, ref } from "vue";
+import { defineOptions, ref } from 'vue'
 
-defineOptions({ name: "ShortcutModal" });
+defineOptions({ name: 'ShortcutModal' })
 
-const show = ref(false);
+const show = ref(false)
 
 const cardStyle = {
-  "width": "800px",
-  "--n-padding-bottom": "10px",
-  "--n-padding-left": "10px",
-  "padding-bottom": "100px",
-};
+  'width': '800px',
+  '--n-padding-bottom': '10px',
+  '--n-padding-left': '10px',
+  'padding-bottom': '100px',
+}
 
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 defineExpose({
   showModal,
-});
+})
 </script>
 
 <template>
@@ -125,11 +125,20 @@ defineExpose({
           <div class="wrapper-request">
             <table style="margin-left: 120px; width: 290px">
               <tr>
-               
-                  <td ><div class="key" style="float: left;
-                     margin-left: 5px;" data-key="c" /></td>
-                <td><div style="float: left;
-                     margin-left: -60px;">关闭（关闭当前场景弹窗）</div></td>
+                <td>
+                  <div
+                    class="key" style="float: left;
+                     margin-left: 5px;" data-key="c"
+                  />
+                </td>
+                <td>
+                  <div
+                    style="float: left;
+                     margin-left: -60px;"
+                  >
+                    关闭（关闭当前场景弹窗）
+                  </div>
+                </td>
               </tr>
               <tr>
                 <td>
@@ -142,7 +151,7 @@ defineExpose({
             </table>
             <table style="margin-left: 50px">
               <tr>
-               <td style="text-align: left; width: 53px">
+                <td style="text-align: left; width: 55px">
                   <div class="key" data-key="p p" />
                 </td>
                 <td>通过</td>
@@ -154,12 +163,11 @@ defineExpose({
                 <td>不通过</td>
               </tr>
             </table>
-            
           </div>
           <div class="wrapper-request">
             <table style="margin-left: 120px; width: 180px">
               <tr>
-                <td style="text-align: left; width: 53px">
+                <td style="text-align: left; width: 55px">
                   <div class="key" data-key="k k" />
                 </td>
                 <td>开启沉浸模式</td>

src/store/modules/dictonary.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
+import { getBackList, getBusinessList, getIzShowList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizApprovalStatusList, getizstatusList } from '@/api/dictionary'
 import { store } from '@/store'
-import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizstatusList, getizApprovalStatusList } from '@/api/dictionary'
 
 export interface DictionaryState {
   regionList: any
@@ -76,7 +76,8 @@ export const useDictionaryStore = defineStore({
       return state.iztaskrromList
     },
     getiztaskstatus: (state) => {
-      return state.iztaskstatusList
+      // return state.iztaskstatusList
+      return state.izstatusList
     },
     getizvisitpro: (state) => {
       return state.izvisitproList
@@ -104,32 +105,32 @@ export const useDictionaryStore = defineStore({
     },
     getizApprovalStatus: (state) => {
       return state.izApprovalStatusList
-    }
+    },
   },
   actions: {
     initData() {
       // this.fetchRegionList(); //废弃
-      this.fetchPictureTypeList();
-      this.fetchPersionList();
-      this.fetchPlanList();
-      this.fetchTFList();
+      this.fetchPictureTypeList()
+      this.fetchPersionList()
+      this.fetchPlanList()
+      this.fetchTFList()
       // this.fetchIzShowList(); //废弃
-      this.fetchIzProjectList();
-      this.fetchIztaskrromList();
-      this.fetchIztaskstatusList(); 
-      this.fetchIzvisitproList();
-      this.fetchIzfirmList();
-      this.fetchIzproductnameList();
-      this.fetchizcustomnameList();
-      this.fetchIzCustomtypeList();
-      this.fetchIzcustomlevelList();
-      this.fetchizizprojecttypeList();
-      this.fetchizvisitcityList();
-      this.fetchRejectList();
-      this.fetchBackList();
-      this.fetchRelationTypeList();
-      this.fetchizstatusListt();
-      this.fetchizApprovalStatusList();
+      this.fetchIzProjectList()
+      this.fetchIztaskrromList()
+      this.fetchIztaskstatusList()
+      this.fetchIzvisitproList()
+      this.fetchIzfirmList()
+      this.fetchIzproductnameList()
+      this.fetchizcustomnameList()
+      this.fetchIzCustomtypeList()
+      this.fetchIzcustomlevelList()
+      this.fetchizizprojecttypeList()
+      this.fetchizvisitcityList()
+      this.fetchRejectList()
+      this.fetchBackList()
+      this.fetchRelationTypeList()
+      this.fetchizstatusListt()
+      this.fetchizApprovalStatusList()
     },
     settfList(config) {
       this.tfList = config

src/views/final/aside/Aside.vue

@@ -26,7 +26,7 @@ import emitter from '@/utils/mitt'
 import { getFilterList } from '@/api/home/main'
 import { useKeydown } from '@/hooks/event/useKeydown'
 
-const emit = defineEmits(['inputChange',])
+const emit = defineEmits(['inputChange'])
 const finalStore = useFinal()
 // 所有左侧模块的值
 const asideValue: Record<keyof typeof asideMap, any> = reactive({})
@@ -67,7 +67,7 @@ function newFilterOk() {
     filterModalRef.value.pagination.page,
     filterModalRef.value.pagination.pageSize,
   )
-  filterModalRef.value.showModal()
+  filterModalRef.value.closeModal()
 }
 
 const mousetrap = inject('mousetrap') as any
@@ -336,7 +336,7 @@ function updateComponent(key, e) {
 }
 defineExpose({
   showSearch,
-});
+})
 useKeydown('s', () => setShowSearch(true))
 </script>
 
@@ -409,6 +409,8 @@ useKeydown('s', () => setShowSearch(true))
   border-radius: 3px;
   box-sizing: border-box;
   height: 100% !important;
+  margin-left: 16px;
+
   &-header {
     padding: 10px;
     width: 100%;

src/views/final/comp/FilterModal.vue

@@ -311,6 +311,7 @@ function closeModal() {
 
 defineExpose({
   showModal,
+  closeModal,
   query,
   pagination,
 })

src/views/final/comp/NewFilterModal.vue

@@ -194,8 +194,8 @@ watch(
 function showModal() {
   show.value = true
   setTimeout(() => {
-    formValue.name = ''
-  }, 300);
+    // formValue.name = ''
+  }, 300)
 }
 
 function closeModal() {
@@ -249,8 +249,9 @@ function edit(editFilter: any) {
   currentStatus.value = 'edit'
 
   const { searchname, ocrUsersearchchildList, id } = editFilter
+
   currentEditId = id
-  formValue.name = searchname
+
   formValue.conditions = ocrUsersearchchildList.map((item) => {
     return {
       type: item.searchfield,
@@ -258,6 +259,10 @@ function edit(editFilter: any) {
       result: unformatValue(item.searchfield, item.searchvalue),
     }
   })
+  formValue.name = editFilter.searchname
+  //  formValue.searchname = searchname
+  formValue.name = searchname
+  console.log(formValue)
 }
 
 defineExpose({

src/views/final/content/Content.vue

@@ -8,6 +8,7 @@ import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
 import {
   computed,
   defineEmits,
+  defineProps,
   h,
   nextTick,
   onBeforeMount,
@@ -16,7 +17,7 @@ import {
   reactive,
   ref,
   unref,
-  watch,defineProps
+  watch,
 } from 'vue'
 import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
 import { useRoute, useRouter } from 'vue-router'
@@ -47,13 +48,14 @@ import emitter from '@/utils/mitt'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
 import DataHeader from '@/components/DataHeader/index.vue'
+
 const props = defineProps({
 
   taskvalue: {
     type: String,
-    default: ""
-  }
-});
+    default: '',
+  },
+})
 const emit = defineEmits(['changeShow'])
 function changeContent() {
   emit('changeShow')
@@ -506,7 +508,7 @@ async function query(
 ) {
   console.log('query', taskName)
   const asideParmas = cloneDeep(unref(finalStore.getAsideValue))
- console.log(asideParmas);
+  console.log(asideParmas)
 
   if (asideParmas.izyear) {
     asideParmas.izuptime = cloneDeep(asideParmas.izyear)
@@ -524,11 +526,10 @@ async function query(
 
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
-  let params = asideParmas
- if (params?.izshowall == true)
-  {
+  const params = asideParmas
+  if (params?.izshowall == true) {
     params.isFail = true
-      delete params.izshowall;
+    delete params.izshowall
   }
   //  params = params?.izshowall ? { isFail: true } : params
 
@@ -918,8 +919,7 @@ function filterTableData(keyword) {
     query(pagination.page, pagination.pageSize, '', keyword)
   else query(pagination.page, pagination.pageSize)
 }
-async function initData(pageSize, page,  filterId?: any,
-  taskName?: string) {
+async function initData(pageSize, page, filterId?: any, taskName?: string) {
   const asideParmas = unref(finalStore.getAsideValue)
   if (asideParmas.izyear) {
     asideParmas.izuptime = cloneDeep(asideParmas.izyear)
@@ -936,11 +936,10 @@ async function initData(pageSize, page,  filterId?: any,
   }
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
-  let params = asideParmas
-  if (params?.izshowall == true)
-  {
+  const params = asideParmas
+  if (params?.izshowall == true) {
     params.isFail = true
-    delete params.izshowall;
+    delete params.izshowall
   }
   const result = await getFinalList({
     sortorder: sortorder.value,
@@ -1167,6 +1166,7 @@ defineExpose({
   flex-direction: column;
   box-sizing: border-box;
   margin-left: 16px;
+
   width: 100%;
   background: #fff;
   padding: 0px 24px 24px 24px;

src/views/final/content/ListContent.vue

@@ -1,8 +1,9 @@
 <script lang="ts" setup>
-import { computed, onMounted, reactive, ref, unref, watch,defineProps } from 'vue'
+import { computed, defineProps, onMounted, reactive, ref, unref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { chunk } from 'lodash-es'
+import { chunk, cloneDeep } from 'lodash-es'
 import { useDialog, useMessage } from 'naive-ui'
+import dayjs from 'dayjs'
 import { RepeatModal, RepeatTaskTableModal } from '../comp'
 import testImg from '@/assets/images/test.png'
 import type { RowData } from '@/config/final'
@@ -10,10 +11,16 @@ import { getFinalList } from '@/api/final'
 import { useFinal } from '@/store/modules/final'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { audit } from '@/api/task/task'
-import dayjs from 'dayjs'
-import { cloneDeep } from 'lodash-es'
+
 import NotPassed from '@/components/Approval/NotPassed.vue'
 
+const props = defineProps({
+
+  taskvalue: {
+    type: String,
+    default: '',
+  },
+})
 const emit = defineEmits(['changeShow'])
 const dialog = useDialog()
 const message = useMessage()
@@ -26,13 +33,6 @@ const total = ref(0)
 const scrollContainer = ref(null)
 const tableData = ref<any>([])
 const finalStore = useFinal()
-const props = defineProps({
-
-  taskvalue: {
-    type: String,
-    default: ""
-  }
-});
 let num = 1
 const pagination = reactive({
   page: 1,
@@ -103,23 +103,21 @@ async function initData(
     // console.log(asideParmas.izyear)
     // asideParmas.izuptime = cloneDeep(asideParmas.izyear)
     // asideParmas.izuptime = asideParmas.izyear.split(",");
-     let ontime = dayjs(asideParmas.izyear[0]).format(
+    const ontime = dayjs(asideParmas.izyear[0]).format(
       'YYYY/MM/DD',
     )
-     let twotime = dayjs(asideParmas.izyear[1]).format(
+    const twotime = dayjs(asideParmas.izyear[1]).format(
       'YYYY/MM/DD',
     )
-      asideParmas.izuptime =ontime+"-"+twotime
+    asideParmas.izuptime = `${ontime}-${twotime}`
     // delete asideParmas.izyear
-    
   }
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
-  let params = asideParmas
-  if (params?.izshowall == true)
-  {
+  const params = asideParmas
+  if (params?.izshowall == true) {
     params.isFail = true
-      delete params.izshowall;
+    delete params.izshowall
   }
   const result = await getFinalList({
     sortorder: sortorder.value,
@@ -162,23 +160,21 @@ async function query(
     // console.log(asideParmas.izyear)
     // asideParmas.izuptime = cloneDeep(asideParmas.izyear)
     // asideParmas.izuptime = asideParmas.izyear.split(",");
-     let ontime = dayjs(asideParmas.izyear[0]).format(
+    const ontime = dayjs(asideParmas.izyear[0]).format(
       'YYYY/MM/DD',
     )
-     let twotime = dayjs(asideParmas.izyear[1]).format(
+    const twotime = dayjs(asideParmas.izyear[1]).format(
       'YYYY/MM/DD',
     )
-      asideParmas.izuptime =ontime+"-"+twotime
+    asideParmas.izuptime = `${ontime}-${twotime}`
     // delete asideParmas.izyear
-    
   }
   let params = asideParmas
-  if (params?.izshowall == true)
-  {
+  if (params?.izshowall == true) {
     params.isFail = true
-      delete params.izshowall;
+    delete params.izshowall
   }
-  params = params?.izshowall ? {isFail:true} : params;
+  params = params?.izshowall ? { isFail: true } : params
   const result = await getFinalList({
     sortorder: sortorder.value,
     pageSize,
@@ -189,7 +185,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) {
@@ -423,7 +419,6 @@ function checkBottom() {
   if (!container)
     return
 
-
   // const { scrollTop, clientHeight, scrollHeight } = container;
   const scrollTop = window.pageYOffset || document.documentElement.scrollTop
 
@@ -753,6 +748,7 @@ defineExpose({
   flex-direction: column;
   box-sizing: border-box;
   margin-left: 16px;
+     margin-right: 16px;
   width: 100%;
   background: #fff;
   padding: 0px 24px 24px 24px;

src/views/home/aside/Aside.vue

@@ -224,7 +224,7 @@ function newFilterOk() {
     filterModalRef.value.pagination.page,
     filterModalRef.value.pagination.pageSize,
   )
-  filterModalRef.value.showModal()
+  filterModalRef.value.closeModal()
 }
 
 // 滚动容器，让key对应模块处于可视区域
@@ -359,6 +359,7 @@ useKeydown('s', () => setShowSearch(true))
   border: 1px solid #efeff5;
   border-radius: 3px;
   box-sizing: border-box;
+   margin-left: 16px;
 
   &-header {
     padding: 10px;

src/views/home/aside/comp/items/Time.vue

@@ -1,71 +1,75 @@
 <script lang="ts" setup>
-import dayjs from "dayjs";
-import { onUpdated, watch } from "vue";
-import { onMounted, ref } from "vue";
-import { useConfig } from "@/store/modules/asideConfig";
-import { useFinal } from '@/store/modules/final'
+import dayjs from 'dayjs'
+import { onMounted, onUpdated, ref, watch } from 'vue'
 
-const configUseStore = useConfig();
+import { useConfig } from '@/store/modules/asideConfig'
+import { useFinal } from '@/store/modules/final'
 
+const props = defineProps<{
+  value: [number, number] | null
+  label: string
+}>()
+const emit = defineEmits<{
+  (e: 'update:value', value: number[]): void
+}>()
+const configUseStore = useConfig()
+const time = ref<[number, number] | null>(props.value)
+const timeold = ref<[number, number] | null>(props.value)
+const isLoadValue = ref(false)
 configUseStore.$subscribe(() => {
   if (isLoadValue.value) {
-    isLoadValue.value = false;
-    return;
+    isLoadValue.value = false
+    return
   }
-  let asideValue = configUseStore.getAsideValue;
-  if (asideValue["izyear"]) {
-    time.value = asideValue["izyear"];
-  } else {
-    time.value = null;
-  }
-});
+  const asideValue = configUseStore.getAsideValue
+  if (asideValue.izyear)
+    time.value = asideValue.izyear
+  else
+    time.value = null
+})
 
 const finalStore = useFinal()
 finalStore.$subscribe(() => {
   if (isLoadValue.value) {
-    isLoadValue.value = false;
-    return;
-  }
-  let asideValue = finalStore.getAsideValue;
-  console.log("asideValue izyear", asideValue);
-  if (asideValue && asideValue["izyear"]) {
-    time.value = asideValue["izyear"];
-  } else {
-    time.value = null;
+    isLoadValue.value = false
+    return
   }
-});
-
+  const asideValue = finalStore.getAsideValue
+  console.log('asideValue izyear', asideValue)
+  if (asideValue && asideValue.izyear)
+    time.value = asideValue.izyear
+  else
+    time.value = null
+})
 
-const props = defineProps<{
-  value: [number, number] | null;
-  label: string;
-}>();
-
-const emit = defineEmits<{
-  (e: "update:value", value: number[]): void;
-}>();
-
-const time = ref<[number, number] | null>(props.value);
-const isLoadValue = ref(false);
 function onChange(value: [number, number]) {
-  isLoadValue.value = true;
-  emit("update:value", value);
+  isLoadValue.value = true
+  emit('update:value', value)
 }
 onMounted(() => {
   if (!props.value) {
     // 获取当前日期
-    const currentDate = dayjs();
+    const currentDate = dayjs()
     // 计算前三个月的起始日期和结束日期
-    const endDate = currentDate.toDate();
-    const startDate = currentDate.subtract(3, "month").toDate();
+    const endDate = currentDate.toDate()
+    const startDate = currentDate.subtract(3, 'month').toDate()
     // 设置默认日期范围为前三个月的起始日期到三个月前的今天
-    time.value = [startDate.getTime(), endDate.getTime()];
-    console.log("time init", startDate.getTime(), endDate.getTime());
+    timeold.value = [startDate.getTime(), endDate.getTime()]
+    time.value = [startDate.getTime(), endDate.getTime()]
+    console.log('time init', startDate.getTime(), endDate.getTime())
     setTimeout(() => {
-      emit("update:value", [startDate.getTime(), endDate.getTime()]);
-    }, 300);
+      emit('update:value', [startDate.getTime(), endDate.getTime()])
+    }, 300)
   }
-});
+})
+watch(
+  () => time.value,
+  () => {
+    // console.log(time.value)
+    if (time.value == null)
+      time.value = timeold.value
+  },
+)
 </script>
 
 <template>
@@ -77,10 +81,12 @@ onMounted(() => {
             v-model:value="time"
             type="daterange"
             :clearable="false"
-            @update:value="onChange"
             placeholder="请选择"
+            @update:value="onChange"
           >
-            <template #separator> 至 </template>
+            <template #separator>
+              至
+            </template>
           </n-date-picker>
         </n-space>
       </n-collapse-item>

src/views/home/aside/comp/modals/FilterModal.vue

@@ -358,6 +358,7 @@ function closeModal() {
 
 defineExpose({
   showModal,
+  closeModal,
   query,
   pagination,
 })

src/views/home/aside/comp/modals/NewFilterModal.vue

@@ -217,8 +217,8 @@ function showModal() {
   typeOptions.value = list
   show.value = true
   setTimeout(() => {
-    formValue.name = ''
-  }, 300);
+    // formValue.name = ''
+  }, 300)
 }
 
 function closeModal() {

src/views/task/aside/Aside.vue

@@ -200,7 +200,7 @@ function newFilterOk() {
     filterModalRef.value.pagination.page,
     filterModalRef.value.pagination.pageSize,
   )
-  filterModalRef.value.showModal()
+  filterModalRef.value.closeModal()
 }
 onBeforeMount(async () => {
   configStore.fetchConfig()
@@ -336,6 +336,8 @@ function handleOk(item: any) {
   border: 1px solid rgb(239, 239, 245);
   border-radius: 3px;
   box-sizing: border-box;
+   margin-left: 16px;
+    margin-right: 16px;
 
   &-header {
     padding: 12px 16px;

src/views/task/content/Content.vue

@@ -126,6 +126,10 @@ function changeimgbigshow() {
 // 键盘左右箭头快捷切换
 useKeydown('right', forwardHandler)
 useKeydown('left', backHandler)
+useKeydown('c', () => {
+  isFullScreen.value = false
+  imgbigshow.value = false
+})
 useKeydown('p p', () => {
   const item = taskDetailInfo.value
   if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
@@ -706,7 +710,7 @@ function nodrage() {
             <template #icon>
               <SvgIcon name="revoke" />
             </template>
-            返回
+            返回1
           </n-button>
           <img
             class="btn-approval btn-left"
@@ -1429,6 +1433,7 @@ function nodrage() {
   flex-direction: column;
   box-sizing: border-box;
   margin-left: 16px;
+    margin-right: 16px !important;
   padding: 16px 16px 0px 16px;
   background: #fff;
   border-radius: 3px;

src/views/task/index.vue

@@ -1,14 +1,14 @@
 <script lang="ts" setup>
-import { ref } from "vue";
-import Aside from "./aside/Aside.vue";
-import Content from "./content/Content.vue";
-import DataHeader from "@/components/DataHeader/index.vue";
+import { ref } from 'vue'
+import Aside from './aside/Aside.vue'
+import Content from './content/Content.vue'
+import DataHeader from '@/components/DataHeader/index.vue'
 import Robot from '@/components/Robot/index.vue'
 
-const asideRef: any = ref(null);
+const asideRef: any = ref(null)
 
 function setAsideItemName(text) {
-  asideRef.value.setAsideItemName(text);
+  asideRef.value.setAsideItemName(text)
 }
 </script>
 
@@ -37,6 +37,8 @@ function setAsideItemName(text) {
 }
 :deep(.header_wrap){
   margin-top: 3px !important;
+  margin-left: 16px;
+   margin-right: 16px;
     background: #FFFFFF;
 }
 .main {

src/views/task/modal/NewFilterModal.vue

@@ -194,8 +194,8 @@ watch(
 function showModal() {
   show.value = true
   setTimeout(() => {
-    formValue.name = ''
-  }, 300);
+    // formValue.name = ''
+  }, 300)
 }
 
 function closeModal() {

src/views/worksheet/aside/Aside.vue

@@ -265,6 +265,7 @@ if (searchContent) {
   border: 1px solid rgb(239, 239, 245);
   border-radius: 3px;
   box-sizing: border-box;
+   margin-left: 16px;
 
   &-header {
     padding: 12px 16px;

src/views/worksheet/content/Content.vue

@@ -988,7 +988,8 @@ defineExpose({
   flex: 1;
   flex-direction: column;
   box-sizing: border-box;
-  margin-left: 16px;
+  margin-left: 16px !important;
+   margin-right: 16px !important;
   padding: 16px 16px 0px 16px;
   background: #fff;
   border-radius: 3px;

src/views/worksheet/index.vue

@@ -33,6 +33,8 @@ function ApprovalOver(packageId) {
 <style lang="less" scoped>
 :deep(.header_wrap){
   margin-top: 3px !important;
+   margin-left: 16px;
+    margin-right: 16px;
     background: #FFFFFF;
 }
 .main {