Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-web/public/index.html

@@ -8,7 +8,7 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
-    <script src="https://webapi.amap.com/maps?v=2.0&key=eed7ca3167f765467aa377fa78e61ece&plugin=Map3D,AMap.DistrictSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MouseTool,AMap.ControlBar,AMap.CircleEditor,AMap.PolyEditor"></script>
+    <script src="https://webapi.amap.com/maps?v=2.0&key=49fcb156d466062435d7d33437099582&plugin=Map3D,AMap.DistrictSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MouseTool,AMap.ControlBar,AMap.CircleEditor,AMap.PolyEditor"></script>
     <script src="./EasyWasmPlayer.js"></script>
     <style>
     html,

gassafety-web/src/views/enterprise/mapView/components/Right.vue

@@ -69,16 +69,16 @@ export default {
   width: 300px;
   height: 800px;
   position: absolute;
-  top: 80px;
+  top: 40px;
   right: 0;
   overflow-x: hidden;
   // right: 10px;
   // top: 131px;
-  background-image: url(/static/img/rightWrapperBg.25536016.png);
-  background-position-x: -72px;
-  background-position-y: center;
-  background-size: 193% 137%;
-  background-repeat: no-repeat;
+  // background-image: url(/static/img/rightWrapperBg.25536016.png);
+  // background-position-x: -72px;
+  // background-position-y: center;
+  // background-size: 193% 137%;
+  // background-repeat: no-repeat;
   img {
     // width: 300px;
     // height: 800px;

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -1612,11 +1612,12 @@ input[type="radio"] {
   width: 348px;
   transition: 0.2s linear;
   // background: #fff;
-  background: #061d3360;
+  // background: #061d3380;
+  background: rgba(6,29,51,0.8);
   // background: red;
   opacity: 0;
   // 优化抽屉出来回去
-  &.opacity {
+  &.opacity { 
     opacity: 1;
   }
   &.back {
@@ -1686,7 +1687,8 @@ input[type="radio"] {
           // border-right: 1px solid #cccccc;
           box-sizing: border-box;
           // padding-left: 5px;
-          color: #053b6a;
+          // color: #053b6a;
+          color: #fff;
           font-weight: 600;
         }
       }
@@ -1760,12 +1762,13 @@ input[type="radio"] {
       display: flex;
       // background-color: #ffffff;
       box-sizing: border-box;
-      border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+      // border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+      border-bottom: 1px solid rgba(0, 0, 0, 0.5);
       cursor: pointer;
       position: relative;
       // box-sizing: border-box;
       &.firstbox {
-        border-top: 1px solid rgba(0, 0, 0, 0.1);
+        border-top: 1px solid rgba(0, 0, 0, 0.5);
         // box-sizing: border-box;
         &:hover {
           border-top: 1px solid rgba(5, 59, 106, 0);
@@ -1777,11 +1780,11 @@ input[type="radio"] {
         background-color: #053b6a;
         border-bottom: none !important;
         .upPic {
-          color: #31EAEA;
+          color: #31eaea;
         }
         .left,
         .right {
-          color: #31EAEA !important;
+          color: #31eaea !important;
         }
       }
       .upPic {
@@ -1829,7 +1832,8 @@ input[type="radio"] {
         //   color: #fff;
         // }
         > i {
-          color: #31EAEA;
+          color: #31eaea;
+          font-weight: 600;
         }
       }
       .left {
@@ -1862,7 +1866,7 @@ input[type="radio"] {
         padding-bottom: 2px;
         .btn {
           border-radius: 50%;
-          background:none;
+          background: none;
           // width: 14px;
           // height: 14px;
           padding: 2px;
@@ -1871,6 +1875,7 @@ input[type="radio"] {
           display: inline-block;
           font-size: 14px;
           padding: 0px 5px;
+          color: #fff;
         }
       }
     }
@@ -1879,9 +1884,9 @@ input[type="radio"] {
   .switch {
     position: absolute;
     font-size: 30px;
-    right: -27px;
+    right: -30px;
     top: 50%;
-    margin-top: -30px;
+    margin-top: -123px;
     width: 40px;
     border-radius: 40%;
     overflow: hidden;