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 |  143 +++++++++++++++++++++++++++++++----------------
 1 files changed, 93 insertions(+), 50 deletions(-)

diff --git a/src/views/system/monitor/video/index.vue b/src/views/system/monitor/video/index.vue
index 06196a0..7cf8ee8 100644
--- a/src/views/system/monitor/video/index.vue
+++ b/src/views/system/monitor/video/index.vue
@@ -2,13 +2,17 @@
 
   <div class="app-container">
     <div
-      style="display: flex;flex-direction: row;min-width: 158px;max-width: 158px;margin-bottom: 5px;border-radius: 1px; user-select: none"
+      style="display: flex;flex-direction: row;min-width: 300px;max-width: 300px;margin-bottom: 5px;border-radius: 1px; user-select: none"
     >
       <div @click="clickTab(null)" class="tab"
-           :class="{tabActive: null == queryParams.provinceTag, tabInactive: null != queryParams.provinceTag}">鍏ㄩ儴
+           :class="{tabActive: !queryParams.provinceTag && !queryParams.deptTag, tabInactive: queryParams.provinceTag || queryParams.deptTag}">
+        鍏ㄩ儴
       </div>
       <div @click="clickTab(0)" class="tab"
-           :class="{tabActive: 0 === queryParams.provinceTag, tabInactive: 0 !== queryParams.provinceTag}">鐪佸巺鑰冩牳
+           :class="{tabActive: queryParams.provinceTag, tabInactive: !queryParams.provinceTag}">鐪佸巺鑰冩牳
+      </div>
+      <div @click="clickTab(1)" class="tab"
+           :class="{tabActive: queryParams.deptTag, tabInactive: !queryParams.deptTag}">鍏畨閮ㄨ�冩牳
       </div>
     </div>
     <el-card class="box-card">
@@ -33,6 +37,10 @@
               <p>寮傚父鏁�</p>
             </div>
             <div class="dashboard-item">
+              <h3 style="color: #4f4f4f">{{ count.unknownNumbers }}</h3>
+              <p>鏈煡鏁�</p>
+            </div>
+            <div class="dashboard-item">
               <h3>{{ count.viewsPercentage }}%</h3>
               <p>璁惧杩愯鐜�</p>
             </div>
@@ -46,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">
@@ -71,6 +80,7 @@
               v-model="queryParams.onState"
               placeholder="璁惧鐘舵��"
               clearable
+              @change="handleQuery"
               style="width: 100px"
             >
               <el-option
@@ -90,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
@@ -105,7 +116,7 @@
                   placeholder="閫夋嫨鏈�">
                 </el-date-picker>
               </el-form-item>
-              <el-form-item label="鍖哄幙" prop="deptIds" required>
+              <el-form-item label="鍖哄幙" prop="deptIds">
                 <el-select v-model="exportForm.deptIds" multiple clearable>
                   <el-option
                     v-for="dept in deptList"
@@ -127,27 +138,27 @@
               </el-form-item>
               <el-form-item label="鏁版嵁绫诲瀷" prop="dataType" required>
                 <el-radio-group v-model="exportForm.dataType">
-<!--                  <div style="display: flex;margin-bottom: 10px;">-->
-<!--                    <div style="width: 48%">-->
-                      <el-radio :label="0">鎬婚噺鏁版嵁</el-radio>
-<!--                    </div>-->
-<!--                    <div style="width: 48%">-->
-                      <el-radio :label="1">姣忔棩鍦ㄧ嚎鎯呭喌</el-radio>
-<!--                    </div>-->
-<!--                  </div>-->
-<!--                  <div style="display: flex;">-->
-<!--                    <div style="width: 48%">-->
-                      <el-radio :label="2">姣忔棩褰曞儚鎯呭喌</el-radio>
-<!--                    </div>-->
-<!--                    <div style="width: 48%">-->
-                      <el-radio :label="3">姣忔棩褰曞儚缂哄け鏃堕暱</el-radio>
-<!--                    </div>-->
-<!--                  </div>-->
+                  <!--                  <div style="display: flex;margin-bottom: 10px;">-->
+                  <!--                    <div style="width: 48%">-->
+                  <el-radio :label="0">鎬婚噺鏁版嵁</el-radio>
+                  <!--                    </div>-->
+                  <!--                    <div style="width: 48%">-->
+                  <el-radio :label="1">姣忔棩鍦ㄧ嚎鎯呭喌</el-radio>
+                  <!--                    </div>-->
+                  <!--                  </div>-->
+                  <!--                  <div style="display: flex;">-->
+                  <!--                    <div style="width: 48%">-->
+                  <el-radio :label="2">姣忔棩褰曞儚鎯呭喌</el-radio>
+                  <!--                    </div>-->
+                  <!--                    <div style="width: 48%">-->
+                  <el-radio :label="3">姣忔棩褰曞儚缂哄け鏃堕暱</el-radio>
+                  <!--                    </div>-->
+                  <!--                  </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>
@@ -161,7 +172,13 @@
       <el-table-column label="ip" align="center" prop="ip" width="180"/>
       <el-table-column label="鏍囩" align="center" width="180" v-if="columns[0].visible">
         <template slot-scope="scope">
-          <div>{{ scope.row.provinceTag == 0 ? "鐪佸巺" : "甯傚眬" }}</div>
+          <div>
+            {{
+              (
+                (scope.row.provinceTagVideo ? '鐪佸巺銆�' : '') +
+                (scope.row.deptTag ? '鍏畨閮ㄣ��' : '')).replace(/銆�$/, '')
+            }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="鍖哄煙" align="center" prop="area" width="180" v-if="columns[1].visible"/>
@@ -195,18 +212,18 @@
           <div>{{ (scope.row.videoLoseTime * 60).toFixed(2) + '鍒嗛挓' }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="OSD鏍囨敞" align="center" prop="OSD" width="180" v-if="columns[10].visible">
+      <el-table-column label="OSD鏍囨敞" align="center" prop="osd" width="180" v-if="columns[10].visible">
         <template slot-scope="scope">
-          <div v-if="scope.row.OSD === 1">姝e父</div>
-          <div v-else-if="scope.row.OSD === 0">鏈煡</div>
-          <div v-else-if="scope.row.OSD === -1">寮傚父</div>
+          <div v-if="scope.row.osd ==true">姝e父</div>
+          <div v-else-if="scope.row.osd == false">寮傚父</div>
+          <div v-else-if="scope.row.osd == null">鏈煡</div>
         </template>
       </el-table-column>
-      <el-table-column label="OSD鏃堕棿" align="center" prop="OSDTime" width="180" v-if="columns[11].visible">
+      <el-table-column label="OSD鏃堕棿" align="center" prop="osdtime" width="180" v-if="columns[11].visible">
         <template slot-scope="scope">
-          <div v-if="scope.row.OSDTime === 1">姝e父</div>
-          <div v-else-if="scope.row.OSDTime === 0">鏈煡</div>
-          <div v-else-if="scope.row.OSDTime === -1">寮傚父</div>
+          <div v-if="scope.row.osdtime ==true">姝e父</div>
+          <div v-else-if="scope.row.osdtime == false">寮傚父</div>
+          <div v-else-if="scope.row.osdtime == null">鏈煡</div>
         </template>
       </el-table-column>
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
@@ -237,10 +254,16 @@
           <el-form-item label="璁惧鍚嶇О锛�">{{ form.name }}</el-form-item>
           <el-col :span="12">
             <el-form-item label="璁惧缂栫爜锛�">{{ form.serialNumber }}</el-form-item>
-            <el-form-item label="鏍囩锛�">{{ form.provinceTag == 0 ? '鐪佸巺' : '甯傚眬' }}</el-form-item>
+            <el-form-item label="鏍囩锛�">
+              {{
+                ((form.provinceTagVideo ? '鐪佸巺銆�' : '') +
+                (form.deptTag ? '鍏畨閮ㄣ��' : '')).replace(/銆�$/, '')
+              }}
+            </el-form-item>
             <el-form-item label="璁惧鐘舵�侊細">
-              <div v-if="form.onState === 0">寮傚父</div>
-              <div v-else-if="form.onState === 1">姝e父</div>
+              <div v-if="form.onState === 0">鏈煡</div>
+              <div v-else-if="form.onState === 1">鍦ㄧ嚎</div>
+              <div v-else-if="form.onState === -1">绂荤嚎</div>
             </el-form-item>
             <el-form-item label="绠$悊鍗曚綅锛�">{{ form.unitName }}</el-form-item>
           </el-col>
@@ -273,9 +296,9 @@
               <div v-else-if="form.videoComplete === -1">寮傚父</div>
             </el-form-item>
             <el-form-item label="OSD鏍囨敞锛�">
-              <div v-if="form.OSD === 1">姝e父</div>
-              <div v-else-if="form.OSD === 0">鏈煡</div>
-              <div v-else-if="form.OSD === -1">寮傚父</div>
+              <div v-if="form.osd ==true">姝e父</div>
+              <div v-else-if="form.osd ==false">寮傚父</div>
+              <div v-else-if="form.osd ==null">鏈煡</div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -284,9 +307,9 @@
             </el-form-item>
             <el-form-item label="褰曞儚缂哄け鏃堕暱锛�">{{ (form.videoLoseTime * 60).toFixed(2) + '鍒嗛挓' }}</el-form-item>
             <el-form-item label="OSD鏃堕棿锛�">
-              <div v-if="form.OSDTime === 1">姝e父</div>
-              <div v-else-if="form.OSDTime === 0">鏈煡</div>
-              <div v-else-if="form.OSDTime === -1">寮傚父</div>
+              <div v-if="form.osdtime ==true">姝e父</div>
+              <div v-else-if="form.osdtime ==false">寮傚父</div>
+              <div v-else-if="form.osdtime ==null">鏈煡</div>
             </el-form-item>
           </el-col>
         </el-row>
@@ -327,6 +350,7 @@
         totalPosts: 0,
         totalMembers: 0,
         postsPercentage: 0,
+        unknownNumbers: 0,
         totalViews: 0,
         noStore: 0,
         partStore: 0,
@@ -381,9 +405,6 @@
         month: [
           {required: true, message: "鏃堕棿涓嶈兘涓虹┖", trigger: "blur"}
         ],
-        deptIds: [
-          {required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur"}
-        ],
         dataType: [
           {required: true, message: "鏁版嵁绫诲瀷涓嶈兘涓虹┖", trigger: "blur"}
         ]
@@ -414,7 +435,16 @@
   },
   methods: {
     clickTab(active) {
-      this.queryParams.provinceTag = active
+      if (active === 0) {
+        this.queryParams.provinceTag = true
+        this.queryParams.deptTag = null
+      } else if (active === 1) {
+        this.queryParams.provinceTag = null
+        this.queryParams.deptTag = true
+      } else {
+        this.queryParams.provinceTag = null
+        this.queryParams.deptTag = null
+      }
       this.getList()
       this.getVideoCount()
     },
@@ -526,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