@vtx/modals2 2.7.17 → 2.8.1

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

@@ -15,28 +15,13 @@
 .cp-baseContent {
   padding: 6px 10px;
 }
-.cp-baseContent .base-top {
-  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;
-}
 .cp-baseContent .base-top-base {
-  width: 390px;
   height: 280px;
-  margin-bottom: 10px;
-  margin-right: 10px;
   padding: 20px;
   background-color: var(--bg-color2);
 }
 .cp-baseContent .base-top-twork {
   height: 280px;
-  width: calc(100% - 405px);
   padding: 20px;
   background-color: var(--bg-color2);
   overflow-y: auto;
@@ -85,24 +70,11 @@
 .cp-baseContent .base-top-twork .twork--item-block-item-value span {
   font-size: 20px;
 }
-.cp-baseContent .base-bottom {
-  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;
-}
 .cp-baseContent .base-bottom-syrules {
   height: 335px;
-  width: 390px;
   padding: 20px;
   background-color: var(--bg-color2);
   overflow-y: auto;
-  margin-right: 10px;
 }
 .cp-baseContent .base-bottom-syrules .syrules-item {
   width: 100%;
@@ -145,8 +117,8 @@
   background-image: url('../../imgs/khsw.png');
 }
 .cp-baseContent .base-bottom-syrules .syrules-item--content {
-  width: 303px;
-  padding: 4px 32px;
+  width: calc(100% - 70px);
+  padding: 4px 8px 4px 24px;
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
@@ -154,19 +126,25 @@
       -ms-flex-pack: justify;
           justify-content: space-between;
 }
+.cp-baseContent .base-bottom-syrules .syrules-item--content div:first-child {
+  width: 110px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  text-align: left;
+}
 .cp-baseContent .base-bottom-syrules .syrules-item--content div:nth-child(2) {
-  width: 60px;
+  width: 70px;
   text-align: center;
 }
 .cp-baseContent .base-bottom-syrules .syrules-item--content div:last-child {
-  width: 80px;
+  width: 100px;
   text-align: left;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
 .cp-baseContent .base-bottom-table {
-  width: calc(100% - 405px);
   height: 335px;
   background-color: var(--bg-color2);
   padding: 10px;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _moment = _interopRequireDefault(require("moment"));
+var _antd = require("antd");
 var _useSettings2 = _interopRequireDefault(require("../../../vm-hooks/useSettings"));
 var _vmSubTitle = _interopRequireDefault(require("../../../vm-sub-title"));
 var _vmInfoCollection = _interopRequireDefault(require("../../../vm-info-collection"));
@@ -31,6 +32,13 @@ var BaseInfo = function BaseInfo(props) {
     className: "cp-baseContent ".concat(theme)
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-top"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    gutter: [10, 10]
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    xxl: 9,
+    xl: 9,
+    lg: 9,
+    md: 12
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-top-base"
   }, /*#__PURE__*/_react["default"].createElement(_vmSubTitle["default"], {
@@ -39,28 +47,41 @@ var BaseInfo = function BaseInfo(props) {
     data: baseInfo,
     horizontal: true,
     gap: 20
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    xxl: 15,
+    xl: 15,
+    lg: 15,
+    md: 12
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-top-twork"
   }, /*#__PURE__*/_react["default"].createElement(_vmSubTitle["default"], {
     title: "\u4ECA\u65E5\u4F5C\u4E1A"
   }), /*#__PURE__*/_react["default"].createElement(_TodayWork["default"], {
     data: todayWorkRes,
     paramConfigsList: paramConfigsList
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "base-bottom"
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    xxl: 9,
+    xl: 9,
+    lg: 9,
+    md: 12
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-bottom-syrules"
   }, /*#__PURE__*/_react["default"].createElement(_vmSubTitle["default"], {
     title: "\u6536\u8FD0\u89C4\u5219"
   }), /*#__PURE__*/_react["default"].createElement(_Rules["default"], {
     rules: rules
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    xxl: 15,
+    xl: 15,
+    lg: 15,
+    md: 12
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-bottom-table"
   }, /*#__PURE__*/_react["default"].createElement(_CarWork["default"], {
     dataSource: dataSource,
     isDark: isDark,
     paramConfigsList: paramConfigsList
-  }))));
+  }))))));
 };
 var _default = BaseInfo;
 exports["default"] = _default;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_react","_interopRequireDefault","require","_moment","_useSettings2","_vmSubTitle","_vmInfoCollection","_Rules","_TodayWork","_CarWork","_api","obj","__esModule","BaseInfo","props","id","baseInfo","rules","_useSettings","useSettings","theme","isDark","nowDate","moment","format","_BaseService$useBaseI","BaseService","useBaseInfo","todayWorkRes","dataSource","paramConfigsList","useConfig","React","createElement","className","concat","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 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, rules } = 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 = BaseService.useConfig();\n    return (React.createElement(\"div\", { className: `cp-baseContent ${theme}` },\n        React.createElement(\"div\", { className: \"base-top\" },\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: 20 })),\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 }))),\n        React.createElement(\"div\", { className: \"base-bottom\" },\n            React.createElement(\"div\", { className: \"base-bottom-syrules\" },\n                React.createElement(SubTitle, { title: \"\\u6536\\u8FD0\\u89C4\\u5219\" }),\n                React.createElement(Rules, { rules: rules })),\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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"}
+{"version":3,"file":"index.js","names":["_react","_interopRequireDefault","require","_moment","_antd","_useSettings2","_vmSubTitle","_vmInfoCollection","_Rules","_TodayWork","_CarWork","_api","obj","__esModule","BaseInfo","props","id","baseInfo","rules","_useSettings","useSettings","theme","isDark","nowDate","moment","format","_BaseService$useBaseI","BaseService","useBaseInfo","todayWorkRes","dataSource","paramConfigsList","useConfig","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, rules } = 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 = 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: 20 }))),\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 }))),\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, { rules: rules }))),\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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"}

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

@@ -11,18 +11,14 @@
 .cp-baseContent {
     padding: 6px 10px;
     .base-top {
-        .flex-start();
+        // .flex-start();
         &-base {
-            width: 390px;
             height: 280px;
-            margin-bottom: 10px;
-            margin-right: 10px;
             padding: 20px;
             background-color: var(--bg-color2);
         }
         &-twork {
             height: 280px;
-            width: calc(100% - 405px);
             padding: 20px;
             background-color: var(--bg-color2);
             overflow-y: auto;
@@ -64,14 +60,11 @@
     }
 
     .base-bottom {
-        .flex-start();
         &-syrules {
             height: 335px;
-            width: 390px;
             padding: 20px;
             background-color: var(--bg-color2);
             overflow-y: auto;
-            margin-right: 10px;
             .syrules-item {
                 width: 100%;
                 height: 29px;
@@ -105,18 +98,25 @@
                     }
                 }
                 &--content {
-                    width: 303px;
-                    padding: 4px 32px;
+                    width: calc(~'100% - 70px');
+                    padding: 4px 8px 4px 24px;
                     display: flex;
                     justify-content: space-between;
 
                     div {
+                        &:first-child {
+                            width: 110px;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                            text-align: left;
+                        }
                         &:nth-child(2) {
-                            width: 60px;
+                            width: 70px;
                             text-align: center;
                         }
                         &:last-child {
-                            width: 80px;
+                            width: 100px;
                             text-align: left;
                             overflow: hidden;
                             white-space: nowrap;
@@ -127,7 +127,6 @@
             }
         }
         &-table {
-            width: calc(100% - 405px);
             height: 335px;
             background-color: var(--bg-color2);
             padding: 10px;

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

@@ -2,23 +2,9 @@
   margin: 6px;
   width: 100%;
 }
-.cp-exeception-head {
-  width: 100%;
-  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;
-}
 .cp-exeception .exeception-summary {
   padding: 14px 20px;
   background-color: var(--bg-color2);
-  width: 500px;
-  margin-right: 6px;
 }
 .cp-exeception .exeception-summary-time {
   margin: 24px;
@@ -101,15 +87,14 @@
           transform: rotate(45deg);
 }
 .cp-exeception .exeception-trend {
-  width: calc(100% - 518px);
   height: 358px;
   padding: 14px 20px;
   background-color: var(--bg-color2);
 }
 .cp-exeception .exeception-record {
   padding: 14px 20px;
-  margin: 6px 12px 0 0;
   background-color: var(--bg-color2);
+  min-height: 180px;
 }
 .cp-exeception .exeception-record-head {
   display: -webkit-box;

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _Summary = _interopRequireDefault(require("./Summary"));
 var _MonthTrend = _interopRequireDefault(require("./MonthTrend"));
 var _ExeceptionRecord = _interopRequireDefault(require("./ExeceptionRecord"));
@@ -18,15 +19,27 @@ var ExeceptionInfo = function ExeceptionInfo(props) {
   var id = props.id;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "cp-exeception"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "cp-exeception-head"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    gutter: [10, 10]
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    xxl: 10,
+    xl: 11,
+    lg: 12,
+    md: 24
   }, /*#__PURE__*/_react["default"].createElement(_Summary["default"], {
     id: id
-  }), /*#__PURE__*/_react["default"].createElement(_MonthTrend["default"], {
+  })), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    xxl: 14,
+    xl: 13,
+    lg: 12,
+    md: 24
+  }, /*#__PURE__*/_react["default"].createElement(_MonthTrend["default"], {
     id: id
-  })), /*#__PURE__*/_react["default"].createElement(_ExeceptionRecord["default"], {
+  })), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 24
+  }, /*#__PURE__*/_react["default"].createElement(_ExeceptionRecord["default"], {
     id: id
-  }));
+  }))));
 };
 var _default = ExeceptionInfo;
 exports["default"] = _default;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_react","_interopRequireDefault","require","_Summary","_MonthTrend","_ExeceptionRecord","obj","__esModule","ExeceptionInfo","props","id","React","createElement","className","Summary","MonthTrend","Record","_default","exports"],"sources":["vtx-cp-modal/components/ExeceptionInfo/index.js"],"sourcesContent":["/**\n * 收集点-异常信息\n */\nimport React from 'react';\nimport Summary from './Summary';\nimport MonthTrend from './MonthTrend';\nimport Record from './ExeceptionRecord';\nimport './index.less';\nconst ExeceptionInfo = props => {\n    const { id } = props;\n    return (React.createElement(\"div\", { className: \"cp-exeception\" },\n        React.createElement(\"div\", { className: \"cp-exeception-head\" },\n            React.createElement(Summary, { id: id }),\n            React.createElement(MonthTrend, { id: id })),\n        React.createElement(Record, { id: id })));\n};\nexport default ExeceptionInfo;\n"],"mappings":";;;;;;AAGA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,QAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,WAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,iBAAA,GAAAJ,sBAAA,CAAAC,OAAA;AACAA,OAAA;AAAsB,SAAAD,uBAAAK,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,gBAAAA,GAAA;AAPtB;AACA;AACA;;AAMA,IAAME,cAAc,GAAG,SAAjBA,cAAcA,CAAGC,KAAK,EAAI;EAC5B,IAAQC,EAAE,GAAKD,KAAK,CAAZC,EAAE;EACV,oBAAQC,iBAAK,CAACC,aAAa,CAAC,KAAK,EAAE;IAAEC,SAAS,EAAE;EAAgB,CAAC,eAC7DF,iBAAK,CAACC,aAAa,CAAC,KAAK,EAAE;IAAEC,SAAS,EAAE;EAAqB,CAAC,eAC1DF,iBAAK,CAACC,aAAa,CAACE,mBAAO,EAAE;IAAEJ,EAAE,EAAEA;EAAG,CAAC,CAAC,eACxCC,iBAAK,CAACC,aAAa,CAACG,sBAAU,EAAE;IAAEL,EAAE,EAAEA;EAAG,CAAC,CAAC,CAAC,eAChDC,iBAAK,CAACC,aAAa,CAACI,4BAAM,EAAE;IAAEN,EAAE,EAAEA;EAAG,CAAC,CAAC,CAAC;AAChD,CAAC;AAAC,IAAAO,QAAA,GACaT,cAAc;AAAAU,OAAA,cAAAD,QAAA"}
+{"version":3,"file":"index.js","names":["_react","_interopRequireDefault","require","_antd","_Summary","_MonthTrend","_ExeceptionRecord","obj","__esModule","ExeceptionInfo","props","id","React","createElement","className","Row","gutter","Col","xxl","xl","lg","md","Summary","MonthTrend","span","Record","_default","exports"],"sources":["vtx-cp-modal/components/ExeceptionInfo/index.js"],"sourcesContent":["/**\n * 收集点-异常信息\n */\nimport React from 'react';\nimport { Row, Col } from 'antd';\nimport Summary from './Summary';\nimport MonthTrend from './MonthTrend';\nimport Record from './ExeceptionRecord';\nimport './index.less';\nconst ExeceptionInfo = props => {\n    const { id } = props;\n    return (React.createElement(\"div\", { className: \"cp-exeception\" },\n        React.createElement(Row, { gutter: [10, 10] },\n            React.createElement(Col, { xxl: 10, xl: 11, lg: 12, md: 24 },\n                React.createElement(Summary, { id: id })),\n            React.createElement(Col, { xxl: 14, xl: 13, lg: 12, md: 24 },\n                React.createElement(MonthTrend, { id: id })),\n            React.createElement(Col, { span: 24 },\n                React.createElement(Record, { id: id })))));\n};\nexport default ExeceptionInfo;\n"],"mappings":";;;;;;AAGA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,WAAA,GAAAJ,sBAAA,CAAAC,OAAA;AACA,IAAAI,iBAAA,GAAAL,sBAAA,CAAAC,OAAA;AACAA,OAAA;AAAsB,SAAAD,uBAAAM,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,gBAAAA,GAAA;AARtB;AACA;AACA;;AAOA,IAAME,cAAc,GAAG,SAAjBA,cAAcA,CAAGC,KAAK,EAAI;EAC5B,IAAQC,EAAE,GAAKD,KAAK,CAAZC,EAAE;EACV,oBAAQC,iBAAK,CAACC,aAAa,CAAC,KAAK,EAAE;IAAEC,SAAS,EAAE;EAAgB,CAAC,eAC7DF,iBAAK,CAACC,aAAa,CAACE,SAAG,EAAE;IAAEC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE;EAAE,CAAC,eACzCJ,iBAAK,CAACC,aAAa,CAACI,SAAG,EAAE;IAAEC,GAAG,EAAE,EAAE;IAAEC,EAAE,EAAE,EAAE;IAAEC,EAAE,EAAE,EAAE;IAAEC,EAAE,EAAE;EAAG,CAAC,eACxDT,iBAAK,CAACC,aAAa,CAACS,mBAAO,EAAE;IAAEX,EAAE,EAAEA;EAAG,CAAC,CAAC,CAAC,eAC7CC,iBAAK,CAACC,aAAa,CAACI,SAAG,EAAE;IAAEC,GAAG,EAAE,EAAE;IAAEC,EAAE,EAAE,EAAE;IAAEC,EAAE,EAAE,EAAE;IAAEC,EAAE,EAAE;EAAG,CAAC,eACxDT,iBAAK,CAACC,aAAa,CAACU,sBAAU,EAAE;IAAEZ,EAAE,EAAEA;EAAG,CAAC,CAAC,CAAC,eAChDC,iBAAK,CAACC,aAAa,CAACI,SAAG,EAAE;IAAEO,IAAI,EAAE;EAAG,CAAC,eACjCZ,iBAAK,CAACC,aAAa,CAACY,4BAAM,EAAE;IAAEd,EAAE,EAAEA;EAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AAAC,IAAAe,QAAA,GACajB,cAAc;AAAAkB,OAAA,cAAAD,QAAA"}

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

@@ -2,18 +2,9 @@
     margin: 6px;
     width: 100%;
 
-    &-head {
-        width: 100%;
-        display: flex;
-        justify-content: start;
-        align-items: start;
-    }
-
     .exeception-summary {
         padding: 14px 20px;
         background-color: var(--bg-color2);
-        width: 500px;
-        margin-right: 6px;
 
         &-time {
             margin: 24px;
@@ -84,7 +75,6 @@
     }
 
     .exeception-trend {
-        width: calc(100% - 518px);
         height: 358px;
         padding: 14px 20px;
         background-color: var(--bg-color2);
@@ -92,8 +82,8 @@
 
     .exeception-record {
         padding: 14px 20px;
-        margin: 6px 12px 0 0;
         background-color: var(--bg-color2);
+        min-height: 180px;
 
         &-head {
             display: flex;

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

@@ -3,28 +3,10 @@
 }
 .cp-syinfo-head {
   padding: 8px 20px;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
   background-color: var(--bg-color2);
 }
 .cp-syinfo-base {
-  margin-top: 8px;
-  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;
+  margin-top: 10px;
 }
 .cp-syinfo-base-noweight {
   padding: 12px 20px;
@@ -32,9 +14,7 @@
   background-color: var(--bg-color2);
 }
 .cp-syinfo-base-weight {
-  width: 49%;
   height: 200px;
-  margin-right: 1%;
   background-color: var(--bg-color2);
   padding-left: 20px;
   padding-top: 12px;
@@ -47,7 +27,6 @@
       flex-wrap: wrap;
 }
 .cp-syinfo-base-chart {
-  width: 50%;
   height: 200px;
   padding-left: 20px;
   padding-top: 12px;

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

@@ -8,6 +8,7 @@ exports["default"] = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _moment = _interopRequireDefault(require("moment"));
+var _antd = require("antd");
 var _vmSubTitle = _interopRequireDefault(require("../../../vm-sub-title"));
 var _vmSubTabs = require("../../../vm-sub-tabs");
 var _vmFilter = require("../../../vm-filter");
@@ -202,6 +203,10 @@ var SyInfo = function SyInfo(props) {
     className: "cp-syinfo"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "cp-syinfo-head"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    gutter: 10
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    flex: 'auto'
   }, /*#__PURE__*/_react["default"].createElement(_vmSubTabs.SubTabsLine, {
     items: baseInfo === null || baseInfo === void 0 ? void 0 : baseInfo.map(function (ele) {
       return {
@@ -215,13 +220,22 @@ var SyInfo = function SyInfo(props) {
         filterKey: key
       });
     }
-  }), /*#__PURE__*/_react["default"].createElement(_vmFilter.VMRangePicker, {
+  })), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    flex: '230px'
+  }, /*#__PURE__*/_react["default"].createElement(_vmFilter.VMRangePicker, {
     value: [(0, _moment["default"])(startDate), (0, _moment["default"])(endDate)],
     onChange: function onChange(dates) {
       return dates && handleDateChange((0, _moment["default"])(dates[0]).format('YYYY-MM-DD'), (0, _moment["default"])(dates[1]).format('YYYY-MM-DD'));
     }
-  })), showWeight ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+  })))), showWeight ? /*#__PURE__*/_react["default"].createElement("div", {
     className: "cp-syinfo-base"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    gutter: 10
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    xxl: 12,
+    xl: 12,
+    lg: 24,
+    md: 24
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "cp-syinfo-base-weight"
   }, /*#__PURE__*/_react["default"].createElement(_vmSubTitle["default"], {
@@ -283,17 +297,20 @@ var SyInfo = function SyInfo(props) {
       width: '150px',
       marginBottom: '24px'
     }
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
+  })))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    xxl: 12,
+    xl: 12,
+    lg: 24,
+    md: 24
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "cp-syinfo-base-chart"
   }, /*#__PURE__*/_react["default"].createElement(_vmSubTitle["default"], {
     title: "\u5783\u573E\u4EA7\u751F\u91CF"
   }), /*#__PURE__*/_react["default"].createElement(_Ljcsl["default"], {
     data: collectWeight
-  })))) : /*#__PURE__*/_react["default"].createElement("div", {
+  }))))) : /*#__PURE__*/_react["default"].createElement("div", {
     className: "cp-syinfo-base-noweight"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "cp-syinfo-base"
-  }, /*#__PURE__*/_react["default"].createElement(_vmImageText["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, null, /*#__PURE__*/_react["default"].createElement(_vmImageText["default"], {
     src: getSrc('jhsj'),
     name: "\u8BA1\u5212\u6536\u96C6",
     value: planCollectNums,