@vtx/modals2 5.0.12 → 5.0.14

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

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -13,6 +19,7 @@ export default function VmExtraTab(_ref) {
   var data = _ref.data,
     value = _ref.value,
     style = _ref.style,
+    itemStyle = _ref.itemStyle,
     onChange = _ref.onChange;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
@@ -30,6 +37,7 @@ export default function VmExtraTab(_ref) {
     children: data === null || data === void 0 ? void 0 : data.map(function (item, index) {
       return /*#__PURE__*/_jsx("div", {
         className: "vm-extra-btn-item ".concat(activeKey === item.key ? 'active' : ''),
+        style: _objectSpread({}, itemStyle),
         onClick: function onClick() {
           setActiveKey(item.key);
           onChange && onChange(item.key);

package/lib/_components/vm-extra-tab/style/index.less

@@ -21,6 +21,7 @@
   background: var(--bg);
   border-radius: 6px;
   padding: 2px;
+  white-space: nowrap;
   &-item {
     height: 28px;
     width: 28px;

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

@@ -173,10 +173,10 @@ var VMTable = function VMTable(props) {
   });
 };
 
-/**
- * 表格导出按钮
- * @param props
- * @returns
+/**
+ * 表格导出按钮
+ * @param props
+ * @returns
  */
 
 export var ExportBtn = function ExportBtn(props) {

package/lib/_util/http.js

@@ -229,6 +229,9 @@ var Http = /*#__PURE__*/function () {
         if (data.result === 0) {
           return data;
         } else {
+          if (config.url.indexOf('zdjg/jg/data/getJgDataStatistics') > -1 || config.url.indexOf('/cloud/zd/base/api/cp/commonFactory') > -1) {
+            return;
+          }
           message.error(data.msg || '请求信息错误');
           return;
         }
@@ -246,6 +249,9 @@ var Http = /*#__PURE__*/function () {
     key: "_errorHandler",
     value: function _errorHandler(error) {
       if (error.response) {
+        if (error.response.data.path.indexOf('zdjg/jg/data/getJgDataStatistics') > -1 || error.response.data.path.indexOf('/cloud/zd/base/api/cp/commonFactory') > -1) {
+          return;
+        }
         var msg;
         switch (error.response.status) {
           case 404:

package/lib/index.js

@@ -16,4 +16,5 @@ export { default as VtxRestaurantModal } from "./vtx-restaurant-modal";
 export { default as VtxCcCpModal } from "./vtx-cc-cp-modal";
 export { default as VtxKhModal } from "./vtx-kh-modal";
 export { default as VtxZgModal } from "./vtx-zg-modal";
-export { default as VtxSdydTfdModal } from "./vtx-sdyd-tfd-modal";
+export { default as VtxSdydTfdModal } from "./vtx-sdyd-tfd-modal";
+export { default as VtxZfModal } from "./vtx-zf-modal";

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,31 +1,31 @@
-.vm-modal-tabs {
-  width: 100%;
-  height: 60px;
-  background: var(--vm-tabs-bg);
-  border-radius: 8px 8px 0 0;
-  border: none;
-  // border: 2px solid var(--vm-tab-border-color);
-  display: flex;
-  justify-content: center;
-  gap: 16px;
-  align-items: center;
-
-  &-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;
-
-    &-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 {
+  width: 100%;
+  height: 60px;
+  background: var(--vm-tabs-bg);
+  border-radius: 8px 8px 0 0;
+  border: none;
+  // border: 2px solid var(--vm-tab-border-color);
+  display: flex;
+  justify-content: center;
+  gap: 16px;
+  align-items: center;
+
+  &-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;
+
+    &-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);
+    }
+  }
+}

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

@@ -1,6 +1,6 @@
-.vm-car-map-wrap {
-  flex: 1;
-  min-height: 230px;
-  width: 100%;
-  margin-top: 10px;
-}
+.vm-car-map-wrap {
+  flex: 1;
+  min-height: 230px;
+  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-cp-modal/components/ExeceptionInfo/AlarmRecord.js

@@ -20,7 +20,7 @@ import sumBy from 'lodash/sumBy';
 import { useEffect } from 'react';
 import { VmFilter, VmTable, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
-import { AlarmService } from "../../api";
+import { ExeceptionService } from "../../api";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function AlarmRecord(props) {
   var _useSettings = useSettings(),
@@ -51,10 +51,10 @@ export default function AlarmRecord(props) {
     startDate = state.startDate,
     endDate = state.endDate,
     sort = state.sort;
-  var _AlarmService$useAlar = AlarmService.useAlarmTrend(id, startDate, endDate),
-    alarmTypes = _AlarmService$useAlar.alarmTypes;
-  var _AlarmService$useAlar2 = AlarmService.useAlarmRecord(id, alarmTypeCode === 'all' ? '' : alarmTypeCode, startDate, endDate, pagination.current - 1, sort),
-    detail = _AlarmService$useAlar2.detail;
+  var _ExeceptionService$us = ExeceptionService.useAlarmTrend(id, startDate, endDate),
+    alarmTypes = _ExeceptionService$us.alarmTypes;
+  var _ExeceptionService$us2 = ExeceptionService.useAlarmRecord(id, alarmTypeCode === 'all' ? '' : alarmTypeCode, "".concat(startDate, " 00:00:00"), "".concat(endDate, " 23:59:59"), pagination.current - 1, sort),
+    detail = _ExeceptionService$us2.detail;
   // 格式化报警类型数据
   var formatAlarmType = function formatAlarmType(dataList) {
     var list = [];

package/lib/vtx-cp-modal/components/SyInfo/index.js

@@ -221,6 +221,9 @@ var SyInfo = function SyInfo(props) {
         size: 26,
         children: [/*#__PURE__*/_jsx(VmExtraTab, {
           value: filterKey,
+          itemStyle: {
+            width: 'fit-content'
+          },
           data: (baseInfo === null || baseInfo === void 0 ? void 0 : baseInfo.map(function (ele) {
             return {
               key: (ele === null || ele === void 0 ? void 0 : ele.productTypeId) || '',

package/lib/vtx-device-modal/components/DataAnalysis/index.less

@@ -1,66 +1,66 @@
-.vtx-device-analysis-dot {
-  width: 6px;
-  height: 6px;
-  background: var(--green-color);
-  border-radius: 50%;
-  &.error {
-    background: var(--red-color);
-  }
-}
-
-.vtx-device-analysis-tabs {
-  display: flex;
-  gap: 16px;
-  color: var(--modal-title-color);
-  font-size: 14px;
-  &-item {
-    cursor: pointer;
-    &.active {
-      color: var(--blue-color);
-    }
-  }
-}
-
-.vtx-device-alarm-summary {
-  width: 368px;
-  height: 104px;
-  padding: 20px;
-  margin-bottom: 20px;
-  color: var(--modal-title-color);
-  display: flex;
-  justify-content: space-between;
-  flex-direction: column;
-  cursor: pointer;
-  background-image: url("../../imgs/current.png");
-  background-size: 100% 100%;
-  border-radius: 8px;
-  border: 1px solid transparent;
-  &-lable {
-    font-size: 16px;
-    font-weight: 600;
-  }
-  &-value {
-    font-weight: 600;
-    font-size: 24px;
-    color: var(--red-color);
-  }
-  &.dark {
-    background-image: url("../../imgs/current_dark.png");
-    &:last-child {
-      background-image: url("../../imgs/history_dark.png");
-    }
-  }
-  &.active {
-    border:1px solid var(--red-color);
-  }
-  &:last-child {
-    margin-bottom: 0;
-    background-image: url("../../imgs/history.png");
-    .vtx-device-alarm-summary-value {
-      color: var(--yellow-color);
-    }
-    &.active {
-      border:1px solid var(--yellow-color);
-    }
-  }
-}
+.vtx-device-analysis-dot {
+  width: 6px;
+  height: 6px;
+  background: var(--green-color);
+  border-radius: 50%;
+  &.error {
+    background: var(--red-color);
+  }
+}
+
+.vtx-device-analysis-tabs {
+  display: flex;
+  gap: 16px;
+  color: var(--modal-title-color);
+  font-size: 14px;
+  &-item {
+    cursor: pointer;
+    &.active {
+      color: var(--blue-color);
+    }
+  }
+}
+
+.vtx-device-alarm-summary {
+  width: 368px;
+  height: 104px;
+  padding: 20px;
+  margin-bottom: 20px;
+  color: var(--modal-title-color);
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  cursor: pointer;
+  background-image: url("../../imgs/current.png");
+  background-size: 100% 100%;
+  border-radius: 8px;
+  border: 1px solid transparent;
+  &-lable {
+    font-size: 16px;
+    font-weight: 600;
+  }
+  &-value {
+    font-weight: 600;
+    font-size: 24px;
+    color: var(--red-color);
+  }
+  &.dark {
+    background-image: url("../../imgs/current_dark.png");
+    &:last-child {
+      background-image: url("../../imgs/history_dark.png");
+    }
+  }
+  &.active {
+    border:1px solid var(--red-color);
+  }
+  &:last-child {
+    margin-bottom: 0;
+    background-image: url("../../imgs/history.png");
+    .vtx-device-alarm-summary-value {
+      color: var(--yellow-color);
+    }
+    &.active {
+      border:1px solid var(--yellow-color);
+    }
+  }
+}