瀏覽代碼

修改大屏图标展示

fengxu 2 年之前
父節點
當前提交
5b6e0e9707

二進制
cokingCoal/images/newImage/data-1619059838735-QE9mBZmhh.png


+ 10 - 8
cokingCoal/index.html

@@ -12,6 +12,7 @@
     <script src="./libs/vue@2.7.10.js"></script>
     <script src="./libs/datav.min.js"></script>
     <script src="./libs/echarts.min.js"></script>
+    <!-- <script src="https://cdn.bootcdn.net/ajax/libs/echarts/5.4.2/echarts.common.js"></script> -->
     <script src="./libs/element-ui@2.15.9.js"></script>
     <script src="./libs/axios.min.js"></script>
     <script src="./js/request.js"></script>
@@ -254,7 +255,7 @@
                                 </div>
                                 <div class="flex items-center justify-center">
                                     <img class="top-img" src="./images/top-4.png" alt="">
-                                    <div>待岗池<span class="top-text">0</span>人</div>
+                                    <div>待岗池<span class="top-text">5923</span>人</div>
                                 </div>
                                 <div class="flex items-center justify-center">
                                     <img class="top-img" src="./images/top-2.png" alt="">
@@ -263,7 +264,7 @@
                             </div>
                             <div class="right_item_item_btm">
                                 <div class="right_item_btm_box">
-                                    <div class="left_user_title">
+                                    <!-- <div class="left_user_title">
                                         <div class="icon_title">
                                             <div class="icon">
                                                 <img src="./images/icon_title.png" alt="">
@@ -273,7 +274,7 @@
                                         <div class="line">
                                             <img src="./images/line.png" alt="">
                                         </div>
-                                    </div>
+                                    </div> -->
                                     <div class="right_btm_item_else">
                                         <div class="image_box_else"><span>0%</span>
                                             <img src="./images/annular.png" style="width: 100%;height:100%;" alt="">
@@ -288,21 +289,22 @@
                                                 <div>优化人数<span>0</span>人</div>
                                             </div>
                                         </div>
+                                        <div class="po_title">优化池</div>
                                     </div>
                                 </div>
                                 <div class="right_btm_item_box">
-                                    <div class="left_user_title">
+                                    <!-- <div class="left_user_title">
                                         <div class="icon_title">
                                             <div class="icon">
                                                 <img src="./images/icon_title.png" alt="">
                                             </div>
-                                            <div class="title">待岗池</div>
+                                            <div class="title">缓冲、待岗、共享</div>
                                         </div>
                                         <div class="line">
                                             <img src="./images/line.png" alt="">
                                         </div>
-                                    </div>
-                                    <div class="right_btm_item" ref="buffer"></div>
+                                    </div> -->
+                                    <div class="right_btm_item" ref="buffer" style="height: 100%;"></div>
                                 </div>
                             </div>
                         </div>
@@ -510,7 +512,7 @@
                                         <img src="./images/icon_title.png" alt="">
                                     </div>
                                     <div class="title_else_sb flex_sb">
-                                        <div class="tit_text">月度平均工资</div>
+                                        <div class="tit_text">平均工资</div>
                                         <div class="tit_icon">
                                             <span>5月</span>
                                             <img style="margin-left:10px" src="./images/down.png" alt="">

+ 17 - 9
cokingCoal/js/dataA.js

@@ -47,19 +47,19 @@ let leftEndList = {
 
 let worksList = {
   x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "民爆集团"],
-  y2: [43, 55, 34.29, 41.75, 129.66, 95.91, 55.4, 36.37],
-  y1: [43.11, 77.03, 49.64, 54.38, 156.33, 111.72, 77.92, 40.09],
+  y2: [43, 55, 34.29, 41.75, 129.66, 95.91, 55.4, 36.37],
+  y1: [43.11, 77.03, 49.64, 54.38, 156.33, 111.72, 77.92, 40.09],
 }
 
 let efficiencyList = {
   x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤"],
-  y2: [8.27, 8.83, 6.88, 7.03, 10.11, 13.07],
-  y1: [8.63, 9.1, 7.13, 7.05, 13.54, 7.6],
+  y2: [8.27, 8.83, 6.88, 7.03, 10.11, 13.07],
+  y1: [8.63, 9.1, 7.13, 7.05, 13.54, 7.6],
 }
 let wholeList = {
   x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤"],
-  y2: [1360, 1291, 1320, 1040, 1948, 2335],
-  y1: [1400, 1348, 1194, 1094, 2376, 1591],
+  y2: [1360, 1291, 1320, 1040, 1948, 2335],
+  y1: [1400, 1348, 1194, 1094, 2376, 1591],
 }
 
 let schoolList = {
@@ -84,10 +84,18 @@ let mobilizeList = {
 // }
 
 let userList = {
-  x: ["西山煤电","汾西矿业","霍州煤电","山煤国际","华晋焦煤","山西焦化","销售公司","投资公司","油品公司"],
-  y1: [412,269,285,217,219,327,92,4,5],
-  y2: [242,0,0,0,0,0,0,0,0],
+  x: ["西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "销售公司", "投资公司", "油品公司"],
+  y1: [412, 269, 285, 217, 219, 327, 92, 4, 5],
+  y2: [2743, 981, 1808, 133, 23, 142, 9, 84, 0],
+  y3: [242, 0, 0, 0, 0, 0, 0, 0, 0],
 }
+// let userList = {
+//   x: ["西山煤电","汾西矿业","霍州煤电","山煤国际","华晋焦煤","山西焦化","销售公司","投资公司","油品公司"],
+//   y1: [412,269,285,217,219,327,92,4,5],
+//   y2: [242,0,0,0,0,0,0,0,0],
+// }
+
+
 
 
 

File diff suppressed because it is too large
+ 21 - 9
cokingCoal/js/newIndex.js


+ 26 - 12
cokingCoal/styles/newIndex.css

@@ -475,7 +475,15 @@ a {
     display: flex;
     justify-content: center;
     align-items: center;
+    position: relative;
+
+}
 
+.po_title {
+    position: absolute;
+    right: 4%;
+    top: 4%;
+    font-size: 26px;
 }
 
 .right_item_btm_box {
@@ -1062,7 +1070,7 @@ img {
     transform: translateY(-50%);
 }
 
-.top_text_on{
+.top_text_on {
     font-size: 40px;
     font-weight: bolder;
     color: #EBB829;
@@ -1075,6 +1083,7 @@ img {
 .top_text span {
     font-size: 30px;
 }
+
 .top_text_on span {
     font-size: 30px;
 }
@@ -1095,12 +1104,13 @@ img {
 .btm_text {
     width: 100%;
     height: 100%;
-    
+
     display: flex;
     justify-content: space-around;
     align-items: center;
 }
-.btm_text_on{
+
+.btm_text_on {
     width: 100%;
     height: 100%;
     display: flex;
@@ -1108,12 +1118,15 @@ img {
     align-items: center;
 }
 
-.btm_text_span{
+.btm_text_span {
     font-size: 26px;
     color: #5AC9FD;
+    letter-spacing: 5px;
 }
-.btm_text_span_on{
+
+.btm_text_span_on {
     font-size: 26px;
+    letter-spacing: 5px;
     color: #EBB829;
 }
 
@@ -1121,10 +1134,11 @@ img {
     color: red;
 } */
 
-.echarts_else{
+.echarts_else {
     position: relative;
 }
-.echarts_else .img{
+
+.echarts_else .img {
     width: 370px;
     height: 370px;
     z-index: 99999;
@@ -1134,11 +1148,11 @@ img {
     animation: fadenum 8s infinite linear;
 }
 
-.tit_text{
+.tit_text {
     margin-top: 10px;
 }
 
-.tit_icon{
+.tit_icon {
     width: 200px;
     height: 65px;
     display: flex;
@@ -1147,12 +1161,12 @@ img {
     margin-top: 10px;
 }
 
-.tit_icon img{
+.tit_icon img {
     width: 33px;
     height: 21px;
 }
 
-.title_else_sb{
+.title_else_sb {
     width: 100%;
     height: 65px;
     text-indent: 30px;
@@ -1192,4 +1206,4 @@ img {
     100% {
         transform: rotate(360deg);
     }
-}
+}

Some files were not shown because too many files changed in this diff