diff --git a/pages/web/css/main.css b/pages/web/css/main.css
index 795e741..d360f95 100644
--- a/pages/web/css/main.css
+++ b/pages/web/css/main.css
@@ -8,6 +8,14 @@ body {
font-family: 'Alibaba PuHuiTi R';
}
+.text-left {
+ text-align: left;
+}
+
+.text-right {
+ text-align: right;
+}
+
#main-box {
width: 100%;
height: 100%;
@@ -84,6 +92,43 @@ body {
height: 100%;
background: url("../image/Group497.png") no-repeat 0 0 / 100% 100%;
background-position: center center !important;
+ display: flex;
+}
+
+.engineering-statistic-item {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 33.33%;
+ height: 100%;
+ flex-direction: column;
+}
+
+.engineering-statistic-item:first-of-type> div, .engineering-statistic-item:last-of-type> div {
+ display: flex;
+ height: 50%;
+ width: 100%;
+ align-items: center;
+}
+
+.engineering-statistic-item>div>div {
+ width: 100%;
+}
+
+.engineering-statistic-item__left > p:first-of-type, .engineering-statistic-item__right > p:first-of-type {
+ font-size: 14px;
+}
+
+.engineering-statistic-item__left > p:last-of-type, .engineering-statistic-item__right > p:last-of-type {
+ font-size: 20px;
+}
+
+.engineering-statistic-item__left {
+ padding-left: 15px;
+}
+
+.engineering-statistic-item__right {
+ padding-right: 15px;
}
#quality-ranking {
@@ -110,6 +155,30 @@ body {
.environment-analysis-item {
width: 33.33%;
height: 100%;
+ display: flex;
+}
+
+.environment-analysis-item > div:last-of-type {
+ width: 25px;
+ height: inherit;
+ writing-mode: vertical-rl;
+ text-orientation: mixed;
+ display: flex;
+ justify-content: center;
+}
+
+.environment-analysis-item > div:first-of-type {
+ flex: 1;
+ height: inherit;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ text-align: right;
+}
+
+.environment-analysis-item > div:first-of-type > p {
+ line-height: 25px;
+ font-size: 16px;
}
#environment-analysis-1 {
@@ -167,7 +236,8 @@ body {
.resource-rate-item {
width: 33.33%;
height: 100%;
- padding-top: 5%;
+ /*padding-top: 8%;*/
+ box-sizing: border-box;
}
#alarm-reminder {
diff --git a/pages/web/css/table.css b/pages/web/css/table.css
new file mode 100644
index 0000000..61a0d26
--- /dev/null
+++ b/pages/web/css/table.css
@@ -0,0 +1,60 @@
+.transparentDataTable .layui-table{
+ background-color: transparent !important;
+}
+.transparentDataTable .layui-table-view{
+ background-color: rgba(0, 0, 0, 0) !important;
+ border: none;
+}
+.transparentDataTable .layui-table-tool {
+ background-color: transparent !important;
+}
+
+.transparentDataTable .layui-table-tool .layui-icon {
+ color: white;
+}
+
+.transparentDataTable .layui-table-header, .transparentDataTable .layui-table-cell, .layui-table-header thead tr {
+ background-color: transparent !important;
+}
+
+.transparentDataTable .layui-table-header thead th, .transparentDataTable .layui-none {
+ /*border: 1px solid #FFFFFF;*/
+ color: white !important;
+}
+
+.transparentDataTable .layui-table tbody tr {
+ border: 1px solid #FFFFFF;
+ color: white;
+}
+
+.transparentDataTable .layui-table-init, .transparentDataTable .layui-laypage-limits select, .transparentDataTable .layui-laypage-btn, .transparentDataTable .layui-laypage-skip input {
+ background-color: transparent !important;
+ color: white;
+}
+
+.transparentDataTable .layui-table-page a, .transparentDataTable .layui-table-page span {
+ color: white !important;
+}
+
+
+.transparentDataTable .layui-laypage-limits select, .transparentDataTable .layui-laypage-limits option {
+ -webkit-appearance: none; /* google */
+ -moz-appearance: none; /* firefox */
+ appearance: none; /* IE */
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0); /* 点击去除高亮的颜色*/
+ background-color: rgba(0, 0, 0, 0.5) !important;
+ color: white;
+}
+
+.transparentDataTable .layui-table[lay-even] tr:nth-child(even){
+ background-color: rgba(180, 238, 180, 0.5) !important;
+}
+
+
+/*静态表格透明*/
+.transparentStaticTable .layui-table{
+ background-color: rgba(0, 0, 0, 0.5) !important;
+}
+.transparentStaticTable .layui-table tbody tr:hover, .statistics_branch_one .layui-table tbody tr:hover {
+ background-color: transparent !important;
+}
\ No newline at end of file
diff --git a/pages/web/js/main.js b/pages/web/js/main.js
index 50a16ba..4e29009 100644
--- a/pages/web/js/main.js
+++ b/pages/web/js/main.js
@@ -1,7 +1,36 @@
let element, layer;
-layui.use(['layer', 'element'], function () {
+layui.use(['layer', 'element', 'table'], function () {
element = layui.element;
layer = layui.layer;
+ var table = layui.table;
+ var data = [
+ {id: 1, proName: '张三', teamName: '666', teamLeader: '男', quality: 1, content: '芜湖'},
+ {id: 2, proName: '李四', teamName: '666', teamLeader: '女', quality: 1, content: '起飞'}
+ ];
+ table.render({
+ elem: '#demo',
+ data: data,
+ skin: 'line',
+ page: false,
+ cols: [[
+ {field: 'id', title: '排名'},
+ {field: 'proName', title: '工程名称'},
+ {field: 'teamName', title: '班组名称'},
+ {field: 'teamLeader', title: '班组长'},
+ {field: 'quality', title: '施工质量'},
+ ]]
+ })
+
+ table.render({
+ elem: '#demo2',
+ data: data,
+ skin: 'line',
+ page: false,
+ cols: [[
+ {field: 'proName', title: '工程名称'},
+ {field: 'content', title: '告警内容'},
+ ]]
+ })
initMainMap()
@@ -775,6 +804,8 @@ function initResourceRate() {
min: 0,
max: 100,
splitNumber: 10,
+ radius: '80%', // 仪表盘大小
+ center: ['50%', '75%'],
itemStyle: {
color: 'green',
shadowColor: 'rgba(0,138,255,0.45)',
@@ -805,7 +836,8 @@ function initResourceRate() {
show: false,
},
title: {
- show: false
+ show: true,
+ color: '#fff'
},
detail: {
borderColor: '#999',
@@ -826,14 +858,15 @@ function initResourceRate() {
color: '#fff'
},
unit: {
- fontSize: 20,
+ fontSize: 15,
color: '#fff',
}
}
},
data: [
{
- value: 50
+ value: 50,
+ name: '利用率'
}
]
}
diff --git a/pages/web/views/main.html b/pages/web/views/main.html
index 385e1d9..77e7dcb 100644
--- a/pages/web/views/main.html
+++ b/pages/web/views/main.html
@@ -7,6 +7,7 @@
+
@@ -15,6 +16,12 @@
首页
+
+
@@ -22,13 +29,63 @@
+
-
@@ -63,11 +120,13 @@
-
-
-
+
人员利用率
+
设备利用率
+
能源利用率
+
+
-