From 426c8b34e6c0a6f97de69864c537cf5e0d7dbb08 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 15 十二月 2022 18:13:34 +0800
Subject: [PATCH] 2022-12-15 趋势分析 地图位置 ，弹窗修改

---
 src/views/operate/log/index.vue |   83 +++++++++++++++++++++--------------------
 1 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue
index 1e2d8fc..b9de74f 100644
--- a/src/views/operate/log/index.vue
+++ b/src/views/operate/log/index.vue
@@ -3,35 +3,42 @@
     <header>
       <div class="header-nav">
         <span class="nav-left">鏁版嵁绛涢��</span>
-        <span class="nav-right">楂樼骇鎼滅储</span>
+        <!-- <span class="nav-right">楂樼骇鎼滅储</span> -->
       </div>
       <div class="header-content">
         <div class="search">
           <span>杈撳叆鏌ヨ:</span>
-          <el-input placeholder="鍐呭淇℃伅" v-model="context"></el-input>
+
+          <div class="option">
+            <el-input placeholder="鍐呭淇℃伅" v-model="context"></el-input>
+          </div>
         </div>
         <div class="message-status">
           <span>鎿嶄綔绫诲瀷:</span>
-          <el-select v-model="operationType">
-            <el-option
-              v-for="item in operationTypeList"
-              :key="item.id"
-              :label="item.operationType"
-              :value="item.operationType"
-            >
-            </el-option>
-          </el-select>
+          <div class="option">
+            <el-select v-model="operationType">
+              <el-option
+                v-for="item in operationTypeList"
+                :key="item.id"
+                :label="item.operationType"
+                :value="item.operationType"
+              >
+              </el-option>
+            </el-select>
+          </div>
         </div>
         <div class="message-kind">
           <span>鏃堕棿鑼冨洿:</span>
-          <el-date-picker
-            v-model="mytime"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="寮�濮嬫棩鏈�"
-            end-placeholder="缁撴潫鏃ユ湡"
-          >
-          </el-date-picker>
+          <div class="option">
+            <el-date-picker
+              v-model="mytime"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="寮�濮嬫棩鏈�"
+              end-placeholder="缁撴潫鏃ユ湡"
+            >
+            </el-date-picker>
+          </div>
         </div>
         <div class="find">
           <el-button
@@ -81,7 +88,7 @@
             prop="createTime"
             label="鏃ュ織鏃堕棿"
             min-width="10"
-            :sort-orders="['descending','ascending']"
+            :sort-orders="['descending', 'ascending']"
             sortable="custom"
           >
             <template slot-scope="scope">
@@ -147,7 +154,7 @@
   </div>
 </template>
 <script>
-import {getNowDate} from '@/utils/helper'
+import { downloadFile, getNowDate } from "@/utils/helper";
 import helper from "@/utils/mydate";
 import { parseTime } from "@/utils/index";
 import { createNamespacedHelpers } from "vuex";
@@ -201,7 +208,6 @@
     async handleExport() {
       const { currentPage, pageSize, context, operationType, mysort, mytime } =
         this;
-      console.log(mytime);
       let arr = await this.exportLogs({
         content: context,
         current: currentPage,
@@ -209,7 +215,7 @@
         id: "",
         operationType: operationType === "鍏ㄩ儴" ? "" : operationType,
         portEquipment: "",
-        size: pageSize,
+        size: 50000,
         startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
         sort: mysort,
       });
@@ -223,7 +229,7 @@
       const href = window.URL.createObjectURL(blob);
       downloadElement.href = href;
       // // 涓嬭浇鍚庢枃浠跺悕
-      downloadElement.download = fileName + '鏃ュ織鏁版嵁.xlsx';
+      downloadElement.download = fileName + "鏃ュ織鏁版嵁.xlsx";
       document.body.appendChild(downloadElement);
       // 鐐瑰嚮涓嬭浇
       downloadElement.click();
@@ -284,7 +290,6 @@
     async getLogList() {
       const { currentPage, pageSize, context, operationType, mysort, mytime } =
         this;
-      console.log(mytime);
       let arr = await this.getLogsList({
         content: context,
         current: currentPage,
@@ -296,12 +301,10 @@
         startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
         sort: mysort,
       });
-      console.log(arr);
       return arr.data.data;
     },
     // 鎵归噺涓嬫媺妗嗘搷浣�
     async selectChange(list) {
-      console.log(this.tempList);
       if (this.tempList.length !== 0) {
         this.preMyIdx = list;
         if (list === 3) {
@@ -344,12 +347,9 @@
                 message: res.message,
               });
             }
-            console.log(res);
           });
         })
-        .catch((err) => {
-          console.log(err);
-        });
+        .catch((err) => {});
     },
     // 琛ㄦ牸鐩戝惉
     tableChange(list) {
@@ -411,9 +411,7 @@
         .then((_) => {
           done();
         })
-        .catch((err) => {
-          console.log(err);
-        });
+        .catch((err) => {});
     },
     // 鑷畾涔夊叧闂脊绐�
     closeDialog({ flag, index }) {
@@ -422,9 +420,7 @@
       }
     },
     //
-    timechange(data) {
-      console.log(data);
-    },
+    timechange(data) {},
   },
 };
 </script>
@@ -450,16 +446,19 @@
       padding: 0 40px;
       display: flex;
       line-height: 100px;
-      justify-content: space-between;
+      // justify-content: space-between;
       align-items: center;
-
+      span {
+        min-width: 120px;
+        padding-left: 15px;
+      }
       .search,
       .message-status,
       .message-kind {
         display: flex;
         justify-content: flex-start;
         align-items: center;
-        flex: 1;
+        // flex: 1;
         .el-input {
           flex: 1;
           color: #1d3f57;
@@ -479,7 +478,9 @@
           background-color: #09152f;
         }
       }
-
+      .find {
+        margin-left: 15px;
+      }
       .findBtn {
         line-height: 100px;
         margin-left: 15px;

--
Gitblit v1.8.0