From fc73551aae9ce41084811a27e835fc61b2bb1825 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Wed, 29 Oct 2025 16:27:03 +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

---
 .../resourceRateAnalysis.js                   | 158 +++++++++++++++---
 1 file changed, 138 insertions(+), 20 deletions(-)

diff --git a/js/pages/dataAnalysisOctober/resourceRateAnalysis.js b/js/pages/dataAnalysisOctober/resourceRateAnalysis.js
index 8baa02c..77bc696 100644
--- a/js/pages/dataAnalysisOctober/resourceRateAnalysis.js
+++ b/js/pages/dataAnalysisOctober/resourceRateAnalysis.js
@@ -6,13 +6,23 @@ layui.use(["layer", "table", "form"], function () {
     layer = layui.layer;
     table = layui.table;
     form = layui.form;
-    getDeviceEcharts();
+    // getDeviceEcharts();
+
+    //效率整体情况
+    getWorkztqk();
+    //效率分析top5
+    getWorkfx();
+    //一周到岗人数趋势
+    getWorkEcharts();
+    //资源应用利率控制层
+    getWorkZy()
+
 });
 
-function getDeviceEcharts(){
+function getWorkztqk(){
     const url =
         commonUrl +
-        "screen/resourceUtilization/selectDeviceEcharts"
+        "screen/resourceUtilization/selectDeviceWorkerEfficiency";
     ajaxRequestGet(
         url,
         "GET",
@@ -21,10 +31,9 @@ function getDeviceEcharts(){
         },
         function (result) {
             if (result.code === 200) {
-                setData(result.data);
+                setData(result);
             } else if (result.code === 500) {
-                console.error("实时监测" + result.msg);
-                setData(null);
+                setData(result);
             } else if (result.code === 401) {
                 loginout(1);
             }
@@ -36,24 +45,133 @@ function getDeviceEcharts(){
         aqEnnable
     );
 
-    /* 实时检测赋值 */
     function setData(data) {
-        if (data) {
-            console.log( data['deviceEcharts'])
-            let deviceEchartsList = data['deviceEcharts']; //设备情况的echarts
-            getDeviceEchartsList(deviceEchartsList)
-            let deviceUtilization = data.deviceUtilization; //设备利用率
+        if(data.code === 200){
+            let deviceUtilization = data.data.deviceUtilization; //设备利用率
             document.getElementById("deviceUtilization").innerHTML = deviceUtilization +'<span>%</span>';
-            let efficiency = data['efficiency']; // 效率分析
-            getEfficiencyTable(efficiency)
-            let todayDutyRate = data.todayDutyRate;  //今日到岗率
+
+            let todayDutyRate = data.data.todayDutyRate;  //今日到岗率
             document.getElementById("todayDutyRate").innerHTML = todayDutyRate +'<span>%</span>';
-            let workerEcharts = data['workerEcharts']; //一周到岗人数趋势
-            getTrend(workerEcharts)
-            let workerUtilization = data.workerUtilization; //人员利用率
+
+            let workerUtilization = data.data.workerUtilization; //人员利用率
             document.getElementById("workerUtilization").innerHTML = workerUtilization +'<span>%</span>';
-            let yesterdayDutyRate = data.yesterdayDutyRate; //昨日到岗率
+            let yesterdayDutyRate = data.data.yesterdayDutyRate; //昨日到岗率
             document.getElementById("yesterdayDutyRate").innerHTML = yesterdayDutyRate +'<span>%</span>';
+
+        }else{
+            layer.msg(data.msg || "暂无数据");
+
+        }
+    }
+}
+
+function getWorkfx(){
+    const url =
+        commonUrl +
+        "screen/resourceUtilization/selectTeamEfficiencyEcharts";
+    ajaxRequestGet(
+        url,
+        "GET",
+        true,
+        function () {
+        },
+        function (result) {
+            if (result.code === 200) {
+                setData(result);
+            } else if (result.code === 500) {
+                setData(result);
+            } else if (result.code === 401) {
+                loginout(1);
+            }
+        },
+        function (xhr, status, error) {
+            errorFn(xhr, status, error);
+            setData(null);
+        },
+        aqEnnable
+    );
+
+    function setData(data) {
+        if(data.code === 200){
+            let efficiency = data.data; // 效率分析
+            getEfficiencyTable(efficiency)
+        }else{
+            layer.msg(data.msg || "暂无数据");
+
+        }
+    }
+}
+
+function getWorkEcharts(){
+    const url =
+        commonUrl +
+        "screen/resourceUtilization/selectWeekOnDutyEcharts";
+    ajaxRequestGet(
+        url,
+        "GET",
+        true,
+        function () {
+        },
+        function (result) {
+            if (result.code === 200) {
+                setData(result);
+            } else if (result.code === 500) {
+                setData(result);
+            } else if (result.code === 401) {
+                loginout(1);
+            }
+        },
+        function (xhr, status, error) {
+            errorFn(xhr, status, error);
+            setData(null);
+        },
+        aqEnnable
+    );
+
+    function setData(data) {
+        if(data.code === 200){
+            let workerEcharts = data.data; //一周到岗人数趋势
+            getTrend(workerEcharts)
+        }else{
+            layer.msg(data.msg || "暂无数据");
+
+        }
+    }
+}
+
+function getWorkZy(){
+    const url =
+        commonUrl +
+        "screen/resourceUtilization/selectDeviceEcharts";
+    ajaxRequestGet(
+        url,
+        "GET",
+        true,
+        function () {
+        },
+        function (result) {
+            if (result.code === 200) {
+                setData(result);
+            } else if (result.code === 500) {
+                setData(result);
+            } else if (result.code === 401) {
+                loginout(1);
+            }
+        },
+        function (xhr, status, error) {
+            errorFn(xhr, status, error);
+            setData(null);
+        },
+        aqEnnable
+    );
+
+    function setData(data) {
+        if(data.code === 200){
+            let deviceEchartsList = data.data; //设备情况的echarts
+            getDeviceEchartsList(deviceEchartsList)
+        }else{
+            layer.msg(data.msg || "暂无数据");
+
         }
     }
 }
@@ -69,7 +187,7 @@ function getTrend(workerEcharts) {
             shouldCount.push(workerEcharts[i].shouldCount)
         }
     }
-    initTrend(date,actualCount,actualCount)
+    initTrend(date, actualCount, shouldCount)
 }
 
 function initTrend(date,actualCount,shouldCount) {