解决冲突

screen-demo/src/views/templateInstance.vue

@@ -112,6 +112,20 @@
       </div>
     </div>
     <div class="table-container2">
+      <div class="schedule ">
+        <div style="display: inline-block; background-color: rgba(215,202,135,0.34); padding: 10px; border-radius: 10px;">
+          <button class="span-left" @click="selectcounty(0)">省</button>
+        </div>
+        <div style="display: inline-block; background-color: rgba(33,152,143,0.4); padding: 10px; border-radius: 10px;">
+          <button class="span-left" @click="selectcounty(1)">市</button>
+        </div>
+        <div style="display: inline-block; background-color: rgba(215,202,135,0.34); padding: 10px; border-radius: 10px;">
+          <button class="span-left" @click="selectcounty(2)">区</button>
+        </div>
+        <div style="display: inline-block; background-color: rgba(33,152,143,0.4); padding: 10px; border-radius: 10px;">
+          <button class="span-right" @click="selectcounty(3)">乡镇</button>
+        </div>
+      </div>
       <div class="button-container">
         <button class="button" @click="btnMethod(0)">告警数量</button>
         <button class="button" @click="btnMethod(1)">完成率</button>
@@ -140,7 +154,7 @@
           <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: 300px; height: 200px;">
+      <div id="chart" style="position: fixed; bottom: 0; left: 0; background-color: rgba(97, 132, 219, 0.4); width: 400px; height: 300px;">
       </div>
     </div>
     <div class="echarts-containers">
@@ -158,7 +172,7 @@
           </div>
         </div>
       </div>
-      <div id="twochart" style="position: fixed; bottom: 0; left: 0; background-color: rgba(97, 132, 219, 0.4); width: 300px; height: 200px;"></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>
     <!-- echarts 图表容器 -->
 
@@ -2310,27 +2324,26 @@ html {
   position: fixed;
   top: 50%;
   left: 0;
-  transform: translateY(-70%);
+  transform: translateY(-270%);
   color:#fff;
   background-color: rgb(66, 113, 227);
-  width: 300px;
+  width: 400px;
   height: 200px;
 
 }
 
 .table-containers {
   position: fixed;
-  top: 11%;
-  left: 0;
-  transform: translateY(-50%);
-  color:#fff;
+  bottom: 190px; /* 距离底部的距离 */
+  right: 10px; /* 距离右侧的距离 */
+  color: #fff;
   background-color: rgb(66, 113, 227);
-  width: 300px;
+  width: 400px;
   height: 200px;
-
 }
 
 
+
 .echarts-containers {
   position: fixed;
   top: 70%;
@@ -2417,12 +2430,13 @@ html {
 }
 .table-container2 {
   position: fixed;
-  right: 0;
-  top: 66vh;
-  color:#fff;
-  background-color: rgba(97,132,219,0.4);
+  left: 1px; /* 距离左侧的距离 */
+  top: 65%; /* 垂直居中 */
+  transform: translateY(-50%);
+  color: #fff;
+  background-color: rgba(97, 132, 219, 0.4);
   width: 400px;
-  height: 270px;
+  height: 800px;
 }
 .another-container {
   position: fixed;