diff --git a/yanzhu-bigscreen/public/faviconnew.ico b/yanzhu-bigscreen/public/faviconnew.ico
new file mode 100755
index 00000000..e1ab4e37
Binary files /dev/null and b/yanzhu-bigscreen/public/faviconnew.ico differ
diff --git a/yanzhu-bigscreen/public/index.html b/yanzhu-bigscreen/public/index.html
index 28759ff2..58ed880d 100644
--- a/yanzhu-bigscreen/public/index.html
+++ b/yanzhu-bigscreen/public/index.html
@@ -1,86 +1,114 @@
-
-
-
-
+
+
+
+
数字建安施工-大屏
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
+
diff --git a/yanzhu-bigscreen/src/views/projectLabor.vue b/yanzhu-bigscreen/src/views/projectLabor.vue
index d3ebab36..76181cbf 100644
--- a/yanzhu-bigscreen/src/views/projectLabor.vue
+++ b/yanzhu-bigscreen/src/views/projectLabor.vue
@@ -1,7 +1,7 @@
-
+
-
-
+
+
-
+
@@ -59,7 +59,7 @@
-
+
{
return {
name: it.dt.substring(5).replace('-', '.'),
- value: it.cnt,
- //value: it.cnt + parseInt(Math.random() * 100),
+ //value: it.cnt,
+ value: it.cnt + parseInt(Math.random() * 100),
}
})
+ this.chartKey++
})
},
getGroupByWorker() {
@@ -270,6 +273,8 @@ export default {
})
},
renderChart2(opt) {
+ let is1K = this.$dpi() == '1K'
+ let is2K = this.$dpi() == '2K'
const areaOption = {
grid: {
left: '5%',
@@ -284,6 +289,9 @@ export default {
type: 'shadow',
label: {
backgroundColor: '#6a7985',
+ textStyle: {
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
+ },
},
},
},
@@ -293,6 +301,7 @@ export default {
axisLabel: {
textStyle: {
color: '#0df2c8',
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
},
},
},
@@ -302,6 +311,7 @@ export default {
axisLabel: {
textStyle: {
color: '#0df2c8',
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
},
},
},
@@ -317,6 +327,7 @@ export default {
position: 'top', // 值标签显示在折线点上方
textStyle: {
color: '#0df2c8', // 设置标签文字颜色为红色
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
},
},
data: this.weekData.map((item) => item.value),
@@ -326,10 +337,15 @@ export default {
return areaOption
},
renderChart3(opt) {
+ let is1K = this.$dpi() == '1K'
+ let is2K = this.$dpi() == '2K'
let pieOption = {
tooltip: {
trigger: 'item',
formatter: '{b} 岁
{c} 人 ({d}%)',
+ textStyle: {
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
+ },
},
legend: {
orient: 'vertical',
@@ -338,6 +354,7 @@ export default {
data: this.ageList.map((it) => it.name),
textStyle: {
color: '#19c0e6',
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
},
},
series: [
@@ -351,12 +368,14 @@ export default {
formatter: '{b}\n{c}',
textStyle: {
color: '#0df2c8',
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
},
},
emphasis: {
formatter: '{b}\n{c}',
textStyle: {
color: '#0df2c8',
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
},
},
},
@@ -372,10 +391,15 @@ export default {
return pieOption
},
renderChart5(opt) {
+ let is1K = this.$dpi() == '1K'
+ let is2K = this.$dpi() == '2K'
const pieOption = {
tooltip: {
trigger: 'item',
formatter: '{b}: {c} ({d}%)',
+ textStyle: {
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
+ },
},
series: [
{
@@ -387,19 +411,21 @@ export default {
formatter: '{b}\n{c}',
textStyle: {
color: '#0df2c8',
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
},
},
emphasis: {
formatter: '{b}\n{c}',
textStyle: {
color: '#0df2c8',
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
},
},
},
emphasis: {
label: {
show: true,
- fontSize: '30',
+ fontSize: is1K ? 12 : is2K ? 16 : 20,
fontWeight: 'bold',
},
},
@@ -666,6 +692,7 @@ export default {
}
})
this.setOpts()
+ this.resize()
},
}
@@ -750,5 +777,191 @@ export default {
}
}
}
+ // 添加媒体查询支持 1920 - 2560 分辨率
+ @media (min-width: 1921px) and (max-width: 2560px) {
+ .labor-base {
+ .attendance-info-title {
+ font-size: 24px; // 增大字体;
+ }
+ .attendance-tag {
+ .survey_content {
+ margin-top: 40px;
+ .survey_content_img {
+ width: 120px;
+ height: 120px;
+ line-height: 120px;
+ background-size: 150px 100px;
+ img {
+ width: 50px;
+ height: 50px;
+ }
+ }
+ }
+ .labour-survey_content_number {
+ font-size: 20px;
+ .survey_content_value {
+ span {
+ font-size: 24px;
+ }
+ }
+ }
+ }
+ }
+ .chart-module4 {
+ .chart-gif {
+ left: 60px;
+ width: 170px;
+ height: 170px;
+ top: 96px !important;
+ }
+ .chart-text {
+ left: 60px;
+ width: 170px;
+ height: 170px;
+ top: 96px !important;
+ .chart-text-title {
+ font-size: 28px;
+ }
+ .chart-text-sub-title {
+ font-size: 18px;
+ }
+ }
+ }
+ .prj-labor-real {
+ .module-ctx {
+ font-size: 16px; // 增大字体
+
+ .real-item {
+ .real-item-type {
+ font-size: 28px; // 增大字体
+ }
+ .real-item-img {
+ padding: 0px 60px; // 调整内边距
+ }
+ .real-item-work-type {
+ line-height: 40px; // 调整行高
+ span {
+ padding: 0 15px; // 调整内边距
+ }
+ }
+ .real-item-time {
+ font-size: 14px; // 增大字体
+ }
+ }
+ }
+ }
+ .prj-labor-alert {
+ .module-ctx {
+ height: calc(100% - 60px);
+ line-height: 40px; // 调整行高
+
+ .alert-list {
+ th {
+ font-size: 20px; // 增大字体;
+ }
+ td {
+ font-size: 16px; // 增大字体
+ }
+ }
+ }
+ }
+ }
+ @media (min-width: 2561px) {
+ .labor-base {
+ .attendance-info-title {
+ font-size: 40px; // 增大字体;
+ }
+ .attendance-tag {
+ .survey_content {
+ margin-top: 80px;
+ .survey_content_img {
+ width: 200px;
+ height: 200px;
+ line-height: 200px;
+ background-size: 180px 120px;
+ img {
+ width: 80px;
+ height: 80px;
+ }
+ }
+ }
+ .labour-survey_content_number {
+ font-size: 32px;
+ .survey_content_value {
+ span {
+ font-size: 40px;
+ }
+ }
+ }
+ }
+ }
+ .labor-week-att {
+ .module-title {
+ span {
+ position: relative;
+ top: -8px;
+ }
+ }
+ }
+ .chart-module4 {
+ .chart-gif {
+ left: 82px;
+ width: 280px;
+ height: 280px;
+ top: 160px !important;
+ }
+ .chart-text {
+ left: 82px;
+ width: 280px;
+ height: 280px;
+ top: 160px !important;
+ .chart-text-title {
+ font-size: 40px;
+ }
+ .chart-text-sub-title {
+ font-size: 32px;
+ }
+ }
+ }
+ .prj-labor-real {
+ .module-ctx {
+ font-size: 24px; // 增大字体
+
+ .real-item {
+ .real-item-type {
+ font-size: 40px; // 增大字体
+ }
+ .real-item-img {
+ height: calc(100% - 140px);
+ padding: 0px 80px; // 调整内边距
+ }
+ .real-item-work-type {
+ line-height: 60px; // 调整行高
+ span {
+ padding: 0 20px; // 调整内边距
+ }
+ }
+ .real-item-time {
+ font-size: 20px; // 增大字体
+ }
+ }
+ }
+ }
+ .prj-labor-alert {
+ .module-ctx {
+ height: calc(100% - 60px);
+ line-height: 60px; // 调整行高
+
+ .alert-list {
+ th {
+ font-size: 28px; // 增大字体;
+ }
+ td {
+ font-size: 24px; // 增大字体
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/index.html b/yanzhu-ui-vue3/index.html
index 82e0e24f..4a7333f6 100644
--- a/yanzhu-ui-vue3/index.html
+++ b/yanzhu-ui-vue3/index.html
@@ -11,7 +11,7 @@
-
+
数字建安施工