From 7cd623e8f803a81c78aa917d91a32a3794a8c6f5 Mon Sep 17 00:00:00 2001 From: cool <653314653@qq.com> Date: Wed, 3 Apr 2024 14:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B1=8F=E9=A6=96?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/web/css/main.css | 35 +++++++++++++++++++----- pages/web/css/table.css | 1 + pages/web/image/效率分析.png | Bin 0 -> 29463 bytes pages/web/js/main.js | 51 ++++++++++++++++++++++++++++++++--- pages/web/views/main.html | 10 +++---- 5 files changed, 81 insertions(+), 16 deletions(-) create mode 100644 pages/web/image/效率分析.png 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 0000000000000000000000000000000000000000..3e4a6e3cce6fee958a31c1ac34444baca0047d62 GIT binary patch literal 29463 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
AN$?8t73oXKs!d7K+wL+?lZ?Zyg* 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 RUoo^OE3Ndp;MKd2{{uH6$Swc? literal 0 HcmV?d00001 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 @@
    • -
      排名
      +
      排名
      工程名称
      班组名称
      班组长
      @@ -106,15 +106,15 @@

      - 总设备:999 + 总设备:0

      - 在线:999 + 在线:0

      - 不在线:999 + 不在线:0

      @@ -145,7 +145,7 @@
      -
      +