@vtx/modals2 6.0.0-beta.3 → 6.0.0-beta.30

package/lib/vtx-staff-modal/components/AlarmInfo/Charts.js

@@ -1,7 +1,8 @@
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { VmEmpty, VmLineCharts, VmPieCharts } from "../../../_components";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Charts = function Charts(_ref) {
+  var _chartData$filter;
   var chartData = _ref.chartData,
     lineData = _ref.lineData;
   var legends = lineData.legends,
@@ -17,7 +18,9 @@ var Charts = function Charts(_ref) {
       });
     });
   }
-  var total = chartData === null || chartData === void 0 ? void 0 : chartData.reduce(function (acc, cur) {
+  var total = chartData === null || chartData === void 0 || (_chartData$filter = chartData.filter(function (item) {
+    return item.alarmTypeCode;
+  })) === null || _chartData$filter === void 0 ? void 0 : _chartData$filter.reduce(function (acc, cur) {
     return acc + cur.value;
   }, 0);
   return /*#__PURE__*/_jsxs("div", {

package/lib/vtx-staff-modal/components/AlarmInfo/List.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 报警信息-列表
  */

package/lib/vtx-staff-modal/components/AlarmInfo/index.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 车辆-报警信息
  */

package/lib/vtx-staff-modal/components/Attendance/Exeception.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 异常统计
  */

package/lib/vtx-staff-modal/components/Attendance/Record.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 考勤记录
  */

package/lib/vtx-staff-modal/components/Attendance/WorkingHours.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 工时统计
  */

package/lib/vtx-staff-modal/components/BaseInfo/ListZymx.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 作业明细-列表
  */

package/lib/vtx-staff-modal/components/BaseInfo/WorkStatic.js

@@ -1,4 +1,4 @@
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 区域进场量分析
  */

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

@@ -18,7 +18,7 @@ import { BaseService } from "../../api";
 import "./index.less";
 import ListZymx from "./ListZymx";
 import WorkStatic from "./WorkStatic";
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var BaseInfo = function BaseInfo(props) {
   var id = props.id,

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

@@ -30,7 +30,7 @@ import overTimeDark from "../../imgs/time_over_dark.png";
 import sumTime from "../../imgs/time_sum.png";
 import sumTimeDark from "../../imgs/time_sum_dark.png";
 import "./index.less";
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var StaticInfo = function StaticInfo(_ref) {
   var id = _ref.id,

package/lib/vtx-staff-modal/components/Calendar/index.less

@@ -11,7 +11,7 @@
   .ant-picker-calendar-full
     .ant-picker-panel
     .ant-picker-calendar-date-content {
-    height: 112px;
+    height: 112px !important;
   }
 
   .ant-picker-calendar-full

package/lib/vtx-staff-modal/components/Equipment/index.js

@@ -4,7 +4,7 @@ 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); }
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 设备信息
  */

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

@@ -6,7 +6,7 @@ import { useMemo } from 'react';
 import VmCustom from "../_components/vm-custom";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
-import { translateLocaleText } from "./../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 import { BaseService } from "./api";
 import { AlarmInfo, Attendance, BaseInfo, Calendar, Equipment } from "./components";
 import "./style";

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

@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { request } from '@vtx/utils';
 import { useRequest } from 'ahooks';
-import { translateLocaleText } from "./../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 var BaseService = {
   useBaseInfo: function useBaseInfo(id) {
     var _baseInfoRes$data, _info$timePeriods;
@@ -42,9 +42,9 @@ var BaseService = {
     }, {
       label: translateLocaleText("t('vtxtfdmodal.hours')"),
       key: 'householdNum',
-      value: info === null || info === void 0 || (_info$timePeriods = info.timePeriods) === null || _info$timePeriods === void 0 || (_info$timePeriods = _info$timePeriods.map(function (ele) {
+      value: info !== null && info !== void 0 && info.timePeriods && _typeof(info.timePeriods) === 'object' ? (_info$timePeriods = info.timePeriods) === null || _info$timePeriods === void 0 || (_info$timePeriods = _info$timePeriods.map(function (ele) {
         return "".concat(ele.startTime, "~").concat(ele.endTime);
-      })) === null || _info$timePeriods === void 0 ? void 0 : _info$timePeriods.join('、')
+      })) === null || _info$timePeriods === void 0 ? void 0 : _info$timePeriods.join('、') : info === null || info === void 0 ? void 0 : info.timePeriods
     }, {
       label: translateLocaleText("t('vtxtfdmodal.supervisor')"),
       key: 'supervisorName',

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

@@ -4,9 +4,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { translateLocaleText } from "./../../../hooks/useTranslation.ts";
-/**
- * 监测指标趋势分析
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
+/**
+ * 监测指标趋势分析
  */
 import { useSetState } from 'ahooks';
 import dayjs from 'dayjs';

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

@@ -1,4 +1,4 @@
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 /**
  * 区域进场量分析
  */

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

@@ -21,7 +21,7 @@ import useSettings from "../../../_hooks/useSettings";
 import { DownIcon, UpIcon } from "../../../_util/iconSvgHtml";
 import { BaseService } from "../../api";
 import "./index.less";
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 // svg大小比png2倍还大，不如使用2次png
 import { sumBy } from 'lodash';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";

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

@@ -16,7 +16,7 @@ import dayjs from 'dayjs';
 import { useEffect } from 'react';
 import { VmBarCharts, VmTable } from "../../../_components";
 import { VMRangePicker } from "../../../_components/vm-filter";
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 //柱状图
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var overview = function overview(params) {
@@ -151,7 +151,7 @@ export default (function (props) {
                       fontSize: '20px'
                     },
                     children: (_baseInfo$total = baseInfo.total) !== null && _baseInfo$total !== void 0 ? _baseInfo$total : 0
-                  }), translateLocaleText("t('vtxwrmodal.nbspTimes')")]
+                  }), "\xA0", translateLocaleText("t('vtxwrmodal.nbspTimes')")]
                 })]
               })]
             }), /*#__PURE__*/_jsxs("div", {
@@ -168,7 +168,7 @@ export default (function (props) {
                       fontSize: '20px'
                     },
                     children: (_baseInfo$score = baseInfo.score) !== null && _baseInfo$score !== void 0 ? _baseInfo$score : 0
-                  }), translateLocaleText("t('vtxwrmodal.nbsp')")]
+                  }), "\xA0", translateLocaleText("t('vtxwrmodal.nbsp')")]
                 })]
               })]
             })]

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

@@ -4,62 +4,19 @@ 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 { getVtxToken, request } from '@vtx/utils';
-import { useEffect, useState } from 'react';
+import '@vtx/components/lib/vtx-image/style/index';
 import { VmEmpty, VmMap } from "../../../_components";
 import Sjjg from "./Sjjg";
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
-//基础设施详情
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 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,10 +1,11 @@
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 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: translateLocaleText("t('vtxwrmodal.thirdToilet')"),
     key: 'third',
@@ -22,7 +23,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'
@@ -38,7 +39,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',
@@ -50,7 +84,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", {
@@ -110,7 +144,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", {
@@ -166,7 +200,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", {
@@ -226,7 +260,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/Sjjg.js

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { request } from '@vtx/utils';
 import { useSetState } from 'ahooks';
 import { useEffect } from 'react';
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var readData = function readData(params) {
   return request.get('/cloud/zhgc-reborn/api/gis/pop/readData', {

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';
@@ -19,7 +19,7 @@ import { VmLineCharts, VmTable } from "../../../_components";
 import { VMDatePicker, VMRangePicker, VMSelect } from "../../../_components/vm-filter";
 import Jbxx from "./Jbxx";
 import Ptss from "./Ptss";
-import { translateLocaleText } from "./../../../hooks/useTranslation.ts";
+import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 //公厕详情
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var getDetail = function getDetail(params) {
@@ -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: translateLocaleText("t('vtxwrmodal.monitoringData')"),
     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",