@vtx/modals2 5.0.3 → 5.0.4

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

@@ -1,218 +1,218 @@
-@import "../../../style";
-
-.vtx-road-rule-wrap {
-  --bg-color: rgba(236, 240, 245, 0.52);
-  --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;
-    --blue-bg-color: rgba(0, 183, 255, 0.1);
-    --green-bg-color: rgba(28, 239, 134, 0.15);
-  }
-
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-
-  &-item-wrap {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 24px;
-    border-radius: 4px;
-    background: var(--bg-color);
-    padding-right: 12px;
-  }
-  &-time {
-    color: var(--time-color);
-    font-size: 12px;
-  }
-  &-number, &-unit {
-    font-size: 20px;
-    font-weight: bold;
-    &.blue {
-      color: var(--blue-color);
-      &.dark {
-        .white_blue()
-      }
-    }
-    &.green {
-      color: var(--green-color);
-      &.dark {
-        .white_green()
-      }
-    }
-    &.purple {
-      color: #B894F9;
-      &.dark {
-        .white_purple()
-      }
-    }
-    &.orange {
-      color: #FF8746;
-      &.dark {
-        .white_green()
-      }
-    }
-    &.yellow {
-      color: #FFAA00;
-      &.dark {
-        .white_yellow()
-      }
-    }
-  }
-  &-unit {
-    margin-left: 4px;
-    font-size: 14px !important;
-  }
-  &-work {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 4px 4px 4px 4px;
-    padding: 0 8px;
-    height: 24px;
-    border: 1px solid;
-    &.blue {
-      color: var(--blue-color);
-      border-color: var(--blue-color);
-      background: var(--blue-bg-color);
-    }
-    &.green {
-      color: var(--green-color);
-      border-color: var(--green-color);
-      background: var(--green-bg-color);
-    }
-    &.purple {
-      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;
-
-    }
-    &.yellow {
-      background: rgba(255, 170, 0, 0.1);
-      border-color: #FFAA00;
-      color: #FFAA00;
-    }
-  }
-}
-
-.vtx-road-work-wrap {
-  display: flex;
-  align-items: center;
-  padding: 24px 28px 24px 45px;
-  justify-content: space-between;
-  .left-info {
-    display: flex;
-    gap: 8px;
-    color: var(--vm-calendar-cell-font-color);
-    margin-bottom: 10px;
-    align-items: center;
-    font-size: 14px;
-    .left-info-dot {
-      width: 6px;
-      height: 6px;
-      background: #b9c4d4;
-      border-radius: 50%;
-    }
-    .left-info-label {
-      color: var(--vm-calendar-cell-font-color);
-    }
-    .left-info-value,.left-info-unit {
-      font-weight: bold;
-      color: var(--vm-calendar-cell-font-color);
-      font-size: 18px !important;
-      &.dark {
-        .white_blue()
-      }
-    }
-    .left-info-unit {
-      font-size: 14px !important;
-      margin-left: 4px;
-    }
-    &:last-child {
-      margin-bottom: 0;
-      .left-info-value,.left-info-unit {
-        &.dark {
-          .white_cyan()
-        }
-      }
-    }
-  }
-  .road-work-left {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    .all-rate-wrap {
-      margin-bottom: 20px;
-    }
-  }
-  .road-work-right {
-    display: flex;
-    flex-direction: column;
-    gap: 25px;
-    .road-work-right-item {
-      display: flex;
-      align-items: center;
-      gap: 10px;
-      color: var(--vm-calendar-cell-font-color);
-      font-size: 12px;
-      .road-work-right-item-left {
-        width: 220px;
-        .road-work-right-item-left-info {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-        }
-        .work-type {
-          font-size: 14px;
-        }
-        .work-rate {
-          color: var(--vm-calendar-cell-font-color);
-          font-size: 14px;
-          font-weight: 600;
-          .work-rate-value, .work-rate-unit {
-            &.blue {
-              &.dark {
-                .white_blue()
-              }
-            }
-            &.green {
-              &.dark {
-                .white_green()
-              }
-            }
-            &.purple {
-              &.dark {
-                .white_purple()
-              }
-            }
-            &.orange {
-              &.dark {
-                .white_green()
-              }
-            }
-            &.yellow {
-              &.dark {
-                .white_yellow()
-              }
-            }
-          }
-          .work-rate-value {
-            font-size: 20px;
-          }
-          .work-rate-unit {
-            margin-left: 4px;
-          }
-        }
-      }
-    }
-  }
-}
+@import "../../../style";
+
+.vtx-road-rule-wrap {
+  --bg-color: rgba(236, 240, 245, 0.52);
+  --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;
+    --blue-bg-color: rgba(0, 183, 255, 0.1);
+    --green-bg-color: rgba(28, 239, 134, 0.15);
+  }
+
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+
+  &-item-wrap {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 24px;
+    border-radius: 4px;
+    background: var(--bg-color);
+    padding-right: 12px;
+  }
+  &-time {
+    color: var(--time-color);
+    font-size: 12px;
+  }
+  &-number, &-unit {
+    font-size: 20px;
+    font-weight: bold;
+    &.blue {
+      color: var(--blue-color);
+      &.dark {
+        .white_blue()
+      }
+    }
+    &.green {
+      color: var(--green-color);
+      &.dark {
+        .white_green()
+      }
+    }
+    &.purple {
+      color: #B894F9;
+      &.dark {
+        .white_purple()
+      }
+    }
+    &.orange {
+      color: #FF8746;
+      &.dark {
+        .white_green()
+      }
+    }
+    &.yellow {
+      color: #FFAA00;
+      &.dark {
+        .white_yellow()
+      }
+    }
+  }
+  &-unit {
+    margin-left: 4px;
+    font-size: 14px !important;
+  }
+  &-work {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 4px 4px 4px 4px;
+    padding: 0 8px;
+    height: 24px;
+    border: 1px solid;
+    &.blue {
+      color: var(--blue-color);
+      border-color: var(--blue-color);
+      background: var(--blue-bg-color);
+    }
+    &.green {
+      color: var(--green-color);
+      border-color: var(--green-color);
+      background: var(--green-bg-color);
+    }
+    &.purple {
+      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;
+
+    }
+    &.yellow {
+      background: rgba(255, 170, 0, 0.1);
+      border-color: #FFAA00;
+      color: #FFAA00;
+    }
+  }
+}
+
+.vtx-road-work-wrap {
+  display: flex;
+  align-items: center;
+  padding: 24px 28px 24px 45px;
+  justify-content: space-between;
+  .left-info {
+    display: flex;
+    gap: 8px;
+    color: var(--vm-calendar-cell-font-color);
+    margin-bottom: 10px;
+    align-items: center;
+    font-size: 14px;
+    .left-info-dot {
+      width: 6px;
+      height: 6px;
+      background: #b9c4d4;
+      border-radius: 50%;
+    }
+    .left-info-label {
+      color: var(--vm-calendar-cell-font-color);
+    }
+    .left-info-value,.left-info-unit {
+      font-weight: bold;
+      color: var(--vm-calendar-cell-font-color);
+      font-size: 18px !important;
+      &.dark {
+        .white_blue()
+      }
+    }
+    .left-info-unit {
+      font-size: 14px !important;
+      margin-left: 4px;
+    }
+    &:last-child {
+      margin-bottom: 0;
+      .left-info-value,.left-info-unit {
+        &.dark {
+          .white_cyan()
+        }
+      }
+    }
+  }
+  .road-work-left {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .all-rate-wrap {
+      margin-bottom: 20px;
+    }
+  }
+  .road-work-right {
+    display: flex;
+    flex-direction: column;
+    gap: 25px;
+    .road-work-right-item {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      color: var(--vm-calendar-cell-font-color);
+      font-size: 12px;
+      .road-work-right-item-left {
+        width: 220px;
+        .road-work-right-item-left-info {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        }
+        .work-type {
+          font-size: 14px;
+        }
+        .work-rate {
+          color: var(--vm-calendar-cell-font-color);
+          font-size: 14px;
+          font-weight: 600;
+          .work-rate-value, .work-rate-unit {
+            &.blue {
+              &.dark {
+                .white_blue()
+              }
+            }
+            &.green {
+              &.dark {
+                .white_green()
+              }
+            }
+            &.purple {
+              &.dark {
+                .white_purple()
+              }
+            }
+            &.orange {
+              &.dark {
+                .white_green()
+              }
+            }
+            &.yellow {
+              &.dark {
+                .white_yellow()
+              }
+            }
+          }
+          .work-rate-value {
+            font-size: 20px;
+          }
+          .work-rate-unit {
+            margin-left: 4px;
+          }
+        }
+      }
+    }
+  }
+}

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-shxq-modal/components/AlarmRecord/index.js

@@ -122,7 +122,10 @@ var AlarmRecord = function AlarmRecord(props) {
               fontType: 'red'
             }].map(function (item, index) {
               return /*#__PURE__*/_jsx(VmFactor, _objectSpread(_objectSpread({}, item), {}, {
-                unit: "\u6B21"
+                unit: "\u6B21",
+                unitStyle: {
+                  fontSize: '14px'
+                }
               }), index);
             })
           })

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

@@ -34,7 +34,6 @@ var TfdRecord = function TfdRecord(props) {
   var _TfdService$useSummar = TfdService.useSummaryInfo(id, formatType[dateType], date.startOf(formatType[dateType]).format('YYYY-MM-DD 00:00:00'), date.endOf(formatType[dateType]).format('YYYY-MM-DD 23:59:59')),
     data = _TfdService$useSummar.data,
     loading = _TfdService$useSummar.loading;
-  console.log(data);
   return /*#__PURE__*/_jsx("div", {
     className: "shxq-tfd ".concat(isDark ? 'dark' : ''),
     children: /*#__PURE__*/_jsxs(VmWrapper, {

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

@@ -111,7 +111,10 @@ var ThrowRecord = function ThrowRecord(props) {
                 value: item.value,
                 name: item.garbageTypeName,
                 unit: unit,
-                fontType: item.garbageCanColor
+                fontType: item.garbageCanColor,
+                unitStyle: {
+                  fontSize: '14px'
+                }
               }, index);
             })
           })

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

@@ -44,7 +44,9 @@ var ListZymx = function ListZymx(props) {
   }, {
     title: '班次名称',
     dataIndex: 'shiftName',
-    key: 'shiftName'
+    key: 'shiftName',
+    width: 110,
+    ellipsis: true
   }, {
     title: '班次时间',
     dataIndex: 'shiftStartTime',
@@ -59,7 +61,9 @@ var ListZymx = function ListZymx(props) {
   }, {
     title: '排班区域',
     dataIndex: 'shiftWorkElementNames',
-    key: 'shiftWorkElementNames'
+    key: 'shiftWorkElementNames',
+    width: 110,
+    ellipsis: true
   }, {
     title: '排班时长',
     dataIndex: 'shiftDurationStr',

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

@@ -71,49 +71,44 @@ var BaseService = {
     return {
       devices: res === null || res === void 0 ? void 0 : res.data
     };
-  }
-};
-var ThrowService = {
-  useSummaryInfo: function useSummaryInfo(id, startTime, endTime) {
+  },
+  useThrowInfo: function useThrowInfo(throwPointId, dateType, startDate, endDate) {
     var _useRequest3 = useRequest(function () {
-        return request.get('/cloud/ljfljc/api/v101/trow/record/detail/throwDetailSummary', {
+        return request.get('/cloud/ljfljc/api/v101/throwBoard/throwAnalysis', {
           data: {
-            subjectId: id,
-            startTime: startTime,
-            endTime: endTime
+            throwPointId: throwPointId,
+            dateType: dateType,
+            startDate: startDate,
+            endDate: endDate
           }
         });
       }, {
-        ready: !!id,
-        refreshDeps: [id, startTime, endTime]
+        ready: !!throwPointId,
+        refreshDeps: [throwPointId, dateType, startDate, endDate]
       }),
-      throwRes = _useRequest3.data;
+      res = _useRequest3.data;
     return {
-      data: throwRes
+      throwAnalysis: res === null || res === void 0 ? void 0 : res.data
     };
   },
-  usePage: function usePage(id, startTime, endTime, page, size) {
+  useAlarmInfo: function useAlarmInfo(throwPointId, dateType, startDate, endDate) {
     var _useRequest4 = useRequest(function () {
-        return request.get('/cloud/ljfljc/api/v101/trow/record/detail/page', {
+        return request.get('/cloud/ljfljc/api/v101/throwBoard/violationAnalysis', {
           data: {
-            subjectId: id,
-            startTime: startTime,
-            endTime: endTime,
-            desensitization: true,
-            page: page,
-            size: size
+            throwPointId: throwPointId,
+            dateType: dateType,
+            startDate: startDate,
+            endDate: endDate
           }
         });
       }, {
-        ready: !!id,
-        refreshDeps: [id, startTime, endTime, page, size]
+        ready: !!throwPointId,
+        refreshDeps: [throwPointId, dateType, startDate, endDate]
       }),
-      pageRes = _useRequest4.data,
-      loading = _useRequest4.loading;
+      res = _useRequest4.data;
     return {
-      data: pageRes === null || pageRes === void 0 ? void 0 : pageRes.data,
-      loading: loading
+      alarmAnalysis: res === null || res === void 0 ? void 0 : res.data
     };
   }
 };
-export { BaseService, ThrowService };
+export { BaseService };