1

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240923162621"
+  "value": "20240923175228"
 }

src/views/home/datav.vue

@@ -14,8 +14,8 @@
                     <div ref="searchRef" class="relative">
                         <HcDatavSelect v-model="searchForm.year" :datas="yearArr" :clearable="false" @change="searchChange" />
                         <HcDatavSelect v-model="pageType" :datas="pageTypeArr" :clearable="false" @change="pageTypeChange" />
-                        <HcDatavSelect v-model="searchForm.month" :datas="monthArr" placeholder="时间" @change="searchChange" />
                         <template v-if="pageType === '1'">
+                            <HcDatavSelect v-model="searchForm.month" :datas="monthArr" placeholder="时间" @change="searchChange" />
                             <HcDatavSelect v-model="searchForm.projectScheduleType" :datas="lagArr" placeholder="项目状态" @change="searchChange" />
                             <HcDatavSelect v-if="searchForm.projectScheduleType === '3'" v-model="searchForm.projectScheduleGrade" :datas="levelArr" placeholder="滞后等级" @change="searchChange" />
                         </template>
@@ -370,7 +370,7 @@ const lagArr = [{ id: '-1', name: '所有' }, { id: '1', name: '超进度项目'
 const levelArr = [{ id: '1', name: '一级' }, { id: '2', name: '二级' }, { id: '3', name: '三级' }, { id: '-1', name: '所有' }]
 const stageArr = ref([])
 const typeArr = ref([])
-const quarterArr = [{ id: '1', name: '一季度' }, { id: '2', name: '二季度' }, { id: '3', name: '三季度' }, { id: '4', name: '四季度' }]
+const quarterArr = [{ id: '-1', name: '所有' }, { id: '1', name: '一季度' }, { id: '2', name: '二季度' }, { id: '3', name: '三季度' }, { id: '4', name: '四季度' }]
 
 const getProType = async () => {
     typeArr.value = []
@@ -418,10 +418,9 @@ const pageTypeChange = (type) => {
 //获取工作要点的数据
 const workInfo = ref({})
 const queryWorkFocusDataInfo = async () => {
-    const { year, projectStage, month } = searchForm.value
+    const { year, projectStage } = searchForm.value
     const { data } = await projectApi.queryWorkFocusDataInfo({
         year: year,
-        month: month,
         workFocusStage: projectStage || '',
     })
     const res = getObjValue(data)
@@ -607,19 +606,22 @@ const workColumn = ref([
 const searchQuarterChange = () => {
     const { quarter } = searchForm.value
     const newArr = [{ key: 'workFocusStageName', name: '项目阶段' }, { key: 'targetPlan', name: '目标任务' }, { key: 'workPlan', name: '工作内容' }]
-    if (quarter === '1') {
+    if (quarter === '1' || quarter === '-1') {
         newArr.push({ key: 'month1', name: '1月' })
         newArr.push({ key: 'month2', name: '2月' })
         newArr.push({ key: 'month3', name: '3月' })
-    } else if (quarter === '2') {
+    }
+    if (quarter === '2' || quarter === '-1') {
         newArr.push({ key: 'month4', name: '4月' })
         newArr.push({ key: 'month5', name: '5月' })
         newArr.push({ key: 'month6', name: '6月' })
-    } else if (quarter === '3') {
+    }
+    if (quarter === '3' || quarter === '-1') {
         newArr.push({ key: 'month7', name: '7月' })
         newArr.push({ key: 'month8', name: '8月' })
         newArr.push({ key: 'month9', name: '9月' })
-    } else if (quarter === '4') {
+    }
+    if (quarter === '4' || quarter === '-1') {
         newArr.push({ key: 'month10', name: '10月' })
         newArr.push({ key: 'month11', name: '11月' })
         newArr.push({ key: 'month12', name: '12月' })

src/views/project/admin/list.vue

@@ -88,6 +88,7 @@ import { onMounted, ref } from 'vue'
 import HcTableList from '../modules/project-list.vue'
 import { arrToId, formValidate, getArrValue, isNullES, newDownBlob, newWindow } from 'js-fast-way'
 import { getDictionaryData } from '~src/utils/tools'
+import config from '~src/config/index'
 import mainApi from '~api/project/project'
 import { useClick } from 'hc-vue3-ui'
 
@@ -266,13 +267,18 @@ const downloadTemplateLoading = ref(false)
 const downloadTemplate = async () => {
     await useClick() //这里要使用 await 来等待
     downloadTemplateLoading.value = true
-    const { error, data, msg, val } = await mainApi.exportTemplate()
+    const { error, data, msg } = await mainApi.exportTemplate()
     downloadTemplateLoading.value = false
     if (error && isNullES(data)) {
         window.$message?.error(msg ?? '数据异常')
         return
     }
-    await newDownBlob(val)
+    console.log(data)
+    if (config.localModel) {
+        window.electron.ipcRenderer.invoke('download-file', { url: data })
+    } else {
+        newWindow(data)
+    }
 }
 
 //上传完成