@vtx/modals2 6.0.0-beta.2 → 6.0.0-beta.21

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

@@ -163,7 +163,11 @@ export var RestaurantConfigureEnum = {
   /**
    * 证件图片
    */
-  PAPER_FILE_IDS: 'paperFileIds'
+  PAPER_FILE_IDS: 'paperFileIds',
+  /**
+   * 排序号
+   */
+  ORDER_INDEX: 'orderIndex'
 };
 export var getFormItem = function getFormItem(item, data) {
   var _formItemMap;
@@ -192,7 +196,8 @@ export var getFormItem = function getFormItem(item, data) {
     businessTime = data.businessTime,
     trashBinLocationPhoto = data.trashBinLocationPhoto,
     signedStatusValue = data.signedStatusValue,
-    suggestCollectTime = data.suggestCollectTime;
+    suggestCollectTime = data.suggestCollectTime,
+    orderIndex = data.orderIndex;
   var dataKey = item.dataKey;
   var formItemMap = (_formItemMap = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_formItemMap, RestaurantConfigureEnum.CODE, {
     label: "t('vtxrestaurantmodal.unit')",
@@ -256,7 +261,7 @@ export var getFormItem = function getFormItem(item, data) {
   }), RestaurantConfigureEnum.REGISTER_MONEY, {
     label: "t('vtxrestaurantmodal.registerMoney')",
     value: registerMoney
-  }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_formItemMap, RestaurantConfigureEnum.ESTABLISHED_TIME, {
+  }), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_formItemMap, RestaurantConfigureEnum.ESTABLISHED_TIME, {
     label: "t('vtxrestaurantmodal.enterpriseHours')",
     value: establishedTime
   }), RestaurantConfigureEnum.SUGGEST_COLLECT_TIME, {
@@ -277,6 +282,9 @@ export var getFormItem = function getFormItem(item, data) {
     label: "t('vtxrestaurantmodal.image2')",
     value: paperFileIds,
     type: 'img'
+  }), RestaurantConfigureEnum.ORDER_INDEX, {
+    label: '排序号',
+    value: orderIndex
   }));
   return formItemMap[dataKey];
 };

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

@@ -20,6 +20,7 @@ import { VmEmpty, VmProgress, VmTable, VmTag, VmWrapper } from "../../../_compon
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
 import { translateLocaleText } from "./../../../hooks/useTranslation.js";
+import { buildIframeQuery } from "../../utils/url";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Work = function Work(props) {
   var id = props.id,
@@ -127,7 +128,14 @@ var Work = function Work(props) {
           if (prefixList.length === 2) {
             prefix = "/".concat(prefixList[0]);
           }
-          var src = "".concat(prefix, "/carHistory/#/zyqsHistory?carId=").concat(record.carId, "&theme=").concat(theme === 'blue' ? 'dark' : theme, "&startTime=").concat(dayjs(date).format('YYYY-MM-DD 00:00:00'), "&endTime=").concat(dayjs(date).format('YYYY-MM-DD 23:59:59'), "&").concat(location.href.split('?')[1], "&roadId=").concat(record.roadId);
+          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'),
+            roadId: record.roadId
+          });
+          var src = "".concat(prefix, "/carHistory/#/zyqsHistory?").concat(query);
           setIframeModalInfo({
             title: translateLocaleText("t('vtxroadmodal.vehicleTrack')"),
             visible: true,

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

@@ -18,6 +18,7 @@ import { useMemo, useState } from 'react';
 import { VmBarCharts, VmEmpty, VmProgress, VmTable, VmTag, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { LaneService } from "../../api";
+import { buildIframeQuery } from "../../utils/url";
 import { translateLocaleText } from "./../../../hooks/useTranslation.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var getPercentInfo = function getPercentInfo(percent) {
@@ -220,7 +221,13 @@ var Work = function Work(props) {
           if (prefixList.length === 2) {
             prefix = "/".concat(prefixList[0]);
           }
-          var src = "".concat(prefix, "/carHistory/#/zyqsLaneHistory?carId=").concat(record.workCarId, "&theme=").concat(theme === 'blue' ? 'dark' : theme, "&startTime=").concat(dayjs(date).format('YYYY-MM-DD 00:00:00'), "&endTime=").concat(dayjs(date).format('YYYY-MM-DD 23:59:59'), "&").concat(location.href.split('?')[1]);
+          var query = buildIframeQuery(location.href.split('?')[1], {
+            carId: record.workCarId,
+            theme: theme === 'blue' ? 'dark' : theme,
+            startTime: dayjs(day).format('YYYY-MM-DD 00:00:00'),
+            endTime: dayjs(day).format('YYYY-MM-DD 23:59:59')
+          });
+          var src = "".concat(prefix, "/carHistory/#/zyqsLaneHistory?").concat(query);
           setIframeModalInfo({
             title: translateLocaleText("t('vtxroadmodal.vehicleTrack')"),
             visible: true,

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

@@ -58,6 +58,9 @@ var Calendar = function Calendar(_ref) {
   }
   var dateCellRender = function dateCellRender(value) {
     var date = dayjs(value).format('YYYY-MM-DD');
+    if (dayjs().isBefore(dayjs(value))) {
+      return null;
+    }
     var info = calendarInfo[date];
     var _ref2 = info || {},
       planMileage = _ref2.planMileage,

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

@@ -12,12 +12,14 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
 import { VmIframeModal } from "../_components";
+import Appraisal from "../_components/vm-appraisal-info";
+import VmCustom from "../_components/vm-custom";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 import { BaseService } from "./api";
-import { BaseInfo, Calendar, Statistical, LaneBaseInfo, LaneStatistical, LaneCalendar } from "./components";
+import { BaseInfo, Calendar, LaneBaseInfo, LaneCalendar, LaneStatistical, Statistical } from "./components";
 import "./style/index";
-import { translateLocaleText } from "./../hooks/useTranslation.js";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_STATIC = 'statistical';
@@ -25,8 +27,8 @@ var TABS_CALENDAR = 'calendar';
 var TABS_LANE_BASE = 'lane-base';
 var TABS_LANE_STATIC = 'lane-statistical';
 var TABS_LANE_CALENDAR = 'lane-calendar';
+var TABS_APPRAISAL = 'appraisal';
 var VtxRoadModal = function VtxRoadModal(props) {
-  var _contents;
   var id = props.id,
     title = props.title,
     subTitle = props.subTitle,
@@ -50,8 +52,10 @@ var VtxRoadModal = function VtxRoadModal(props) {
       title: translateLocaleText("t('vtxroadmodal.statisticalInformation')")
     });
   }
+  // 配置尚未返回或未配置页签时，沿用道路弹窗原有的默认页签。
   var _useGetConfig = useGetConfig('tr', tabs),
     tabsData = _useGetConfig.tabsData;
+  var tabsList = tabsData || [];
   var _useSetState = useSetState({
       src: '',
       visible: false,
@@ -84,7 +88,19 @@ var VtxRoadModal = function VtxRoadModal(props) {
   var laneCalendarContent = /*#__PURE__*/_jsx(LaneCalendar, {
     id: id
   });
-  var contents = (_contents = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_BASE, baseContent), "tr-".concat(TABS_BASE), baseContent), TABS_STATIC, statisticalContent), "tr-".concat(TABS_STATIC), statisticalContent), TABS_CALENDAR, calendarContent), "tr-".concat(TABS_CALENDAR), calendarContent), TABS_LANE_BASE, laneBaseContent), "tr-".concat(TABS_LANE_BASE), laneBaseContent), TABS_LANE_STATIC, laneStatisticalContent), "tr-".concat(TABS_LANE_STATIC), laneStatisticalContent), _defineProperty(_defineProperty(_contents, TABS_LANE_CALENDAR, laneCalendarContent), "tr-".concat(TABS_LANE_CALENDAR), laneCalendarContent));
+  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, baseContent), TABS_STATIC, statisticalContent), TABS_CALENDAR, calendarContent), TABS_LANE_BASE, laneBaseContent), TABS_LANE_STATIC, laneStatisticalContent), TABS_LANE_CALENDAR, laneCalendarContent), TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
+    id: id
+  }));
+
+  // 自定义页签可配置多个。
+  tabsList.forEach(function (tab) {
+    if (tab.url) {
+      contents[tab.key] = /*#__PURE__*/_jsx(VmCustom, {
+        id: id,
+        url: tab.url
+      });
+    }
+  });
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [visible && /*#__PURE__*/_jsx(VtxBaseModal, {
       title: title,
@@ -93,7 +109,7 @@ var VtxRoadModal = function VtxRoadModal(props) {
       theme: theme,
       visible: visible,
       onCancel: onCancel,
-      tabs: tabsData,
+      tabs: tabsList,
       tabChose: tabChose,
       startDate: startDate,
       endDate: endDate,

package/lib/vtx-road-modal/utils/url.js

@@ -0,0 +1,12 @@
+export var buildIframeQuery = function buildIframeQuery() {
+  var routeQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var searchParams = new URLSearchParams(routeQuery || '');
+  Object.keys(params).forEach(function (key) {
+    var value = params[key];
+    if (value !== undefined && value !== null) {
+      searchParams.set(key, value);
+    }
+  });
+  return searchParams.toString().replace(/\+/g, '%20');
+};

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

@@ -43,8 +43,8 @@ var BaseService = {
       value: info === null || info === void 0 ? void 0 : info.divisionName
     }, {
       label: translateLocaleText("t('vtxshxqmodal.type2')"),
-      key: 'classTypeName',
-      value: info === null || info === void 0 ? void 0 : info.classTypeName
+      key: 'facilityClassName',
+      value: info === null || info === void 0 ? void 0 : info.facilityClassName
     }, {
       label: translateLocaleText("t('vtxshxqmodal.pointQuantityItems')"),
       key: 'throwPointNum',
@@ -201,14 +201,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/ThrowCalendar/List.js

@@ -11,8 +11,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { translateLocaleText } from "./../../../hooks/useTranslation.js";
-/**
- * 作业明细-列表
+/**
+ * 作业明细-列表
  */
 
 import { useSetState } from 'ahooks';

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

@@ -31,19 +31,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' ? [{
@@ -77,7 +79,8 @@ var ListZymx = function ListZymx(props) {
     title: translateLocaleText("t('vtxshxqmodal.weightKg')"),
     dataIndex: 'weight',
     key: 'weight',
-    width: 120
+    width: 120,
+    align: 'right'
   }, qualityFlag && {
     title: translateLocaleText("t('vtxsdydtfdmodal.classificationQuality')"),
     dataIndex: 'evaluation',
@@ -103,7 +106,8 @@ var ListZymx = function ListZymx(props) {
     title: translateLocaleText("t('vtxshxqmodal.hours4')"),
     dataIndex: 'time',
     key: 'time',
-    width: 120
+    width: 120,
+    sorter: true
   }]);
   var pageChange = function pageChange(page) {
     setState({
@@ -112,6 +116,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,
@@ -121,7 +133,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-shxq-modal/index.js

@@ -3,19 +3,26 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { useMemo } from 'react';
+import Appraisal from "../_components/vm-appraisal-info";
 import VmCustom from "../_components/vm-custom";
+import VmRepairMaintain from "../_components/vm-repair-maintain";
+import VmVideo, { insertVideoTab } from "../_components/vm-video";
+import useGetChannels from "../_hooks/useGetChannels";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
+import { translateLocaleText } from "./../hooks/useTranslation.js";
 import { BaseService } from "./api";
 import { AlarmRecord, BaseInfo, Tfd, ThrowCalendar, ThrowRecord } from "./components";
 import "./style";
-import { translateLocaleText } from "./../hooks/useTranslation.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_CALENDAR = 'calendar';
 var TABS_THROW = 'throw';
 var TABS_ALARM = 'alarm';
 var TABS_TFD = 'tfd';
+var TABS_APPRAISAL = 'appraisal';
+var TABS_VIDEO = 'video';
+var TABS_RM = 'rm';
 var tabs = [{
   key: TABS_BASE,
   title: translateLocaleText("t('vtxdefaultmodal.overviewInformation')")
@@ -56,11 +63,15 @@ var VtxShxqModal = function VtxShxqModal(props) {
     baseInfo = _BaseService$useBaseI.baseInfo;
   var _useGetConfig = useGetConfig(info.typeCode, tabs),
     tabsData = _useGetConfig.tabsData;
+  var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
+      return ele.key === 'video';
+    })) > -1),
+    channels = _useGetChannels.channels;
   var tabsList = useMemo(function () {
     var tabsList = tabsData;
-    return tabsList;
-  }, [JSON.stringify(tabsData)]);
-  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {
+    return insertVideoTab(tabsList, channels);
+  }, [JSON.stringify(tabsData), JSON.stringify(channels)]);
+  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {
     id: id,
     info: info,
     baseInfo: baseInfo,
@@ -76,6 +87,12 @@ var VtxShxqModal = function VtxShxqModal(props) {
   })), TABS_TFD, /*#__PURE__*/_jsx(Tfd, {
     id: id,
     service: "rykq"
+  })), TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
+    id: id
+  })), TABS_RM, /*#__PURE__*/_jsx(VmRepairMaintain, {
+    id: id
+  })), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
+    channels: channels
   }));
 
   // 自定义页签可配置多个，

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

@@ -2,6 +2,7 @@ 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-tfd-modal/api.js

@@ -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

@@ -5,8 +5,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { translateLocaleText } from "./../../../hooks/useTranslation.js";
-/**
- * 监测指标趋势分析
+/**
+ * 监测指标趋势分析
  */
 import { useSetState } from 'ahooks';
 import dayjs from 'dayjs';

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.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.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", {