@vtx/modals2 5.0.46 → 5.0.48

package/lib/_components/vm-card-statistics/index.less

@@ -1,27 +1,27 @@
-.vm-car-statistics {
-  width: 208px;
-  height: 84px;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  padding: 20px;
-  background-size: 100% 100%;
-  &-label {
-    color: var(--img-text-color);
-  }
-  &-value, &-unit {
-    color: #1f1f1f;
-  }
-  &.vm-car-statistics-dark {
-    .vm-car-statistics-value,.vm-car-statistics-unit {
-      background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
-      background-clip: text;
-      -webkit-text-fill-color: transparent;
-    }
-  }
-  &-value {
-    font-size: 20px;
-    font-weight: bold;
-    margin-right: 4px;
-  }
-}
+.vm-car-statistics {
+  width: 208px;
+  height: 84px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding: 20px;
+  background-size: 100% 100%;
+  &-label {
+    color: var(--img-text-color);
+  }
+  &-value, &-unit {
+    color: #1f1f1f;
+  }
+  &.vm-car-statistics-dark {
+    .vm-car-statistics-value,.vm-car-statistics-unit {
+      background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
+      background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  }
+  &-value {
+    font-size: 20px;
+    font-weight: bold;
+    margin-right: 4px;
+  }
+}

package/lib/_components/vm-factor-list/index.less

@@ -1,11 +1,11 @@
-.vm-factor-list-wrap {
-  display: flex;
-  padding: 12px 16px;
-  height: 68px;
-  background: #F3F8FF;
-  border-radius: 8px;
-  gap: 26px;
-  &.dark {
-    background: rgba(0,136,240,0.15);
-  }
-}
+.vm-factor-list-wrap {
+  display: flex;
+  padding: 12px 16px;
+  height: 68px;
+  background: #F3F8FF;
+  border-radius: 8px;
+  gap: 26px;
+  &.dark {
+    background: rgba(0,136,240,0.15);
+  }
+}

package/lib/_components/vm-map/index.js

@@ -14,6 +14,8 @@ import { Circle, Dom, FeatureLayer, Map } from '@vtx/ol-map';
 import { useUpdateEffect } from 'ahooks';
 import { Tooltip } from 'antd';
 import classNames from 'classnames';
+import { register } from 'ol/proj/proj4';
+import proj4 from 'proj4';
 import { useEffect, useRef, useState } from 'react';
 import useSettings from "../../_hooks/useSettings";
 import "./index.less";
@@ -40,6 +42,7 @@ export default function VmOlMap(_ref) {
     isDark = _useSettings.isDark,
     theme = _useSettings.theme,
     mapInfo = _useSettings.mapInfo;
+  var projectionRef = useRef(mapInfo.epsg ? "EPSG:".concat(mapInfo.epsg) : 'EPSG:4326');
   var _useState3 = useState({
       data: [],
       style: {}
@@ -49,6 +52,11 @@ export default function VmOlMap(_ref) {
     setNewPoints = _useState4[1];
   useEffect(function () {
     if (mapInfo !== null && mapInfo !== void 0 && mapInfo.longitude) {
+      if (mapInfo.epsg) {
+        projectionRef.current = "EPSG:".concat(mapInfo.epsg);
+        proj4.defs("EPSG:".concat(mapInfo.epsg), mapInfo.proj4);
+        register(proj4);
+      }
       setDefaultCenter([mapInfo.longitude, mapInfo.latitude]);
     }
   }, [mapInfo]);
@@ -202,6 +210,7 @@ export default function VmOlMap(_ref) {
       zoom: 16,
       dark: isDark || theme === 'blue',
       tk: "1adbb6e47668cb33757cd799548bf1f4",
+      projection: projectionRef.current,
       customBaseLayers: layers.length > 0 ? function () {
         return layers;
       } : null,

package/lib/_components/vm-popover/index.less

@@ -1,7 +1,7 @@
-.vm-popover {
-  &.dark {
-    .ant-popover-inner-content, .ant-popover-arrow-content, .ant-popover-arrow-content::before {
-      background: rgb(51 95 135);
-    }
-  }
-}
+.vm-popover {
+  &.dark {
+    .ant-popover-inner-content, .ant-popover-arrow-content, .ant-popover-arrow-content::before {
+      background: rgb(51 95 135);
+    }
+  }
+}

package/lib/_service/index.js

@@ -9,11 +9,12 @@ import { useRequest } from 'ahooks';
 var CommonService = {
   useBaseInfo: function useBaseInfo(id) {
     var _baseInfoRes$data, _baseInfoRes$data2, _tabConfig$data;
+    var coordType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'wgs84';
     var _useRequest = useRequest(function () {
         return request.get('/cloud/jcss-reborn/facility/get', {
           data: {
             id: id,
-            coordType: 'wgs84'
+            coordType: coordType
           }
         });
       }, {
@@ -81,6 +82,22 @@ var CommonService = {
     return {
       detail: (res === null || res === void 0 ? void 0 : res.data) || {}
     };
+  },
+  // 计量详情
+  useLmDetailZdReborn: function useLmDetailZdReborn(id) {
+    var _useRequest5 = useRequest(function () {
+        return request.post('/cloud/zd-reborn/api/base/commonFactory/getCommonFactoryById?factoryId=' + id, {
+          data: JSON.stringify({
+            factoryId: id
+          })
+        });
+      }, {
+        refreshDeps: [id]
+      }),
+      res = _useRequest5.data;
+    return {
+      detail: (res === null || res === void 0 ? void 0 : res.data) || {}
+    };
   }
 };
 export { CommonService };

package/lib/vtx-base-modal/Header/index.less

@@ -1,98 +1,98 @@
-.vm-modal-header-container {
-  width: 100%;
-  height: 116px;
-  border-radius: 8px 8px 0 0;
-  background: var(--modal-head-bg);
-  padding: 0 16px;
-  margin-top: 1px;
-}
-
-.vm-modal-header-wrap {
-  width: 100%;
-  height: 56px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  position: relative;
-  &::after {
-    position: absolute;
-    top: 54px;
-    left: 0;
-    content: '';
-    width: 180px;
-    height: 1px;
-    background: var(--modal-head-line-bg);
-    box-shadow: var(--modal-head-line-shadow);
-    border-radius: 8px;
-    animation: move 6s linear infinite;
-
-    @keyframes move {
-      0% {
-        left: 0;
-      }
-
-      100% {
-        left: calc(100% - 180px);
-      }
-    }
-  }
-
-  &-left {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-
-    &-title {
-      font-weight: bold;
-      font-size: 20px;
-      color: var(--modal-title-color);
-    }
-
-    &-tag {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 4px;
-      height: 24px;
-      border-radius: 16px;
-      font-size: 12px;
-      padding: 0 8px;
-      border: 1px solid;
-    }
-  }
-
-  &-right {
-    display: flex;
-    align-items: center;
-    gap: 16px;
-
-    &-close {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: var(--modal-close-color);
-      width: 28px;
-      height: 28px;
-      cursor: pointer;
-      font-size: 16px;
-    }
-
-    &-line {
-      width: 1px;
-      height: 14px;
-      background-color: var(--modal-head-split-line-color);
-    }
-
-    &-collect {
-      width: 28px;
-      height: 28px;
-      border-radius: 8px;
-      text-align: center;
-      cursor: pointer;
-
-      &.active {
-        background: var(--collect-bg);
-      }
-    }
-  }
-}
+.vm-modal-header-container {
+  width: 100%;
+  height: 116px;
+  border-radius: 8px 8px 0 0;
+  background: var(--modal-head-bg);
+  padding: 0 16px;
+  margin-top: 1px;
+}
+
+.vm-modal-header-wrap {
+  width: 100%;
+  height: 56px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  position: relative;
+  &::after {
+    position: absolute;
+    top: 54px;
+    left: 0;
+    content: '';
+    width: 180px;
+    height: 1px;
+    background: var(--modal-head-line-bg);
+    box-shadow: var(--modal-head-line-shadow);
+    border-radius: 8px;
+    animation: move 6s linear infinite;
+
+    @keyframes move {
+      0% {
+        left: 0;
+      }
+
+      100% {
+        left: calc(100% - 180px);
+      }
+    }
+  }
+
+  &-left {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    &-title {
+      font-weight: bold;
+      font-size: 20px;
+      color: var(--modal-title-color);
+    }
+
+    &-tag {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 4px;
+      height: 24px;
+      border-radius: 16px;
+      font-size: 12px;
+      padding: 0 8px;
+      border: 1px solid;
+    }
+  }
+
+  &-right {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+
+    &-close {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: var(--modal-close-color);
+      width: 28px;
+      height: 28px;
+      cursor: pointer;
+      font-size: 16px;
+    }
+
+    &-line {
+      width: 1px;
+      height: 14px;
+      background-color: var(--modal-head-split-line-color);
+    }
+
+    &-collect {
+      width: 28px;
+      height: 28px;
+      border-radius: 8px;
+      text-align: center;
+      cursor: pointer;
+
+      &.active {
+        background: var(--collect-bg);
+      }
+    }
+  }
+}

package/lib/vtx-base-modal/Tabs/index.less

@@ -1,68 +1,68 @@
-.vm-modal-tabs {
-  width: 100%;
-  height: 60px;
-  background: var(--vm-tabs-bg);
-  border-radius: 8px 8px 0 0;
-  border: none;
-  .vm-modal-tabs-wrap {
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    gap: 16px;
-    align-items: center;
-    overflow-x: auto;
-    box-sizing: border-box;
-    padding: 0 16px;
-    &.vm-modal-tabs-wrap-scrollable {
-      justify-content: flex-start;
-    }
-    &::-webkit-scrollbar {
-      height: 2px !important;
-    }
-    &::-webkit-scrollbar-thumb {
-      background-color: #d3d7db !important;
-    }
-  }
-
-  &-item {
-    display: flex;
-    height: 36px;
-    padding: 0 14px;
-    font-size: 16px;
-    gap: 8px;
-    color: var(--vm-tabs-font-color);
-    cursor: pointer;
-    align-items: center;
-    justify-content: center;
-    flex-shrink: 0;
-    &-active {
-      background: var(--vm-tab-item-active-bg-color);
-      border-radius: 26px;
-      color: var(--vm-tab-item-active-color);
-      box-shadow: var(--vm-tab-item-active-box-shadow);
-      &.vm-modal-tabs-item-dark {
-        position: relative;
-        &::before {
-          content: '';
-          position: absolute;
-          top: 0;
-          left: 0;
-          right: 0;
-          bottom: 0;
-          background: linear-gradient(
-            180deg,
-            rgba(255, 255, 255, 1),
-            rgba(54, 161, 255, 1)
-          );
-          border-radius: 26px;
-          padding: 1px;
-          -webkit-mask: linear-gradient(#fff 0 0) content-box,
-            linear-gradient(#fff 0 0);
-          -webkit-mask-composite: xor;
-          mask-composite: exclude;
-          z-index: -1;
-        }
-      }
-    }
-  }
-}
+.vm-modal-tabs {
+  width: 100%;
+  height: 60px;
+  background: var(--vm-tabs-bg);
+  border-radius: 8px 8px 0 0;
+  border: none;
+  .vm-modal-tabs-wrap {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    gap: 16px;
+    align-items: center;
+    overflow-x: auto;
+    box-sizing: border-box;
+    padding: 0 16px;
+    &.vm-modal-tabs-wrap-scrollable {
+      justify-content: flex-start;
+    }
+    &::-webkit-scrollbar {
+      height: 2px !important;
+    }
+    &::-webkit-scrollbar-thumb {
+      background-color: #d3d7db !important;
+    }
+  }
+
+  &-item {
+    display: flex;
+    height: 36px;
+    padding: 0 14px;
+    font-size: 16px;
+    gap: 8px;
+    color: var(--vm-tabs-font-color);
+    cursor: pointer;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    &-active {
+      background: var(--vm-tab-item-active-bg-color);
+      border-radius: 26px;
+      color: var(--vm-tab-item-active-color);
+      box-shadow: var(--vm-tab-item-active-box-shadow);
+      &.vm-modal-tabs-item-dark {
+        position: relative;
+        &::before {
+          content: '';
+          position: absolute;
+          top: 0;
+          left: 0;
+          right: 0;
+          bottom: 0;
+          background: linear-gradient(
+            180deg,
+            rgba(255, 255, 255, 1),
+            rgba(54, 161, 255, 1)
+          );
+          border-radius: 26px;
+          padding: 1px;
+          -webkit-mask: linear-gradient(#fff 0 0) content-box,
+            linear-gradient(#fff 0 0);
+          -webkit-mask-composite: xor;
+          mask-composite: exclude;
+          z-index: -1;
+        }
+      }
+    }
+  }
+}

package/lib/vtx-car-modal/components/Info/index.less

@@ -1,6 +1,6 @@
-.vm-car-map-wrap {
-  flex: 1;
-  min-height: 0;
-  width: 100%;
-  margin-top: 10px;
-}
+.vm-car-map-wrap {
+  flex: 1;
+  min-height: 0;
+  width: 100%;
+  margin-top: 10px;
+}

package/lib/vtx-car-modal/content/Common/OilConsumption/index.less

@@ -1,6 +1,6 @@
-.vtx-car-oil-wrap {
-  height: 100%;
-  display: flex;
-  gap: 16px;
-  flex-direction: column;
-}
+.vtx-car-oil-wrap {
+  height: 100%;
+  display: flex;
+  gap: 16px;
+  flex-direction: column;
+}

package/lib/vtx-car-modal/content/Common/WaterConsumption/index.less

@@ -1,6 +1,6 @@
-.vtx-car-water-wrap {
-  height: 100%;
-  display: flex;
-  gap: 16px;
-  flex-direction: column;
-}
+.vtx-car-water-wrap {
+  height: 100%;
+  display: flex;
+  gap: 16px;
+  flex-direction: column;
+}

package/lib/vtx-cc-unit-modal/components/BaseInfo/index.less

@@ -1,6 +1,6 @@
-.vm-cc-unit-map-wrap {
-  flex: 1;
-  min-height: 230px;
-  width: 100%;
-  margin-top: 10px;
-}
+.vm-cc-unit-map-wrap {
+  flex: 1;
+  min-height: 230px;
+  width: 100%;
+  margin-top: 10px;
+}

package/lib/vtx-default-modal/index.js

@@ -7,14 +7,14 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 /**
  * 通用弹窗
  */
-import { VmCustom, VmRepairMaintain, VmVideo } from "../_components";
-import Appraisal from "../vtx-kh-modal/components/Record";
 import { useMemo } from 'react';
+import { VmCustom, VmRepairMaintain, VmVideo } from "../_components";
 import useGetChannels from "../_hooks/useGetChannels";
 import useGetConfig from "../_hooks/useGetConfig";
 import { CommonService } from "../_service";
 import VtxBaseModal from "../vtx-base-modal";
 import Metering from "../vtx-df-modal/components/Metering";
+import Appraisal from "../vtx-kh-modal/components/Record";
 import { BaseInfo } from "./components";
 import "./style";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
@@ -43,7 +43,7 @@ var VtxDefaultModal = function VtxDefaultModal(props) {
     key: TABS_BASE,
     title: '总览信息'
   }];
-  var _CommonService$useBas = CommonService.useBaseInfo(id, 'wgs84'),
+  var _CommonService$useBas = CommonService.useBaseInfo(id, (customMapInfo === null || customMapInfo === void 0 ? void 0 : customMapInfo.coordinate) || 'wgs84'),
     photos = _CommonService$useBas.photos,
     info = _CommonService$useBas.info;
   var _useGetConfig = useGetConfig(info === null || info === void 0 ? void 0 : info.typeCode, tabs),