@vtx/modals2 5.0.14 → 5.0.17

package/lib/index.js

@@ -17,4 +17,7 @@ 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 VtxZfModal } from "./vtx-zf-modal";
+export { default as VtxZfModal } from "./vtx-zf-modal";
+
+// 建筑垃圾产品弹窗
+export { default as VtxJzljGcxmModal } from "./vtx-jzlj-gcxm-modal"; // 建筑垃圾-工程项目

package/lib/style/index.less

@@ -26,15 +26,10 @@
     #cef0ff 100%
   );
   --modal-head-line-shadow: 0 4px 4px 0 rgba(0, 0, 0, 25%);
-  --modal-content-bg: linear-gradient(
-    180deg,
-    rgba(0, 120, 199, 0.8) 0%,
-    rgba(15, 72, 118, 0) 100%
-  );
   --modal-head-split-line-color: rgba(255, 255, 255, 0.2);
   --modal-content-bg: linear-gradient(
     180deg,
-    rgba(0, 120, 199, 0.5) 0%,
+    rgba(0, 120, 199, 0.4) 0%,
     rgba(15, 72, 118, 0) 100%
   );
   --modal-content-box-shadow: 0 4px 4px 0 rgba(22, 119, 255, 25%),

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

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { AccessIcon, AlarmIcon, AnalysisIcon, AnnouncementIcon, AnnualInspectionIcon, AssessmentIcon, AssetIcon, AttendanceIcon, CalendarIcon, CaseIcon, ChargingIcon, CollectionIcon, ContractIcon, DeviceIcon, DocumentIcon, EvaluationIcon, FactoryIcon, HistoryIcon, IndexIcon, InspectionIcon, InsuranceIcon, InterviewIcon, LifeCycleIcon, LogIcon, MaintenanceIcon, MeasurementIcon, OilIcon, OperationIcon, PointIcon, ProcessIcon, ProductionUnitIcon, RouteIcon, SchedulingIcon, SparePartsIcon, SpeedCurveIcon, StatisticsIcon, SummaryIcon, TrashIcon, VideoIcon, ViolationIcon, WaterIcon, WorkInfoIcon, WorkingConditionIcon, WorkOrderIcon } from "../../_util/iconSvgHtml";
+import { AccessIcon, AlarmIcon, AnalysisIcon, AnnouncementIcon, AnnualInspectionIcon, AppraisalIcon, AppraiseIcon, AssessmentIcon, AssetIcon, AttendanceIcon, CalendarIcon, CaseIcon, ChargingIcon, CollectionIcon, ContractIcon, DeviceIcon, DocumentIcon, EquipmentIcon, EvaluationIcon, FactoryIcon, HistoryIcon, IndexIcon, InspectionIcon, InsuranceIcon, InterviewIcon, LifeCycleIcon, LogIcon, MaintenanceIcon, MeasurementIcon, MeteringIcon, OilIcon, OperationIcon, PointIcon, ProcessIcon, ProductionUnitIcon, RmIcon, RouteIcon, SbzjIcon, SchedulingIcon, ScoreIcon, SparePartsIcon, SpeedCurveIcon, StatisticsIcon, SummaryIcon, SyInfoIcon, TfdIcon, TfrdIcon, ThrowIcon, TrashIcon, VideoIcon, ViolationIcon, WaterIcon, WgrgsIcon, WgxwIcon, WorkConditionIcon, WorkInfoIcon, WorkingConditionIcon, WorkOrderIcon } from "../../_util/iconSvgHtml";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Tabs = function Tabs(props) {
@@ -10,9 +10,28 @@ var Tabs = function Tabs(props) {
     _props$theme = props.theme,
     theme = _props$theme === void 0 ? 'light' : _props$theme;
   var iconRender = {
+    'default-base': SummaryIcon,
+    base: SummaryIcon,
     summary: SummaryIcon,
     history: HistoryIcon,
     alarm: AlarmIcon,
+    'cp-sy': SyInfoIcon,
+    'cp-warning': AlarmIcon,
+    'cp-exeception': AlarmIcon,
+    sy: SyInfoIcon,
+    warning: AlarmIcon,
+    exeception: AlarmIcon,
+    rm: RmIcon,
+    'default-rm': RmIcon,
+    appraisal: AppraisalIcon,
+    'default-appraisal': AppraisalIcon,
+    equipment: EquipmentIcon,
+    sbzj: SbzjIcon,
+    wgxw: WgxwIcon,
+    tfrd: TfrdIcon,
+    throw: ThrowIcon,
+    tfd: TfdIcon,
+    wgrgs: WgrgsIcon,
     water: WaterIcon,
     oil: OilIcon,
     video: VideoIcon,
@@ -49,23 +68,31 @@ var Tabs = function Tabs(props) {
     route: RouteIcon,
     measurement: MeasurementIcon,
     workingCondition: WorkingConditionIcon,
+    workCondition: WorkConditionIcon,
+    metering: MeteringIcon,
     evaluation: EvaluationIcon,
     scheduling: SchedulingIcon,
     workOrder: WorkOrderIcon,
     assessment: AssessmentIcon,
-    index: IndexIcon
+    index: IndexIcon,
+    appraise: AppraiseIcon,
+    score: ScoreIcon,
+    build: WorkInfoIcon,
+    file: DocumentIcon
   };
   return tabs.length ? /*#__PURE__*/_jsx("div", {
     className: 'vm-modal-tabs',
     children: tabs.map(function (tab, index) {
       var width = 26,
         height = 26;
-      var ComponentIcon = iconRender[tab.key];
+      var ComponentIcon = iconRender[tab.key] || SummaryIcon;
       return /*#__PURE__*/_jsxs("div", {
         onClick: function onClick() {
           onChange(tab.key);
         },
-        className: classNames('vm-modal-tabs-item', active === tab.key ? 'vm-modal-tabs-item-active' : 'vm-modal-tabs-item-normal'),
+        className: classNames('vm-modal-tabs-item', active === tab.key ? 'vm-modal-tabs-item-active' : 'vm-modal-tabs-item-normal', {
+          'vm-modal-tabs-item-dark': theme !== 'light'
+        }),
         children: [ComponentIcon && /*#__PURE__*/_jsx(ComponentIcon, {
           width: width,
           height: height,

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

@@ -1,31 +1,54 @@
-.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);
+      &.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-base-modal/index.js

@@ -126,7 +126,7 @@ var VmBaseModal = function VmBaseModal(props) {
     if (prefixList.length === 2) {
       prefix = "/".concat(prefixList[0]);
     }
-    var _theme = theme === 'blue' ? 'dark' : theme;
+    var _theme = theme === 'light' ? 'light' : 'dark';
     if (type === 'car') {
       var path = 'index';
       src = iframeUrl || "".concat(prefix, "/carHistory/#/").concat(path, "?carId=").concat(id, "&theme=").concat(_theme, "&startTime=").concat(startDate ? dayjs(startDate).format('YYYY-MM-DD 00:00:00') : '', "&endTime=").concat(endDate ? dayjs(endDate).format('YYYY-MM-DD 23:59:59') : '');
@@ -184,7 +184,7 @@ var VmBaseModal = function VmBaseModal(props) {
               setCurrentTabKey(key);
             },
             active: currentTabKey,
-            theme: "dark"
+            theme: theme
           }), /*#__PURE__*/_jsx(VtxThemeProvider, {
             value: value,
             children: /*#__PURE__*/_jsx("div", {

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

@@ -44,6 +44,7 @@
     width: 100%;
     background: var(--modal-content-bg);
     border-radius: 8px;
+    opacity: 0.8;
   }
   .vm-base-modal-content-wrap {
     flex: 1;
@@ -52,7 +53,8 @@
     padding: 0 16px 16px;
     .vm-base-modal-content {
       height: 100%;
-      overflow: auto;
+      overflow-x: hidden;
+      overflow-y: auto;
     }
   }
   * {

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

@@ -87,6 +87,9 @@ var Info = function Info() {
   }];
   return /*#__PURE__*/_jsx(Col, {
     flex: '400px',
+    style: {
+      height: '100%'
+    },
     children: /*#__PURE__*/_jsxs(VmWrapper, {
       title: '基本信息',
       children: [/*#__PURE__*/_jsx(VmInfoCollection, {

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: 0;
+  width: 100%;
+  margin-top: 10px;
+}

package/lib/vtx-car-modal/content/Common/BaseInfo/index.js

@@ -34,6 +34,14 @@ var BaseInfo = function BaseInfo() {
     loading = _BaseService$useDaily.loading;
   var todayInfo = _.last(dailyCarRunRes);
   var xAxis = _.map(dailyCarRunRes, 'reportDate');
+  var blueColor = '#1677FF';
+  var greenColor = '#0FB964';
+  var colorOpacity = 0.2;
+  if (isDark) {
+    blueColor = '#0095FF';
+    greenColor = '#36AB78';
+    colorOpacity = 0.6;
+  }
   return /*#__PURE__*/_jsxs(Row, {
     gutter: [16, 16],
     style: {
@@ -42,7 +50,8 @@ var BaseInfo = function BaseInfo() {
     children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
       flex: '1',
       style: {
-        minWidth: 0
+        minWidth: 0,
+        height: '100%'
       },
       children: /*#__PURE__*/_jsxs("div", {
         className: 'vtx-car-info-right-wrap',
@@ -77,18 +86,18 @@ var BaseInfo = function BaseInfo() {
                     dataList: [{
                       name: '行驶里程',
                       data: _.map(dailyCarRunRes, 'sumMileage'),
-                      color: 'rgba(22, 119, 255, 0.20)',
+                      color: transformRgb(blueColor, colorOpacity),
                       smooth: true,
                       symbol: 'none',
                       areaStyle: {
                         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                           offset: 0,
-                          color: 'rgba(22, 119, 255, 0.20)'
+                          color: transformRgb(blueColor, colorOpacity)
                         },
                         // 半透明
                         {
                           offset: 1,
-                          color: 'rgba(22, 119, 255, 0)'
+                          color: transformRgb(blueColor, 0)
                         } // 更透明
                         ])
                       }
@@ -132,18 +141,18 @@ var BaseInfo = function BaseInfo() {
                     dataList: [{
                       name: '行驶时长',
                       data: _.map(dailyCarRunRes, 'driveDuration'),
-                      color: 'rgba(15, 185, 100, 0.20)',
+                      color: transformRgb(greenColor, colorOpacity),
                       smooth: true,
                       symbol: 'none',
                       areaStyle: {
                         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                           offset: 0,
-                          color: 'rgba(15, 185, 100, 0.20)'
+                          color: transformRgb(greenColor, colorOpacity)
                         },
                         // 半透明
                         {
                           offset: 1,
-                          color: 'rgba(15, 185, 100, 0)'
+                          color: transformRgb(greenColor, 0)
                         } // 更透明
                         ])
                       }

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-car-modal/content/JXH/BaseInfo/index.js

@@ -32,7 +32,8 @@ var BaseInfo = function BaseInfo() {
     children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
       flex: '1',
       style: {
-        minWidth: 0
+        minWidth: 0,
+        height: '100%'
       },
       children: /*#__PURE__*/_jsxs("div", {
         className: 'vtx-car-info-right-wrap',

package/lib/vtx-car-modal/content/Ljsy/BaseInfo/index.js

@@ -10,6 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { transformRgb } from "../../../../_util";
 import { Col, Row } from 'antd';
 import dayjs from 'dayjs';
 import * as echarts from 'echarts';
@@ -108,6 +109,15 @@ var BaseInfo = function BaseInfo() {
       fontType: 'blue'
     });
   }
+  var blueColor = '#1677FF';
+  var greenColor = '#0FB964';
+  var yellowColor = '#ffaa00';
+  var colorOpacity = 0.2;
+  if (isDark) {
+    blueColor = '#0095FF';
+    greenColor = '#36AB78';
+    colorOpacity = 0.6;
+  }
   return /*#__PURE__*/_jsxs(Row, {
     gutter: [16, 16],
     style: {
@@ -116,7 +126,8 @@ var BaseInfo = function BaseInfo() {
     children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
       flex: '1',
       style: {
-        minWidth: 0
+        minWidth: 0,
+        height: '100%'
       },
       children: /*#__PURE__*/_jsxs("div", {
         className: 'vtx-car-info-right-wrap',
@@ -179,18 +190,18 @@ var BaseInfo = function BaseInfo() {
                     dataList: [{
                       name: '已收点位',
                       data: _.map(taskDaySummary, 'collectPointNum'),
-                      color: 'rgba(22, 119, 255, 0.20)',
+                      color: transformRgb(greenColor, colorOpacity),
                       smooth: true,
                       symbol: 'none',
                       areaStyle: {
                         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                           offset: 0,
-                          color: 'rgba(22, 119, 255, 0.20)'
+                          color: transformRgb(greenColor, colorOpacity)
                         },
                         // 半透明
                         {
                           offset: 1,
-                          color: 'rgba(22, 119, 255, 0)'
+                          color: transformRgb(greenColor, 0)
                         } // 更透明
                         ])
                       }
@@ -230,18 +241,18 @@ var BaseInfo = function BaseInfo() {
                     dataList: [{
                       name: '收集桶数',
                       data: _.map(taskDaySummary, 'bucketNum'),
-                      color: 'rgba(15, 185, 100, 0.20)',
+                      color: transformRgb(blueColor, colorOpacity),
                       smooth: true,
                       symbol: 'none',
                       areaStyle: {
                         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                           offset: 0,
-                          color: 'rgba(15, 185, 100, 0.20)'
+                          color: transformRgb(blueColor, colorOpacity)
                         },
                         // 半透明
                         {
                           offset: 1,
-                          color: 'rgba(15, 185, 100, 0)'
+                          color: transformRgb(blueColor, 0)
                         } // 更透明
                         ])
                       }
@@ -282,18 +293,18 @@ var BaseInfo = function BaseInfo() {
                     dataList: [{
                       name: '收集重量',
                       data: _.map(taskDaySummary, 'weight'),
-                      color: 'rgba(17, 159, 251, 0.20)',
+                      color: transformRgb(yellowColor, colorOpacity),
                       smooth: true,
                       symbol: 'none',
                       areaStyle: {
                         color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
                           offset: 0,
-                          color: 'rgba(17, 159, 251, 0.20)'
+                          color: transformRgb(yellowColor, colorOpacity)
                         },
                         // 半透明
                         {
                           offset: 1,
-                          color: 'rgba(17, 159, 251, 0)'
+                          color: transformRgb(yellowColor, 0)
                         } // 更透明
                         ])
                       }