Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/cockpit/borderTemplate.vue

@@ -33,6 +33,7 @@ export default {
   right: 10px;
   top: 68%;
   width: 21.6%; //416px
+  max-width: 416px;
   height: calc((100% - 52px) / 3);
   display: -ms-flexbox;
   display: flex;

src/views/cockpit/wpjg.vue

@@ -527,7 +527,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .wpjg {
-  top: calc(66.6% + 10px) !important;
+  top: 67% !important;
 
   .stacontent {
     width: 100%;

src/views/cockpitNew1/borderTemplate.vue

@@ -33,6 +33,7 @@ export default {
   right: 10px;
   top: 68%;
   width: 21.6%; //416px
+  max-width: 416px;
   height: calc((100% - 52px) / 3);
   display: -ms-flexbox;
   display: flex;

src/views/cockpitNew1/wpjg.vue

@@ -100,7 +100,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .wpjg {
-  top: calc(66.6% + 10px) !important;
+  top: 67% !important;
   .stacontent {
     width: 100%;
     height: 24px;