@vtx/modals2 5.0.40 → 5.0.42

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

@@ -173,10 +173,10 @@ var VMTable = function VMTable(props) {
   });
 };
 
-/**
- * 表格导出按钮
- * @param props
- * @returns
+/**
+ * 表格导出按钮
+ * @param props
+ * @returns
  */
 
 export var ExportBtn = function ExportBtn(props) {

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

@@ -13,7 +13,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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); }); }; }
-import { getVtxToken } from '@vtx/utils';
+import { getVtxToken, request } from '@vtx/utils';
 import { useRequest } from 'ahooks';
 import http from "../_util/http";
 var prefix = process.env.PREFIX || '';
@@ -1349,4 +1349,35 @@ export var JzljService = {
       visibleList: visibleList
     };
   }
+};
+
+// 单位
+export var useUnit = function useUnit() {
+  var _data$data4, _unitStr2;
+  var groupCode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'XTPZ';
+  var _useRequest53 = useRequest(function () {
+      return request.get("/cloud/jzlj/web/api/tenant/system/config/getConfig", {
+        data: {}
+      });
+    }, {
+      refreshDeps: [groupCode]
+    }),
+    data = _useRequest53.data;
+  var obj = {};
+  var originalData = data === null || data === void 0 || (_data$data4 = data.data) === null || _data$data4 === void 0 ? void 0 : _data$data4[groupCode];
+  for (var group in originalData) {
+    if (originalData.hasOwnProperty(group)) {
+      for (var item in originalData[group]) {
+        var _originalData$group2;
+        obj[item] = (_originalData$group2 = originalData[group]) === null || _originalData$group2 === void 0 ? void 0 : _originalData$group2[item];
+      }
+    }
+  }
+  var jointOrderWeightUnitTypeName = obj === null || obj === void 0 ? void 0 : obj.jointOrderWeightUnitTypeName;
+  var nameSplitArr = jointOrderWeightUnitTypeName === null || jointOrderWeightUnitTypeName === void 0 ? void 0 : jointOrderWeightUnitTypeName.split('（');
+  var unitStr = (nameSplitArr === null || nameSplitArr === void 0 ? void 0 : nameSplitArr[1]) || '吨）';
+  unitStr = (_unitStr2 = unitStr) === null || _unitStr2 === void 0 ? void 0 : _unitStr2.replace('）', '');
+  return {
+    unitStr: unitStr
+  };
 };

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

@@ -225,6 +225,9 @@ var WorkRecord = function WorkRecord() {
           });
         },
         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,

package/lib/vtx-car-modal/content/Jzlj/Collection/Chart.js

@@ -1,17 +1,20 @@
+import { mean } from 'lodash';
 import { VmBarCharts, VmEmpty, VmFactorList, VmWrapper } from "../../../../_components";
 import useSettings from "../../../../_hooks/useSettings";
-import "./index.less";
-import { mean } from 'lodash';
+import { useUnit } from "../../../api";
 import pjrcc_dark from "../../../imgs/jzlj/pjrcc_dark.png";
 import pjrcc_light from "../../../imgs/jzlj/pjrcc_light.png";
 import pjryl_dark from "../../../imgs/jzlj/pjryl_dark.png";
 import pjryl_light from "../../../imgs/jzlj/pjryl_light.png";
+import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function Chart(_ref) {
   var _ref$dataList = _ref.dataList,
     dataList = _ref$dataList === void 0 ? [] : _ref$dataList;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
+  var _useUnit = useUnit(),
+    unitStr = _useUnit.unitStr;
   var ylData = dataList.map(function (item) {
     return item.weight;
   });
@@ -22,7 +25,7 @@ export default function Chart(_ref) {
   var ccDataAvg = ccData !== null && ccData !== void 0 && ccData.length ? mean(ccData).toFixed(2) : '0';
   var dataList_top = [{
     name: '平均日运量',
-    unit: '吨',
+    unit: unitStr,
     value: ylDataAvg,
     img: isDark ? pjryl_dark : pjryl_light,
     fontType: 'blue',
@@ -79,8 +82,8 @@ export default function Chart(_ref) {
           name: '(次)'
         }, {
           key: "\u2000",
-          unit: '吨',
-          name: '(吨)'
+          unit: unitStr,
+          name: "(".concat(unitStr, ")")
         }],
         lineList: [{
           name: '车次',

package/lib/vtx-car-modal/content/Jzlj/Collection/index.js

@@ -20,7 +20,7 @@ import dayjs from 'dayjs';
 import { useContext, useEffect } from 'react';
 import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../../_components";
 import useSettings from "../../../../_hooks/useSettings";
-import { JzljService } from "../../../api";
+import { JzljService, useUnit } from "../../../api";
 import { CarContext } from "../../../index";
 import "./index.less";
 import { QuestionCircleOutlined } from '@ant-design/icons';
@@ -36,6 +36,8 @@ export default function Collection() {
     setIframeModalInfo = _useContext.setIframeModalInfo;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
+  var _useUnit = useUnit(),
+    unitStr = _useUnit.unitStr;
   var _useSetState = useSetState({
       activeKey: 'chart',
       stepThreeOperateTimeLeft: dayjs().subtract(6, 'day'),
@@ -122,7 +124,7 @@ export default function Collection() {
     width: 180
   }], ['建筑垃圾类别', 'garbageTypeName', {
     width: 120
-  }], ['运量(吨)', 'receivedWeight', {
+  }], ["\u8FD0\u91CF(".concat(unitStr, ")"), 'receivedWeight', {
     width: 120,
     align: 'right'
   }]]), [['操作', 'action', {
@@ -213,7 +215,7 @@ export default function Collection() {
     totalWeight = _totalData$totalWeigh === void 0 ? 0 : _totalData$totalWeigh;
   var totalList = [{
     name: '总运量',
-    unit: '吨',
+    unit: unitStr,
     value: totalWeight,
     unitStyle: {
       fontSize: 14

package/lib/vtx-jzlj-xnc-modal/components/Overview/index.js

@@ -52,7 +52,7 @@ export default function Overview() {
   var _overviewApis$useCzz = overviewApis.useCzz(id),
     czzData = _overviewApis$useCzz.data;
   infoData.push({
-    label: '剩余量(吨)',
+    label: "\u5269\u4F59\u91CF(".concat(unitStr, ")"),
     key: 'syWeight',
     value: (_czzData$syWeight = czzData === null || czzData === void 0 ? void 0 : czzData.syWeight) !== null && _czzData$syWeight !== void 0 ? _czzData$syWeight : '--'
   });

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

@@ -85,7 +85,7 @@ export var BaseService = {
       }),
       jcssBaseInfoRes = _useRequest3.data;
     var jcssInfo = jcssBaseInfoRes === null || jcssBaseInfoRes === void 0 ? void 0 : jcssBaseInfoRes.data;
-    var hasRule = (jcssInfo === null || jcssInfo === void 0 || (_jcssInfo$dataJson = jcssInfo.dataJson) === null || _jcssInfo$dataJson === void 0 || (_jcssInfo$dataJson = _jcssInfo$dataJson.roadWorkTypeId) === null || _jcssInfo$dataJson === void 0 ? void 0 : _jcssInfo$dataJson.indexOf('jxhbj')) > -1;
+    var hasRule = (jcssInfo === null || jcssInfo === void 0 || (_jcssInfo$dataJson = jcssInfo.dataJson) === null || _jcssInfo$dataJson === void 0 || (_jcssInfo$dataJson = _jcssInfo$dataJson.businessTypeId) === null || _jcssInfo$dataJson === void 0 ? void 0 : _jcssInfo$dataJson.indexOf('HW')) > -1;
     return {
       jcssInfo: jcssInfo,
       hasRule: hasRule

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

@@ -303,12 +303,12 @@ var AlarmService = {
       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({
+        return _objectSpread(_objectSpread({}, ele), {}, {
           name: ele.alarmTypeName,
           value: ele.count,
           label: "".concat(ele.alarmTypeName, "(").concat(ele.count, ")"),
           key: ele.alarmTypeCode || 'all'
-        }, ele);
+        });
       }) : []
     };
   },

package/lib/vtx-staff-modal/components/AlarmInfo/Charts.js

@@ -33,26 +33,13 @@ var Charts = function Charts(_ref) {
         outerRadius: ['65%', '70%'],
         dataList: (chartData === null || chartData === void 0 ? void 0 : chartData.filter(function (ele) {
           return ele.alarmTypeCode;
-        })) || [],
-        legendConfig: {
-          right: 160,
-          formatter: function formatter(name) {
-            var value = chartData.find(function (item) {
-              return item.name === name;
-            });
-            if (value) {
-              return "\t\t".concat(name, "\t\t").concat(value.value, "\u6B21\t\t").concat((value.value / total * 100).toFixed(2), "%");
-            } else {
-              return '';
-            }
-          }
-        }
+        })) || []
       }) : /*#__PURE__*/_jsx(VmEmpty, {
         type: "NO_CHART"
       })
     }), /*#__PURE__*/_jsx("div", {
       className: "staff-alarm-charts-item",
-      children: (chartData === null || chartData === void 0 ? void 0 : chartData.length) > 0 ? /*#__PURE__*/_jsx(VmLineCharts, {
+      children: (values === null || values === void 0 ? void 0 : values.length) > 0 ? /*#__PURE__*/_jsx(VmLineCharts, {
         height: 216,
         unit: "\u6B21",
         name: "\u62A5\u8B66\u6B21\u6570",

package/lib/vtx-staff-modal/components/Attendance/Record.js

@@ -14,6 +14,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * 考勤记录
  */
 import { useSetState } from 'ahooks';
+import { Tag } from 'antd';
 import dayjs from 'dayjs';
 import { VmExtraTab, VmTable, VmWrapper } from "../../../_components";
 import { AttendanceService } from "../../api";
@@ -47,15 +48,24 @@ export default function Record(props) {
   var getColor = function getColor(code) {
     var color = '';
     switch (code) {
-      case '正常':
-        color = 'staff-attend-record-status1';
+      case 'Normal':
+        color = 'green';
+        break;
+      case 'Late':
+      case 'Early':
+        color = 'red';
+        break;
+      case 'Leave':
+      case 'Absent':
+        color = 'orange';
         break;
       default:
-        color = 'staff-attend-record-status2';
+        color = 'warning';
         break;
     }
     return color;
   };
+  var isClockInOut = shiftClockWay === 'CLOCK_IN_OUT';
   var columns = [{
     title: '所属机构',
     dataIndex: 'deptName',
@@ -65,7 +75,8 @@ export default function Record(props) {
   }, {
     title: '姓名',
     dataIndex: 'staffName',
-    key: 'staffName'
+    key: 'staffName',
+    ellipsis: true
   }, {
     title: '班次',
     dataIndex: 'shiftName',
@@ -88,7 +99,7 @@ export default function Record(props) {
     key: 'shiftWorkElementNames',
     width: 100,
     ellipsis: true
-  }, {
+  }, isClockInOut && {
     title: '上班时间',
     dataIndex: 'clockInTime',
     key: 'clockInTime',
@@ -96,18 +107,23 @@ export default function Record(props) {
     render: function render(text) {
       return text ? text : '-';
     }
-  }, {
+  }, isClockInOut && {
     title: '上班状态',
     dataIndex: 'clockInStatusName',
     key: 'clockInStatusName',
     width: 80,
-    render: function render(text) {
-      return text ? /*#__PURE__*/_jsx("div", {
-        className: getColor(text),
-        children: text
+    render: function render(text, record) {
+      return record.clockInStatusCode ? /*#__PURE__*/_jsx("div", {
+        style: {
+          color: getColor(record.clockInStatusCode)
+        },
+        children: /*#__PURE__*/_jsx(Tag, {
+          color: getColor(record.clockInStatusCode),
+          children: text
+        })
       }) : '--';
     }
-  }, {
+  }, isClockInOut && {
     title: '下班时间',
     dataIndex: 'clockOutTime',
     key: 'clockOutTime',
@@ -115,24 +131,55 @@ export default function Record(props) {
     render: function render(text) {
       return text ? text : '-';
     }
-  }, {
+  }, isClockInOut && {
     title: '下班状态',
     dataIndex: 'clockOutStatusName',
     key: 'clockOutStatusName',
     width: 80,
-    render: function render(text) {
-      return text ? /*#__PURE__*/_jsx("div", {
-        className: getColor(text),
-        children: text
+    render: function render(text, record) {
+      return record.clockOutStatusCode ? /*#__PURE__*/_jsx("div", {
+        style: {
+          color: getColor(record.clockOutStatusCode)
+        },
+        children: /*#__PURE__*/_jsx(Tag, {
+          color: getColor(record.clockOutStatusCode),
+          children: text
+        })
       }) : '--';
     }
+  }, !isClockInOut && {
+    title: '打卡时间',
+    dataIndex: 'clockInTime',
+    key: 'clockInTime',
+    width: 140,
+    render: function render(text) {
+      return text ? text : '-';
+    }
+  }, !isClockInOut && {
+    title: '打卡状态',
+    dataIndex: 'clockInStatusName',
+    key: 'clockInStatusName',
+    width: 80,
+    render: function render(text, record) {
+      return /*#__PURE__*/_jsx("div", {
+        style: {
+          color: getColor(record.clockInStatusCode)
+        },
+        children: /*#__PURE__*/_jsx(Tag, {
+          color: getColor(record.clockInStatusCode),
+          children: text
+        })
+      });
+    }
   }, {
     title: '用工类型',
     dataIndex: 'workTypeName',
     key: 'workTypeName',
     width: 80,
     ellipsis: true
-  }];
+  }].filter(function (item) {
+    return !!item;
+  });
   var pageChange = function pageChange(page) {
     setState({
       pagination: _objectSpread(_objectSpread({}, pagination), {}, {

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

@@ -1,5 +1,5 @@
-/**
- * 区域进场量分析
+/**
+ * 区域进场量分析
  */
 
 import { Col, Row } from 'antd';
@@ -26,8 +26,8 @@ function WorkStaticDay(_ref) {
   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,
+    _ref2$totalMileageStr = _ref2.totalMileageStr,
+    totalMileageStr = _ref2$totalMileageStr === void 0 ? 0 : _ref2$totalMileageStr,
     onlineHour = _ref2.onlineHour,
     validWorkHour = _ref2.validWorkHour,
     outShiftHour = _ref2.outShiftHour,
@@ -69,7 +69,7 @@ function WorkStaticDay(_ref) {
           children: [/*#__PURE__*/_jsx(VmFactor, {
             name: "\u4ECA\u65E5\u884C\u8D70",
             unit: "km",
-            value: totalMileage || 0,
+            value: totalMileageStr || 0,
             img: isDark ? mileageDark : mileageLight,
             fontType: "blue"
           }), /*#__PURE__*/_jsx(VmFactor, {

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

@@ -63,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',
-            mapPoints: mapPoints,
+            newMapPoints: mapPoints,
             mapPolygons: mapPolygons,
             geometryType: "polygon",
             address: info === null || info === void 0 ? void 0 : info.address

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,
-            mapPoints: mapPoints
+            newMapPoints: mapPoints
           }, customMapInfo))
         })
       })]

package/lib/vtx-wr-modal/components/Base/Ptss.js

@@ -23,6 +23,9 @@ export default (function (props) {
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx("div", {
       className: "wr-base-ptss",
+      style: {
+        padding: gcDetail.hasDevice ? '10px 136px 0' : '30px 136px 30px'
+      },
       children: ptss.map(function (item) {
         return /*#__PURE__*/_jsxs("div", {
           className: "wr-ptss-item",
@@ -37,6 +40,7 @@ export default (function (props) {
     }), /*#__PURE__*/_jsxs("div", {
       style: {
         display: 'flex',
+        flexDirection: gcDetail.hasDevice ? 'row' : 'column',
         justifyContent: 'space-between',
         gap: '20px',
         padding: '0 16px'
@@ -44,10 +48,16 @@ export default (function (props) {
       children: [/*#__PURE__*/_jsxs("div", {
         className: "wr-base-kws",
         style: {
+          flex: gcDetail.hasDevice ? 1 : 'auto',
+          height: gcDetail.hasDevice ? 'auto' : '200px',
           background: theme === 'blue' ? 'rgba(51, 166, 255, 0.2)' : '#F3F8FF'
         },
         children: [/*#__PURE__*/_jsxs("div", {
           className: "wr-kws-total",
+          style: {
+            justifyContent: gcDetail.hasDevice ? 'space-between' : 'center',
+            gap: gcDetail.hasDevice ? '0' : '60px'
+          },
           children: [/*#__PURE__*/_jsxs("div", {
             className: "wr-kws-tip",
             children: [/*#__PURE__*/_jsx("img", {
@@ -98,6 +108,9 @@ export default (function (props) {
           })]
         }), /*#__PURE__*/_jsxs("div", {
           className: "wr-kws-each",
+          style: {
+            padding: gcDetail.hasDevice ? '0' : '40px 80px'
+          },
           children: [showKeys.includes('urinalNums') && /*#__PURE__*/_jsxs("div", {
             children: [/*#__PURE__*/_jsx("span", {
               style: {
@@ -151,10 +164,16 @@ export default (function (props) {
       }), /*#__PURE__*/_jsxs("div", {
         className: "wr-base-kws",
         style: {
+          flex: gcDetail.hasDevice ? 1 : 'auto',
+          height: gcDetail.hasDevice ? 'auto' : '200px',
           background: theme === 'blue' ? 'rgba(255,152,175,0.2)' : '#FFF2F5'
         },
         children: [/*#__PURE__*/_jsxs("div", {
           className: "wr-kws-total",
+          style: {
+            justifyContent: gcDetail.hasDevice ? 'space-between' : 'center',
+            gap: gcDetail.hasDevice ? '0' : '60px'
+          },
           children: [/*#__PURE__*/_jsxs("div", {
             className: "wr-kws-tip",
             children: [/*#__PURE__*/_jsx("img", {
@@ -205,6 +224,9 @@ export default (function (props) {
           })]
         }), /*#__PURE__*/_jsxs("div", {
           className: "wr-kws-each",
+          style: {
+            padding: gcDetail.hasDevice ? '0' : '40px 80px'
+          },
           children: [showKeys.includes('womanSquatNums') && /*#__PURE__*/_jsxs("div", {
             children: [/*#__PURE__*/_jsx("span", {
               style: {

package/lib/vtx-wr-modal/components/Base/Sjjg.js

@@ -150,7 +150,7 @@ export default (function (props) {
                     style: {
                       fontSize: '18px'
                     },
-                    children: (_each$value = each.value) !== null && _each$value !== void 0 ? _each$value : '--'
+                    children: each.factorCode === 'PERSON_NUM' && Number(each.value) ? Number(each.value).toFixed(0) : (_each$value = each.value) !== null && _each$value !== void 0 ? _each$value : '--'
                   }), "\xA0", (_each$unit = each.unit) !== null && _each$unit !== void 0 ? _each$unit : '--']
                 }), /*#__PURE__*/_jsxs("div", {
                   className: "each-factor-value",

package/lib/vtx-wr-modal/components/Base/index.js

@@ -156,7 +156,7 @@ export default (function (props) {
   }];
   var tableProps = {
     columns: columns,
-    height: 220,
+    height: 270,
     isIndex: false,
     pagination: false,
     dataSource: alarmList
@@ -165,7 +165,7 @@ export default (function (props) {
     label: '监测数据',
     key: 'data',
     children: /*#__PURE__*/_jsx(VmLineCharts, {
-      height: 260,
+      height: 300,
       xAxis: echartsData.names || [],
       dataList: (echartsData.values || []).map(function (item, index) {
         return {
@@ -267,8 +267,8 @@ export default (function (props) {
     }
   }, [monitorTypeCode]);
   useEffect(function () {
-    startDate && endDate && activeKey === 'data' && getData();
-  }, [startDate, endDate, activeKey]);
+    startDate && endDate && activeKey === 'data' && (gcDetail === null || gcDetail === void 0 ? void 0 : gcDetail.id) && getData();
+  }, [startDate, endDate, activeKey, gcDetail]);
   var getData = function getData() {
     monitorItemEcharts({
       facilityId: gcDetail.id,
@@ -300,8 +300,8 @@ export default (function (props) {
     });
   };
   useEffect(function () {
-    date && activeKey === 'list' && getList();
-  }, [date, activeKey]);
+    date && activeKey === 'list' && (gcDetail === null || gcDetail === void 0 ? void 0 : gcDetail.id) && getList();
+  }, [date, activeKey, gcDetail]);
   return /*#__PURE__*/_jsxs("div", {
     className: "wr-base-content",
     children: [detail.fallDownAlarm && /*#__PURE__*/_jsx("div", {
@@ -325,6 +325,9 @@ export default (function (props) {
       className: "wr-base-right",
       children: [/*#__PURE__*/_jsxs("div", {
         className: "wr-base-sjjg",
+        style: {
+          height: gcDetail.hasDevice ? '270px' : '100%'
+        },
         children: [/*#__PURE__*/_jsx("div", {
           className: "wr-base-title",
           children: "\u914D\u5957\u8BBE\u65BD"

package/lib/vtx-wr-modal/components/Base/index.less

@@ -86,7 +86,7 @@
     }
     .wr-base-jcbj {
       width: 100%;
-      height: 330px;
+      height: 375px;
       padding-bottom: 16px;
       overflow: hidden;
       overflow-y: auto;
@@ -213,7 +213,6 @@
 }
 .wr-base-kws {
   flex: 1;
-  height: 134px;
   border-radius: 8px;
   margin: 12px 0;
   padding: 14px;

package/package.json

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