@vtx/modals2 4.0.7 → 5.0.1

package/lib/vtx-cp-modal/components/BaseInfo/index.css

@@ -1,87 +1,3 @@
-.vtx-business-modal-wrap {
-  --modal-content-bg: #f7f9fb;
-  --modal-border-color: #fff;
-  --head-bg: #fff;
-  --bg-color2: #fff;
-  --label-color: rgba(0, 0, 0, 0.65);
-  --table-head-bg: rgba(24, 144, 255, 0.1);
-  --title-color: #222;
-  --title-color2: #222;
-  --block-bg-color: rgba(0, 0, 0, 0.1);
-  --block-bg-color2: #1890ff;
-  --calendar-border: #ececec;
-  --calendar-thead-bg: #fff;
-  --calendar-bg: #fff;
-  --info-danger: #fd3a15;
-  --info-warnning: #f7d93d;
-  --info-active: #222;
-  --info-active2: #222;
-  --info-active3: #fff;
-  --bg-color: white;
-  --sub-bg-color: #f3f3f380;
-  --title-bg-color: white;
-  --title-border: 1px solid #dbdbdbff;
-  --sub-title-color: #222;
-  --info-color: #222;
-  --border-color: '#DADADAFF';
-  --scroll-bar-bg: #c0c0c0;
-  --scroll-bar-hover-bg: #adadad;
-  --scroll-bar-track-bg: #fafafa;
-  --button-checked-color: #1890ff;
-  --button-color: #222;
-}
-*::-webkit-scrollbar {
-  width: 0px;
-  height: 0px;
-}
-*::-webkit-scrollbar-track {
-  background: transparent;
-  border-radius: 5px;
-}
-*::-webkit-scrollbar-thumb {
-  background: transparent;
-  border-radius: 5px;
-}
-*::-webkit-scrollbar-corner {
-  background-color: transparent;
-}
-.vtx-business-modal-wrap.dark {
-  --modal-content-bg: #0b1315;
-  --modal-border-color: #69958a;
-  --head-bg: #122a2c;
-  --bg-color: linear-gradient(0deg, #081e21cc, #000c);
-  --bg-color2: #162123;
-  --sub-bg-color: #ffffff0d;
-  --title-bg-color: #1a292bff;
-  --title-border: 1px solid transparent;
-  --title-color: white;
-  --title-color2: #a9d5d3;
-  --sub-title-color: #00f0ff;
-  --label-color: #cafdffff;
-  --info-color: #ffffffff;
-  --border-color: '#3C7073FF';
-  --scroll-bar-bg: #39cbc3aa;
-  --scroll-bar-hover-bg: #39cbc3ff;
-  --scroll-bar-track-bg: transparent;
-  --button-text-color--defalut: #c9e6e8;
-  --button-text-color--active: #ffffff;
-  --button-background-color--default: #1a5561;
-  --button-background-color--active: linear-gradient(0deg, #3195aa, #0f5160);
-  --button-checked-color: #1890ff;
-  --arrow-icon-color: #355e5f;
-  --block-bg-color: rgba(255, 255, 255, 0.1);
-  --block-bg-color2: rgba(48, 118, 114, 0.2);
-  --info-active: #40ffd3;
-  --info-active2: #52c41a;
-  --info-active3: #40ffd3;
-  --info-danger: #fd3a15;
-  --info-warnning: #f7d93d;
-  --table-head-bg: rgba(0, 173, 177, 0.1);
-  --timeline-active: #24f2ff;
-  --calendar-border: #35444c;
-  --calendar-thead-bg: #29373e;
-  --calendar-bg: rgba(255, 255, 255, 0.1);
-}
 .flex-start {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -103,11 +19,13 @@
   height: 280px;
   padding: 20px;
   background-color: var(--bg-color2);
+  border: 1px solid var(--bg-border-color2);
 }
 .cp-baseContent .base-top-twork {
   height: 280px;
   padding: 20px;
   background-color: var(--bg-color2);
+  border: 1px solid var(--bg-border-color2);
   overflow-y: auto;
 }
 .cp-baseContent .base-top-twork .twork--item {
@@ -147,74 +65,70 @@
 .cp-baseContent .base-top-twork .twork--item-block-item {
   width: 25%;
 }
-.cp-baseContent .base-top-twork .twork--item-block-item-value2 {
+.cp-baseContent .base-top-twork .twork--item-block-item-value {
   color: var(--info-active);
   line-height: 20px;
 }
-.cp-baseContent .base-top-twork .twork--item-block-item-value2 span {
+.cp-baseContent .base-top-twork .twork--item-block-item-value span {
   font-size: 20px;
 }
-.cp-baseContent .base-top .default-base {
-  height: 74%;
-  margin-right: 10px;
-  background-color: var(--bg-color2);
-}
-.cp-baseContent .base-top .default-base img {
-  height: 160px;
-  width: 100%;
-}
-.cp-baseContent .base-top .default-base-img {
-  margin-bottom: 24px;
-}
-.cp-baseContent .base-top .default-base-img img {
-  height: 160px;
-  width: 100%;
-}
 .cp-baseContent .base-bottom-syrules {
   height: 335px;
   padding: 20px;
   background-color: var(--bg-color2);
+  border: 1px solid var(--bg-border-color2);
   overflow-y: auto;
 }
 .cp-baseContent .base-bottom-syrules .syrules-item {
   width: 100%;
-  height: 29px;
+  padding: 16px 20px;
+  border-radius: 16px;
+  border: 1px dashed;
+  color: var(--info-color);
+  margin-bottom: 24px;
+  font-size: 14px;
+}
+.cp-baseContent .base-bottom-syrules .syrules-item--info {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-pack: start;
-      -ms-flex-pack: start;
-          justify-content: start;
-  -webkit-box-align: start;
-      -ms-flex-align: start;
-          align-items: start;
-  background: var(--block-bg-color);
-  color: var(--info-color);
-  margin-bottom: 24px;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  gap: 12px;
+  margin-bottom: 10px;
 }
-.cp-baseContent .base-bottom-syrules .syrules-item--name {
-  width: 70px;
-  height: 100%;
-  font-size: 14px;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  text-align: center;
-  line-height: 30px;
-  background-repeat: no-repeat;
+.cp-baseContent .base-bottom-syrules .syrules-item--icon {
+  width: 50px;
+  height: 28px;
   background-size: 100% 100%;
-  color: #fff;
+  background-position: center;
+  margin-left: 6px;
 }
-.cp-baseContent .base-bottom-syrules .syrules-item--name.qt {
-  background-image: url('../../imgs/qt.png');
+.cp-baseContent .base-bottom-syrules .syrules-item--icon.qt {
+  background-image: url('../../imgs/qt_car.png');
 }
-.cp-baseContent .base-bottom-syrules .syrules-item--name.cy {
-  background-image: url('../../imgs/cy.png');
+.cp-baseContent .base-bottom-syrules .syrules-item--icon.cy {
+  background-image: url('../../imgs/cy_car.png');
 }
-.cp-baseContent .base-bottom-syrules .syrules-item--name.yh {
-  background-image: url('../../imgs/yh.png');
+.cp-baseContent .base-bottom-syrules .syrules-item--icon.yh {
+  background-image: url('../../imgs/yh_car.png');
 }
-.cp-baseContent .base-bottom-syrules .syrules-item--name.khsw {
-  background-image: url('../../imgs/khsw.png');
+.cp-baseContent .base-bottom-syrules .syrules-item--icon.yf {
+  background-image: url('../../imgs/yf_car.png');
+}
+.cp-baseContent .base-bottom-syrules .syrules-item--icon.khsw {
+  background-image: url('../../imgs/khsw_car.png');
+}
+.cp-baseContent .base-bottom-syrules .syrules-item--label {
+  color: var(--label-color);
+  width: 60px;
+}
+.cp-baseContent .base-bottom-syrules .syrules-item--name {
+  width: 70px;
+  height: 100%;
+  font-size: 16px;
+  font-weight: 700;
 }
 .cp-baseContent .base-bottom-syrules .syrules-item--content {
   width: calc(100% - 70px);
@@ -247,78 +161,6 @@
 .cp-baseContent .base-bottom-table {
   height: 335px;
   background-color: var(--bg-color2);
+  border: 1px solid var(--bg-border-color2);
   padding: 10px;
 }
-.cp-baseContent .showRule {
-  width: 100%;
-  border-radius: 16px;
-  position: relative;
-  border: 1px solid #aec8de;
-  background-size: 100% 64px !important;
-  background-repeat: no-repeat !important;
-  padding: 10px 13px;
-  margin-bottom: 14px;
-}
-.cp-baseContent .line {
-  width: 4px;
-  height: 16px;
-  background: #1890ff;
-  display: inline-block;
-  margin-right: 10px;
-}
-.cp-baseContent .rowItemCheckbox {
-  margin-bottom: 6px;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  font-family: PingFang SC;
-  font-weight: 500;
-  font-size: 16px;
-}
-.cp-baseContent .title {
-  font-weight: 600;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  margin: 8px 0 10px 0;
-}
-.cp-baseContent .rowItem {
-  position: relative;
-  color: var(--label-color);
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  line-height: 30px;
-}
-.cp-baseContent .rowItem .rowItemSingle {
-  width: 50%;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-}
-.cp-baseContent .rowItem .questionCircle {
-  position: absolute;
-  right: -5px;
-  top: 1px;
-}
-.cp-baseContent .rowItem .minusItem {
-  color: red;
-  position: absolute;
-  right: 0px;
-}
-.cp-baseContent .rowItemDGSD .rowItemSingle {
-  width: 100%;
-}
-.cp-baseContent .rowItemDGSD .rowItemTitle,
-.cp-baseContent .rowItemDGSD .rowItemSingle {
-  word-wrap: break-word;
-}

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

@@ -15,14 +15,10 @@ var _TodayWork = _interopRequireDefault(require("./TodayWork"));
 var _CarWork = _interopRequireDefault(require("./CarWork"));
 var _api = require("../../api");
 require("./index.less");
-var _utils = require("@vtx/utils");
-var _components = require("@vtx/components");
-var _vmNodata = _interopRequireDefault(require("../../../vm-nodata"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 var BaseInfo = function BaseInfo(props) {
   var id = props.id,
-    baseInfo = props.baseInfo,
-    info = props.info;
+    baseInfo = props.baseInfo;
   var _useSettings = (0, _useSettings2["default"])(),
     theme = _useSettings.theme,
     isDark = _useSettings.isDark;
@@ -48,43 +44,10 @@ var BaseInfo = function BaseInfo(props) {
     className: "base-top-base"
   }, /*#__PURE__*/_react["default"].createElement(_vmSubTitle["default"], {
     title: "\u57FA\u672C\u4FE1\u606F"
-  }), JSON.parse((info === null || info === void 0 ? void 0 : info.photoIds) || '[]') && ( /*#__PURE__*/_react["default"].createElement("div", {
-    className: "default-base"
-  }, JSON.parse((info === null || info === void 0 ? void 0 : info.photoIds) || '[]').length ? ( /*#__PURE__*/_react["default"].createElement(_components.VtxImage.PreviewGroup, {
-    style: {
-      height: '100%'
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_antd.Carousel
-  // autoplay
-  // dotPosition={'bottom'}
-  , {
-    // autoplay
-    // dotPosition={'bottom'}
-    style: {
-      width: '370px',
-      height: '160px',
-      overflow: 'hidden'
-    }
-  }, JSON.parse((info === null || info === void 0 ? void 0 : info.photoIds) || '[]').map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement(_components.VtxImage, {
-      key: item.id,
-      src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat((0, _utils.getVtxToken)('token') || 'be7c4279-1a76-432b-a069-8fd89a9eb06b'),
-      alt: item.name,
-      style: {
-        maxHeight: '175px',
-        overflow: 'hidden',
-        height: 160
-      }
-    });
-  })))) : ( /*#__PURE__*/_react["default"].createElement(_vmNodata["default"], {
-    style: {
-      height: '175px'
-    }
-  })))), /*#__PURE__*/_react["default"].createElement(_vmInfoCollection["default"], {
+  }), /*#__PURE__*/_react["default"].createElement(_vmInfoCollection["default"], {
     data: baseInfo,
     horizontal: true,
-    gap: 20,
-    infoData: info
+    gap: 16
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     xxl: 15,
     xl: 15,
@@ -108,7 +71,7 @@ var BaseInfo = function BaseInfo(props) {
   }, /*#__PURE__*/_react["default"].createElement(_vmSubTitle["default"], {
     title: "\u6536\u8FD0\u89C4\u5219"
   }), /*#__PURE__*/_react["default"].createElement(_Rules["default"], {
-    formData: info
+    id: id
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     xxl: 15,
     xl: 15,

package/lib/vtx-cp-modal/components/BaseInfo/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_react","_interopRequireDefault","require","_moment","_antd","_useSettings2","_vmSubTitle","_vmInfoCollection","_Rules","_TodayWork","_CarWork","_api","_utils","_components","_vmNodata","e","__esModule","BaseInfo","props","id","baseInfo","info","_useSettings","useSettings","theme","isDark","nowDate","moment","format","_BaseService$useBaseI","BaseService","useBaseInfo","todayWorkRes","dataSource","_BaseService$useConfi","useConfig","paramConfigsList","productTypes","React","createElement","className","concat","Row","gutter","Col","xxl","xl","lg","md","SubTitle","title","JSON","parse","photoIds","length","VtxImage","PreviewGroup","style","height","Carousel","width","overflow","map","item","key","src","getVtxToken","alt","name","maxHeight","NoData","Base","data","horizontal","gap","infoData","TodayWork","Rules","formData","CarWork","_default","exports"],"sources":["vtx-cp-modal/components/BaseInfo/index.js"],"sourcesContent":["import React from 'react';\nimport moment from 'moment';\nimport { Row, Col, Carousel } from 'antd';\nimport useSettings from '../../../vm-hooks/useSettings';\nimport SubTitle from '../../../vm-sub-title';\nimport Base from '../../../vm-info-collection';\nimport Rules from './Rules';\nimport TodayWork from './TodayWork';\nimport CarWork from './CarWork';\nimport { BaseService } from '../../api';\nimport './index.less';\nimport { getVtxToken } from '@vtx/utils';\nimport { VtxImage } from '@vtx/components';\nimport NoData from '../../../vm-nodata';\nconst BaseInfo = (props) => {\n    const { id, baseInfo, info } = props;\n    const { theme, isDark } = useSettings();\n    const nowDate = moment().format('YYYY-MM-DD');\n    const { todayWorkRes, dataSource } = BaseService.useBaseInfo(id, nowDate, nowDate);\n    const { paramConfigsList, productTypes } = BaseService.useConfig();\n    return (React.createElement(\"div\", { className: `cp-baseContent ${theme}` },\n        React.createElement(\"div\", { className: \"base-top\" },\n            React.createElement(Row, { gutter: [10, 10] },\n                React.createElement(Col, { xxl: 9, xl: 9, lg: 9, md: 12 },\n                    React.createElement(\"div\", { className: \"base-top-base\" },\n                        React.createElement(SubTitle, { title: \"\\u57FA\\u672C\\u4FE1\\u606F\" }),\n                        JSON.parse((info === null || info === void 0 ? void 0 : info.photoIds) || '[]') && (React.createElement(\"div\", { className: \"default-base\" }, JSON.parse((info === null || info === void 0 ? void 0 : info.photoIds) || '[]').length ? (React.createElement(VtxImage.PreviewGroup, { style: { height: '100%' } },\n                            React.createElement(Carousel\n                            // autoplay\n                            // dotPosition={'bottom'}\n                            , { \n                                // autoplay\n                                // dotPosition={'bottom'}\n                                style: {\n                                    width: '370px',\n                                    height: '160px',\n                                    overflow: 'hidden',\n                                } }, JSON.parse((info === null || info === void 0 ? void 0 : info.photoIds) || '[]').map((item) => {\n                                return (React.createElement(VtxImage, { key: item.id, src: `/cloudFile/common/downloadFile?id=${item.id}&token=${getVtxToken('token') ||\n                                        'be7c4279-1a76-432b-a069-8fd89a9eb06b'}`, alt: item.name, style: {\n                                        maxHeight: '175px',\n                                        overflow: 'hidden',\n                                        height: 160,\n                                    } }));\n                            })))) : (React.createElement(NoData, { style: { height: '175px' } })))),\n                        React.createElement(Base, { data: baseInfo, horizontal: true, gap: 20, infoData: info }))),\n                React.createElement(Col, { xxl: 15, xl: 15, lg: 15, md: 12 },\n                    React.createElement(\"div\", { className: \"base-top-twork\" },\n                        React.createElement(SubTitle, { title: \"\\u4ECA\\u65E5\\u4F5C\\u4E1A\" }),\n                        React.createElement(TodayWork, { data: todayWorkRes, paramConfigsList: paramConfigsList, productTypes: productTypes }))),\n                React.createElement(Col, { xxl: 9, xl: 9, lg: 9, md: 12 },\n                    React.createElement(\"div\", { className: \"base-bottom-syrules\" },\n                        React.createElement(SubTitle, { title: \"\\u6536\\u8FD0\\u89C4\\u5219\" }),\n                        React.createElement(Rules, { formData: info }))),\n                React.createElement(Col, { xxl: 15, xl: 15, lg: 15, md: 12 },\n                    React.createElement(\"div\", { className: \"base-bottom-table\" },\n                        React.createElement(CarWork, { dataSource: dataSource, isDark: isDark, paramConfigsList: paramConfigsList })))))));\n};\nexport default BaseInfo;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["_react","_interopRequireDefault","require","_moment","_antd","_useSettings2","_vmSubTitle","_vmInfoCollection","_Rules","_TodayWork","_CarWork","_api","e","__esModule","BaseInfo","props","id","baseInfo","_useSettings","useSettings","theme","isDark","nowDate","moment","format","_BaseService$useBaseI","BaseService","useBaseInfo","todayWorkRes","dataSource","_BaseService$useConfi","useConfig","paramConfigsList","productTypes","React","createElement","className","concat","Row","gutter","Col","xxl","xl","lg","md","SubTitle","title","Base","data","horizontal","gap","TodayWork","Rules","CarWork","_default","exports"],"sources":["vtx-cp-modal/components/BaseInfo/index.js"],"sourcesContent":["import React from 'react';\nimport moment from 'moment';\nimport { Row, Col } from 'antd';\nimport useSettings from '../../../vm-hooks/useSettings';\nimport SubTitle from '../../../vm-sub-title';\nimport Base from '../../../vm-info-collection';\nimport Rules from './Rules';\nimport TodayWork from './TodayWork';\nimport CarWork from './CarWork';\nimport { BaseService } from '../../api';\nimport './index.less';\nconst BaseInfo = (props) => {\n    const { id, baseInfo } = props;\n    const { theme, isDark } = useSettings();\n    const nowDate = moment().format('YYYY-MM-DD');\n    const { todayWorkRes, dataSource } = BaseService.useBaseInfo(id, nowDate, nowDate);\n    const { paramConfigsList, productTypes } = BaseService.useConfig();\n    return (React.createElement(\"div\", { className: `cp-baseContent ${theme}` },\n        React.createElement(\"div\", { className: \"base-top\" },\n            React.createElement(Row, { gutter: [10, 10] },\n                React.createElement(Col, { xxl: 9, xl: 9, lg: 9, md: 12 },\n                    React.createElement(\"div\", { className: \"base-top-base\" },\n                        React.createElement(SubTitle, { title: \"\\u57FA\\u672C\\u4FE1\\u606F\" }),\n                        React.createElement(Base, { data: baseInfo, horizontal: true, gap: 16 }))),\n                React.createElement(Col, { xxl: 15, xl: 15, lg: 15, md: 12 },\n                    React.createElement(\"div\", { className: \"base-top-twork\" },\n                        React.createElement(SubTitle, { title: \"\\u4ECA\\u65E5\\u4F5C\\u4E1A\" }),\n                        React.createElement(TodayWork, { data: todayWorkRes, paramConfigsList: paramConfigsList, productTypes: productTypes }))),\n                React.createElement(Col, { xxl: 9, xl: 9, lg: 9, md: 12 },\n                    React.createElement(\"div\", { className: \"base-bottom-syrules\" },\n                        React.createElement(SubTitle, { title: \"\\u6536\\u8FD0\\u89C4\\u5219\" }),\n                        React.createElement(Rules, { id: id }))),\n                React.createElement(Col, { xxl: 15, xl: 15, lg: 15, md: 12 },\n                    React.createElement(\"div\", { className: \"base-bottom-table\" },\n                        React.createElement(CarWork, { dataSource: dataSource, isDark: isDark, paramConfigsList: paramConfigsList })))))));\n};\nexport default BaseInfo;\n"],"mappings":"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","ignoreList":[]}

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

@@ -1,4 +1,3 @@
-@import '../../style/index.less';
 .flex-start {
     display: flex;
     justify-content: start;
@@ -17,11 +16,14 @@
             height: 280px;
             padding: 20px;
             background-color: var(--bg-color2);
+            border: 1px solid var(--bg-border-color2);
         }
         &-twork {
             height: 280px;
             padding: 20px;
             background-color: var(--bg-color2);
+            border: 1px solid var(--bg-border-color2);
+
             overflow-y: auto;
             .twork {
                 &--item {
@@ -46,7 +48,7 @@
                         justify-content: start;
                         &-item {
                             width: 25%;
-                            &-value2 {
+                            &-value {
                                 color: var(--info-active);
                                 line-height: 20px;
                                 span {
@@ -58,24 +60,6 @@
                 }
             }
         }
-        .default-base {
-            // width: 430px;
-            height: 74%;
-            // padding: 24px;
-            margin-right: 10px;
-            background-color: var(--bg-color2);
-            img {
-                height:160px;
-                width: 100%;
-            }
-            &-img {
-                margin-bottom: 24px;
-                img {
-                    height:160px;
-                    width: 100%;
-                }
-            }
-        }
     }
 
     .base-bottom {
@@ -83,39 +67,55 @@
             height: 335px;
             padding: 20px;
             background-color: var(--bg-color2);
+            border: 1px solid var(--bg-border-color2);
+
             overflow-y: auto;
             .syrules-item {
                 width: 100%;
-                height: 29px;
-                .flex-start();
-                background: var(--block-bg-color);
+                padding: 16px 20px;
+                border-radius: 16px;
+                border: 1px dashed;
                 color: var(--info-color);
                 margin-bottom: 24px;
-
-                &--name {
-                    width: 70px;
-                    height: 100%;
-                    font-size: 14px;
-                    font-family: PingFangSC-Medium, PingFang SC;
-                    font-weight: 500;
-                    text-align: center;
-                    line-height: 30px;
-                    background-repeat: no-repeat;
+                font-size: 14px;
+                &--info {
+                    display: flex;
+                    align-items: center;
+                    gap: 12px;
+                    margin-bottom: 10px;
+                }
+                &--icon {
+                    width: 50px;
+                    height: 28px;
                     background-size: 100% 100%;
-                    color: #fff;
+                    background-position: center;
+                    margin-left: 6px;
                     &.qt {
-                        background-image: url('../../imgs/qt.png');
+                        background-image: url('../../imgs/qt_car.png');
                     }
                     &.cy {
-                        background-image: url('../../imgs/cy.png');
+                        background-image: url('../../imgs/cy_car.png');
                     }
                     &.yh {
-                        background-image: url('../../imgs/yh.png');
+                        background-image: url('../../imgs/yh_car.png');
+                    }
+                    &.yf {
+                        background-image: url('../../imgs/yf_car.png');
                     }
                     &.khsw {
-                        background-image: url('../../imgs/khsw.png');
+                        background-image: url('../../imgs/khsw_car.png');
                     }
                 }
+                &--label {
+                    color: var(--label-color);
+                    width: 60px;
+                }
+                &--name {
+                    width: 70px;
+                    height: 100%;
+                    font-size: 16px;
+                    font-weight: 700;
+                }
                 &--content {
                     width: calc(~'100% - 70px');
                     padding: 4px 8px 4px 24px;
@@ -148,79 +148,9 @@
         &-table {
             height: 335px;
             background-color: var(--bg-color2);
-            padding: 10px;
-        }
-    }
-    .showRule {
-        width: 100%;
-        // height: 160px;
-        border-radius: 16px;
-        position: relative;
-        border: 1px solid #aec8de;
-        // background: linear-gradient(180deg, #dae8f4, #ffffff) no-repeat;
-        background-size: 100% 64px !important;
-        background-repeat: no-repeat !important;
-
-        padding: 10px 13px;
-        margin-bottom: 14px;
-    }
-
-    .line {
-        width: 4px;
-        height: 16px;
-        background: #1890ff;
-        display: inline-block;
-        margin-right: 10px;
-    }
-    .rowItemCheckbox {
-        margin-bottom: 6px;
-        // width: 132px;
-        // text-align: center;
-        // line-height:30px;
-        display: flex;
-        align-items: center;
+            border: 1px solid var(--bg-border-color2);
 
-        font-family: PingFang SC;
-        font-weight: 500;
-        font-size: 16px;
-        // color: #0e4e90;
-    }
-    .title {
-        font-weight: 600;
-        display: flex;
-        align-items: center;
-        margin: 8px 0 10px 0;
-    }
-    .rowItem {
-        position: relative;
-        color: var(--label-color);
-        display: flex;
-        align-items: center;
-        line-height: 30px;
-
-        .rowItemSingle {
-            width: 50%;
-            display: flex;
-        }
-
-        .questionCircle {
-            position: absolute;
-            right: -5px;
-            top: 1px;
-        }
-        .minusItem {
-            color: red;
-            position: absolute;
-            right: 0px;
-        }
-
-    }
-    .rowItemDGSD{
-        .rowItemSingle{
-            width: 100%;
-        }
-        .rowItemTitle,.rowItemSingle{
-            word-wrap: break-word;
+            padding: 10px;
         }
     }
 }

package/lib/vtx-cp-modal/components/ExeceptionInfo/MonthTrend.js

@@ -19,7 +19,8 @@ var MonthTrend = function MonthTrend(_ref) {
   var id = _ref.id;
   var _useSettings = (0, _useSettings2["default"])(),
     chartColor = _useSettings.chartColor,
-    chartFontColor = _useSettings.chartFontColor;
+    chartFontColor = _useSettings.chartFontColor,
+    theme = _useSettings.theme;
   var _ExeceptionService$us = _api.ExeceptionService.useAlarmMonthTrend(id, (0, _moment["default"])().subtract(6, 'M').format('YYYY-MM-DD'), (0, _moment["default"])().format('YYYY-MM-DD')),
     alarmMonthTrend = _ExeceptionService$us.alarmMonthTrend;
   var legends = alarmMonthTrend.legends,
@@ -28,7 +29,17 @@ var MonthTrend = function MonthTrend(_ref) {
   var option = {
     color: chartColor,
     tooltip: {
-      trigger: 'axis'
+      trigger: 'axis',
+      formatter: function formatter(params) {
+        var _a, _b;
+        var str = "<div  style=\"text-align:left\">".concat((_a = params === null || params === void 0 ? void 0 : params[0]) === null || _a === void 0 ? void 0 : _a.axisValue, "<?div>");
+        var color = (_b = params[0].color) === null || _b === void 0 ? void 0 : _b.colorStops; // 获取系列的颜色
+        params.map(function (item, index) {
+          var _a;
+          str += "<div  style=\"text-align:left\"><span style=\"color:".concat(item.color && typeof item.color == 'string' ? item.color : (_a = color === null || color === void 0 ? void 0 : color[index]) === null || _a === void 0 ? void 0 : _a.color, "\">\u2022</span> ").concat(item.seriesName, " &nbsp;&nbsp;&nbsp;").concat(item.value, '次', "</div>");
+        });
+        return str; // 返回带点的字符串
+      }
     },
     legend: {
       show: true,
@@ -36,7 +47,7 @@ var MonthTrend = function MonthTrend(_ref) {
       itemHeight: 6,
       top: 20,
       textStyle: {
-        color: chartFontColor,
+        color: theme === 'blue' ? '#fff' : chartFontColor,
         fontSize: 12
       },
       data: legends || []
@@ -55,7 +66,7 @@ var MonthTrend = function MonthTrend(_ref) {
         show: false
       },
       axisLabel: {
-        color: chartFontColor
+        color: theme === 'blue' ? '#fff' : chartFontColor
       },
       data: names || []
     },
@@ -63,13 +74,13 @@ var MonthTrend = function MonthTrend(_ref) {
       name: '单位（次）',
       type: 'value',
       nameTextStyle: {
-        color: chartFontColor
+        color: theme === 'blue' ? '#fff' : chartFontColor
       },
       axisTick: {
         show: false
       },
       axisLabel: {
-        color: chartFontColor
+        color: theme === 'blue' ? '#fff' : chartFontColor
       },
       axisLine: {
         show: true