更新页面

src/components/CustomPages/BI/BI014RiskPerformanceModel.js

@@ -122,16 +122,14 @@ class BI014RiskPerformanceModel extends React.Component {
                 "机电设备管理办公室",
                 "矿山部",
                 "财务部",
-                "办公室",
                 "非金属资源部筹备组",
                 "企业管理部",
                 "技术管理部",
-                "营销部",
               ],
-              LEVEL1: [0, 1, 0, 1, 0, 0, 1, 0, 0, 0],
+              LEVEL1: [0, 1, 0, 1, 0, 0, 1, 0],
-              LEVEL2: [0, 2, 0, 3, 0, 0, 1, 0, 0, 0],
+              LEVEL2: [0, 2, 0, 3, 0, 0, 1, 0],
-              LEVEL3: [56, 109, 273, 381, 74, 135, 215, 296, 123, 335],
+              LEVEL3: [56, 109, 273, 381, 74, 135, 215, 335],
-              LEVEL4: [23, 168, 250, 390, 62, 117, 244, 313, 89, 367],
+              LEVEL4: [23, 168, 250, 390, 62, 117, 244, 367],
             },
 
             {
@@ -252,14 +250,14 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           CHARTZYRW1:
           {
-            NAME: ["一般任务", "关键任务", "许可作业"],
+            NAME: ["许可作业", "关键任务", "一般任务"],
-            LEVEL1: [67, 81, 91],
+            LEVEL1: [67, 81, 191],
           }
           ,
           CHARTZYRW2: [
-            { name: "一般任务", value: 67 },
+            { name: "许可作业", value: 67 },
             { name: "关键任务", value: 81 },
-            { name: "许可作业", value: 91 },
+            { name: "一般任务", value: 191 },
           ],
         },
         TotalCount: 0,
@@ -527,6 +525,7 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           series: [
             {
+              barWidth: 20,
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
@@ -544,7 +543,6 @@ class BI014RiskPerformanceModel extends React.Component {
                   }
                 }
               },
-              barWidth: 30,
               label: {
                 normal: {
                   show: true,
@@ -664,6 +662,7 @@ class BI014RiskPerformanceModel extends React.Component {
         ],
         series: [
           {
+            barWidth: 20,
             name: "一级",
             type: "bar",
             data: Data.LEVEL1,
@@ -679,9 +678,10 @@ class BI014RiskPerformanceModel extends React.Component {
                 },
               },
             },
-            barWidth: 30
+
           },
           {
+            barWidth: 20,
             name: "二级",
             type: "bar",
             data: Data.LEVEL2,
@@ -699,6 +699,7 @@ class BI014RiskPerformanceModel extends React.Component {
             },
           },
           {
+            barWidth: 20,
             name: "三级",
             type: "bar",
             data: Data.LEVEL3,
@@ -716,6 +717,7 @@ class BI014RiskPerformanceModel extends React.Component {
             },
           },
           {
+            barWidth: 20,
             name: "四级",
             type: "bar",
             data: Data.LEVEL4,
@@ -788,6 +790,7 @@ class BI014RiskPerformanceModel extends React.Component {
         },
         series: [
           {
+            barWidth: 20,
             name: "露天矿",
             type: "bar",
             stack: "总量",
@@ -797,9 +800,9 @@ class BI014RiskPerformanceModel extends React.Component {
             },
             data: Data.LEVEL3.slice(0, 10),
             itemStyle: { color: this.state.level3Color },
-            barWidth: 30
           },
           {
+            barWidth: 20,
             name: "选矿厂",
             type: "bar",
             stack: "总量",
@@ -811,6 +814,7 @@ class BI014RiskPerformanceModel extends React.Component {
             itemStyle: { color: this.state.level1Color },
           },
           {
+            barWidth: 20,
             name: "尾矿库",
             type: "bar",
             stack: "总量",
@@ -822,6 +826,7 @@ class BI014RiskPerformanceModel extends React.Component {
             itemStyle: { color: this.state.level2Color },
           },
           {
+            barWidth: 20,
             name: "职能部门",
             type: "bar",
             stack: "总量",
@@ -843,10 +848,6 @@ class BI014RiskPerformanceModel extends React.Component {
       let myChart = echarts.init(chartZRDW);
       myChart.setOption(
         {
-          // title: {
-          //   text: "责任单位(等级)",
-          //   left: "center",
-          // },
           tooltip: {
             trigger: "axis",
             axisPointer: {
@@ -892,28 +893,68 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           series: [
             {
+              barWidth: 20,
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
               itemStyle: { color: this.state.level1Color },
+              label: {
+                show: true,
+                position: 'top', // 或者 'inside'（内部）、'insideLeft'、'insideRight' 等其他位置
+                formatter: '{c}', // 使用变量 {c} 表示数值，也可以自定义格式化函数
+                textStyle: {
+                  fontSize: 12, // 字体大小
+                  color: '#333', // 字体颜色
+                },
+              },
             },
             {
+              barWidth: 20,
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
               itemStyle: { color: this.state.level2Color },
+              label: {
+                show: true,
+                position: 'top', // 或者 'inside'（内部）、'insideLeft'、'insideRight' 等其他位置
+                formatter: '{c}', // 使用变量 {c} 表示数值，也可以自定义格式化函数
+                textStyle: {
+                  fontSize: 12, // 字体大小
+                  color: '#333', // 字体颜色
+                },
+              },
             },
             {
+              barWidth: 20,
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
               itemStyle: { color: this.state.level3Color },
+              label: {
+                show: true,
+                position: 'top', // 或者 'inside'（内部）、'insideLeft'、'insideRight' 等其他位置
+                formatter: '{c}', // 使用变量 {c} 表示数值，也可以自定义格式化函数
+                textStyle: {
+                  fontSize: 12, // 字体大小
+                  color: '#333', // 字体颜色
+                },
+              },
             },
             {
+              barWidth: 20,
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
               itemStyle: { color: this.state.level4Color },
+              label: {
+                show: true,
+                position: 'top', // 或者 'inside'（内部）、'insideLeft'、'insideRight' 等其他位置
+                formatter: '{c}', // 使用变量 {c} 表示数值，也可以自定义格式化函数
+                textStyle: {
+                  fontSize: 12, // 字体大小
+                  color: '#333', // 字体颜色
+                },
+              },
             },
           ],
         },
@@ -969,6 +1010,7 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           series: [
             {
+              barWidth: 20,
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
@@ -986,6 +1028,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
@@ -1003,6 +1046,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
@@ -1020,6 +1064,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
@@ -1093,6 +1138,7 @@ class BI014RiskPerformanceModel extends React.Component {
           },
           series: [
             {
+              barWidth: 20,
               name: "一级",
               type: "bar",
               stack: "总量",
@@ -1102,9 +1148,9 @@ class BI014RiskPerformanceModel extends React.Component {
               },
               data: Data.LEVEL1,
               itemStyle: { color: this.state.level1Color },
-              barWidth: 30
             },
             {
+              barWidth: 20,
               name: "二级",
               type: "bar",
               stack: "总量",
@@ -1116,6 +1162,7 @@ class BI014RiskPerformanceModel extends React.Component {
               itemStyle: { color: this.state.level2Color },
             },
             {
+              barWidth: 20,
               name: "三级",
               type: "bar",
               stack: "总量",
@@ -1127,6 +1174,7 @@ class BI014RiskPerformanceModel extends React.Component {
               itemStyle: { color: this.state.level3Color },
             },
             {
+              barWidth: 20,
               name: "四级",
               type: "bar",
               stack: "总量",
@@ -1172,6 +1220,7 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           series: [
             {
+              barWidth: 20,
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
@@ -1179,17 +1228,14 @@ class BI014RiskPerformanceModel extends React.Component {
                 color: function (params) {
                   switch (params.dataIndex) {
                     case 0:
-                      return "#c02e30"; // 第一个柱子颜色
+                      return "#f7aa52"; // 第一个柱子颜色
                     case 1:
-                      return "#f7aa52"; // 第二个柱子颜色
+                      return "#fbe06a"; // 第二个柱子颜色
                     case 2:
-                      return "#fbe06a"; // 第三个柱子颜色
+                      return "#5185f3"; // 第三个柱子颜色
-                    case 3:
-                      return "#5185f3"; // 第四个柱子颜色
                   }
                 }
               },
-              barWidth: 30,
               label: {
                 normal: {
                   show: true,
@@ -1222,7 +1268,7 @@ class BI014RiskPerformanceModel extends React.Component {
           legend: {
             left: "0%",
             bottom: "10%",
-            data: ["一般任务", "关键任务", "许可作业"],
+            data: ["许可作业", "关键任务", "一般任务"],
           },
           series: [
             {
@@ -1234,13 +1280,11 @@ class BI014RiskPerformanceModel extends React.Component {
                 color: function (params) {
                   switch (params.dataIndex) {
                     case 0:
-                      return "#c02e30"; // 第一个柱子颜色
+                      return "#f7aa52"; // 第一个柱子颜色
                     case 1:
-                      return "#f7aa52"; // 第二个柱子颜色
+                      return "#fbe06a"; // 第二个柱子颜色
                     case 2:
-                      return "#fbe06a"; // 第三个柱子颜色
+                      return "#5185f3"; // 第三个柱子颜色
-                    case 3:
-                      return "#5185f3"; // 第四个柱子颜色
                   }
                 }
               },
@@ -1335,6 +1379,7 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           series: [
             {
+              barWidth: 20,
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
@@ -1351,9 +1396,9 @@ class BI014RiskPerformanceModel extends React.Component {
                   },
                 },
               },
-              barWidth: 30
             },
             {
+              barWidth: 20,
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
@@ -1372,6 +1417,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
@@ -1390,6 +1436,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
@@ -1468,6 +1515,7 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           series: [
             {
+              barWidth: 20,
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
@@ -1484,9 +1532,10 @@ class BI014RiskPerformanceModel extends React.Component {
                   },
                 },
               },
-              barWidth: 30
+
             },
             {
+              barWidth: 20,
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
@@ -1505,6 +1554,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
@@ -1523,6 +1573,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
@@ -1601,6 +1652,7 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           series: [
             {
+              barWidth: 20,
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
@@ -1617,9 +1669,10 @@ class BI014RiskPerformanceModel extends React.Component {
                   },
                 },
               },
-              barWidth: 30
+
             },
             {
+              barWidth: 20,
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
@@ -1638,6 +1691,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
@@ -1656,6 +1710,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
@@ -1734,6 +1789,7 @@ class BI014RiskPerformanceModel extends React.Component {
           ],
           series: [
             {
+              barWidth: 20,
               name: "一级",
               type: "bar",
               data: Data.LEVEL1,
@@ -1750,9 +1806,10 @@ class BI014RiskPerformanceModel extends React.Component {
                   },
                 },
               },
-              barWidth: 30
+
             },
             {
+              barWidth: 20,
               name: "二级",
               type: "bar",
               data: Data.LEVEL2,
@@ -1771,6 +1828,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "三级",
               type: "bar",
               data: Data.LEVEL3,
@@ -1789,6 +1847,7 @@ class BI014RiskPerformanceModel extends React.Component {
               },
             },
             {
+              barWidth: 20,
               name: "四级",
               type: "bar",
               data: Data.LEVEL4,
@@ -1872,7 +1931,7 @@ class BI014RiskPerformanceModel extends React.Component {
               data: Data.LEVEL1,
               itemStyle: { color: this.state.level1Color },
               stack: "总量",
-              barWidth: 30,
+              barWidth: 20,
               label: {
                 normal: {
                   show: true,
@@ -1891,7 +1950,7 @@ class BI014RiskPerformanceModel extends React.Component {
               data: Data.LEVEL2,
               itemStyle: { color: this.state.level2Color },
               stack: "总量",
-              barWidth: 30,
+              barWidth: 20,
               label: {
                 normal: {
                   show: true,
@@ -1910,7 +1969,7 @@ class BI014RiskPerformanceModel extends React.Component {
               data: Data.LEVEL3,
               itemStyle: { color: this.state.level3Color },
               stack: "总量",
-              barWidth: 30,
+              barWidth: 20,
               label: {
                 normal: {
                   show: true,
@@ -1929,7 +1988,7 @@ class BI014RiskPerformanceModel extends React.Component {
               data: Data.LEVEL4,
               itemStyle: { color: this.state.level4Color },
               stack: "总量",
-              barWidth: 30,
+              barWidth: 20,
               label: {
                 normal: {
                   show: true,

src/components/CustomPages/HM/HM042ShowPrint.js

@@ -83,12 +83,15 @@ class HM042ShowPrint extends React.Component {
         if (typeof this.props.data.onCancel != "undefined" && typeof this.props.data.onCancel == 'function')
             this.props.data.onCancel();
     }
+
     loadData = (dataId) => {
         let json = initFilter(this.props.login.OrgId);
         extendRule(json, 'ID', 1, dataId);
         extendInclude(json, 'Nav_InitiatingDepartment');
         extendInclude(json, 'Nav_ReleaseUser');
         extendInclude(json, 'Nav_Details.Nav_ChargeUser');
+        extendInclude(json, 'Nav_Details.Nav_Areas.Nav_Area');
+        extendInclude(json, 'Nav_Details.Nav_Identifyings.Nav_Identifying');
         extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
         extendInclude(json, 'Nav_GroupLeader.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
         extendInclude(json, 'Nav_DeputyGroupLeader.Nav_UserSignFiles.Nav_ImgFile.Nav_File');
@@ -159,6 +162,43 @@ class HM042ShowPrint extends React.Component {
             tmpData: newtmpData,
         });
     }
+    joinArea(data) {
+        let ret = [];
+        for (let it of data) {
+            if (it.Nav_Area && it.Nav_Area.NAME) {
+                ret.push(it.Nav_Area.NAME);
+            }
+        }
+        return ret.join('、');
+    }
+    joinIdentifying(data) {
+        let ret = [];
+        for (let it of data) {
+            if (it.Nav_Identifying && it.Nav_Identifying.NAME) {
+                ret.push(it.Nav_Identifying.NAME);
+            }
+        }
+        return ret.join('、');
+    }
+    renderLevel(level) {
+        let str = '';
+        if (level == undefined) {
+            return str;
+        }
+        if (level.indexOf('0') >= 0) {
+            str += '部门 ';
+        }
+        if (level.indexOf('1') >= 0) {
+            str += '车间 ';
+        }
+        if (level.indexOf('2') >= 0) {
+            str += '班组 ';
+        }
+        if (level.indexOf('3') >= 0) {
+            str += '公司 ';
+        }
+        return str;
+    }
     render() {
         const { data } = this.state;
         return <div>
@@ -217,6 +257,32 @@ class HM042ShowPrint extends React.Component {
                                     {data.GROUP_LEADER_OPINION == 1 ? <img width={'200px'} alt={data.Nav_GroupLeader.NAME} src={data.Nav_GroupLeader.Nav_UserSignFiles.length > 0 ? config.picServerHost + data.Nav_GroupLeader.Nav_UserSignFiles[0].Nav_ImgFile?.Nav_File.FILE_PATH : ''} /> : ""}
                                 </Descriptions.Item>
                             </Descriptions>
+                            <table style={{ width: '100%', textAlign: 'center' }} className={styles.PrintForm1}>
+                                <tr>
+                                    <td className={styles.fontBold}>开始时间</td>
+                                    <td className={styles.fontBold}>结束时间</td>
+                                    <td className={styles.fontBold}>层级</td>
+                                    <td className={styles.fontBold}>辨识区域</td>
+                                    <td className={styles.fontBold}>类别</td>
+                                    <td className={styles.fontBold}>辨识对象</td>
+                                    <td className={styles.fontBold}>负责人</td>
+                                    <td className={styles.fontBold}>备注</td>
+                                </tr>
+                                {
+                                    data.Nav_Details && data.Nav_Details.map((item, i) => {
+                                        return <tr>
+                                            <td>{moment(item.START_TIME).format('YYYY-MM-DD')}</td>
+                                            <td>{moment(item.END_TIME).format('YYYY-MM-DD')}</td>
+                                            <td>{this.renderLevel(item.LEVEL)}</td>
+                                            <td>{this.joinArea(item.Nav_Areas)}</td>
+                                            <td>{this.joinIdentifying(item.Nav_Identifyings)}</td>
+                                            <td>{this.props.app.enums.HMRiskTypeEnmu.enums[item.RISK_TYPE]}</td>
+                                            <td>{item.Nav_ChargeUser?.NAME}</td>
+                                            <td>{item.REMARK}</td>
+                                        </tr>
+                                    })
+                                }
+                            </table>
                             <FormPage {...this.state.tmpData} />
                             <table style={{ width: '90%', lineHeight: '35px' }}>
                                 <tbody>