fengxu 2 éve
szülő
commit
33c815b2e1
3 módosított fájl, 509 hozzáadás és 488 törlés
  1. 76 63
      cokingCoal/js/dataA.js
  2. 428 425
      cokingCoal/js/newIndex.js
  3. 5 0
      cokingCoal/styles/newIndex.css

+ 76 - 63
cokingCoal/js/dataA.js

@@ -3,25 +3,25 @@ let echarts1 = [
     [1200, 680, 562]
 ]
 let echarts2 = [{
-        name: "高级-正高级",
-        value: 146,
-    },
-    {
-        name: "高级-副高级",
-        value: 4021,
-    },
-    {
-        name: "中级",
-        value: 17437,
-    },
-    {
-        name: "初级-助理级",
-        value: 12622,
-    },
-    {
-        name: "初级-员级",
-        value: 7350,
-    },
+    name: "高级-正高级",
+    value: 146,
+},
+{
+    name: "高级-副高级",
+    value: 4021,
+},
+{
+    name: "中级",
+    value: 17437,
+},
+{
+    name: "初级-助理级",
+    value: 12622,
+},
+{
+    name: "初级-员级",
+    value: 7350,
+},
 ]
 
 let levelList = {
@@ -29,9 +29,14 @@ let levelList = {
     x: ["高级技师", "技师", "高级工", "中级工", "初级工"],
     y: [903, 5086, 34826, 50610, 14227],
 }
+// let salaryList = {
+//     x: ["西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备", "金土地", "销售公司", "国发公司", "投资公司", "人力公司", "金融资本", "民爆集团", "云数据", "焦煤置业", "新能源", "油品公司", "低碳公司", "交易中心", "招标公司"],
+//     y: [94, 90, 93, 80, 85, 95, 98, 99, 93, 91, 95, 83, 98, 94, 99, 92, 90, 93, 87, 89, 97],
+// }
+
 let salaryList = {
-    x: ["西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备", "金土地", "销售公司", "国发公司", "投资公司", "人力公司", "金融资本", "民爆集团", "云数据", "焦煤置业", "新能源", "油品公司", "低碳公司", "交易中心", "招标公司"],
-    y: [94, 90, 93, 80, 85, 95, 98, 99, 93, 91, 95, 83, 98, 94, 99, 92, 90, 93, 87, 89, 97],
+    x: ["西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备公司", "金土地公司", "销售公司", "国发公司", "投资公司", "人力资源公司", "金融资本公司", "民爆集团", "云数据公司", "焦煤置业", "新能源公司", "油品公司", "低碳公司", "交易中心", "招标公司"],
+    y: [94, 90, 93, 90, 93, 95, 98, 100, 93, 91, 95, 90, 98, 94, 99, 92, 100, 93, 97, 89, 97]
 }
 
 // let leftEndList = {
@@ -40,12 +45,20 @@ let salaryList = {
 //   y2: [10525, 19735.8, 6856.6, 7729.8, 7320.2, 8711, 8908.4, 4784.4, 11697.8, 14724.2, 15173.2, 8016.6, 0, 14323.8, 5423.8, 11432.8, 10882.2, 13060, 0, 13103.6, 15612, 0, 9911, 3106.2],
 // }
 
+// let leftEndList = {
+//     x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备公司", "金土地公司", "销售公司", "国发公司", "投资公司", "人力公司", "金融资本公司", "民爆集团", "云数据公司", "焦煤置业", "新能源公司", "油品公司", "低碳公司", "交易中心"],
+//     y1: [11708, 7611.2, 9818.8, 8530.8, 9409.4, 9777.4, 4882.8, 12574.4, 17091.8, 23969.2, 7321, 10175, 18170.6, 14901.8, 7572.4, 15567, 11993.6, 11090.6, 11957.2, 4578.4, 7566, ],
+//     y2: [10525, 6856.6, 7729.8, 7320.2, 8711, 8908.4, 4784.4, 11697.8, 14724.2, 9911, 15173.2, 8016.6, 0, 14323.8, 5423.8, 11432.8, 13103.6, 10882.2, 13060, 0, 0, ],
+// }
+
 let leftEndList = {
-    x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备公司", "金土地公司", "销售公司", "国发公司", "投资公司", "人力公司", "金融资本公司", "民爆集团", "云数据公司", "焦煤置业", "新能源公司", "油品公司", "低碳公司", "交易中心"],
-    y1: [11708, 7611.2, 9818.8, 8530.8, 9409.4, 9777.4, 4882.8, 12574.4, 17091.8, 23969.2, 7321, 10175, 18170.6, 14901.8, 7572.4, 15567, 11993.6, 11090.6, 11957.2, 4578.4, 7566, ],
-    y2: [10525, 6856.6, 7729.8, 7320.2, 8711, 8908.4, 4784.4, 11697.8, 14724.2, 9911, 15173.2, 8016.6, 0, 14323.8, 5423.8, 11432.8, 13103.6, 10882.2, 13060, 0, 0, ],
+    x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备公司", "金土地公司", "销售公司", "国发公司", "投资公司", "人力资源公司", "金融资本公司", "民爆集团", "云数据公司", "焦煤置业", "新能源公司", "油品公司", "低碳公司", "交易中心", "招标公司"],
+    y1: [9401, 9794, 9814, 8997, 9411, 10830, 5043, 12743, 16787, 20488, 7321, 8479, 18297, 14812, 7551, 16525, 12173, 11308, 13405, 7077, 7566, 5889],
+    y2: [8146, 8812, 8043, 7634, 8231, 8928, 4752, 11693, 15066, 15402, 9911, 6681, 0, 14568, 5457, 13146, 13014, 10882, 12268, 0, 0, 0],
 }
 
+
+
 let worksList = {
     x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "民爆集团"],
     y2: [43, 55, 34.29, 41.75, 129.66, 95.91, 55.4, 36.37],
@@ -94,16 +107,16 @@ let admissionList = {
 // }
 
 let userList = {
-        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],
-    // }
+    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],
+// }
 
 
 
@@ -119,35 +132,35 @@ function spArr(arr, num) { //arr是你要分割的数组,num是以几个为一
 }
 
 let left5 = [{
-        y: 3103,
-        name: '研究生及以上',
-        sliced: false,
-        selected: false,
-    },
-    {
-        y: 42543,
-        name: '大学',
-        sliced: false,
-        selected: false,
-    },
-    {
-        y: 46669,
-        name: '大专',
-        sliced: false,
-        selected: false,
-    },
-    {
-        y: 69437,
-        name: '中专、技校',
-        sliced: false,
-        selected: false,
-    },
-    {
-        y: 25049,
-        name: '初中及以下',
-        sliced: false,
-        selected: false,
-    }
+    y: 3103,
+    name: '研究生及以上',
+    sliced: false,
+    selected: false,
+},
+{
+    y: 42543,
+    name: '大学',
+    sliced: false,
+    selected: false,
+},
+{
+    y: 46669,
+    name: '大专',
+    sliced: false,
+    selected: false,
+},
+{
+    y: 69437,
+    name: '中专、技校',
+    sliced: false,
+    selected: false,
+},
+{
+    y: 25049,
+    name: '初中及以下',
+    sliced: false,
+    selected: false,
+}
 ]
 
 // let downhole = {

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 428 - 425
cokingCoal/js/newIndex.js


+ 5 - 0
cokingCoal/styles/newIndex.css

@@ -921,6 +921,11 @@ img {
     color: #f3f3f3;
     position: relative;
     padding-left: 12px;
+    /* color: #5340ff; */
+    /* color: #277d8a;
+    color: #1F6276;
+    color: #13405c;
+    color: #0a2547; */
 }
 
 .tooltip-cont p::before {

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott