@vtx/modals2 5.0.31 → 5.0.32

package/lib/_components/index.js

@@ -19,4 +19,5 @@ export { default as VmTabs } from "./vm-tabs";
 export { default as VmTag } from "./vm-tag";
 export { default as VmTitle } from "./vm-title";
 export { default as VmVideo } from "./vm-video";
-export { default as VmWrapper } from "./vm-wrapper";
+export { default as VmWrapper } from "./vm-wrapper";
+export { default as VmPopover } from "./vm-popover";

package/lib/_components/vm-info-collection/style/index.js

@@ -1 +1,2 @@
+import '@vtx/components/lib/vtx-image/style/index';
 import "./index.less";

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

@@ -39,7 +39,9 @@ var PieCharts = function PieCharts(_ref) {
     _ref$colors2 = _ref.colors2,
     colors2 = _ref$colors2 === void 0 ? null : _ref$colors2,
     _ref$subTitle = _ref.subTitle,
-    subTitle = _ref$subTitle === void 0 ? null : _ref$subTitle;
+    subTitle = _ref$subTitle === void 0 ? null : _ref$subTitle,
+    _ref$tooltipFormatter = _ref.tooltipFormatter,
+    tooltipFormatter = _ref$tooltipFormatter === void 0 ? null : _ref$tooltipFormatter;
   var _useSettings = useSettings(),
     chartFontColor = _useSettings.chartFontColor,
     isDark = _useSettings.isDark;
@@ -51,7 +53,7 @@ var PieCharts = function PieCharts(_ref) {
   var option = {
     tooltip: {
       trigger: 'item',
-      formatter: "{a} <br/>{b}: {c}".concat(unit, " ({d}%)"),
+      formatter: tooltipFormatter || "{a} <br/>{b}: {c}".concat(unit, " ({d}%)"),
       position: function position(point, _params, _dom, _rect, size) {
         // 固定在顶部
         var leftSize = point[0] - size.contentSize[0];

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

@@ -0,0 +1,19 @@
+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); }
+import { Popover } from 'antd';
+import useSettings from "../../_hooks/useSettings";
+import "./index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+var VmPopover = function VmPopover(props) {
+  var _useSettings = useSettings(),
+    isDark = _useSettings.isDark;
+  return /*#__PURE__*/_jsx(Popover, _objectSpread(_objectSpread({}, props), {}, {
+    overlayClassName: "vm-popover ".concat(isDark ? 'dark' : ''),
+    children: props.children
+  }));
+};
+export default VmPopover;

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

@@ -0,0 +1,7 @@
+.vm-popover {
+  &.dark {
+    .ant-popover-inner-content, .ant-popover-arrow-content, .ant-popover-arrow-content::before {
+      background: rgb(51 95 135);
+    }
+  }
+}

package/lib/style/index.less

@@ -89,7 +89,7 @@
   --modal-head-line-bg: transparent;
   --modal-head-split-line-color: rgba(89, 89, 89, 0.2);
   --modal-head-line-shadow: transparent;
-  --modal-content-bg: #ecf0f5;
+  --modal-content-bg: rgba(236, 240, 245, 0.8);
   --modal-content-box-shadow: #ecf0f5;
   --modal-close-color: #595959;
   --modal-content-border-color: linear-gradient(

package/lib/vtx-base-modal/style/index.less

@@ -44,7 +44,6 @@
     width: 100%;
     background: var(--modal-content-bg);
     border-radius: 8px;
-    opacity: 0.8;
   }
   .vm-base-modal-content-wrap {
     flex: 1;

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

@@ -1145,6 +1145,19 @@ export var JzljService = {
       data = _useRequest46$data === void 0 ? {} : _useRequest46$data;
     return (data === null || data === void 0 ? void 0 : data.data) || [];
   },
+  // 字段配置
+  fieldConfig: function fieldConfig() {
+    var _useRequest47 = useRequest(function () {
+        return http.get("/cloud/jzlj/web/field/config/list?ledgerType=CZHZBA", {
+          body: {}
+        });
+      }, {
+        refreshDeps: []
+      }),
+      _useRequest47$data = _useRequest47.data,
+      data = _useRequest47$data === void 0 ? {} : _useRequest47$data;
+    return (data === null || data === void 0 ? void 0 : data.data) || [];
+  },
   // 联单-分页
   ldPage: function ldPage(_ref27) {
     var carId = _ref27.carId,
@@ -1226,7 +1239,7 @@ export var JzljService = {
     var carId = _ref32.carId,
       startDate = _ref32.startDate,
       endDate = _ref32.endDate;
-    var _useRequest47 = useRequest(function () {
+    var _useRequest48 = useRequest(function () {
         return http.get("/cloud/jzlj/web/dz/kanban/carAlarmTypeCountSummaryInfo", {
           body: {
             carId: carId,
@@ -1238,7 +1251,7 @@ export var JzljService = {
       }, {
         refreshDeps: [carId, startDate, endDate]
       }),
-      alarmSummaryRes = _useRequest47.data;
+      alarmSummaryRes = _useRequest48.data;
     return {
       alarmSummaryData: (alarmSummaryRes === null || alarmSummaryRes === void 0 ? void 0 : alarmSummaryRes.data) || {}
     };
@@ -1248,7 +1261,7 @@ export var JzljService = {
     var id = _ref33.id,
       startDate = _ref33.startDate,
       endDate = _ref33.endDate;
-    var _useRequest48 = useRequest(function () {
+    var _useRequest49 = useRequest(function () {
         return http.get("/cloud/jzlj/web/api/gis/real/time/carOrderAlarmAnalyse", {
           body: {
             id: id,
@@ -1259,9 +1272,39 @@ export var JzljService = {
       }, {
         refreshDeps: [id, startDate, endDate]
       }),
-      alarmTrendRes = _useRequest48.data;
+      alarmTrendRes = _useRequest49.data;
     return {
       alarmTrendData: (alarmTrendRes === null || alarmTrendRes === void 0 ? void 0 : alarmTrendRes.data) || []
     };
+  },
+  // 单位
+  useUnit: function useUnit() {
+    var _data$data3, _unitStr;
+    var groupCode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'XTPZ';
+    var _useRequest50 = useRequest(function () {
+        return http.get("/cloud/jzlj/web/api/tenant/system/config/getConfig", {
+          body: {}
+        });
+      }, {
+        refreshDeps: [groupCode]
+      }),
+      data = _useRequest50.data;
+    var obj = {};
+    var originalData = data === null || data === void 0 || (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3[groupCode];
+    for (var group in originalData) {
+      if (originalData.hasOwnProperty(group)) {
+        for (var item in originalData[group]) {
+          var _originalData$group;
+          obj[item] = (_originalData$group = originalData[group]) === null || _originalData$group === void 0 ? void 0 : _originalData$group[item];
+        }
+      }
+    }
+    var jointOrderWeightUnitTypeName = obj === null || obj === void 0 ? void 0 : obj.jointOrderWeightUnitTypeName;
+    var nameSplitArr = jointOrderWeightUnitTypeName === null || jointOrderWeightUnitTypeName === void 0 ? void 0 : jointOrderWeightUnitTypeName.split('（');
+    var unitStr = (nameSplitArr === null || nameSplitArr === void 0 ? void 0 : nameSplitArr[1]) || '吨）';
+    unitStr = (_unitStr = unitStr) === null || _unitStr === void 0 ? void 0 : _unitStr.replace('）', '');
+    return {
+      unitStr: unitStr
+    };
   }
 };

package/lib/vtx-car-modal/content/Jzlj/Alarm/Bottom.js

@@ -93,11 +93,11 @@ export default function Bottom(_ref) {
     width: 150,
     ellipsis: true
   }], ['报警开始时间', 'alarmStartTime', {
-    width: 180
+    width: 160
   }], ['报警结束时间', 'alarmEndTime', {
-    width: 180
+    width: 160
   }], ['处置状态', 'processStatusChs', {
-    width: 150,
+    width: 100,
     render: function render(text, record) {
       return text ? /*#__PURE__*/_jsx("span", {
         style: {
@@ -107,7 +107,7 @@ export default function Bottom(_ref) {
       }) : '-';
     }
   }], ['处置结果', 'processResultChs', {
-    width: 150,
+    width: 120,
     render: function render(text, record) {
       return text ? /*#__PURE__*/_jsx("span", {
         style: {
@@ -170,7 +170,7 @@ export default function Bottom(_ref) {
       }) : '-';
     }
   }], ['处置状态', 'processStatusChs', {
-    width: 150,
+    width: 100,
     render: function render(text, record) {
       return text ? /*#__PURE__*/_jsx("span", {
         style: {
@@ -180,7 +180,7 @@ export default function Bottom(_ref) {
       }) : '-';
     }
   }], ['处置结果', 'processResultChs', {
-    width: 150,
+    width: 120,
     render: function render(text, record) {
       return text ? /*#__PURE__*/_jsx("span", {
         style: {

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

@@ -20,14 +20,13 @@ import pjryl_dark from "../../../imgs/jzlj/pjryl_dark.png";
 import pjryl_light from "../../../imgs/jzlj/pjryl_light.png";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var BaseInfo = function BaseInfo() {
-  var _dailyCarRunData$driv;
   var _useContext = useContext(CarContext),
     id = _useContext.id,
     startDate = _useContext.startDate,
     info = _useContext.info;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
-  var _useState = useState(dayjs(startDate)),
+  var _useState = useState(startDate ? dayjs(startDate) : dayjs()),
     _useState2 = _slicedToArray(_useState, 2),
     date = _useState2[0],
     setDate = _useState2[1];
@@ -43,6 +42,8 @@ var BaseInfo = function BaseInfo() {
       endDate: dayjs(date).format('YYYY-MM-DD')
     }),
     dailyCarRunData = _JzljService$useDaily.dailyCarRunData;
+  var _JzljService$useUnit = JzljService.useUnit(),
+    unitStr = _JzljService$useUnit.unitStr;
   var extraList = [{
     name: '生效中处置证',
     unit: '张',
@@ -57,13 +58,15 @@ var BaseInfo = function BaseInfo() {
     justifyContent: 'center',
     textAlign: 'center'
   };
-  var yxxxList_top = [{
-    name: '核算行驶里程',
-    unit: 'km',
-    value: (dailyCarRunData === null || dailyCarRunData === void 0 ? void 0 : dailyCarRunData.sumMileage) || 0,
-    fontType: 'blue',
-    style: itemStyle
-  }, {
+  var yxxxList_top = [
+  // {
+  //   name: '核算行驶里程',
+  //   unit: 'km',
+  //   value: dailyCarRunData?.sumMileage || 0,
+  //   fontType: 'blue',
+  //   style: itemStyle,
+  // },
+  {
     name: '完成联单数',
     unit: '单',
     value: (zlOtherInfoData === null || zlOtherInfoData === void 0 ? void 0 : zlOtherInfoData.orderCount) || 0,
@@ -78,15 +81,19 @@ var BaseInfo = function BaseInfo() {
       fontSize: 14
     }
   }];
-  var yxxxList_bottom = [{
-    name: '作业时长',
-    unit: '',
-    value: secondToFormatTime(((_dailyCarRunData$driv = dailyCarRunData === null || dailyCarRunData === void 0 ? void 0 : dailyCarRunData.driveDuration) !== null && _dailyCarRunData$driv !== void 0 ? _dailyCarRunData$driv : 0) / 1000 || 0),
-    fontType: 'blue',
-    style: itemStyle
-  }, {
+  var yxxxList_bottom = [
+  // {
+  //   name: '作业时长',
+  //   unit: '',
+  //   value: secondToFormatTime(
+  //     (dailyCarRunData?.driveDuration ?? 0) / 1000 || 0,
+  //   ),
+  //   fontType: 'blue',
+  //   style: itemStyle,
+  // },
+  {
     name: '已运输量',
-    unit: '吨',
+    unit: unitStr,
     value: (zlOtherInfoData === null || zlOtherInfoData === void 0 ? void 0 : zlOtherInfoData.yysWeight) || 0,
     style: itemStyle
   }, {
@@ -116,7 +123,7 @@ var BaseInfo = function BaseInfo() {
   var ccDataAvg = ccData !== null && ccData !== void 0 && ccData.length ? mean(ccData).toFixed(2) : '0';
   var yxfxList = [{
     name: '平均日运量',
-    unit: '吨',
+    unit: unitStr,
     value: ylDataAvg,
     img: isDark ? pjryl_dark : pjryl_light,
     fontType: 'blue',
@@ -209,8 +216,8 @@ var BaseInfo = function BaseInfo() {
                   name: '(次)'
                 }, {
                   key: "\u2000",
-                  unit: '吨',
-                  name: '(吨)'
+                  unit: unitStr,
+                  name: "(".concat(unitStr, ")")
                 }],
                 lineList: [{
                   name: '车次',

package/lib/vtx-car-modal/content/Jzlj/Collection/index.js

@@ -11,7 +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 { useAntdTable, useSetState } from 'ahooks';
-import { Button } from 'antd';
+import { Button, Tooltip } from 'antd';
 import dayjs from 'dayjs';
 import { useContext, useEffect } from 'react';
 import { VmFactorList, VmFilter, VmTable, VmTag, VmWrapper } from "../../../../_components";
@@ -19,6 +19,7 @@ import useSettings from "../../../../_hooks/useSettings";
 import { JzljService } from "../../../api";
 import { CarContext } from "../../../index";
 import "./index.less";
+import { QuestionCircleOutlined } from '@ant-design/icons';
 import cc_dark from "../../../imgs/jzlj/pjrcc_dark.png";
 import cc_light from "../../../imgs/jzlj/pjrcc_light.png";
 import yl_dark from "../../../imgs/jzlj/pjryl_dark.png";
@@ -106,7 +107,7 @@ export default function Collection() {
           setIframeModalInfo({
             visible: true,
             title: '联单信息',
-            src: "/jzlj/#/constructionJointOrder?id=".concat(record.id)
+            src: "/jzlj/#/constructionJointOrder?id=".concat(record.id, "&stepOneOperateTimeLeft=").concat(record.stepOneOperateTime ? dayjs(record.stepOneOperateTime).format('YYYY-MM-DD') : '', "&stepOneOperateTimeRight=").concat(record.stepOneOperateTime ? dayjs(record.stepOneOperateTime).format('YYYY-MM-DD') : '', "&stepThreeOperateTimeLeft=").concat(record.stepThreeOperateTime ? dayjs(record.stepThreeOperateTime).format('YYYY-MM-DD') : '', "&stepThreeOperateTimeRight=").concat(record.stepThreeOperateTime ? dayjs(record.stepThreeOperateTime).format('YYYY-MM-DD') : '')
           });
         },
         children: "\u67E5\u770B"
@@ -128,8 +129,8 @@ export default function Collection() {
       code: code,
       startingPointName: startingPointName,
       endingPointName: endingPointName,
-      stepThreeOperateTimeLeft: stepThreeOperateTimeLeft.format('YYYY-MM-DD'),
-      stepThreeOperateTimeRight: stepThreeOperateTimeRight.format('YYYY-MM-DD')
+      stepThreeOperateTimeLeft: stepThreeOperateTimeLeft.format('YYYY-MM-DD 00:00:00'),
+      stepThreeOperateTimeRight: stepThreeOperateTimeRight.format('YYYY-MM-DD 23:59:59')
     };
     JzljService.ldChart({
       id: id,
@@ -168,7 +169,9 @@ export default function Collection() {
       disposalCertificateInfoCode: undefined,
       code: undefined,
       startingPointName: undefined,
-      endingPointName: undefined
+      endingPointName: undefined,
+      stepThreeOperateTimeLeft: dayjs().subtract(6, 'day'),
+      stepThreeOperateTimeRight: dayjs()
     });
     reset();
   };
@@ -273,7 +276,19 @@ export default function Collection() {
   return /*#__PURE__*/_jsx("div", {
     className: "jzlj-car-collection",
     children: /*#__PURE__*/_jsx(VmWrapper, {
-      title: "\u8054\u5355\u8FD0\u884C\u60C5\u51B5",
+      title: /*#__PURE__*/_jsxs("span", {
+        children: [/*#__PURE__*/_jsx("span", {
+          children: "\u8054\u5355\u8FD0\u884C\u60C5\u51B5"
+        }), /*#__PURE__*/_jsx(Tooltip, {
+          title: "\u6309\u7167\u5DF2\u5B8C\u6210\u8054\u5355\u7EDF\u8BA1",
+          children: /*#__PURE__*/_jsx(QuestionCircleOutlined, {
+            style: {
+              cursor: 'pointer',
+              marginLeft: 4
+            }
+          })
+        })]
+      }),
       needChange: true,
       activeKey: activeKey,
       onChange: function onChange(key) {

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

@@ -19,6 +19,7 @@ export default function Pies(_ref) {
       value: item.czzCount
     });
   });
+  var startDataSum = startDataList === null || startDataList === void 0 ? void 0 : startDataList.length;
   var endPieData = pieData.find(function (item) {
     return item.startEndType === 'END';
   });
@@ -28,6 +29,8 @@ export default function Pies(_ref) {
       value: item.czzCount
     });
   });
+  var endDataSum = endDataList === null || endDataList === void 0 ? void 0 : endDataList.length;
+  var tooltipFormatter = "{a}\uFF1A<br/>{b}<br/>\u5173\u8054\u5904\u7F6E\u8BC1\uFF1A{c}\u5F20 ({d}%)";
   return /*#__PURE__*/_jsxs("div", {
     className: "jzlj-car-dispose-pies-main",
     children: [/*#__PURE__*/_jsx("div", {
@@ -36,7 +39,7 @@ export default function Pies(_ref) {
         dataList: startDataList,
         name: "\u8FD0\u8F93\u8D77\u70B9",
         title: "\u8FD0\u8F93\u8D77\u70B9(\u4E2A)",
-        total: startPieData === null || startPieData === void 0 ? void 0 : startPieData.totalCount,
+        total: startDataSum !== null && startDataSum !== void 0 ? startDataSum : 0,
         unit: "\u4E2A",
         innerRadius: ['30%', '40%'],
         outerRadius: ['40%', '45%'],
@@ -47,9 +50,10 @@ 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 !== null && value !== void 0 ? value : 0, "\u5904\u7F6E\u8BC1)");
+            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value !== null && value !== void 0 ? value : 0, "\u5F20\u5904\u7F6E\u8BC1)");
           }
-        }
+        },
+        tooltipFormatter: tooltipFormatter
       })
     }), /*#__PURE__*/_jsx("div", {
       className: "jzlj-car-dispose-pies-main-item",
@@ -57,7 +61,7 @@ export default function Pies(_ref) {
         dataList: endDataList,
         name: "\u8FD0\u8F93\u7EC8\u70B9",
         title: "\u8FD0\u8F93\u7EC8\u70B9(\u4E2A)",
-        total: endPieData === null || endPieData === void 0 ? void 0 : endPieData.totalCount,
+        total: endDataSum !== null && endDataSum !== void 0 ? endDataSum : 0,
         unit: "\u4E2A",
         innerRadius: ['30%', '40%'],
         outerRadius: ['40%', '45%'],
@@ -68,9 +72,10 @@ 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 !== null && value !== void 0 ? value : 0, "\u5904\u7F6E\u8BC1)");
+            return "{name|".concat(name.slice(0, 6)).concat(name.length > 6 ? '...' : '', "}(\u5173\u8054").concat(value !== null && value !== void 0 ? value : 0, "\u5F20\u5904\u7F6E\u8BC1)");
           }
-        }
+        },
+        tooltipFormatter: tooltipFormatter
       })
     })]
   });

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

@@ -29,7 +29,7 @@ export default function Dispose() {
       code: undefined,
       endingPointName: undefined,
       startingPointName: undefined,
-      effectiveStatusCode: undefined,
+      effectiveStatusCode: 'sxz',
       pieData: []
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
@@ -42,7 +42,14 @@ export default function Dispose() {
     effectiveStatusCode = state.effectiveStatusCode,
     pieData = state.pieData;
   var effectiveStatusList = JzljService.fetchJzljEnum('EffectiveStatusEnum');
-  var columns = [['运输单位', 'transportUnitName', {
+  var fieldConfigData = JzljService.fieldConfig();
+  var transportWeightField = fieldConfigData.find(function (item) {
+    return item.dataKey === 'transportWeight';
+  }) || {};
+  var columns = [['处置证编号', 'code', {
+    width: 160,
+    ellipsis: true
+  }], ['运输单位', 'transportUnitName', {
     width: 160,
     ellipsis: true
   }], ['运输起点', 'startingPointName', {
@@ -53,11 +60,11 @@ export default function Dispose() {
     ellipsis: true
   }], ['运输垃圾类型', 'garbageTypeName', {
     width: 100
-  }], ['运输量(吨)', 'transportWeight', {
-    width: 80,
+  }], [(transportWeightField === null || transportWeightField === void 0 ? void 0 : transportWeightField.displayName) || '运输量(吨)', 'transportWeight', {
+    width: 100,
     align: 'right'
   }], ['申报有效期', 'effectiveDate', {
-    width: 150
+    width: 180
   }], ['生效状态', 'effectiveStatusName', {
     width: 100,
     render: function render(text, record) {
@@ -81,7 +88,7 @@ export default function Dispose() {
           setIframeModalInfo({
             visible: true,
             title: '处置证信息',
-            src: "/jzlj/#/disposalApprovalFill?id=".concat(record.id)
+            src: "/jzlj/#/disposalApprovalFill?id=".concat(record.id, "&effectiveStatusCode=").concat(record.effectiveStatusCode)
           });
         },
         children: "\u67E5\u770B"
@@ -159,30 +166,30 @@ export default function Dispose() {
       }
     })
   }, {
-    title: '终点',
+    title: '起点',
     weight: 1,
     dom: /*#__PURE__*/_jsx(VmFilter.VMInput, {
       style: {
         width: 120
       },
-      value: endingPointName,
+      value: startingPointName,
       onValChange: function onValChange(val) {
         setState({
-          endingPointName: val
+          startingPointName: val
         });
       }
     })
   }, {
-    title: '起点',
+    title: '终点',
     weight: 1,
     dom: /*#__PURE__*/_jsx(VmFilter.VMInput, {
       style: {
         width: 120
       },
-      value: startingPointName,
+      value: endingPointName,
       onValChange: function onValChange(val) {
         setState({
-          startingPointName: val
+          endingPointName: val
         });
       }
     })

package/lib/vtx-car-modal/content/Jzlj/RunCalendar/index.js

@@ -51,6 +51,8 @@ export default function RunCalendar() {
     lds_icon = lds_dark;
     yl_icon = yl_dark;
   }
+  var _JzljService$useUnit = JzljService.useUnit(),
+    unitStr = _JzljService$useUnit.unitStr;
   var columns = [{
     title: '日期',
     dataIndex: 'date',
@@ -62,7 +64,7 @@ export default function RunCalendar() {
     key: 'count',
     width: 100
   }, {
-    title: '运量(吨)',
+    title: "\u8FD0\u91CF(".concat(unitStr, ")"),
     dataIndex: 'weight',
     key: 'weight',
     width: 100
@@ -91,7 +93,7 @@ export default function RunCalendar() {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "green",
         img: yl_icon,
-        value: item.weight + ' 吨',
+        value: item.weight + " ".concat(unitStr),
         style: {
           width: '139px',
           justifyContent: 'space-between'
@@ -102,7 +104,7 @@ export default function RunCalendar() {
   return /*#__PURE__*/_jsx("div", {
     className: "vtx-jzlj-car-run-calendar",
     children: /*#__PURE__*/_jsxs(VmWrapper, {
-      title: '作业分析',
+      title: '收运分析',
       needChange: true,
       showCalendar: true,
       onChange: setType,
@@ -120,7 +122,7 @@ export default function RunCalendar() {
             img: lds_icon,
             type: 'blue'
           }, {
-            name: '运量(吨)',
+            name: "\u8FD0\u91CF(".concat(unitStr, ")"),
             img: yl_icon,
             type: 'green'
           }].map(function (item, index) {
@@ -157,10 +159,10 @@ export default function RunCalendar() {
           name: '联单数(次)'
         }, {
           key: '',
-          unit: '吨',
-          name: '运量(吨)'
+          unit: unitStr,
+          name: "\u8FD0\u91CF(".concat(unitStr, ")")
         }],
-        unit: '吨',
+        unit: unitStr,
         lineList: [{
           name: '运量',
           data: yxfxData.map(function (item) {

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

@@ -222,7 +222,7 @@ var VtxCarModal = function VtxCarModal(props) {
         title: '报警信息'
       }, {
         key: TABS_JZLJ_CAR_RUNNING_CALENDAR,
-        title: '运行日历'
+        title: '运输日历'
       }];
     } else {
       tabs = [{

package/lib/vtx-device-modal/components/BaseInfo/KnowledgeBasesDetail.js

@@ -0,0 +1,77 @@
+import { VmWrapper } from "../../../_components";
+import VtxBaseModal from "../../../vtx-base-modal";
+import PreviewAndDownload from "./PreviewAndDownload";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+var Content = function Content(_ref) {
+  var info = _ref.info,
+    theme = _ref.theme;
+  var content = info.content,
+    title = info.title,
+    knowledgeCategoryName = info.knowledgeCategoryName;
+  var attachments = [];
+  if (info.attachments) {
+    attachments = JSON.parse(info.attachments);
+  }
+  return /*#__PURE__*/_jsx(VmWrapper, {
+    showTitle: false,
+    children: /*#__PURE__*/_jsxs("div", {
+      style: {
+        height: 'calc(100vh - 70px)'
+      },
+      children: [/*#__PURE__*/_jsx("h2", {
+        style: {
+          marginBottom: 24,
+          textAlign: 'center',
+          color: 'var(--modal-title-color)'
+        },
+        children: title
+      }), /*#__PURE__*/_jsx("div", {
+        style: {
+          color: 'var(--gray-color)'
+        },
+        children: knowledgeCategoryName
+      }), /*#__PURE__*/_jsx("div", {
+        className: "w-e-text-container",
+        children: /*#__PURE__*/_jsx("div", {
+          dangerouslySetInnerHTML: {
+            __html: content
+          },
+          "data-slate-editor": true
+        })
+      }), attachments.length > 0 ? attachments.map(function (item) {
+        return /*#__PURE__*/_jsx(PreviewAndDownload, {
+          data: item,
+          theme: theme
+        }, item.id);
+      }) : '--']
+    })
+  });
+};
+var KnowledgeBasesDetail = function KnowledgeBasesDetail(_ref2) {
+  var title = _ref2.title,
+    visible = _ref2.visible,
+    onCancel = _ref2.onCancel,
+    theme = _ref2.theme,
+    info = _ref2.info;
+  return visible ? /*#__PURE__*/_jsx(VtxBaseModal, {
+    width: "100vw",
+    height: "100vh",
+    top: 0,
+    left: 0,
+    title: title,
+    visible: visible,
+    theme: theme,
+    onCancel: onCancel,
+    tabs: [{
+      key: 'info'
+    }],
+    contents: {
+      info: /*#__PURE__*/_jsx(Content, {
+        info: info,
+        theme: theme
+      })
+    },
+    modalHeight: "100vh"
+  }) : null;
+};
+export default KnowledgeBasesDetail;