cwchen
/
ah_jjzhgd_webscreen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
jiang 2025-07-24 23:10:00 +08:00
parent 0097c0dc9f 732b6479e7
commit 87e2a38530
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/commonRequest.js
View File

@ -13,7 +13,7 @@ let aqEnnable = false; // 参数加密开关
const URL_IP = "http://127.0.0.1:13030/ah_jjzhgd_webscreen";
// const commonUrl = "http://192.168.0.38:13030/zhgd/";
const commonUrl = "http://192.168.2.72:13030/zhgd/";
const commonUrl = "http://127.0.0.1:13030/zhgd/";
// const commonUrl = "http://192.168.1.105:18080/zhgd/";
// const imgUrl = "http://192.168.0.38:13030/zhgd/file/files/";
const imgUrl = "http://sgwpdm.ah.sgcc.com.cn/zhgd/file/files/";

24
js/pages/newDataAnalysis/resourceApiService.js
View File

@ -70,8 +70,8 @@ class ResourceApiService {
// 如果没有传入日期，默认获取最近7天
if (!startDate || !endDate) {
// 使用数据库中更新后的日期范围
startDate = '2025-07-17';
endDate = '2025-07-23';
startDate = '2025-03-07';
endDate = '2025-03-14';
}
const url = `${this.baseUrl}/trends?projectId=${this.projectId}&startDate=${startDate}&endDate=${endDate}&granularity=${granularity}`;
@ -128,7 +128,7 @@ class ResourceApiService {
return {
overallStats: {
totalRate: 85.2,
personnelRate: 88.5,
personnelRate: 100.0,
equipmentRate: 82.3,
materialRate: 84.8
},
@ -145,13 +145,13 @@ class ResourceApiService {
return {
total: 15,
list: [
{ id: "001", type: "人员", name: "土建班组", status: "rest", rate: 92.5, assessment: "优秀", location: "1号楼3层" },
{ id: "002", type: "人员", name: "钢筋班组", status: "rest", rate: 88.2, assessment: "良好", location: "2号楼1层" },
{ id: "003", type: "人员", name: "混凝土班组", status: "rest", rate: 85.7, assessment: "良好", location: "休息区" },
{ id: "004", type: "设备", name: "塔吊001", status: "offline", rate: 89.3, assessment: "优秀", location: "施工区域A" },
{ id: "005", type: "设备", name: "挖掘机002", status: "offline", rate: 78.6, assessment: "一般", location: "施工区域B" },
{ id: "001", type: "人员", name: "土建班组", status: "rest", rate: 100.0, assessment: "良好", location: "1号楼3层" },
{ id: "002", type: "人员", name: "钢筋班组", status: "rest", rate: 100.0, assessment: "良好", location: "2号楼1层" },
{ id: "003", type: "人员", name: "混凝土班组", status: "rest", rate: 100.0, assessment: "良好", location: "休息区" },
{ id: "004", type: "设备", name: "塔吊-T1", status: "offline", rate: 89.3, assessment: "优秀", location: "施工区域A" },
{ id: "005", type: "设备", name: "挖掘机-H2", status: "offline", rate: 78.6, assessment: "一般", location: "施工区域B" },
{ id: "006", type: "设备", name: "混凝土泵车", status: "offline", rate: 76.4, assessment: "一般", location: "维护区" },
{ id: "007", type: "设备", name: "起重机003", status: "offline", rate: 0, assessment: "较差", location: "停车场" },
{ id: "007", type: "设备", name: "起重机-T1", status: "offline", rate: 0, assessment: "较差", location: "停车场" },
{ id: "008", type: "材料", name: "钢筋", status: "low_stock", rate: 91.2, assessment: "优秀", location: "材料仓库" },
{ id: "009", type: "材料", name: "混凝土", status: "low_stock", rate: 83.5, assessment: "良好", location: "材料仓库" },
{ id: "010", type: "材料", name: "砂石料", status: "low_stock", rate: 79.8, assessment: "一般", location: "材料仓库" },
@ -168,7 +168,7 @@ class ResourceApiService {
return {
dates: ['2025-03-07', '2025-03-08', '2025-03-09', '2025-03-10', '2025-03-11', '2025-03-12', '2025-03-13'],
trends: {
personnel: [85.2, 87.1, 88.5, 89.2, 88.8, 87.9, 88.5],
personnel: [100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0],
equipment: [78.9, 80.3, 82.1, 81.7, 82.3, 83.1, 82.3],
material: [82.1, 83.5, 84.2, 84.8, 85.1, 84.6, 84.8],
energy: [89.5, 90.2, 91.2, 90.8, 91.5, 91.0, 91.2]
@ -178,7 +178,7 @@ class ResourceApiService {
if (url.includes('/distribution')) {
return [
{ name: "人员", value: 88.5, color: "#16baaa" },
{ name: "人员", value: 100.0, color: "#16baaa" },
{ name: "设备", value: 82.3, color: "#20d3c2" },
{ name: "材料", value: 84.8, color: "#25e5d0" },
{ name: "能源", value: 91.2, color: "#2af0dd" }
@ -190,7 +190,7 @@ class ResourceApiService {
{
id: "001",
title: "设备调度优化",
description: "挖掘机002利用率偏低，建议调整作业计划，提高设备运转效率",
description: "挖掘机-H2利用率偏低，建议调整作业计划，提高设备运转效率",
priority: "高优先级",
category: "equipment"
},

6
pages/newDataAnalysis/engineeringSafetyAnalysis.html
View File

@ -32,11 +32,11 @@
<body>
<div style="height: 100%;width: 100%;">
<div style="height: 42%;width: 100%;display: flex;">
<div style="height: 90%;width: 48%;" class="bg-white">
<div style="height: 90%;width: 100%;" class="bg-white">
<div id="environmentChart" style="height: 100%;width: 100%;"></div>
</div>
<div style="height: 90%;width: 48%;" class="bg-white">
<div id="riskChart" style="height: 100%;width: 100%;"></div>
<div style="height: 0%;width: 0%;" class="bg-white">
<div id="riskChart" style="height: 0%;width: 0%;"></div>
</div>
</div>
<div style="height: 57%;width: 100%; margin-top: 1%">

14
pages/newDataAnalysis/proQualityAnalysis.html
View File

@ -31,16 +31,14 @@
<body>
<div id="proQuality">
<div class="leftBox">
<button class="layui-btn" id="uploadBtn">上传</button>
<table id="demo2" lay-filter="test"></table>
</div>
<div class="rightBox" id="rightLineBox">
</div>
<i class="layui-icon layui-icon-upload" id="uploadBtn"
style="font-size: 20px; cursor: pointer; color: #7aa2a7;"></i>
</div>
<!-- <div id="oneEcharts">
@ -71,11 +69,13 @@
width: 75%;
}
#uploadBtn{
margin-top: 40px;
#uploadBtn {
margin-top: 32px;
margin-bottom: -14px;
margin-left: 20px;
margin-right: 10px;
}
.rightBox {
width: 25%;
height: 500px;