@vtx/modals2 2.15.89 → 2.15.90

package/lib/style/index.css

@@ -135,7 +135,7 @@
   --info-warnning: #f7d93d;
   --table-head-bg: rgba(0, 173, 177, 0.1);
   --timeline-active: #24f2ff;
-  --calendar-border: #35444c;
+  --calendar-border: rgba(32, 102, 167, 0.5);
   --calendar-thead-bg: rgba(255, 255, 255, 0.1);
   --calendar-content-bg: linear-gradient(0deg, #2a55e9, #0dbafe);
   --calendar-bg: rgba(255, 255, 255, 0.1);

package/lib/style/themes/dark.css

@@ -135,7 +135,7 @@
   --info-warnning: #f7d93d;
   --table-head-bg: rgba(0, 173, 177, 0.1);
   --timeline-active: #24f2ff;
-  --calendar-border: #35444c;
+  --calendar-border: rgba(32, 102, 167, 0.5);
   --calendar-thead-bg: rgba(255, 255, 255, 0.1);
   --calendar-content-bg: linear-gradient(0deg, #2a55e9, #0dbafe);
   --calendar-bg: rgba(255, 255, 255, 0.1);

package/lib/style/themes/dark.less

@@ -110,7 +110,7 @@
         --info-warnning: #f7d93d;
         --table-head-bg: rgba(0, 173, 177, 0.1);
         --timeline-active: #24f2ff;
-        --calendar-border: #35444c;
+        --calendar-border: rgba(32, 102, 167, 0.5);
         --calendar-thead-bg: rgba(255, 255, 255, 0.1);
         --calendar-content-bg: linear-gradient(0deg, #2a55e9, #0dbafe);
         --calendar-bg: rgba(255, 255, 255, 0.1);

package/lib/style/themes/index.css

@@ -135,7 +135,7 @@
   --info-warnning: #f7d93d;
   --table-head-bg: rgba(0, 173, 177, 0.1);
   --timeline-active: #24f2ff;
-  --calendar-border: #35444c;
+  --calendar-border: rgba(32, 102, 167, 0.5);
   --calendar-thead-bg: rgba(255, 255, 255, 0.1);
   --calendar-content-bg: linear-gradient(0deg, #2a55e9, #0dbafe);
   --calendar-bg: rgba(255, 255, 255, 0.1);

package/lib/vm-sub-tabs/style/index.css

@@ -31,7 +31,7 @@
   --border-active: 1px solid #018aff;
   --color: #fff;
   --active-color: #fff !important;
-  --active-bg: linear-gradient(180deg, #2a55e9 0%, #0dbafe 100%);
+  --active-bg: rgba(28, 115, 212, 0.4);
 }
 .vtx-sub-tabs .tab-pane {
   padding: 18px 0;
@@ -75,15 +75,15 @@
   height: 32px;
   margin-left: 0 !important;
   color: var(--color);
-  background-color: var(--active-bg);
-  border: var(--border);
+  background-color: transparent;
+  border: 1px solid var(--active-bg);
   border-radius: 2px;
 }
 .vtx-sub-tabs.blue > .ant-tabs-nav > .ant-tabs-nav-wrap > .ant-tabs-nav-list > .ant-tabs-tab-active {
   background: var(--active-bg);
-  border: var(--border-active);
-  -o-border-image: var(--border-image);
-     border-image: var(--border-image);
+  border: 1px solid var(--active-bg);
+  -o-border-image: var(--active-bg);
+     border-image: var(--active-bg);
 }
 .vtx-sub-tabs.blue > .ant-tabs-nav > .ant-tabs-nav-wrap > .ant-tabs-nav-list > .ant-tabs-tab-active .ant-tabs-tab-btn {
   color: var(--active-color);

package/lib/vm-sub-tabs/style/index.less

@@ -1,182 +1,182 @@
-.vtx-sub-tabs {
-    --border: 1px solid #dadadaff;
-    --border-active: 1px solid #1890ffff;
-    --border-image: none;
-    --color: #222;
-    --active-color: #1890ffff;
-    --active-bg: transparent;
-    min-width: 300px;
-    img {
-        margin: -2px 14px 0 0;
-    }
-
-    &.ghost {
-        --border: 1px solid #4eadfb;
-
-        --color: #1890ff;
-        --active-color: #fff;
-        --active-bg: linear-gradient(180deg, #62c1fd 0%, #1890ff 100%);
-    }
-
-    &.dark {
-        --border: 1px solid #95fff933;
-        --border-image: linear-gradient(180deg, #356178, #51e0ff) 1 1;
-        --border-active: 1px solid #95fff9ff;
-        --color: #8d9798ff;
-        --active-color: #95fff9ff !important;
-        --active-bg: linear-gradient(0deg, #1a606d, #192f3f);
-    }
-    &.blue {
-        --border: 1px solid #1464a6;
-        --border-image: linear-gradient(180deg, #356178, #51e0ff) 1 1;
-        --border-active: 1px solid #018aff;
-        --color: #fff;
-        --active-color: #fff !important;
-        --active-bg: linear-gradient(180deg, #2a55e9 0%, #0dbafe 100%);
-    }
-    color: var(--color);
-    .tab-pane {
-        padding: 18px 0;
-    }
-    > .ant-tabs-content-holder {
-        color: var(--color);
-    }
-    > .ant-tabs-nav {
-        // margin-bottom: 0;
-
-        &::before {
-            display: none;
-        }
-
-        > .ant-tabs-nav-wrap {
-            > .ant-tabs-nav-list {
-                > .ant-tabs-tab {
-                    height: 32px;
-                    margin-left: 0 !important;
-                    color: var(--color);
-                    background-color: transparent;
-                    border: var(--border);
-                    border-radius: 2px;
-                }
-
-                > .ant-tabs-tab-active {
-                    background: var(--active-bg);
-                    border: var(--border-active);
-                    border-image: var(--border-image);
-
-                    .ant-tabs-tab-btn {
-                        color: var(--active-color);
-                        &:focus {
-                            color: var(--active-color);
-                        }
-                    }
-                }
-            }
-        }
-        .ant-tabs-tab-btn:active {
-            color: var(--border-active);
-        }
-    }
-
-    &.blue {
-        .tab-pane {
-            padding: 18px 0;
-        }
-        > .ant-tabs-nav {
-            // margin-bottom: 0;
-
-            &::before {
-                display: none;
-            }
-
-            > .ant-tabs-nav-wrap {
-                > .ant-tabs-nav-list {
-                    > .ant-tabs-tab {
-                        height: 32px;
-                        margin-left: 0 !important;
-                        color: var(--color);
-                        background-color: var(--active-bg);
-                        border: var(--border);
-                        border-radius: 2px;
-                    }
-
-                    > .ant-tabs-tab-active {
-                        background: var(--active-bg);
-                        border: var(--border-active);
-                        border-image: var(--border-image);
-
-                        .ant-tabs-tab-btn {
-                            color: var(--active-color);
-                            &:focus {
-                                color: var(--active-color);
-                            }
-                        }
-                    }
-                }
-            }
-            .ant-tabs-tab-btn:active {
-                color: var(--border-active);
-            }
-        }
-    }
-}
-
-.vtx-sub-tabs-line {
-    --border: 1px solid #dadadaff;
-    --border-active: 1px solid #1890ffff;
-    --border-image: none;
-    --color: #222;
-    --active-color: #1890ffff;
-    --active-bg: transparent;
-
-    &.dark {
-        --border: 1px solid #95fff933;
-        --border-image: linear-gradient(180deg, #356178, #51e0ff) 1 1;
-        --border-active: 1px solid #95fff9ff;
-        --color: #8d9798ff;
-        --active-color: #95fff9ff !important;
-        --active-bg: linear-gradient(0deg, #1a606d, #192f3f);
-    }
-
-    &.blue {
-        --border: 1px solid #95fff933;
-        --border-image: linear-gradient(180deg, #356178, #51e0ff) 1 1;
-        --border-active: 1px solid #018aff !important;
-        --color: #ffffff;
-        --active-color: #1890ffff !important;
-        --active-bg: linear-gradient(180deg, #2a55e9 0%, #0dbafe 100%);
-    }
-    > .ant-tabs-nav {
-        // margin-bottom: 0;
-
-        &::before {
-            border-bottom: 1px solid rgba(102, 244, 251, 0.1);
-            content: '';
-        }
-
-        > .ant-tabs-nav-wrap {
-            > .ant-tabs-nav-list {
-                > .ant-tabs-tab {
-                    height: 32px;
-                    color: var(--color);
-                    background-color: transparent;
-                }
-
-                > .ant-tabs-tab-active {
-                    .ant-tabs-tab-btn {
-                        color: var(--active-color);
-                        &:focus {
-                            color: var(--active-color);
-                        }
-                    }
-                }
-                > .ant-tabs-ink-bar {
-                    background: var(--active-color);
-                }
-            }
-        }
-        .ant-tabs-tab-btn:active {
-            color: var(--border-active);
-        }
-    }
-}
+.vtx-sub-tabs {
+    --border: 1px solid #dadadaff;
+    --border-active: 1px solid #1890ffff;
+    --border-image: none;
+    --color: #222;
+    --active-color: #1890ffff;
+    --active-bg: transparent;
+    min-width: 300px;
+    img {
+        margin: -2px 14px 0 0;
+    }
+
+    &.ghost {
+        --border: 1px solid #4eadfb;
+
+        --color: #1890ff;
+        --active-color: #fff;
+        --active-bg: linear-gradient(180deg, #62c1fd 0%, #1890ff 100%);
+    }
+
+    &.dark {
+        --border: 1px solid #95fff933;
+        --border-image: linear-gradient(180deg, #356178, #51e0ff) 1 1;
+        --border-active: 1px solid #95fff9ff;
+        --color: #8d9798ff;
+        --active-color: #95fff9ff !important;
+        --active-bg: linear-gradient(0deg, #1a606d, #192f3f);
+    }
+    &.blue {
+        --border: 1px solid #1464a6;
+        --border-image: linear-gradient(180deg, #356178, #51e0ff) 1 1;
+        --border-active: 1px solid #018aff;
+        --color: #fff;
+        --active-color: #fff !important;
+        --active-bg: rgba(28,115,212,0.4);
+    }
+    color: var(--color);
+    .tab-pane {
+        padding: 18px 0;
+    }
+    > .ant-tabs-content-holder {
+        color: var(--color);
+    }
+    > .ant-tabs-nav {
+        // margin-bottom: 0;
+
+        &::before {
+            display: none;
+        }
+
+        > .ant-tabs-nav-wrap {
+            > .ant-tabs-nav-list {
+                > .ant-tabs-tab {
+                    height: 32px;
+                    margin-left: 0 !important;
+                    color: var(--color);
+                    background-color: transparent;
+                    border: var(--border);
+                    border-radius: 2px;
+                }
+
+                > .ant-tabs-tab-active {
+                    background: var(--active-bg);
+                    border: var(--border-active);
+                    border-image: var(--border-image);
+
+                    .ant-tabs-tab-btn {
+                        color: var(--active-color);
+                        &:focus {
+                            color: var(--active-color);
+                        }
+                    }
+                }
+            }
+        }
+        .ant-tabs-tab-btn:active {
+            color: var(--border-active);
+        }
+    }
+
+    &.blue {
+        .tab-pane {
+            padding: 18px 0;
+        }
+        > .ant-tabs-nav {
+            // margin-bottom: 0;
+
+            &::before {
+                display: none;
+            }
+
+            > .ant-tabs-nav-wrap {
+                > .ant-tabs-nav-list {
+                    > .ant-tabs-tab {
+                        height: 32px;
+                        margin-left: 0 !important;
+                        color: var(--color);
+                        background-color: transparent;
+                        border: 1px solid var(--active-bg);
+                        border-radius: 2px;
+                    }
+
+                    > .ant-tabs-tab-active {
+                        background: var(--active-bg);
+                        border: 1px solid var(--active-bg);
+                        border-image: var(--active-bg);
+
+                        .ant-tabs-tab-btn {
+                            color: var(--active-color);
+                            &:focus {
+                                color: var(--active-color);
+                            }
+                        }
+                    }
+                }
+            }
+            .ant-tabs-tab-btn:active {
+                color: var(--border-active);
+            }
+        }
+    }
+}
+
+.vtx-sub-tabs-line {
+    --border: 1px solid #dadadaff;
+    --border-active: 1px solid #1890ffff;
+    --border-image: none;
+    --color: #222;
+    --active-color: #1890ffff;
+    --active-bg: transparent;
+
+    &.dark {
+        --border: 1px solid #95fff933;
+        --border-image: linear-gradient(180deg, #356178, #51e0ff) 1 1;
+        --border-active: 1px solid #95fff9ff;
+        --color: #8d9798ff;
+        --active-color: #95fff9ff !important;
+        --active-bg: linear-gradient(0deg, #1a606d, #192f3f);
+    }
+
+    &.blue {
+        --border: 1px solid #95fff933;
+        --border-image: linear-gradient(180deg, #356178, #51e0ff) 1 1;
+        --border-active: 1px solid #018aff !important;
+        --color: #ffffff;
+        --active-color: #1890ffff !important;
+        --active-bg: linear-gradient(180deg, #2a55e9 0%, #0dbafe 100%);
+    }
+    > .ant-tabs-nav {
+        // margin-bottom: 0;
+
+        &::before {
+            border-bottom: 1px solid rgba(102, 244, 251, 0.1);
+            content: '';
+        }
+
+        > .ant-tabs-nav-wrap {
+            > .ant-tabs-nav-list {
+                > .ant-tabs-tab {
+                    height: 32px;
+                    color: var(--color);
+                    background-color: transparent;
+                }
+
+                > .ant-tabs-tab-active {
+                    .ant-tabs-tab-btn {
+                        color: var(--active-color);
+                        &:focus {
+                            color: var(--active-color);
+                        }
+                    }
+                }
+                > .ant-tabs-ink-bar {
+                    background: var(--active-color);
+                }
+            }
+        }
+        .ant-tabs-tab-btn:active {
+            color: var(--border-active);
+        }
+    }
+}

package/lib/vm-video/index.css

@@ -135,7 +135,7 @@
   --info-warnning: #f7d93d;
   --table-head-bg: rgba(0, 173, 177, 0.1);
   --timeline-active: #24f2ff;
-  --calendar-border: #35444c;
+  --calendar-border: rgba(32, 102, 167, 0.5);
   --calendar-thead-bg: rgba(255, 255, 255, 0.1);
   --calendar-content-bg: linear-gradient(0deg, #2a55e9, #0dbafe);
   --calendar-bg: rgba(255, 255, 255, 0.1);

package/lib/vtx-area-modal/style/index.css

@@ -135,7 +135,7 @@
   --info-warnning: #f7d93d;
   --table-head-bg: rgba(0, 173, 177, 0.1);
   --timeline-active: #24f2ff;
-  --calendar-border: #35444c;
+  --calendar-border: rgba(32, 102, 167, 0.5);
   --calendar-thead-bg: rgba(255, 255, 255, 0.1);
   --calendar-content-bg: linear-gradient(0deg, #2a55e9, #0dbafe);
   --calendar-bg: rgba(255, 255, 255, 0.1);

package/lib/vtx-car-modal/components/AlarmInfo/index.css

@@ -28,7 +28,7 @@
   -webkit-box-align: center;
       -ms-flex-align: center;
           align-items: center;
-  width: 40%;
+  width: 50%;
 }
 .car-alarm .car-main .car-head-label {
   display: inline-block;
@@ -38,6 +38,20 @@
 .car-alarm .car-main .car-head-sel {
   margin-right: 24px;
 }
+.car-alarm .car-main .car-head-tabs {
+  width: 84px;
+  overflow: hidden;
+  padding-left: 20px;
+}
+.car-alarm .car-main .car-head-tabs .ant-tabs-nav {
+  margin: 0 !important;
+}
+.car-alarm .car-main .car-head-tabs .vtx-sub-tabs img {
+  margin: 0;
+}
+.car-alarm .car-main .car-head-tabs .ant-tabs-card > .ant-tabs-nav .ant-tabs-tab {
+  padding: 8px;
+}
 .car-alarm .car-main-list {
   min-height: 550px;
 }

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

@@ -16,12 +16,8 @@ var _List = _interopRequireDefault(require("./List"));
 var _useSettings2 = _interopRequireDefault(require("../../../vm-hooks/useSettings"));
 var _api = require("../../api");
 require("./index.less");
-var _chart = _interopRequireDefault(require("../../../vm-appraisal-info/imgs/chart.png"));
-var _chart_active = _interopRequireDefault(require("../../../vm-appraisal-info/imgs/chart_active.png"));
-var _chart_active_light = _interopRequireDefault(require("../../../vm-appraisal-info/imgs/chart_active_light.png"));
-var _list = _interopRequireDefault(require("../../../vm-appraisal-info/imgs/list.png"));
-var _list_active = _interopRequireDefault(require("../../../vm-appraisal-info/imgs/list_active.png"));
-var _list_active_light = _interopRequireDefault(require("../../../vm-appraisal-info/imgs/list_active_light.png"));
+var _chart = _interopRequireDefault(require("../../imgs/chart.svg"));
+var _table = _interopRequireDefault(require("../../imgs/table.svg"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -85,30 +81,7 @@ var CarAlarmInfo = function CarAlarmInfo(props) {
     className: "car-main"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "car-head"
-  }, /*#__PURE__*/_react["default"].createElement(_vmSubTabs["default"], {
-    onChange: function onChange(key) {
-      setState({
-        tabKey: key
-      });
-    },
-    activeKey: tabKey
-  }, [{
-    name: (/*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
-      src: tabKey === '1' ? isDark || theme == 'blue' ? _chart_active["default"] : _chart_active_light["default"] : _chart["default"]
-    }), "\u56FE\u8868")),
-    key: '1'
-  }, {
-    name: (/*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
-      src: tabKey === '2' ? isDark || theme == 'blue' ? _list_active["default"] : _list_active_light["default"] : _list["default"]
-    }), "\u5217\u8868")),
-    key: '2'
-  }].map(function (ele) {
-    return /*#__PURE__*/_react["default"].createElement(_vmSubTabs.SubTabPane, {
-      subKey: ele.key,
-      key: ele.key,
-      tab: ele.name
-    });
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("div", null), /*#__PURE__*/_react["default"].createElement("div", {
     className: "car-head-filter"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "car-head-sel"
@@ -126,7 +99,43 @@ var CarAlarmInfo = function CarAlarmInfo(props) {
     onChange: function onChange(dates) {
       return dates && handleDateChange((0, _moment["default"])(dates[0]).format('YYYY-MM-DD'), (0, _moment["default"])(dates[1]).format('YYYY-MM-DD'));
     }
-  }))), tabKey === '1' && (/*#__PURE__*/_react["default"].createElement(_Charts["default"], {
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "car-head-tabs"
+  }, /*#__PURE__*/_react["default"].createElement(_vmSubTabs["default"], {
+    onChange: function onChange(key) {
+      setState({
+        tabKey: key
+      });
+    },
+    activeKey: tabKey,
+    style: {
+      padding: 0
+    }
+  }, [{
+    name: (/*#__PURE__*/_react["default"].createElement("img", {
+      src: _chart["default"],
+      style: {
+        transform: 'translateX(60px)',
+        filter: tabKey === '1' ? isDark || theme == 'blue' ? 'drop-shadow(#74bbf4 -60px 0 0)' : 'drop-shadow(#74bbf4 -60px 0 0)' : isDark || theme == 'blue' ? 'drop-shadow(#fff -60px 0 0)' : 'drop-shadow(grey -60px 0 0)'
+      }
+    })),
+    key: '1'
+  }, {
+    name: (/*#__PURE__*/_react["default"].createElement("img", {
+      src: _table["default"],
+      style: {
+        transform: 'translateX(60px)',
+        filter: tabKey === '2' ? isDark || theme == 'blue' ? 'drop-shadow(#74bbf4 -60px 0 0)' : 'drop-shadow(#74bbf4 -60px 0 0)' : isDark || theme == 'blue' ? 'drop-shadow(#fff -60px 0 0)' : 'drop-shadow(grey -60px 0 0)'
+      }
+    })),
+    key: '2'
+  }].map(function (ele) {
+    return /*#__PURE__*/_react["default"].createElement(_vmSubTabs.SubTabPane, {
+      subKey: ele.key,
+      key: ele.key,
+      tab: ele.name
+    });
+  }))))), tabKey === '1' && (/*#__PURE__*/_react["default"].createElement(_Charts["default"], {
     pieData: (value === 'GPS' ? (_a = todayRunRes === null || todayRunRes === void 0 ? void 0 : todayRunRes.alarmGroupByType) === null || _a === void 0 ? void 0 : _a.items : pieData) || [],
     lineData: (value === 'GPS' ? todayRunRes === null || todayRunRes === void 0 ? void 0 : todayRunRes.alarmGroupByDayChart : lineData) || {}
   })), tabKey === '2' && (/*#__PURE__*/_react["default"].createElement(_List["default"], {