From d874cdc354465eeed76f7039de9e4d7e5b17dabc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 20 Apr 2021 18:23:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

---
 src/views/realTimePolice/real.vue |  137 +++++++++++++++++++++++++++++----------------
 1 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index c4c4e10..39fe652 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -1,9 +1,3 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-03-17 15:21:33
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-04-12 17:28:33
- */
 <template>
   <basic-container>
     <avue-crud
@@ -69,20 +63,23 @@
       </template>
 
       <template slot="menuLeft">
-        <el-button type="warning"
-                    size="mini"
-                    plain
-                    icon="el-icon-download"
-                    @click="handleExport">导出
+        <el-button
+          type="warning"
+          size="mini"
+          plain
+          icon="el-icon-download"
+          @click="handleExport"
+          >导出
         </el-button>
-        <el-button type="warning"
-                    size="small"
-                    plain
-                    icon="el-icon-pie-chart"
-                    @click="handleExportStatis">导出报表
+        <el-button
+          type="warning"
+          size="small"
+          plain
+          icon="el-icon-pie-chart"
+          @click="handleExportStatis"
+          >导出报表
         </el-button>
       </template>
-
 
       <template slot-scope="{ row }" slot="jtype">
         <el-tag
@@ -413,7 +410,7 @@
     </el-drawer>
   </basic-container>
 </template>
-
+ 
 <script>
 import { getList, remove, update, add, getclient } from "@/api/real/real";
 import { mapGetters } from "vuex";
@@ -494,7 +491,7 @@
             type: "datetime",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd",
-            searchValue:[this.getStartTime(),this.getEndTime()],
+            searchValue: [this.getStartTime(), this.getEndTime()],
             searchRange: true,
             searchSpan: 5,
             hide: true,
@@ -1128,18 +1125,26 @@
         };
       });
     },
-    getStartTime(){
-           if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
-             return this.$route.query.startTime
-           }
-           return '';
-      },
-      getEndTime(){
-           if (this.$route.query.endTime != undefined && this.$route.query.endTime != null && this.$route.query.endTime != "" ) {
-             return this.$route.query.endTime
-           }
-           return '';
-      },
+    getStartTime() {
+      if (
+        this.$route.query.startTime != undefined &&
+        this.$route.query.startTime != null &&
+        this.$route.query.startTime != ""
+      ) {
+        return this.$route.query.startTime;
+      }
+      return "";
+    },
+    getEndTime() {
+      if (
+        this.$route.query.endTime != undefined &&
+        this.$route.query.endTime != null &&
+        this.$route.query.endTime != ""
+      ) {
+        return this.$route.query.endTime;
+      }
+      return "";
+    },
     handleManage(row) {
       this.form = row;
       this.peopleList = [
@@ -1467,30 +1472,66 @@
       this.$confirm("是否导出实时警情数据?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        window.open(`/api/blade-jfpts/alarm/alarm/export-alarm?beginTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&waringType=${this.$route.query.waringType}&timeDesc=${this.$route.query.timeDesc}`);
+        window.open(
+          `/api/blade-jfpts/alarm/alarm/export-alarm?beginTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&waringType=${this.$route.query.waringType}&timeDesc=${this.$route.query.timeDesc}`
+        );
       });
     },
     //数据报表导出
-      handleExportStatis() {
-        this.$confirm("是否导出实时警情数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          let beginTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
-          let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
-          let waringType = this.$route.query.waringType==undefined? '':this.$route.query.waringType;
-          let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
-          window.open(`http://localhost:8108/ureport/preview?_u=blade-alarm.statis.ureport.xml&beginTime=${beginTime}&endTime=${endTime}&waringType=${waringType}&timeDesc=${timeDesc}`);
-          //window.open(`http://localhost:8108/ureport/excel?_u=blade-alarm.statis.ureport.xml&beginTime=${beginTime}&endTime=${endTime}&waringType=${waringType}&timeDesc=${timeDesc}`);
-        });
+    handleExportStatis() {
+      this.$confirm("是否导出实时警情数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let beginTime =
+          this.$route.query.startTime == undefined
+            ? ""
+            : this.$route.query.startTime;
+        let endTime =
+          this.$route.query.endTime == undefined
+            ? ""
+            : this.$route.query.endTime;
+        let waringType =
+          this.$route.query.waringType == undefined
+            ? ""
+            : this.$route.query.waringType;
+        let timeDesc =
+          this.$route.query.timeDesc == undefined
+            ? ""
+            : this.$route.query.timeDesc;
+        window.open(
+          `http://localhost:8108/ureport/preview?_u=blade-alarm.statis.ureport.xml&beginTime=${beginTime}&endTime=${endTime}&waringType=${waringType}&timeDesc=${timeDesc}`
+        );
+        //window.open(`http://localhost:8108/ureport/excel?_u=blade-alarm.statis.ureport.xml&beginTime=${beginTime}&endTime=${endTime}&waringType=${waringType}&timeDesc=${timeDesc}`);
+      });
+    },
+    getStartTime() {
+      if (
+        this.$route.query.startTime != undefined &&
+        this.$route.query.startTime != null &&
+        this.$route.query.startTime != ""
+      ) {
+        return this.$route.query.startTime;
       }
+      return "";
+    },
+    getEndTime() {
+      if (
+        this.$route.query.endTime != undefined &&
+        this.$route.query.endTime != null &&
+        this.$route.query.endTime != ""
+      ) {
+        return this.$route.query.endTime;
+      }
+      return "";
+    },
   },
 };
 </script>
-
+ 
 <style>
 .el-card__body .waringTypeClass {
   width: 12%;
@@ -1605,4 +1646,4 @@
 .tabFontSize {
   font-size: 15px;
 }
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.3