From 698d85f448fa9f819bf21388075b7a94d2600375 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 23 Jul 2025 15:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/dataAnalysis/commonStyle.css              |   1 +
 js/pages/newDataAnalysis/datas.js             | 166 ++++++++++++++++++
 .../workerEfficiencyAnalysis.js               | 162 ++---------------
 .../workerEfficiencyAnalysis.html             |   3 +-
 4 files changed, 186 insertions(+), 146 deletions(-)
 create mode 100644 js/pages/newDataAnalysis/datas.js

diff --git a/css/dataAnalysis/commonStyle.css b/css/dataAnalysis/commonStyle.css
index e48892b..0af73d5 100644
--- a/css/dataAnalysis/commonStyle.css
+++ b/css/dataAnalysis/commonStyle.css
@@ -30,6 +30,7 @@ body {
     height: 100%;
     padding: 2% 0;
     box-sizing: border-box;
+    flex-direction: column;
 }
 
 .basic-search-box{
diff --git a/js/pages/newDataAnalysis/datas.js b/js/pages/newDataAnalysis/datas.js
new file mode 100644
index 0000000..3b46cc2
--- /dev/null
+++ b/js/pages/newDataAnalysis/datas.js
@@ -0,0 +1,166 @@
+
+/** 工人效率分析数据*/
+// 1512P017007Y01-凌云变 1612P021000T01-红枫变
+let dataList = [{
+    bidCode: '1512P017007Y01',
+    list: [{
+        userName: '宋跃进',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '刘振',
+        teamName: '变电土建-朱润生3班',
+        postName: '导线压线工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '黄照飞',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '王玉华',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '黄丹',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '赵光伟',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '刘磊',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '化苏碧',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '曹先应',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '陆乃怀',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '袁加纯',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    },
+    {
+        userName: '张友顺',
+        teamName: '变电土建-朱润生3班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    }
+    ]
+},
+{
+    bidCode: '1612P021000T01',
+    list: [{
+        userName: '宋跃进',
+        teamName: '变电土建-宋鹏2班',
+        postName: '组塔工',
+        attDay: 22,
+        workTime: 176,
+        completeWorkload: 15,
+        completeWorkloadUnit:'座',
+        unitTimeOutput: 0.085,
+        unitTimeOutputUnit: '座/小时',
+        rateLevel: '高效',
+    }]
+}];
\ No newline at end of file
diff --git a/js/pages/newDataAnalysis/workerEfficiencyAnalysis.js b/js/pages/newDataAnalysis/workerEfficiencyAnalysis.js
index 3c6132f..29f758c 100644
--- a/js/pages/newDataAnalysis/workerEfficiencyAnalysis.js
+++ b/js/pages/newDataAnalysis/workerEfficiencyAnalysis.js
@@ -1,142 +1,3 @@
-// 1512P017007Y01-凌云变 1612P021000T01-红枫变
-let dataList = [{
-    bidCode: '1512P017007Y01',
-    list: [{
-        userName: '宋跃进',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '刘振',
-        teamName: '变电土建-朱润生3班',
-        postName: '导线压线工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '黄照飞',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '王玉华',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '黄丹',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '赵光伟',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '刘磊',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '化苏碧',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '曹先应',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '陆乃怀',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '袁加纯',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    },
-    {
-        userName: '张友顺',
-        teamName: '变电土建-朱润生3班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    }
-    ]
-},
-{
-    bidCode: '1612P021000T01',
-    list: [{
-        userName: '宋跃进',
-        teamName: '变电土建-宋鹏2班',
-        postName: '组塔工',
-        attDay: 22,
-        workTime: 176,
-        completeWorkload: '15座',
-        unitTimeOutput: '0.085座/小时',
-        rateLevel: '高效',
-    }]
-}];
-
 let table, layer, form;
 let myChart = null, myChart2 = null;
 layui.use(['layer', 'table', 'form'], function () {
@@ -170,8 +31,16 @@ function initTable(data) {
             { field: 'postName', title: '工种', align: 'center', width: '10%' },
             { field: 'attDay', title: '出勤天数', align: 'center', width: '10%' },
             { field: 'workTime', title: '工作时长', align: 'center', width: '10%' },
-            { field: 'completeWorkload', title: '完成工作量', align: 'center', width: '15%' },
-            { field: 'unitTimeOutput', title: '单位时间产量', align: 'center', width: '15%' },
+            { field: 'completeWorkload', title: '完成工作量', align: 'center', width: '15%',
+                templet: function (d) {
+                    return d.completeWorkload + d.completeWorkloadUnit;
+                }
+             },
+            { field: 'unitTimeOutput', title: '单位时间产量', align: 'center', width: '15%',
+                templet: function (d) {
+                    return d.unitTimeOutput + d.unitTimeOutputUnit;
+                }
+             },
             {
                 field: 'rateLevel', title: '效率评级', align: 'center', width: '10%',
                 templet: function (d) {
@@ -202,6 +71,7 @@ function initTable(data) {
     })
     table.on('rowDouble(demo2)', function (obj) {
         console.log(obj.data);
+        initEcharts(obj.data);
     });
 }
 
@@ -224,12 +94,14 @@ function query(type) {
 }
 
 // 初始化 echarts
-function initEcharts() {
-    myChart.dispose();
-    myChart2.dispose();
+function initEcharts(data) {
+    if(myChart && myChart2){
+        myChart.dispose();
+        myChart2.dispose();
+    }
     myChart = echarts.init(document.getElementById("oneEcharts"));
     myChart2 = echarts.init(document.getElementById("twoEcharts"));
-    initEchartsOne();
+    initEchartsOne(data);
 }
 
 function initEchartsOne() {
diff --git a/pages/newDataAnalysis/workerEfficiencyAnalysis.html b/pages/newDataAnalysis/workerEfficiencyAnalysis.html
index c1115d0..d7cc091 100644
--- a/pages/newDataAnalysis/workerEfficiencyAnalysis.html
+++ b/pages/newDataAnalysis/workerEfficiencyAnalysis.html
@@ -43,7 +43,7 @@
             </div>
             <table id="demo2" lay-filter="demo2"></table>
         </div>
-        <div id="right-box">
+        <div id="right-box" class="layout">
             <div id="oneEcharts">
 
             </div>
@@ -58,6 +58,7 @@
         background-color: transparent !important;
     }
 </style>
+<script src="../../js/pages/newDataAnalysis/datas.js" type="text/javascript"></script>
 <script src="../../js/pages/newDataAnalysis/workerEfficiencyAnalysis.js" type="text/javascript"></script>
 
 </html>