@vtx/modals2 5.0.28 → 5.0.30

package/lib/_components/vm-map/index.js

@@ -21,8 +21,6 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function VmOlMap(_ref) {
   var _mapInfo$olProps, _points$data2, _polygons$data2, _newPoints$data3;
   var mapCenter = _ref.mapCenter,
-    _ref$mapType = _ref.mapType,
-    mapType = _ref$mapType === void 0 ? 'bmap' : _ref$mapType,
     _ref$mapPoints = _ref.mapPoints,
     mapPoints = _ref$mapPoints === void 0 ? [] : _ref$mapPoints,
     _ref$newMapPoints = _ref.newMapPoints,

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,
-      endDate: endDate,
-      date: date,
+      startDate: startDate ? dayjs(startDate) : '',
+      endDate: endDate ? dayjs(endDate) : '',
+      date: date ? dayjs(date) : '',
       mapInfo: mapInfo,
       tabPosition: tabPosition,
       chartFontColor: theme === 'light' ? '#595959' : '#FFFFFF',

package/lib/vtx-car-modal/content/Jzlj/Dispose/Pies.js

@@ -47,7 +47,7 @@ export default function Pies(_ref) {
             });
             var info = startDataList[index] || {};
             var value = info.value;
-            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value, "\u5904\u7F6E\u8BC1)");
+            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value !== null && value !== void 0 ? value : 0, "\u5904\u7F6E\u8BC1)");
           }
         }
       })
@@ -68,7 +68,7 @@ export default function Pies(_ref) {
             });
             var info = endDataList[index] || {};
             var value = info.value;
-            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value, "\u5904\u7F6E\u8BC1)");
+            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value !== null && value !== void 0 ? value : 0, "\u5904\u7F6E\u8BC1)");
           }
         }
       })

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

@@ -87,8 +87,8 @@ export var CarContext = /*#__PURE__*/React.createContext({
   id: '',
   info: {},
   detail: {},
-  startDate: dayjs().format('YYYY-MM-DD'),
-  endDate: dayjs().format('YYYY-MM-DD'),
+  startDate: dayjs(),
+  endDate: dayjs(),
   showFields: []
 });
 var Provider = CarContext.Provider;
@@ -287,8 +287,8 @@ var VtxCarModal = function VtxCarModal(props) {
       id: id,
       info: info,
       detail: detail,
-      startDate: startDate,
-      endDate: endDate,
+      startDate: startDate ? dayjs(startDate) : null,
+      endDate: endDate ? dayjs(endDate) : null,
       showFields: showFields,
       onTdClick: onTdClick,
       onCancel: onCancel,

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

@@ -97,8 +97,7 @@ var BaseService = {
         },
         lng: mapInfoRes.data.lngDone,
         lat: mapInfoRes.data.latDone,
-        labelClass: 'vtx-map-carCode',
-        url: mapInfoRes !== null && mapInfoRes !== void 0 && (_mapInfoRes$data2 = mapInfoRes.data) !== null && _mapInfoRes$data2 !== void 0 && _mapInfoRes$data2.icon ? "/cloudFile/common/downloadFile?id=".concat(mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data3 = mapInfoRes.data) === null || _mapInfoRes$data3 === void 0 ? void 0 : _mapInfoRes$data3.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon2({
+        url: mapInfoRes !== null && mapInfoRes !== void 0 && (_mapInfoRes$data2 = mapInfoRes.data) !== null && _mapInfoRes$data2 !== void 0 && _mapInfoRes$data2.icon ? "/cloudFile/common/downloadFile?id=".concat(mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data3 = mapInfoRes.data) === null || _mapInfoRes$data3 === void 0 ? void 0 : _mapInfoRes$data3.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon({
           canvasIcon: 'PERSONNEL',
           color: (mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data4 = mapInfoRes.data) === null || _mapInfoRes$data4 === void 0 ? void 0 : _mapInfoRes$data4.statusCode) === 'Normal' ? '#119FFB' : '#999999'
         }).getImgUrl() : new MapIcon.CommonIcon({

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

@@ -104,8 +104,8 @@ var BaseService = {
         },
         lng: mapInfoRes.data.lngDone,
         lat: mapInfoRes.data.latDone,
-        labelClass: 'vtx-map-carCode',
-        url: mapInfoRes !== null && mapInfoRes !== void 0 && (_mapInfoRes$data3 = mapInfoRes.data) !== null && _mapInfoRes$data3 !== void 0 && _mapInfoRes$data3.icon ? "/cloudFile/common/downloadFile?id=".concat(mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data4 = mapInfoRes.data) === null || _mapInfoRes$data4 === void 0 ? void 0 : _mapInfoRes$data4.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon2({
+        // labelClass: 'vtx-map-carCode',
+        url: mapInfoRes !== null && mapInfoRes !== void 0 && (_mapInfoRes$data3 = mapInfoRes.data) !== null && _mapInfoRes$data3 !== void 0 && _mapInfoRes$data3.icon ? "/cloudFile/common/downloadFile?id=".concat(mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data4 = mapInfoRes.data) === null || _mapInfoRes$data4 === void 0 ? void 0 : _mapInfoRes$data4.icon, "&token=").concat(getVtxToken('token')) : isDark ? new MapIcon.CommonIcon({
           canvasIcon: 'PERSONNEL',
           color: (mapInfoRes === null || mapInfoRes === void 0 || (_mapInfoRes$data5 = mapInfoRes.data) === null || _mapInfoRes$data5 === void 0 ? void 0 : _mapInfoRes$data5.statusCode) === 'Normal' ? '#119FFB' : '#999999'
         }).getImgUrl() : new MapIcon.CommonIcon({

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

@@ -118,7 +118,8 @@ var ListZymx = function ListZymx(props) {
       total: (todayWorkRes === null || todayWorkRes === void 0 ? void 0 : todayWorkRes.total) || 0,
       defaultPageSize: 20,
       onChange: pageChange
-    })
+    }),
+    dataSource: (todayWorkRes === null || todayWorkRes === void 0 ? void 0 : todayWorkRes.rows) || []
   };
   return /*#__PURE__*/_jsx(VmTable, _objectSpread({
     columns: columns,

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

@@ -80,7 +80,7 @@ var BaseInfo = function BaseInfo(props) {
           children: (center === null || center === void 0 ? void 0 : center.length) > 0 && /*#__PURE__*/_jsx(VmMap, _objectSpread({
             mapCenter: center,
             mapType: (mapInfo === null || mapInfo === void 0 ? void 0 : mapInfo.mapType) || 'bmap',
-            newMapPoints: mapPoints,
+            mapPoints: mapPoints,
             mapPolygons: mapPolygons,
             geometryType: "polygon",
             address: realtimeInfo === null || realtimeInfo === void 0 ? void 0 : realtimeInfo.address

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

@@ -14,7 +14,7 @@ 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";
+import { VmEmpty, VmMap } from "../../../_components";
 import Sjjg from "./Sjjg";
 
 //基础设施详情
@@ -25,6 +25,7 @@ var getJcssDetail = function getJcssDetail(params) {
   });
 };
 export default (function (props) {
+  var _gcDetail$geometryInf, _gcDetail$geometryInf2, _gcDetail$geometryInf3, _gcDetail$geometryInf4;
   var theme = props.theme,
     gcDetail = props.gcDetail,
     fields = props.fields;
@@ -69,10 +70,6 @@ export default (function (props) {
     name: '行政区划',
     key: 'divisionName',
     isShow: isShow('divisionId')
-  }, {
-    name: '详细地址',
-    key: 'address',
-    isShow: isShow('address')
   }, {
     name: '开放时间',
     key: 'openTime',
@@ -117,6 +114,10 @@ export default (function (props) {
     name: '保洁时间',
     key: 'cleanTime',
     isShow: isShow('bjsjId')
+  }, {
+    name: '详细地址',
+    key: 'address',
+    isShow: isShow('address')
   }];
   return /*#__PURE__*/_jsxs("div", {
     className: "wr-base-inner",
@@ -137,9 +138,9 @@ export default (function (props) {
       }) : /*#__PURE__*/_jsx(VmEmpty, {
         type: "NO_PICTURE"
       })
-    }), /*#__PURE__*/_jsx("div", {
+    }), /*#__PURE__*/_jsxs("div", {
       className: "wr-base-info",
-      children: basicList.filter(function (item) {
+      children: [basicList.filter(function (item) {
         return item.isShow;
       }).map(function (item) {
         return /*#__PURE__*/_jsxs("div", {
@@ -151,7 +152,21 @@ export default (function (props) {
             children: [item.name, "\uFF1A"]
           }), gcDetail[item.key] || '--']
         }, item.key);
-      })
+      }), isShow('address') && ((_gcDetail$geometryInf = gcDetail.geometryInfo) === null || _gcDetail$geometryInf === void 0 ? void 0 : _gcDetail$geometryInf.lngLats) && /*#__PURE__*/_jsx("div", {
+        className: "wr-map",
+        children: /*#__PURE__*/_jsx(VmMap, {
+          mapCenter: (_gcDetail$geometryInf2 = gcDetail.geometryInfo) === null || _gcDetail$geometryInf2 === void 0 ? void 0 : _gcDetail$geometryInf2.lngLats.split(','),
+          mapType: "bmap",
+          geometryType: "point",
+          mapPoints: [{
+            id: 'wrPoint',
+            name: 'wrPoint',
+            lng: (_gcDetail$geometryInf3 = gcDetail.geometryInfo) === null || _gcDetail$geometryInf3 === void 0 ? void 0 : _gcDetail$geometryInf3.lngLats.split(',')[0],
+            lat: (_gcDetail$geometryInf4 = gcDetail.geometryInfo) === null || _gcDetail$geometryInf4 === void 0 ? void 0 : _gcDetail$geometryInf4.lngLats.split(',')[1],
+            icon: 'HW_GC'
+          }]
+        })
+      })]
     }), /*#__PURE__*/_jsx("div", {
       className: "divider"
     }), gcDetail.hasDevice && /*#__PURE__*/_jsxs(_Fragment, {

package/lib/vtx-wr-modal/components/Base/index.less

@@ -45,6 +45,12 @@
           text-overflow: ellipsis;
           white-space: nowrap;
         }
+        .wr-map {
+          width: 100%;
+          height: 200px;
+          border-radius: 10px;
+          border: 1px solid rgba(12, 154, 255, 0.15);
+        }
       }
       .divider {
         width: 100%;

package/package.json

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