@vtx/modals2 6.0.0-beta.2 → 6.0.0-beta.20

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

@@ -1,26 +1,27 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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); }
 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; }
-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 { useSetState } from 'ahooks';
 import dayjs from 'dayjs';
 import React, { useMemo } from 'react';
 import { VmCustom, VmIframeModal, VmVideo } from "../_components";
 import useGetChannels from "../_hooks/useGetChannels";
 import useGetConfig from "../_hooks/useGetConfig";
+import { useZdService } from "../_hooks/useUmsService";
 import VtxBaseModal from "../vtx-base-modal";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 import { BaseService, OilService } from "./api";
 import { Cc, Common, JXH, Jzlj, Ljsy, Ljzy } from "./content";
 import "./style";
-import { translateLocaleText } from "./../hooks/useTranslation.js";
 // 总览信息
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var TABS_BASE = 'base';
@@ -32,6 +33,14 @@ var TABS_ALARM = 'alarm';
 var TABS_STATIC = 'static';
 // 水耗信息
 var TABS_WATER = 'water';
+// 用水信息
+var TABS_WATER_USE = 'water-use';
+// 用电信息
+var TABS_ELE_USE = 'ele-use';
+// 加油信息
+var TABS_OIL_USE = 'oil-use';
+// 运营信息
+var TABS_OPERATION = 'operation';
 // 油耗信息
 var TABS_OIL = 'oil';
 // 维保信息
@@ -124,11 +133,11 @@ var VtxCarModal = function VtxCarModal(props) {
     iframeUrl = _props$iframeUrl === void 0 ? '' : _props$iframeUrl,
     _props$width = props.width,
     width = _props$width === void 0 ? null : _props$width;
+  var serviceConfig = useZdService();
   var _BaseService$useBaseI = BaseService.useBaseInfo(id),
     detail = _BaseService$useBaseI.detail,
     info = _BaseService$useBaseI.info;
-  var _useGetChannels = useGetChannels(info === null || info === void 0 ? void 0 : info.carCode, !!(info !== null && info !== void 0 && info.carCode)),
-    channels = _useGetChannels.channels;
+  var zdReborn = (serviceConfig === null || serviceConfig === void 0 ? void 0 : serviceConfig.zdService) === 'reborn';
   var _OilService$useHasOil = OilService.useHasOil(id),
     beenOilStatus = _OilService$useHasOil.beenOilStatus;
   var _BaseService$useField = BaseService.useFieldConfig(),
@@ -243,6 +252,18 @@ var VtxCarModal = function VtxCarModal(props) {
       }, {
         key: TABS_ALARM,
         title: translateLocaleText("t('vtxqyrymodal.alarmInformation')")
+      }, {
+        key: TABS_WATER_USE,
+        title: translateLocaleText("t('vtxcarmodal.waterUseInformation')")
+      }, {
+        key: TABS_ELE_USE,
+        title: translateLocaleText("t('vtxcarmodal.eleUseInformation')")
+      }, {
+        key: TABS_OIL_USE,
+        title: translateLocaleText("t('vtxcarmodal.oilUseInformation')")
+      }, {
+        key: TABS_OPERATION,
+        title: translateLocaleText("t('vtxcarmodal.operationInformation')")
       }];
     }
     return tabs.concat([{
@@ -250,11 +271,12 @@ var VtxCarModal = function VtxCarModal(props) {
       title: translateLocaleText("t('vtxdevicemodal.video')")
     }]);
   }, [info === null || info === void 0 ? void 0 : info.actionType]);
-  var contents = (_contents = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_BASE, /*#__PURE__*/_jsx(Common.BaseInfo, {})), TABS_STATIC, /*#__PURE__*/_jsx(Common.StaticInfo, {})), TABS_ALARM, /*#__PURE__*/_jsx(Common.AlarmInfo, {})), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
-    channels: channels
-  })), TABS_OIL, /*#__PURE__*/_jsx(Common.OilConsumption, {})), TABS_WATER, /*#__PURE__*/_jsx(Common.WaterConsumption, {})), TABS_MAINTENANCE, /*#__PURE__*/_jsx(Common.Maintenance, {})), TABS_DETAIL, /*#__PURE__*/_jsx(Common.DetailInfo, {})), TABS_DEVICE, /*#__PURE__*/_jsx(Common.DeviceInfo, {})), TABS_JXH_BASE, /*#__PURE__*/_jsx(JXH.BaseInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JXH_STATIC, /*#__PURE__*/_jsx(JXH.StaticInfo, {})), TABS_JXH_WORK, /*#__PURE__*/_jsx(JXH.WorkRecord, {})), TABS_JXH_ALARM, /*#__PURE__*/_jsx(JXH.AlarmInfo, {})), TABS_JXH_BASE_HW_2, /*#__PURE__*/_jsx(JXH.Hw2BaseInfo, {})), TABS_JXH_STATIC_HW_2, /*#__PURE__*/_jsx(JXH.Hw2StaticInfo, {})), TABS_JXH_WORK_HW_2, /*#__PURE__*/_jsx(JXH.Hw2WorkRecord, {})), TABS_JXH_ALARM_HW_2, /*#__PURE__*/_jsx(JXH.Hw2AlarmInfo, {})), TABS_LJSY_BASE, /*#__PURE__*/_jsx(Ljsy.BaseInfo, {})), TABS_LJSY_STATIC, /*#__PURE__*/_jsx(Ljsy.StaticInfo, {})), TABS_LJSY_WORK, /*#__PURE__*/_jsx(Ljsy.WorkRecord, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_LJSY_ALARM, /*#__PURE__*/_jsx(Ljsy.AlarmInfo, {})), TABS_CC_BASE, /*#__PURE__*/_jsx(Cc.BaseInfo, {})), TABS_CC_ORDER, /*#__PURE__*/_jsx(Cc.OrderInfo, {})), TABS_CC_STATIC, /*#__PURE__*/_jsx(Cc.StaticInfo, {})), TABS_CC_WORK, /*#__PURE__*/_jsx(Cc.WorkRecord, {})), TABS_CC_ALARM, /*#__PURE__*/_jsx(Cc.AlarmInfo, {})), TABS_LJZY_BASE, /*#__PURE__*/_jsx(Ljzy.BaseInfo, {})), TABS_LJZY_STATIC, /*#__PURE__*/_jsx(Ljzy.StaticInfo, {})), TABS_LJZY_WORK, /*#__PURE__*/_jsx(Ljzy.WorkRecord, {})), TABS_JZLJ_CAR_BASE, /*#__PURE__*/_jsx(Jzlj.BaseInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JZLJ_CAR_DISPOSE, /*#__PURE__*/_jsx(Jzlj.Dispose, {})), TABS_JZLJ_CAR_COLLECTION, /*#__PURE__*/_jsx(Jzlj.Collection, {})), TABS_JZLJ_CAR_ALARM, /*#__PURE__*/_jsx(Jzlj.Alarm, {})), TABS_JZLJ_CAR_RUNNING_CALENDAR, /*#__PURE__*/_jsx(Jzlj.RunCalendar, {})));
   var _useGetConfig = useGetConfig(code, tabs),
     tabsData = _useGetConfig.tabsData;
+  var _useGetChannels = useGetChannels(info === null || info === void 0 ? void 0 : info.carCode, !!(info !== null && info !== void 0 && info.carCode) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
+      return ele.key === 'video';
+    })) > -1),
+    channels = _useGetChannels.channels;
   var tabsList = useMemo(function () {
     var tabsList = tabsData;
     if (tabsList.findIndex(function (ele) {
@@ -291,6 +313,15 @@ var VtxCarModal = function VtxCarModal(props) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     iframeModalInfo = _useSetState2[0],
     setIframeModalInfo = _useSetState2[1];
+  var contents = (_contents = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_BASE, /*#__PURE__*/_jsx(Common.BaseInfo, {})), TABS_STATIC, /*#__PURE__*/_jsx(Common.StaticInfo, {})), TABS_ALARM, /*#__PURE__*/_jsx(Common.AlarmInfo, {})), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
+    channels: channels
+  })), TABS_OIL, /*#__PURE__*/_jsx(Common.OilConsumption, {})), TABS_WATER, /*#__PURE__*/_jsx(Common.WaterConsumption, {})), TABS_WATER_USE, /*#__PURE__*/_jsx(Common.WaterUse, {})), TABS_ELE_USE, /*#__PURE__*/_jsx(Common.EleUse, {})), TABS_OIL_USE, /*#__PURE__*/_jsx(Common.OilUse, {})), TABS_OPERATION, /*#__PURE__*/_jsx(Common.OperationAnalysis, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_MAINTENANCE, /*#__PURE__*/_jsx(Common.Maintenance, {})), TABS_DETAIL, /*#__PURE__*/_jsx(Common.DetailInfo, {})), TABS_DEVICE, /*#__PURE__*/_jsx(Common.DeviceInfo, {})), TABS_JXH_BASE, /*#__PURE__*/_jsx(JXH.BaseInfo, {})), TABS_JXH_STATIC, /*#__PURE__*/_jsx(JXH.StaticInfo, {})), TABS_JXH_WORK, /*#__PURE__*/_jsx(JXH.WorkRecord, {})), TABS_JXH_ALARM, /*#__PURE__*/_jsx(JXH.AlarmInfo, {})), TABS_JXH_BASE_HW_2, /*#__PURE__*/_jsx(JXH.Hw2BaseInfo, {})), TABS_JXH_STATIC_HW_2, /*#__PURE__*/_jsx(JXH.Hw2StaticInfo, {})), TABS_JXH_WORK_HW_2, /*#__PURE__*/_jsx(JXH.Hw2WorkRecord, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JXH_ALARM_HW_2, /*#__PURE__*/_jsx(JXH.Hw2AlarmInfo, {})), TABS_LJSY_BASE, /*#__PURE__*/_jsx(Ljsy.BaseInfo, {})), TABS_LJSY_STATIC, /*#__PURE__*/_jsx(Ljsy.StaticInfo, {})), TABS_LJSY_WORK, /*#__PURE__*/_jsx(Ljsy.WorkRecord, {})), TABS_LJSY_ALARM, /*#__PURE__*/_jsx(Ljsy.AlarmInfo, {})), TABS_CC_BASE, /*#__PURE__*/_jsx(Cc.BaseInfo, {})), TABS_CC_ORDER, /*#__PURE__*/_jsx(Cc.OrderInfo, {})), TABS_CC_STATIC, /*#__PURE__*/_jsx(Cc.StaticInfo, {})), TABS_CC_WORK, /*#__PURE__*/_jsx(Cc.WorkRecord, {})), TABS_CC_ALARM, /*#__PURE__*/_jsx(Cc.AlarmInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_LJZY_BASE, /*#__PURE__*/_jsx(Ljzy.BaseInfo, {
+    zdReborn: zdReborn
+  })), TABS_LJZY_STATIC, /*#__PURE__*/_jsx(Ljzy.StaticInfo, {
+    zdReborn: zdReborn
+  })), TABS_LJZY_WORK, /*#__PURE__*/_jsx(Ljzy.WorkRecord, {
+    zdReborn: zdReborn
+  })), TABS_JZLJ_CAR_BASE, /*#__PURE__*/_jsx(Jzlj.BaseInfo, {})), TABS_JZLJ_CAR_DISPOSE, /*#__PURE__*/_jsx(Jzlj.Dispose, {})), TABS_JZLJ_CAR_COLLECTION, /*#__PURE__*/_jsx(Jzlj.Collection, {})), TABS_JZLJ_CAR_ALARM, /*#__PURE__*/_jsx(Jzlj.Alarm, {})), TABS_JZLJ_CAR_RUNNING_CALENDAR, /*#__PURE__*/_jsx(Jzlj.RunCalendar, {})));
   var value = useMemo(function () {
     return {
       id: id,

package/lib/vtx-cc-cp-modal/components/Calendar/index.js

@@ -73,7 +73,7 @@ var CalendarContent = function CalendarContent(_ref) {
           children: [/*#__PURE__*/_jsx("div", {
             children: collectItem !== null && collectItem !== void 0 && collectItem.weighTime ? dayjs(collectItem.weighTime).format('HH:mm:ss') : '--' || '--'
           }), /*#__PURE__*/_jsx(VmTag, {
-            title: '已收集',
+            title: translateLocaleText("t('vtxrestaurantmodal.collected')"),
             type: 'green'
           })]
         }), /*#__PURE__*/_jsxs("div", {
@@ -81,13 +81,13 @@ var CalendarContent = function CalendarContent(_ref) {
           style: {
             height: 14
           },
-          children: [collectItem === null || collectItem === void 0 ? void 0 : collectItem.trashNum, "\u6876 / ", collectItem === null || collectItem === void 0 ? void 0 : collectItem.netWeight, "kg"]
+          children: [collectItem === null || collectItem === void 0 ? void 0 : collectItem.trashNum, translateLocaleText("t('common.unit.bucket')"), " / ", collectItem === null || collectItem === void 0 ? void 0 : collectItem.netWeight, "kg"]
         }), /*#__PURE__*/_jsx("div", {
           className: 'cc_restaurant_calendar-content-item',
           children: collectItem === null || collectItem === void 0 ? void 0 : collectItem.carCode
         })]
       }) : null, isEmpty(collectList) && isAfter && isCollect ? /*#__PURE__*/_jsx(VmTag, {
-        title: '未收集',
+        title: translateLocaleText("t('vtxrestaurantmodal.notCollected')"),
         type: 'yellow',
         style: {
           width: '100%'

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-cp-modal/components/SyInfo/Ljcsl.js

@@ -1,6 +1,6 @@
 import { translateLocaleText } from "./../../../hooks/useTranslation.js";
-/**
- * 计量信息-图表-进场趋势分析
+/**
+ * 计量信息-图表-进场趋势分析
  */
 
 import * as echarts from 'echarts';

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

@@ -3,8 +3,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { useMemo } from 'react';
+import Appraisal from "../_components/vm-appraisal-info";
 import VmCustom from "../_components/vm-custom";
 import VmRepairMaintain from "../_components/vm-repair-maintain";
+import VmVideo, { insertVideoTab } from "../_components/vm-video";
 import useGetChannels from "../_hooks/useGetChannels";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
@@ -20,6 +22,7 @@ var TABS_WARNNING = 'warning';
 var TABS_EXECEPTION = 'exeception';
 var TABS_RM = 'default-rm';
 var TABS_VIDEO = 'video';
+var TABS_APPRAISAL = 'appraisal';
 var VtxCpModal = function VtxCpModal(props) {
   var id = props.id,
     title = props.title,
@@ -59,21 +62,12 @@ var VtxCpModal = function VtxCpModal(props) {
     var tabsList = tabsData;
     if (!(facConfig !== null && facConfig !== void 0 && (_facConfig$data = facConfig.data) !== null && _facConfig$data !== void 0 && _facConfig$data.beenCollect)) {
       tabsList = tabsList.filter(function (ele) {
-        return !['cp-sy', 'cp-warning', 'cp-exeception'].includes(ele.key);
+        return !['sy', 'warning', 'exeception'].includes(ele.key);
       });
     }
-    if (tabsList.findIndex(function (ele) {
-      return ele.key === 'cp-video';
-    }) > -1) {
-      if ((channels === null || channels === void 0 ? void 0 : channels.length) < 1) {
-        tabsList = tabsList.filter(function (ele) {
-          return ele.key !== 'cp-video';
-        });
-      }
-    }
-    return tabsList;
+    return insertVideoTab(tabsList, channels);
   }, [JSON.stringify(tabsData), JSON.stringify(channels), JSON.stringify(facConfig)]);
-  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {
+  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {
     id: id,
     baseInfo: baseInfo,
     info: info,
@@ -84,8 +78,14 @@ var VtxCpModal = function VtxCpModal(props) {
     id: id
   })), TABS_EXECEPTION, /*#__PURE__*/_jsx(ExeceptionInfo, {
     id: id
+  })), TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
+    id: id
+  })), "rm", /*#__PURE__*/_jsx(VmRepairMaintain, {
+    id: id
   })), TABS_RM, /*#__PURE__*/_jsx(VmRepairMaintain, {
     id: id
+  })), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
+    channels: channels
   }));
   // 自定义页签可配置多个，包含custom即可
   if (tabsData !== null && tabsData !== void 0 && tabsData.length) {

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

@@ -5,8 +5,8 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { translateLocaleText } from "./../hooks/useTranslation.js";
-/**
- * 通用弹窗
+/**
+ * 通用弹窗
  */
 import { useMemo } from 'react';
 import { VmCustom, VmRepairMaintain, VmVideo } from "../_components";
@@ -15,7 +15,7 @@ import useGetConfig from "../_hooks/useGetConfig";
 import { CommonService } from "../_service";
 import VtxBaseModal from "../vtx-base-modal";
 import Metering from "../vtx-df-modal/components/Metering";
-import Appraisal from "../vtx-kh-modal/components/Record";
+import Appraisal from "../_components/vm-appraisal-info";
 import { BaseInfo } from "./components";
 import "./style";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
@@ -27,6 +27,7 @@ var TABS_METERING = 'metering';
 var VtxDefaultModal = function VtxDefaultModal(props) {
   var _info$geometryInfo, _info$geometryInfo2, _info$geometryInfo3;
   var id = props.id,
+    facilityId = props.facilityId,
     title = props.title,
     subTitle = props.subTitle,
     theme = props.theme,
@@ -94,17 +95,17 @@ var VtxDefaultModal = function VtxDefaultModal(props) {
     id: id
   })), TABS_RM, /*#__PURE__*/_jsx(VmRepairMaintain, {
     id: id
-  })), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
-    channels: channels
   })), TABS_METERING, /*#__PURE__*/_jsx(Metering, {
     id: id
+  })), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
+    channels: channels
   }));
   // 自定义页签可配置多个，包含custom即可
   if (tabsData !== null && tabsData !== void 0 && tabsData.length) {
     tabsData.forEach(function (ele) {
       if (ele.url) {
         contents[ele.key] = /*#__PURE__*/_jsx(VmCustom, {
-          id: id,
+          id: ele.url.indexOf('type=1') > -1 ? facilityId : id,
           url: ele === null || ele === void 0 ? void 0 : ele.url
         });
       }

package/lib/vtx-df-modal/components/BaseInfo/Jczbqs.js

@@ -5,8 +5,8 @@ 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 { translateLocaleText } from "./../../../hooks/useTranslation.js";
-/**
- * 监测指标趋势分析
+/**
+ * 监测指标趋势分析
  */
 import { useSetState } from 'ahooks';
 import dayjs from 'dayjs';

package/lib/vtx-df-modal/components/BaseInfo/Qyjcl.js

@@ -9,27 +9,33 @@ import { BaseService } from "../../api";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 function Qyjcl(props) {
-  var _areaSumData$areaDeta, _areaSumData$areaDeta2;
+  var _areaSumData$areaDeta, _ref, _areaSumData$areaDeta2;
   var code = props.code,
     startDate = props.startDate,
     endDate = props.endDate;
   var _BaseService$useQyjcl = BaseService.useQyjcl(code, startDate, endDate),
     areaSumData = _BaseService$useQyjcl.areaSumData;
   var total = sumBy((areaSumData === null || areaSumData === void 0 ? void 0 : areaSumData.areaDetailList) || [], 'todayInWeight') || 0;
+  // 数据量达到万吨及以上时，转换为万吨展示，保留2位小数
+  var isWanTons = total >= 10000;
+  var rate = isWanTons ? 10000 : 1;
+  var unitText = isWanTons ? translateLocaleText("t('vtxtfdmodal.wanTons')") : translateLocaleText("t('vtxdefaultmodal.tonUnit')");
+  var titleText = isWanTons ? translateLocaleText("t('vtxtfdmodal.wanTons')") : translateLocaleText("t('vtxtfdmodal.tons')");
   return /*#__PURE__*/_jsx("div", {
     className: "df-qyjcl",
     children: areaSumData !== null && areaSumData !== void 0 && (_areaSumData$areaDeta = areaSumData.areaDetailList) !== null && _areaSumData$areaDeta !== void 0 && _areaSumData$areaDeta.length ? /*#__PURE__*/_jsx(VmPieCharts, {
       height: 216,
-      total: total === null || total === void 0 ? void 0 : total.toFixed(2),
-      title: translateLocaleText("t('vtxtfdmodal.tons')"),
-      unit: translateLocaleText("t('vtxdefaultmodal.tonUnit')"),
+      total: (_ref = total / rate) === null || _ref === void 0 ? void 0 : _ref.toFixed(2),
+      title: titleText,
+      unit: unitText,
       name: translateLocaleText("t('vtxdfmodal.areaInboundAmount')"),
       innerRadius: ['50%', '65%'],
       outerRadius: ['65%', '70%'],
       dataList: (areaSumData === null || areaSumData === void 0 || (_areaSumData$areaDeta2 = areaSumData.areaDetailList) === null || _areaSumData$areaDeta2 === void 0 ? void 0 : _areaSumData$areaDeta2.map(function (ele) {
+        var _ref2;
         return {
           name: ele.areaName,
-          value: ele.todayInWeight,
+          value: Number((_ref2 = ele.todayInWeight / rate) === null || _ref2 === void 0 ? void 0 : _ref2.toFixed(2)),
           rate: ele.todayInWeightPercent
         };
       })) || [],

package/lib/vtx-df-modal/components/BaseInfoZdReborn/Jczbqs.js

@@ -5,8 +5,8 @@ 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 { translateLocaleText } from "./../../../hooks/useTranslation.js";
-/**
- * 监测指标趋势分析
+/**
+ * 监测指标趋势分析
  */
 import { useSetState } from 'ahooks';
 import dayjs from 'dayjs';

package/lib/vtx-df-modal/components/Calendar/index.js

@@ -23,7 +23,8 @@ import "./index.less";
 import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var Charts = function Charts(_ref) {
-  var code = _ref.code;
+  var code = _ref.code,
+    hasWorkCondition = _ref.hasWorkCondition;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _useSetState = useSetState({
@@ -112,20 +113,26 @@ var Charts = function Charts(_ref) {
       children: [/*#__PURE__*/_jsx("div", {
         className: "df-calendar-head",
         children: [{
+          visible: true,
           name: translateLocaleText("t('vtxdfmodal.tons')"),
           img: jcl,
           type: 'blue'
         }, {
+          visible: true,
           name: translateLocaleText("t('vtxjzljdftpdmodal.times')"),
           img: car,
           type: 'green'
         }, {
+          visible: hasWorkCondition,
           name: translateLocaleText("t('vtxdfmodal.workConditionNormal')"),
           imgType: 'normal'
         }, {
+          visible: hasWorkCondition,
           name: translateLocaleText("t('vtxdfmodal.workConditionAbnormal')"),
           imgType: 'alarm'
-        }].map(function (item, index) {
+        }].filter(function (ele) {
+          return ele.visible;
+        }).map(function (item, index) {
           return /*#__PURE__*/_jsx(VmCalendarInner, _objectSpread(_objectSpread({}, item), {}, {
             value: item.name
           }), index);

package/lib/vtx-df-modal/components/Calendar/zd-reborn.js

@@ -25,7 +25,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 var Charts = function Charts(_ref) {
   var code = _ref.code,
     deviceId = _ref.deviceId,
-    handleAbility = _ref.handleAbility;
+    handleAbility = _ref.handleAbility,
+    hasWorkCondition = _ref.hasWorkCondition;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _useSetState = useSetState({
@@ -112,20 +113,26 @@ var Charts = function Charts(_ref) {
       children: [/*#__PURE__*/_jsx("div", {
         className: "df-calendar-head",
         children: [{
+          visible: true,
           name: translateLocaleText("t('vtxdfmodal.tons')"),
           img: jcl,
           type: 'blue'
         }, {
+          visible: true,
           name: translateLocaleText("t('vtxjzljdftpdmodal.times')"),
           img: car,
           type: 'green'
         }, {
+          visible: hasWorkCondition,
           name: translateLocaleText("t('vtxdfmodal.workConditionNormal')"),
           imgType: 'normal'
         }, {
+          visible: hasWorkCondition,
           name: translateLocaleText("t('vtxdfmodal.workConditionAbnormal')"),
           imgType: 'alarm'
-        }].map(function (item, index) {
+        }].filter(function (ele) {
+          return ele.visible;
+        }).map(function (item, index) {
           return /*#__PURE__*/_jsx(VmCalendarInner, _objectSpread(_objectSpread({}, item), {}, {
             value: item.name
           }), index);

package/lib/vtx-df-modal/components/WorkCondition/Table.js

@@ -11,8 +11,8 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { translateLocaleText } from "./../../../hooks/useTranslation.js";
-/**
- * 计量-工况信息
+/**
+ * 计量-工况信息
  */
 import dayjs from 'dayjs';
 import { VmTable } from "../../../_components";

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

@@ -4,18 +4,18 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { useMemo } from 'react';
 import { BaseInfo as DefaultBaseInfo } from "../vtx-default-modal/components";
-import { BaseInfo, BaseInfoZdReborn, Calendar, CalendarZdReborn, Metering, MeteringZdReborn, WorkCondition } from "./components";
 import { translateLocaleText } from "./../hooks/useTranslation.js";
+import { BaseInfo, BaseInfoZdReborn, Calendar, CalendarZdReborn, Metering, MeteringZdReborn, WorkCondition } from "./components";
 // import Appraisal from '../vm-appraisal-info';
+import VmCustom from "../_components/vm-custom";
 import VmRepairMaintain from "../_components/vm-repair-maintain";
-import VmVideo from "../_components/vm-video";
+import VmVideo, { insertVideoTab } from "../_components/vm-video";
 import useGetChannels from "../_hooks/useGetChannels";
-import { CommonService } from "../_service";
-import { BaseService } from "./api";
-// import VideoService from '../vm-video/api';
-import VmCustom from "../_components/vm-custom";
 import useGetConfig from "../_hooks/useGetConfig";
+import { useZdService } from "../_hooks/useUmsService";
+import { CommonService } from "../_service";
 import VtxBaseModal from "../vtx-base-modal";
+import { BaseService } from "./api";
 import "./style";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 var TABS_BASE = 'base';
@@ -37,9 +37,9 @@ var VtxDfModal = function VtxDfModal(props) {
     customMapInfo = props.customMapInfo,
     tabChose = props.tabChose,
     _props$showCollect = props.showCollect,
-    showCollect = _props$showCollect === void 0 ? true : _props$showCollect,
-    _props$zdReborn = props.zdReborn,
-    zdReborn = _props$zdReborn === void 0 ? false : _props$zdReborn;
+    showCollect = _props$showCollect === void 0 ? true : _props$showCollect;
+  var serviceConfig = useZdService();
+  var zdReborn = (serviceConfig === null || serviceConfig === void 0 ? void 0 : serviceConfig.zdService) === 'reborn';
   var _CommonService$useBas = CommonService.useBaseInfo(id, (customMapInfo === null || customMapInfo === void 0 ? void 0 : customMapInfo.coordinate) || 'wgs84'),
     info = _CommonService$useBas.info,
     photos = _CommonService$useBas.photos;
@@ -59,7 +59,9 @@ var VtxDfModal = function VtxDfModal(props) {
     detail = _CommonService.detail;
   var _BaseService$useRealt = BaseService.useRealtimeMonitor(info === null || info === void 0 ? void 0 : info.code),
     realtimeMonitor = _BaseService$useRealt.realtimeMonitor;
-  var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode)),
+  var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
+      return ele.key === 'video';
+    })) > -1),
     channels = _useGetChannels.channels;
 
   // realtimeRes为空则无工况，beenWeigh为false则无计量
@@ -67,23 +69,14 @@ var VtxDfModal = function VtxDfModal(props) {
     var tabsList = tabsData;
     if (!(detail !== null && detail !== void 0 && detail.beenWeigh)) {
       tabsList = tabsList.filter(function (ele) {
-        return ele.key !== 'df-metering';
+        return ele.key !== 'metering';
       });
     }
-    if (tabsList.findIndex(function (ele) {
-      return ele.key === 'df-video';
-    }) > -1) {
-      if ((channels === null || channels === void 0 ? void 0 : channels.length) < 1) {
-        tabsList = tabsList.filter(function (ele) {
-          return ele.key !== 'df-video';
-        });
-      }
-    }
-    return tabsList;
+    return insertVideoTab(tabsList, channels);
   }, [JSON.stringify(tabsData), JSON.stringify(channels), JSON.stringify(detail)]);
   var ZLBase = zdReborn ? BaseInfoZdReborn : BaseInfo;
-  console.log(zdReborn);
-  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, !(detail !== null && detail !== void 0 && detail.beenWeigh) && !(realtimeMonitor !== null && realtimeMonitor !== void 0 && realtimeMonitor.length) ? /*#__PURE__*/_jsx(DefaultBaseInfo, {
+  var hasWorkCondition = (realtimeMonitor === null || realtimeMonitor === void 0 ? void 0 : realtimeMonitor.length) > 0;
+  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, !(detail !== null && detail !== void 0 && detail.beenWeigh) && !hasWorkCondition ? /*#__PURE__*/_jsx(DefaultBaseInfo, {
     id: id,
     info: info,
     photos: photos,
@@ -107,9 +100,11 @@ var VtxDfModal = function VtxDfModal(props) {
   })), TABS_Calendar, zdReborn ? /*#__PURE__*/_jsx(CalendarZdReborn, {
     code: info === null || info === void 0 ? void 0 : info.code,
     deviceId: detail === null || detail === void 0 ? void 0 : detail.deviceId,
-    handleAbility: detail === null || detail === void 0 ? void 0 : detail.handleAbility
+    handleAbility: detail === null || detail === void 0 ? void 0 : detail.handleAbility,
+    hasWorkCondition: hasWorkCondition
   }) : /*#__PURE__*/_jsx(Calendar, {
-    code: info === null || info === void 0 ? void 0 : info.code
+    code: info === null || info === void 0 ? void 0 : info.code,
+    hasWorkCondition: hasWorkCondition
   })), TABS_RM, /*#__PURE__*/_jsx(VmRepairMaintain, {
     id: id
   })), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {