wangzhe %!s(int64=2) %!d(string=hai) anos
pai
achega
9727362022
Modificáronse 2 ficheiros con 86 adicións e 43 borrados
  1. 85 43
      src/assets/styles/base.scss
  2. 1 0
      src/views/eventdetailsdialog.vue

+ 85 - 43
src/assets/styles/base.scss

@@ -29,6 +29,9 @@ rgba($color: #020f2a, $alpha: 1);
 $boxBG: 180deg, rgba($color: #0d2760, $alpha: 1),
 rgba($color: #081a41, $alpha: 1);
 
+$popupBG:180deg, rgba($color: #1541a0, $alpha: 1),
+rgba($color: #3566d0, $alpha: 1);
+
 //内阴影
 $shadowList: 0 0 1rem 0 rgba($color: #0b1b25, $alpha: .8);
 $shadowTitle: 0 -0.2rem .5rem 0.3rem rgba($color: #0dc0db, $alpha: .09) inset;
@@ -65,6 +68,7 @@ $eventStateColor-wb: #c2bc43;
 $eventStateColor-cf: #a23737;
 $eventStateColor-bj: #6ae08f;
 $eventStateColor-gd: #0369ef;
+$eventStateColor-qr: #20EF56;
 
 $eventStateColor-xsb: #11b57e;
 $eventStateColor-cb: #e63b4a;
@@ -78,6 +82,16 @@ $date-state1: #2abc65;
 $date-state2: #e68d3f;
 $date-state3: #d6333b;
 
+//视频摄像头预览弹层样式
+.videoCustomWidth {
+  width: 1070px !important;
+  height: 700px !important;
+}
+//电视墙视频摄像头预览弹层样式
+.TVWallCustomWidth {
+  width: 1200px !important;
+  height: 750px !important;
+}
 
 //公共
 body {
@@ -217,6 +231,40 @@ ul {
   height: 100vh;
 }
 
+ //超图气泡
+ .leaflet-popup-content-wrapper {
+  // padding: 15px 20px !important;
+  background-image: -moz-linear-gradient($popupBG)!important;
+  background-image: -webkit-linear-gradient($popupBG) !important;
+  background-image: linear-gradient($popupBG)!important;
+  box-shadow: $shadowTitle !important;
+  color: #3cd7ef !important;
+
+
+}
+.leaflet-popup-tip{
+  background: #3061c9 !important;
+  color: #333;
+  box-shadow:none !important;
+}
+ //超图气泡内插槽
+  .map-tip {
+    .d-l-con {
+      width: 100%;
+      box-shadow: none;
+
+      .d-l-l-text {
+        width: 100%;
+        //white-space: nowrap;
+
+        h4 {
+          // display: flex;
+          color:$white;
+        }
+      }
+    }
+  }
+
 div::-webkit-scrollbar {
   display: none;
 }
@@ -553,28 +601,11 @@ div::-webkit-scrollbar {
 }
 
 //弹层样式
-.diaWidth {
-  width: 522px !important;
-  height: 826px !important;
-}
-
-//弹层样式
 .customWidth {
   width: 1822px !important;
   height: 866px !important;
 }
 
-//视频摄像头预览弹层样式
-.videoCustomWidth {
-  width: 1070px !important;
-  height: 700px !important;
-}
-//电视墙视频摄像头预览弹层样式
-.TVWallCustomWidth {
-  width: 1200px !important;
-  height: 750px !important;
-}
-
 .dia-event-info {
   .el-row {
     height: 780px;
@@ -584,6 +615,7 @@ div::-webkit-scrollbar {
     height: 780px !important;
     position: absolute;
     z-index: 999;
+
     button {
       padding: 0 .3rem;
       height: 1.5rem;
@@ -827,8 +859,8 @@ div::-webkit-scrollbar {
 
           .el-collapse-item__arrow {
             color: $inBlue;
-            position: relative;
-            left: -20.5rem;
+            position: absolute;
+            left: 1rem;
             margin: 0;
           }
 
@@ -1132,8 +1164,8 @@ div::-webkit-scrollbar {
 
           .el-collapse-item__arrow {
             color: $inBlue;
-            position: relative;
-            left: -20.5rem;
+            position: absolute;
+            left: 1rem;
             margin: 0;
           }
 
@@ -1354,6 +1386,7 @@ div::-webkit-scrollbar {
   // 2.5D地图显示
   .cesium-infoBox{
     z-index: 9999 !important;
+
   }
   .el-input__inner {
     border: 1px $searchBorder;
@@ -1361,24 +1394,6 @@ div::-webkit-scrollbar {
     color: $inBlue;
   }
 
-  .map-tip {
-    .d-l-con {
-
-      box-shadow: none;
-
-      .d-l-l-text {
-        width: 100%;
-
-
-        h4 {
-		  width: 19rem;
-          display: flex;
-          color: #ffffff !important;
-		  white-space: break-spaces;
-        }
-      }
-    }
-  }
 
   //收起展开
   .mascot {
@@ -1803,8 +1818,8 @@ div::-webkit-scrollbar {
 
     .el-collapse-item__arrow {
       color: $inBlue;
-      position: relative;
-      left: -20.5rem;
+      position: absolute;
+      left: 1rem;
       margin: 0;
     }
 
@@ -2171,13 +2186,16 @@ div::-webkit-scrollbar {
     max-width: 90%;
   }
 
+
   .d-l-l-text {
     display: flex;
     align-items: center;
     flex: 1;
     color: $fListTitle;
     padding: .2rem;
-
+    .el-tooltip__popper{
+		width: 100px;
+	}
     h4 {
       font-size: .7rem;
       margin: 0;
@@ -2506,6 +2524,27 @@ div::-webkit-scrollbar {
         border-radius: .2rem;
       }
     }
+    //确认
+    .event-state-qr {
+      display: flex;
+      align-items: center;
+
+      i {
+        color: $eventStateColor-qr;
+        font-size: 1rem;
+        margin-left: -.5rem;
+      }
+
+      .event-list-state-qr {
+        width: fit-content;
+        background-color: $eventStateColor-qr;
+        color: $white;
+		    padding:0.25rem 0.4rem;
+        margin-left: -.5rem;
+        margin-bottom: .2rem;
+        border-radius: .2rem;
+      }
+    }
 
     .bgt-info-name {
       color: $inBlue;
@@ -3156,7 +3195,7 @@ div::-webkit-scrollbar {
 	box-shadow: initial;
 }
 .no_hover:hover h4{
-	color:#2bacf7;
+	color:#2bacf7!important;
 }
 .no_hover:hover .event-count .count-number{
 	border: 2px solid rgb(59 193 255 / 90%);
@@ -3180,3 +3219,6 @@ div::-webkit-scrollbar {
 // .d-l-l-text h4{
 // 	color:#fff!important;
 // }
+.no_hover .no-weight h4{
+	color:#2bacf7!important;
+}

+ 1 - 0
src/views/eventdetailsdialog.vue

@@ -1634,6 +1634,7 @@ export default {
         }, 1000)
       } else {
         // 消防资源落点
+        console.log("消防资源落点")
         let param = { longitude: this.longitude, latitude: this.latitude, type: type, radius: this.radius }
         if (type != 'sxt') {
           fireControlViewPoint(type).then(res => {