merge upstream

src/assets/styles/index.scss

@@ -88,12 +88,7 @@ div:focus {
 .pl-5 {
   padding-left: 5px;
 }
-.p-2{
+
-  background: rgba(247, 248, 252, 1);
-  min-height: 100vh;
-  box-sizing: border-box;
-  padding: 15px;
-}
 
 .block {
   display: block;

src/views/controlCenter/210/index.vue

@@ -4,4 +4,11 @@
     </div>
 </template>
 <script setup lang="ts"></script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.p-2{
+  background: rgba(247, 248, 252, 1);
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding: 15px;
+}
+</style>

src/views/controlCenter/6170/index.vue

@@ -638,6 +638,12 @@ onUnmounted(() => {
 
 </script>
 <style lang="scss" scoped>
+.p-2{
+  background: rgba(247, 248, 252, 1);
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding: 15px;
+}
 .device-page {
     .header-bar {
         border-radius: 8px;

src/views/controlCenter/670/index.vue

@@ -720,6 +720,12 @@ window.hideConfirm = function () {
 };
 </script>
 <style lang="scss" scoped>
+.p-2{
+  background: rgba(247, 248, 252, 1);
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding: 15px;
+}
 .device-page {
   .header-bar {
     border-radius: 8px;

src/views/controlCenter/controlPanel/index.vue

@@ -485,6 +485,12 @@ const forceAlarm = async () => {
 
 </script>
 <style lang="scss" scoped>
+.p-2{
+  background: rgba(247, 248, 252, 1);
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding: 15px;
+}
 :deep .el-collapse{
   border-top:none
 }

src/views/controlCenter/delivery/index.vue

@@ -249,6 +249,12 @@ const handleExport = () => {
 
 </script>
 <style lang="scss" scoped>
+.p-2{
+  background: rgba(247, 248, 252, 1);
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding: 15px;
+}
 :deep .el-collapse{
   border-top:none
 }

src/views/controlCenter/historyjectory/index.vue

@@ -257,6 +257,12 @@ const historyjectory = (row: any) => {
 
 </script>
 <style lang="scss" scoped>
+.p-2{
+  background: rgba(247, 248, 252, 1);
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding: 15px;
+}
 :deep .el-collapse{
   border-top:none
 }

src/views/system/menu/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div class="p-3">
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">