@vtx/modals2 5.0.30 → 5.0.32

package/lib/vtx-staff-modal/components/BaseInfo/WorkStatic.js

@@ -2,41 +2,126 @@
  * 区域进场量分析
  */
 
-import { VmEmpty, VmPieCharts } from "../../../_components";
+import { Col, Row } from 'antd';
+import dayjs from 'dayjs';
+import { VmEmpty, VmFactor, VmPieCharts } from "../../../_components";
+import useSettings from "../../../_hooks/useSettings";
+import { BaseService } from "../../api";
+import mileageLight from "../../imgs/mileage.png";
+import mileageDark from "../../imgs/mileage_dark.png";
+import onlineLight from "../../imgs/online.png";
+import onlineDark from "../../imgs/online_dark.png";
+import allTimeLight from "../../imgs/all_time.png";
+import allTimeDark from "../../imgs/all_time_dark.png";
+import avgLight from "../../imgs/avg.png";
+import avgDark from "../../imgs/avg_dark.png";
 import "./index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 function WorkStaticDay(_ref) {
-  var _workStaticRes$detail, _workStaticRes$detail2;
-  var workStaticRes = _ref.workStaticRes;
-  return /*#__PURE__*/_jsx("div", {
-    className: "staff-base-static-chart",
-    children: workStaticRes !== null && workStaticRes !== void 0 && (_workStaticRes$detail = workStaticRes.details) !== null && _workStaticRes$detail !== void 0 && _workStaticRes$detail.length ? /*#__PURE__*/_jsx(VmPieCharts, {
-      unit: "",
-      name: "",
-      innerRadius: ['50%', '65%'],
-      outerRadius: ['65%', '70%'],
-      dataList: (workStaticRes === null || workStaticRes === void 0 || (_workStaticRes$detail2 = workStaticRes.details) === null || _workStaticRes$detail2 === void 0 ? void 0 : _workStaticRes$detail2.length) > 0 ? workStaticRes === null || workStaticRes === void 0 ? void 0 : workStaticRes.details.map(function (ele) {
-        return {
-          name: ele.statusName,
-          value: ele.duration / 1000,
-          durationStr: ele.durationStr
-        };
-      }) : [],
-      legendConfig: {
-        formatter: function formatter(name) {
-          var value = workStaticRes === null || workStaticRes === void 0 ? void 0 : workStaticRes.details.find(function (item) {
-            return item.statusName === name;
-          });
-          if (value) {
-            return "\t\t".concat(name, "\t\t").concat(value.durationStr, "\t\t");
-          } else {
-            return '';
-          }
-        }
-      }
-    }) : /*#__PURE__*/_jsx(VmEmpty, {
-      type: "NO_CHART"
-    })
+  var type = _ref.type,
+    service = _ref.service,
+    id = _ref.id;
+  var _useSettings = useSettings(),
+    isDark = _useSettings.isDark;
+  var _BaseService$useStaff = BaseService.useStaffStatic(id, type === 'day' ? dayjs().format('YYYY-MM-DD') : dayjs().startOf('M').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'), service),
+    workInfoRes = _BaseService$useStaff.workInfoRes;
+  var _ref2 = workInfoRes || {},
+    _ref2$totalMileage = _ref2.totalMileage,
+    totalMileage = _ref2$totalMileage === void 0 ? 0 : _ref2$totalMileage,
+    onlineHour = _ref2.onlineHour,
+    validWorkHour = _ref2.validWorkHour,
+    outShiftHour = _ref2.outShiftHour,
+    violateStayHour = _ref2.violateStayHour,
+    outPostHour = _ref2.outPostHour;
+  var avgWorkHour = 0;
+  var detail = [];
+  if (Number(validWorkHour)) {
+    avgWorkHour = (Number(validWorkHour) / dayjs().date()).toFixed(2) || 0;
+    detail.push({
+      name: '有效作业',
+      value: Number(validWorkHour)
+    });
+  }
+  if (Number(outShiftHour)) {
+    detail.push({
+      name: '脱岗',
+      value: Number(outShiftHour)
+    });
+  }
+  if (Number(violateStayHour)) {
+    detail.push({
+      name: '违规滞留',
+      value: Number(violateStayHour)
+    });
+  }
+  if (Number(outPostHour)) {
+    detail.push({
+      name: '异常离线',
+      value: Number(outPostHour)
+    });
+  }
+  return /*#__PURE__*/_jsxs(Row, {
+    children: [/*#__PURE__*/_jsx(Col, {
+      span: 9,
+      children: /*#__PURE__*/_jsxs("div", {
+        className: "staff-base-right-static",
+        children: [type === 'day' && /*#__PURE__*/_jsxs(_Fragment, {
+          children: [/*#__PURE__*/_jsx(VmFactor, {
+            name: "\u4ECA\u65E5\u884C\u8D70",
+            unit: "km",
+            value: totalMileage || 0,
+            img: isDark ? mileageDark : mileageLight,
+            fontType: "blue"
+          }), /*#__PURE__*/_jsx(VmFactor, {
+            name: "\u4ECA\u65E5\u5728\u7EBF",
+            unit: "h",
+            value: onlineHour || '--',
+            img: isDark ? onlineDark : onlineLight,
+            style: {
+              marginBottom: 12
+            },
+            fontType: "green"
+          })]
+        }), type === 'month' && /*#__PURE__*/_jsxs(_Fragment, {
+          children: [/*#__PURE__*/_jsx(VmFactor, {
+            name: "\u603B\u6709\u6548\u4F5C\u4E1A\u65F6\u957F",
+            unit: "h",
+            value: validWorkHour || 0,
+            img: isDark ? allTimeDark : allTimeLight,
+            fontType: "blue"
+          }), /*#__PURE__*/_jsx(VmFactor, {
+            name: "\u65E5\u5747\u6709\u6548\u4F5C\u4E1A\u65F6\u957F",
+            unit: "h",
+            value: avgWorkHour || '--',
+            img: isDark ? avgDark : avgLight,
+            fontType: "green",
+            style: {
+              marginBottom: 12
+            }
+          })]
+        })]
+      })
+    }), /*#__PURE__*/_jsx(Col, {
+      span: 15,
+      children: /*#__PURE__*/_jsx("div", {
+        className: "staff-base-right--right",
+        children: /*#__PURE__*/_jsx("div", {
+          className: "staff-base-static-chart",
+          children: detail.length ? /*#__PURE__*/_jsx(VmPieCharts, {
+            unit: "h",
+            name: "",
+            innerRadius: ['50%', '65%'],
+            outerRadius: ['65%', '70%'],
+            dataList: detail,
+            legendConfig: {
+              right: 20
+            }
+          }) : /*#__PURE__*/_jsx(VmEmpty, {
+            type: "NO_CHART"
+          })
+        })
+      })
+    })]
   });
 }
 export default WorkStaticDay;

package/lib/vtx-staff-modal/components/BaseInfo/index.js

@@ -11,26 +11,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 } from 'antd';
 import dayjs from 'dayjs';
-import { VmExtraTab, VmFactor, VmInfoCollection, VmMap, VmTitle, VmWrapper } from "../../../_components";
+import { VmExtraTab, VmInfoCollection, VmMap, VmTitle, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
-import mileageLight from "../../imgs/mileage.png";
-import mileageDark from "../../imgs/mileage_dark.png";
-import onlineLight from "../../imgs/online.png";
-import onlineDark from "../../imgs/online_dark.png";
-import allTimeLight from "../../imgs/all_time.png";
-import allTimeDark from "../../imgs/all_time_dark.png";
-import avgLight from "../../imgs/avg.png";
-import avgDark from "../../imgs/avg_dark.png";
 import "./index.less";
 import ListZymx from "./ListZymx";
 import WorkStatic from "./WorkStatic";
-import WorkStaticDay from "./WorkStaticDay";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var BaseInfo = function BaseInfo(props) {
-  var _workInfoRes$totalMil;
   var id = props.id,
     baseInfo = props.baseInfo,
     realInfo = props.realInfo,
@@ -39,25 +28,19 @@ var BaseInfo = function BaseInfo(props) {
     service = _props$service === void 0 ? '' : _props$service;
   var _useSettings = useSettings(),
     theme = _useSettings.theme,
-    isDark = _useSettings.isDark,
     mapInfo = _useSettings.mapInfo;
   var _useSetState = useSetState({
-      activeKey: '1',
+      activeKey: 'day',
       contentStyle: {}
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
     setState = _useSetState2[1];
-  var activeKey = state.activeKey,
-    contentStyle = state.contentStyle;
+  var activeKey = state.activeKey;
   var mapPoints = realInfo.mapPoints,
     pointLngLat = realInfo.pointLngLat,
     mapPolygons = realInfo.mapPolygons,
     realtimeInfo = realInfo.realtimeInfo;
-  var _BaseService$useWorkI = BaseService.useWorkInfo(id, dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'), service),
-    workInfoRes = _BaseService$useWorkI.workInfoRes;
-  var _BaseService$useWorkS = BaseService.useWorkStatic(id, dayjs().startOf('M').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'), service),
-    workStaticRes = _BaseService$useWorkS.workStaticRes;
   var baseTabContent = /*#__PURE__*/_jsx(VmInfoCollection, {
     data: baseInfo,
     gap: 8,
@@ -94,73 +77,22 @@ var BaseInfo = function BaseInfo(props) {
         extra: /*#__PURE__*/_jsx(VmExtraTab, {
           data: [{
             title: '今日',
-            key: '1'
+            key: 'day'
           }, {
             title: '本月',
-            key: '2'
+            key: 'month'
           }],
           onChange: function onChange(key) {
             setState({
               activeKey: key
             });
-          }
+          },
+          value: activeKey
         }),
-        children: /*#__PURE__*/_jsx(_Fragment, {
-          children: /*#__PURE__*/_jsxs(Row, {
-            children: [/*#__PURE__*/_jsx(Col, {
-              span: 9,
-              children: /*#__PURE__*/_jsxs("div", {
-                className: "staff-base-right-static",
-                children: [activeKey === '1' && /*#__PURE__*/_jsxs(_Fragment, {
-                  children: [/*#__PURE__*/_jsx(VmFactor, {
-                    name: "\u4ECA\u65E5\u884C\u8D70",
-                    unit: "km",
-                    value: (workInfoRes === null || workInfoRes === void 0 || (_workInfoRes$totalMil = workInfoRes.totalMileage) === null || _workInfoRes$totalMil === void 0 ? void 0 : _workInfoRes$totalMil.toFixed(2)) || 0,
-                    img: isDark ? mileageDark : mileageLight,
-                    fontType: "blue"
-                  }), /*#__PURE__*/_jsx(VmFactor, {
-                    name: "\u4ECA\u65E5\u5728\u7EBF",
-                    unit: "",
-                    value: (workInfoRes === null || workInfoRes === void 0 ? void 0 : workInfoRes.onlineTimeStr) || '--',
-                    img: isDark ? onlineDark : onlineLight,
-                    style: {
-                      marginBottom: 12
-                    },
-                    fontType: "green"
-                  })]
-                }), activeKey === '2' && /*#__PURE__*/_jsxs(_Fragment, {
-                  children: [/*#__PURE__*/_jsx(VmFactor, {
-                    name: "\u603B\u6709\u6548\u4F5C\u4E1A\u65F6\u957F",
-                    unit: "",
-                    value: (workStaticRes === null || workStaticRes === void 0 ? void 0 : workStaticRes.totalOnLineTimeStr) || 0,
-                    img: isDark ? allTimeDark : allTimeLight,
-                    fontType: "blue"
-                  }), /*#__PURE__*/_jsx(VmFactor, {
-                    name: "\u65E5\u5747\u6709\u6548\u4F5C\u4E1A\u65F6\u957F",
-                    unit: "",
-                    value: (workStaticRes === null || workStaticRes === void 0 ? void 0 : workStaticRes.avgOnLineTimeStr) || '--',
-                    img: isDark ? avgDark : avgLight,
-                    fontType: "green",
-                    style: {
-                      marginBottom: 12
-                    }
-                  })]
-                })]
-              })
-            }), /*#__PURE__*/_jsx(Col, {
-              span: 15,
-              children: /*#__PURE__*/_jsxs("div", {
-                className: "staff-base-right--right",
-                children: [activeKey === '1' && /*#__PURE__*/_jsx(WorkStaticDay, {
-                  id: id,
-                  service: service
-                }), activeKey === '2' && /*#__PURE__*/_jsx(WorkStatic, {
-                  id: id,
-                  workStaticRes: workStaticRes
-                })]
-              })
-            })]
-          })
+        children: /*#__PURE__*/_jsx(WorkStatic, {
+          type: activeKey,
+          service: service,
+          id: id
         })
       }), /*#__PURE__*/_jsx("div", {
         className: "staff-zymx",

package/lib/vtx-staff-modal/components/Equipment/index.js

@@ -137,7 +137,7 @@ var Equipment = function Equipment(props) {
           className: "staff-equip-map",
           children: /*#__PURE__*/_jsx(VmMap, _objectSpread({
             mapCenter: pointLngLat !== null && pointLngLat !== void 0 && pointLngLat.length ? pointLngLat : mapInfo === null || mapInfo === void 0 ? void 0 : mapInfo.mapCenter,
-            newMapPoints: mapPoints
+            mapPoints: mapPoints
           }, customMapInfo))
         })
       })]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "5.0.30",
+  "version": "5.0.32",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",

package/lib/vtx-staff-modal/components/BaseInfo/WorkStaticDay.js

@@ -1,48 +0,0 @@
-/**
- * 区域进场量分析
- */
-
-import dayjs from 'dayjs';
-import { VmEmpty, VmPieCharts } from "../../../_components";
-import { BaseService } from "../../api";
-import "./index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
-function WorkStaticDay(_ref) {
-  var _workStaticRes$detail, _workStaticRes$detail2;
-  var id = _ref.id,
-    _ref$service = _ref.service,
-    service = _ref$service === void 0 ? '' : _ref$service;
-  var _BaseService$useWorkS = BaseService.useWorkStatic(id, dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'), service),
-    workStaticRes = _BaseService$useWorkS.workStaticRes;
-  return /*#__PURE__*/_jsx("div", {
-    className: "staff-base-static-chart",
-    children: workStaticRes !== null && workStaticRes !== void 0 && (_workStaticRes$detail = workStaticRes.details) !== null && _workStaticRes$detail !== void 0 && _workStaticRes$detail.length ? /*#__PURE__*/_jsx(VmPieCharts, {
-      unit: "",
-      name: "",
-      innerRadius: ['50%', '65%'],
-      outerRadius: ['65%', '70%'],
-      dataList: (workStaticRes === null || workStaticRes === void 0 || (_workStaticRes$detail2 = workStaticRes.details) === null || _workStaticRes$detail2 === void 0 ? void 0 : _workStaticRes$detail2.length) > 0 ? workStaticRes === null || workStaticRes === void 0 ? void 0 : workStaticRes.details.map(function (ele) {
-        return {
-          name: ele.statusName,
-          value: ele.duration / 1000,
-          durationStr: ele.durationStr
-        };
-      }) : [],
-      legendConfig: {
-        formatter: function formatter(name) {
-          var value = workStaticRes === null || workStaticRes === void 0 ? void 0 : workStaticRes.details.find(function (item) {
-            return item.statusName === name;
-          });
-          if (value) {
-            return "\t\t".concat(name, "\t\t").concat(value.durationStr, "\t\t");
-          } else {
-            return '';
-          }
-        }
-      }
-    }) : /*#__PURE__*/_jsx(VmEmpty, {
-      type: "NO_CHART"
-    })
-  });
-}
-export default WorkStaticDay;