@vtx/modals2 5.0.3 → 5.0.5

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

@@ -24,20 +24,198 @@ import darkMileageIcon from "../../../imgs/calendar/dark_mileage.png";
 import lightWorkMileageIcon from "../../../imgs/calendar/green_mileage.png";
 import lightMileageIcon from "../../../imgs/calendar/mileage.png";
 import { CarContext } from "../../../index";
+import Unmanned from "../../Unmanned";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var StaticInfo = function StaticInfo() {
-  var _useSettings = useSettings(),
-    isDark = _useSettings.isDark;
   var _useState = useState('calendar'),
     _useState2 = _slicedToArray(_useState, 2),
     type = _useState2[0],
     setType = _useState2[1];
   var _useContext = useContext(CarContext),
-    id = _useContext.id;
+    id = _useContext.id,
+    info = _useContext.info;
   var _useState3 = useState(dayjs()),
     _useState4 = _slicedToArray(_useState3, 2),
     month = _useState4[0],
     setMonth = _useState4[1];
+  var common = {
+    type: type,
+    id: id,
+    month: month
+  };
+  return /*#__PURE__*/_jsx(VmWrapper, {
+    title: '作业分析',
+    needChange: true,
+    showCalendar: true,
+    onChange: setType,
+    filterType: "monthPicker",
+    dateValue: month,
+    filterChange: setMonth,
+    disabledDate: function disabledDate(current) {
+      return current && current > dayjs().endOf('M');
+    },
+    children: (info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' ? /*#__PURE__*/_jsx(Unmanned.Calendar, _objectSpread(_objectSpread({}, common), {}, {
+      legend: /*#__PURE__*/_jsx(RateLegend, {}),
+      getRateColor: getRateColor,
+      baseColumns: BaseColumns
+    })) : /*#__PURE__*/_jsx(Calendar, _objectSpread({}, common))
+  });
+};
+
+// 作业率图例
+function RateLegend() {
+  return /*#__PURE__*/_jsxs(Space, {
+    children: [/*#__PURE__*/_jsx("div", {
+      children: "\u6709\u6548\u4F5C\u4E1A\u7387\uFF1A"
+    }), /*#__PURE__*/_jsx("div", {
+      className: 'vtx-car-calendar-complete-legend',
+      style: {
+        background: 'var(--gray-color)'
+      }
+    }), /*#__PURE__*/_jsx("div", {
+      children: "0%"
+    }), /*#__PURE__*/_jsx("div", {
+      className: 'vtx-car-calendar-complete-legend',
+      style: {
+        background: 'var(--red-color)'
+      }
+    }), /*#__PURE__*/_jsx("div", {
+      children: "(0%-50%]"
+    }), /*#__PURE__*/_jsx("div", {
+      className: 'vtx-car-calendar-complete-legend',
+      style: {
+        background: 'var(--yellow-color)'
+      }
+    }), /*#__PURE__*/_jsx("div", {
+      children: "(50%-80%]"
+    }), /*#__PURE__*/_jsx("div", {
+      className: 'vtx-car-calendar-complete-legend',
+      style: {
+        background: 'var(--blue-color)'
+      }
+    }), /*#__PURE__*/_jsx("div", {
+      children: "(80%-100%]"
+    }), /*#__PURE__*/_jsx("div", {
+      className: 'vtx-car-calendar-complete-legend',
+      style: {
+        background: 'var(--green-color)'
+      }
+    }), /*#__PURE__*/_jsx("div", {
+      children: "100%"
+    })]
+  });
+}
+
+// 列表字段-默认
+var BaseColumns = [{
+  title: '作业日期',
+  dataIndex: 'workDate',
+  key: 'workDate',
+  width: 100
+}, {
+  title: '作业开始时间',
+  dataIndex: 'workStartTime',
+  key: 'workStartTime',
+  render: function render(text) {
+    return /*#__PURE__*/_jsx("span", {
+      children: text || '-'
+    });
+  },
+  sorter: function sorter(a, b) {
+    return a.workStartTime > b.workStartTime ? 1 : -1;
+  },
+  width: 160
+}, {
+  title: '作业结束时间',
+  dataIndex: 'workEndTime',
+  key: 'workEndTime',
+  render: function render(text) {
+    return /*#__PURE__*/_jsx("span", {
+      children: text || '-'
+    });
+  },
+  sorter: function sorter(a, b) {
+    return a.workEndTime > b.workEndTime ? 1 : -1;
+  },
+  width: 160
+}, {
+  title: '作业时长',
+  dataIndex: 'workDuration',
+  key: 'workDuration',
+  render: function render(text) {
+    return /*#__PURE__*/_jsx("span", {
+      children: secondToFormatTime((text || 0) / 1000) || '-'
+    });
+  },
+  width: 100
+}, {
+  title: '行驶时长',
+  dataIndex: 'driveDuration',
+  key: 'driveDuration',
+  render: function render(text) {
+    return /*#__PURE__*/_jsx("span", {
+      children: secondToFormatTime((text || 0) / 1000) || '-'
+    });
+  },
+  width: 100
+}, {
+  title: '规划里程(km)',
+  dataIndex: 'planMileage',
+  key: 'planMileage',
+  render: function render(text) {
+    return /*#__PURE__*/_jsx("span", {
+      children: text || '-'
+    });
+  },
+  align: 'right',
+  width: 120
+}, {
+  title: '核算作业里程(km)',
+  dataIndex: 'workMileage',
+  key: 'workMileage',
+  render: function render(text) {
+    return /*#__PURE__*/_jsx("span", {
+      children: text || '-'
+    });
+  },
+  align: 'right',
+  width: 120
+}, {
+  title: '行驶里程(km)',
+  dataIndex: 'driveMileage',
+  key: 'driveMileage',
+  render: function render(text) {
+    return /*#__PURE__*/_jsx("span", {
+      children: text || '-'
+    });
+  },
+  align: 'right',
+  width: 100
+}];
+
+// 获取效率颜色
+function getRateColor() {
+  var percent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var color = 'gray';
+  if (percent > 0 && percent <= 50) {
+    color = 'red';
+  } else if (percent > 50 && percent <= 80) {
+    color = 'yellow';
+  } else if (percent > 80 && percent < 100) {
+    color = 'blue';
+  } else if (percent >= 100) {
+    color = 'green';
+  }
+  return color;
+}
+
+// 机械化作业日历-默认
+function Calendar(_ref) {
+  var type = _ref.type,
+    id = _ref.id,
+    month = _ref.month;
+  var _useSettings = useSettings(),
+    isDark = _useSettings.isDark;
   var _JxhService$useCarWor = JxhService.useCarWorkDailyReport(id, month.startOf('M').format('YYYY-MM-DD'), month.endOf('M').format('YYYY-MM-DD')),
     _JxhService$useCarWor2 = _JxhService$useCarWor.dailyData,
     dailyData = _JxhService$useCarWor2 === void 0 ? [] : _JxhService$useCarWor2,
@@ -49,98 +227,6 @@ var StaticInfo = function StaticInfo() {
     mileageIcon = darkMileageIcon;
     workMileageIcon = darkWorkMileageIcon;
   }
-  var columns = [{
-    title: '作业日期',
-    dataIndex: 'workDate',
-    key: 'workDate',
-    width: 100
-  }, {
-    title: '作业开始时间',
-    dataIndex: 'workStartTime',
-    key: 'workStartTime',
-    render: function render(text) {
-      return /*#__PURE__*/_jsx("span", {
-        children: text || '-'
-      });
-    },
-    sorter: function sorter(a, b) {
-      return a.workStartTime > b.workStartTime ? 1 : -1;
-    },
-    width: 160
-  }, {
-    title: '作业结束时间',
-    dataIndex: 'workEndTime',
-    key: 'workEndTime',
-    render: function render(text) {
-      return /*#__PURE__*/_jsx("span", {
-        children: text || '-'
-      });
-    },
-    sorter: function sorter(a, b) {
-      return a.workEndTime > b.workEndTime ? 1 : -1;
-    },
-    width: 160
-  }, {
-    title: '作业时长',
-    dataIndex: 'workDuration',
-    key: 'workDuration',
-    render: function render(text) {
-      return /*#__PURE__*/_jsx("span", {
-        children: secondToFormatTime((text || 0) / 1000) || '-'
-      });
-    },
-    width: 100
-  }, {
-    title: '行驶时长',
-    dataIndex: 'driveDuration',
-    key: 'driveDuration',
-    render: function render(text) {
-      return /*#__PURE__*/_jsx("span", {
-        children: secondToFormatTime((text || 0) / 1000) || '-'
-      });
-    },
-    width: 100
-  }, {
-    title: '核算作业里程(km)',
-    dataIndex: 'realWorkMileage',
-    key: 'realWorkMileage',
-    render: function render(text) {
-      return /*#__PURE__*/_jsx("span", {
-        children: text || '-'
-      });
-    },
-    align: 'right',
-    width: 120
-  }, {
-    title: '行驶里程(km)',
-    dataIndex: 'driveMileage',
-    key: 'driveMileage',
-    render: function render(text) {
-      return /*#__PURE__*/_jsx("span", {
-        children: text || '-'
-      });
-    },
-    align: 'right',
-    width: 100
-  }, {
-    title: /*#__PURE__*/_jsxs(Space, {
-      children: [/*#__PURE__*/_jsx("span", {
-        children: "\u6709\u6548\u4F5C\u4E1A\u7387"
-      }), /*#__PURE__*/_jsx(Tooltip, {
-        title: "\u6838\u7B97\u4F5C\u4E1A\u91CC\u7A0B/\u884C\u9A76\u91CC\u7A0B",
-        children: /*#__PURE__*/_jsx(QuestionCircleOutlined, {})
-      })]
-    }),
-    dataIndex: 'percent',
-    key: 'percent',
-    render: function render(text) {
-      return /*#__PURE__*/_jsx("span", {
-        children: (text || 0) + '%'
-      });
-    },
-    align: 'right',
-    width: 100
-  }];
   var tableProps = {
     pagination: false,
     dataSource: dailyData
@@ -153,17 +239,8 @@ var StaticInfo = function StaticInfo() {
     }
     var percent = item.percent,
       driveMileage = item.driveMileage,
-      realWorkMileage = item.realWorkMileage;
-    var color = 'gray';
-    if (percent > 0 && percent <= 50) {
-      color = 'red';
-    } else if (percent > 50 && percent <= 80) {
-      color = 'yellow';
-    } else if (percent > 80 && percent < 100) {
-      color = 'blue';
-    } else if (percent >= 100) {
-      color = 'green';
-    }
+      workMileage = item.workMileage;
+    var color = getRateColor(percent);
     return /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(VmCalendarPercent, {
         percent: percent,
@@ -180,7 +257,7 @@ var StaticInfo = function StaticInfo() {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "green",
         img: workMileageIcon,
-        value: realWorkMileage,
+        value: workMileage,
         style: {
           width: '139px',
           justifyContent: 'space-between'
@@ -188,17 +265,7 @@ var StaticInfo = function StaticInfo() {
       })]
     });
   };
-  return /*#__PURE__*/_jsxs(VmWrapper, {
-    title: '作业分析',
-    needChange: true,
-    showCalendar: true,
-    onChange: setType,
-    filterType: "monthPicker",
-    dateValue: month,
-    filterChange: setMonth,
-    disabledDate: function disabledDate(current) {
-      return current && current > dayjs().endOf('M');
-    },
+  return /*#__PURE__*/_jsxs(_Fragment, {
     children: [type === 'calendar' && /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("div", {
         className: 'vtx-car-calendar-head',
@@ -214,46 +281,7 @@ var StaticInfo = function StaticInfo() {
           return /*#__PURE__*/_jsx(VmCalendarInner, _objectSpread(_objectSpread({}, item), {}, {
             value: item.name
           }), index);
-        }), /*#__PURE__*/_jsxs(Space, {
-          children: [/*#__PURE__*/_jsx("div", {
-            children: "\u6709\u6548\u5B8C\u6210\u7387\uFF1A"
-          }), /*#__PURE__*/_jsx("div", {
-            className: 'vtx-car-calendar-complete-legend',
-            style: {
-              background: 'var(--gray-color)'
-            }
-          }), /*#__PURE__*/_jsx("div", {
-            children: "0%"
-          }), /*#__PURE__*/_jsx("div", {
-            className: 'vtx-car-calendar-complete-legend',
-            style: {
-              background: 'var(--red-color)'
-            }
-          }), /*#__PURE__*/_jsx("div", {
-            children: "(0%-50%]"
-          }), /*#__PURE__*/_jsx("div", {
-            className: 'vtx-car-calendar-complete-legend',
-            style: {
-              background: 'var(--yellow-color)'
-            }
-          }), /*#__PURE__*/_jsx("div", {
-            children: "(50%-80%]"
-          }), /*#__PURE__*/_jsx("div", {
-            className: 'vtx-car-calendar-complete-legend',
-            style: {
-              background: 'var(--blue-color)'
-            }
-          }), /*#__PURE__*/_jsx("div", {
-            children: "(80%-100%]"
-          }), /*#__PURE__*/_jsx("div", {
-            className: 'vtx-car-calendar-complete-legend',
-            style: {
-              background: 'var(--green-color)'
-            }
-          }), /*#__PURE__*/_jsx("div", {
-            children: "100%"
-          })]
-        })]
+        }), /*#__PURE__*/_jsx(RateLegend, {})]
       }), /*#__PURE__*/_jsx("div", {
         style: {
           flex: 1,
@@ -265,7 +293,27 @@ var StaticInfo = function StaticInfo() {
         })
       })]
     }), type === 'list' && /*#__PURE__*/_jsx(VmTable, _objectSpread({
-      columns: columns,
+      columns: BaseColumns.filter(function (v) {
+        return v.key !== 'planMileage';
+      }).concat({
+        title: /*#__PURE__*/_jsxs(Space, {
+          children: [/*#__PURE__*/_jsx("span", {
+            children: "\u6709\u6548\u4F5C\u4E1A\u7387"
+          }), /*#__PURE__*/_jsx(Tooltip, {
+            title: "\u6838\u7B97\u4F5C\u4E1A\u91CC\u7A0B/\u884C\u9A76\u91CC\u7A0B",
+            children: /*#__PURE__*/_jsx(QuestionCircleOutlined, {})
+          })]
+        }),
+        dataIndex: 'percent',
+        key: 'percent',
+        render: function render(text) {
+          return /*#__PURE__*/_jsx("span", {
+            children: (text || 0) + '%'
+          });
+        },
+        align: 'right',
+        width: 100
+      }),
       rowKey: "id"
     }, tableProps)), type === 'chart' && /*#__PURE__*/_jsx(VmBarCharts, {
       dataList: [{
@@ -276,10 +324,11 @@ var StaticInfo = function StaticInfo() {
       }, {
         name: '核算作业里程',
         data: dailyData.map(function (item) {
-          return "\u2000".concat(item.realWorkMileage);
+          return "\u2000".concat(item.workMileage);
         }),
         color: 'green'
       }],
+      unit: '%',
       xAxis: dailyData.map(function (item) {
         return item.workDate;
       }),
@@ -303,5 +352,5 @@ var StaticInfo = function StaticInfo() {
       loading: loading
     })]
   });
-};
+}
 export default StaticInfo;

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

@@ -33,7 +33,8 @@ var WorkRecord = function WorkRecord() {
     id = _useContext.id,
     sDate = _useContext.startDate,
     eDate = _useContext.endDate,
-    service = _useContext.service;
+    service = _useContext.service,
+    info = _useContext.info;
   var _useSetState = useSetState({
       startDate: sDate ? sDate : dayjs().subtract(6, 'day'),
       endDate: eDate ? eDate : dayjs(),
@@ -100,24 +101,28 @@ var WorkRecord = function WorkRecord() {
     dataIndex: 'workDate',
     key: 'workDate',
     width: 100,
-    sorter: true
+    sorter: true,
+    fixed: 'left'
   }, {
     title: '作业开始时间',
     dataIndex: 'workStartTime',
     key: 'workStartTime',
     width: 150,
-    sorter: true
+    sorter: true,
+    fixed: 'left'
   }, {
     title: '作业结束时间',
     dataIndex: 'workEndTime',
     key: 'workEndTime',
     width: 150,
-    sorter: true
+    sorter: true,
+    fixed: 'left'
   }, {
     title: '作业类型',
     dataIndex: 'workTypeName',
     key: 'workTypeName',
     width: 100,
+    fixed: 'left',
     render: function render(text, record) {
       return /*#__PURE__*/_jsx(VmTag, {
         title: text,
@@ -129,6 +134,7 @@ var WorkRecord = function WorkRecord() {
     dataIndex: 'roadName',
     key: 'roadName',
     width: 150,
+    fixed: 'left',
     ellipsis: true
   }];
   if (extraData !== null && extraData > 0) {
@@ -139,10 +145,10 @@ var WorkRecord = function WorkRecord() {
       align: 'right',
       width: 110
     }, {
-      title: '计划趟次',
+      title: '计划趟次(趟)',
       dataIndex: 'workCount',
       key: 'workCount',
-      width: 90,
+      width: 110,
       align: 'right',
       render: function render(text, record) {
         return /*#__PURE__*/_jsx("span", {
@@ -150,16 +156,16 @@ var WorkRecord = function WorkRecord() {
         });
       }
     }, {
-      title: '核算作业里程',
+      title: '核算作业里程(km)',
       dataIndex: 'workMileage',
       key: 'workMileage',
-      width: 110,
+      width: 130,
       align: 'right'
     }, {
-      title: '作业趟次',
+      title: '作业趟次(趟)',
       dataIndex: 'actualWorkCount',
       key: 'actualWorkCount',
-      width: 90,
+      width: 110,
       align: 'right'
     }, {
       title: '作业均速(km/h)',
@@ -234,10 +240,24 @@ var WorkRecord = function WorkRecord() {
                 flex: '108px',
                 children: /*#__PURE__*/_jsx(VmProgress.Circle, {
                   rate: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workRate) || 0,
-                  name: '有效作业率'
+                  name: '有效作业率',
+                  strokeColor: isDark ? {
+                    '0%': '#009DFF',
+                    '100%': '#44FF98'
+                  } : {
+                    '0%': '#1677FF',
+                    '100%': '#48A2FF'
+                  }
                 })
               }), /*#__PURE__*/_jsxs(Col, {
-                children: [/*#__PURE__*/_jsx(VmFactor, {
+                children: [(info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' && /*#__PURE__*/_jsx(VmFactor, {
+                  name: '规划里程',
+                  unit: 'km',
+                  type: 'sm',
+                  value: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.planMileage) || 0,
+                  fontType: 'blue',
+                  img: isDark ? require("../../../imgs/track_dark.png") : require("../../../imgs/track.png")
+                }), /*#__PURE__*/_jsx(VmFactor, {
                   name: '行驶里程',
                   unit: 'km',
                   type: 'sm',
@@ -256,11 +276,11 @@ var WorkRecord = function WorkRecord() {
             })
           }), /*#__PURE__*/_jsx(Col, {
             span: 12,
-            children: extraData !== null && extraData > 0 ? /*#__PURE__*/_jsx(VmLineCharts, {
+            children: extraData !== null && extraData > 0 || (info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' ? /*#__PURE__*/_jsx(VmLineCharts, {
               xAxis: names,
               unit: "%",
               dataList: [{
-                name: '有效作业率',
+                name: '有效完成率',
                 data: (values === null || values === void 0 ? void 0 : values.length) > 1 ? values[1] : [],
                 areaStyle: {
                   color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
@@ -302,6 +322,7 @@ var WorkRecord = function WorkRecord() {
                 name: '核算作业里程',
                 data: (values === null || values === void 0 ? void 0 : values.length) > 0 ? values[0] : []
               }],
+              unit: 'km',
               loading: workAnaLoading,
               height: 190,
               yAxisList: [{
@@ -317,9 +338,11 @@ var WorkRecord = function WorkRecord() {
       span: 24,
       children: /*#__PURE__*/_jsx(VmWrapper, {
         title: '作业明细',
-        children: /*#__PURE__*/_jsx(VmTable, _objectSpread({
+        children: /*#__PURE__*/_jsx(VmTable, _objectSpread(_objectSpread({
           columns: columns
-        }, tableProps))
+        }, tableProps), {}, {
+          indexFixed: true
+        }))
       })
     })]
   });

package/lib/vtx-car-modal/content/Ljsy/BaseInfo/index.js

@@ -115,6 +115,9 @@ var BaseInfo = function BaseInfo() {
     },
     children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
       flex: '1',
+      style: {
+        minWidth: 0
+      },
       children: /*#__PURE__*/_jsxs("div", {
         className: 'vtx-car-info-right-wrap',
         children: [/*#__PURE__*/_jsx("div", {

package/lib/vtx-car-modal/content/Ljsy/WorkRecord/Summary.js

@@ -56,6 +56,7 @@ var Summary = function Summary(_ref) {
               name: '收集点位',
               data: _.map(taskDaySummary, 'collectPointNum')
             }],
+            unit: '个',
             xAxis: xAxis,
             yAxisList: [{
               unit: '个',

package/lib/vtx-car-modal/content/Ljzy/BaseInfo/index.js

@@ -46,6 +46,9 @@ var BaseInfo = function BaseInfo() {
     },
     children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
       flex: '1',
+      style: {
+        minWidth: 0
+      },
       children: /*#__PURE__*/_jsxs("div", {
         className: 'vtx-car-info-right-wrap',
         children: [/*#__PURE__*/_jsx("div", {

package/lib/vtx-car-modal/content/Ljzy/WorkRecord/Summary.js

@@ -48,6 +48,7 @@ var Summary = function Summary(_ref) {
               name: '进场车次',
               data: _.map(taskDaySummary, 'carNums')
             }],
+            unit: '次',
             xAxis: xAxis,
             yAxisList: [{
               unit: '次',

package/lib/vtx-car-modal/content/Unmanned/Analysis/index.js

@@ -0,0 +1,33 @@
+import { VmBarCharts } from "../../../../_components";
+import { jsx as _jsx } from "react/jsx-runtime";
+export default function (props) {
+  return /*#__PURE__*/_jsx(VmBarCharts, {
+    dataList: [{
+      name: '规划里程',
+      data: [20, 50, 63, 51, 23],
+      yAxisIndex: 0,
+      color: 'geekblue'
+    }, {
+      name: '核算作业里程',
+      data: [20, 50, 63, 51, 23],
+      yAxisIndex: 0,
+      color: 'green'
+    }],
+    lineList: [{
+      name: '总电耗',
+      data: [2, 2, 4, 1, 5],
+      yAxisIndex: 1,
+      color: '#FFAB0C'
+    }],
+    xAxis: [1, 2, 3, 4, 5],
+    yAxisList: [{
+      unit: 'km',
+      name: '(km)'
+    }, {
+      unit: 'kwh',
+      name: '(kwh)'
+    }]
+
+    //   loading={loadingJxh}
+  });
+}