@vtx/modals2 6.0.0-beta.6 → 6.0.0-beta.8

package/lib/_components/vm-line-charts/index.js

@@ -64,7 +64,9 @@ var LineCharts = function LineCharts(_ref) {
     }],
     legend: _objectSpread({
       show: showLegend,
-      right: dataList.length === 1 ? '5%' : 'center',
+      left: '10%',
+      top: 0,
+      height: 24,
       type: 'scroll',
       itemGap: 8,
       itemHeight: 2,
@@ -84,6 +86,7 @@ var LineCharts = function LineCharts(_ref) {
     grid: _objectSpread({
       left: 50,
       right: 50,
+      top: showLegend ? 40 : 20,
       bottom: showDataZoom ? 50 : 20
     }, gridOption),
     xAxis: _objectSpread({

package/lib/_components/vm-video/HistoryGrid.js

@@ -1,15 +1,61 @@
+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 { HistoryPlayer } from '@vtx/player';
-import { forwardRef, useRef } from 'react';
+import { forwardRef, useEffect, useRef, useState } from 'react';
 import VmEmpty from "../vm-empty";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _channel$list;
   var channel = props.channel,
     onClose = props.onClose;
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    url = _useState2[0],
+    setUrl = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    startTime = _useState4[0],
+    setStartTime = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    endTime = _useState6[0],
+    setEndTime = _useState6[1];
   var name = "".concat(channel === null || channel === void 0 ? void 0 : channel.deviceName, "-").concat(channel === null || channel === void 0 ? void 0 : channel.channelName);
-  var url = (channel === null || channel === void 0 ? void 0 : channel.totalTimeUrl) || (channel === null || channel === void 0 || (_channel$list = channel.list) === null || _channel$list === void 0 || (_channel$list = _channel$list[0]) === null || _channel$list === void 0 ? void 0 : _channel$list.playbackUrl);
   var gridItemRef = useRef(null);
+  useEffect(function () {
+    var _channel$list;
+    var src = (channel === null || channel === void 0 ? void 0 : channel.totalTimeUrl) || (channel === null || channel === void 0 || (_channel$list = channel.list) === null || _channel$list === void 0 || (_channel$list = _channel$list[0]) === null || _channel$list === void 0 ? void 0 : _channel$list.playbackUrl);
+    if (channel.enableAgent) {
+      if (src.indexOf('http') === -1) {
+        setUrl("".concat(window.location.origin).concat(src));
+      }
+    } else {
+      setUrl(src);
+    }
+    if (channel !== null && channel !== void 0 && channel.totalTimeUrl) {
+      setStartTime(props === null || props === void 0 ? void 0 : props.startTime);
+      setEndTime(props === null || props === void 0 ? void 0 : props.endTime);
+    } else {
+      var _channel$list2, _channel$list3;
+      setStartTime(channel === null || channel === void 0 || (_channel$list2 = channel.list) === null || _channel$list2 === void 0 || (_channel$list2 = _channel$list2[0]) === null || _channel$list2 === void 0 ? void 0 : _channel$list2.beginTime);
+      setEndTime(channel === null || channel === void 0 || (_channel$list3 = channel.list) === null || _channel$list3 === void 0 || (_channel$list3 = _channel$list3[0]) === null || _channel$list3 === void 0 ? void 0 : _channel$list3.endTime);
+    }
+  }, [channel.enableAgent, props.startTime, JSON.stringify(channel)]);
+  useEffect(function () {
+    var _channel$list4;
+    var src = (channel === null || channel === void 0 ? void 0 : channel.totalTimeUrl) || (channel === null || channel === void 0 || (_channel$list4 = channel.list) === null || _channel$list4 === void 0 || (_channel$list4 = _channel$list4[0]) === null || _channel$list4 === void 0 ? void 0 : _channel$list4.playbackUrl);
+    if (channel.enableAgent) {
+      if (src.indexOf('http') === -1) {
+        setUrl("".concat(window.location.origin).concat(src));
+      }
+    } else {
+      setUrl(src);
+    }
+  }, [JSON.stringify(channel)]);
   return /*#__PURE__*/_jsx("div", {
     className: "vm-video-content-container",
     ref: gridItemRef,
@@ -34,6 +80,8 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
           beenHasAudio: channel.beenHasAudio // 音频
           ,
           url: url,
+          startTime: startTime,
+          endTime: endTime,
           type: channel === null || channel === void 0 ? void 0 : channel.player,
           deviceIp: channel.deviceIp,
           devicePort: channel.devicePort,

package/lib/_components/vm-video/RealtimeGrid.js

@@ -1,17 +1,36 @@
+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 { LivePlayer } from '@vtx/player';
-import { forwardRef, useRef } from 'react';
+import { forwardRef, useEffect, useRef, useState } from 'react';
 import VmEmpty from "../vm-empty";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
   var channel = props.channel,
     onClose = props.onClose;
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    url = _useState2[0],
+    setUrl = _useState2[1];
   var name = "".concat(channel === null || channel === void 0 ? void 0 : channel.deviceName, "-").concat(channel === null || channel === void 0 ? void 0 : channel.channelName);
   var gridItemRef = useRef(null);
+  useEffect(function () {
+    if (channel.enableAgent) {
+      if ((channel === null || channel === void 0 ? void 0 : channel.url.indexOf('http')) === -1) {
+        setUrl("".concat(window.location.origin).concat(channel.url));
+      }
+    } else {
+      setUrl(channel.url);
+    }
+  }, [channel.enableAgent, channel === null || channel === void 0 ? void 0 : channel.url]);
   return /*#__PURE__*/_jsx("div", {
     className: "vm-video-content-container",
     ref: gridItemRef,
-    children: channel !== null && channel !== void 0 && channel.url ? /*#__PURE__*/_jsxs(_Fragment, {
+    children: url ? /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("div", {
         className: "vm-video-content-container-header",
         children: [/*#__PURE__*/_jsx("span", {
@@ -31,7 +50,7 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
           ,
           beenHasAudio: channel.beenHasAudio // 音频
           ,
-          url: channel.url,
+          url: url,
           type: channel === null || channel === void 0 ? void 0 : channel.player,
           deviceIp: channel.deviceIp,
           devicePort: channel.devicePort,

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

@@ -117,22 +117,25 @@ var VmVideo = function VmVideo(_ref) {
   }, [dateType]);
   useEffect(function () {
     if (channels !== null && channels !== void 0 && channels.length && tabKey === '1') {
-      var _channels$filter;
-      Promise.all(channels === null || channels === void 0 || (_channels$filter = channels.filter(function (ele, index) {
-        return index < 4;
-      })) === null || _channels$filter === void 0 ? void 0 : _channels$filter.map(function (ele) {
+      var defaultCheckedChannels = channels.map(function (channel, index) {
+        return _objectSpread(_objectSpread({}, channel), {}, {
+          checked: index < 4
+        });
+      });
+      Promise.all(channels.slice(0, 4).map(function (ele) {
         return getPreviewUrl({
           channelNum: ele.channelNum,
           deviceId: ele.videoDeviceId
         });
       })).then(function (res) {
-        setCheckedChannels(res === null || res === void 0 ? void 0 : res.map(function (ele, index) {
-          return _objectSpread(_objectSpread({}, ele === null || ele === void 0 ? void 0 : ele.data), {}, {
+        setCheckedChannels(defaultCheckedChannels.map(function (channel, index) {
+          var _res$index;
+          return _objectSpread(_objectSpread(_objectSpread({}, channel), index < 4 ? (_res$index = res[index]) === null || _res$index === void 0 ? void 0 : _res$index.data : {}), {}, {
             checked: index < 4
           });
         }));
       });
-    } else {}
+    }
     if (tabKey === '2') {
       var _channels$;
       form.setFieldsValue({
@@ -185,13 +188,27 @@ var VmVideo = function VmVideo(_ref) {
                   onChange: function onChange(e) {
                     var list = cloneDeep(checkedChannels);
                     if (e.target.checked) {
+                      var selectedCount = list.filter(function (channel) {
+                        return channel.checked;
+                      }).length + 1;
+                      if (selectedCount > 9) {
+                        message.warning('同时播放通道不能超过9路');
+                        return;
+                      }
+                      if (selectedCount > Number(mode)) {
+                        setMode(selectedCount <= 4 ? '4' : '9');
+                      }
                       getPreviewUrl({
                         channelNum: ele.channelNum,
-                        deviceId: ele.deviceId
+                        deviceId: ele.videoDeviceId || ele.deviceId
                       }).then(function (res) {
-                        list[index] = _objectSpread({
+                        var _res$data, _res$data2;
+                        var currentChannel = list[index];
+                        list[index] = _objectSpread(_objectSpread(_objectSpread({}, currentChannel), res.data), {}, {
+                          channelName: currentChannel.channelName || ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.channelName),
+                          deviceName: currentChannel.deviceName || ((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.deviceName),
                           checked: true
-                        }, res.data);
+                        });
                         setCheckedChannels(list);
                       });
                     } else {
@@ -380,15 +397,23 @@ var VmVideo = function VmVideo(_ref) {
             key: '9'
           }],
           onChange: function onChange(key) {
-            setMode(key);
+            var selectedCount = checkedChannels.filter(function (channel) {
+              return channel.checked;
+            }).length;
+            setMode(selectedCount > Number(key) ? selectedCount <= 4 ? '4' : '9' : key);
           }
         }) : /*#__PURE__*/_jsx(_Fragment, {})
       }), /*#__PURE__*/_jsx("div", {
         className: "vm-video-content _".concat(mode),
-        children: tabKey === '1' ? getGridItems(mode, checkedChannels === null || checkedChannels === void 0 ? void 0 : checkedChannels.filter(function (ele) {
-          return ele.checked;
-        }), setCheckedChannels) : /*#__PURE__*/_jsx(HistoryGrid, {
-          channel: history
+        children: tabKey === '1' ? getGridItems(mode, checkedChannels, setCheckedChannels) : /*#__PURE__*/_jsx(HistoryGrid, {
+          channel: history,
+          startTime: startTime,
+          endTime: endTime,
+          onClose: function onClose() {
+            setState({
+              history: {}
+            });
+          }
         })
       })]
     })]
@@ -396,18 +421,28 @@ var VmVideo = function VmVideo(_ref) {
 };
 export default VmVideo;
 var getGridItems = function getGridItems(latestGrid, channels, setCheckedChannels) {
+  var selectedChannels = channels.filter(function (channel) {
+    return channel.checked;
+  });
   var items = [];
   var _loop = function _loop(i) {
     var element = /*#__PURE__*/_jsx(RealtimeGrid, {
-      channel: channels[i] || {
+      channel: selectedChannels[i] || {
         channelNum: '',
         channelId: ''
       },
       onClose: function onClose() {
         var list = cloneDeep(channels);
-        list[i].checked = false;
-        list[i].url = '';
-        list[i].player = '';
+        var channelIndex = list.findIndex(function (channel) {
+          var _selectedChannels$i;
+          return channel.channelNum === ((_selectedChannels$i = selectedChannels[i]) === null || _selectedChannels$i === void 0 ? void 0 : _selectedChannels$i.channelNum);
+        });
+        if (channelIndex === -1) {
+          return;
+        }
+        list[channelIndex].checked = false;
+        list[channelIndex].url = '';
+        list[channelIndex].player = '';
         setCheckedChannels(list);
       },
       scale: 1

package/lib/_components/vm-video/index.less

@@ -59,13 +59,13 @@
       padding-top: 12px;
       overflow-y: auto;
 
-      .channels--item {
-        svg {
-          transform: translateY(7px);
-          margin-right: 2px;
-        }
-        .ant-checkbox {
-          transform: translateY(-2px);
+      .channels--item {
+        svg {
+          display: block;
+          margin-right: 2px;
+        }
+        .ant-checkbox {
+          top: 0;
         }
         .ant-checkbox-checked .ant-checkbox-inner {
           background-color: var(--check-bg);
@@ -78,13 +78,17 @@
           width: 15px;
           height: 15px;
         }
-        .ant-checkbox-wrapper {
-          font-size: 15px;
-          //   color: var(--modal-title-color);
-        }
-        .ant-checkbox + span {
-          padding: 0 4px;
-        }
+        .ant-checkbox-wrapper {
+          display: inline-flex;
+          align-items: center;
+          font-size: 15px;
+          //   color: var(--modal-title-color);
+        }
+        .ant-checkbox + span {
+          display: inline-flex;
+          align-items: center;
+          padding: 0 4px;
+        }
       }
     }
   }

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

@@ -59,7 +59,8 @@ var Detail = function Detail(_ref) {
     dataIndex: 'collectPointName',
     key: 'collectPointName',
     fixed: 'left',
-    width: 160
+    width: 160,
+    ellipsis: true
   }, {
     title: translateLocaleText("t('vtxcarmodal.hours10')"),
     dataIndex: 'actualCollectTime',

package/lib/vtx-cp-modal/components/BaseInfo/CarWork.js

@@ -94,13 +94,10 @@ export default function CarWork(props) {
   }
   var tableProps = {
     scroll: {
-      y: 194,
+      y: 245,
       x: '100%'
     },
-    pagination: {
-      current: 1,
-      pageSize: 10
-    },
+    pagination: false,
     indexWidth: '8%',
     dataSource: (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 ? dataSource.map(function (ele, index) {
       var _ele$bidSectionName;

package/lib/vtx-cp-modal/components/BaseInfo/TodayWork.js

@@ -53,6 +53,12 @@ export default function TodayWork(props) {
   };
   var getValue = function getValue(name, id) {
     var strokeColor = '#1890FF';
+    if (!name) {
+      return {
+        strokeColor: strokeColor,
+        src: isDark ? allRateDark : allRate
+      };
+    }
     var src = name === '全部' ? isDark ? allRateDark : allRate : getIcon(id);
     if (isDark) {
       if (name.indexOf('全部') > -1) {
@@ -101,7 +107,7 @@ export default function TodayWork(props) {
           className: "twork--item-progress",
           children: [/*#__PURE__*/_jsxs("div", {
             className: "twork--item-progress-row",
-            children: ["".concat(item === null || item === void 0 ? void 0 : item.productTypeName).concat(translateLocaleText("t('vtxcpmodal.completionRateColon')")), "".concat(item.rate || 0, "%")]
+            children: ["".concat((item === null || item === void 0 ? void 0 : item.productTypeName) || '-').concat(translateLocaleText("t('vtxcpmodal.completionRateColon')")), "".concat(item.rate || 0, "%")]
           }), /*#__PURE__*/_jsx(Progress, {
             strokeLinecap: "butt",
             percent: item.rate,

package/lib/vtx-cp-modal/components/ExeceptionInfo/AlarmRecord.js

@@ -94,19 +94,23 @@ export default function AlarmRecord(props) {
     title: translateLocaleText("t('vtxzgmodal.hours')"),
     dataIndex: 'submitDate',
     key: 'submitDate',
-    sorter: true
+    sorter: true,
+    width: 150
   }, {
     title: translateLocaleText("t('vtxcccpmodal.type3')"),
     dataIndex: 'abnormalTypeStr',
-    key: 'abnormalTypeStr'
+    key: 'abnormalTypeStr',
+    width: 120
   }, {
     title: translateLocaleText("t('vtxcpmodal.reportVehicle')"),
     dataIndex: 'carCode',
-    key: 'carCode'
+    key: 'carCode',
+    width: 120
   }, {
     title: translateLocaleText("t('vtxcccpmodal.status')"),
     dataIndex: 'dealStatusStr',
     key: 'dealStatusStr',
+    width: 120,
     render: function render(text, record) {
       return /*#__PURE__*/_jsxs("span", {
         style: {
@@ -149,7 +153,7 @@ export default function AlarmRecord(props) {
   };
   var handleTableChange = function handleTableChange(sorter) {
     setState({
-      sort: "collectDay,".concat(sorter.order === 'ascend' ? 'ASC' : 'DESC')
+      sort: "submitDate,".concat(sorter.order === 'ascend' ? 'ASC' : 'DESC')
     });
   };
   var tableProps = {

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

@@ -43,8 +43,8 @@ var BaseService = {
       value: info === null || info === void 0 ? void 0 : info.divisionName
     }, {
       label: translateLocaleText("t('vtxshxqmodal.type2')"),
-      key: 'classTypeName',
-      value: info === null || info === void 0 ? void 0 : info.classTypeName
+      key: 'facilityClassName',
+      value: info === null || info === void 0 ? void 0 : info.facilityClassName
     }, {
       label: translateLocaleText("t('vtxshxqmodal.pointQuantityItems')"),
       key: 'throwPointNum',

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

@@ -2,6 +2,7 @@ import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { VmEmpty, VmLineCharts, VmPieCharts } from "../../../_components";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Charts = function Charts(_ref) {
+  var _chartData$filter;
   var chartData = _ref.chartData,
     lineData = _ref.lineData;
   var legends = lineData.legends,
@@ -17,7 +18,9 @@ var Charts = function Charts(_ref) {
       });
     });
   }
-  var total = chartData === null || chartData === void 0 ? void 0 : chartData.reduce(function (acc, cur) {
+  var total = chartData === null || chartData === void 0 || (_chartData$filter = chartData.filter(function (item) {
+    return item.alarmTypeCode;
+  })) === null || _chartData$filter === void 0 ? void 0 : _chartData$filter.reduce(function (acc, cur) {
     return acc + cur.value;
   }, 0);
   return /*#__PURE__*/_jsxs("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "6.0.0-beta.6",
+  "version": "6.0.0-beta.8",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",
@@ -51,10 +51,10 @@
     "@types/react-dom": "^18.0.0",
     "@umijs/lint": "^4.0.0",
     "@vtx/components": "^4.0.0-beta.58",
+    "@vtx/map-icon": "^2.0.62",
     "@vtx/ol-map": "^2.0.0-beta.16",
-    "@vtx/player": "latest",
+    "@vtx/player": "^1.12.7",
     "@vtx/utils": "^1.0.20",
-    "ol": "6.15.1",
     "antd": "6.0.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "babel-eslint": "^10.1.0",
@@ -65,22 +65,22 @@
     "father": "^4.1.0",
     "husky": "^8.0.1",
     "lint-staged": "^13.0.3",
+    "ol": "6.15.1",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.0.0",
     "prettier-plugin-packagejson": "^2.2.18",
     "react": "18.0.0",
     "react-dom": "18.0.0",
-    "stylelint": "^14.9.1",
-    "@vtx/map-icon": "^2.0.62"
+    "stylelint": "^14.9.1"
   },
   "peerDependencies": {
-    "antd": ">=6",
     "@ant-design/icons": ">=6",
     "@vtx/components": ">=4.0.0-beta.0",
     "@vtx/map-icon": ">=2.0.0",
     "@vtx/ol-map": ">=2.0.0-beta.0",
     "@vtx/player": ">=1.0.0",
     "@vtx/utils": ">=1.0.20",
+    "antd": ">=6",
     "ol": ">=6.15.1",
     "react": ">=18",
     "react-dom": ">=18"