From d770ca905d659e50cb3efb7290043a35dd2ea379 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 一月 2025 11:52:37 +0800
Subject: [PATCH] 运行监控报表导出超时时间配置

---
 src/views/system/monitor/video/index.vue |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/views/system/monitor/video/index.vue b/src/views/system/monitor/video/index.vue
index bcf28ac..7cf8ee8 100644
--- a/src/views/system/monitor/video/index.vue
+++ b/src/views/system/monitor/video/index.vue
@@ -54,9 +54,10 @@
           <el-form-item label="鍏抽敭瀛�" prop="name">
             <el-input
               v-model="queryParams.name"
-              placeholder="璇疯緭鍏ュ叧閿瓧"
+              placeholder="璁惧鍚�/璁惧缂栫爜/IP/鍗曚綅鍚�"
               clearable
               @keyup.enter.native="handleQuery"
+              @clear="handleQuery"
             />
           </el-form-item>
           <el-form-item label="鍖哄煙" prop="onState">
@@ -79,6 +80,7 @@
               v-model="queryParams.onState"
               placeholder="璁惧鐘舵��"
               clearable
+              @change="handleQuery"
               style="width: 100px"
             >
               <el-option
@@ -98,11 +100,12 @@
         </el-form>
         <!-- 瀵煎嚭鎸夐挳 -->
         <div v-hasPermi="['system:monitor:export']">
+          <el-button style="margin-right: 10px" slot="reference" type="primary" size="mini" @click="handleExport" plain >瀵煎嚭</el-button>
           <el-popover
             placement="left"
             width="300px"
             trigger="click">
-            <span style="font-weight: bold;font-size: 16px">瀵煎嚭</span>
+            <span style="font-weight: bold;font-size: 16px">瀵煎嚭鎶ヨ〃</span>
             <el-form ref="exportForm" :model="exportForm" :rules="exportRules" label-width="100px">
               <el-form-item label="鑰冩牳鏃堕棿" prop="month" required>
                 <el-date-picker
@@ -153,9 +156,9 @@
                   <!--                  </div>-->
                 </el-radio-group>
               </el-form-item>
-              <el-button type="primary" size="small" style="width: 400px" @click="handleExport">瀵煎嚭</el-button>
+              <el-button type="primary" size="small" style="width: 100%" @click="handleFormExport">瀵煎嚭</el-button>
             </el-form>
-            <el-button slot="reference" type="primary" size="mini" plain>瀵煎嚭</el-button>
+            <el-button slot="reference" type="primary" size="mini" plain>瀵煎嚭鎶ヨ〃</el-button>
           </el-popover>
         </div>
       </el-col>
@@ -172,7 +175,7 @@
           <div>
             {{
               (
-                (scope.row.provinceTag ? '鐪佸巺銆�' : '') +
+                (scope.row.provinceTagVideo ? '鐪佸巺銆�' : '') +
                 (scope.row.deptTag ? '鍏畨閮ㄣ��' : '')).replace(/銆�$/, '')
             }}
           </div>
@@ -253,7 +256,7 @@
             <el-form-item label="璁惧缂栫爜锛�">{{ form.serialNumber }}</el-form-item>
             <el-form-item label="鏍囩锛�">
               {{
-                ((form.provinceTag ? '鐪佸巺銆�' : '') +
+                ((form.provinceTagVideo ? '鐪佸巺銆�' : '') +
                 (form.deptTag ? '鍏畨閮ㄣ��' : '')).replace(/銆�$/, '')
               }}
             </el-form-item>
@@ -553,24 +556,37 @@
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
+      this.download('system/monitor/export', {
+        ...this.queryParams
+      }, `monitor_${new Date().getTime()}.xlsx`)
+    },
+    handleFormExport() {
       this.$refs["exportForm"].validate(valid => {
         if (valid) {
           if (this.exportForm.dataType === 0) {
             this.download('system/monitor/export/video/total', {
               ...this.exportForm,
-            }, `鎬婚噺鎯呭喌_${new Date().getTime()}.xlsx`)
+            }, `鎬婚噺鎯呭喌_${new Date().getTime()}.xlsx`, {
+              timeout: 60000
+            })
           } else if (this.exportForm.dataType === 1) {
             this.download('system/monitor/export/video/online', {
               ...this.exportForm,
-            }, `鐐逛綅鍦ㄧ嚎_${new Date().getTime()}.xlsx`)
+            }, `鐐逛綅鍦ㄧ嚎_${new Date().getTime()}.xlsx`, {
+              timeout: 60000
+            })
           } else if (this.exportForm.dataType === 2) {
             this.download('system/monitor/export/video/record', {
               ...this.exportForm,
-            }, `褰曞儚鎯呭喌_${new Date().getTime()}.xlsx`)
+            }, `褰曞儚鎯呭喌_${new Date().getTime()}.xlsx`, {
+              timeout: 60000
+            })
           } else if (this.exportForm.dataType === 3) {
             this.download('system/monitor/export/video/loseTime', {
               ...this.exportForm,
-            }, `褰曞儚缂哄け鏃堕暱_${new Date().getTime()}.xlsx`)
+            }, `褰曞儚缂哄け鏃堕暱_${new Date().getTime()}.xlsx`, {
+              timeout: 60000
+            })
           }
         }
       });

--
Gitblit v1.8.0