fix

index.html

@@ -37,8 +37,8 @@
          * key、solution设置
          */
 
-        minemap.key = "63b68d77877a4ed686e8bc30894975e5";
-        minemap.solution = 222525;
+        minemap.key = "38025fbc9e3f4e1fb64b34b2b55080ab";
+        minemap.solution = 12887;
     </script>
 
 

src/components/Card/index.scss

@@ -6,13 +6,13 @@
 .card-container {
     width: 470px;
     height: 472px;
-    width: px2rem(470px * 2);
-    height: px2rem(770px / 2 * 2);
+    width: px2rem(424px*2);
+    height: px2rem(304px*2);
     background-position: top center;
     background-size: cover;
     z-index: 1;
     box-sizing: border-box;
-    padding: px2rem(60px * 2) px2rem(30px * 2) px2rem(25px * 2);
+    padding: px2rem(60px * 2) px2rem(18px * 2) px2rem(25px * 2);
     display: flex;
     flex-direction: column;
     color: #fff;
@@ -36,13 +36,15 @@
         background-image: url('../../assets/card-bg/frame_information.png');
     }
     &-bg-incident-info {
-        height: px2rem(468px * 2);
+        height: px2rem(476px * 2);
+        margin-right: px2rem(10px * 2);
         background-image: url('../../assets/card-bg/frame_sjxx@2x.png');
     }
     &-bg-command-chain {
+        margin-right: px2rem(10px * 2);
         background-image: url('../../assets/card-bg/frame_zhtx@2x.png');
         // margin-top: px2rem(-63px * 2);
-        height: px2rem(302px * 2);
+        height: px2rem(304px * 2);
         margin-top: px2rem(20px * 2);
     }
     &-bg-incident-plan {
@@ -56,20 +58,20 @@
         background-image: url('../../assets/card-bg/frame_yjya@2x.png');
     }
     &-bg-wz-all {
-        margin-right: px2rem(20px *2);
-        margin-top: px2rem(20px *2);
-        height: px2rem(302px * 2);
+        margin-right: px2rem(10px *2);
+        margin-top: px2rem(15px *2);
+        height: px2rem(375px * 2);
         background-image: url('../../assets/card-bg/frame_kywz@2x.png');
     }
     &-bg-em-ex {
-        margin-right: px2rem(20px *2);
-        height: px2rem(468px * 2);
+        margin-right: px2rem(10px *2);
+        height: px2rem(420px * 2);
         background-image: url('../../assets/card-bg/frame_czfa@2x.png');
     }
     &-bg-accident-scene {
         background-image: url('../../assets/card-bg/frame_sgxc@2x.png');
-        width: px2rem(472px * 2);
-        height: px2rem(302px * 2);
+        width: px2rem(424px * 2);
+        height: px2rem(304px * 2);
         margin-top: px2rem(20px * 2);
         >div {
             height: px2rem(302px * 2 - 60px * 2 - 25px * 2);
@@ -95,15 +97,15 @@
     &-bg-execution-log {
         width: 939px;
         height: 554px;
-        width: px2rem(472px * 2);
-        height: px2rem(789px * 2);
+        width: px2rem(422px * 2);
+        height: px2rem(809px * 2);
         background-image: url('../../assets/card-bg/frame_zxrz@2x.png');
     }
     &-bg-live-monitoring {
         width: 943px;
         height: 939px;
-        width: px2rem(472px * 2);
-        height: px2rem(469px * 2);
+        width: px2rem(424px * 2);
+        height: px2rem(476px * 2);
         background-image: url('../../assets/card-bg/frame_skjc@2x.png');
         .livec {
             height: px2rem((469px * 2 - 60px * 2 - 25px *2)/2 - 10px*2);

src/components/MapView/index.tsx

@@ -88,9 +88,9 @@ export default defineComponent({
         container: 'map',
         style:
           (import.meta.env.VITE_MAP_SERVER as string) +
-          '/service/solu/style/id/222525' /*底图样式*/,
+          '/service/solu/style/id/12887' /*底图样式*/,
         center: [118.29564, 33.97441] /*地图中心点*/,
-        zoom: 14 /*地图默认缩放等级*/,
+        zoom: 12 /*地图默认缩放等级*/,
         pitch: 0 /*地图俯仰角度*/,
         maxZoom: 17 /*地图最大缩放等级*/,
         minZoom: 3 /*地图最小缩放等级*/,

src/components/MarkerMap/index.scss

@@ -164,25 +164,24 @@
         }
     }
     .minemap-map {
-        .tipc{
+        .tipc {
             z-index: 11111;
-            position:absolute;
-            top:-80px;
+            position: absolute;
+            top: -80px;
             transform: translateX(-50%);
-            left:50%;
-            padding:10px 20px;
-            height:40px;
+            left: 50%;
+            padding: 10px 20px;
+            height: 40px;
             font-size: 26px;
-            background:rgba($color: #0567e9, $alpha: 0.85);
+            background: rgba($color: #0567e9, $alpha: 0.85);
             border-radius: 10px;
             color: white;
-            min-width:fit-content;
+            min-width: fit-content;
             width: fit-content;
             line-height: 40px;
             white-space: nowrap;
-    
         }
-        .pointerc:hover{
+        .pointerc:hover {
             cursor: pointer;
         }
         .minemap-popup-tip {
@@ -291,14 +290,13 @@
                     }
                 }
             }
-           
         }
     }
     .address-type-card-container {
         &.in-detail {
             position: absolute;
             height: px2rem(554px * 2 - 182px + 390px * 2 - 172px + 48px);
-            right: px2rem((939px + 30px + 30px) * 2);
+            right: px2rem((819px + 30px + 30px) * 2);
             top: px2rem(65px * 2);
             // transform: translateY(calc(-50% - px2rem(52px / 2 * 2)));
             .address-type-card {

src/components/MarkerMap/index.tsx

@@ -884,10 +884,9 @@ export default defineComponent({
             imagep.style.width = (19 * 3 * 0.66 * 2) / 576 + 'rem';
             imagep.style.height = (22 * 3 * 0.66 * 2) / 576 + 'rem';
           }
-        var markp = 
-              new window.minemap.Marker(imagep, {
-                offset: [-25, -25],
-              });
+        var markp = new window.minemap.Marker(imagep, {
+          offset: [10, 0],
+        });
 
         if(type==="单兵"){
           i.name = i.userName;
@@ -1187,7 +1186,7 @@ export default defineComponent({
           } else {
             state.map?.flyTo({
               center: [118.29564, 33.97441],
-              zoom: 14,
+              zoom: 12,
               bearing: 10,
               pitch: 30,
               duration: 2000,

src/layout/BaseLayout/index.scss

@@ -109,7 +109,7 @@
             position: absolute;
             background-size: 100% 100%;
             bottom: 10%;
-            right: px2rem(1000px * 2);
+            right: px2rem(879px * 2);
             animation-iteration-count: infinite;
         }
     }

src/views/HomePage/index.scss

@@ -1,57 +1,57 @@
 @import '../../styles/utils.scss';
-
 .home-page-container {
-  flex: 1;
-  position: relative;
-  .echarts {
-    width: px2rem(642px);
-    height: px2rem(887px);
-    position: absolute;
-    top: px2rem(38px);
-    left: 50%;
-    transform: translateX(-50%);
-  }
-  .card-container {
-    position: absolute;
-    top: px2rem(83px * 2);
-    &-bg-message-list {
-      left: px2rem(30px * 2);
-      width: px2rem(528px * 2);
-      height: px2rem(448px * 2);
+    flex: 1;
+    position: relative;
+    .echarts {
+        width: px2rem(642px);
+        height: px2rem(887px);
+        position: absolute;
+        top: px2rem(38px);
+        left: 50%;
+        transform: translateX(-50%);
+    }
+    .card-container {
+        position: absolute;
+        top: px2rem(83px * 2);
+        &-bg-message-list {
+            left: px2rem(30px * 2);
+            width: px2rem(528px * 2);
+            height: px2rem(448px * 2);
+        }
     }
-  }
 }
+
 .message-card-container {
-  color: #fff;
-  overflow-y: auto;
-  > a {
     color: #fff;
-    cursor: pointer;
-    &:hover {
-      .title {
-        transition: color 0.2s;
-        color: #7cb3ff;
-      }
-    }
-  }
-  .message-item {
-    padding-bottom: px2rem(30px * 2);
-    .title {
-      font-size: px2rem(16px * 2);
-      display: flex;
-      align-items: top;
-      padding-bottom: px2rem(13px * 2);
-      color: #fff;
-      .index {
+    overflow-y: auto;
+    >a {
         color: #fff;
-        width: px2rem(20px * 2);
-        // width: 20px * 2;
-      }
+        cursor: pointer;
+        &:hover {
+            .title {
+                transition: color 0.2s;
+                color: #7cb3ff;
+            }
+        }
     }
-    .desc {
-      font-size: px2rem(16px * 2);
-      padding-left: px2rem(20px * 2);
-      // padding-left: 20px * 2;
+    .message-item {
+        padding-bottom: px2rem(30px * 2);
+        .title {
+            font-size: px2rem(16px * 2);
+            display: flex;
+            align-items: top;
+            padding-bottom: px2rem(13px * 2);
+            color: #fff;
+            .index {
+                color: #fff;
+                width: px2rem(20px * 2);
+                // width: 20px * 2;
+            }
+        }
+        .desc {
+            font-size: px2rem(16px * 2);
+            padding-left: px2rem(20px * 2);
+            // padding-left: 20px * 2;
+        }
     }
-  }
-}
+}

src/views/IncidentDetail/LiveMonitoringCard/index.tsx

@@ -25,28 +25,25 @@ export default defineComponent({
     return () => (
       <Card cardType="live-monitoring">
         <div class="livec">
-          <div id="relvideo1"  style="width: 100%;height: 100%;padding:10px;padding-bottom:18px">
-           <img
-            style="width: 100%;height: 100%;"
-            // src={fdimg}
-            src="https://img1.baidu.com/it/u=1650334584,1209303936&fm=253&fmt=auto&app=120&f=JPEG?w=1129&h=642"
-
-          /> 
-
-
+          <div
+            id="relvideo1"
+            style="width: 100%;height: 100%;padding:10px;padding-left:1px;padding-bottom:1px">
+            <img
+              style="width: 100%;height: 100%;"
+              // src={fdimg}
+              src="https://img1.baidu.com/it/u=1650334584,1209303936&fm=253&fmt=auto&app=120&f=JPEG?w=1129&h=642"
+            />
           </div>
-         
         </div>
         <div class="livec">
-        <div id="relvideo2"  style="width: 100%;height: 100%;padding:10px;padding-bottom:18px">
-           <img
-            style="width: 100%;height: 100%;"
-            // src={fdimg}
-            src="https://img1.baidu.com/it/u=1650334584,1209303936&fm=253&fmt=auto&app=120&f=JPEG?w=1129&h=642"
-
-          /> 
-
-
+          <div
+            id="relvideo2"
+            style="width: 100%;height: 100%;padding:10px;padding-left:1px;padding-bottom:1px">
+            <img
+              style="width: 100%;height: 100%;"
+              // src={fdimg}
+              src="https://img1.baidu.com/it/u=1650334584,1209303936&fm=253&fmt=auto&app=120&f=JPEG?w=1129&h=642"
+            />
           </div>
         </div>
       </Card>

src/views/IncidentDetail/index.scss

@@ -79,8 +79,8 @@
         top: -2px;
         left: 0;
         // left: px2rem(30px * 2);
-        width: px2rem(471px * 2);
-        height: px2rem(814px * 2);
+        width: px2rem(424px * 2);
+        height: px2rem(787px * 2);
         background-color: red;
         z-index: 100;
         background: url("../../assets/card-bg/frame_sjlb.png");
@@ -101,8 +101,8 @@
         }
         .elc-content {
             // font-size: 3rem;
-            height: px2rem(814px * 2)- px2rem(55px * 4);
-            width: px2rem(471px * 2) - px2rem(27px * 4);
+            height: px2rem(777px * 2)- px2rem(55px * 4);
+            width: px2rem(424px * 2) - px2rem(27px * 4);
             top: px2rem(79px * 2);
             left: px2rem(27px * 2);
             position: absolute;
@@ -161,7 +161,7 @@
         .detail-left,
         .detail-right {
             position: absolute;
-            top: px2rem(65px * 2);
+            top: px2rem(55px * 2);
             // transform: translateY(calc(-50% - px2rem(52px / 2 * 2)));
             height: max-content;
             z-index: 1;
@@ -175,7 +175,7 @@
         }
         .detail-right {
             right: px2rem(40px * 2);
-            width: px2rem(939px * 2);
+            width: px2rem(829px * 2);
             flex-direction: column;
             max-height: px2rem(900px * 2);
             // height: calc(px2rem(554px) + px2rem(390px) + px2rem(21px));
@@ -193,7 +193,6 @@
             // top: px2rem(83px);
             &-bg-incident-info {
                 // left: px2rem(30px);
-                margin-right: px2rem(21px * 2);
                 position: relative;
                 .event-list {
                     position: absolute;
@@ -291,7 +290,6 @@
             }
             &-bg-command-chain {
                 // left: px2rem(521px);
-                margin-right: px2rem(21px * 2);
                 .command-chain-container {
                     position: relative;
                     margin-right: -15px;
@@ -854,7 +852,7 @@
             &-bg-live-monitoring {
                 // top: px2rem(564px + 83px);
                 // right: px2rem(22px);
-                width: px2rem(472px * 2);
+                // width: px2rem(472px * 2);
                 // margin-top: px2rem(48px);
                 .el-button {
                     position: absolute;
@@ -1057,7 +1055,7 @@
                 .headerbutton {
                     position: absolute;
                     top: px2rem(20px * 2);
-                    left: px2rem(102px * 2);
+                    left: px2rem(60px * 2);
                     width: px2rem(289px * 2);
                     height: px2rem(35px * 2);
                     // line-height: px2rem(35px * 2);
@@ -1085,7 +1083,7 @@
                     }
                 }
                 .content-c {
-                    max-height: px2rem(372px * 2);
+                    max-height: px2rem(332px * 2);
                     margin-top: px2rem(10px * 2);
                     &::-webkit-scrollbar-thumb {
                         background: #39d6fe;