diff --git a/pages/web/css/main.css b/pages/web/css/main.css index 24c91b4..b2f36c7 100644 --- a/pages/web/css/main.css +++ b/pages/web/css/main.css @@ -144,7 +144,7 @@ body { #environment-analysis { box-sizing: border-box; width: 100%; - height: 15%; + height: 16%; background: url("../image/环境监测分析.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; padding: 10% 3% 4% 3%; @@ -201,7 +201,7 @@ body { #device-status { box-sizing: border-box; width: 100%; - height: 32%; + height: 31%; background: url("../image/设备状态.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; justify-content: space-between; @@ -211,7 +211,7 @@ body { #safety-analysis { box-sizing: border-box; width: 100%; - height: 30%; + height: 31%; background: url("../image/工程安全隐患分析.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; justify-content: space-between; @@ -220,8 +220,8 @@ body { #efficiency-analysis { box-sizing: border-box; width: 100%; - height: 30%; - background: url("../image/工人效率分析.png") no-repeat 0 0 / 100% 100%; + height: 31%; + background: url("../image/效率分析.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; justify-content: space-between; } @@ -229,7 +229,7 @@ body { #resource-rate { box-sizing: border-box; width: 100%; - height: 18%; + height: 17%; background: url("../image/资源利用及能源使用.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; display: flex; @@ -245,7 +245,7 @@ body { #alarm-reminder { box-sizing: border-box; width: 100%; - height: 22%; + height: 21%; background: url("../image/告警提醒.png") no-repeat 0 0 / 100% 100%; background-position: center center !important; justify-content: space-between; @@ -268,4 +268,25 @@ body { #device-status-chart { height: calc(100% - 20px); +} + +/*工程质量排名图标*/ +.quality-ranking { + padding-left: 30px !important; + background-repeat: no-repeat; + background-size: 24px 24px; /* 根据你的图标尺寸调整 */ + background-position: left center; + line-height: 1.5; /* 根据需要调整行高 */ +} + +.quality-ranking-1 { + background-image: url('../image/1.png'); /* 替换 'icon.png' 为你的图标文件路径 */ +} + +.quality-ranking-2 { + background-image: url('../image/2.png'); /* 替换 'icon.png' 为你的图标文件路径 */ +} + +.quality-ranking-3 { + background-image: url('../image/3.png'); /* 替换 'icon.png' 为你的图标文件路径 */ } \ No newline at end of file diff --git a/pages/web/css/table.css b/pages/web/css/table.css index 077517b..c167d71 100644 --- a/pages/web/css/table.css +++ b/pages/web/css/table.css @@ -1,6 +1,7 @@ .custom-table { width: 100%; box-sizing: border-box; + overflow-y: auto; } .custom-table> li { diff --git a/pages/web/image/效率分析.png b/pages/web/image/效率分析.png new file mode 100644 index 0000000..3e4a6e3 Binary files /dev/null and b/pages/web/image/效率分析.png differ diff --git a/pages/web/js/main.js b/pages/web/js/main.js index 6ab60ab..9eee7c7 100644 --- a/pages/web/js/main.js +++ b/pages/web/js/main.js @@ -107,7 +107,7 @@ function initQualityRanking() { res.data.forEach((item, index) => { const {bidName, teamName, teamLeader, score} = item var newRow = `
  • -
    ${index + 1}
    +
    ${index + 1}
    ${bidName}
    ${teamName}
    ${teamLeader}
    @@ -226,6 +226,17 @@ function initDeviceStatus() { fontSize: fontSize, fontFamily: fontFamily }, + interval: 0, + formatter: function (params) { + var val = ""; + // 超过四个字隐藏 + if (params.length > 8) { + val = params.substr(0, 6) + '...'; + return val; + } else { + return params; + } + } }, splitLine: { show: false, @@ -393,8 +404,12 @@ function initMainMap(dataMap = []) { res.push({ proName: data[i].proName, riskLeve: data[i].riskLevel, + bidName: data[i].bidName, + bidCode: data[i].bidCode, + teamName: data[i].teamName, + workManager: data[i].workManager, + riskLevel: data[i].riskLevel, workContent: data[i].workContent, - workManage: data[i].workManage, value: geoCoord }); } @@ -429,7 +444,12 @@ function initMainMap(dataMap = []) { color: '#fff' }, formatter (res) { - const dom = '
    '+ `工作内容:${res.data.workContent}` + '
    ' + const dom = '
    '+ `标段工程名称:${res.data.bidName}` + '
    ' + + '
    '+ `标段编码:${res.data.bidCode}` + '
    ' + + '
    '+ `班组名称:${res.data.teamName}` + '
    ' + + '
    '+ `班组长:${res.data.workManager}` + '
    ' + + '
    '+ `风险等级:${res.data.riskLevel}` + '
    ' + + '
    '+ `工作内容:${res.data.workContent}` + '
    ' return dom }, extraCssText: "max-width:300px;height:auto;word-break:break-all;white-space:pre-wrap;", @@ -702,6 +722,17 @@ function initSafetyAnalysis() { fontSize: fontSize, fontFamily: fontFamily }, + interval: 0, + formatter: function (params) { + var val = ""; + // 超过四个字隐藏 + if (params.length > 8) { + val = params.substr(0, 6) + '...'; + return val; + } else { + return params; + } + } }, splitLine: { show: false, @@ -957,6 +988,17 @@ function initEfficiencyAnalysis() { fontSize: fontSize, fontFamily: fontFamily }, + interval: 0, + formatter: function (params) { + var val = ""; + // 超过四个字隐藏 + if (params.length > 8) { + val = params.substr(0, 6) + '...'; + return val; + } else { + return params; + } + } }, splitLine: { show: false, @@ -1137,7 +1179,8 @@ function getResourceChartOption(config) { offsetCenter: [0, '-25%'], valueAnimation: true, formatter: function (value) { - return '{value|' + value + '}{unit|%}'; + // return '{value|' + value + '}{unit|%}'; + return '{value|' + value + '}'; }, rich: { value: { diff --git a/pages/web/views/main.html b/pages/web/views/main.html index 40cb6ed..e9e3a13 100644 --- a/pages/web/views/main.html +++ b/pages/web/views/main.html @@ -71,7 +71,7 @@