@vtx/modals2 5.0.66 → 5.0.69

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

@@ -1,5 +1,6 @@
 .vm-modal-header-container {
   width: 100%;
+  box-sizing: border-box;
   height: 116px;
   border-radius: 8px 8px 0 0;
   background: var(--modal-head-bg);

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

@@ -11,10 +11,11 @@
   left: 50%;
   top: 50%;
   transform: translate(-50%, -50%);
-  width: 1200px;
+  width: min(1200px, calc(100vw - 32px));
   height: calc(100vh * 0.9);
   max-height: 748px;
   min-height: 500px;
+  box-sizing: border-box;
   z-index: 1000;
   border-radius: 12px;
   background: var(--modal-bg-color);
@@ -42,16 +43,21 @@
     display: flex;
     flex-direction: column;
     width: 100%;
+    min-width: 0;
+    box-sizing: border-box;
     background: var(--modal-content-bg);
     border-radius: 8px;
   }
   .vm-base-modal-content-wrap {
     flex: 1;
     min-height: 0;
+    min-width: 0;
     overflow: auto;
     padding: 0 16px 16px;
+    box-sizing: border-box;
     .vm-base-modal-content {
       height: 100%;
+      min-width: 0;
       overflow-x: hidden;
       overflow-y: auto;
     }

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

@@ -448,7 +448,7 @@ export var JxhService = {
   useWorkSummaryJxh: function useWorkSummaryJxh(carId, startDate, endDate, matchHistory) {
     //机械化作业统计
     var _useRequest18 = useRequest(function () {
-        return http.get("".concat(prefix, "/cloud/zyqs-zqb/api/kanban/workInfoStatisticsByCarId"), {
+        return http.get("".concat(prefix, "/cloud/zyqs-zqb/api/noshift/kanban/v2/workInfoStatisticsByCarId"), {
           body: {
             carId: carId,
             startDate: startDate,

package/lib/vtx-car-modal/content/JXH/StaticInfo/index.js

@@ -257,7 +257,7 @@ function Calendar(_ref) {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "green",
         img: workMileageIcon,
-        value: workMileage,
+        value: (workMileage / 1000).toFixed(2),
         style: {
           width: '139px',
           justifyContent: 'space-between'

package/lib/vtx-car-modal/content/Unmanned/Calendar/index.js

@@ -56,7 +56,7 @@ export default function (_ref) {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "blue",
         img: isDark ? track_dark : track,
-        value: "".concat((item === null || item === void 0 ? void 0 : item.workMileage) || 0, "/").concat((item === null || item === void 0 ? void 0 : item.driveMileage) || 0),
+        value: "".concat((((item === null || item === void 0 ? void 0 : item.workMileage) || 0) / 1000).toFixed(2), "/").concat((item === null || item === void 0 ? void 0 : item.driveMileage) || 0),
         style: {
           width: '139px',
           justifyContent: 'space-between',

package/lib/vtx-restaurant-modal/config.js

@@ -60,112 +60,112 @@ export var QD_DETAIL_FIELDS = [{
   label: '二维码'
 }];
 export var RestaurantConfigureEnum = {
-  /**
-   * 编号
+  /**
+   * 编号
    */
   CODE: 'code',
-  /**
-   * 产生单位名称
+  /**
+   * 产生单位名称
    */
   NAME: 'name',
-  /**
-   * 店铺名称
+  /**
+   * 店铺名称
    */
   SHORT_NAME: 'shortName',
-  /**
-   * 行政区划名称
+  /**
+   * 行政区划名称
    */
   DIVISION_NAME: 'divisionId',
-  /**
-   * 联系人
+  /**
+   * 联系人
    */
   CONTACT_PERSON: 'contactPerson',
-  /**
-   * 联系方式
+  /**
+   * 联系方式
    */
   CONTACT_PHONE: 'contactPhone',
-  /**
-   * 身份证号
+  /**
+   * 身份证号
    */
   CARD_ID: 'cardId',
-  /**
-   * 商户地址
+  /**
+   * 商户地址
    */
   ADDRESS: 'address',
-  /**
-   * 经纬度
+  /**
+   * 经纬度
    */
   LOCATION: 'location',
-  /**
-   * 产生单位状态
+  /**
+   * 产生单位状态
    */
   SIGNED_STATUS: 'signedStatus',
-  /**
-   * 签约状态
+  /**
+   * 签约状态
    */
   IS_SIGN: 'isSign',
-  /**
-   * 收集类型
+  /**
+   * 收集类型
    */
   COLLECT_STATUS: 'collectStatus',
-  /**
-   * 收集点
+  /**
+   * 收集点
    */
   SY_POINT_NAME: 'syPointId',
-  /**
-   * 商户类型名称
+  /**
+   * 商户类型名称
    */
   CLASSES_NAME: 'classesId',
-  /**
-   * 规模名称
+  /**
+   * 规模名称
    */
   SCALE_NAME: 'scaleId',
-  /**
-   * 垃圾桶个数
+  /**
+   * 垃圾桶个数
    */
   TRASH_CAN_NUM: 'trashCanNum',
-  /**
-   * 统一社会信用代码
+  /**
+   * 统一社会信用代码
    */
   CREDIT_CODE: 'creditCode',
-  /**
-   * 行业名称
+  /**
+   * 行业名称
    */
   INDUSTRY_NAME: 'industryId',
-  /**
-   * 经营范围
+  /**
+   * 经营范围
    */
   BUSINESS_SCOPE: 'businessScope',
-  /**
-   * 注册资金
+  /**
+   * 注册资金
    */
   REGISTER_MONEY: 'registerMoney',
-  /**
-   * 企业成立时间
+  /**
+   * 企业成立时间
    */
   ESTABLISHED_TIME: 'establishedTime',
-  /**
-   * 建议收集时间
+  /**
+   * 建议收集时间
    */
   SUGGEST_COLLECT_TIME: 'suggestCollectTime',
-  /**
-   * 营业时间段
+  /**
+   * 营业时间段
    */
   BUSINESS_TIME: 'businessTime',
-  /**
-   * 垃圾桶摆放位置图片
+  /**
+   * 垃圾桶摆放位置图片
    */
   TRASH_BIN_LOCATION_PHOTO: 'trashBinLocationPhoto',
-  /**
-   * 商户图片
+  /**
+   * 商户图片
    */
   PHOTO_IDS: 'photoIds',
-  /**
-   * 证件图片
+  /**
+   * 证件图片
    */
   PAPER_FILE_IDS: 'paperFileIds',
-  /**
-   * 排序号
+  /**
+   * 排序号
    */
   ORDER_INDEX: 'orderIndex'
 };

package/lib/vtx-road-modal/components/BaseInfo/Work.js

@@ -128,8 +128,8 @@ var Work = function Work(props) {
           var query = buildIframeQuery(location.href.split('?')[1], {
             carId: record.carId,
             theme: theme === 'blue' ? 'dark' : theme,
-            startTime: dayjs(date).format('YYYY-MM-DD 00:00:00'),
-            endTime: dayjs(date).format('YYYY-MM-DD 23:59:59'),
+            startTime: dayjs(day).format('YYYY-MM-DD 00:00:00'),
+            endTime: dayjs(day).format('YYYY-MM-DD 23:59:59'),
             roadId: record.roadId
           });
           var src = "".concat(prefix, "/carHistory/#/zyqsHistory?").concat(query);

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

@@ -61,7 +61,7 @@ var Calendar = function Calendar(_ref) {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "blue",
         img: mileageIcon,
-        value: planMileage,
+        value: (planMileage / 1000).toFixed(2),
         style: {
           width: '139px',
           justifyContent: 'space-between',
@@ -70,7 +70,7 @@ var Calendar = function Calendar(_ref) {
       }), /*#__PURE__*/_jsx(VmCalendarInner, {
         type: "green",
         img: workMileageIcon,
-        value: workMileage,
+        value: (workMileage / 1000).toFixed(2),
         style: {
           width: '139px',
           justifyContent: 'space-between'

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

@@ -200,14 +200,14 @@ var ThrowService = {
       loading: loading
     };
   },
-  usePage: function usePage(id, startTime, endTime, page, size, source) {
+  usePage: function usePage(id, startTime, endTime, page, size, source, sort) {
     var _useRequest8 = useRequest(function () {
         return request.get('/cloud/ljfljc/api/v101/trow/record/detail/page', {
-          data: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, source === 'tfd' ? 'throwPointId' : 'subjectId', id), "startTime", startTime), "endTime", endTime), "desensitization", true), "page", page), "size", size)
+          data: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, source === 'tfd' ? 'throwPointId' : 'subjectId', id), "startTime", startTime), "endTime", endTime), "desensitization", true), "page", page), "size", size), "sort", sort)
         });
       }, {
         ready: !!id,
-        refreshDeps: [id, startTime, endTime, page, size]
+        refreshDeps: [id, startTime, endTime, page, size, source, sort]
       }),
       pageRes = _useRequest8.data,
       loading = _useRequest8.loading;

package/lib/vtx-shxq-modal/components/ThrowRecord/List.js

@@ -30,19 +30,21 @@ var ListZymx = function ListZymx(props) {
         current: 1,
         pageSize: 10,
         total: 0
-      }
+      },
+      sort: ''
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
     setState = _useSetState2[1];
-  var pagination = state.pagination;
+  var pagination = state.pagination,
+    sort = state.sort;
   var _ThrowService$useThro = ThrowService.useThrowConfig(),
     configObj = _ThrowService$useThro.configObj;
   var weightFlag = JSON.parse(((_configObj$THROW_WEIG = configObj['THROW_WEIGHT']) === null || _configObj$THROW_WEIG === void 0 ? void 0 : _configObj$THROW_WEIG.configValue) || '[]');
   var qualityFlag = JSON.parse(((_configObj$THROW_QUAL = configObj['THROW_QUALITY']) === null || _configObj$THROW_QUAL === void 0 ? void 0 : _configObj$THROW_QUAL.configValue) || '[]');
   var integralFlag = JSON.parse(((_configObj$INTEGRAL_I = configObj['INTEGRAL_INFO']) === null || _configObj$INTEGRAL_I === void 0 ? void 0 : _configObj$INTEGRAL_I.configValue) || '[]');
   var subjectFlag = (_configObj$THROW_SUBJ = configObj['THROW_SUBJECT_DIMENSION']) === null || _configObj$THROW_SUBJ === void 0 ? void 0 : _configObj$THROW_SUBJ.configValue;
-  var _ThrowService$usePage = ThrowService.usePage(id, startTime, endTime, pagination.current - 1, pagination.pageSize, source),
+  var _ThrowService$usePage = ThrowService.usePage(id, startTime, endTime, pagination.current - 1, pagination.pageSize, source, sort),
     data = _ThrowService$usePage.data,
     loading = _ThrowService$usePage.loading;
   var columns = [].concat(_toConsumableArray(subjectFlag === 'THROW_RESIDENT' ? [{
@@ -76,7 +78,8 @@ var ListZymx = function ListZymx(props) {
     title: '垃圾重量(kg)',
     dataIndex: 'weight',
     key: 'weight',
-    width: 100
+    width: 100,
+    align: 'right'
   }, qualityFlag && {
     title: '分类质量',
     dataIndex: 'evaluation',
@@ -102,7 +105,8 @@ var ListZymx = function ListZymx(props) {
     title: '上传时间',
     dataIndex: 'time',
     key: 'time',
-    width: 120
+    width: 120,
+    sorter: true
   }]);
   var pageChange = function pageChange(page) {
     setState({
@@ -111,6 +115,14 @@ var ListZymx = function ListZymx(props) {
       })
     });
   };
+  var handleTableChange = function handleTableChange(sorter) {
+    setState({
+      pagination: _objectSpread(_objectSpread({}, pagination), {}, {
+        current: 1
+      }),
+      sort: sorter !== null && sorter !== void 0 && sorter.order ? "".concat(sorter.field, ",").concat(sorter.order === 'ascend' ? 'asc' : 'desc') : ''
+    });
+  };
   var tableProps = {
     height: '100%',
     isIndex: false,
@@ -120,7 +132,8 @@ var ListZymx = function ListZymx(props) {
       total: (data === null || data === void 0 ? void 0 : data.total) || 0,
       defaultPageSize: 20,
       onChange: pageChange
-    })
+    }),
+    handleTableChange: handleTableChange
   };
   return /*#__PURE__*/_jsx("div", {
     className: "shxq-thr-table",

package/lib/vtx-wr-modal/components/Base/Jbxx.js

@@ -4,63 +4,18 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
 import { VtxImage } from '@vtx/components';
 import '@vtx/components/lib/vtx-image/style/index';
-import { getVtxToken, request } from '@vtx/utils';
-import { useEffect, useState } from 'react';
 import { VmEmpty, VmMap } from "../../../_components";
 import Sjjg from "./Sjjg";
-
-//基础设施详情
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-var getJcssDetail = function getJcssDetail(params) {
-  return request.get('/cloud/jcss-reborn/facility/get', {
-    data: params
-  });
-};
 export default (function (props) {
   var _gcDetail$geometryInf, _gcDetail$geometryInf2, _gcDetail$geometryInf3, _gcDetail$geometryInf4;
   var theme = props.theme,
     gcDetail = props.gcDetail,
     fields = props.fields;
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    imgList = _useState2[0],
-    setImgList = _useState2[1];
-  useEffect(function () {
-    if (gcDetail.id) {
-      if (gcDetail.photoIds) {
-        setImgList(JSON.parse(gcDetail.photoIds).map(function (item, index) {
-          return _objectSpread(_objectSpread({}, item), {}, {
-            index: index + 1,
-            name: item.name.split('.')[0],
-            url: "/vortex/rest/cloud/np/file/downloadFileThumbnail/".concat(item.id, "?token=").concat(getVtxToken('token'), "&outputQuality=0.5&scale=0.5")
-          });
-        }));
-      } else {
-        getJcssDetail({
-          id: gcDetail.id,
-          coordType: 'bd09'
-        }).then(function (res) {
-          if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
-            setImgList(res.data.typePhotoIds ? JSON.parse(res.data.typePhotoIds).map(function (item, index) {
-              return _objectSpread(_objectSpread({}, item), {}, {
-                index: index + 1,
-                name: item.name.split('.')[0],
-                url: "/vortex/rest/cloud/np/file/downloadFileThumbnail/".concat(item.id, "?token=").concat(getVtxToken('token'), "&outputQuality=0.5&scale=0.5")
-              });
-            }) : []);
-          }
-        });
-      }
-    }
-  }, [gcDetail]);
+  var _gcDetail$imgList = gcDetail.imgList,
+    imgList = _gcDetail$imgList === void 0 ? [] : _gcDetail$imgList;
   var isShow = function isShow(key) {
     return fields.filter(function (item) {
       return item.key === key;

package/lib/vtx-wr-modal/components/Base/Ptss.js

@@ -1,9 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export default (function (props) {
-  var _gcDetail$pitInuseMal, _gcDetail$pitTotalMal, _gcDetail$urinalNums, _gcDetail$squatNumMal, _gcDetail$seatNumMale, _gcDetail$manAccessib, _gcDetail$pitInuseFem, _gcDetail$pitTotalFem, _gcDetail$squatNumFem, _gcDetail$seatNumFema, _gcDetail$womanAccess;
+  var _gcDetail$jcssDetail, _gcDetail$noGenderNum, _gcDetail$noGenderNum2, _gcDetail$pitInuseMal, _gcDetail$pitTotalMal, _gcDetail$urinalNums, _gcDetail$squatNumMal, _gcDetail$seatNumMale, _gcDetail$manAccessib, _gcDetail$pitInuseFem, _gcDetail$pitTotalFem, _gcDetail$squatNumFem, _gcDetail$seatNumFema, _gcDetail$womanAccess;
   var theme = props.theme,
     gcDetail = props.gcDetail,
     fields = props.fields;
+  var isUniversalRestroom = ((_gcDetail$jcssDetail = gcDetail.jcssDetail) === null || _gcDetail$jcssDetail === void 0 || (_gcDetail$jcssDetail = _gcDetail$jcssDetail.dataJson) === null || _gcDetail$jcssDetail === void 0 ? void 0 : _gcDetail$jcssDetail.sfywxbcjId) === true;
   var ptss = [{
     name: '第三卫生间',
     key: 'third',
@@ -21,7 +22,7 @@ export default (function (props) {
     return item.showKey;
   });
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx("div", {
+    children: [!isUniversalRestroom && /*#__PURE__*/_jsx("div", {
       className: "wr-base-ptss",
       style: {
         padding: gcDetail.hasDevice ? '10px 136px 0' : '30px 136px 30px'
@@ -37,7 +38,40 @@ export default (function (props) {
           })]
         }, item.key);
       })
-    }), /*#__PURE__*/_jsxs("div", {
+    }), isUniversalRestroom ? /*#__PURE__*/_jsx("div", {
+      className: "wr-base-universal",
+      children: /*#__PURE__*/_jsxs("div", {
+        className: "wr-base-universal-card",
+        style: {
+          background: theme === 'blue' ? 'rgba(255, 203, 105, 0.2)' : '#FFF9EF'
+        },
+        children: [/*#__PURE__*/_jsxs("div", {
+          className: "wr-universal-title",
+          children: [/*#__PURE__*/_jsx("img", {
+            src: require("./assets/".concat(theme, "/tywsj.png")),
+            alt: "tywsj"
+          }), /*#__PURE__*/_jsx("div", {
+            children: "\u901A\u7528\u536B\u751F\u95F4"
+          })]
+        }), /*#__PURE__*/_jsxs("div", {
+          className: "wr-universal-total",
+          children: [/*#__PURE__*/_jsx("span", {
+            className: "wr-universal-tip"
+          }), /*#__PURE__*/_jsx("span", {
+            children: "\u5395\u4F4D\u6570"
+          }), /*#__PURE__*/_jsx("span", {
+            className: "wr-universal-used",
+            children: (_gcDetail$noGenderNum = gcDetail.noGenderNumInUse) !== null && _gcDetail$noGenderNum !== void 0 ? _gcDetail$noGenderNum : '--'
+          }), /*#__PURE__*/_jsx("span", {
+            children: "/"
+          }), /*#__PURE__*/_jsx("span", {
+            children: (_gcDetail$noGenderNum2 = gcDetail.noGenderNum) !== null && _gcDetail$noGenderNum2 !== void 0 ? _gcDetail$noGenderNum2 : '--'
+          }), /*#__PURE__*/_jsx("span", {
+            children: "\u4E2A"
+          })]
+        })]
+      })
+    }) : /*#__PURE__*/_jsxs("div", {
       style: {
         display: 'flex',
         flexDirection: gcDetail.hasDevice ? 'row' : 'column',
@@ -49,7 +83,7 @@ export default (function (props) {
         className: "wr-base-kws",
         style: {
           flex: gcDetail.hasDevice ? 1 : 'auto',
-          height: gcDetail.hasDevice ? 'auto' : '200px',
+          height: gcDetail.hasDevice ? 'auto' : '160px',
           background: theme === 'blue' ? 'rgba(51, 166, 255, 0.2)' : '#F3F8FF'
         },
         children: [/*#__PURE__*/_jsxs("div", {
@@ -109,7 +143,7 @@ export default (function (props) {
         }), /*#__PURE__*/_jsxs("div", {
           className: "wr-kws-each",
           style: {
-            padding: gcDetail.hasDevice ? '0' : '40px 80px'
+            padding: gcDetail.hasDevice ? '0' : '12px 80px 4px'
           },
           children: [showKeys.includes('urinalNums') && /*#__PURE__*/_jsxs("div", {
             children: [/*#__PURE__*/_jsx("span", {
@@ -165,7 +199,7 @@ export default (function (props) {
         className: "wr-base-kws",
         style: {
           flex: gcDetail.hasDevice ? 1 : 'auto',
-          height: gcDetail.hasDevice ? 'auto' : '200px',
+          height: gcDetail.hasDevice ? 'auto' : '160px',
           background: theme === 'blue' ? 'rgba(255,152,175,0.2)' : '#FFF2F5'
         },
         children: [/*#__PURE__*/_jsxs("div", {
@@ -225,7 +259,7 @@ export default (function (props) {
         }), /*#__PURE__*/_jsxs("div", {
           className: "wr-kws-each",
           style: {
-            padding: gcDetail.hasDevice ? '0' : '40px 80px'
+            padding: gcDetail.hasDevice ? '0' : '12px 80px 4px'
           },
           children: [showKeys.includes('womanSquatNums') && /*#__PURE__*/_jsxs("div", {
             children: [/*#__PURE__*/_jsx("span", {

package/lib/vtx-wr-modal/components/Base/index.js

@@ -1,16 +1,16 @@
 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; }
-import { request } from '@vtx/utils';
+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 { getVtxToken, request } from '@vtx/utils';
 import { useSetState } from 'ahooks';
 import { Alert, Tabs } from 'antd';
 import dayjs from 'dayjs';
@@ -27,6 +27,12 @@ var getDetail = function getDetail(params) {
     data: params
   });
 };
+//基础设施详情
+var getJcssDetail = function getJcssDetail(params) {
+  return request.get('/cloud/jcss-reborn/facility/get', {
+    data: params
+  });
+};
 //公厕配置字段
 var getFields = function getFields(params) {
   return request.get('/cloud/jcss-reborn/facility/type/view/detail', {
@@ -50,6 +56,19 @@ var getAlarmList = function getAlarmList(params) {
     data: JSON.stringify(params)
   });
 };
+var getImgList = function getImgList(photoIds, typePhotoIds) {
+  var photoList = photoIds || typePhotoIds;
+  if (!photoList) {
+    return [];
+  }
+  return (typeof photoList === 'string' ? JSON.parse(photoList) : photoList).map(function (item, index) {
+    return _objectSpread(_objectSpread({}, item), {}, {
+      index: index + 1,
+      name: item.name.split('.')[0],
+      url: "/vortex/rest/cloud/np/file/downloadFileThumbnail/".concat(item.id, "?token=").concat(getVtxToken('token'), "&outputQuality=0.5&scale=0.5")
+    });
+  });
+};
 export default (function (props) {
   var _monitorTypeList$filt;
   var theme = props.theme,
@@ -96,11 +115,22 @@ export default (function (props) {
     alarmList = state.alarmList;
   useEffect(function () {
     if (id) {
-      getDetail({
+      Promise.all([getDetail({
         id: id
-      }).then(function (res) {
-        if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
-          setGcDetail(res.data || {});
+      }), getJcssDetail({
+        id: id,
+        coordType: 'bd09'
+      })]).then(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+          detailRes = _ref2[0],
+          jcssRes = _ref2[1];
+        if ((detailRes === null || detailRes === void 0 ? void 0 : detailRes.result) === 0) {
+          var detailData = detailRes.data || {};
+          var jcssDetail = (jcssRes === null || jcssRes === void 0 ? void 0 : jcssRes.result) === 0 ? jcssRes.data || {} : {};
+          setGcDetail(_objectSpread(_objectSpread({}, detailData), {}, {
+            jcssDetail: jcssDetail,
+            imgList: getImgList(detailData.photoIds, jcssDetail.typePhotoIds)
+          }));
         }
       });
       getFields({
@@ -156,7 +186,7 @@ export default (function (props) {
   }];
   var tableProps = {
     columns: columns,
-    height: 270,
+    height: 220,
     isIndex: false,
     pagination: false,
     dataSource: alarmList
@@ -165,7 +195,7 @@ export default (function (props) {
     label: '监测数据',
     key: 'data',
     children: /*#__PURE__*/_jsx(VmLineCharts, {
-      height: 300,
+      height: 260,
       xAxis: echartsData.names || [],
       dataList: (echartsData.values || []).map(function (item, index) {
         return {
@@ -326,7 +356,8 @@ export default (function (props) {
       children: [/*#__PURE__*/_jsxs("div", {
         className: "wr-base-sjjg",
         style: {
-          height: gcDetail.hasDevice ? '270px' : '100%'
+          height: gcDetail.hasDevice ? '270px' : 'auto',
+          flex: gcDetail.hasDevice ? '0 0 270px' : '1 1 auto'
         },
         children: [/*#__PURE__*/_jsx("div", {
           className: "wr-base-title",

package/lib/vtx-wr-modal/components/Base/index.less

@@ -3,6 +3,9 @@
   height: 100%;
   display: flex;
   justify-content: space-between;
+  gap: 16px;
+  box-sizing: border-box;
+  min-width: 0;
   position: relative;
   .wr-base-alart {
     width: 100%;
@@ -23,6 +26,8 @@
   }
   .wr-base-left {
     width: 448px;
+    flex: 0 1 448px;
+    min-width: 0;
     height: 100%;
     border-radius: 8px;
     box-sizing: border-box;
@@ -32,6 +37,10 @@
       height: calc(100% - 50px);
       overflow: hidden;
       overflow-y: auto;
+      scrollbar-width: none;
+      &::-webkit-scrollbar {
+        display: none;
+      }
       .wr-base-img {
         width: 100%;
         height: 207px;
@@ -75,24 +84,51 @@
   }
   .wr-base-right {
     width: 704px;
+    flex: 1 1 704px;
+    min-width: 0;
+    min-height: 0;
+    box-sizing: border-box;
     height: 100%;
     overflow: hidden;
     overflow-y: auto;
+    display: flex;
+    flex-direction: column;
+    scrollbar-width: none;
+    &::-webkit-scrollbar {
+      display: none;
+    }
     .wr-base-sjjg {
       width: 100%;
+      box-sizing: border-box;
+      min-width: 0;
+      min-height: 0;
       height: 270px;
       padding-bottom: 16px;
       border-radius: 8px;
+      overflow: hidden;
+      overflow-y: auto;
+      scrollbar-width: none;
+      &::-webkit-scrollbar {
+        display: none;
+      }
     }
     .wr-base-jcbj {
       width: 100%;
-      height: 375px;
-      padding-bottom: 16px;
+      box-sizing: border-box;
+      min-width: 0;
+      min-height: 0;
+      height: auto;
+      flex: 1 1 auto;
+      padding-bottom: 8px;
       overflow: hidden;
       overflow-y: auto;
       border-radius: 8px;
       margin-top: 15px;
       position: relative;
+      scrollbar-width: none;
+      &::-webkit-scrollbar {
+        display: none;
+      }
       .ant-tabs-nav {
         margin-bottom: 0;
         padding-left: 16px;
@@ -211,6 +247,49 @@
     }
   }
 }
+.wr-base-universal {
+  padding: 16px 16px 0;
+  box-sizing: border-box;
+  height: auto;
+  display: flex;
+  align-items: flex-start;
+  .wr-base-universal-card {
+    width: 100%;
+    min-height: 76px;
+    border-radius: 8px;
+    padding: 14px 20px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .wr-universal-title {
+      display: flex;
+      gap: 10px;
+      align-items: center;
+      img {
+        width: 44px;
+        height: 44px;
+      }
+    }
+    .wr-universal-total {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      .wr-universal-tip {
+        width: 6px;
+        height: 6px;
+        border-radius: 3px;
+        background: #ffc30f;
+        box-shadow: 0 0 5px rgba(255, 195, 15, 0.8);
+      }
+      .wr-universal-used {
+        color: #1ce548;
+        font-size: 24px;
+        font-weight: bold;
+      }
+    }
+  }
+}
 .wr-base-kws {
   flex: 1;
   border-radius: 8px;
@@ -323,8 +402,12 @@
       height: calc(100% - 44px);
       overflow: hidden;
       overflow-y: auto;
+      scrollbar-width: none;
+      &::-webkit-scrollbar {
+        display: none;
+      }
       .each-value {
-        width: 120px;
+        width: calc((100% - 12px) / 3);
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -332,7 +415,7 @@
           font-weight: bold;
         }
         .each-factor-value {
-          width: 120px;
+          width: 100%;
           text-align: center;
           overflow: hidden;
           text-overflow: ellipsis;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "5.0.66",
+  "version": "5.0.69",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",