Merge remote-tracking branch 'origin/master'

screen-demo/src/views/templateInstance.vue

@@ -155,12 +155,12 @@
           <div class="span-right">完成率</div>
         </div>
       </div>
-      <div id="chart" style="position: fixed; bottom: 0; left: 0; background-color: rgba(97, 132, 219, 0.4); width: 400px; height: 300px;">
+      <div id="chart" style="position: fixed; bottom: 0; left: 0; background-color: rgba(97, 132, 219, 0.4); width: 400px; height: 100px;">
       </div>
     </div>
     <div class="echarts-containers">
 
-      <div id="echarts-container" style="position: fixed; bottom: 0; left: 0; background-color: rgba(97, 132, 219, 0.4); width: 300px; height: 200px;"></div>
+      <div id="echarts-container" style="position: fixed; bottom: 0; left: 0; background-color: rgba(97, 132, 219, 0.4); width: 300px; height: 100px;"></div>
     </div>
     <div class="table-container">
       <div class="schedule" style="width: 300px; margin: auto;">
@@ -173,7 +173,7 @@
           </div>
         </div>
       </div>
-      <div id="twochart" style="position: fixed; bottom: 0; left: 0; background-color: rgba(97, 132, 219, 0.4); width: 400px; height: 200px;"></div>
+      <div id="twochart" style="position: fixed; bottom: 0; left: 0; background-color: rgba(97, 132, 219, 0.4); width: 300px; height: 100px;"></div>
     </div>
     <!-- echarts 图表容器 -->
 
@@ -2342,18 +2342,18 @@ html {
   position: fixed;
   top: 50%;
   left: 0;
-  transform: translateY(-270%);
+  transform: translateY(-220%);
   color:#fff;
   background-color: rgb(66, 113, 227);
-  width: 400px;
+  width: 300px;
   height: 200px;
 
 }
 
 .table-containers {
   position: fixed;
-  bottom: 190px; /* 距离底部的距离 */
-  right: 10px; /* 距离右侧的距离 */
+  bottom: 50px; /* 距离底部的距离 */
+  right: 5px; /* 距离右侧的距离 */
   color: #fff;
   background-color: rgb(66, 113, 227);
   width: 400px;
@@ -2369,8 +2369,8 @@ html {
   transform: translateY(-10%);
   color:#fff;
   background-color: rgb(66, 113, 227);
-  width: 300px;
-  height: 200px;
+  width: 200px;
+  height: 100px;
 }
 
 
@@ -2453,8 +2453,8 @@ html {
   transform: translateY(-50%);
   color: #fff;
   background-color: rgba(97, 132, 219, 0.4);
-  width: 400px;
-  height: 800px;
+  width: 300px;
+  height: 600px;
 }
 .another-container {
   position: fixed;