@vtx/modals2 5.0.35 → 5.0.37

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

@@ -108,9 +108,9 @@ var VmBaseModal = function VmBaseModal(props) {
   var value = useMemo(function () {
     return {
       theme: theme,
-      startDate: startDate ? dayjs(startDate) : '',
-      endDate: endDate ? dayjs(endDate) : '',
-      date: date ? dayjs(date) : '',
+      startDate: startDate ? dayjs(startDate) : undefined,
+      endDate: endDate ? dayjs(endDate) : undefined,
+      date: date ? dayjs(date) : undefined,
       mapInfo: mapInfo,
       tabPosition: tabPosition,
       chartFontColor: theme === 'light' ? '#595959' : '#FFFFFF',

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

@@ -287,8 +287,8 @@ var VtxCarModal = function VtxCarModal(props) {
       id: id,
       info: info,
       detail: detail,
-      startDate: startDate ? dayjs(startDate) : null,
-      endDate: endDate ? dayjs(endDate) : null,
+      startDate: startDate ? dayjs(startDate) : undefined,
+      endDate: endDate ? dayjs(endDate) : undefined,
       showFields: showFields,
       onTdClick: onTdClick,
       onCancel: onCancel,

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

@@ -48,19 +48,15 @@ export default function CZZ(_ref) {
       justifyContent: 'center',
       textAlign: 'center'
     }
-  }, {
-    name: '核准量',
-    unit: unitStr,
-    value: 0,
-    unitStyle: {
-      fontSize: 14
-    },
-    style: {
-      flex: 1,
-      justifyContent: 'center',
-      textAlign: 'center'
-    }
-  }];
+  }
+  // {
+  //   name: '核准量',
+  //   unit: unitStr,
+  //   value: 0,
+  //   unitStyle: { fontSize: 14 },
+  //   style: { flex: 1, justifyContent: 'center', textAlign: 'center' },
+  // },
+  ];
   var dataList_yssy = [{
     name: '已接收量',
     unit: unitStr,

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

@@ -35,8 +35,11 @@ var Charts = function Charts(_ref) {
             var value = chartData.find(function (item) {
               return item.name === name;
             });
+            var total = chartData.reduce(function (acc, cur) {
+              return acc + cur.value;
+            }, 0);
             if (value) {
-              return "\t\t".concat(name, "\t\t").concat(value.value, "\u6B21\t\t");
+              return "\t\t".concat(name, "\t\t").concat(value.value, "\u6B21\t\t").concat((value.value / total * 100).toFixed(2), "%");
             } else {
               return '';
             }

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

@@ -99,6 +99,7 @@ var List = function List(props) {
       defaultPageSize: 10,
       onChange: pageChange
     }),
+    height: 110,
     handleTableChange: handleTableChange,
     dataSource: records.rows
   };

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

@@ -11,12 +11,13 @@ import { useSetState } from 'ahooks';
 import dayjs from 'dayjs';
 import { VmEmpty, VmPieCharts, VmWrapper } from "../../../_components";
 import { AttendanceService } from "../../api";
+import { sumBy } from 'lodash';
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function Exeception(props) {
   var id = props.id,
     service = props.service;
   var _useSetState = useSetState({
-      startDate: dayjs(),
+      startDate: dayjs().startOf('M'),
       endDate: dayjs()
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
@@ -24,7 +25,7 @@ export default function Exeception(props) {
     setState = _useSetState2[1];
   var startDate = state.startDate,
     endDate = state.endDate;
-  var _AttendanceService$us = AttendanceService.useAnalysis(id, startDate.startOf('M').format('YYYY-MM-DD'), endDate.format('YYYY-MM-DD'), service),
+  var _AttendanceService$us = AttendanceService.useAnalysis(id, startDate.format('YYYY-MM-DD'), endDate.format('YYYY-MM-DD'), service),
     attendAnalysisRes = _AttendanceService$us.attendAnalysisRes;
   var handleDateChange = function handleDateChange(dates) {
     setState({
@@ -47,6 +48,8 @@ export default function Exeception(props) {
         innerRadius: ['50%', '65%'],
         outerRadius: ['65%', '70%'],
         dataList: attendAnalysisRes || [],
+        total: sumBy(attendAnalysisRes, 'value'),
+        title: "\u603B\u6570(\u6B21)",
         legendConfig: {
           right: 12
         }

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

@@ -22,7 +22,7 @@ export default function Record(props) {
   var id = props.id,
     service = props.service;
   var _useSetState = useSetState({
-      startDate: dayjs(),
+      startDate: dayjs().startOf('M'),
       endDate: dayjs(),
       pagination: {
         current: 1,
@@ -36,12 +36,24 @@ export default function Record(props) {
   var pagination = state.pagination,
     startDate = state.startDate,
     endDate = state.endDate;
-  var _AttendanceService$us = AttendanceService.useAttendRecord(id, "".concat(startDate.startOf('M').format('YYYY-MM-DD'), " 00:00:00"), "".concat(endDate.format('YYYY-MM-DD'), " 23:59:59"), pagination.current - 1, service),
+  var _AttendanceService$us = AttendanceService.useAttendRecord(id, "".concat(startDate.format('YYYY-MM-DD'), " 00:00:00"), "".concat(endDate.format('YYYY-MM-DD'), " 23:59:59"), pagination.current - 1, service),
     attendRecordRes = _AttendanceService$us.attendRecordRes;
   var records = {
     total: (attendRecordRes === null || attendRecordRes === void 0 ? void 0 : attendRecordRes.total) || 0,
     rows: (attendRecordRes === null || attendRecordRes === void 0 ? void 0 : attendRecordRes.rows) || []
   };
+  var getColor = function getColor(code) {
+    var color = '';
+    switch (code) {
+      case '正常':
+        color = 'staff-attend-record-status1';
+        break;
+      default:
+        color = 'staff-attend-record-status2';
+        break;
+    }
+    return color;
+  };
   var columns = [{
     title: '所属机构',
     dataIndex: 'deptName',
@@ -86,10 +98,13 @@ export default function Record(props) {
     title: '上班状态',
     dataIndex: 'clockInStatusName',
     key: 'clockInStatusName',
-    width: 80
-    // render: (text: string) => {
-    //     return <div style={{ color: getColor(text) }}>{text || '-'}</div>;
-    // },
+    width: 80,
+    render: function render(text) {
+      return text ? /*#__PURE__*/_jsx("div", {
+        className: getColor(text),
+        children: text
+      }) : '--';
+    }
   }, {
     title: '下班时间',
     dataIndex: 'clockOutTime',
@@ -102,10 +117,13 @@ export default function Record(props) {
     title: '下班状态',
     dataIndex: 'clockOutStatusName',
     key: 'clockOutStatusName',
-    width: 80
-    // render: (text: string) => {
-    //     return <div style={{ color: getColor(text) }}>{text}</div>;
-    // },
+    width: 80,
+    render: function render(text) {
+      return text ? /*#__PURE__*/_jsx("div", {
+        className: getColor(text),
+        children: text
+      }) : '--';
+    }
   }, {
     title: '用工类型',
     dataIndex: 'workTypeName',
@@ -128,7 +146,7 @@ export default function Record(props) {
     style: {
       padding: '0 20px'
     },
-    height: 250,
+    height: 132,
     dataSource: records.rows
   };
   var handleDateChange = function handleDateChange(dates) {

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

@@ -32,7 +32,7 @@ export default function WorkingHours(props) {
   var id = props.id,
     service = props.service;
   var _useSetState = useSetState({
-      startDate: dayjs(),
+      startDate: dayjs().startOf('M'),
       endDate: dayjs()
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
@@ -40,7 +40,7 @@ export default function WorkingHours(props) {
     setState = _useSetState2[1];
   var startDate = state.startDate,
     endDate = state.endDate;
-  var _AttendanceService$us = AttendanceService.useTimeAnalysis(id, startDate.startOf('M').format('YYYY-MM-DD'), endDate.format('YYYY-MM-DD'), service),
+  var _AttendanceService$us = AttendanceService.useTimeAnalysis(id, startDate.format('YYYY-MM-DD'), endDate.format('YYYY-MM-DD'), service),
     attendTimeAnalysisRes = _AttendanceService$us.attendTimeAnalysisRes;
   var names = attendTimeAnalysisRes.names,
     values = attendTimeAnalysisRes.values;

package/lib/vtx-staff-modal/components/Attendance/index.less

@@ -29,10 +29,32 @@
       gap: 12px;
     }
     &-right {
-        flex: 1;
+      flex: 1;
     }
   }
   &-record {
     width: 100%;
+    &-status1 {
+      &::before {
+        content: '';
+        display: inline-block;
+        width: 8px;
+        height: 8px;
+        border-radius: 50%;
+        margin-right: 6px;
+        background: #35eaff;
+      }
+    }
+    &-status2 {
+      &::before {
+        content: '';
+        display: inline-block;
+        width: 8px;
+        height: 8px;
+        border-radius: 50%;
+        margin-right: 6px;
+        background: #ffef41;
+      }
+    }
   }
 }

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

@@ -85,7 +85,7 @@ var ListZymx = function ListZymx(props) {
     render: function render(text, record) {
       return text ? /*#__PURE__*/_jsx("span", {
         title: "".concat(record.clockInTime || '', "-").concat(record.clockOutTime || ''),
-        children: "".concat(record.clockInTime || '', "-").concat(record.clockOutTime || '')
+        children: "".concat(record.clockInTime || '').concat(record.clockOutTime ? '-' : '').concat(record.clockOutTime || '')
       }) : '--';
     }
   }, {
@@ -112,7 +112,7 @@ var ListZymx = function ListZymx(props) {
     });
   };
   var tableProps = {
-    height: 170,
+    height: 160,
     isIndex: false,
     pagination: _objectSpread(_objectSpread({}, pagination), {}, {
       total: (todayWorkRes === null || todayWorkRes === void 0 ? void 0 : todayWorkRes.total) || 0,

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

@@ -40,7 +40,7 @@ var BaseInfo = function BaseInfo(props) {
   var mapPoints = realInfo.mapPoints,
     pointLngLat = realInfo.pointLngLat,
     mapPolygons = realInfo.mapPolygons,
-    realtimeInfo = realInfo.realtimeInfo;
+    info = realInfo.info;
   var baseTabContent = /*#__PURE__*/_jsx(VmInfoCollection, {
     data: baseInfo,
     gap: 8,
@@ -57,7 +57,7 @@ var BaseInfo = function BaseInfo(props) {
         title: "\u57FA\u672C\u4FE1\u606F",
         children: [baseTabContent, /*#__PURE__*/_jsx(VmTitle, {
           title: "\u5B9E\u65F6\u4FE1\u606F",
-          time: realtimeInfo === null || realtimeInfo === void 0 ? void 0 : realtimeInfo.gpsTime
+          time: info === null || info === void 0 ? void 0 : info.gpsTime
         }), /*#__PURE__*/_jsx("div", {
           className: "staff-base-map",
           children: (center === null || center === void 0 ? void 0 : center.length) > 0 && /*#__PURE__*/_jsx(VmMap, _objectSpread({
@@ -66,7 +66,7 @@ var BaseInfo = function BaseInfo(props) {
             mapPoints: mapPoints,
             mapPolygons: mapPolygons,
             geometryType: "polygon",
-            address: realtimeInfo === null || realtimeInfo === void 0 ? void 0 : realtimeInfo.address
+            address: info === null || info === void 0 ? void 0 : info.address
           }, customMapInfo))
         })]
       })

package/package.json

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