@vtx/modals2 5.0.14 → 5.0.17

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

@@ -60,108 +60,108 @@ 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'
 };

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

@@ -22,12 +22,12 @@ import { BasicService } from "./api";
 import { Alarm, Basic, Calendar, Collection, DetailInfo, SignAndContract } from "./components";
 import "./style";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-var TABS_BASE = 'restaurant-base';
-var TABS_DETAIL = 'restaurant-detail';
-var TABS_CALENDAR = 'restaurant-calendar';
-var TABS_SIGN = 'restaurant-sign';
-var TABS_ALARM = 'restaurant-alarm';
-var TABS_COLLECTION = 'restaurant-collection';
+var TABS_BASE = 'base';
+var TABS_DETAIL = 'detail';
+var TABS_CALENDAR = 'calendar';
+var TABS_SIGN = 'sign';
+var TABS_ALARM = 'alarm';
+var TABS_COLLECTION = 'collection';
 export var RestaurantContext = /*#__PURE__*/createContext({
   prefix: '',
   id: '',

package/lib/vtx-road-modal/components/Statistical/index.less

@@ -1,32 +1,32 @@
-.road-statistic-summary-main-rate {
-  --bg-color: linear-gradient(180deg, #E4EFFF 0%, #F5FBFF 100%);
-  &-dark {
-    --bg-color: linear-gradient(180deg, #1C7CBF 0%, #0B588E 100%);
-  }
-  width: 100%;
-  height: 130px;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  padding: 0 24px;
-  background: var(--bg-color);
-  border-radius: 8px;
-  &--block {
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
-  }
-  &--label {
-    display: flex;
-    gap: 4px;
-    align-items: center;
-    font-size: 16px;
-    color: var(--img-text-color);
-  }
-  &--value {
-    margin-left: 12px;
-    font-weight: bold;
-    font-size: 24px;
-    color: #1F1F1F;
-  }
-}
+.road-statistic-summary-main-rate {
+  --bg-color: linear-gradient(180deg, #E4EFFF 0%, #F5FBFF 100%);
+  &-dark {
+    --bg-color: linear-gradient(180deg, #1C7CBF 0%, #0B588E 100%);
+  }
+  width: 100%;
+  height: 130px;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  padding: 0 24px;
+  background: var(--bg-color);
+  border-radius: 8px;
+  &--block {
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+  }
+  &--label {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+    font-size: 16px;
+    color: var(--img-text-color);
+  }
+  &--value {
+    margin-left: 12px;
+    font-weight: bold;
+    font-size: 24px;
+    color: #1F1F1F;
+  }
+}

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

@@ -18,9 +18,9 @@ import { BaseService } from "./api";
 import { BaseInfo, Calendar, Statistical } from "./components";
 import "./style/index";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-var TABS_BASE = 'road-base';
-var TABS_STATIC = 'road-statistical';
-var TABS_CALENDAR = 'road-calendar';
+var TABS_BASE = 'base';
+var TABS_STATIC = 'statistical';
+var TABS_CALENDAR = 'calendar';
 var VtxRoadModal = function VtxRoadModal(props) {
   var id = props.id,
     title = props.title,

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

@@ -116,7 +116,7 @@ var BaseInfo = function BaseInfo(props) {
             extra: /*#__PURE__*/_jsx("div", {
               style: {
                 position: 'absolute',
-                right: 200,
+                right: 188,
                 top: 0,
                 borderRadius: 10,
                 background: 'rgba(12,154,255,0.99)'

package/lib/vtx-shxq-modal/components/Tfd/index.js

@@ -48,7 +48,7 @@ var TfdRecord = function TfdRecord(props) {
       extra: /*#__PURE__*/_jsx("div", {
         style: {
           position: 'absolute',
-          right: 200,
+          right: 188,
           top: 0,
           borderRadius: 10,
           background: 'rgba(12,154,255,0.99)'

package/lib/vtx-shxq-modal/components/Tfd/index.less

@@ -25,6 +25,12 @@
     padding-bottom: 20px;
     margin-bottom: 24px;
 
+    &:last-child {
+      margin-bottom: 0;
+      padding-bottom: 0;
+      border-bottom: 0;
+    }
+
     &-title {
       font-family: PingFang SC, PingFang SC;
       font-weight: 600;

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

@@ -66,7 +66,7 @@ var ThrowRecord = function ThrowRecord(props) {
           extra: /*#__PURE__*/_jsx("div", {
             style: {
               position: 'absolute',
-              right: 200,
+              right: 188,
               top: 0,
               borderRadius: 10,
               background: 'rgba(12,154,255,0.99)'

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

@@ -11,9 +11,9 @@ import { AlarmRecord, BaseInfo, Tfd, ThrowCalendar, ThrowRecord } from "./compon
 import "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 var TABS_BASE = 'base';
-var TABS_CALENDAR = 'calender';
+var TABS_CALENDAR = 'calendar';
 var TABS_THROW = 'throw';
-var TABS_ALARM = 'shxq-alarm';
+var TABS_ALARM = 'alarm';
 var TABS_TFD = 'tfd';
 var tabs = [{
   key: TABS_BASE,

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

@@ -10,21 +10,17 @@ import { BaseService } from "./api";
 import { AlarmInfo, Attendance, BaseInfo, Calendar, Equipment } from "./components";
 import "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
-var TABS_BASE = 'staff-base';
-var TABS_CALENDAR = 'staff-calender';
-var TABS_DETAIL = 'staff-detail';
-var TABS_ALARM = 'staff-alarm';
-var TABS_ATTENDANCE = 'staff-attendance';
-var TABS_EUQIPMENT = 'staff-equipment';
+var TABS_BASE = 'base';
+var TABS_CALENDAR = 'calendar';
+var TABS_ALARM = 'alarm';
+var TABS_ATTENDANCE = 'attendance';
+var TABS_EUQIPMENT = 'equipment';
 var tabs = [{
   key: TABS_BASE,
   title: '总览信息'
 }, {
   key: TABS_CALENDAR,
   title: '作业日历'
-}, {
-  key: TABS_DETAIL,
-  title: '详细信息'
 }, {
   key: TABS_ALARM,
   title: '报警信息'

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

@@ -12,9 +12,9 @@ import { BaseInfo } from "./components";
 import "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 var TABS_BASE = 'base';
-var TABS_CALENDAR = 'calender';
+var TABS_CALENDAR = 'calendar';
 var TABS_THROW = 'throw';
-var TABS_ALARM = 'tfd-alarm';
+var TABS_ALARM = 'alarm';
 var tabs = [{
   key: TABS_BASE,
   title: '总览信息'

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export default (function (props) {
-  var _gcDetail$pitTotalMal, _gcDetail$urinalNums, _gcDetail$squatNumMal, _gcDetail$seatNumMale, _gcDetail$manAccessib, _gcDetail$pitTotalFem, _gcDetail$squatNumFem, _gcDetail$seatNumFema, _gcDetail$womanAccess;
+  var _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;
@@ -56,24 +56,44 @@ export default (function (props) {
             }), /*#__PURE__*/_jsx("div", {
               children: "\u7537\u5395"
             })]
-          }), showKeys.includes('manPitNum') && /*#__PURE__*/_jsxs("div", {
+          }), /*#__PURE__*/_jsxs("div", {
             className: "wr-total-num",
-            children: [/*#__PURE__*/_jsxs("div", {
-              style: {
-                display: 'flex',
-                alignItems: 'center'
-              },
-              children: [/*#__PURE__*/_jsx("span", {
-                className: "num-tip-blue"
-              }), "\u5751\u4F4D\u603B\u6570"]
-            }), /*#__PURE__*/_jsx("div", {
-              className: "wr-num-total",
-              children: /*#__PURE__*/_jsx("span", {
+            children: [gcDetail.hasDevice && /*#__PURE__*/_jsxs(_Fragment, {
+              children: [/*#__PURE__*/_jsxs("div", {
+                style: {
+                  display: 'flex',
+                  alignItems: 'center'
+                },
+                children: [/*#__PURE__*/_jsx("span", {
+                  className: "num-tip-blue"
+                }), "\u5360\u7528"]
+              }), /*#__PURE__*/_jsx("div", {
+                className: "wr-num-total",
+                children: /*#__PURE__*/_jsx("span", {
+                  style: {
+                    fontSize: '24px'
+                  },
+                  children: (_gcDetail$pitInuseMal = gcDetail.pitInuseMale) !== null && _gcDetail$pitInuseMal !== void 0 ? _gcDetail$pitInuseMal : '--'
+                })
+              })]
+            }), showKeys.includes('manPitNum') && /*#__PURE__*/_jsxs(_Fragment, {
+              children: [/*#__PURE__*/_jsxs("div", {
                 style: {
-                  fontSize: '24px'
+                  display: 'flex',
+                  alignItems: 'center'
                 },
-                children: (_gcDetail$pitTotalMal = gcDetail.pitTotalMale) !== null && _gcDetail$pitTotalMal !== void 0 ? _gcDetail$pitTotalMal : '--'
-              })
+                children: [/*#__PURE__*/_jsx("span", {
+                  className: "num-tip-blue"
+                }), "\u5751\u4F4D\u603B\u6570"]
+              }), /*#__PURE__*/_jsx("div", {
+                className: "wr-num-total",
+                children: /*#__PURE__*/_jsx("span", {
+                  style: {
+                    fontSize: '24px'
+                  },
+                  children: (_gcDetail$pitTotalMal = gcDetail.pitTotalMale) !== null && _gcDetail$pitTotalMal !== void 0 ? _gcDetail$pitTotalMal : '--'
+                })
+              })]
             })]
           })]
         }), /*#__PURE__*/_jsxs("div", {
@@ -143,24 +163,44 @@ export default (function (props) {
             }), /*#__PURE__*/_jsx("div", {
               children: "\u5973\u5395"
             })]
-          }), showKeys.includes('womanPitNum') && /*#__PURE__*/_jsxs("div", {
+          }), /*#__PURE__*/_jsxs("div", {
             className: "wr-total-num",
-            children: [/*#__PURE__*/_jsxs("div", {
-              style: {
-                display: 'flex',
-                alignItems: 'center'
-              },
-              children: [/*#__PURE__*/_jsx("span", {
-                className: "num-tip-red"
-              }), "\u5751\u4F4D\u603B\u6570"]
-            }), /*#__PURE__*/_jsx("div", {
-              className: "wr-num-total",
-              children: /*#__PURE__*/_jsx("span", {
+            children: [gcDetail.hasDevice && /*#__PURE__*/_jsxs(_Fragment, {
+              children: [/*#__PURE__*/_jsxs("div", {
+                style: {
+                  display: 'flex',
+                  alignItems: 'center'
+                },
+                children: [/*#__PURE__*/_jsx("span", {
+                  className: "num-tip-red"
+                }), "\u5360\u7528"]
+              }), /*#__PURE__*/_jsx("div", {
+                className: "wr-num-total",
+                children: /*#__PURE__*/_jsx("span", {
+                  style: {
+                    fontSize: '24px'
+                  },
+                  children: (_gcDetail$pitInuseFem = gcDetail.pitInuseFemale) !== null && _gcDetail$pitInuseFem !== void 0 ? _gcDetail$pitInuseFem : '--'
+                })
+              })]
+            }), showKeys.includes('womanPitNum') && /*#__PURE__*/_jsxs(_Fragment, {
+              children: [/*#__PURE__*/_jsxs("div", {
                 style: {
-                  fontSize: '24px'
+                  display: 'flex',
+                  alignItems: 'center'
                 },
-                children: (_gcDetail$pitTotalFem = gcDetail.pitTotalFemale) !== null && _gcDetail$pitTotalFem !== void 0 ? _gcDetail$pitTotalFem : '--'
-              })
+                children: [/*#__PURE__*/_jsx("span", {
+                  className: "num-tip-red"
+                }), "\u5751\u4F4D\u603B\u6570"]
+              }), /*#__PURE__*/_jsx("div", {
+                className: "wr-num-total",
+                children: /*#__PURE__*/_jsx("span", {
+                  style: {
+                    fontSize: '24px'
+                  },
+                  children: (_gcDetail$pitTotalFem = gcDetail.pitTotalFemale) !== null && _gcDetail$pitTotalFem !== void 0 ? _gcDetail$pitTotalFem : '--'
+                })
+              })]
             })]
           })]
         }), /*#__PURE__*/_jsxs("div", {

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

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { request } from '@vtx/utils';
 import { useSetState } from 'ahooks';
-import { Tabs } from 'antd';
+import { Alert, Tabs } from 'antd';
 import dayjs from 'dayjs';
 import { useEffect, useState } from 'react';
 import { VmLineCharts, VmTable } from "../../../_components";
@@ -53,7 +53,8 @@ var getAlarmList = function getAlarmList(params) {
 export default (function (props) {
   var _monitorTypeList$filt;
   var theme = props.theme,
-    id = props.id;
+    id = props.id,
+    detail = props.detail;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     gcDetail = _useState2[0],
@@ -303,7 +304,18 @@ export default (function (props) {
   }, [date, activeKey]);
   return /*#__PURE__*/_jsxs("div", {
     className: "wr-base-content",
-    children: [/*#__PURE__*/_jsxs("div", {
+    children: [detail.fallDownAlarm && /*#__PURE__*/_jsx("div", {
+      className: "wr-base-alart",
+      children: /*#__PURE__*/_jsx(Alert, {
+        message: /*#__PURE__*/_jsxs("div", {
+          children: [/*#__PURE__*/_jsx("img", {
+            src: require("./assets/alert.png")
+          }), "\u2002 ", detail.fallDownAlarm]
+        }),
+        type: "warning",
+        closable: true
+      })
+    }), /*#__PURE__*/_jsxs("div", {
       className: "wr-base-left",
       children: [/*#__PURE__*/_jsx("div", {
         className: "wr-base-title",

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

@@ -3,6 +3,19 @@
   height: 100%;
   display: flex;
   justify-content: space-between;
+  position: relative;
+  .wr-base-alart {
+    width: 100%;
+    height: 50px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    border-radius: 8px;
+    overflow: hidden;
+    .ant-alert-message {
+      color: #ffa100;
+    }
+  }
   .wr-base-title {
     padding: 12px 16px;
     font-size: 16px;
@@ -214,7 +227,7 @@
     }
     .wr-total-num {
       display: flex;
-      gap: 30px;
+      gap: 8px;
       align-items: center;
       .num-tip-blue {
         display: flex;

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

@@ -72,7 +72,9 @@ export default (function (props) {
       }
     });
   }, [id]);
-  var contentList = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, 'wr-base', /*#__PURE__*/_jsx(Base, _objectSpread({}, props))), 'wr-appraise', /*#__PURE__*/_jsx(Appraise, _objectSpread({}, props))), 'wr-score', /*#__PURE__*/_jsx(Score, _objectSpread({}, props))), 'wr-build', /*#__PURE__*/_jsx(Build, _objectSpread({}, props))), 'wr-file', /*#__PURE__*/_jsx(File, _objectSpread({}, props)));
+  var contentList = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, 'base', /*#__PURE__*/_jsx(Base, _objectSpread(_objectSpread({}, props), {}, {
+    detail: detail
+  }))), 'appraise', /*#__PURE__*/_jsx(Appraise, _objectSpread({}, props))), 'score', /*#__PURE__*/_jsx(Score, _objectSpread({}, props))), 'build', /*#__PURE__*/_jsx(Build, _objectSpread({}, props))), 'file', /*#__PURE__*/_jsx(File, _objectSpread({}, props)));
 
   // 自定义页签可配置多个，
   if (config !== null && config !== void 0 && config.length) {

package/lib/vtx-zf-modal/components/Record/index.js

@@ -67,13 +67,21 @@ export default (function (props) {
       dataIndex: 'fromContent',
       key: 'fromContent',
       width: 110,
-      ellipsis: true
+      ellipsis: true,
+      render: function render(text) {
+        var value = (text || '').replaceAll(' ', '');
+        return value;
+      }
     }, {
       title: '修改后的值',
       dataIndex: 'toContent',
       key: 'toContent',
       width: 110,
-      ellipsis: true
+      ellipsis: true,
+      render: function render(text) {
+        var value = (text || '').replaceAll(' ', '');
+        return value;
+      }
     }, {
       title: '修改人',
       dataIndex: 'changeStaffName',

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

@@ -40,27 +40,11 @@ export default (function (props) {
     _useState2 = _slicedToArray(_useState, 2),
     detail = _useState2[0],
     setDetail = _useState2[1];
-  var _useState3 = useState([{
-      title: '基本信息',
-      key: 'zf-base'
-    }, {
-      title: '流程信息',
-      key: 'zf-process'
-    }, {
-      title: '附件信息',
-      key: 'zf-file'
-    }, {
-      title: '文书',
-      key: 'zf-document'
-    }, {
-      title: '修改记录',
-      key: 'zf-record'
-    }]),
+  var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     config = _useState4[0],
     setConfig = _useState4[1];
   useEffect(function () {
-    return;
     getByCode({
       code: 'zhzf'
     }).then(function (res) {

package/lib/vtx-zzz-modal/style/index.js

@@ -0,0 +1 @@
+import "../../vtx-df-modal/style/";

package/package.json

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