@vtx/modals2 5.0.57 → 5.0.59

package/lib/vtx-car-modal/content/JXH/Hw2WorkRecord/index.js

@@ -0,0 +1,291 @@
+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); }
+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 { useSetState } from 'ahooks';
+import { Col, Row, Space } from 'antd';
+import dayjs from 'dayjs';
+import * as echarts from 'echarts';
+import { useContext } from 'react';
+import { VmFactor, VmLineCharts, VmProgress, VmTable, VmTag, VmWrapper } from "../../../../_components";
+import useSettings from "../../../../_hooks/useSettings";
+import { Hw2Service, JxhService } from "../../../api";
+import { CarContext } from "../../../index";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+var workTypeColors = ['blue', 'green', 'yellow', 'purple', 'orange'];
+var Hw2WorkRecord = function Hw2WorkRecord() {
+  var _useSettings = useSettings(),
+    isDark = _useSettings.isDark,
+    chartFontColor = _useSettings.chartFontColor;
+  var _useContext = useContext(CarContext),
+    id = _useContext.id,
+    sDate = _useContext.startDate,
+    eDate = _useContext.endDate,
+    service = _useContext.service;
+  var _useSetState = useSetState({
+      startDate: sDate ? sDate : dayjs().subtract(6, 'day'),
+      endDate: eDate ? eDate : dayjs()
+    }),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
+    state = _useSetState2[0],
+    setState = _useSetState2[1];
+  var startDate = dayjs(state.startDate).format('YYYY-MM-DD');
+  var endDate = dayjs(state.endDate).format('YYYY-MM-DD');
+  var _Hw2Service$useWorkRe = Hw2Service.useWorkRecord(id, startDate, endDate),
+    workRecord = _Hw2Service$useWorkRe.workRecord,
+    loading = _Hw2Service$useWorkRe.loading;
+  var _workRecord$totalWork = workRecord.totalWorkInfo,
+    totalWorkInfo = _workRecord$totalWork === void 0 ? {} : _workRecord$totalWork,
+    _workRecord$workInfo = workRecord.workInfo,
+    workInfo = _workRecord$workInfo === void 0 ? [] : _workRecord$workInfo,
+    _workRecord$details = workRecord.details,
+    details = _workRecord$details === void 0 ? [] : _workRecord$details;
+  // 作业类型
+  var _JxhService$useWorkTy = JxhService.useWorkTypeJxh(service),
+    workTypeRes = _JxhService$useWorkTy.workTypeRes;
+  var workTypeColorMap = (workTypeRes || []).reduce(function (pre, cur, index) {
+    pre[cur.code] = workTypeColors[index % workTypeColors.length];
+    return pre;
+  }, {});
+  var tableProps = {
+    rowKey: 'ruleId',
+    pagination: false,
+    dataSource: details || [],
+    loading: loading
+  };
+  var columns = [_defineProperty(_defineProperty({
+    title: '排班日期',
+    dataIndex: 'workDate',
+    key: 'workDate',
+    width: 100,
+    sorter: true
+  }, "sorter", function sorter(a, b) {
+    return a.workDate > b.workDate ? 1 : -1;
+  }), "fixed", 'left'), {
+    title: '排班班次',
+    dataIndex: 'shiftInfoName',
+    key: 'shiftInfoName',
+    width: 150
+  }, {
+    title: '排班司机',
+    dataIndex: 'driverName',
+    key: 'driverName',
+    width: 120
+  }, {
+    title: '排班路段',
+    dataIndex: 'roadName',
+    key: 'roadName',
+    width: 150
+  }, {
+    title: '车道类型',
+    dataIndex: 'facilityTypeName',
+    key: 'facilityTypeName',
+    width: 120
+  }, {
+    title: '作业类型',
+    dataIndex: 'workTypeName',
+    key: 'workTypeName',
+    width: 100,
+    render: function render(text, record) {
+      return /*#__PURE__*/_jsx(VmTag, {
+        title: text,
+        type: workTypeColorMap[record.workTypeCode]
+      });
+    }
+  }, {
+    title: '排班趟数',
+    dataIndex: 'workCount',
+    key: 'workCount',
+    width: 100,
+    ellipsis: true,
+    align: 'right'
+  }, {
+    title: '排班里程(km)',
+    dataIndex: 'planMileage',
+    key: 'planMileage',
+    width: 120,
+    ellipsis: true,
+    align: 'right'
+  }, {
+    title: '作业里程(km)',
+    dataIndex: 'workMileage',
+    key: 'workMileage',
+    width: 120,
+    ellipsis: true,
+    align: 'right'
+  }, {
+    title: '任务完成率',
+    dataIndex: 'completeRate',
+    key: 'completeRate',
+    width: 120,
+    align: 'right',
+    render: function render(text) {
+      return "".concat(text, "%");
+    }
+  }, {
+    title: '作业质量',
+    dataIndex: 'workQuality',
+    key: 'workQuality',
+    width: 100,
+    render: function render(text) {
+      var colorMap = {
+        优: 'green',
+        良: 'yellow',
+        差: 'red'
+      };
+      return text ? /*#__PURE__*/_jsx(VmTag, {
+        title: text,
+        type: colorMap[text]
+      }) : '-';
+    }
+  }];
+  return /*#__PURE__*/_jsxs(Row, {
+    style: {
+      padding: 16,
+      height: '100%'
+    },
+    gutter: [16, 16],
+    children: [/*#__PURE__*/_jsx(Col, {
+      span: 24,
+      style: {
+        height: 273
+      },
+      children: /*#__PURE__*/_jsx(VmWrapper, {
+        title: '作业汇总分析',
+        filterType: 'rangePicker',
+        filterChange: function filterChange(date) {
+          setState({
+            startDate: date[0],
+            endDate: date[1]
+          });
+        },
+        dateValue: [state.startDate, state.endDate],
+        disabledDate: function disabledDate(current) {
+          return current && current > dayjs().endOf('day');
+        },
+        children: /*#__PURE__*/_jsxs(Row, {
+          children: [/*#__PURE__*/_jsx(Col, {
+            span: 12,
+            children: /*#__PURE__*/_jsxs(Row, {
+              gutter: [34, 34],
+              align: 'middle',
+              justify: 'center',
+              style: {
+                width: '100%',
+                height: '100%'
+              },
+              children: [/*#__PURE__*/_jsx(Col, {
+                flex: '108px',
+                children: /*#__PURE__*/_jsx(VmProgress.Circle, {
+                  rate: (totalWorkInfo === null || totalWorkInfo === void 0 ? void 0 : totalWorkInfo.completeRate) || 0,
+                  name: '完成率',
+                  strokeColor: isDark ? {
+                    '0%': '#009DFF',
+                    '100%': '#44FF98'
+                  } : {
+                    '0%': '#1677FF',
+                    '100%': '#48A2FF'
+                  }
+                })
+              }), /*#__PURE__*/_jsxs(Col, {
+                children: [/*#__PURE__*/_jsxs(Space, {
+                  size: 30,
+                  children: [/*#__PURE__*/_jsx(VmFactor, {
+                    name: '排班里程',
+                    unit: 'km',
+                    type: 'sm',
+                    value: (totalWorkInfo === null || totalWorkInfo === void 0 ? void 0 : totalWorkInfo.planMileage) || 0,
+                    fontType: 'green',
+                    img: isDark ? require("../../../imgs/calendar/dark_green_mileage.png") : require("../../../imgs/calendar/green_mileage.png")
+                  }), /*#__PURE__*/_jsx(VmFactor, {
+                    name: '行驶里程',
+                    unit: 'km',
+                    type: 'sm',
+                    value: (totalWorkInfo === null || totalWorkInfo === void 0 ? void 0 : totalWorkInfo.driverMileage) || 0,
+                    fontType: 'blue',
+                    img: isDark ? require("../../../imgs/calendar/dark_mileage.png") : require("../../../imgs/calendar/blue_mileage.png")
+                  })]
+                }), /*#__PURE__*/_jsx(VmFactor, {
+                  name: '作业里程',
+                  unit: 'km',
+                  type: 'sm',
+                  fontType: 'blue',
+                  value: (totalWorkInfo === null || totalWorkInfo === void 0 ? void 0 : totalWorkInfo.workMileage) || 0,
+                  img: isDark ? require("../../../imgs/calendar/dark_mileage.png") : require("../../../imgs/calendar/mileage.png")
+                })]
+              })]
+            })
+          }), /*#__PURE__*/_jsx(Col, {
+            span: 12,
+            children: /*#__PURE__*/_jsx(VmLineCharts, {
+              xAxis: _.map(workInfo, 'date'),
+              unit: "%",
+              dataList: [{
+                name: '完成率',
+                data: _.map(workInfo, 'completeRate'),
+                areaStyle: {
+                  color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                    offset: 0,
+                    color: 'rgba(32, 187, 112, 0.30)'
+                  }, {
+                    offset: 1,
+                    color: 'rgba(32, 187, 112, 0.05)'
+                  }])
+                },
+                lineStyle: {
+                  color: '#20BB70'
+                },
+                itemStyle: {
+                  color: '#20BB70'
+                },
+                markLine: {
+                  data: [{
+                    type: 'average',
+                    name: '均值'
+                  }],
+                  label: {
+                    show: true,
+                    position: 'insideEndTop',
+                    formatter: '{b}: {c}',
+                    color: chartFontColor,
+                    fontWeight: 'normal'
+                  },
+                  lineStyle: {
+                    color: '#F69518'
+                  }
+                }
+              }],
+              loading: loading,
+              height: 190
+            })
+          })]
+        })
+      })
+    }), /*#__PURE__*/_jsx(Col, {
+      span: 24,
+      style: {
+        height: 'calc(100% - 273px)'
+      },
+      children: /*#__PURE__*/_jsx(VmWrapper, {
+        title: '作业明细',
+        style: {
+          height: '100%'
+        },
+        children: /*#__PURE__*/_jsx(VmTable, _objectSpread(_objectSpread({
+          columns: columns
+        }, tableProps), {}, {
+          indexFixed: true
+        }))
+      })
+    })]
+  });
+};
+export default Hw2WorkRecord;

package/lib/vtx-car-modal/content/JXH/WorkRecord/index.js

@@ -85,7 +85,7 @@ var WorkRecord = function WorkRecord() {
     });
   };
   var tableProps = {
-    rowKey: 'index',
+    rowKey: 'ruleId',
     pagination: _objectSpread(_objectSpread({}, pagination), {}, {
       total: (recordJxhRes === null || recordJxhRes === void 0 ? void 0 : recordJxhRes.total) || 0,
       defaultPageSize: 10,

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

@@ -2,9 +2,17 @@ import BaseInfo from "./BaseInfo";
 import StaticInfo from "./StaticInfo";
 import WorkRecord from "./WorkRecord";
 import AlarmInfo from "./AlarmInfo";
+import Hw2WorkRecord from "./Hw2WorkRecord";
+import Hw2AlarmInfo from "./Hw2AlarmInfo";
+import Hw2BaseInfo from "./Hw2BaseInfo";
+import Hw2StaticInfo from "./Hw2StaticInfo";
 export default {
   BaseInfo: BaseInfo,
   StaticInfo: StaticInfo,
   WorkRecord: WorkRecord,
-  AlarmInfo: AlarmInfo
+  AlarmInfo: AlarmInfo,
+  Hw2WorkRecord: Hw2WorkRecord,
+  Hw2AlarmInfo: Hw2AlarmInfo,
+  Hw2BaseInfo: Hw2BaseInfo,
+  Hw2StaticInfo: Hw2StaticInfo
 };

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

@@ -47,6 +47,14 @@ var TABS_JXH_STATIC = 'jxh-static';
 var TABS_JXH_ALARM = 'jxh-alarm';
 // 机械化-作业记录
 var TABS_JXH_WORK = 'jxh-work';
+// 机械化-总览信息
+var TABS_JXH_BASE_HW_2 = 'jxh-base-hw2';
+// 机械化-作业日历
+var TABS_JXH_STATIC_HW_2 = 'jxh-static-hw2';
+// 机械化-报警信息
+var TABS_JXH_ALARM_HW_2 = 'jxh-alarm-hw2';
+// 机械化-作业记录
+var TABS_JXH_WORK_HW_2 = 'jxh-work-hw2';
 // 垃圾收运-总览信息
 var TABS_LJSY_BASE = 'ljsy-base';
 // 垃圾收运-运行日历
@@ -243,7 +251,7 @@ var VtxCarModal = function VtxCarModal(props) {
   }, [info === null || info === void 0 ? void 0 : info.actionType]);
   var contents = (_contents = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_BASE, /*#__PURE__*/_jsx(Common.BaseInfo, {})), TABS_STATIC, /*#__PURE__*/_jsx(Common.StaticInfo, {})), TABS_ALARM, /*#__PURE__*/_jsx(Common.AlarmInfo, {})), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
     channels: channels
-  })), TABS_OIL, /*#__PURE__*/_jsx(Common.OilConsumption, {})), TABS_WATER, /*#__PURE__*/_jsx(Common.WaterConsumption, {})), TABS_MAINTENANCE, /*#__PURE__*/_jsx(Common.Maintenance, {})), TABS_DETAIL, /*#__PURE__*/_jsx(Common.DetailInfo, {})), TABS_DEVICE, /*#__PURE__*/_jsx(Common.DeviceInfo, {})), TABS_JXH_BASE, /*#__PURE__*/_jsx(JXH.BaseInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JXH_STATIC, /*#__PURE__*/_jsx(JXH.StaticInfo, {})), TABS_JXH_WORK, /*#__PURE__*/_jsx(JXH.WorkRecord, {})), TABS_JXH_ALARM, /*#__PURE__*/_jsx(JXH.AlarmInfo, {})), TABS_LJSY_BASE, /*#__PURE__*/_jsx(Ljsy.BaseInfo, {})), TABS_LJSY_STATIC, /*#__PURE__*/_jsx(Ljsy.StaticInfo, {})), TABS_LJSY_WORK, /*#__PURE__*/_jsx(Ljsy.WorkRecord, {})), TABS_LJSY_ALARM, /*#__PURE__*/_jsx(Ljsy.AlarmInfo, {})), TABS_CC_BASE, /*#__PURE__*/_jsx(Cc.BaseInfo, {})), TABS_CC_ORDER, /*#__PURE__*/_jsx(Cc.OrderInfo, {})), TABS_CC_STATIC, /*#__PURE__*/_jsx(Cc.StaticInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_CC_WORK, /*#__PURE__*/_jsx(Cc.WorkRecord, {})), TABS_CC_ALARM, /*#__PURE__*/_jsx(Cc.AlarmInfo, {})), TABS_LJZY_BASE, /*#__PURE__*/_jsx(Ljzy.BaseInfo, {})), TABS_LJZY_STATIC, /*#__PURE__*/_jsx(Ljzy.StaticInfo, {})), TABS_LJZY_WORK, /*#__PURE__*/_jsx(Ljzy.WorkRecord, {})), TABS_JZLJ_CAR_BASE, /*#__PURE__*/_jsx(Jzlj.BaseInfo, {})), TABS_JZLJ_CAR_DISPOSE, /*#__PURE__*/_jsx(Jzlj.Dispose, {})), TABS_JZLJ_CAR_COLLECTION, /*#__PURE__*/_jsx(Jzlj.Collection, {})), TABS_JZLJ_CAR_ALARM, /*#__PURE__*/_jsx(Jzlj.Alarm, {})), TABS_JZLJ_CAR_RUNNING_CALENDAR, /*#__PURE__*/_jsx(Jzlj.RunCalendar, {})));
+  })), TABS_OIL, /*#__PURE__*/_jsx(Common.OilConsumption, {})), TABS_WATER, /*#__PURE__*/_jsx(Common.WaterConsumption, {})), TABS_MAINTENANCE, /*#__PURE__*/_jsx(Common.Maintenance, {})), TABS_DETAIL, /*#__PURE__*/_jsx(Common.DetailInfo, {})), TABS_DEVICE, /*#__PURE__*/_jsx(Common.DeviceInfo, {})), TABS_JXH_BASE, /*#__PURE__*/_jsx(JXH.BaseInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JXH_STATIC, /*#__PURE__*/_jsx(JXH.StaticInfo, {})), TABS_JXH_WORK, /*#__PURE__*/_jsx(JXH.WorkRecord, {})), TABS_JXH_ALARM, /*#__PURE__*/_jsx(JXH.AlarmInfo, {})), TABS_JXH_BASE_HW_2, /*#__PURE__*/_jsx(JXH.Hw2BaseInfo, {})), TABS_JXH_STATIC_HW_2, /*#__PURE__*/_jsx(JXH.Hw2StaticInfo, {})), TABS_JXH_WORK_HW_2, /*#__PURE__*/_jsx(JXH.Hw2WorkRecord, {})), TABS_JXH_ALARM_HW_2, /*#__PURE__*/_jsx(JXH.Hw2AlarmInfo, {})), TABS_LJSY_BASE, /*#__PURE__*/_jsx(Ljsy.BaseInfo, {})), TABS_LJSY_STATIC, /*#__PURE__*/_jsx(Ljsy.StaticInfo, {})), TABS_LJSY_WORK, /*#__PURE__*/_jsx(Ljsy.WorkRecord, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_LJSY_ALARM, /*#__PURE__*/_jsx(Ljsy.AlarmInfo, {})), TABS_CC_BASE, /*#__PURE__*/_jsx(Cc.BaseInfo, {})), TABS_CC_ORDER, /*#__PURE__*/_jsx(Cc.OrderInfo, {})), TABS_CC_STATIC, /*#__PURE__*/_jsx(Cc.StaticInfo, {})), TABS_CC_WORK, /*#__PURE__*/_jsx(Cc.WorkRecord, {})), TABS_CC_ALARM, /*#__PURE__*/_jsx(Cc.AlarmInfo, {})), TABS_LJZY_BASE, /*#__PURE__*/_jsx(Ljzy.BaseInfo, {})), TABS_LJZY_STATIC, /*#__PURE__*/_jsx(Ljzy.StaticInfo, {})), TABS_LJZY_WORK, /*#__PURE__*/_jsx(Ljzy.WorkRecord, {})), TABS_JZLJ_CAR_BASE, /*#__PURE__*/_jsx(Jzlj.BaseInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JZLJ_CAR_DISPOSE, /*#__PURE__*/_jsx(Jzlj.Dispose, {})), TABS_JZLJ_CAR_COLLECTION, /*#__PURE__*/_jsx(Jzlj.Collection, {})), TABS_JZLJ_CAR_ALARM, /*#__PURE__*/_jsx(Jzlj.Alarm, {})), TABS_JZLJ_CAR_RUNNING_CALENDAR, /*#__PURE__*/_jsx(Jzlj.RunCalendar, {})));
   var _useGetConfig = useGetConfig(code, tabs),
     tabsData = _useGetConfig.tabsData;
   var tabsList = useMemo(function () {

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/BaseInfo/TodayWork.js

@@ -106,6 +106,7 @@ export default function TodayWork(props) {
             percent: item.rate,
             strokeColor: strokeColor,
             trailColor: isDark ? 'rgba(255,255,255,0.05)' : '#D2D2D2',
+            railColor: isDark ? 'rgba(255,255,255,0.05)' : '#D2D2D2',
             strokeWidth: 6,
             showInfo: false
           })]

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);
+    }
+  }
+}

package/lib/vtx-housing-estate-modal/components/Alarm/GDCLXL.js

@@ -80,11 +80,13 @@ var GDCLXL = function GDCLXL(_ref) {
             type: "dashboard",
             percent: ele.value,
             width: 120,
+            size: 120,
             strokeWidth: 10,
             gapDegree: 180,
             strokeLinecap: "butt",
             strokeColor: strokeColor[ele.value > ele.avg ? 'alarm' : 'normal'],
             trailColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
+            railColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
             showInfo: false
           }), /*#__PURE__*/_jsxs("div", {
             className: "".concat(classPrefix, "-progress-desc"),

package/lib/vtx-housing-estate-modal/components/Alarm/MYFX_GD.js

@@ -70,11 +70,13 @@ var GDCLXL = function GDCLXL(_ref) {
             type: "dashboard",
             percent: ele.value,
             width: 160,
+            size: 160,
             strokeWidth: 10,
             gapDegree: 180,
             strokeLinecap: "butt",
             strokeColor: strokeColor[ele.value > ele.avg ? 'alarm' : 'normal'],
             trailColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
+            railColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
             showInfo: false
           }), /*#__PURE__*/_jsx("div", {
             className: "".concat(classPrefix, "-progress-desc"),

package/lib/vtx-housing-estate-modal/components/OverView/RightBottom.js

@@ -123,12 +123,14 @@ var RightBottom = function RightBottom(_ref) {
               }), /*#__PURE__*/_jsx(Progress, {
                 type: "dashboard",
                 percent: ele.value,
+                size: 120,
                 width: 120,
                 strokeWidth: 10,
                 gapDegree: 180,
                 strokeLinecap: "butt",
                 strokeColor: strokeColor[ele.value > ele.avg ? 'alarm' : 'normal'],
                 trailColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
+                railColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
                 showInfo: false
               }), /*#__PURE__*/_jsxs("div", {
                 className: "".concat(classPrefix, "-rightbottom-progress-desc"),

package/lib/vtx-restaurant-modal/components/Basic/index.less

@@ -1,16 +1,16 @@
-.vtx-restaurant-rule_item {
-  border-radius: 8px 8px 8px 8px;
-  border: 1px solid var(--gray-line-color);
-  padding: 16px 16px  8px;
-  margin-top: 12px;
-  position: relative;
-  .vtx-restaurant-border {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: -2px;
-    height: 44px;
-    border-radius: 8px 8px 0px 0px;
-    border-top: 2px solid var(--blue-color);
-  }
-}
+.vtx-restaurant-rule_item {
+  border-radius: 8px 8px 8px 8px;
+  border: 1px solid var(--gray-line-color);
+  padding: 16px 16px  8px;
+  margin-top: 12px;
+  position: relative;
+  .vtx-restaurant-border {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: -2px;
+    height: 44px;
+    border-radius: 8px 8px 0px 0px;
+    border-top: 2px solid var(--blue-color);
+  }
+}