Merge branch 'dev' into dev-webgis

src/views/left/modules/ReportDisposal.vue

@@ -441,18 +441,19 @@ function openRiskBigTable() {
 .content_four {
   // flex: 1;
   width: 100%;
-  height: 202px;
+  height: 210px;
 
   .content_four_body {
-    height: 146px;
+    height: 152px;
     padding: 0 10px;
+    box-sizing: border-box;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    background: linear-gradient(180deg, rgba(32, 70, 121, 0) 2%, rgba(32, 70, 121, 0.6) 100%);
+    // background: linear-gradient(180deg, rgba(32, 70, 121, 0) 2%, rgba(32, 70, 121, 0.6) 100%);
     border-radius: 0px 0px 0px 0px;
-    border: 1px solid;
+    // border: 1px solid;
-    border-image: linear-gradient(180deg, rgba(7, 108, 208, 0), rgba(168, 212, 235, 1)) 1 1;
+    // border-image: linear-gradient(180deg, rgba(7, 108, 208, 0), rgba(168, 212, 235, 1)) 1 1;
   }
 
   // 检测设备  应急车辆

src/views/right/components/common/RightLegend.vue

@@ -207,7 +207,7 @@ const handleInstitutionLevel = (item) => {
 
 <style lang="scss">
 .right-legend {
-  padding: 20px;
+  padding: 15px 20px;
   width: 217px;
   // height: 750px;
   background-image: url("../../../../assets/img/撒点弹窗.png");
@@ -215,7 +215,7 @@ const handleInstitutionLevel = (item) => {
   .legend-item {
     display: flex;
     align-items: center;
-    margin: 15px 0;
+    margin: 11px 0;
     .icon-box {
       width: 28px;
       height: 28px;
@@ -259,6 +259,7 @@ const handleInstitutionLevel = (item) => {
       //   box-shadow: inset 0px 5px 8px 0px rgba(69, 210, 255, 0.8);
       border-radius: 4px 4px 4px 4px;
       border: 1px solid #45d2ff;
+      border-bottom: 1px solid #45d2ff;
       border-image: linear-gradient(
           174deg,
           rgba(154, 249, 255, 1),
@@ -266,7 +267,7 @@ const handleInstitutionLevel = (item) => {
         )
         1 1;
       .el-select__wrapper {
-        background-color: transparent;
+        background-color: transparent!important;
         box-shadow: none;
         color: #45d2ff !important;
       }