@vtx/modals2 5.0.3 → 5.0.5

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

@@ -71,49 +71,44 @@ var BaseService = {
     return {
       devices: res === null || res === void 0 ? void 0 : res.data
     };
-  }
-};
-var ThrowService = {
-  useSummaryInfo: function useSummaryInfo(id, startTime, endTime) {
+  },
+  useThrowInfo: function useThrowInfo(throwPointId, dateType, startDate, endDate) {
     var _useRequest3 = useRequest(function () {
-        return request.get('/cloud/ljfljc/api/v101/trow/record/detail/throwDetailSummary', {
+        return request.get('/cloud/ljfljc/api/v101/throwBoard/throwAnalysis', {
           data: {
-            subjectId: id,
-            startTime: startTime,
-            endTime: endTime
+            throwPointId: throwPointId,
+            dateType: dateType,
+            startDate: startDate,
+            endDate: endDate
           }
         });
       }, {
-        ready: !!id,
-        refreshDeps: [id, startTime, endTime]
+        ready: !!throwPointId,
+        refreshDeps: [throwPointId, dateType, startDate, endDate]
       }),
-      throwRes = _useRequest3.data;
+      res = _useRequest3.data;
     return {
-      data: throwRes
+      throwAnalysis: res === null || res === void 0 ? void 0 : res.data
     };
   },
-  usePage: function usePage(id, startTime, endTime, page, size) {
+  useAlarmInfo: function useAlarmInfo(throwPointId, dateType, startDate, endDate) {
     var _useRequest4 = useRequest(function () {
-        return request.get('/cloud/ljfljc/api/v101/trow/record/detail/page', {
+        return request.get('/cloud/ljfljc/api/v101/throwBoard/violationAnalysis', {
           data: {
-            subjectId: id,
-            startTime: startTime,
-            endTime: endTime,
-            desensitization: true,
-            page: page,
-            size: size
+            throwPointId: throwPointId,
+            dateType: dateType,
+            startDate: startDate,
+            endDate: endDate
           }
         });
       }, {
-        ready: !!id,
-        refreshDeps: [id, startTime, endTime, page, size]
+        ready: !!throwPointId,
+        refreshDeps: [throwPointId, dateType, startDate, endDate]
       }),
-      pageRes = _useRequest4.data,
-      loading = _useRequest4.loading;
+      res = _useRequest4.data;
     return {
-      data: pageRes === null || pageRes === void 0 ? void 0 : pageRes.data,
-      loading: loading
+      alarmAnalysis: res === null || res === void 0 ? void 0 : res.data
     };
   }
 };
-export { BaseService, ThrowService };
+export { BaseService };

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

@@ -1,3 +1,9 @@
+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); }
@@ -10,18 +16,17 @@ import { useSetState } from 'ahooks';
 import { Col, Row } from 'antd';
 import dayjs from 'dayjs';
 import { useRef } from 'react';
-import { VmEmpty, VmFactor, VmFilter, VmInfoCollection, VmLineCharts, VmPieCharts, VmTitle, VmWrapper } from "../../../_components";
+import { VmEmpty, VmFilter, VmInfoCollection, VmPieCharts, VmTitle, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
+import { DownIcon, UpIcon } from "../../../_util/iconSvgHtml";
 import { BaseService } from "../../api";
 import "./index.less";
 
 // svg大小比png2倍还大，不如使用2次png
-import hjtfl from "../../imgs/hjtfl.png";
-import hjtfl_light from "../../imgs/hjtfl_light.png";
-import khsl from "../../imgs/khsl.png";
-import khsl_light from "../../imgs/khsl_light.png";
+import { sumBy } from 'lodash';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var BaseInfo = function BaseInfo(props) {
+  var _throwAnalysis$garbag, _alarmAnalysis$violat;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var id = props.id,
@@ -37,8 +42,17 @@ var BaseInfo = function BaseInfo(props) {
   var dateType = state.dateType,
     date = state.date;
   var imgRef = useRef(null);
+  var formatType = {
+    datePicker: 'day',
+    monthPicker: 'month',
+    yearPicker: 'year'
+  };
   var _BaseService$useDevic = BaseService.useDeviceInfo(id),
     devices = _BaseService$useDevic.devices;
+  var _BaseService$useThrow = BaseService.useThrowInfo(id, formatType[dateType], date.startOf(formatType[dateType]).format('YYYY-MM-DD'), date.endOf(formatType[dateType]).format('YYYY-MM-DD')),
+    throwAnalysis = _BaseService$useThrow.throwAnalysis;
+  var _BaseService$useAlarm = BaseService.useAlarmInfo(id, formatType[dateType], date.startOf(formatType[dateType]).format('YYYY-MM-DD'), date.endOf(formatType[dateType]).format('YYYY-MM-DD')),
+    alarmAnalysis = _BaseService$useAlarm.alarmAnalysis;
   return /*#__PURE__*/_jsxs("div", {
     className: "tfd-base",
     children: [/*#__PURE__*/_jsx("div", {
@@ -80,9 +94,9 @@ var BaseInfo = function BaseInfo(props) {
             padding: '0 12px 12px'
           }), /*#__PURE__*/_jsx(VmTitle, {
             title: "\u8BBE\u5907\u60C5\u51B5"
-          }), /*#__PURE__*/_jsx("div", {
+          }), (devices === null || devices === void 0 ? void 0 : devices.length) > 0 ? /*#__PURE__*/_jsx("div", {
             className: "tfd-equipment",
-            children: devices === null || devices === void 0 ? void 0 : devices.map(function (ele, index) {
+            children: devices.map(function (ele, index) {
               return /*#__PURE__*/_jsxs("div", {
                 className: "tfd-equipment-item",
                 children: [/*#__PURE__*/_jsx("img", {
@@ -92,6 +106,12 @@ var BaseInfo = function BaseInfo(props) {
                 })]
               }, index);
             })
+          }) : /*#__PURE__*/_jsx(VmEmpty, {
+            type: "NO_DATA",
+            text: "\u6682\u65E0\u8BBE\u5907",
+            style: {
+              height: 120
+            }
           })]
         })]
       })
@@ -102,13 +122,21 @@ var BaseInfo = function BaseInfo(props) {
         children: [/*#__PURE__*/_jsx(Col, {
           span: 24,
           children: /*#__PURE__*/_jsx(VmWrapper, {
-            title: "\u6295\u653E\u91CF\u5206\u6790",
+            title: "",
             filterType: dateType,
             filterChange: function filterChange(date) {
               setState({
                 date: date
               });
             },
+            style: {
+              height: 52
+            },
+            headerStyle: {
+              height: 52,
+              borderBottom: 'unset'
+            },
+            showContent: false,
             dateValue: date,
             extra: /*#__PURE__*/_jsx("div", {
               style: {
@@ -136,64 +164,77 @@ var BaseInfo = function BaseInfo(props) {
                   });
                 }
               })
-            }),
-            children: /*#__PURE__*/_jsxs(Row, {
-              children: [/*#__PURE__*/_jsxs(Col, {
-                span: 6,
-                offset: 1,
-                children: [/*#__PURE__*/_jsx(VmFactor, {
-                  name: "\u5F00\u6237\u6570\u91CF",
-                  unit: "\u6237",
-                  value: 987,
-                  img: isDark ? khsl : khsl_light,
-                  style: {
-                    marginTop: 24
-                  }
-                }), /*#__PURE__*/_jsx(VmFactor, {
-                  name: "\u6237\u5747\u6295\u653E\u91CF",
-                  unit: "kg/\u65E5",
-                  value: 987,
-                  img: isDark ? hjtfl : hjtfl_light,
-                  style: {
-                    marginTop: 24
-                  }
-                })]
-              }), /*#__PURE__*/_jsx(Col, {
-                span: 17,
-                children: /*#__PURE__*/_jsx(VmPieCharts, {
-                  height: 172,
-                  dataList: [],
-                  name: '投放总量',
-                  title: "\u603B\u91CF(".concat(dateType === 'datePicker' ? 'kg' : '吨', ")"),
-                  total: 1,
-                  loading: false,
-                  unit: dateType === 'datePicker' ? 'kg' : '吨',
-                  innerRadius: ['65%', '85%'],
-                  outerRadius: ['85%', '95%'],
-                  legendConfig: {
-                    right: '10%'
-                  }
-                })
-              })]
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
           span: 24,
-          children: /*#__PURE__*/_jsx(VmWrapper, {
+          children: /*#__PURE__*/_jsxs(VmWrapper, {
+            title: "\u6295\u653E\u91CF\u5206\u6790",
+            style: {
+              height: 265
+            },
+            children: [/*#__PURE__*/_jsx(VmPieCharts, {
+              height: 160,
+              dataList: (throwAnalysis === null || throwAnalysis === void 0 || (_throwAnalysis$garbag = throwAnalysis.garbageValues) === null || _throwAnalysis$garbag === void 0 ? void 0 : _throwAnalysis$garbag.map(function (ele) {
+                return _objectSpread(_objectSpread({}, ele), {}, {
+                  name: ele.garbageTypeName,
+                  value: ele.value
+                });
+              })) || [],
+              name: '投放量',
+              title: "\u6295\u653E\u91CF(".concat(dateType === 'datePicker' ? 'kg' : '吨', ")"),
+              total: sumBy(throwAnalysis === null || throwAnalysis === void 0 ? void 0 : throwAnalysis.garbageValues, 'value'),
+              loading: false,
+              unit: dateType === 'datePicker' ? 'kg' : '吨',
+              innerRadius: ['65%', '85%'],
+              outerRadius: ['85%', '95%'],
+              legendConfig: {
+                right: '8%'
+              },
+              nameLength: 8
+            }), /*#__PURE__*/_jsxs("div", {
+              className: "tfd-base-right-compare",
+              children: ["\u4E0E\u8FD130\u5929\u65E5\u5747\u503C\u6BD4", (throwAnalysis === null || throwAnalysis === void 0 ? void 0 : throwAnalysis.rate) || 0, "%", (throwAnalysis === null || throwAnalysis === void 0 ? void 0 : throwAnalysis.rate) < 0 && /*#__PURE__*/_jsx(DownIcon, {
+                fill: '#f5222d'
+              }), (throwAnalysis === null || throwAnalysis === void 0 ? void 0 : throwAnalysis.rate) > 0 && /*#__PURE__*/_jsx(UpIcon, {
+                fill: '#0fb964'
+              })]
+            })]
+          })
+        }), /*#__PURE__*/_jsx(Col, {
+          span: 24,
+          children: /*#__PURE__*/_jsxs(VmWrapper, {
             title: "\u8FDD\u89C4\u5206\u6790",
             style: {
-              height: 344
+              height: 265
             },
-            children: /*#__PURE__*/_jsx(VmLineCharts, {
-              xAxis: [],
-              dataList: [],
-              unit: dateType === 'datePicker' ? 'kg' : '吨'
-              //   loading={loading}
-              ,
-              legendOption: {
-                width: '95%'
-              }
-            })
+            children: [/*#__PURE__*/_jsx(VmPieCharts, {
+              height: 160,
+              dataList: (alarmAnalysis === null || alarmAnalysis === void 0 || (_alarmAnalysis$violat = alarmAnalysis.violationValues) === null || _alarmAnalysis$violat === void 0 ? void 0 : _alarmAnalysis$violat.map(function (ele) {
+                return _objectSpread(_objectSpread({}, ele), {}, {
+                  name: ele.violationTypeName,
+                  value: ele.count
+                });
+              })) || [],
+              name: '违规类型',
+              title: "\u5408\u8BA1(\u6B21)",
+              total: sumBy(alarmAnalysis === null || alarmAnalysis === void 0 ? void 0 : alarmAnalysis.garbageValues, 'value'),
+              loading: false,
+              unit: "\u6B21",
+              innerRadius: ['65%', '85%'],
+              outerRadius: ['85%', '95%'],
+              legendConfig: {
+                right: '12%'
+              },
+              nameLength: 8
+            }), /*#__PURE__*/_jsxs("div", {
+              className: "tfd-base-right-compare",
+              children: ["\u4E0E\u8FD130\u5929\u65E5\u5747\u503C\u6BD4", (alarmAnalysis === null || alarmAnalysis === void 0 ? void 0 : alarmAnalysis.rate) || 0, "%", (alarmAnalysis === null || alarmAnalysis === void 0 ? void 0 : alarmAnalysis.rate) < 0 && /*#__PURE__*/_jsx(DownIcon, {
+                fill: '#f5222d'
+              }), (alarmAnalysis === null || alarmAnalysis === void 0 ? void 0 : alarmAnalysis.rate) > 0 && /*#__PURE__*/_jsx(UpIcon, {
+                fill: '#0fb964'
+              })]
+            })]
           })
         })]
       })

package/lib/vtx-tfd-modal/components/BaseInfo/index.less

@@ -10,6 +10,11 @@
   }
   &-right {
     width: calc(100% - 416px);
+
+    &-compare {
+      margin-left: 16%;
+      color: var(--modal-title-color);
+    }
   }
 
   .base-top {

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

@@ -0,0 +1,107 @@
+import { MapIcon } from '@vtx/map-icon';
+import { request } from '@vtx/utils';
+import { useRequest } from 'ahooks';
+var BaseService = {
+  useBaseDetail: function useBaseDetail(id) {
+    var _info$geometryInfo, _info$geometryInfo2, _lngLats$split, _lngLats$split2, _info$geometryInfo3;
+    var _useRequest = useRequest(function () {
+        return request.get('/cloud/zykh-reborn/orderTask/get', {
+          data: {
+            id: id,
+            coordType: 'wgs84'
+          }
+        });
+      }, {
+        refreshDeps: [id]
+      }),
+      baseInfoRes = _useRequest.data,
+      loading = _useRequest.loading;
+    var info = baseInfoRes === null || baseInfoRes === void 0 ? void 0 : baseInfoRes.data;
+    var baseInfo = [{
+      label: '问题来源',
+      key: 'problemFromStr',
+      value: info === null || info === void 0 ? void 0 : info.problemFromStr
+    }, {
+      label: '大类',
+      key: 'parentCategoryName',
+      value: info === null || info === void 0 ? void 0 : info.parentCategoryName
+    }, {
+      label: '问题分类',
+      key: 'problemCategoryName',
+      value: info === null || info === void 0 ? void 0 : info.problemCategoryName
+    }, {
+      label: '考核对象',
+      key: 'checkResourceName',
+      value: info === null || info === void 0 ? void 0 : info.checkResourceName
+    }, {
+      label: '上报人员',
+      key: 'reportStaffName',
+      value: info === null || info === void 0 ? void 0 : info.reportStaffName
+    }, {
+      label: '上报时间',
+      key: 'reportDateTimeStr',
+      value: info === null || info === void 0 ? void 0 : info.reportDateTimeStr
+    }, {
+      label: '截止时间',
+      key: 'endDateTimeStr',
+      value: info === null || info === void 0 ? void 0 : info.endDateTimeStr
+    }, {
+      label: '标段',
+      key: 'tenderName',
+      value: info === null || info === void 0 ? void 0 : info.tenderName
+    }, {
+      label: '行政区划',
+      key: 'divisionName',
+      value: info === null || info === void 0 ? void 0 : info.divisionName,
+      width: '100%'
+    }, {
+      label: '问题描述',
+      key: 'memo',
+      value: info === null || info === void 0 ? void 0 : info.memo,
+      width: '100%'
+    }, {
+      label: '问题照片',
+      key: 'photos',
+      value: info === null || info === void 0 ? void 0 : info.photos,
+      componentType: 'IMAGE',
+      width: '100%'
+    }, {
+      label: '问题位置',
+      key: 'address',
+      value: info === null || info === void 0 ? void 0 : info.address,
+      width: '100%'
+    }];
+    var lngLats = info === null || info === void 0 || (_info$geometryInfo = info.geometryInfo) === null || _info$geometryInfo === void 0 ? void 0 : _info$geometryInfo.lngLats;
+    return {
+      info: info,
+      baseInfo: baseInfo,
+      lngLats: (info === null || info === void 0 || (_info$geometryInfo2 = info.geometryInfo) === null || _info$geometryInfo2 === void 0 ? void 0 : _info$geometryInfo2.lngLats) || '',
+      loading: loading,
+      mapPoints: [{
+        lng: lngLats === null || lngLats === void 0 || (_lngLats$split = lngLats.split(',')) === null || _lngLats$split === void 0 ? void 0 : _lngLats$split[0],
+        lat: lngLats === null || lngLats === void 0 || (_lngLats$split2 = lngLats.split(',')) === null || _lngLats$split2 === void 0 ? void 0 : _lngLats$split2[1],
+        icon: 'GD',
+        type: info === null || info === void 0 || (_info$geometryInfo3 = info.geometryInfo) === null || _info$geometryInfo3 === void 0 ? void 0 : _info$geometryInfo3.type,
+        url: new MapIcon.CommonIcon({
+          canvasIcon: 'GD',
+          color: '#119FFB'
+        }).getImgUrl()
+      }]
+    };
+  },
+  useGetRecord: function useGetRecord(orderTaskNo) {
+    var _useRequest2 = useRequest(function () {
+        return request.get('/cloud/zykh-reborn/orderProcessLog/list', {
+          data: {
+            orderTaskNo: orderTaskNo
+          }
+        });
+      }, {
+        ready: !!orderTaskNo,
+        refreshDeps: [orderTaskNo]
+      }),
+      data = _useRequest2.data;
+    return (data === null || data === void 0 ? void 0 : data.data) || [];
+  }
+};
+export { BaseService };