页面调整

src/views/screen/building/cameraDataDialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="main-data dialog-area" @click.stop="preventDefault" @mouseleave="leaveFun">
+    <div class="main-data dialog-area" @click.stop="preventDefault">
       <div class="dialog-title">
         <img
           src="@/assets/images/main/cont_title_bg.png"
@@ -191,8 +191,8 @@
               <div class="content-title">
                 <span class="title">定额指标</span>
               </div>
-              <!-- <div class="content-Image"></div> -->
-              <div class="charts-cont"> 
+              <div class="content-Image"></div>
+              <!-- <div class="charts-cont"> 
                 <bar-chart
                    :chart-data="buildingAreaBarData"
                    :x-axis="buildingAreaBarAxis"
@@ -204,7 +204,7 @@
                     width="520px"
                     height="140px"
                       />
-                </div>  
+                </div>   -->
             </div>
           </div>
   
@@ -234,8 +234,8 @@
               <div class="content-title">
                 <span class="title">绿电比例</span>
               </div>
-              <!-- <div class="greenElectricity"></div> -->
-              <div id="wqo" style="width: 600px;height:400px;"></div>
+              <div class="greenElectricity"></div>
+              <!-- <div id="wqo" style="width: 600px;height:400px;"></div> -->
             </div>
           </div>
 
@@ -716,6 +716,20 @@
               barWidth: 20,
               data: [15,80,40],
             },
+            {
+              name: "约束值",
+              type: "bar",
+              symbolOffset: [40, 0],
+              stack: "b",
+              itemStyle: {
+                color: "#FBF43F",
+                borderWidth: 3,
+                borderColor: "#FBF43F",
+                //barBorderRadius: [5, 5, 0, 0], // 统一设置四个角的圆角大小
+              },
+              barWidth: 2,
+              data: [13,20,25],
+            },
         
       ],
       buildingAreaBarYaxis: {

src/views/screen/logistics/assets/codeBillDialog.vue

@@ -536,23 +536,27 @@ export default {
             //barBorderRadius: [10, 10, 0, 0], // 统一设置四个角的圆角大小
           },
           barWidth: 15,
-          data: [40, 80, 50, 50, 90, 70,50],
+          data: [40, 80, 50, 50, 90, 70,50,80,50,55,80],
         },
       ],
       nowBuildingAreaBarAxis: {
         type: "category",
         data: [
-          "太原市",
-          "大同市",
-          "长治市",
-          "阳泉市",
-          "晋城市",
-          "运城市",
-          "吕梁市",
+          "晋中供电公司",
+          "临汾供电公司",
+          "运城供电公司",
+          "晋城供电公司",
+          "长治供电公司",
+          "吕梁供电公司",
+          "忻州供电公司",
+          "朔州供电公司",
+          "阳泉供电公司",
+          "大同供电公司",
+          "太原供电公司",
         ],
         axisLabel: {
           color: "white", // 设置横坐标轴字体颜色为红色
-          rotate: 30,
+          rotate: 40,
           interval: 0
         },
         axisLine:{
@@ -656,18 +660,28 @@ export default {
             //barBorderRadius: [10, 10, 0, 0], // 统一设置四个角的圆角大小
           },
           barWidth: 15,
-          data: [40, 80, 45, 40, 70, 75,65,40,75,70,50,85],
+          data: [40, 80, 45, 40, 70, 75,65,40,75,70,85],
         },
 
       ],
       addBuildingAreaBarAxis: {
         type: "category",
         data: [
-          "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月",
+          "晋中供电公司",
+          "临汾供电公司",
+          "运城供电公司",
+          "晋城供电公司",
+          "长治供电公司",
+          "吕梁供电公司",
+          "忻州供电公司",
+          "朔州供电公司",
+          "阳泉供电公司",
+          "大同供电公司",
+          "太原供电公司",
         ],
         axisLabel: {
           color: "white", // 设置横坐标轴字体颜色为红色
-          rotate: 30,
+          rotate: 45,
           interval: 0
         },
         axisLine:{
@@ -720,11 +734,21 @@ export default {
       jueBuildingAreaBarAxis: {
         type: "category",
         data: [
-          "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月",
+          "太原市电力公司",
+          "大同市电力公司",
+          "阳泉市电力公司",
+          "长治市电力公司",
+          "晋城市电力公司",
+          "朔州市电力公司",
+          "忻州市电力公司",
+          "晋中市电力公司",
+          "吕梁市电力公司",
+          "临汾市电力公司",
+          "运城市电力公司",
         ],
         axisLabel: {
           color: "white", // 设置横坐标轴字体颜色为红色
-          rotate: 30,
+          rotate: 45,
           interval: 0
         },
         axisLine:{
@@ -896,7 +920,7 @@ export default {
   }
 
   .content {
-    margin-top: 10px;
+    //margin-top: 10px;
     padding-left: 20px;
   }
 
@@ -988,7 +1012,7 @@ export default {
   .rightList1{
     display: flex;
     flex-wrap: wrap;
-    padding: 15px;
+    padding: 15px 15px 0px 15px;
     .left-list{
         display: flex;
         align-items: center;

src/views/screen/logistics/logisticsAssets.vue

@@ -635,7 +635,7 @@ export default {
   }
 
   .content {
-    margin-top: 10px;
+    // margin-top: 10px;
     padding-left: 20px;
     .smallTitle{
       font-size: 10px;
@@ -650,7 +650,7 @@ export default {
     width: 100%;
     display: flex;
     justify-content: space-between !important;
-    margin-bottom:20px;
+     margin-bottom:20px;
 
     .dialog-item{
       width: calc(50% - 20px);
@@ -676,7 +676,7 @@ export default {
     .rightList1{
     display: flex;
     flex-wrap: wrap;
-    padding: 15px;
+    padding: 15px 15px 0px 15px;
     .left-list{
         display: flex;
         align-items: center;

src/views/screen/service/basicOperation.vue

@@ -24,7 +24,7 @@
               :width="80"
               :stroke-width="5"
               :percentage=onlineRate
-              color="#00F7FF"
+              color="#00FFFF"
               style="color:rgba(0, 247, 255, 0.18);"
             ></el-progress>
             <div class="name">人数在线率</div>
@@ -203,6 +203,11 @@ export default {
     font-family: "fashionZh" !important;
     font-size: 16px !important;
   }
+  
+  .el-progress-circle__track {
+    color: #FFFFFF;
+    opacity: 0.1;
+    }
 
   ::-webkit-scrollbar {
     width: 3px;

src/views/screen/service/basicOperationDialog.vue

@@ -39,7 +39,7 @@
                     :width="80"
                     :stroke-width="5"
                     :percentage="onlineRate"
-                    color="#00F7FF"
+                    color="#00FFFF"
                     style="color: rgba(0, 247, 255, 0.18)"
                   ></el-progress>
                   <div class="name">人数在线率</div>
@@ -1143,6 +1143,10 @@ export default {
     }
   }
 
+  .el-progress-circle__track {
+    color: #FFFFFF;
+    opacity: 0.1;
+    }
 
   ::-webkit-scrollbar {
     width: 3px;

src/views/screen/service/employeeHealth.vue

@@ -28,9 +28,8 @@
               type="circle"
               :width="112"
               :stroke-width="8"
-              :percentage="participateProportionRate.value"
-             
-              text-color="#00F7FF"
+              :percentage="participateProportionRate.value"   
+              color="#00FFFF"
               style="color:rgba(0, 247, 255, 0.18);"
             ></el-progress>
             <div class="name">检查人数占比</div>
@@ -191,7 +190,12 @@ export default {
       }
     }
   }
+  .el-progress-circle__track {
+    color: #FFFFFF;
+    opacity: 0.1;
+    }
 
+  
   ::v-deep .el-progress__text {
     color: #ffffff !important;
   }
@@ -213,6 +217,7 @@ export default {
     background: #ddd;
     // border-radius: 5px;
   }
+  
 }
 </style>
 

src/views/screen/service/employeeHealthDialog.vue

@@ -37,7 +37,7 @@
               :width="112"
               :stroke-width="8"
               :percentage="participateProportionRate.value"
-              color="#00F7FF"
+              color="#00FFFF"
               style="color:rgba(0, 247, 255, 0.18);"
             ></el-progress>
             <div class="name">检查人数占比</div>
@@ -395,7 +395,12 @@ export default {
       }
     }
   }
+  .el-progress-circle__track {
+    color: #FFFFFF;
+    opacity: 0.1;
+    }
 
+  
   ::v-deep .el-progress__text {
     color: #ffffff !important;
   }