diff --git a/package-lock.json b/package-lock.json
index b449dae..82c6413 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,9 +17,7 @@
"codemirror": "^5.65.9",
"core-js": "^3.6.5",
"dayjs": "^1.11.4",
- "default-passive-events": "^2.0.0",
"echarts": "^5.3.1",
- "echarts-liquidfill": "^3.1.0",
"element-plus": "^2.2.21",
"exceljs": "^4.3.0",
"file-saver": "^2.0.5",
@@ -31,7 +29,6 @@
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.0",
"pinia": "^2.0.21",
- "pinia-persistedstate-plugin": "^0.1.0",
"pinia-plugin-persistedstate": "^2.1.1",
"print-js": "^1.6.0",
"sass": "^1.54.0",
@@ -828,11 +825,6 @@
"resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.3.tgz",
"integrity": "sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q=="
},
- "node_modules/@types/js-cookie": {
- "version": "3.0.2",
- "resolved": "https://registry.npmmirror.com/@types/js-cookie/-/js-cookie-3.0.2.tgz",
- "integrity": "sha512-6+0ekgfusHftJNYpihfkMu8BWdeHs9EOJuGcSofErjstGPfPGEu9yTu4t460lTzzAMl2cM5zngQJqPMHbbnvYA=="
- },
"node_modules/@types/json-schema": {
"version": "7.0.11",
"resolved": "https://r.cnpmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -2957,11 +2949,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/default-passive-events": {
- "version": "2.0.0",
- "resolved": "https://r2.cnpmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
- "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
- },
"node_modules/defaults": {
"version": "1.0.4",
"resolved": "https://r.cnpmjs.org/defaults/-/defaults-1.0.4.tgz",
@@ -3175,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",
@@ -6565,15 +6544,6 @@
}
}
},
- "node_modules/pinia-persistedstate-plugin": {
- "version": "0.1.0",
- "resolved": "https://registry.npmmirror.com/pinia-persistedstate-plugin/-/pinia-persistedstate-plugin-0.1.0.tgz",
- "integrity": "sha512-ToKR/EJzhhXElQ5YL8PVVY4CqLJjywxszAJjOCgprjmIVkTrPBsEOY4b/ATOzHQc1TtuaJs/3MJuoCpA3pv8Ew==",
- "dependencies": {
- "@types/js-cookie": "^3.0.1",
- "pinia": "^2.0.12"
- }
- },
"node_modules/pinia-plugin-persistedstate": {
"version": "2.1.1",
"resolved": "https://registry.npmmirror.com/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-2.1.1.tgz",
@@ -10160,11 +10130,6 @@
"resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.3.tgz",
"integrity": "sha512-UfnOK1pIxO7P+EgPRZXD9jMpimd8QEFcEZ5R67R1UhGbv4zghU5+NE7U8M8G9H5Jc8FI51rqDWQs6FtUfq2e/Q=="
},
- "@types/js-cookie": {
- "version": "3.0.2",
- "resolved": "https://registry.npmmirror.com/@types/js-cookie/-/js-cookie-3.0.2.tgz",
- "integrity": "sha512-6+0ekgfusHftJNYpihfkMu8BWdeHs9EOJuGcSofErjstGPfPGEu9yTu4t460lTzzAMl2cM5zngQJqPMHbbnvYA=="
- },
"@types/json-schema": {
"version": "7.0.11",
"resolved": "https://r.cnpmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -11844,11 +11809,6 @@
"resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.3.2.tgz",
"integrity": "sha512-qjMjTrk+RKv/sp4RPDpV5CnKhxjFI9p+GkLBOls5A8EEElldYWCWA9zceAkmfd0xIo2aU1nxiaLFoiya2sb6Cg=="
},
- "default-passive-events": {
- "version": "2.0.0",
- "resolved": "https://r2.cnpmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
- "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
- },
"defaults": {
"version": "1.0.4",
"resolved": "https://r.cnpmjs.org/defaults/-/defaults-1.0.4.tgz",
@@ -12041,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",
@@ -14687,15 +14641,6 @@
}
}
},
- "pinia-persistedstate-plugin": {
- "version": "0.1.0",
- "resolved": "https://registry.npmmirror.com/pinia-persistedstate-plugin/-/pinia-persistedstate-plugin-0.1.0.tgz",
- "integrity": "sha512-ToKR/EJzhhXElQ5YL8PVVY4CqLJjywxszAJjOCgprjmIVkTrPBsEOY4b/ATOzHQc1TtuaJs/3MJuoCpA3pv8Ew==",
- "requires": {
- "@types/js-cookie": "^3.0.1",
- "pinia": "^2.0.12"
- }
- },
"pinia-plugin-persistedstate": {
"version": "2.1.1",
"resolved": "https://registry.npmmirror.com/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-2.1.1.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 @@
-
+
-
+