@vtx/modals2 5.0.57 → 5.0.59

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

@@ -1,4 +1,7 @@
 import BaseInfo from "./BaseInfo";
 import Calendar from "./Calendar";
 import Statistical from "./Statistical";
-export { BaseInfo, Calendar, Statistical };
+import LaneStatistical from "./LaneStatistical";
+import LaneCalendar from "./LaneCalendar";
+import LaneBaseInfo from "./LaneBaseInfo";
+export { BaseInfo, Calendar, Statistical, LaneStatistical, LaneCalendar, LaneBaseInfo };

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

@@ -15,12 +15,15 @@ import { VmIframeModal } from "../_components";
 import useGetConfig from "../_hooks/useGetConfig";
 import VtxBaseModal from "../vtx-base-modal";
 import { BaseService } from "./api";
-import { BaseInfo, Calendar, Statistical } from "./components";
+import { BaseInfo, Calendar, Statistical, LaneBaseInfo, LaneStatistical, LaneCalendar } from "./components";
 import "./style/index";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_STATIC = 'statistical';
 var TABS_CALENDAR = 'calendar';
+var TABS_LANE_BASE = 'lane-base';
+var TABS_LANE_STATIC = 'lane-statistical';
+var TABS_LANE_CALENDAR = 'lane-calendar';
 var VtxRoadModal = function VtxRoadModal(props) {
   var id = props.id,
     title = props.title,
@@ -47,11 +50,6 @@ var VtxRoadModal = function VtxRoadModal(props) {
   }
   var _useGetConfig = useGetConfig('tr', tabs),
     tabsData = _useGetConfig.tabsData;
-  var _BaseService$useBaseI = BaseService.useBaseInfo(id, hasRule),
-    info = _BaseService$useBaseI.info,
-    baseInfo = _BaseService$useBaseI.baseInfo,
-    rules = _BaseService$useBaseI.rules,
-    workTypeColorMap = _BaseService$useBaseI.workTypeColorMap;
   var _useSetState = useSetState({
       src: '',
       visible: false,
@@ -73,14 +71,12 @@ var VtxRoadModal = function VtxRoadModal(props) {
       startDate: startDate,
       endDate: endDate,
       date: date,
-      contents: _defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {
+      tagList: [{
+        color: 'yellow',
+        value: jcssInfo.originTypeName
+      }],
+      contents: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(BaseInfo, {
         id: id,
-        data: {
-          info: info,
-          baseInfo: baseInfo,
-          rules: rules,
-          workTypeColorMap: workTypeColorMap
-        },
         jcssInfo: jcssInfo,
         hasRule: hasRule,
         setIframeModalInfo: setIframeModalInfo
@@ -88,6 +84,15 @@ var VtxRoadModal = function VtxRoadModal(props) {
         id: id
       })), TABS_CALENDAR, /*#__PURE__*/_jsx(Calendar, {
         id: id
+      })), TABS_LANE_BASE, /*#__PURE__*/_jsx(LaneBaseInfo, {
+        id: id,
+        jcssInfo: jcssInfo,
+        hasRule: hasRule,
+        setIframeModalInfo: setIframeModalInfo
+      })), TABS_LANE_STATIC, /*#__PURE__*/_jsx(LaneStatistical, {
+        id: id
+      })), TABS_LANE_CALENDAR, /*#__PURE__*/_jsx(LaneCalendar, {
+        id: id
       }))
     }), /*#__PURE__*/_jsx(VmIframeModal, _objectSpread(_objectSpread({}, iframeModalInfo), {}, {
       theme: theme,

package/lib/vtx-sdyd-tfd-modal/components/Alarm/GDCLXL.js

@@ -80,11 +80,13 @@ var GDCLXL = function GDCLXL(_ref) {
             type: "dashboard",
             percent: ele.value,
             width: 120,
+            size: 120,
             strokeWidth: 10,
             gapDegree: 180,
             strokeLinecap: "butt",
             strokeColor: strokeColor[ele.value > ele.avg ? 'alarm' : 'normal'],
             trailColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
+            railColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
             showInfo: false
           }), /*#__PURE__*/_jsxs("div", {
             className: "".concat(classPrefix, "-progress-desc"),

package/lib/vtx-sdyd-tfd-modal/components/Alarm/MYFX_GD.js

@@ -69,12 +69,14 @@ var GDCLXL = function GDCLXL(_ref) {
           }), /*#__PURE__*/_jsx(Progress, {
             type: "dashboard",
             percent: ele.value,
+            size: 160,
             width: 160,
             strokeWidth: 10,
             gapDegree: 180,
             strokeLinecap: "butt",
             strokeColor: strokeColor[ele.value > ele.avg ? 'alarm' : 'normal'],
             trailColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
+            railColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
             showInfo: false
           }), /*#__PURE__*/_jsx("div", {
             className: "".concat(classPrefix, "-progress-desc"),

package/lib/vtx-sdyd-tfd-modal/components/OverView/RightBottom.js

@@ -124,11 +124,13 @@ var RightBottom = function RightBottom(_ref) {
                 type: "dashboard",
                 percent: ele.value,
                 width: 120,
+                size: 120,
                 strokeWidth: 10,
                 gapDegree: 180,
                 strokeLinecap: "butt",
                 strokeColor: strokeColor[ele.value > ele.avg ? 'alarm' : 'normal'],
                 trailColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
+                railColor: isDark ? '#9B9FA8' : 'rgba(0, 0, 0, 0.1)',
                 showInfo: false
               }), /*#__PURE__*/_jsxs("div", {
                 className: "".concat(classPrefix, "-rightbottom-progress-desc"),

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

@@ -1,5 +1,5 @@
-/**
- * 区域进场量分析
+/**
+ * 区域进场量分析
  */
 
 import { Col, Row } from 'antd';

package/package.json

@@ -1,81 +1,81 @@
-{
-  "name": "@vtx/modals2",
-  "version": "5.0.57",
-  "description": "弹窗组件",
-  "license": "MIT",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "build": "father build",
-    "build:watch": "father dev",
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:preview": "dumi preview",
-    "doctor": "father doctor",
-    "lint": "npm run lint:es && npm run lint:css",
-    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "husky install && dumi setup",
-    "prepublishOnly": "npm run build",
-    "start": "npm run dev"
-  },
-  "dependencies": {
-    "base-64": "^1.0.0",
-    "htmr": "^1.0.2",
-    "number-precision": "^1.6.0",
-    "react-tagcloud": "^2.3.3",
-    "proj4": "^2.20.8"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "4.7.0",
-    "@babel/preset-react": "^7.28.5",
-    "@babel/runtime": "^7.6.3",
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@types/lodash": "^4.14.202",
-    "@types/qs": "^6.9.11",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/lint": "^4.0.0",
-    "@vtx/components": "^3.1.166",
-    "@vtx/ol-map": "^1.0.170",
-    "@vtx/player": "latest",
-    "@vtx/utils": "^1.0.20",
-    "@turf/turf": "^7.3.4",
-    "ol": "6.15.1",
-    "ahooks": "^3.1.5",
-    "antd": "^4.24.16",
-    "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.21.1",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-import": "^1.13.8",
-    "dayjs": "^1.11.10",
-    "dumi": "^2.2.13",
-    "echarts": "^5.3.2",
-    "echarts-for-react": "3.0.2",
-    "echarts-liquidfill": "^3.1.0",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "lodash": "^4.17.21",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-packagejson": "^2.2.18",
-    "qs": "^6.0.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "stylelint": "^14.9.1"
-  },
-  "peerDependencies": {
-    "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "authors": []
-}
+{
+  "name": "@vtx/modals2",
+  "version": "5.0.59",
+  "description": "弹窗组件",
+  "license": "MIT",
+  "module": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "build": "father build",
+    "build:watch": "father dev",
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:preview": "dumi preview",
+    "doctor": "father doctor",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
+    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "prepare": "husky install && dumi setup",
+    "prepublishOnly": "npm run build",
+    "start": "npm run dev"
+  },
+  "dependencies": {
+    "base-64": "^1.0.0",
+    "htmr": "^1.0.2",
+    "number-precision": "^1.6.0",
+    "react-tagcloud": "^2.3.3",
+    "proj4": "^2.20.8"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "4.7.0",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/runtime": "^7.6.3",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@types/lodash": "^4.14.202",
+    "@types/qs": "^6.9.11",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@umijs/lint": "^4.0.0",
+    "@vtx/components": "^3.1.166",
+    "@vtx/ol-map": "^1.0.170",
+    "@vtx/player": "latest",
+    "@vtx/utils": "^1.0.20",
+    "@turf/turf": "^7.3.4",
+    "ol": "6.15.1",
+    "ahooks": "^3.1.5",
+    "antd": "^4.24.16",
+    "antd-dayjs-webpack-plugin": "^1.0.6",
+    "axios": "^0.21.1",
+    "babel-eslint": "^10.1.0",
+    "babel-plugin-import": "^1.13.8",
+    "dayjs": "^1.11.10",
+    "dumi": "^2.2.13",
+    "echarts": "^5.3.2",
+    "echarts-for-react": "3.0.2",
+    "echarts-liquidfill": "^3.1.0",
+    "eslint": "^8.23.0",
+    "father": "^4.1.0",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "lodash": "^4.17.21",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^3.0.0",
+    "prettier-plugin-packagejson": "^2.2.18",
+    "qs": "^6.0.0",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "stylelint": "^14.9.1"
+  },
+  "peerDependencies": {
+    "react": ">=16.9.0",
+    "react-dom": ">=16.9.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": []
+}