@vtx/modals2 5.0.36 → 5.0.38

package/lib/vtx-restaurant-modal/config.js

@@ -60,108 +60,108 @@ export var QD_DETAIL_FIELDS = [{
   label: '二维码'
 }];
 export var RestaurantConfigureEnum = {
-  /**
-   * 编号
+  /**
+   * 编号
    */
   CODE: 'code',
-  /**
-   * 产生单位名称
+  /**
+   * 产生单位名称
    */
   NAME: 'name',
-  /**
-   * 店铺名称
+  /**
+   * 店铺名称
    */
   SHORT_NAME: 'shortName',
-  /**
-   * 行政区划名称
+  /**
+   * 行政区划名称
    */
   DIVISION_NAME: 'divisionId',
-  /**
-   * 联系人
+  /**
+   * 联系人
    */
   CONTACT_PERSON: 'contactPerson',
-  /**
-   * 联系方式
+  /**
+   * 联系方式
    */
   CONTACT_PHONE: 'contactPhone',
-  /**
-   * 身份证号
+  /**
+   * 身份证号
    */
   CARD_ID: 'cardId',
-  /**
-   * 商户地址
+  /**
+   * 商户地址
    */
   ADDRESS: 'address',
-  /**
-   * 经纬度
+  /**
+   * 经纬度
    */
   LOCATION: 'location',
-  /**
-   * 产生单位状态
+  /**
+   * 产生单位状态
    */
   SIGNED_STATUS: 'signedStatus',
-  /**
-   * 签约状态
+  /**
+   * 签约状态
    */
   IS_SIGN: 'isSign',
-  /**
-   * 收集类型
+  /**
+   * 收集类型
    */
   COLLECT_STATUS: 'collectStatus',
-  /**
-   * 收集点
+  /**
+   * 收集点
    */
   SY_POINT_NAME: 'syPointId',
-  /**
-   * 商户类型名称
+  /**
+   * 商户类型名称
    */
   CLASSES_NAME: 'classesId',
-  /**
-   * 规模名称
+  /**
+   * 规模名称
    */
   SCALE_NAME: 'scaleId',
-  /**
-   * 垃圾桶个数
+  /**
+   * 垃圾桶个数
    */
   TRASH_CAN_NUM: 'trashCanNum',
-  /**
-   * 统一社会信用代码
+  /**
+   * 统一社会信用代码
    */
   CREDIT_CODE: 'creditCode',
-  /**
-   * 行业名称
+  /**
+   * 行业名称
    */
   INDUSTRY_NAME: 'industryId',
-  /**
-   * 经营范围
+  /**
+   * 经营范围
    */
   BUSINESS_SCOPE: 'businessScope',
-  /**
-   * 注册资金
+  /**
+   * 注册资金
    */
   REGISTER_MONEY: 'registerMoney',
-  /**
-   * 企业成立时间
+  /**
+   * 企业成立时间
    */
   ESTABLISHED_TIME: 'establishedTime',
-  /**
-   * 建议收集时间
+  /**
+   * 建议收集时间
    */
   SUGGEST_COLLECT_TIME: 'suggestCollectTime',
-  /**
-   * 营业时间段
+  /**
+   * 营业时间段
    */
   BUSINESS_TIME: 'businessTime',
-  /**
-   * 垃圾桶摆放位置图片
+  /**
+   * 垃圾桶摆放位置图片
    */
   TRASH_BIN_LOCATION_PHOTO: 'trashBinLocationPhoto',
-  /**
-   * 商户图片
+  /**
+   * 商户图片
    */
   PHOTO_IDS: 'photoIds',
-  /**
-   * 证件图片
+  /**
+   * 证件图片
    */
   PAPER_FILE_IDS: 'paperFileIds'
 };

package/lib/vtx-road-modal/components/Statistical/index.less

@@ -1,32 +1,32 @@
-.road-statistic-summary-main-rate {
-  --bg-color: linear-gradient(180deg, #E4EFFF 0%, #F5FBFF 100%);
-  &-dark {
-    --bg-color: linear-gradient(180deg, #1C7CBF 0%, #0B588E 100%);
-  }
-  width: 100%;
-  height: 130px;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  padding: 0 24px;
-  background: var(--bg-color);
-  border-radius: 8px;
-  &--block {
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
-  }
-  &--label {
-    display: flex;
-    gap: 4px;
-    align-items: center;
-    font-size: 16px;
-    color: var(--img-text-color);
-  }
-  &--value {
-    margin-left: 12px;
-    font-weight: bold;
-    font-size: 24px;
-    color: #1F1F1F;
-  }
-}
+.road-statistic-summary-main-rate {
+  --bg-color: linear-gradient(180deg, #E4EFFF 0%, #F5FBFF 100%);
+  &-dark {
+    --bg-color: linear-gradient(180deg, #1C7CBF 0%, #0B588E 100%);
+  }
+  width: 100%;
+  height: 130px;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  padding: 0 24px;
+  background: var(--bg-color);
+  border-radius: 8px;
+  &--block {
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+  }
+  &--label {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+    font-size: 16px;
+    color: var(--img-text-color);
+  }
+  &--value {
+    margin-left: 12px;
+    font-weight: bold;
+    font-size: 24px;
+    color: #1F1F1F;
+  }
+}

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) {
@@ -36,7 +41,7 @@ var Charts = function Charts(_ref) {
               return item.name === name;
             });
             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

@@ -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',
@@ -99,6 +136,7 @@ var List = function List(props) {
       defaultPageSize: 10,
       onChange: pageChange
     }),
+    height: 110,
     handleTableChange: handleTableChange,
     dataSource: records.rows
   };

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/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

@@ -15,15 +15,16 @@ 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) {
   var id = props.id,
     service = props.service;
   var _useSetState = useSetState({
-      startDate: dayjs(),
+      startDate: dayjs().startOf('M'),
       endDate: dayjs(),
+      shiftClockWay: 'CLOCK_IN_OUT',
       pagination: {
         current: 1,
         pageSize: 10,
@@ -35,13 +36,26 @@ 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.startOf('M').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,
     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 +100,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,15 +119,19 @@ 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',
     key: 'workTypeName',
-    width: 80
+    width: 80,
+    ellipsis: true
   }];
   var pageChange = function pageChange(page) {
     setState({
@@ -128,7 +149,7 @@ export default function Record(props) {
     style: {
       padding: '0 20px'
     },
-    height: 250,
+    height: 132,
     dataSource: records.rows
   };
   var handleDateChange = function handleDateChange(dates) {
@@ -145,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/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))
         })]
       })