@vtx/modals2 2.15.60 → 2.15.61

package/lib/vtx-cc-cp-modal/components/OrderInfo/index.less

@@ -1,108 +1,108 @@
-.cc-cp-order {
-    margin: 6px;
-    width: 100%;
-    .order-summary {
-        padding: 14px 20px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-
-        &-time {
-            margin: 24px;
-            display: flex;
-            justify-content: start;
-            align-items: center;
-            img {
-                width: 46px;
-                height: 46px;
-                margin-right: 19px;
-            }
-            &-name {
-                font-size: 12px;
-                color: var(--title-color);
-            }
-            &-value {
-                color: var(--title-color);
-                font-size: 12px;
-                span {
-                    font-size: 20px;
-                    line-height: 25px;
-                }
-                &-compare {
-                    display: inline-block;
-                    margin-left: 36px;
-                }
-            }
-        }
-        .triangle-up {
-            width: 12px;
-            height: 8px;
-            position: relative;
-            overflow: hidden;
-            display: inline-block;
-            margin-left: 4px;
-            &::before {
-                content: '';
-                position: absolute;
-                top: 0;
-                left: 0;
-                right: 0;
-                bottom: 0;
-                background: #f65861;
-                transform-origin: left bottom;
-                transform: rotate(45deg);
-            }
-        }
-        .triangle-down {
-            width: 12px;
-            height: 8px;
-            position: relative;
-            overflow: hidden;
-            display: inline-block;
-            margin-left: 4px;
-            margin-bottom: -2px;
-            &::before {
-                content: '';
-                position: absolute;
-                top: 0;
-                left: 0;
-                right: 0;
-                bottom: 0;
-                background: #41ffb4;
-                transform-origin: right top;
-                transform: rotate(45deg);
-            }
-        }
-    }
-
-    .order-trend {
-        height: 358px;
-        padding: 14px 20px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-    }
-
-    .order-record {
-        padding: 14px 20px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-
-        min-height: 180px;
-
-        &-head {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-
-        &-table {
-            margin-top: 14px;
-            height: 200px;
-        }
-
-        .orderLevel {
-            img {
-                margin-top: -2px;
-            }
-        }
-    }
-}
+.cc-cp-order {
+    margin: 6px;
+    width: 100%;
+    .order-summary {
+        padding: 14px 20px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+
+        &-time {
+            margin: 24px;
+            display: flex;
+            justify-content: start;
+            align-items: center;
+            img {
+                width: 46px;
+                height: 46px;
+                margin-right: 19px;
+            }
+            &-name {
+                font-size: 12px;
+                color: var(--title-color);
+            }
+            &-value {
+                color: var(--title-color);
+                font-size: 12px;
+                span {
+                    font-size: 20px;
+                    line-height: 25px;
+                }
+                &-compare {
+                    display: inline-block;
+                    margin-left: 36px;
+                }
+            }
+        }
+        .triangle-up {
+            width: 12px;
+            height: 8px;
+            position: relative;
+            overflow: hidden;
+            display: inline-block;
+            margin-left: 4px;
+            &::before {
+                content: '';
+                position: absolute;
+                top: 0;
+                left: 0;
+                right: 0;
+                bottom: 0;
+                background: #f65861;
+                transform-origin: left bottom;
+                transform: rotate(45deg);
+            }
+        }
+        .triangle-down {
+            width: 12px;
+            height: 8px;
+            position: relative;
+            overflow: hidden;
+            display: inline-block;
+            margin-left: 4px;
+            margin-bottom: -2px;
+            &::before {
+                content: '';
+                position: absolute;
+                top: 0;
+                left: 0;
+                right: 0;
+                bottom: 0;
+                background: #41ffb4;
+                transform-origin: right top;
+                transform: rotate(45deg);
+            }
+        }
+    }
+
+    .order-trend {
+        height: 358px;
+        padding: 14px 20px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+    }
+
+    .order-record {
+        padding: 14px 20px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+
+        min-height: 180px;
+
+        &-head {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+
+        &-table {
+            margin-top: 14px;
+            height: 200px;
+        }
+
+        .orderLevel {
+            img {
+                margin-top: -2px;
+            }
+        }
+    }
+}

package/lib/vtx-cc-cp-modal/components/SyInfo/index.less

@@ -1,46 +1,46 @@
-.cc-cp-syinfo {
-    padding: 6px 10px;
-    &-head {
-        padding: 8px 20px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-
-        display: flex;
-        justify-content: flex-end;
-    }
-    &-base {
-        margin-top: 10px;
-    }
-    &-base-noweight {
-        padding: 12px 20px;
-        margin-top: 10px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-    }
-    &-base-weight {
-        height: 200px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-
-        padding-left: 20px;
-        padding-top: 12px;
-        &-item {
-            display: flex;
-            flex-wrap: wrap;
-        }
-    }
-    &-base-chart {
-        height: 200px;
-        padding-left: 20px;
-        padding-top: 12px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-    }
-    &-table {
-        padding: 20px;
-        margin-top: 10px;
-        height: 400px;
-        background-color: var(--bg-color2);
-        border: 1px solid var(--bg-border-color2);
-    }
-}
+.cc-cp-syinfo {
+    padding: 6px 10px;
+    &-head {
+        padding: 8px 20px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+
+        display: flex;
+        justify-content: flex-end;
+    }
+    &-base {
+        margin-top: 10px;
+    }
+    &-base-noweight {
+        padding: 12px 20px;
+        margin-top: 10px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+    }
+    &-base-weight {
+        height: 200px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+
+        padding-left: 20px;
+        padding-top: 12px;
+        &-item {
+            display: flex;
+            flex-wrap: wrap;
+        }
+    }
+    &-base-chart {
+        height: 200px;
+        padding-left: 20px;
+        padding-top: 12px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+    }
+    &-table {
+        padding: 20px;
+        margin-top: 10px;
+        height: 400px;
+        background-color: var(--bg-color2);
+        border: 1px solid var(--bg-border-color2);
+    }
+}

package/lib/vtx-cc-cp-modal/style/index.less

@@ -1 +1 @@
-@import '../../style/index';
+@import '../../style/index';

package/lib/vtx-cc-unit-modal/components/QdBase/CollectRecord.js

@@ -82,7 +82,8 @@ var CollectRecord = function CollectRecord(_ref) {
     ellipsis: true
   }]);
   return /*#__PURE__*/_react["default"].createElement(_vmTable["default"], Object.assign({}, tableProps, {
-    columns: columns
+    columns: columns,
+    height: 400
   }));
 };
 var _default = exports["default"] = CollectRecord;

package/lib/vtx-cc-unit-modal/components/QdBase/CollectRecord.js.map

@@ -1 +1 @@
-{"version":3,"file":"CollectRecord.js","names":["_react","_interopRequireDefault","require","_api","_vmTable","e","__esModule","_toConsumableArray","r","_arrayWithoutHoles","_iterableToArray","_unsupportedIterableToArray","_nonIterableSpread","TypeError","a","_arrayLikeToArray","t","toString","call","slice","constructor","name","Array","from","test","Symbol","iterator","isArray","length","n","CollectRecord","_ref","id","startTime","endTime","garbageType","tableProps","BasicService","collectList","columns","title","dataIndex","width","ellipsis","render","text","concat","sorter","align","React","createElement","VMTable","Object","assign","_default","exports"],"sources":["vtx-cc-unit-modal/components/QdBase/CollectRecord.js"],"sourcesContent":["import React from 'react';\nimport { BasicService } from '../../api';\nimport VMTable from '../../../vm-table';\nconst CollectRecord = ({ id, startTime, endTime, garbageType, }) => {\n    const tableProps = BasicService.collectList({\n        startTime,\n        endTime,\n        id,\n        garbageType,\n    });\n    const columns = [\n        {\n            title: '产生单位',\n            dataIndex: 'restaurantName',\n            width: 100,\n            ellipsis: true,\n            render(text) {\n                return text || '-';\n            },\n        },\n        ...(garbageType === 'fqyz'\n            ? [\n                {\n                    title: '煎炸油收运桶数(桶)',\n                    dataIndex: 'jzyTrashNum',\n                    width: 180,\n                    sorter: true,\n                    align: 'right',\n                },\n                {\n                    title: '煎炸油收运量(kg)(预估)',\n                    dataIndex: 'jzyYgWeight',\n                    width: 220,\n                    sorter: true,\n                    align: 'right',\n                },\n                {\n                    title: '其他废弃油脂收运桶数(桶)',\n                    dataIndex: 'qtfqyzTrashNum',\n                    width: 220,\n                    sorter: true,\n                    align: 'right',\n                },\n                {\n                    title: '其他废弃油脂收运量(kg)(预估)',\n                    dataIndex: 'qtfqyzYgWeight',\n                    width: 260,\n                    sorter: true,\n                    align: 'right',\n                },\n            ]\n            : [\n                {\n                    title: '垃圾桶数(桶)',\n                    dataIndex: 'trashNum',\n                    width: 120,\n                    sorter: true,\n                    align: 'right',\n                },\n                {\n                    title: '垃圾量(kg)(预估量)',\n                    dataIndex: 'ygNetWeight',\n                    width: 170,\n                    align: 'right',\n                    sorter: true,\n                },\n                {\n                    title: '垃圾量(kg)(实际量)',\n                    dataIndex: 'netWeight',\n                    width: 180,\n                    align: 'right',\n                    sorter: true,\n                },\n            ]),\n        {\n            title: '车牌号',\n            dataIndex: 'carCode',\n            width: 100,\n            ellipsis: true,\n        },\n    ];\n    return React.createElement(VMTable, Object.assign({}, tableProps, { columns: columns }));\n};\nexport default CollectRecord;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"CollectRecord.js","names":["_react","_interopRequireDefault","require","_api","_vmTable","e","__esModule","_toConsumableArray","r","_arrayWithoutHoles","_iterableToArray","_unsupportedIterableToArray","_nonIterableSpread","TypeError","a","_arrayLikeToArray","t","toString","call","slice","constructor","name","Array","from","test","Symbol","iterator","isArray","length","n","CollectRecord","_ref","id","startTime","endTime","garbageType","tableProps","BasicService","collectList","columns","title","dataIndex","width","ellipsis","render","text","concat","sorter","align","React","createElement","VMTable","Object","assign","height","_default","exports"],"sources":["vtx-cc-unit-modal/components/QdBase/CollectRecord.js"],"sourcesContent":["import React from 'react';\nimport { BasicService } from '../../api';\nimport VMTable from '../../../vm-table';\nconst CollectRecord = ({ id, startTime, endTime, garbageType, }) => {\n    const tableProps = BasicService.collectList({\n        startTime,\n        endTime,\n        id,\n        garbageType,\n    });\n    const columns = [\n        {\n            title: '产生单位',\n            dataIndex: 'restaurantName',\n            width: 100,\n            ellipsis: true,\n            render(text) {\n                return text || '-';\n            },\n        },\n        ...(garbageType === 'fqyz'\n            ? [\n                {\n                    title: '煎炸油收运桶数(桶)',\n                    dataIndex: 'jzyTrashNum',\n                    width: 180,\n                    sorter: true,\n                    align: 'right',\n                },\n                {\n                    title: '煎炸油收运量(kg)(预估)',\n                    dataIndex: 'jzyYgWeight',\n                    width: 220,\n                    sorter: true,\n                    align: 'right',\n                },\n                {\n                    title: '其他废弃油脂收运桶数(桶)',\n                    dataIndex: 'qtfqyzTrashNum',\n                    width: 220,\n                    sorter: true,\n                    align: 'right',\n                },\n                {\n                    title: '其他废弃油脂收运量(kg)(预估)',\n                    dataIndex: 'qtfqyzYgWeight',\n                    width: 260,\n                    sorter: true,\n                    align: 'right',\n                },\n            ]\n            : [\n                {\n                    title: '垃圾桶数(桶)',\n                    dataIndex: 'trashNum',\n                    width: 120,\n                    sorter: true,\n                    align: 'right',\n                },\n                {\n                    title: '垃圾量(kg)(预估量)',\n                    dataIndex: 'ygNetWeight',\n                    width: 170,\n                    align: 'right',\n                    sorter: true,\n                },\n                {\n                    title: '垃圾量(kg)(实际量)',\n                    dataIndex: 'netWeight',\n                    width: 180,\n                    align: 'right',\n                    sorter: true,\n                },\n            ]),\n        {\n            title: '车牌号',\n            dataIndex: 'carCode',\n            width: 100,\n            ellipsis: true,\n        },\n    ];\n    return React.createElement(VMTable, Object.assign({}, tableProps, { columns: columns, height: 400 }));\n};\nexport default CollectRecord;\n"],"mappings":"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","ignoreList":[]}

package/lib/vtx-cc-unit-modal/components/QdBase/CollectStatistics.js

@@ -5,21 +5,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _api = require("../../api");
 var _antd = require("antd");
 require("./index.less");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var CollectStatistics = function CollectStatistics(_ref) {
-  var id = _ref.id,
-    startTime = _ref.startTime,
-    endTime = _ref.endTime,
-    garbageType = _ref.garbageType;
-  var data = _api.BasicService.statistics({
-    id: id,
-    startTime: startTime,
-    endTime: endTime,
-    garbageType: garbageType
-  });
+  var garbageType = _ref.garbageType,
+    data = _ref.data,
+    hideNetWeight = _ref.hideNetWeight;
   var list = garbageType === 'fqyz' ? [{
     label: '煎炸油收运桶数',
     value: (data === null || data === void 0 ? void 0 : data.jzyTrashCount) || 0,
@@ -42,13 +40,14 @@ var CollectStatistics = function CollectStatistics(_ref) {
     unit: '桶'
   }, {
     label: '收运预估量',
-    value: (data === null || data === void 0 ? void 0 : data.ygNetWeight) || 0,
-    unit: '吨'
-  }, {
+    abel: '进厂量',
+    value: (data === null || data === void 0 ? void 0 : data.ygNetWeightKg) > 10000 ? ((data.ygNetWeightKg || 0) / 1000).toFixed(2) : data === null || data === void 0 ? void 0 : data.ygNetWeightKg,
+    unit: (data === null || data === void 0 ? void 0 : data.ygNetWeightKg) ? '吨' : 'kg'
+  }].concat(_toConsumableArray(hideNetWeight ? [] : [{
     label: '进厂量',
-    value: (((data === null || data === void 0 ? void 0 : data.netWeightTotal) || 0) / 1000).toFixed(2),
-    unit: '吨'
-  }];
+    value: (data === null || data === void 0 ? void 0 : data.netWeightTotal) > 10000 ? ((data.netWeightTotal || 0) / 1000).toFixed(2) : data === null || data === void 0 ? void 0 : data.netWeightTotal,
+    unit: (data === null || data === void 0 ? void 0 : data.netWeightTotal) ? '吨' : 'kg'
+  }]));
   return /*#__PURE__*/_react["default"].createElement(_antd.Row, {
     justify: 'space-around'
   }, list.map(function (item) {

package/lib/vtx-cc-unit-modal/components/QdBase/CollectStatistics.js.map

@@ -1 +1 @@
-{"version":3,"file":"CollectStatistics.js","names":["_react","_interopRequireDefault","require","_api","_antd","e","__esModule","CollectStatistics","_ref","id","startTime","endTime","garbageType","data","BasicService","statistics","list","label","value","jzyTrashCount","unit","jzyWeight","qtfqyTrashCount","qtfqyWeight","trashNums","ygNetWeight","netWeightTotal","toFixed","React","createElement","Row","justify","map","item","key","className","_default","exports"],"sources":["vtx-cc-unit-modal/components/QdBase/CollectStatistics.js"],"sourcesContent":["import React from 'react';\nimport { BasicService } from '../../api';\nimport { Row } from 'antd';\nimport './index.less';\nconst CollectStatistics = ({ id, startTime, endTime, garbageType, }) => {\n    const data = BasicService.statistics({\n        id,\n        startTime,\n        endTime,\n        garbageType,\n    });\n    const list = garbageType === 'fqyz'\n        ? [\n            {\n                label: '煎炸油收运桶数',\n                value: (data === null || data === void 0 ? void 0 : data.jzyTrashCount) || 0,\n                unit: '桶',\n            },\n            {\n                label: '煎炸油收运预估量',\n                value: (data === null || data === void 0 ? void 0 : data.jzyWeight) || 0,\n                unit: '吨',\n            },\n            {\n                label: '其他废弃油脂收运桶数',\n                value: (data === null || data === void 0 ? void 0 : data.qtfqyTrashCount) || 0,\n                unit: '桶',\n            },\n            {\n                label: '其他废弃油脂预估量',\n                value: (data === null || data === void 0 ? void 0 : data.qtfqyWeight) || 0,\n                unit: '吨',\n            },\n        ]\n        : [\n            {\n                label: '收运桶数',\n                value: (data === null || data === void 0 ? void 0 : data.trashNums) || 0,\n                unit: '桶',\n            },\n            {\n                label: '收运预估量',\n                value: (data === null || data === void 0 ? void 0 : data.ygNetWeight) || 0,\n                unit: '吨',\n            },\n            {\n                label: '进厂量',\n                value: (((data === null || data === void 0 ? void 0 : data.netWeightTotal) || 0) / 1000).toFixed(2),\n                unit: '吨',\n            },\n        ];\n    return (React.createElement(Row, { justify: 'space-around' }, list.map(item => (React.createElement(\"div\", { key: item.label, className: \"vtx-cc-unit-statistics\" },\n        React.createElement(\"div\", { className: \"vtx-cc-unit-statistics__label\" }, item.label),\n        React.createElement(\"div\", null,\n            React.createElement(\"span\", { className: \"vtx-cc-unit-statistics__value\" }, item.value),\n            React.createElement(\"span\", { className: \"vtx-cc-unit-statistics__unit\" }, item.unit)))))));\n};\nexport default CollectStatistics;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"CollectStatistics.js","names":["_react","_interopRequireDefault","require","_antd","e","__esModule","_toConsumableArray","r","_arrayWithoutHoles","_iterableToArray","_unsupportedIterableToArray","_nonIterableSpread","TypeError","a","_arrayLikeToArray","t","toString","call","slice","constructor","name","Array","from","test","Symbol","iterator","isArray","length","n","CollectStatistics","_ref","garbageType","data","hideNetWeight","list","label","value","jzyTrashCount","unit","jzyWeight","qtfqyTrashCount","qtfqyWeight","trashNums","abel","ygNetWeightKg","toFixed","concat","netWeightTotal","React","createElement","Row","justify","map","item","key","className","_default","exports"],"sources":["vtx-cc-unit-modal/components/QdBase/CollectStatistics.js"],"sourcesContent":["import React from 'react';\nimport { Row } from 'antd';\nimport './index.less';\nconst CollectStatistics = ({ garbageType, data, hideNetWeight, }) => {\n    const list = garbageType === 'fqyz'\n        ? [\n            {\n                label: '煎炸油收运桶数',\n                value: (data === null || data === void 0 ? void 0 : data.jzyTrashCount) || 0,\n                unit: '桶',\n            },\n            {\n                label: '煎炸油收运预估量',\n                value: (data === null || data === void 0 ? void 0 : data.jzyWeight) || 0,\n                unit: '吨',\n            },\n            {\n                label: '其他废弃油脂收运桶数',\n                value: (data === null || data === void 0 ? void 0 : data.qtfqyTrashCount) || 0,\n                unit: '桶',\n            },\n            {\n                label: '其他废弃油脂预估量',\n                value: (data === null || data === void 0 ? void 0 : data.qtfqyWeight) || 0,\n                unit: '吨',\n            },\n        ]\n        : [\n            {\n                label: '收运桶数',\n                value: (data === null || data === void 0 ? void 0 : data.trashNums) || 0,\n                unit: '桶',\n            },\n            {\n                label: '收运预估量',\n                abel: '进厂量',\n                value: (data === null || data === void 0 ? void 0 : data.ygNetWeightKg) > 10000\n                    ? ((data.ygNetWeightKg || 0) / 1000).toFixed(2)\n                    : data === null || data === void 0 ? void 0 : data.ygNetWeightKg,\n                unit: (data === null || data === void 0 ? void 0 : data.ygNetWeightKg) ? '吨' : 'kg',\n            },\n            ...(hideNetWeight\n                ? []\n                : [\n                    {\n                        label: '进厂量',\n                        value: (data === null || data === void 0 ? void 0 : data.netWeightTotal) > 10000\n                            ? ((data.netWeightTotal || 0) / 1000).toFixed(2)\n                            : data === null || data === void 0 ? void 0 : data.netWeightTotal,\n                        unit: (data === null || data === void 0 ? void 0 : data.netWeightTotal) ? '吨' : 'kg',\n                    },\n                ]),\n        ];\n    return (React.createElement(Row, { justify: 'space-around' }, list.map(item => (React.createElement(\"div\", { key: item.label, className: \"vtx-cc-unit-statistics\" },\n        React.createElement(\"div\", { className: \"vtx-cc-unit-statistics__label\" }, item.label),\n        React.createElement(\"div\", null,\n            React.createElement(\"span\", { className: \"vtx-cc-unit-statistics__value\" }, item.value),\n            React.createElement(\"span\", { className: \"vtx-cc-unit-statistics__unit\" }, item.unit)))))));\n};\nexport default CollectStatistics;\n"],"mappings":"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","ignoreList":[]}

package/lib/vtx-cc-unit-modal/components/QdBase/Factory.js

@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _api = require("../../api");
-var _moment = _interopRequireDefault(require("moment"));
 var _vmTable = _interopRequireDefault(require("../../../vm-table"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 var Factory = function Factory(_ref) {
-  var id = _ref.id;
+  var id = _ref.id,
+    startTime = _ref.startTime,
+    endTime = _ref.endTime;
   var tableProps = _api.BasicService.factoryList({
-    startTime: (0, _moment["default"])().format('YYYY-MM-DD 00:00:00'),
-    endTime: (0, _moment["default"])().format('YYYY-MM-DD 23:59:59'),
+    startTime: startTime,
+    endTime: endTime,
     id: id
   });
   var columns = [{

package/lib/vtx-cc-unit-modal/components/QdBase/Factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"Factory.js","names":["_react","_interopRequireDefault","require","_api","_moment","_vmTable","e","__esModule","Factory","_ref","id","tableProps","BasicService","factoryList","startTime","moment","format","endTime","columns","title","dataIndex","width","ellipsis","sorter","align","React","createElement","VMTable","Object","assign","_default","exports"],"sources":["vtx-cc-unit-modal/components/QdBase/Factory.js"],"sourcesContent":["import React from 'react';\nimport { BasicService } from '../../api';\nimport moment from 'moment';\nimport VMTable from '../../../vm-table';\nconst Factory = ({ id }) => {\n    const tableProps = BasicService.factoryList({\n        startTime: moment().format('YYYY-MM-DD 00:00:00'),\n        endTime: moment().format('YYYY-MM-DD 23:59:59'),\n        id,\n    });\n    const columns = [\n        {\n            title: '车牌号',\n            dataIndex: 'carCode',\n            width: 100,\n            ellipsis: true,\n        },\n        {\n            title: '处置单位',\n            dataIndex: 'handleUnit',\n            width: 150,\n            ellipsis: true,\n        },\n        {\n            title: '进厂时间',\n            dataIndex: 'grossDateTime',\n            width: 150,\n            sorter: true,\n        },\n        {\n            title: '净重（kg）',\n            dataIndex: 'netWeight',\n            width: 120,\n            align: 'right',\n            sorter: true,\n        },\n    ];\n    return React.createElement(VMTable, Object.assign({}, tableProps, { columns: columns }));\n};\nexport default Factory;\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,QAAA,GAAAJ,sBAAA,CAAAC,OAAA;AAAwC,SAAAD,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,gBAAAA,CAAA;AACxC,IAAME,OAAO,GAAG,SAAVA,OAAOA,CAAAC,IAAA,EAAe;EAAA,IAATC,EAAE,GAAAD,IAAA,CAAFC,EAAE;EACjB,IAAMC,UAAU,GAAGC,iBAAY,CAACC,WAAW,CAAC;IACxCC,SAAS,EAAE,IAAAC,kBAAM,EAAC,CAAC,CAACC,MAAM,CAAC,qBAAqB,CAAC;IACjDC,OAAO,EAAE,IAAAF,kBAAM,EAAC,CAAC,CAACC,MAAM,CAAC,qBAAqB,CAAC;IAC/CN,EAAE,EAAFA;EACJ,CAAC,CAAC;EACF,IAAMQ,OAAO,GAAG,CACZ;IACIC,KAAK,EAAE,KAAK;IACZC,SAAS,EAAE,SAAS;IACpBC,KAAK,EAAE,GAAG;IACVC,QAAQ,EAAE;EACd,CAAC,EACD;IACIH,KAAK,EAAE,MAAM;IACbC,SAAS,EAAE,YAAY;IACvBC,KAAK,EAAE,GAAG;IACVC,QAAQ,EAAE;EACd,CAAC,EACD;IACIH,KAAK,EAAE,MAAM;IACbC,SAAS,EAAE,eAAe;IAC1BC,KAAK,EAAE,GAAG;IACVE,MAAM,EAAE;EACZ,CAAC,EACD;IACIJ,KAAK,EAAE,QAAQ;IACfC,SAAS,EAAE,WAAW;IACtBC,KAAK,EAAE,GAAG;IACVG,KAAK,EAAE,OAAO;IACdD,MAAM,EAAE;EACZ,CAAC,CACJ;EACD,oBAAOE,iBAAK,CAACC,aAAa,CAACC,mBAAO,EAAEC,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,EAAElB,UAAU,EAAE;IAAEO,OAAO,EAAEA;EAAQ,CAAC,CAAC,CAAC;AAC5F,CAAC;AAAC,IAAAY,QAAA,GAAAC,OAAA,cACavB,OAAO","ignoreList":[]}
+{"version":3,"file":"Factory.js","names":["_react","_interopRequireDefault","require","_api","_vmTable","e","__esModule","Factory","_ref","id","startTime","endTime","tableProps","BasicService","factoryList","columns","title","dataIndex","width","ellipsis","sorter","align","React","createElement","VMTable","Object","assign","_default","exports"],"sources":["vtx-cc-unit-modal/components/QdBase/Factory.js"],"sourcesContent":["import React from 'react';\nimport { BasicService } from '../../api';\nimport VMTable from '../../../vm-table';\nconst Factory = ({ id, startTime, endTime, }) => {\n    const tableProps = BasicService.factoryList({\n        startTime,\n        endTime,\n        id,\n    });\n    const columns = [\n        {\n            title: '车牌号',\n            dataIndex: 'carCode',\n            width: 100,\n            ellipsis: true,\n        },\n        {\n            title: '处置单位',\n            dataIndex: 'handleUnit',\n            width: 150,\n            ellipsis: true,\n        },\n        {\n            title: '进厂时间',\n            dataIndex: 'grossDateTime',\n            width: 150,\n            sorter: true,\n        },\n        {\n            title: '净重（kg）',\n            dataIndex: 'netWeight',\n            width: 120,\n            align: 'right',\n            sorter: true,\n        },\n    ];\n    return React.createElement(VMTable, Object.assign({}, tableProps, { columns: columns }));\n};\nexport default Factory;\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAH,sBAAA,CAAAC,OAAA;AAAwC,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,gBAAAA,CAAA;AACxC,IAAME,OAAO,GAAG,SAAVA,OAAOA,CAAAC,IAAA,EAAoC;EAAA,IAA9BC,EAAE,GAAAD,IAAA,CAAFC,EAAE;IAAEC,SAAS,GAAAF,IAAA,CAATE,SAAS;IAAEC,OAAO,GAAAH,IAAA,CAAPG,OAAO;EACrC,IAAMC,UAAU,GAAGC,iBAAY,CAACC,WAAW,CAAC;IACxCJ,SAAS,EAATA,SAAS;IACTC,OAAO,EAAPA,OAAO;IACPF,EAAE,EAAFA;EACJ,CAAC,CAAC;EACF,IAAMM,OAAO,GAAG,CACZ;IACIC,KAAK,EAAE,KAAK;IACZC,SAAS,EAAE,SAAS;IACpBC,KAAK,EAAE,GAAG;IACVC,QAAQ,EAAE;EACd,CAAC,EACD;IACIH,KAAK,EAAE,MAAM;IACbC,SAAS,EAAE,YAAY;IACvBC,KAAK,EAAE,GAAG;IACVC,QAAQ,EAAE;EACd,CAAC,EACD;IACIH,KAAK,EAAE,MAAM;IACbC,SAAS,EAAE,eAAe;IAC1BC,KAAK,EAAE,GAAG;IACVE,MAAM,EAAE;EACZ,CAAC,EACD;IACIJ,KAAK,EAAE,QAAQ;IACfC,SAAS,EAAE,WAAW;IACtBC,KAAK,EAAE,GAAG;IACVG,KAAK,EAAE,OAAO;IACdD,MAAM,EAAE;EACZ,CAAC,CACJ;EACD,oBAAOE,iBAAK,CAACC,aAAa,CAACC,mBAAO,EAAEC,MAAM,CAACC,MAAM,CAAC,CAAC,CAAC,EAAEd,UAAU,EAAE;IAAEG,OAAO,EAAEA;EAAQ,CAAC,CAAC,CAAC;AAC5F,CAAC;AAAC,IAAAY,QAAA,GAAAC,OAAA,cACarB,OAAO","ignoreList":[]}

package/lib/vtx-cc-unit-modal/components/QdBase/index.js

@@ -1,21 +1,39 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 var _vmCard = _interopRequireDefault(require("../../../vm-card"));
 var _antd = require("antd");
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _vmInfoCollection = _interopRequireDefault(require("../../../vm-info-collection"));
 var _CollectStatistics = _interopRequireDefault(require("./CollectStatistics"));
 var _moment = _interopRequireDefault(require("moment"));
 var _Factory = _interopRequireDefault(require("./Factory"));
 var _CollectRecord = _interopRequireDefault(require("./CollectRecord"));
+var _vmFilter = require("../../../vm-filter");
+var _api = require("../../api");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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(r) { if (Array.isArray(r)) return r; }
 var QdBase = function QdBase(_ref) {
   var info = _ref.info,
     id = _ref.id;
+  var _useState = (0, _react.useState)([(0, _moment["default"])().subtract(30, 'day'), (0, _moment["default"])()]),
+    _useState2 = _slicedToArray(_useState, 2),
+    times = _useState2[0],
+    setTimes = _useState2[1];
+  var onDateChange = function onDateChange(date) {
+    setTimes(date);
+  };
   var dataSource = [{
     label: '单位名称',
     key: 'unitName',
@@ -46,7 +64,39 @@ var QdBase = function QdBase(_ref) {
     key: 'establishedTime',
     value: info.establishedTime
   }];
-  return /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+  var timeStr = times.map(function (item) {
+    return item.format('YYYY-MM-DD');
+  }).join('~');
+  var startTime = times[0].format('YYYY-MM-DD 00:00:00');
+  var endTime = times[1].format('YYYY-MM-DD 23:59:59');
+  var statisticsData = _api.BasicService.statistics({
+    id: id,
+    startTime: startTime,
+    endTime: endTime,
+    garbageType: info.garbageType
+  });
+  var list = [{
+    label: '进厂车次',
+    value: (statisticsData === null || statisticsData === void 0 ? void 0 : statisticsData.count) || 0,
+    unit: '桶'
+  }, {
+    label: '进厂量',
+    value: (statisticsData === null || statisticsData === void 0 ? void 0 : statisticsData.netWeightTotal) > 10000 ? ((statisticsData.netWeightTotal || 0) / 1000).toFixed(2) : statisticsData === null || statisticsData === void 0 ? void 0 : statisticsData.netWeightTotal,
+    unit: (statisticsData === null || statisticsData === void 0 ? void 0 : statisticsData.netWeightTotal) ? '吨' : 'kg'
+  }];
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      position: 'absolute',
+      top: 65,
+      right: 10
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_vmFilter.VMRangePicker, {
+    value: times,
+    onChange: onDateChange,
+    style: {
+      height: 32
+    }
+  })), /*#__PURE__*/_react["default"].createElement(_antd.Row, {
     gutter: [10, 10],
     style: {
       padding: 10
@@ -70,9 +120,28 @@ var QdBase = function QdBase(_ref) {
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 24
   }, /*#__PURE__*/_react["default"].createElement(_vmCard["default"], {
-    title: "\u4ECA\u65E5\u8FDB\u5382\u660E\u7EC6"
+    title: "\u8FDB\u5382\u6C47\u603B\u7EDF\u8BA1(".concat(timeStr, ")")
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    justify: 'space-around'
+  }, list.map(function (item) {
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      key: item.label,
+      className: "vtx-cc-unit-statistics"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "vtx-cc-unit-statistics__label"
+    }, item.label), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "vtx-cc-unit-statistics__value"
+    }, item.value), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "vtx-cc-unit-statistics__unit"
+    }, item.unit)));
+  })))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 24
+  }, /*#__PURE__*/_react["default"].createElement(_vmCard["default"], {
+    title: "\u8FDB\u5382\u660E\u7EC6(".concat(timeStr, ")")
   }, /*#__PURE__*/_react["default"].createElement(_Factory["default"], {
-    id: id
+    id: id,
+    startTime: startTime,
+    endTime: endTime
   }))))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 13
   }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
@@ -83,22 +152,21 @@ var QdBase = function QdBase(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 24
   }, /*#__PURE__*/_react["default"].createElement(_vmCard["default"], {
-    title: "\u4ECA\u65E5\u6536\u8FD0\u7EDF\u8BA1"
+    title: "\u6536\u8FD0\u6C47\u603B\u7EDF\u8BA1(".concat(timeStr, ")")
   }, /*#__PURE__*/_react["default"].createElement(_CollectStatistics["default"], {
-    id: id,
-    startTime: (0, _moment["default"])().format('YYYY-MM-DD 00:00:00'),
-    endTime: (0, _moment["default"])().format('YYYY-MM-DD 23:59:59'),
-    garbageType: info.garbageType
+    garbageType: info.garbageType,
+    data: statisticsData,
+    hideNetWeight: true
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 24
   }, /*#__PURE__*/_react["default"].createElement(_vmCard["default"], {
-    title: "\u4ECA\u65E5\u6536\u8FD0\u660E\u7EC6"
+    title: "\u6536\u8FD0\u660E\u7EC6(".concat(timeStr, ")")
   }, /*#__PURE__*/_react["default"].createElement(_CollectRecord["default"], {
     id: id,
-    startTime: (0, _moment["default"])().format('YYYY-MM-DD 00:00:00'),
-    endTime: (0, _moment["default"])().format('YYYY-MM-DD 23:59:59'),
+    startTime: startTime,
+    endTime: endTime,
     garbageType: info.garbageType
-  }))))));
+  })))))));
 };
 var _default = exports["default"] = QdBase;
 //# sourceMappingURL=index.js.map