diff --git a/package-lock.json b/package-lock.json index e9c66f7..82c6413 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,6 @@ "core-js": "^3.6.5", "dayjs": "^1.11.4", "echarts": "^5.3.1", - "echarts-liquidfill": "^3.1.0", "element-plus": "^2.2.21", "exceljs": "^4.3.0", "file-saver": "^2.0.5", @@ -3163,14 +3162,6 @@ "zrender": "5.3.2" } }, - "node_modules/echarts-liquidfill": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-3.1.0.tgz", - "integrity": "sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw==", - "peerDependencies": { - "echarts": "^5.0.1" - } - }, "node_modules/element-in-view": { "version": "0.1.0", "resolved": "https://registry.npmmirror.com/element-in-view/-/element-in-view-0.1.0.tgz", @@ -12010,12 +12001,6 @@ "zrender": "5.3.2" } }, - "echarts-liquidfill": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-3.1.0.tgz", - "integrity": "sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw==", - "requires": {} - }, "element-in-view": { "version": "0.1.0", "resolved": "https://registry.npmmirror.com/element-in-view/-/element-in-view-0.1.0.tgz", diff --git a/package.json b/package.json index 6dc6392..62bc4ab 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "core-js": "^3.6.5", "dayjs": "^1.11.4", "echarts": "^5.3.1", - "echarts-liquidfill": "^3.1.0", "element-plus": "^2.2.21", "exceljs": "^4.3.0", "file-saver": "^2.0.5", diff --git a/src/components/PageWrapLayout/index.scss b/src/components/PageWrapLayout/index.scss new file mode 100644 index 0000000..95810a3 --- /dev/null +++ b/src/components/PageWrapLayout/index.scss @@ -0,0 +1,18 @@ +.m-container-layout { + width: 100%; + height: 100%; + display: flex; + padding: 10px 12px; + box-sizing: border-box; + .m-container-layout-inner { + flex: 1; + display: flex; + flex-direction: column; + box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + background: white; + padding: 20px; + width: 100%; + height: 100%; + box-sizing: border-box; + } +} diff --git a/src/components/PageWrapLayout/index.vue b/src/components/PageWrapLayout/index.vue new file mode 100644 index 0000000..eb8f256 --- /dev/null +++ b/src/components/PageWrapLayout/index.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/layout/components/Header/ToolRight.vue b/src/layout/components/Header/ToolRight.vue index 9112852..812df70 100644 --- a/src/layout/components/Header/ToolRight.vue +++ b/src/layout/components/Header/ToolRight.vue @@ -13,11 +13,11 @@ diff --git a/src/views/form/validateForm/index.vue b/src/views/form/validateForm/index.vue index 4974ba5..654a938 100644 --- a/src/views/form/validateForm/index.vue +++ b/src/views/form/validateForm/index.vue @@ -1,6 +1,6 @@