feat: taskOperateType

src/views/realm/report/api.js

@@ -103,38 +103,30 @@ export function getOnlineDurationExcel () {
     url: '/excel/export?type=DEVICE_ONLINE_TOTAL',
     method: 'POST',
     data: addTenant()
-  }, downloadRequest).then(response => {
-    download(response, `在线时长${parseTime(new Date(), '{y}{m}{d}{h}{i}{s}')}.xlsx`)
   })
 }
 
-export function getRangeOnlineDurationExcel (data, fileName = '') {
+export function getRangeOnlineDurationExcel (data) {
   return send({
     url: '/excel/export?type=DEVICE_ONLINE_RANGEDAY',
     method: 'POST',
     data: addTenant(data)
-  }, downloadRequest).then(response => {
-    download(response, `在线时长${parseTime(new Date(), '{y}{m}{d}{h}{i}{s}')}_${fileName}.xlsx`)
   })
 }
 
-export function getDepartmentOnlineDurationExcel (department, fileName = '') {
+export function getDepartmentOnlineDurationExcel (department) {
   return send({
     url: '/excel/export?type=DEVICE_ONLINE_TOTAL',
     method: 'POST',
     data: { department }
-  }, downloadRequest).then(response => {
-    download(response, `在线时长${parseTime(new Date(), '{y}{m}{d}{h}{i}{s}')}_${fileName}.xlsx`)
   })
 }
 
-export function getDepartmentRangeOnlineDurationExcel (data, fileName = '') {
+export function getDepartmentRangeOnlineDurationExcel (data) {
   return send({
     url: '/excel/export?type=DEVICE_ONLINE_RANGEDAY',
     method: 'POST',
     data
-  }, downloadRequest).then(response => {
-    download(response, `在线时长${parseTime(new Date(), '{y}{m}{d}{h}{i}{s}')}_${fileName}.xlsx`)
   })
 }
 

src/views/realm/report/components/OnlineDurationDialog.vue

@@ -76,18 +76,30 @@ export default {
           getRangeOnlineDurationExcel({
             sumDateFrom: this.dateRange[0],
             sumDateTo: this.dateRange[1]
-          }, time).then(done)
+          }, time).then(({ data: { type } }) => {
+            this.$emit('added', type)
+            done()
+          })
         } else {
           getDepartmentRangeOnlineDurationExcel({
             department: this.$group.path,
             sumDateFrom: this.dateRange[0],
             sumDateTo: this.dateRange[1]
-          }, `${this.$group.name}_${time}`).then(done)
+          }, `${this.$group.name}_${time}`).then(({ data: { type } }) => {
+            this.$emit('added', type)
+            done()
+          })
         }
       } else if (this.tenant === groupPath) {
-        getOnlineDurationExcel().then(done)
+        getOnlineDurationExcel().then(({ data: { type } }) => {
+          this.$emit('added', type)
+          done()
+        })
       } else {
-        getDepartmentOnlineDurationExcel(this.$group.path, this.$group.name).then(done)
+        getDepartmentOnlineDurationExcel(this.$group.path, this.$group.name).then(({ data: { type } }) => {
+          this.$emit('added', type)
+          done()
+        })
       }
     }
   }

src/views/realm/report/components/ServerAsyncTaskDialog.vue

@@ -9,14 +9,15 @@
 
 <script>
 import {
-  AppletOrderType, TaskStatus
+  TaskStatus, TaskOperateType
 } from '@/constant.js'
 import { getServerAsyncTasks } from '../api.js'
 
 const TypeInfo = {
-  [AppletOrderType.PACKAGE]: '大屏播出单',
-  [AppletOrderType.SOON]: '大屏上下线记录',
-  [AppletOrderType.DAILY]: '人流量统计'
+  [TaskOperateType.DEPRECATED_STATUS]: '大屏播出单',
+  [TaskOperateType.DEPRECATED_ADD]: '大屏上下线记录',
+  [TaskOperateType.STATUS]: '人流量统计',
+  [TaskOperateType.ADD]: '在线时长'
 }
 
 export default {
@@ -35,9 +36,10 @@ export default {
         condition: { type: this.type },
         filters: [
           { key: 'type', type: 'select', options: [
-            { value: AppletOrderType.PACKAGE, label: '大屏播出单' },
-            { value: AppletOrderType.SOON, label: '大屏上下线记录' },
-            { value: AppletOrderType.DAILY, label: '人流量统计' }
+            { value: TaskOperateType.DEPRECATED_STATUS, label: '大屏播出单' },
+            { value: TaskOperateType.DEPRECATED_ADD, label: '大屏上下线记录' },
+            { value: TaskOperateType.STATUS, label: '人流量统计' },
+            { value: TaskOperateType.ADD, label: '在线时长' }
           ], placeholder: '任务类型' },
           { key: 'status', type: 'select', options: [
             { value: TaskStatus.CANCELLED, label: '待完成' },

src/views/realm/report/index.vue

@@ -125,7 +125,10 @@
     <program-guide-dialog ref="programGuideDialog" />
     <device-ad-dialog ref="deviceAdDialog" />
     <program-plays-dialog ref="programPlaysDialog" />
-    <online-duration-dialog ref="onlineDurationDialog" />
+    <online-duration-dialog
+      ref="onlineDurationDialog"
+      @added="showServerAsyncTask"
+    />
     <people-counting-dialog
       ref="peopleCountingDialog"
       @added="showServerAsyncTask"