@vtx/modals2 5.0.37 → 5.0.38

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

@@ -396,7 +396,7 @@ var AttendanceService = {
       }) : []
     };
   },
-  useAttendRecord: function useAttendRecord(staffId, startTime, endTime, pageNo, service) {
+  useAttendRecord: function useAttendRecord(staffId, startTime, endTime, pageNo, service, shiftClockWay) {
     var _useRequest17 = useRequest(function () {
         return request.get("/cloud/".concat(service ? 'rygl' : 'zyry-reborn', "/api/v101/attendanceRecord"), {
           data: {
@@ -404,11 +404,12 @@ var AttendanceService = {
             startTime: startTime,
             endTime: endTime,
             pageNo: pageNo,
-            pageSize: 10
+            pageSize: 10,
+            shiftClockWay: shiftClockWay
           }
         });
       }, {
-        refreshDeps: [staffId, startTime, endTime, pageNo]
+        refreshDeps: [staffId, startTime, endTime, pageNo, shiftClockWay]
       }),
       attendRecordRes = _useRequest17.data;
     return {

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

@@ -16,6 +16,9 @@ var Charts = function Charts(_ref) {
       });
     });
   }
+  var total = chartData === null || chartData === void 0 ? void 0 : chartData.reduce(function (acc, cur) {
+    return acc + cur.value;
+  }, 0);
   return /*#__PURE__*/_jsxs("div", {
     className: "staff-alarm-charts",
     children: [/*#__PURE__*/_jsx("div", {
@@ -24,6 +27,8 @@ var Charts = function Charts(_ref) {
         height: 216,
         unit: "\u6B21",
         name: "\u62A5\u8B66\u6B21\u6570",
+        subTitle: "\u603B\u6570(\u6B21)",
+        total: total,
         innerRadius: ['50%', '65%'],
         outerRadius: ['65%', '70%'],
         dataList: (chartData === null || chartData === void 0 ? void 0 : chartData.filter(function (ele) {
@@ -35,9 +40,6 @@ 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").concat((value.value / total * 100).toFixed(2), "%");
             } else {

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

@@ -15,10 +15,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 
 import { useSetState } from 'ahooks';
+import { Tag } from 'antd';
 import { VmTable } from "../../../_components";
 import { secondToFormatTime } from "../../../_util";
 import { AlarmService } from "../../api";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var List = function List(props) {
   var id = props.id,
     startDate = props.startDate,
@@ -46,14 +47,50 @@ var List = function List(props) {
     total: (alarmRecordRes === null || alarmRecordRes === void 0 ? void 0 : alarmRecordRes.total) || 0,
     rows: (alarmRecordRes === null || alarmRecordRes === void 0 ? void 0 : alarmRecordRes.rows) || []
   };
+  var getColor = function getColor(code) {
+    if ((code === null || code === void 0 ? void 0 : code.indexOf('脱岗')) > -1) {
+      return '#f00707';
+    } else if ((code === null || code === void 0 ? void 0 : code.indexOf('违规')) > -1) {
+      return '#961414';
+    } else if ((code === null || code === void 0 ? void 0 : code.indexOf('异常')) > -1) {
+      return '#c7292b';
+    }
+    return '#c44a4a';
+  };
+  var getColor2 = function getColor2(code) {
+    if ((code === null || code === void 0 ? void 0 : code.indexOf('一')) > -1) {
+      return '#f00707';
+    } else if ((code === null || code === void 0 ? void 0 : code.indexOf('二')) > -1) {
+      return '#f7c500';
+    } else if ((code === null || code === void 0 ? void 0 : code.indexOf('三')) > -1) {
+      return '#d3ec43';
+    }
+    return '#87972b';
+  };
   var columns = [{
     title: '报警类型',
     dataIndex: 'alarmTypeName',
-    key: 'alarmTypeName'
+    key: 'alarmTypeName',
+    render: function render(text) {
+      return text ? /*#__PURE__*/_jsx(Tag, {
+        color: getColor(text),
+        children: text
+      }) : '--';
+    }
   }, {
     title: '报警等级',
     dataIndex: 'alarmLevelName',
-    key: 'alarmLevelName'
+    key: 'alarmLevelName',
+    render: function render(text) {
+      return text ? /*#__PURE__*/_jsxs("div", {
+        children: [/*#__PURE__*/_jsx("div", {
+          className: 'staff-alarm-status',
+          style: {
+            backgroundColor: getColor2(text)
+          }
+        }), text]
+      }) : '--';
+    }
   }, {
     title: '报警开始时间',
     dataIndex: 'startTime',

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

@@ -6,4 +6,16 @@
       flex: 1 1;
     }
   }
+  &-type {
+    padding: 6px 12px;
+    border: 1px solid #f00707;
+  }
+  &-status {
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    margin-right: 6px;
+    background: #f00707;
+  }
 }

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

@@ -15,7 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 import { useSetState } from 'ahooks';
 import dayjs from 'dayjs';
-import { VmTable, VmWrapper } from "../../../_components";
+import { VmExtraTab, VmTable, VmWrapper } from "../../../_components";
 import { AttendanceService } from "../../api";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function Record(props) {
@@ -24,6 +24,7 @@ export default function Record(props) {
   var _useSetState = useSetState({
       startDate: dayjs().startOf('M'),
       endDate: dayjs(),
+      shiftClockWay: 'CLOCK_IN_OUT',
       pagination: {
         current: 1,
         pageSize: 10,
@@ -35,8 +36,9 @@ export default function Record(props) {
     setState = _useSetState2[1];
   var pagination = state.pagination,
     startDate = state.startDate,
-    endDate = state.endDate;
-  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),
+    endDate = state.endDate,
+    shiftClockWay = state.shiftClockWay;
+  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, shiftClockWay),
     attendRecordRes = _AttendanceService$us.attendRecordRes;
   var records = {
     total: (attendRecordRes === null || attendRecordRes === void 0 ? void 0 : attendRecordRes.total) || 0,
@@ -128,7 +130,8 @@ export default function Record(props) {
     title: '用工类型',
     dataIndex: 'workTypeName',
     key: 'workTypeName',
-    width: 80
+    width: 80,
+    ellipsis: true
   }];
   var pageChange = function pageChange(page) {
     setState({
@@ -163,6 +166,26 @@ export default function Record(props) {
       filterChange: function filterChange(dates) {
         return dates && handleDateChange(dates);
       },
+      extra: service ? /*#__PURE__*/_jsx(VmExtraTab, {
+        data: [{
+          key: 'CLOCK_IN_OUT',
+          title: '上下班打卡'
+        }, {
+          key: 'SHIFT_CHECK_IN',
+          title: '班次内打卡'
+        }],
+        value: shiftClockWay,
+        onChange: function onChange(key) {
+          setState({
+            shiftClockWay: key,
+            pagination: {
+              current: 1,
+              pageSize: 10,
+              total: 0
+            }
+          });
+        }
+      }) : null,
       children: /*#__PURE__*/_jsx(VmTable, _objectSpread({
         columns: columns,
         rowKey: "id"

package/package.json

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