@vtx/modals2 5.0.62 → 5.0.64

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-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/_components/vm-video/HistoryGrid.js

@@ -31,6 +31,8 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
           ref: ref,
           beenHasVideo: channel.beenHasVideo // 对讲
           ,
+          beenHasAudio: channel.beenHasAudio // 音频
+          ,
           url: url,
           type: channel === null || channel === void 0 ? void 0 : channel.player,
           deviceIp: channel.deviceIp,

package/lib/_components/vm-video/RealtimeGrid.js

@@ -29,6 +29,8 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
           ref: ref,
           beenHasVideo: channel.beenHasVideo // 对讲
           ,
+          beenHasAudio: channel.beenHasAudio // 音频
+          ,
           url: channel.url,
           type: channel === null || channel === void 0 ? void 0 : channel.player,
           deviceIp: channel.deviceIp,

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

@@ -61,6 +61,8 @@ var VmVideo = function VmVideo(_ref) {
     endTime = state.endTime,
     history = state.history;
   useEffect(function () {
+    var s,
+      e = '';
     if (dateType === 'custom') {
       setState({
         datePickerDisabled: false
@@ -69,23 +71,25 @@ var VmVideo = function VmVideo(_ref) {
       setState({
         datePickerDisabled: true
       });
-      if (dateType === 'dayBeforeYesterday') {
-        setState({
-          startTime: dayjs().subtract(2, 'day').format('YYYY-MM-DD 00:00:00'),
-          endTime: dayjs().subtract(2, 'day').format('YYYY-MM-DD 23:59:59')
-        });
-      } else if (dateType === 'yesterday') {
-        setState({
-          startTime: dayjs().subtract(1, 'day').format('YYYY-MM-DD 00:00:00'),
-          endTime: dayjs().subtract(1, 'day').format('YYYY-MM-DD 23:59:59')
-        });
-      } else if (dateType === 'today') {
-        setState({
-          startTime: dayjs().format('YYYY-MM-DD 00:00:00'),
-          endTime: dayjs().format('YYYY-MM-DD HH:mm:ss')
-        });
-      }
     }
+    if (dateType === 'dayBeforeYesterday') {
+      s = dayjs().subtract(2, 'day').format('YYYY-MM-DD 00:00:00');
+      e = dayjs().subtract(2, 'day').format('YYYY-MM-DD 23:59:59');
+    } else if (dateType === 'yesterday') {
+      s = dayjs().subtract(1, 'day').format('YYYY-MM-DD 00:00:00');
+      e = dayjs().subtract(1, 'day').format('YYYY-MM-DD 23:59:59');
+    } else {
+      s = dayjs().format('YYYY-MM-DD 00:00:00');
+      e = dayjs().format('YYYY-MM-DD HH:mm:ss');
+    }
+    setState({
+      startTime: s,
+      endTime: e
+    });
+    form.setFieldsValue({
+      beginTime: dayjs(s),
+      endTime: dayjs(e)
+    });
   }, [dateType]);
   useEffect(function () {
     if (channels !== null && channels !== void 0 && channels.length && tabKey === '1') {
@@ -199,8 +203,8 @@ var VmVideo = function VmVideo(_ref) {
                 requiredMark: false,
                 colon: true,
                 initialValues: {
-                  beginTime: startTime ? dayjs(startTime) : dayjs().subtract(1, 'day').startOf('day'),
-                  endTime: endTime ? dayjs(endTime) : dayjs().subtract(1, 'day').endOf('day')
+                  beginTime: startTime ? dayjs(startTime) : dayjs().startOf('day'),
+                  endTime: endTime ? dayjs(endTime) : dayjs().endOf('day')
                 },
                 autoComplete: "off",
                 children: [/*#__PURE__*/_jsx(Form.Item, {

package/lib/_hooks/useGetChannels.js

@@ -6,27 +6,17 @@ import { useRequest } from 'ahooks';
 import http from "../_util/http";
 export default (function (billId, ready) {
   var _useRequest = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var url, exists;
+      var url;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             url = "".concat(process.env.PREFIX || '', "/cloud/vis/base/np/videoDevice/loadVideoChannelByBillId.smvc");
-            _context.next = 3;
-            return http.exists(url);
-          case 3:
-            exists = _context.sent;
-            if (exists) {
-              _context.next = 6;
-              break;
-            }
-            return _context.abrupt("return");
-          case 6:
             return _context.abrupt("return", http.get(url, {
               body: {
                 billId: billId
               }
             }));
-          case 7:
+          case 2:
           case "end":
             return _context.stop();
         }

package/lib/_util/http.js

@@ -17,7 +17,7 @@ import pickBy from 'lodash/pickBy';
 import qs from 'qs';
 var SECOND = 30;
 var MILL_SECOND = 1000;
-var baseUrlPrefix = process.env.PREFIX ? "/".concat(process.env.PREFIX) : '';
+var baseUrlPrefix = process.env.PREFIX ? "".concat(process.env.PREFIX) : '';
 var Http = /*#__PURE__*/function () {
   function Http(options) {
     _classCallCheck(this, Http);
@@ -78,9 +78,9 @@ var Http = /*#__PURE__*/function () {
       });
     }
 
-    /**
-     * 判断接口是否存在
-     * @param {*} url
+    /**
+     * 判断接口是否存在
+     * @param {*} url
      */
   }, {
     key: "exists",
@@ -103,10 +103,10 @@ var Http = /*#__PURE__*/function () {
         return (error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) !== 404;
       });
     }
-    /**
-     * get 请求
-     * @param {*} url
-     * @param {*} options {body}
+    /**
+     * get 请求
+     * @param {*} url
+     * @param {*} options {body}
      */
   }, {
     key: "getForTenantId",

package/lib/vtx-area-modal/api.js

@@ -62,7 +62,7 @@ var BaseService = {
         layerType: 'staff',
         staffName: item.staffName,
         newType: item.icon ? 1 : item.statusCode === 'Normal' ? 2 : 3,
-        url: item.icon ? "/cloudFile/common/downloadFile?id=".concat(item.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon2({
+        url: item.icon ? "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(item.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon2({
           canvasIcon: 'PERSONNEL',
           color: ((_mapInfoRes = mapInfoRes) === null || _mapInfoRes === void 0 || (_mapInfoRes = _mapInfoRes.data) === null || _mapInfoRes === void 0 ? void 0 : _mapInfoRes.statusCode) === 'Normal' ? '#119FFB' : '#999999'
         }).getImgUrl() : new MapIcon.CommonIcon({

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/index.js

@@ -157,6 +157,9 @@ var VmBaseModal = function VmBaseModal(props) {
     if (prefixList.length === 2) {
       prefix = "/".concat(prefixList[0]);
     }
+    if (prefixList.length === 3) {
+      prefix = "/".concat(prefixList[0], "/").concat(prefixList[1]);
+    }
     var _theme = theme === 'light' ? 'light' : 'dark';
     if (type === 'car') {
       var path = 'index';

package/lib/vtx-base-modal/service.js

@@ -21,7 +21,7 @@ export var cancelFavorite = function cancelFavorite(params) {
   });
 };
 export var getTenantById = function getTenantById(id) {
-  return http.get("".concat(prefix, "/cloud/management/rest/np/tenant/getTenantById"), {
+  return http.get("/cloud/management/rest/np/tenant/getTenantById", {
     body: {
       parameters: JSON.stringify({
         id: id
@@ -30,7 +30,7 @@ export var getTenantById = function getTenantById(id) {
   });
 };
 export var getUmsConfig = function getUmsConfig(componentCode) {
-  return http.get("".concat(prefix, "/cloud/management/api/v101/user/config/component/page"), {
+  return http.get("/cloud/management/api/v101/user/config/component/page", {
     body: {
       componentCode: componentCode,
       userId: getVtxToken('userId')

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/Cc/OrderInfo/Detail.js

@@ -59,7 +59,7 @@ var Content = function Content(_ref) {
         src: "/vortex/rest/cloud/np/file/downloadFileThumbnail?outputQuality=0.5&scale=0.2&id=".concat(text, "&token=").concat(token),
         preview: {
           destroyOnClose: true,
-          src: "/cloudFile/common/downloadFile?id=".concat(text, "&token=").concat(token),
+          src: "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(text, "&token=").concat(token),
           maskClassName: 'maskClass'
         },
         alt: "\u7B7E\u5B57",
@@ -88,7 +88,7 @@ var Content = function Content(_ref) {
         src: "/vortex/rest/cloud/np/file/downloadFileThumbnail?outputQuality=0.5&scale=0.2&id=".concat(text, "&token=").concat(token),
         preview: {
           destroyOnClose: true,
-          src: "/cloudFile/common/downloadFile?id=".concat(text, "&token=").concat(token),
+          src: "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(text, "&token=").concat(token),
           maskClassName: 'maskClass'
         },
         alt: "\u7B7E\u5B57",

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.js

@@ -40,7 +40,7 @@ var BaseInfo = function BaseInfo(_ref) {
             height: 80,
             src: "/vortex/rest/cloud/np/file/downloadFileThumbnail?outputQuality=0.5&scale=0.2&id=".concat(item.id, "&token=").concat(getVtxToken('token')),
             preview: {
-              src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat(getVtxToken('token'))
+              src: "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(item.id, "&token=").concat(getVtxToken('token'))
             }
           }, item.id);
         })

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-cc-unit-modal/components/DetailInfo/index.js

@@ -70,7 +70,7 @@ var DetailInfo = function DetailInfo(_ref) {
             height: 80,
             src: "/vortex/rest/cloud/np/file/downloadFileThumbnail?outputQuality=0.5&scale=0.2&id=".concat(item.id, "&token=").concat(getVtxToken('token')),
             preview: {
-              src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat(getVtxToken('token'))
+              src: "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(item.id, "&token=").concat(getVtxToken('token'))
             }
           }, item.id);
         })

package/lib/vtx-cp-modal/components/BaseInfo/TodayWork.js

@@ -35,7 +35,7 @@ export default function TodayWork(props) {
     var src = '';
     if (productTypes !== null && productTypes !== void 0 && (_productTypes$id = productTypes[id]) !== null && _productTypes$id !== void 0 && _productTypes$id.icon) {
       var icon = JSON.parse(productTypes[id].icon)[0];
-      src = "/cloudFile/common/downloadFile?id=".concat(icon.id, "&token=").concat(getVtxToken('token'));
+      src = "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(icon.id, "&token=").concat(getVtxToken('token'));
     }
     return src;
   };

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

@@ -67,7 +67,7 @@ var BaseInfo = function BaseInfo(props) {
               },
               children: photos.map(function (item) {
                 return /*#__PURE__*/_jsx(VtxImage, {
-                  src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat(getVtxToken('token')),
+                  src: "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(item.id, "&token=").concat(getVtxToken('token')),
                   alt: item.name,
                   style: {
                     width: '100%',

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

@@ -26,6 +26,7 @@ var TABS_METERING = 'metering';
 var VtxDefaultModal = function VtxDefaultModal(props) {
   var _info$geometryInfo, _info$geometryInfo2, _info$geometryInfo3;
   var id = props.id,
+    facilityId = props.facilityId,
     title = props.title,
     subTitle = props.subTitle,
     theme = props.theme,
@@ -103,7 +104,7 @@ var VtxDefaultModal = function VtxDefaultModal(props) {
     tabsData.forEach(function (ele) {
       if (ele.url) {
         contents[ele.key] = /*#__PURE__*/_jsx(VmCustom, {
-          id: id,
+          id: ele.url.indexOf('type=1') > -1 ? facilityId : id,
           url: ele === null || ele === void 0 ? void 0 : ele.url
         });
       }

package/lib/vtx-device-modal/components/BaseInfo/PreviewAndDownload.js

@@ -37,7 +37,7 @@ var PreviewAndDownload = function PreviewAndDownload(_ref) {
   var onPreview = function onPreview(_ref2) {
     var id = _ref2.id,
       name = _ref2.name;
-    var url = "".concat(window.location.origin, "/cloudFile/common/downloadFile?id=").concat(id, "&fullfilename=").concat(id, "-").concat(name.replace(/\s*/g, ''), "&token=").concat(token);
+    var url = "".concat(window.location.origin).concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(id, "&fullfilename=").concat(id, "-").concat(name.replace(/\s*/g, ''), "&token=").concat(token);
     var base64 = Buffer.from(url).toString('base64');
     setIframeModalInfo({
       src: "".concat(window.location.origin, "/cloud/kkPreview/onlinePreview?url=").concat(base64, "&token=").concat(token),
@@ -47,7 +47,7 @@ var PreviewAndDownload = function PreviewAndDownload(_ref) {
   };
   //下载
   var download = function download(obj) {
-    window.location.href = "/cloudFile/common/downloadFile?id=".concat(obj.id, "&token=").concat(token);
+    window.location.href = "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(obj.id, "&token=").concat(token);
   };
   var component = /*#__PURE__*/_jsxs("div", {
     children: [/*#__PURE__*/_jsx(Button, {

package/lib/vtx-device-modal/components/BaseInfo/index.js

@@ -99,7 +99,7 @@ var BaseInfo = function BaseInfo(_ref) {
   if (info.photoIds) {
     var _JSON$parse;
     var id = (_JSON$parse = JSON.parse(info.photoIds)) === null || _JSON$parse === void 0 || (_JSON$parse = _JSON$parse[0]) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.id;
-    url = id ? "/cloudFile/common/downloadFile?id=".concat(id, "&token=").concat(getVtxToken('token') || '') : '';
+    url = id ? "".concat(process.env.PREFIX || '', "/cloudFile/common/downloadFile?id=").concat(id, "&token=").concat(getVtxToken('token') || '') : '';
   }
   var installLocationDTO = info.installLocationDTO;
   var _ref2 = installLocationDTO !== null && installLocationDTO !== void 0 && installLocationDTO.lngLats ? installLocationDTO.lngLats.split(',') : [],