@vtx/modals2 5.0.13 → 5.0.15

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

@@ -1,13 +1,13 @@
-@import "../../../style";
+@import '../../../style/index';
 
 .vtx-road-rule-wrap {
   --bg-color: rgba(236, 240, 245, 0.52);
-  --time-color: #5E6169;
+  --time-color: #5e6169;
   --blue-bg-color: rgba(22, 119, 255, 0.15);
   --green-bg-color: rgba(15, 185, 100, 0.15);
   &.vtx-road-rule-wrap-dark {
-    --bg-color: rgba(11, 88, 142, 0.30);
-    --time-color: #6BA6DE;
+    --bg-color: rgba(11, 88, 142, 0.3);
+    --time-color: #6ba6de;
     --blue-bg-color: rgba(0, 183, 255, 0.1);
     --green-bg-color: rgba(28, 239, 134, 0.15);
   }
@@ -29,37 +29,38 @@
     color: var(--time-color);
     font-size: 12px;
   }
-  &-number, &-unit {
+  &-number,
+  &-unit {
     font-size: 20px;
     font-weight: bold;
     &.blue {
       color: var(--blue-color);
       &.dark {
-        .white_blue()
+        .white_blue();
       }
     }
     &.green {
       color: var(--green-color);
       &.dark {
-        .white_green()
+        .white_green();
       }
     }
     &.purple {
-      color: #B894F9;
+      color: #b894f9;
       &.dark {
-        .white_purple()
+        .white_purple();
       }
     }
     &.orange {
-      color: #FF8746;
+      color: #ff8746;
       &.dark {
-        .white_green()
+        .white_green();
       }
     }
     &.yellow {
-      color: #FFAA00;
+      color: #ffaa00;
       &.dark {
-        .white_yellow()
+        .white_yellow();
       }
     }
   }
@@ -86,20 +87,19 @@
       background: var(--green-bg-color);
     }
     &.purple {
-      color: #B894F9;
-      border-color: #B894F9;
+      color: #b894f9;
+      border-color: #b894f9;
       background: rgba(184, 148, 249, 0.15);
     }
     &.orange {
-      background: rgba(255, 135, 70, 0.10);
-      border-color: #FF8746;
-      color: #FF8746;
-
+      background: rgba(255, 135, 70, 0.1);
+      border-color: #ff8746;
+      color: #ff8746;
     }
     &.yellow {
       background: rgba(255, 170, 0, 0.1);
-      border-color: #FFAA00;
-      color: #FFAA00;
+      border-color: #ffaa00;
+      color: #ffaa00;
     }
   }
 }
@@ -125,12 +125,13 @@
     .left-info-label {
       color: var(--vm-calendar-cell-font-color);
     }
-    .left-info-value,.left-info-unit {
+    .left-info-value,
+    .left-info-unit {
       font-weight: bold;
       color: var(--vm-calendar-cell-font-color);
       font-size: 18px !important;
       &.dark {
-        .white_blue()
+        .white_blue();
       }
     }
     .left-info-unit {
@@ -139,9 +140,10 @@
     }
     &:last-child {
       margin-bottom: 0;
-      .left-info-value,.left-info-unit {
+      .left-info-value,
+      .left-info-unit {
         &.dark {
-          .white_cyan()
+          .white_cyan();
         }
       }
     }
@@ -178,30 +180,31 @@
           color: var(--vm-calendar-cell-font-color);
           font-size: 14px;
           font-weight: 600;
-          .work-rate-value, .work-rate-unit {
+          .work-rate-value,
+          .work-rate-unit {
             &.blue {
               &.dark {
-                .white_blue()
+                .white_blue();
               }
             }
             &.green {
               &.dark {
-                .white_green()
+                .white_green();
               }
             }
             &.purple {
               &.dark {
-                .white_purple()
+                .white_purple();
               }
             }
             &.orange {
               &.dark {
-                .white_green()
+                .white_green();
               }
             }
             &.yellow {
               &.dark {
-                .white_yellow()
+                .white_yellow();
               }
             }
           }

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) {