@vtx/modals2 5.0.10 → 5.0.12

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

@@ -46,7 +46,8 @@ var VmBaseModal = function VmBaseModal(props) {
     width = props.width,
     _props$iframeUrl = props.iframeUrl,
     iframeUrl = _props$iframeUrl === void 0 ? '' : _props$iframeUrl,
-    modalShow = props.modalShow;
+    _props$modalShow = props.modalShow,
+    modalShow = _props$modalShow === void 0 ? true : _props$modalShow;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     currentTabKey = _useState2[0],

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

@@ -1012,6 +1012,13 @@ export var MaintenanceService = {
     };
   }
 };
+
+// 无人车实时信息
+export var unmannedRealByCarId = function unmannedRealByCarId(body) {
+  return http.get("".concat(prefix, "/cloud/zyqs-zqb/api/kanban/unmannedRealByCarId"), {
+    body: body
+  });
+};
 export var carIdentityMap = new Map([['innerCode', '自编号'], ['carCode', '车牌号'], ['originalDeviceCode', '原始设备编码'], ['carClassName', '车辆类别'], ['carGradeName', '车辆种类'], ['emissionStageName', '排放阶段'], ['licensePlateColorName', '车牌颜色'], ['drivingLicenseCode', '行驶证编号'], ['useUnitName', '使用单位'], ['belongUnitName', '所属单位'], ['manageStaffName', '责任人'], ['divisionName', '行政区划'], ['backupManageStaffName', '后备责任人'], ['contact', '联系人'], ['contactWay', '联系方式'], ['carBrand', '车辆品牌'], ['carType', '车辆型号'], ['procurementDate', '购置时间'], ['useYears', '使用年限'], ['procurementAmt', '购置金额（元）'], ['life', '使用年限（年）'], ['scrapDate', '报废时间'], ['depreciationVal', '已折旧金额（元）'], ['reDepreciationVal', '剩余折旧金额（元）'], ['invoiceCode', '发票编号'], ['certificateCode', '证书编号'], ['certificateKeeper', '证书保管人'], ['identifyCode', '车辆识别代号'], ['engineCode', '发动机号'], ['purchaseApprovalCode', '采购审批单号'], ['orderIndex', '排序号'], ['workTypeName', '作业类型'], ['carStateStr', '生命周期'], ['bidSectionName', '所属标段'], ['photoIds', '车辆照片'],
 // ['qrCode', '车辆二维码'],
 ['photoTwoIds', '图片']]);

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

@@ -29,7 +29,8 @@ var Info = function Info() {
   var _useContext = useContext(CarContext),
     info = _useContext.info,
     detail = _useContext.detail,
-    showFields = _useContext.showFields;
+    showFields = _useContext.showFields,
+    id = _useContext.id;
   var showFieldsMap = keyBy(showFields, 'dataKey') || {};
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
@@ -94,7 +95,9 @@ var Info = function Info() {
       }), /*#__PURE__*/_jsx(VmTitle, {
         title: '实时信息',
         time: info === null || info === void 0 ? void 0 : info.equipmentTime
-      }), (info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' ? /*#__PURE__*/_jsx(Unmanned.Monitor, {}) : /*#__PURE__*/_jsx(VmFactorList, {
+      }), (info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' ? /*#__PURE__*/_jsx(Unmanned.Monitor, {
+        carId: id
+      }) : /*#__PURE__*/_jsx(VmFactorList, {
         list: list
       }), /*#__PURE__*/_jsx("div", {
         className: 'vm-car-map-wrap',

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

@@ -49,7 +49,8 @@ var BaseInfo = function BaseInfo() {
               return current && current > dayjs().endOf('day');
             },
             children: (info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' ? /*#__PURE__*/_jsx(Unmanned.WorkInfo, {
-              info: info
+              id: id,
+              date: date
             }) : /*#__PURE__*/_jsx(BaseWork, {
               id: id,
               date: date

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

@@ -250,14 +250,14 @@ var WorkRecord = function WorkRecord() {
                   }
                 })
               }), /*#__PURE__*/_jsxs(Col, {
-                children: [(info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' && /*#__PURE__*/_jsx(VmFactor, {
-                  name: '规划里程',
+                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, {
+                }) : /*#__PURE__*/_jsx(VmFactor, {
                   name: '行驶里程',
                   unit: 'km',
                   type: 'sm',

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

@@ -11,7 +11,10 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { QuestionCircleOutlined } from '@ant-design/icons';
+import { JxhService } from "../../../api";
 import { Space, Tooltip } from 'antd';
+import dayjs from 'dayjs';
+import { keyBy } from 'lodash';
 import { VmBarCharts, VmCalendar, VmCalendarInner, VmCalendarPercent, VmTable } from "../../../../_components";
 import useSettings from "../../../../_hooks/useSettings";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
@@ -32,23 +35,28 @@ export default function (_ref) {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark,
     chartFontColor = _useSettings.chartFontColor;
+  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,
+    loading = _JxhService$useCarWor.loading;
+  var keyByDate = keyBy(dailyData || [], 'workDate');
+  console.log(keyByDate);
   var dateCellRender = function dateCellRender(value) {
-    //   const date = dayjs(value).format('YYYY-MM-DD');
-    //   const item = keyByDate[date];
-    //   if (!item) {
-    //     return null;
-    //   }
-    //   const { percent, driveMileage, workMileage } = item;
-    var percent = 50;
-    var color = getRateColor(percent);
+    var date = dayjs(value).format('YYYY-MM-DD');
+    var item = keyByDate[date];
+    if (!item) {
+      return null;
+    }
+    // let percent = 50;
+    var color = getRateColor(item.percent);
     return /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(VmCalendarPercent, {
-        percent: percent,
+        percent: item.percent,
         color: color
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "blue",
         img: isDark ? track_dark : track,
-        value: "0/0",
+        value: "".concat((item === null || item === void 0 ? void 0 : item.workMileage) || 0, "/").concat((item === null || item === void 0 ? void 0 : item.driveMileage) || 0),
         style: {
           width: '139px',
           justifyContent: 'space-between',
@@ -57,7 +65,7 @@ export default function (_ref) {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "yellow",
         img: isDark ? butter_dark : butter,
-        value: 0,
+        value: (item === null || item === void 0 ? void 0 : item.electricityExpendTotal) || 0,
         style: {
           width: '139px',
           justifyContent: 'space-between',
@@ -66,7 +74,7 @@ export default function (_ref) {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "green",
         img: isDark ? water_dark : water,
-        value: 0,
+        value: (item === null || item === void 0 ? void 0 : item.waterExpendTotal) || 0,
         style: {
           width: '139px',
           justifyContent: 'space-between'

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

@@ -1,4 +1,12 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { unmannedRealByCarId } from "../../../api";
 import { Col, Row, Space } from 'antd';
+import { useEffect, useState } from 'react';
 import { VmProgress } from "../../../..//_components";
 import useSettings from "../../../../_hooks/useSettings";
 import butter from "../../../imgs/butter.png";
@@ -8,10 +16,23 @@ import water_dark from "../../../imgs/water_dark.png";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 function Monitor(_ref) {
-  var _ref$carInfo = _ref.carInfo,
-    carInfo = _ref$carInfo === void 0 ? {} : _ref$carInfo;
+  var carId = _ref.carId;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    detail = _useState2[0],
+    setDetail = _useState2[1];
+  useEffect(function () {
+    if (carId) unmannedRealByCarId({
+      carId: carId,
+      mainDevice: true
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
+        setDetail((res === null || res === void 0 ? void 0 : res.data) || {});
+      }
+    });
+  }, [carId]);
   return /*#__PURE__*/_jsx("div", {
     className: "unmaned_factor_bg",
     children: /*#__PURE__*/_jsxs(Row, {
@@ -20,8 +41,8 @@ function Monitor(_ref) {
         children: /*#__PURE__*/_jsx(Item, {
           icon: isDark ? butter_dark : butter,
           unit: "%",
-          value: 60,
-          rate: 60,
+          value: (detail === null || detail === void 0 ? void 0 : detail.surplusElectricity) || 0,
+          rate: (detail === null || detail === void 0 ? void 0 : detail.surplusElectricity) || 0,
           strokeColor: ['#FFA700', '#FFC637']
         })
       }), /*#__PURE__*/_jsx(Col, {
@@ -29,7 +50,7 @@ function Monitor(_ref) {
         children: /*#__PURE__*/_jsxs("div", {
           className: "unmaned_factor_simple",
           children: [/*#__PURE__*/_jsx("div", {
-            children: carInfo.gpsSpeed || 0
+            children: (detail === null || detail === void 0 ? void 0 : detail.mileage) || 0
           }), /*#__PURE__*/_jsx("div", {
             className: "unit",
             children: '今日行驶(km)'
@@ -40,8 +61,8 @@ function Monitor(_ref) {
         children: /*#__PURE__*/_jsx(Item, {
           icon: isDark ? water_dark : water,
           unit: "L",
-          value: 60,
-          rate: 60,
+          value: (detail === null || detail === void 0 ? void 0 : detail.surplusWater) || 0,
+          rate: (detail === null || detail === void 0 ? void 0 : detail.surplusWater) || 0,
           strokeColor: ['#00CF5D', '#04EC6C']
         })
       })]

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

@@ -4,48 +4,52 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { JxhService } from "../../../api";
 import { Col, Row } from 'antd';
+import dayjs from 'dayjs';
 import { VmFactor, VmProgress } from "../../../../_components";
 import useSettings from "../../../../_hooks/useSettings";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function (props) {
-  var info = props.info;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
+  var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(props.id, dayjs(props.date).format('YYYY-MM-DD'), dayjs(props.date).format('YYYY-MM-DD')),
+    workSummaryJxhRes = _JxhService$useWorkSu.workSummaryJxhRes,
+    loading = _JxhService$useWorkSu.loading;
   var data = [{
     name: '规划里程',
     unit: 'km',
-    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    value: workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.planMileage,
     img: isDark ? require("../../../imgs/track_dark.png") : require("../../../imgs/track.png"),
     fontType: 'blue'
   }, {
     name: '运行时长',
     unit: '',
-    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    value: workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.runDuration,
     img: isDark ? require("../../../imgs/clock_dark.png") : require("../../../imgs/clock.png"),
     fontType: 'blue'
   }, {
     name: '总电耗',
     unit: 'kwh',
-    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    value: workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.electricityExpendTotal,
     img: isDark ? require("../../../imgs/butter_dark.png") : require("../../../imgs/butter.png"),
     fontType: 'yellow'
   }, {
     name: '核算作业里程',
     unit: 'km',
-    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    value: workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workMileage,
     img: isDark ? require("../../../imgs/track_green_dark.png") : require("../../../imgs/track_green.png"),
     fontType: 'green'
   }, {
     name: '作业时长',
     unit: '',
-    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    value: workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workDuration,
     img: isDark ? require("../../../imgs/clock_green_dark.png") : require("../../../imgs/clock_green.png"),
     fontType: 'green'
   }, {
     name: '总水耗',
     unit: 'L',
-    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    value: workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.waterExpendTotal,
     img: isDark ? require("../../../imgs/water_dark.png") : require("../../../imgs/water.png"),
     fontType: 'green'
   }];
@@ -59,7 +63,7 @@ export default function (props) {
     children: [/*#__PURE__*/_jsx(Col, {
       flex: '112px',
       children: /*#__PURE__*/_jsx(VmProgress.Circle, {
-        rate: (info === null || info === void 0 ? void 0 : info.rate) || 50,
+        rate: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workRate) || 0,
         name: '完成率',
         strokeColor: isDark ? {
           '0%': '#009DFF',

package/lib/vtx-cp-modal/components/BaseInfo/index.less

@@ -33,7 +33,7 @@
         &-block {
           flex: 1;
           display: flex;
-          justify-content: space-between;
+          justify-content: space-evenly;
           align-items: center;
         }
       }

package/lib/vtx-housing-estate-modal/components/Alarm/index.js

@@ -43,7 +43,6 @@ var WGXW = function WGXW(_ref) {
     businessPackage: tab,
     areaDimension: 'COMMUNITY'
   });
-  console.log(tab);
   return /*#__PURE__*/_jsx("div", {
     className: prefix,
     children: /*#__PURE__*/_jsxs(VmWrapper, {

package/lib/vtx-sdyd-tfd-modal/components/Sbzj/index.js

@@ -31,7 +31,6 @@ var Sbzj = function Sbzj(_ref) {
     LIGHT: 'deng',
     CAMERA: 'sbzj_video'
   };
-  console.log(data);
   return /*#__PURE__*/_jsxs("div", {
     className: "".concat(prefix),
     children: [/*#__PURE__*/_jsx(VmWrapper, {

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

@@ -13,7 +13,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_CALENDAR = 'calender';
 var TABS_THROW = 'throw';
-var TABS_ALARM = 'alarm';
+var TABS_ALARM = 'shxq-alarm';
 var TABS_TFD = 'tfd';
 var tabs = [{
   key: TABS_BASE,
@@ -36,7 +36,6 @@ var VtxShxqModal = function VtxShxqModal(props) {
     title = props.title,
     subTitle = props.subTitle,
     theme = props.theme,
-    source = props.source,
     visible = props.visible,
     onCancel = props.onCancel,
     _props$top = props.top,
@@ -95,7 +94,6 @@ var VtxShxqModal = function VtxShxqModal(props) {
     title: title,
     subTitle: subTitle,
     visible: visible,
-    source: source,
     theme: theme,
     onCancel: onCancel,
     frameParams: frameParams,

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

@@ -14,7 +14,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_CALENDAR = 'calender';
 var TABS_THROW = 'throw';
-var TABS_ALARM = 'alarm';
+var TABS_ALARM = 'tfd-alarm';
 var tabs = [{
   key: TABS_BASE,
   title: '总览信息'

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

@@ -11,6 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { VtxImage } from '@vtx/components';
+import '@vtx/components/lib/vtx-image/style/index';
 import { getVtxToken, request } from '@vtx/utils';
 import { useEffect, useState } from 'react';
 import { VmEmpty } from "../../../_components";
@@ -122,11 +123,12 @@ export default (function (props) {
     children: [/*#__PURE__*/_jsx("div", {
       className: "wr-base-img",
       children: imgList.length ? /*#__PURE__*/_jsx(VtxImage.PreviewGroup, {
-        children: imgList.map(function (item) {
+        children: imgList.map(function (item, index) {
           return /*#__PURE__*/_jsx(VtxImage, {
             src: item.url,
             alt: item.name,
             style: {
+              display: index === 0 ? 'block' : 'none',
               width: '100%',
               height: '100%'
             }

package/lib/vtx-wr-modal/style/index.js

@@ -1,3 +1,4 @@
+import '@vtx/components/lib/vtx-image/style/index';
 import "../components/Appraise/index.less";
 import "../components/Base/index.less";
 import "../components/Build/index.less";

package/package.json

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