@vtx/modals2 5.0.29 → 5.0.31

package/lib/_components/vm-map/index.js

@@ -21,8 +21,6 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function VmOlMap(_ref) {
   var _mapInfo$olProps, _points$data2, _polygons$data2, _newPoints$data3;
   var mapCenter = _ref.mapCenter,
-    _ref$mapType = _ref.mapType,
-    mapType = _ref$mapType === void 0 ? 'bmap' : _ref$mapType,
     _ref$mapPoints = _ref.mapPoints,
     mapPoints = _ref$mapPoints === void 0 ? [] : _ref$mapPoints,
     _ref$newMapPoints = _ref.newMapPoints,

package/lib/vtx-car-modal/content/Jzlj/Dispose/Pies.js

@@ -47,7 +47,7 @@ export default function Pies(_ref) {
             });
             var info = startDataList[index] || {};
             var value = info.value;
-            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value, "\u5904\u7F6E\u8BC1)");
+            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value !== null && value !== void 0 ? value : 0, "\u5904\u7F6E\u8BC1)");
           }
         }
       })
@@ -68,7 +68,7 @@ export default function Pies(_ref) {
             });
             var info = endDataList[index] || {};
             var value = info.value;
-            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value, "\u5904\u7F6E\u8BC1)");
+            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value !== null && value !== void 0 ? value : 0, "\u5904\u7F6E\u8BC1)");
           }
         }
       })

package/lib/vtx-qyry-modal/api.js

@@ -97,8 +97,7 @@ var BaseService = {
         },
         lng: mapInfoRes.data.lngDone,
         lat: mapInfoRes.data.latDone,
-        labelClass: 'vtx-map-carCode',
-        url: mapInfoRes !== null && mapInfoRes !== void 0 && (_mapInfoRes$data2 = mapInfoRes.data) !== null && _mapInfoRes$data2 !== void 0 && _mapInfoRes$data2.icon ? "/cloudFile/common/downloadFile?id=".concat(mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data3 = mapInfoRes.data) === null || _mapInfoRes$data3 === void 0 ? void 0 : _mapInfoRes$data3.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon2({
+        url: mapInfoRes !== null && mapInfoRes !== void 0 && (_mapInfoRes$data2 = mapInfoRes.data) !== null && _mapInfoRes$data2 !== void 0 && _mapInfoRes$data2.icon ? "/cloudFile/common/downloadFile?id=".concat(mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data3 = mapInfoRes.data) === null || _mapInfoRes$data3 === void 0 ? void 0 : _mapInfoRes$data3.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon({
           canvasIcon: 'PERSONNEL',
           color: (mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data4 = mapInfoRes.data) === null || _mapInfoRes$data4 === void 0 ? void 0 : _mapInfoRes$data4.statusCode) === 'Normal' ? '#119FFB' : '#999999'
         }).getImgUrl() : new MapIcon.CommonIcon({

package/lib/vtx-staff-modal/api.js

@@ -1,4 +1,7 @@
 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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; }
@@ -104,8 +107,8 @@ var BaseService = {
         },
         lng: mapInfoRes.data.lngDone,
         lat: mapInfoRes.data.latDone,
-        labelClass: 'vtx-map-carCode',
-        url: mapInfoRes !== null && mapInfoRes !== void 0 && (_mapInfoRes$data3 = mapInfoRes.data) !== null && _mapInfoRes$data3 !== void 0 && _mapInfoRes$data3.icon ? "/cloudFile/common/downloadFile?id=".concat(mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data4 = mapInfoRes.data) === null || _mapInfoRes$data4 === void 0 ? void 0 : _mapInfoRes$data4.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon2({
+        // labelClass: 'vtx-map-carCode',
+        url: mapInfoRes !== null && mapInfoRes !== void 0 && (_mapInfoRes$data3 = mapInfoRes.data) !== null && _mapInfoRes$data3 !== void 0 && _mapInfoRes$data3.icon ? "/cloudFile/common/downloadFile?id=".concat(mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data4 = mapInfoRes.data) === null || _mapInfoRes$data4 === void 0 ? void 0 : _mapInfoRes$data4.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon({
           canvasIcon: 'PERSONNEL',
           color: (mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data5 = mapInfoRes.data) === null || _mapInfoRes$data5 === void 0 ? void 0 : _mapInfoRes$data5.statusCode) === 'Normal' ? '#119FFB' : '#999999'
         }).getImgUrl() : new MapIcon.CommonIcon({
@@ -175,9 +178,42 @@ var BaseService = {
       workInfoRes: (workInfoRes === null || workInfoRes === void 0 ? void 0 : workInfoRes.data) || {}
     };
   },
+  useStaffStatic: function useStaffStatic(staffId, startDate, endDate, service) {
+    var _useRequest7 = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var _res$data;
+        var res;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/staffStatic/page"), {
+                data: {
+                  staffId: staffId,
+                  startTime: "".concat(startDate, " 00:00:00"),
+                  endTime: "".concat(endDate, " 23:59:59"),
+                  pageNo: 0,
+                  pageSize: 1
+                }
+              });
+            case 2:
+              res = _context.sent;
+              return _context.abrupt("return", (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.rows) === null || _res$data === void 0 ? void 0 : _res$data[0]) || {});
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      })), {
+        refreshDeps: [staffId, startDate, endDate]
+      }),
+      workInfoRes = _useRequest7.data;
+    return {
+      workInfoRes: workInfoRes || {}
+    };
+  },
   // 今日作业
   useTodayWork: function useTodayWork(staffId, startDate, endDate, page, service) {
-    var _useRequest7 = useRequest(function () {
+    var _useRequest8 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/kanban/kanbanShiftWorkInfoPage"), {
           data: {
             staffId: staffId,
@@ -190,14 +226,14 @@ var BaseService = {
       }, {
         refreshDeps: [staffId, startDate, endDate, page]
       }),
-      todayWorkRes = _useRequest7.data;
+      todayWorkRes = _useRequest8.data;
     return {
       todayWorkRes: (todayWorkRes === null || todayWorkRes === void 0 ? void 0 : todayWorkRes.data) || []
     };
   },
   // 作业统计
   useWorkStatic: function useWorkStatic(staffId, startDate, endDate, service) {
-    var _useRequest8 = useRequest(function () {
+    var _useRequest9 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/kanban/kanbanWorkInfoStatistics"), {
           data: {
             staffId: staffId,
@@ -208,14 +244,14 @@ var BaseService = {
       }, {
         refreshDeps: [staffId, startDate, endDate]
       }),
-      workStaticRes = _useRequest8.data;
+      workStaticRes = _useRequest9.data;
     return {
       workStaticRes: (workStaticRes === null || workStaticRes === void 0 ? void 0 : workStaticRes.data) || {}
     };
   },
   // 里程分析
   useMileAnalysis: function useMileAnalysis(staffId, startDate, endDate) {
-    var _useRequest9 = useRequest(function () {
+    var _useRequest10 = useRequest(function () {
         return request.get('/cloud/zyry-reborn/api/v101/kanban/kanbanWorkMileageAnalysis', {
           data: {
             staffId: staffId,
@@ -226,14 +262,14 @@ var BaseService = {
       }, {
         refreshDeps: [staffId, startDate, endDate]
       }),
-      mileAnalysisRes = _useRequest9.data;
+      mileAnalysisRes = _useRequest10.data;
     return {
       mileAnalysisRes: (mileAnalysisRes === null || mileAnalysisRes === void 0 ? void 0 : mileAnalysisRes.data) || {}
     };
   },
   useStatisticsByMonth: function useStatisticsByMonth(id, month, service) {
     //日历
-    var _useRequest10 = useRequest(function () {
+    var _useRequest11 = useRequest(function () {
         return request.get("/cloud/".concat(service ? 'rygl' : 'zyry-reborn', "/api/v101/attendanceRecord/statisticsByMonth"), {
           data: {
             staffId: id,
@@ -243,7 +279,7 @@ var BaseService = {
       }, {
         refreshDeps: [id, month]
       }),
-      data = _useRequest10.data;
+      data = _useRequest11.data;
     return {
       data: (data === null || data === void 0 ? void 0 : data.data) || []
     };
@@ -253,7 +289,7 @@ var AlarmService = {
   // 报警类型
   useAlarmType: function useAlarmType(staffId, startTime, endTime, service) {
     var _alarmTypeRes$data;
-    var _useRequest11 = useRequest(function () {
+    var _useRequest12 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/alarmInfo/pageAlarmCount"), {
           data: {
             staffId: staffId,
@@ -264,7 +300,7 @@ var AlarmService = {
       }, {
         refreshDeps: [staffId, startTime, endTime]
       }),
-      alarmTypeRes = _useRequest11.data;
+      alarmTypeRes = _useRequest12.data;
     return {
       alarmTypeRes: (alarmTypeRes === null || alarmTypeRes === void 0 || (_alarmTypeRes$data = alarmTypeRes.data) === null || _alarmTypeRes$data === void 0 ? void 0 : _alarmTypeRes$data.length) > 0 ? alarmTypeRes.data.map(function (ele) {
         return _objectSpread({
@@ -278,7 +314,7 @@ var AlarmService = {
   },
   // 报警类型分析
   useAlarmAnalysis: function useAlarmAnalysis(staffId, startDate, endDate, service) {
-    var _useRequest12 = useRequest(function () {
+    var _useRequest13 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/kanban/kanbanAlarmAnalysis"), {
           data: {
             staffId: staffId,
@@ -289,14 +325,14 @@ var AlarmService = {
       }, {
         refreshDeps: [staffId, startDate, endDate]
       }),
-      alarmAnalysisRes = _useRequest12.data;
+      alarmAnalysisRes = _useRequest13.data;
     return {
       alarmAnalysisRes: (alarmAnalysisRes === null || alarmAnalysisRes === void 0 ? void 0 : alarmAnalysisRes.data) || {}
     };
   },
   // 报警列表
   useAlarmRecord: function useAlarmRecord(staffId, alarmTypeCode, startTime, endTime, pageNo, sortBy, order, service) {
-    var _useRequest13 = useRequest(function () {
+    var _useRequest14 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/alarmInfo/page"), {
           data: {
             staffId: staffId,
@@ -312,7 +348,7 @@ var AlarmService = {
       }, {
         refreshDeps: [staffId, alarmTypeCode, startTime, endTime, pageNo, sortBy, order]
       }),
-      alarmRecordRes = _useRequest13.data;
+      alarmRecordRes = _useRequest14.data;
     return {
       alarmRecordRes: (alarmRecordRes === null || alarmRecordRes === void 0 ? void 0 : alarmRecordRes.data) || {}
     };
@@ -321,7 +357,7 @@ var AlarmService = {
 // 考勤信息
 var AttendanceService = {
   useTimeAnalysis: function useTimeAnalysis(staffId, startDate, endDate, service) {
-    var _useRequest14 = useRequest(function () {
+    var _useRequest15 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/kanban/kanbanAttendanceTimeAnalysis"), {
           data: {
             staffId: staffId,
@@ -332,14 +368,14 @@ var AttendanceService = {
       }, {
         refreshDeps: [staffId, startDate, endDate]
       }),
-      attendTimeAnalysisRes = _useRequest14.data;
+      attendTimeAnalysisRes = _useRequest15.data;
     return {
       attendTimeAnalysisRes: (attendTimeAnalysisRes === null || attendTimeAnalysisRes === void 0 ? void 0 : attendTimeAnalysisRes.data) || {}
     };
   },
   useAnalysis: function useAnalysis(staffId, startDate, endDate, service) {
     var _attendAnalysisRes$da;
-    var _useRequest15 = useRequest(function () {
+    var _useRequest16 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/kanban/kanbanAttendanceAnalysis"), {
           data: {
             staffId: staffId,
@@ -350,7 +386,7 @@ var AttendanceService = {
       }, {
         refreshDeps: [staffId, startDate, endDate]
       }),
-      attendAnalysisRes = _useRequest15.data;
+      attendAnalysisRes = _useRequest16.data;
     return {
       attendAnalysisRes: (attendAnalysisRes === null || attendAnalysisRes === void 0 || (_attendAnalysisRes$da = attendAnalysisRes.data) === null || _attendAnalysisRes$da === void 0 ? void 0 : _attendAnalysisRes$da.length) > 0 ? attendAnalysisRes.data.map(function (ele) {
         return _objectSpread({
@@ -361,7 +397,7 @@ var AttendanceService = {
     };
   },
   useAttendRecord: function useAttendRecord(staffId, startTime, endTime, pageNo, service) {
-    var _useRequest16 = useRequest(function () {
+    var _useRequest17 = useRequest(function () {
         return request.get("/cloud/".concat(service ? 'rygl' : 'zyry-reborn', "/api/v101/attendanceRecord"), {
           data: {
             staffId: staffId,
@@ -374,7 +410,7 @@ var AttendanceService = {
       }, {
         refreshDeps: [staffId, startTime, endTime, pageNo]
       }),
-      attendRecordRes = _useRequest16.data;
+      attendRecordRes = _useRequest17.data;
     return {
       attendRecordRes: (attendRecordRes === null || attendRecordRes === void 0 ? void 0 : attendRecordRes.data) || {}
     };
@@ -382,7 +418,7 @@ var AttendanceService = {
 };
 var EquipmentService = {
   useDevice: function useDevice(staffId, service) {
-    var _useRequest17 = useRequest(function () {
+    var _useRequest18 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/device/getByStaffId"), {
           data: {
             staffId: staffId
@@ -391,8 +427,8 @@ var EquipmentService = {
       }, {
         refreshDeps: [staffId]
       }),
-      deviceRes = _useRequest17.data;
-    var _useRequest18 = useRequest(function () {
+      deviceRes = _useRequest18.data;
+    var _useRequest19 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/positionRealtime/getByStaffId"), {
           data: {
             staffId: staffId
@@ -401,14 +437,14 @@ var EquipmentService = {
       }, {
         refreshDeps: [staffId]
       }),
-      monitorRes = _useRequest18.data;
+      monitorRes = _useRequest19.data;
     return {
       deviceRes: (deviceRes === null || deviceRes === void 0 ? void 0 : deviceRes.data) || {},
       monitorRes: (monitorRes === null || monitorRes === void 0 ? void 0 : monitorRes.data) || {}
     };
   },
   useDeviceStatus: function useDeviceStatus(id, service) {
-    var _useRequest19 = useRequest(function () {
+    var _useRequest20 = useRequest(function () {
         return request.get("/cloud/".concat(service || 'zyry-reborn', "/api/v101/positionRealtime/deviceStatus"), {
           data: {
             id: id
@@ -418,7 +454,7 @@ var EquipmentService = {
         ready: !!id,
         refreshDeps: [id]
       }),
-      deviceStatusRes = _useRequest19.data;
+      deviceStatusRes = _useRequest20.data;
     return {
       deviceStatusRes: (deviceStatusRes === null || deviceStatusRes === void 0 ? void 0 : deviceStatusRes.data) || '-'
     };

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

@@ -118,7 +118,8 @@ var ListZymx = function ListZymx(props) {
       total: (todayWorkRes === null || todayWorkRes === void 0 ? void 0 : todayWorkRes.total) || 0,
       defaultPageSize: 20,
       onChange: pageChange
-    })
+    }),
+    dataSource: (todayWorkRes === null || todayWorkRes === void 0 ? void 0 : todayWorkRes.rows) || []
   };
   return /*#__PURE__*/_jsx(VmTable, _objectSpread({
     columns: columns,

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,
@@ -80,7 +63,7 @@ var BaseInfo = function BaseInfo(props) {
           children: (center === null || center === void 0 ? void 0 : center.length) > 0 && /*#__PURE__*/_jsx(VmMap, _objectSpread({
             mapCenter: center,
             mapType: (mapInfo === null || mapInfo === void 0 ? void 0 : mapInfo.mapType) || 'bmap',
-            newMapPoints: mapPoints,
+            mapPoints: mapPoints,
             mapPolygons: mapPolygons,
             geometryType: "polygon",
             address: realtimeInfo === null || realtimeInfo === void 0 ? void 0 : realtimeInfo.address
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "5.0.29",
+  "version": "5.0.31",
   "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;