From 8d837b97ffb27e4e26f067c1febde353bfdf91cf Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 23 Apr 2021 09:16:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

---
 src/views/realTimePolice/real.vue |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 1c7264d..f3b909f 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -577,7 +577,7 @@
             cascaderItem: ["city", "district"],
             dicUrl: "/api/blade-system/region/select",
             span: 6,
-            className: "cityClass1",
+            className: "cityreal1",
             hide: true,
             addDisplay: true,
             editDisplay: true,
@@ -599,7 +599,7 @@
             dicUrl: "/api/blade-system/region/select?code={{key}}",
             span: 3,
             labelWidth: "0",
-            className: "cityClass2",
+            className: "cityreal2",
             hide: true,
             addDisplay: true,
             editDisplay: true,
@@ -621,7 +621,7 @@
             dicUrl: "/api/blade-system/region/select?code={{key}}",
             span: 3,
             labelWidth: "0",
-            className: "cityClass3",
+            className: "cityreal3",
             hide: true,
             addDisplay: true,
             editDisplay: true,
@@ -1479,11 +1479,6 @@
     },
     //数据报表导出
     handleExportStatis() {
-      this.$confirm("是否导出实时警情报表数据?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
         let beginTime =
           this.$route.query.startTime == undefined
             ? ""
@@ -1504,7 +1499,6 @@
           `https://web.byisf.com/api/blade-report/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}`);
-      });
     }
   },
 };
@@ -1515,38 +1509,44 @@
   width: 12%;
 }
 
+
+.cityreal2 div label,.cityreal3 div label {
+  display: none;
+  
+}
+
 /*页面样式*/
-.el-card__body .cityClass1 {
-  width: 155px;
+.el-card__body .cityreal1 {
+  width: 150px;
   padding-right: 0px !important;
 }
 
-.el-card__body .cityClass2 {
+.el-card__body .cityreal2 {
   width: 100px;
-  padding-left: 0px !important;
+  padding-left: 10px !important;
   padding-right: 0px !important;
 }
 
-.el-card__body .cityClass3 {
+.el-card__body .cityreal3 {
   width: 100px;
-  padding-left: 0px !important;
+  padding-left: 10px !important;
   padding-right: 0px !important;
 }
 
 /*新增窗体样式*/
-.el-dialog .cityClass1 {
-  width: 220px;
+.el-dialog .cityreal1 {
+  width: 216px;
   padding-right: 0px !important;
 }
 
-.el-dialog .cityClass2 {
-  width: 110px;
-  padding-left: 5px !important;
-  padding-right: 5px !important;
+.el-dialog .cityreal2 {
+  width: 130px;
+  padding-left: 10px !important;
+  padding-right: 10px !important;
 }
 
-.el-dialog .cityClass3 {
-  width: 110px;
+.el-dialog .cityreal3 {
+  width: 105px;
   padding-left: 0px !important;
   padding-right: 0px !important;
 }

--
Gitblit v1.9.3