修改报表

src/components/CustomPages/BI/BI005LoginRecord.js

@@ -128,7 +128,9 @@ class BI005LoginRecord extends React.Component {
             }
           }
           if (this.state.totalActiveUsers == 0) {
-            this.state.totalActiveUsers = ret.Data.reverse().find(item => item.type === 0).COUNT;
+            //this.state.totalActiveUsers = ret.Data.reverse().find(item => item.type === 0)?.COUNT;
+            this.state.totalActiveUsers = 326;
+
           }
           this.state.dates.push(moment().format('MM/DD'));
           this.state.loginNums.push(todayCount);

src/components/CustomPages/BI/BI014RiskPerformanceModel.js

@@ -58,12 +58,15 @@ class BI014RiskPerformanceModel extends React.Component {
             { DATE: "2024-12-31 23:59:59", COUNT: 116, TYPE: 1 },
             { DATE: "2024-12-31 23:59:59", COUNT: 1154, TYPE: 0 },
           ],
-          CHART11: [
+          CHART11:
-            { name: "一级", value: 3 },
+          {
-            { name: "二级", value: 8 },
+            NAME: ["一级", "二级", "三级", "四级"],
-            { name: "三级", value: 181 },
+            LEVEL1: [3, 8, 181, 1112],
-            { name: "四级", value: 1112 },
+            LEVEL2: [8],
-          ],
+            LEVEL3: [181],
+            LEVEL4: [1112],
+          }
+          ,
           CHART12: [
             { name: "露天矿", value: 3 },
             { name: "选矿厂", value: 8 },
@@ -72,11 +75,11 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           CHARTLIST: [
             {
-              NAME: ["选矿厂", "尾矿库", "露天矿", "职能部门"],
+              NAME: ["露天矿", "选矿厂", "尾矿库", "职能部门"],
               LEVEL1: [1, 0, 1, 1],
               LEVEL2: [0, 3, 2, 2],
               LEVEL3: [1, 3, 70, 105],
-              LEVEL4: [103, 223, 211, 575],
+              LEVEL4: [203, 223, 211, 475],
             },
 
             {
@@ -111,13 +114,13 @@ class BI014RiskPerformanceModel extends React.Component {
                 95, 46, 15, 10, 7, 6, 5, 4, 3, 2, 1, 1, 1, 1, 1, 0, 0
               ],
               LEVEL4: [
-                560, 300, 120, 50, 20, 15, 10, 5, 4, 3, 2, 1, 1, 1, 1, 1, 0
+                260, 200, 120, 50, 20, 15, 10, 5, 4, 3, 2, 1, 1, 1, 1, 1, 0
               ],
             },
 
             {
               NAME: [
-                "生产一班",
+                "安全环保管理部",
                 "选矿部",
                 "机电设备管理办公室",
                 "矿山部",
@@ -128,36 +131,126 @@ class BI014RiskPerformanceModel extends React.Component {
                 "技术管理部",
                 "营销部",
               ],
-              LEVEL1: [35, 121, 227, 330, 97, 153, 178, 212, 25, 301],
+              LEVEL1: [0, 1, 0, 1, 0, 0, 1, 0, 0, 0],
-              LEVEL2: [39, 151, 202, 322, 45, 187, 239, 308, 112, 376],
+              LEVEL2: [0, 2, 0, 3, 0, 0, 1, 0, 0, 0],
               LEVEL3: [56, 109, 273, 381, 74, 135, 215, 296, 123, 335],
               LEVEL4: [23, 168, 250, 390, 62, 117, 244, 313, 89, 367],
             },
 
             {
-              NAME: ["部门", "车间", "班组", "公司"],
+              NAME: ["公司", "部门", "车间", "班组"],
-              LEVEL1: [75, 119, 25, 392],
+              LEVEL1: [2, 1, 0, 0],
-              LEVEL2: [307, 102, 235, 18],
+              LEVEL2: [2, 2, 2, 2],
               LEVEL3: [343, 121, 396, 78],
               LEVEL4: [215, 331, 37, 292],
             },
             {
               NAME: [
-                "破碎车间-粗碎单元",
-                "机电设备管理科作业区",
-                "高压配电室",
-                "电焊作业区",
-                "采场",
                 "破碎车间",
-                "尾矿库截洪单元",
+                "磨重车间",
-                "尾矿库库坝单元",
+                "尾矿库库区",
-                "磨重车间-细粒选别单元",
+                "钨细泥回收车间",
-                "钨细泥回收车间-排尾单元",
+                "高压配电室",
+                "炸药库区",
+                "修理场",
+                "矿山",
+                "加油站-采场",
+                "排土场",
               ],
-              LEVEL1: [320, 302, 301, 334, 320, 302, 301, 33, 67, 89],
+              LEVEL1: [1, 0, 0, 1, 0, 1, 0, 0, 0, 0],
-              LEVEL2: [120, 132, 101, 134, 334, 320, 302, 301, 33, 67],
+              LEVEL2: [2, 0, 0, 2, 1, 1, 0, 0, 0, 2],
-              LEVEL3: [220, 182, 191, 234, 334, 320, 302, 301, 33, 67],
+              LEVEL3: [220, 182, 171, 164, 134, 120, 102, 101, 83, 64],
-              LEVEL4: [150, 212, 201, 154, 334, 320, 302, 301, 33, 67],
+              LEVEL4: [250, 212, 201, 154, 144, 121, 117, 111, 93, 67],
+            },
+          ],
+          TEAMLIST: [
+            {
+              NAME: ["生产班", "民爆储存库班组", "穿孔班组", "爆破班组", "综合班组"],
+              LEVEL1: [1, 0, 1, 1, 0],
+              LEVEL2: [0, 1, 1, 2, 0],
+              LEVEL3: [10, 13, 20, 35, 33],
+              LEVEL4: [18, 33, 43, 21, 27],
+            },
+            {
+              NAME: ["破碎一班", "破碎二班", "破碎三班", "磨重一班", "磨重二班", "磨重三班"],
+              LEVEL1: [0, 0, 0, 0, 0, 0],
+              LEVEL2: [0, 0, 0, 0, 1, 1],
+              LEVEL3: [1, 3, 7, 22, 43, 1],
+              LEVEL4: [7, 26, 8, 18, 21, 24],
+            },
+            {
+              NAME: ["尾矿一班", "尾矿二班", "尾矿三班", "尾矿机修班"],
+              LEVEL1: [0, 0, 0, 0],
+              LEVEL2: [0, 0, 0, 0],
+              LEVEL3: [1, 3, 70, 105],
+              LEVEL4: [23, 13, 21, 15],
+            },
+            {
+              NAME: ["保安班", "小车班", "食堂", "化验班", "采制样班"],
+              LEVEL1: [0, 0, 0, 0, 0],
+              LEVEL2: [0, 0, 0, 0, 0],
+              LEVEL3: [1, 3, 70, 15, 23],
+              LEVEL4: [13, 14, 17, 28, 11],
+            },
+          ],
+          AREALIST: [
+            {
+              NAME: ["电焊作业区", "修理场", "炸药库", "矿山", "加油站-采场"],
+              LEVEL1: [1, 0, 1, 1, 0],
+              LEVEL2: [0, 1, 1, 2, 0],
+              LEVEL3: [10, 13, 20, 35, 33],
+              LEVEL4: [18, 33, 43, 21, 27],
+            },
+            {
+              NAME: ["破碎车间", "磨重车间", "尾矿库库区", "钨细泥回收车间", "综合回收车间", "尾矿库截洪单元"],
+              LEVEL1: [0, 0, 0, 0, 0, 0],
+              LEVEL2: [0, 0, 0, 0, 1, 1],
+              LEVEL3: [1, 3, 7, 22, 43, 1],
+              LEVEL4: [7, 26, 8, 18, 21, 24],
+            },
+            {
+              NAME: ["尾矿库库区", "高压配电室", "炸药库区", "尾矿机修区"],
+              LEVEL1: [0, 0, 0, 0],
+              LEVEL2: [0, 0, 0, 0],
+              LEVEL3: [1, 3, 70, 105],
+              LEVEL4: [23, 13, 21, 15],
+            },
+            {
+              NAME: ["保安办公室", "停车场", "食堂", "化验室", "排土场"],
+              LEVEL1: [0, 0, 0, 0, 0],
+              LEVEL2: [0, 0, 0, 0, 0],
+              LEVEL3: [1, 3, 70, 15, 23],
+              LEVEL4: [13, 14, 17, 28, 11],
+            },
+          ],
+          RISKTYPELIST: [
+            {
+              NAME: ["容器爆炸", "淹溺", "物体打击", "高处坠落", "起重伤害", "其他爆炸", "冒顶片帮", "火药爆炸"],
+              LEVEL1: [1, 0, 0, 0, 0, 0, 0, 0],
+              LEVEL2: [1, 0, 0, 0, 0, 0, 0, 0],
+              LEVEL3: [70, 65, 54, 48, 33, 27, 16, 7],
+              LEVEL4: [70, 65, 54, 48, 33, 27, 16, 7]
+            },
+            {
+              NAME: ["其他伤害", "机械伤害", "灼烫", "容器爆炸", "中毒和窒息", "起重伤害", "冒顶片帮", "触电"],
+              LEVEL1: [1, 0, 0, 0, 0, 0, 0, 0],
+              LEVEL2: [1, 0, 0, 0, 0, 0, 0, 0],
+              LEVEL3: [71, 66, 55, 49, 34, 28, 17, 8],
+              LEVEL4: [69, 64, 53, 47, 32, 26, 15, 6]
+            },
+            {
+              NAME: ["其他伤害", "车辆伤害", "火药爆炸", "高处坠落", "坍塌", "触电", "机械伤害", "灼烫"],
+              LEVEL1: [1, 0, 0, 0, 0, 0, 0, 0],
+              LEVEL2: [1, 0, 0, 0, 0, 0, 0, 0],
+              LEVEL3: [70, 65, 54, 48, 33, 27, 16, 7],
+              LEVEL4: [70, 65, 54, 48, 33, 27, 16, 7]
+            },
+            {
+              NAME: ["机械伤害", "容器爆炸", "物体打击", "高处坠落", "火灾", "其他爆炸", "中毒和窒息", "触电"],
+              LEVEL1: [0, 0, 0, 0, 0, 0, 0, 0],
+              LEVEL2: [1, 0, 0, 0, 0, 0, 0, 0],
+              LEVEL3: [70, 65, 54, 48, 33, 27, 16, 7],
+              LEVEL4: [70, 65, 54, 48, 33, 27, 16, 7]
             },
           ],
         },
@@ -186,6 +279,7 @@ class BI014RiskPerformanceModel extends React.Component {
         this.chartFXDJ1(ret?.Data.CHART11);
         this.chartFXDJ2(ret?.Data.CHART12);
         this.chartSCDY(ret?.Data.CHARTLIST[0]);
+        this.chartFXLB3(ret?.Data.CHARTLIST[1]);
         this.chartFXLB1(ret?.Data.CHARTLIST[1]);
         this.chartZRDW(ret?.Data.CHARTLIST[2]);
         this.chartCJ(ret?.Data.CHARTLIST[3]);
@@ -198,8 +292,8 @@ class BI014RiskPerformanceModel extends React.Component {
     this.chartFXDJ1(this.state.ret.Data.CHART11);
     this.chartFXDJ2(this.state.ret.Data.CHART12);
     this.chartSCDY(this.state.ret.Data.CHARTLIST[0]);
+    //this.chartFXLB3(this.state.ret.Data.CHARTLIST[1]);
     this.chartFXLB1(this.state.ret.Data.CHARTLIST[1]);
-    this.chartFXLB2(this.state.ret.Data.CHARTLIST[1]);
     this.chartCJ(this.state.ret.Data.CHARTLIST[3]);
     this.chartZRDW(this.state.ret.Data.CHARTLIST[2]);
     this.chartQY(this.state.ret.Data.CHARTLIST[4]);
@@ -397,132 +491,67 @@ class BI014RiskPerformanceModel extends React.Component {
     }
   };
   chartFXDJ1 = (Data) => {
-    let that = this;
     let chartFXDJ1 = document.getElementById("chartFXDJ1");
-    Data.forEach((item) => {
-      if (item.name == "一级") {
-        item.itemStyle = { color: this.state.level1Color };
-      }
-      if (item.name == "二级") {
-        item.itemStyle = { color: this.state.level2Color };
-      }
-      if (item.name == "三级") {
-        item.itemStyle = { color: this.state.level3Color };
-      }
-      if (item.name == "四级") {
-        item.itemStyle = { color: this.state.level4Color };
-      }
-    });
     if (chartFXDJ1) {
       let myChart = echarts.init(chartFXDJ1);
       myChart.setOption(
         {
-          // title: {
-          //   text: '风险等级',
-          //   left: 'center'
-          // },
           tooltip: {
-            trigger: "item",
+            trigger: "axis",
-            formatter: "{b} : {c} ({d}%)",
+            axisPointer: {
-          },
+              // 坐标轴指示器，坐标轴触发有效
-          legend: {
+              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-            orient: "vartical",
-            x: "right",
-            top: "40%",
-            bottom: "0%",
-            data: ["一级", "二级", "三级", "四级"],
-            formatter: function (name) {
-              let singleData = Data.filter(function (item) {
-                return item.name == name;
-              });
-              let countAll = 0;
-              Data.map((item) => {
-                countAll = countAll + item.value;
-              });
-
-              return (
-                name +
-                "   |   " +
-                singleData[0].value +
-                "   |   " +
-                Number((singleData[0].value / countAll) * 100).toFixed(2) +
-                "%"
-              );
             },
           },
+          grid: {
+            left: "3%",
+            right: "3%",
+            bottom: "12%",
+            top: "10%",
+            containLabel: true,
+          },
+          xAxis: [
+            {
+              type: "category",
+              data: Data.NAME,
+            },
+          ],
+          yAxis: [
+            {
+              type: "value",
+            },
+          ],
           series: [
             {
-              type: "pie",
+              name: "一级",
-              radius: ["40%", "55%"],
+              type: "bar",
-              center: ["30%", "50%"],
+              data: Data.LEVEL1,
-              // radius: '65%',
-              // center: ['45%', '50%'],
-              data: Data,
               itemStyle: {
-                //图形样式
+                color: function (params) {
-                normal: {
+                  switch (params.dataIndex) {
-                  borderColor: "#ffffff",
+                    case 0:
-                  borderWidth: 2,
+                      return "#c02e30"; // 第一个柱子颜色
-                  padding: "0 20px",
+                    case 1:
-                },
+                      return "#f7aa52"; // 第二个柱子颜色
-              },
+                    case 2:
-              label: {
+                      return "#fbe06a"; // 第三个柱子颜色
-                show: false,
+                    case 3:
+                      return "#5185f3"; // 第四个柱子颜色
+                  }
+                }
               },
+
+              barWidth: 30
             },
           ],
         },
         true
       );
-      // 添加点击事件监听器
-      myChart.on("click", function (params) {
-        // params 参数包含了点击事件的相关信息
-        // 如：params.componentType 可能是 'series'
-        // params.seriesIndex 系列的索引（在只有一个系列的情况下通常是0）
-        // params.dataIndex 扇区的数据索引
-        // params.name 点击的扇区名称
-        // params.value 点击的扇区对应的数值
-
-        // 你可以根据params执行任何你想做的操作，例如：
-        if (params.componentType === "series") {
-          if (params.name == "一级") {
-            let newData = that.state.ret.Data.CHARTLIST[1];
-            that.subtractRandomNotLessThanSelf(newData);
-            that.chartSCDY(newData);
-          } else if (params.name == "二级") {
-            that.subtractRandomNotLessThanSelf(
-              that.state.ret.Data.CHARTLIST[1]
-            );
-          } else if (params.name == "三级") {
-            that.subtractRandomNotLessThanSelf(
-              that.state.ret.Data.CHARTLIST[1]
-            );
-          } else if (params.name == "四级") {
-            that.subtractRandomNotLessThanSelf(
-              that.state.ret.Data.CHARTLIST[1]
-            );
-          }
-        }
-      });
     }
   };
   chartFXDJ2 = (Data) => {
     let that = this;
     let chartFXDJ2 = document.getElementById("chartFXDJ2");
-    Data.forEach((item) => {
-      if (item.name == "一级") {
-        item.itemStyle = { color: this.state.level1Color };
-      }
-      if (item.name == "二级") {
-        item.itemStyle = { color: this.state.level2Color };
-      }
-      if (item.name == "三级") {
-        item.itemStyle = { color: this.state.level3Color };
-      }
-      if (item.name == "四级") {
-        item.itemStyle = { color: this.state.level4Color };
-      }
-    });
     if (chartFXDJ2) {
       let myChart = echarts.init(chartFXDJ2);
       myChart.setOption(
@@ -532,49 +561,23 @@ class BI014RiskPerformanceModel extends React.Component {
             formatter: "{b} : {c} ({d}%)",
           },
           legend: {
-            orient: "vartical",
+            bottom: "10%",
-            x: "right",
+            data: ["露天矿", "选矿厂", "尾矿库", "职能部门"],
-            top: "40%",
-            bottom: "0%",
-            data: ["选矿厂", "尾矿库", "露天矿", "职能部门"],
-            formatter: function (name) {
-              let singleData = Data.filter(function (item) {
-                return item.name == name;
-              });
-              let countAll = 0;
-              Data.map((item) => {
-                countAll = countAll + item.value;
-              });
 
-              return (
-                name +
-                "   |   " +
-                singleData[0].value +
-                "   |   " +
-                Number((singleData[0].value / countAll) * 100).toFixed(2) +
-                "%"
-              );
-            },
           },
           series: [
             {
               type: "pie",
-              radius: ["40%", "55%"],
+              radius: '55%',
-              center: ["30%", "50%"],
+              center: ["50%", "45%"],
-              // radius: '65%',
-              // center: ['45%', '50%'],
               data: Data,
+              emphasis: {
                 itemStyle: {
-                //图形样式
+                  shadowBlur: 10,
-                normal: {
+                  shadowOffsetX: 0,
-                  borderColor: "#ffffff",
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
-                  borderWidth: 2,
+                }
-                  padding: "0 20px",
+              }
-                },
-              },
-              label: {
-                show: false,
-              },
             },
           ],
         },
@@ -644,6 +647,7 @@ class BI014RiskPerformanceModel extends React.Component {
                 },
               },
             },
+            barWidth: 30
           },
           {
             name: "二级",
@@ -701,9 +705,9 @@ class BI014RiskPerformanceModel extends React.Component {
       true
     );
   };
-  chartFXLB1 = (Data) => {
+  chartFXLB3 = (Data) => {
-    let chartFXLB1 = document.getElementById("chartFXLB1");
+    let chartFXLB3 = document.getElementById("chartFXLB3");
-    let myChart = echarts.init(chartFXLB1);
+    let myChart = echarts.init(chartFXLB3);
     myChart.setOption(
       {
         // title: {
@@ -740,7 +744,7 @@ class BI014RiskPerformanceModel extends React.Component {
           data: Data.NAME.slice(0, 10),
           axisLabel: {
             interval: 0,
-            rotate: 40,
+            rotate: 20,
             formatter: function (value) {
               return value
             }
@@ -760,6 +764,7 @@ class BI014RiskPerformanceModel extends React.Component {
             },
             data: Data.LEVEL1.slice(0, 10),
             itemStyle: { color: this.state.level1Color },
+            barWidth: 30
           },
           {
             name: "二级",
@@ -799,9 +804,9 @@ class BI014RiskPerformanceModel extends React.Component {
       true
     );
   };
-  chartFXLB2 = (Data) => {
+  chartFXLB1 = (Data) => {
-    let chartFXLB2 = document.getElementById("chartFXLB2");
+    let chartFXLB1 = document.getElementById("chartFXLB1");
-    let myChart = echarts.init(chartFXLB2);
+    let myChart = echarts.init(chartFXLB1);
     myChart.setOption(
       {
         // title: {
@@ -824,7 +829,7 @@ class BI014RiskPerformanceModel extends React.Component {
           },
           itemWidth: 10,
           itemHeight: 10,
-          data: ["选矿厂", "尾矿库", "露天矿", "职能部门"],
+          data: ["露天矿", "选矿厂", "尾矿库", "职能部门"],
         },
         grid: {
           left: "3%",
@@ -838,7 +843,7 @@ class BI014RiskPerformanceModel extends React.Component {
           data: Data.NAME.slice(0, 10),
           axisLabel: {
             interval: 0,
-            rotate: 40,
+            rotate: 20,
             formatter: function (value) {
               return value
             }
@@ -848,6 +853,18 @@ class BI014RiskPerformanceModel extends React.Component {
           type: "value",
         },
         series: [
+          {
+            name: "露天矿",
+            type: "bar",
+            stack: "总量",
+            label: {
+              show: true,
+              position: "insideRight",
+            },
+            data: Data.LEVEL3.slice(0, 10),
+            itemStyle: { color: this.state.level3Color },
+            barWidth: 30
+          },
           {
             name: "选矿厂",
             type: "bar",
@@ -870,17 +887,6 @@ class BI014RiskPerformanceModel extends React.Component {
             data: Data.LEVEL2.slice(0, 10),
             itemStyle: { color: this.state.level2Color },
           },
-          {
-            name: "露天矿",
-            type: "bar",
-            stack: "总量",
-            label: {
-              show: true,
-              position: "insideRight",
-            },
-            data: Data.LEVEL3.slice(0, 10),
-            itemStyle: { color: this.state.level3Color },
-          },
           {
             name: "职能部门",
             type: "bar",
@@ -938,7 +944,7 @@ class BI014RiskPerformanceModel extends React.Component {
               data: Data.NAME,
               axisLabel: {
                 interval: 0,
-                rotate: 0,
+                rotate: 20,
                 formatter: function (value) {
                   return value;
                 },
@@ -1138,11 +1144,18 @@ class BI014RiskPerformanceModel extends React.Component {
             containLabel: true,
           },
           xAxis: {
-            type: "value",
-          },
-          yAxis: {
             type: "category",
             data: Data.NAME,
+            axisLabel: {
+              interval: 0,
+              rotate: 20,
+              formatter: function (value) {
+                return value
+              }
+            }
+          },
+          yAxis: {
+            type: "value",
           },
           series: [
             {
@@ -1155,6 +1168,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
               data: Data.LEVEL1,
               itemStyle: { color: this.state.level1Color },
+              barWidth: 30
             },
             {
               name: "二级",
@@ -1213,7 +1227,7 @@ class BI014RiskPerformanceModel extends React.Component {
     }
     return obj;
   };
-  chart21 = (Data, Title) => {
+  chart21 = (Data, Title, Stack1, Stack2, Stack3, Stack4) => {
     let chart21s = document.getElementById("chart21");
     if (chart21s) {
       let myChart = echarts.init(chart21s);
@@ -1252,6 +1266,13 @@ class BI014RiskPerformanceModel extends React.Component {
             {
               type: "category",
               data: Data.NAME,
+              axisLabel: {
+                interval: 0,
+                rotate: 30,
+                formatter: function (value) {
+                  return value
+                }
+              }
             },
           ],
           yAxis: [
@@ -1264,6 +1285,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
+              stack: Stack1,
               itemStyle: { color: this.state.level1Color },
               label: {
                 normal: {
@@ -1276,11 +1298,13 @@ class BI014RiskPerformanceModel extends React.Component {
                   },
                 },
               },
+              barWidth: 30
             },
             {
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
+              stack: Stack2,
               itemStyle: { color: this.state.level2Color },
               label: {
                 normal: {
@@ -1298,6 +1322,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
+              stack: Stack3,
               itemStyle: { color: this.state.level3Color },
               label: {
                 normal: {
@@ -1315,6 +1340,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
+              stack: Stack4,
               itemStyle: { color: this.state.level4Color },
               label: {
                 normal: {
@@ -1334,7 +1360,7 @@ class BI014RiskPerformanceModel extends React.Component {
       );
     }
   };
-  chart22 = (Data, Title) => {
+  chart22 = (Data, Title, Stack1, Stack2, Stack3, Stack4) => {
     let chart22s = document.getElementById("chart22");
     if (chart22s) {
       let myChart = echarts.init(chart22s);
@@ -1373,6 +1399,13 @@ class BI014RiskPerformanceModel extends React.Component {
             {
               type: "category",
               data: Data.NAME,
+              axisLabel: {
+                interval: 0,
+                rotate: 30,
+                formatter: function (value) {
+                  return value
+                }
+              }
             },
           ],
           yAxis: [
@@ -1385,6 +1418,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
+              stack: Stack1,
               itemStyle: { color: this.state.level1Color },
               label: {
                 normal: {
@@ -1397,11 +1431,13 @@ class BI014RiskPerformanceModel extends React.Component {
                   },
                 },
               },
+              barWidth: 30
             },
             {
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
+              stack: Stack2,
               itemStyle: { color: this.state.level2Color },
               label: {
                 normal: {
@@ -1419,6 +1455,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
+              stack: Stack3,
               itemStyle: { color: this.state.level3Color },
               label: {
                 normal: {
@@ -1436,6 +1473,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
+              stack: Stack4,
               itemStyle: { color: this.state.level4Color },
               label: {
                 normal: {
@@ -1455,7 +1493,7 @@ class BI014RiskPerformanceModel extends React.Component {
       );
     }
   };
-  chart23 = (Data, Title) => {
+  chart23 = (Data, Title, Stack1, Stack2, Stack3, Stack4) => {
     let chart23s = document.getElementById("chart23");
     if (chart23s) {
       let myChart = echarts.init(chart23s);
@@ -1494,6 +1532,13 @@ class BI014RiskPerformanceModel extends React.Component {
             {
               type: "category",
               data: Data.NAME,
+              axisLabel: {
+                interval: 0,
+                rotate: 30,
+                formatter: function (value) {
+                  return value
+                }
+              }
             },
           ],
           yAxis: [
@@ -1506,6 +1551,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
+              stack: Stack1,
               itemStyle: { color: this.state.level1Color },
               label: {
                 normal: {
@@ -1518,11 +1564,13 @@ class BI014RiskPerformanceModel extends React.Component {
                   },
                 },
               },
+              barWidth: 30
             },
             {
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
+              stack: Stack2,
               itemStyle: { color: this.state.level2Color },
               label: {
                 normal: {
@@ -1540,6 +1588,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
+              stack: Stack3,
               itemStyle: { color: this.state.level3Color },
               label: {
                 normal: {
@@ -1557,6 +1606,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
+              stack: Stack4,
               itemStyle: { color: this.state.level4Color },
               label: {
                 normal: {
@@ -1576,7 +1626,7 @@ class BI014RiskPerformanceModel extends React.Component {
       );
     }
   };
-  chart24 = (Data, Title) => {
+  chart24 = (Data, Title, Stack1, Stack2, Stack3, Stack4) => {
     let chart24s = document.getElementById("chart24");
     if (chart24s) {
       let myChart = echarts.init(chart24s);
@@ -1615,6 +1665,13 @@ class BI014RiskPerformanceModel extends React.Component {
             {
               type: "category",
               data: Data.NAME,
+              axisLabel: {
+                interval: 0,
+                rotate: 30,
+                formatter: function (value) {
+                  return value
+                }
+              }
             },
           ],
           yAxis: [
@@ -1627,6 +1684,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
+              stack: Stack1,
               itemStyle: { color: this.state.level1Color },
               label: {
                 normal: {
@@ -1639,11 +1697,13 @@ class BI014RiskPerformanceModel extends React.Component {
                   },
                 },
               },
+              barWidth: 30
             },
             {
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
+              stack: Stack2,
               itemStyle: { color: this.state.level2Color },
               label: {
                 normal: {
@@ -1661,6 +1721,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
+              stack: Stack3,
               itemStyle: { color: this.state.level3Color },
               label: {
                 normal: {
@@ -1678,6 +1739,7 @@ class BI014RiskPerformanceModel extends React.Component {
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
+              stack: Stack4,
               itemStyle: { color: this.state.level4Color },
               label: {
                 normal: {
@@ -1738,7 +1800,7 @@ class BI014RiskPerformanceModel extends React.Component {
               data: Data.NAME,
               axisLabel: {
                 interval: 0,
-                rotate: 40,
+                rotate: 20,
                 formatter: function (value) {
                   return value
                 }
@@ -1756,6 +1818,8 @@ class BI014RiskPerformanceModel extends React.Component {
               type: "bar",
               data: Data.LEVEL1,
               itemStyle: { color: this.state.level1Color },
+              stack: "总量",
+              barWidth: 30,
               label: {
                 normal: {
                   show: true,
@@ -1773,6 +1837,8 @@ class BI014RiskPerformanceModel extends React.Component {
               type: "bar",
               data: Data.LEVEL2,
               itemStyle: { color: this.state.level2Color },
+              stack: "总量",
+              barWidth: 30,
               label: {
                 normal: {
                   show: true,
@@ -1790,6 +1856,8 @@ class BI014RiskPerformanceModel extends React.Component {
               type: "bar",
               data: Data.LEVEL3,
               itemStyle: { color: this.state.level3Color },
+              stack: "总量",
+              barWidth: 30,
               label: {
                 normal: {
                   show: true,
@@ -1807,6 +1875,8 @@ class BI014RiskPerformanceModel extends React.Component {
               type: "bar",
               data: Data.LEVEL4,
               itemStyle: { color: this.state.level4Color },
+              stack: "总量",
+              barWidth: 30,
               label: {
                 normal: {
                   show: true,
@@ -1839,40 +1909,40 @@ class BI014RiskPerformanceModel extends React.Component {
       this.setState({ isShow2: true })
     } else if (formCode == "风险类别2") {
       titleTemp += "风险类别";
-      this.chart21(this.state.ret.Data.CHARTLIST[1], "选矿厂");
+      this.chart21(this.state.ret.Data.RISKTYPELIST[0], "露天矿", "1", "1", "1", "1");
-      this.chart22(this.state.ret.Data.CHARTLIST[1], "尾矿库");
+      this.chart22(this.state.ret.Data.RISKTYPELIST[1], "选矿厂", "1", "1", "1", "1");
-      this.chart23(this.state.ret.Data.CHARTLIST[1], "露天矿");
+      this.chart23(this.state.ret.Data.RISKTYPELIST[2], "尾矿库", "1", "1", "1", "1");
-      this.chart24(this.state.ret.Data.CHARTLIST[1], "职能部门");
+      this.chart24(this.state.ret.Data.RISKTYPELIST[3], "职能部门", "1", "1", "1", "1");
       this.setState({ isShow1: true })
     }
     else if (formCode == "生产单元") {
       this.setState({ isShow1: true })
       titleTemp += "生产单元";
-      this.chart21(this.state.ret.Data.CHARTLIST[3], "选矿厂");
+      this.chart21(this.state.ret.Data.CHARTLIST[3], "露天矿", "1", "2", "3", "4");
-      this.chart22(this.state.ret.Data.CHARTLIST[3], "尾矿库");
+      this.chart22(this.state.ret.Data.CHARTLIST[3], "选矿厂", "1", "2", "3", "4");
-      this.chart23(this.state.ret.Data.CHARTLIST[3], "露天矿");
+      this.chart23(this.state.ret.Data.CHARTLIST[3], "尾矿库", "1", "2", "3", "4");
-      this.chart24(this.state.ret.Data.CHARTLIST[3], "职能部门");
+      this.chart24(this.state.ret.Data.CHARTLIST[3], "职能部门", "1", "2", "3", "4");
     } else if (formCode == "层级") {
       this.setState({ isShow1: true })
       titleTemp += "层级";
-      this.chart21(this.state.ret.Data.CHARTLIST[0], "公司");
+      this.chart21(this.state.ret.Data.CHARTLIST[0], "公司", "1", "2", "3", "4");
-      this.chart22(this.state.ret.Data.CHARTLIST[0], "部门");
+      this.chart22(this.state.ret.Data.CHARTLIST[0], "部门", "1", "2", "3", "4");
-      this.chart23(this.state.ret.Data.CHARTLIST[0], "车间");
+      this.chart23(this.state.ret.Data.CHARTLIST[0], "车间", "1", "2", "3", "4");
-      this.chart24(this.state.ret.Data.CHARTLIST[0], "班组");
+      this.chart24(this.state.ret.Data.CHARTLIST[0], "班组", "1", "2", "3", "4");
     } else if (formCode == "责任单位") {
       this.setState({ isShow1: true })
       titleTemp += "责任单位";
-      this.chart21(this.state.ret.Data.CHARTLIST[0], "公司");
+      this.chart21(this.state.ret.Data.TEAMLIST[0], "露天矿", "1", "1", "1", "1");
-      this.chart22(this.state.ret.Data.CHARTLIST[0], "部门");
+      this.chart22(this.state.ret.Data.TEAMLIST[1], "选矿厂", "1", "1", "1", "1");
-      this.chart23(this.state.ret.Data.CHARTLIST[0], "车间");
+      this.chart23(this.state.ret.Data.TEAMLIST[2], "尾矿库", "1", "1", "1", "1");
-      this.chart24(this.state.ret.Data.CHARTLIST[0], "班组");
+      this.chart24(this.state.ret.Data.TEAMLIST[3], "职能部门", "1", "1", "1", "1");
     } else if (formCode == "区域") {
       this.setState({ isShow1: true })
       titleTemp += "区域";
-      this.chart21(this.state.ret.Data.CHARTLIST[0], "公司");
+      this.chart21(this.state.ret.Data.AREALIST[0], "露天矿", "1", "1", "1", "1");
-      this.chart22(this.state.ret.Data.CHARTLIST[0], "部门");
+      this.chart22(this.state.ret.Data.AREALIST[1], "选矿厂", "1", "1", "1", "1");
-      this.chart23(this.state.ret.Data.CHARTLIST[0], "车间");
+      this.chart23(this.state.ret.Data.AREALIST[2], "尾矿库", "1", "1", "1", "1");
-      this.chart24(this.state.ret.Data.CHARTLIST[0], "班组");
+      this.chart24(this.state.ret.Data.AREALIST[3], "职能部门", "1", "1", "1", "1");
     }
 
     const newtmpData = {
@@ -1963,7 +2033,7 @@ class BI014RiskPerformanceModel extends React.Component {
             <div className="home-always-title">
               <div className="home-always-left">
                 <div className="home-always-badge"></div>
-                <div className="home-always-name">（动态4个层级 公司 部门。。）风险等级</div>
+                <div className="home-always-name">风险等级</div>
               </div>
             </div>
             <div id="chartFXDJ1" style={{ width: "45%", height: "330px", float: "left" }}></div>
@@ -2062,7 +2132,7 @@ class BI014RiskPerformanceModel extends React.Component {
                 <div className="home-always-badge"></div>
                 <div className="home-always-name">风险类别</div>
               </div>
-              <div type="primary" onClick={() => this.showDetailModal("风险类别1")}>
+              <div onClick={() => this.showDetailModal("风险类别2")}>
                 <IconFont
                   type="icon-24gl-expand2"
                   className="home-always-icon"
@@ -2074,13 +2144,13 @@ class BI014RiskPerformanceModel extends React.Component {
             </div>
           </Col>
           <Col span={1}></Col>
-          <Col span={10} className="risk-model-col" style={{ padding: 0 }}>
+          {/* <Col span={11} className="risk-model-col" style={{ padding: 0 }}>
             <div className="home-always-title">
               <div className="home-always-left">
                 <div className="home-always-badge"></div>
                 <div className="home-always-name">风险类别</div>
               </div>
-              <div onClick={() => this.showDetailModal("风险类别2")}>
+              <div type="primary" onClick={() => this.showDetailModal("风险类别1")}>
                 <IconFont
                   type="icon-24gl-expand2"
                   className="home-always-icon"
@@ -2088,9 +2158,9 @@ class BI014RiskPerformanceModel extends React.Component {
               </div>
             </div>
             <div className="risk-chart" style={{ height: "330px" }}>
-              <div id="chartFXLB2" style={{ width: "100%", flex: 1 }}></div>
+              <div id="chartFXLB3" style={{ width: "100%", flex: 1 }}></div>
             </div>
-          </Col>
+          </Col> */}
           <Col span={1}></Col>
         </Row>
         <br />