@vtx/modals2 2.15.24 → 2.15.25

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

@@ -1,35 +1,35 @@
-.car-maintenance {
-    padding: 10px;
-    min-height: 500px;
-    &-main {
-        margin-bottom: 10px;
-        padding: 20px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-
-        &-item-wrap {
-            display: flex;
-            flex-wrap: wrap;
-        }
-
-        &-item {
-            width: 400px;
-            display: flex;
-            justify-content: start;
-            margin-bottom: 8px;
-            &-label {
-                color: var(--label-color);
-                margin-right: 8px;
-            }
-            &-value {
-                color: var(--info-color);
-            }
-            &-warn {
-                color: var(--info-danger);
-                img {
-                    margin: -8px 10px 0 10px;
-                }
-            }
-        }
-    }
-}
+.car-maintenance {
+    padding: 10px;
+    min-height: 500px;
+    &-main {
+        margin-bottom: 10px;
+        padding: 20px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+
+        &-item-wrap {
+            display: flex;
+            flex-wrap: wrap;
+        }
+
+        &-item {
+            width: 400px;
+            display: flex;
+            justify-content: start;
+            margin-bottom: 8px;
+            &-label {
+                color: var(--label-color);
+                margin-right: 8px;
+            }
+            &-value {
+                color: var(--info-color);
+            }
+            &-warn {
+                color: var(--info-danger);
+                img {
+                    margin: -8px 10px 0 10px;
+                }
+            }
+        }
+    }
+}

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

@@ -1,39 +1,39 @@
-.oil-consumption {
-    padding: 10px;
-
-    &-head {
-        // display: flex;
-        // justify-content: start;
-        &-filter {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-        &-main {
-            margin-top: 24px;
-            // display: flex;
-            // flex-wrap: wrap;
-        }
-        &-summary {
-            padding: 20px;
-            // width: 600px;
-            height: 234px;
-            background-color: var(--bg-color2);
-            border: 1px solid var(--bg-border-color2);
-        }
-        &-oil {
-            padding: 20px;
-            // width: 665px;
-            height: 234px;
-            background-color: var(--bg-color2);
-            border: 1px solid var(--bg-border-color2);
-        }
-    }
-    &-main {
-        margin-top: 10px;
-        min-height: 400px;
-        padding: 16px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-    }
-}
+.oil-consumption {
+    padding: 10px;
+
+    &-head {
+        // display: flex;
+        // justify-content: start;
+        &-filter {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+        &-main {
+            margin-top: 24px;
+            // display: flex;
+            // flex-wrap: wrap;
+        }
+        &-summary {
+            padding: 20px;
+            // width: 600px;
+            height: 234px;
+            background-color: var(--bg-color2);
+            border: 1px solid var(--bg-border-color2);
+        }
+        &-oil {
+            padding: 20px;
+            // width: 665px;
+            height: 234px;
+            background-color: var(--bg-color2);
+            border: 1px solid var(--bg-border-color2);
+        }
+    }
+    &-main {
+        margin-top: 10px;
+        min-height: 400px;
+        padding: 16px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+    }
+}

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

@@ -1,82 +1,82 @@
-.car-static {
-    padding: 10px;
-
-    &.bottom {
-        max-height: 77vh;
-        overflow: auto;
-    }
-    &.right {
-        width: 100%;
-    }
-    .car-main {
-        padding: 11px 16px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-        overflow: auto;
-        .car-head {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-    }
-    &-charts {
-        margin: 24px auto;
-        text-align: center;
-    }
-    &-list {
-        min-height: 466px;
-    }
-}
-.car-calendar {
-    display: flex;
-    flex-direction: column;
-    color: var(--title-color);
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    padding-top: 34px;
-
-    &-item {
-        display: flex;
-        justify-content: start;
-        align-items: center;
-
-        img {
-            width: 26px;
-            height: 26px;
-            margin: 0 6px 0 18px;
-        }
-    }
-}
-.ant-picker-calendar,
-.ant-picker-calendar-full {
-    background-color: var(--bg-color2) !important;
-    border: 1px solid var(--bg-border-color2);
-
-    .ant-picker-panel {
-        background: var(--calendar-bg) !important;
-    }
-    .ant-picker-body {
-        border: 1px solid var(--calendar-border);
-        padding: 0 !important;
-    }
-    .ant-picker-content thead {
-        background: var(--calendar-thead-bg);
-    }
-    .ant-picker-content th {
-        color: var(--info-color);
-    }
-    .ant-picker-panel .ant-picker-calendar-date {
-        color: var(--info-color);
-        border-top: 2px solid var(--calendar-border) !important;
-        margin: 0 1px !important;
-    }
-    .ant-picker-panel .ant-picker-cell:hover .ant-picker-calendar-date {
-        background: var(--calendar-date-today-hover-bg-color) !important;
-    }
-    .ant-picker-calendar-date-today {
-        background: var(--calendar-date-today-bg-color) !important;
-    }
-}
+.car-static {
+    padding: 10px;
+
+    &.bottom {
+        max-height: 77vh;
+        overflow: auto;
+    }
+    &.right {
+        width: 100%;
+    }
+    .car-main {
+        padding: 11px 16px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+        overflow: auto;
+        .car-head {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+    }
+    &-charts {
+        margin: 24px auto;
+        text-align: center;
+    }
+    &-list {
+        min-height: 466px;
+    }
+}
+.car-calendar {
+    display: flex;
+    flex-direction: column;
+    color: var(--title-color);
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    padding-top: 34px;
+
+    &-item {
+        display: flex;
+        justify-content: start;
+        align-items: center;
+
+        img {
+            width: 26px;
+            height: 26px;
+            margin: 0 6px 0 18px;
+        }
+    }
+}
+.ant-picker-calendar,
+.ant-picker-calendar-full {
+    background-color: var(--bg-color2) !important;
+    border: 1px solid var(--bg-border-color2);
+
+    .ant-picker-panel {
+        background: var(--calendar-bg) !important;
+    }
+    .ant-picker-body {
+        border: 1px solid var(--calendar-border);
+        padding: 0 !important;
+    }
+    .ant-picker-content thead {
+        background: var(--calendar-thead-bg);
+    }
+    .ant-picker-content th {
+        color: var(--info-color);
+    }
+    .ant-picker-panel .ant-picker-calendar-date {
+        color: var(--info-color);
+        border-top: 2px solid var(--calendar-border) !important;
+        margin: 0 1px !important;
+    }
+    .ant-picker-panel .ant-picker-cell:hover .ant-picker-calendar-date {
+        background: var(--calendar-date-today-hover-bg-color) !important;
+    }
+    .ant-picker-calendar-date-today {
+        background: var(--calendar-date-today-bg-color) !important;
+    }
+}

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

@@ -1,25 +1,25 @@
-.water-consumption {
-    padding: 10px;
-
-    &-head {
-        padding: 20px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-
-        &-filter {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-        &-main {
-            display: flex;
-        }
-    }
-    &-main {
-        margin-top: 10px;
-        padding: 16px;
-        min-height: 400px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-    }
-}
+.water-consumption {
+    padding: 10px;
+
+    &-head {
+        padding: 20px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+
+        &-filter {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+        &-main {
+            display: flex;
+        }
+    }
+    &-main {
+        margin-top: 10px;
+        padding: 16px;
+        min-height: 400px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+    }
+}

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

@@ -1,66 +1,66 @@
-.car-work {
-    padding: 10px;
-    &-head {
-        padding: 10px 20px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-    }
-    &-content {
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-    }
-    &-summary {
-        padding: 0 20px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-
-        &-left {
-            width: 45%;
-        }
-    }
-    &-summary-nopb {
-        padding: 10px 20px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-    }
-    &-summary-pb {
-        padding: 0 20px;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        &-item {
-            width: 50%;
-            height: 200px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-    }
-    &-summary-norelation {
-        padding: 24px 0;
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-    }
-    &-summary-relation-item {
-        height: 200px;
-        display: flex;
-        flex-wrap: wrap;
-    }
-    &-summary-relation-chart {
-        width: 55%;
-    }
-    &-table {
-        min-height: 400px;
-        margin-top: 10px;
-        padding: 10px 20px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-    }
-}
+.car-work {
+    padding: 10px;
+    &-head {
+        padding: 10px 20px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    &-content {
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+    }
+    &-summary {
+        padding: 0 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        &-left {
+            width: 45%;
+        }
+    }
+    &-summary-nopb {
+        padding: 10px 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    &-summary-pb {
+        padding: 0 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        &-item {
+            width: 50%;
+            height: 200px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+    }
+    &-summary-norelation {
+        padding: 24px 0;
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+    }
+    &-summary-relation-item {
+        height: 200px;
+        display: flex;
+        flex-wrap: wrap;
+    }
+    &-summary-relation-chart {
+        width: 55%;
+    }
+    &-table {
+        min-height: 400px;
+        margin-top: 10px;
+        padding: 10px 20px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+    }
+}

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

@@ -79,10 +79,11 @@ var VtxCarModal = function VtxCarModal(props) {
   var _BaseService$useBaseI = _api.BaseService.useBaseInfo(id),
     baseInfo = _BaseService$useBaseI.baseInfo,
     info = _BaseService$useBaseI.info,
-    tabConfig = _BaseService$useBaseI.tabConfig,
-    visited = _BaseService$useBaseI.visited;
+    tabConfig = _BaseService$useBaseI.tabConfig;
   var _VideoService$getChan = _api2["default"].getChannels(info === null || info === void 0 ? void 0 : info.carCode, !!(info === null || info === void 0 ? void 0 : info.carCode)),
     channels = _VideoService$getChan.channels;
+  var _OilService$useHasOil = _api.OilService.useHasOil(id),
+    beenOilStatus = _OilService$useHasOil.beenOilStatus;
   (0, _react.useEffect)(function () {
     if (data === null || data === void 0 ? void 0 : data.id) {
       setService('zyqs-zqb');
@@ -121,23 +122,30 @@ var VtxCarModal = function VtxCarModal(props) {
   }
   var subTitle = ((_d = info === null || info === void 0 ? void 0 : info.actionType) === null || _d === void 0 ? void 0 : _d.indexOf('ACTION_LJSY')) > -1 ? info === null || info === void 0 ? void 0 : info.productTypeName : info === null || info === void 0 ? void 0 : info.carClassName;
   (0, _react.useEffect)(function () {
-    if (visited) {
-      var _tabsC = (tabConfig === null || tabConfig === void 0 ? void 0 : tabConfig.length) > 0 ? tabConfig : tabs;
-      if (_tabsC.findIndex(function (ele) {
+    if (tabConfig === null || tabConfig === void 0 ? void 0 : tabConfig.length) {
+      var list = tabConfig;
+      if (tabConfig.findIndex(function (ele) {
         return ele.key === 'car-video';
-      }) > -1) {
-        if ((channels === null || channels === void 0 ? void 0 : channels.length) < 1) {
-          _tabsC = _tabsC.filter(function (ele) {
-            return ele.key !== 'car-video';
-          });
-        }
+      }) > -1 && (channels === null || channels === void 0 ? void 0 : channels.length) < 1) {
+        list = tabsC.filter(function (ele) {
+          return ele.key !== 'car-video';
+        });
       }
-      setTabsC(_tabsC);
-      if ((_tabsC === null || _tabsC === void 0 ? void 0 : _tabsC.length) > 0 && tabChose) {
-        setTabChoseC(tabChose);
+      if (tabConfig.findIndex(function (ele) {
+        return ele.key === 'car-oil';
+      }) > -1 && !beenOilStatus) {
+        list = list.filter(function (ele) {
+          return ele.key !== 'car-oil';
+        });
       }
+      setTabsC(list);
     }
-  }, [id, JSON.stringify(tabConfig), tabChose, visited, JSON.stringify(channels)]);
+  }, [JSON.stringify(tabConfig), beenOilStatus, JSON.stringify(channels)]);
+  (0, _react.useEffect)(function () {
+    if ((tabConfig === null || tabConfig === void 0 ? void 0 : tabConfig.length) > 0 && tabChose) {
+      setTabChoseC(tabChose);
+    }
+  }, [JSON.stringify(tabConfig), tabChose]);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, visible && (/*#__PURE__*/_react["default"].createElement(_vtxBaseModal["default"], {
     title: title,
     subTitle: /*#__PURE__*/_react["default"].createElement("span", {