From 5410c040883a089e72e58a1b22a21f1f2d65747b Mon Sep 17 00:00:00 2001 From: junhong Date: Tue, 13 May 2025 09:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- folder-alias.json | 6 +++ src/assets/images/zw.png | Bin 0 -> 11633 bytes .../progress-monitoring/echartsOptions.js | 24 ++++++--- .../progress-monitoring/index.vue | 14 ++--- src/views/large-screen/index.vue | 51 +++++++++++++----- .../sitePersonnel/access-control/index.vue | 4 ++ .../sitePersonnel/work-attendance/index.vue | 3 ++ src/views/vehicleMachinery/map.vue | 15 +++--- 8 files changed, 83 insertions(+), 34 deletions(-) create mode 100644 src/assets/images/zw.png diff --git a/folder-alias.json b/folder-alias.json index 52f24f09..c126f439 100644 --- a/folder-alias.json +++ b/folder-alias.json @@ -28,5 +28,11 @@ }, "src/views/constructionScheduling/resource-management": { "description": "资源管理" + }, + "src/views/sitePersonnel/access-control": { + "description": "门禁" + }, + "src/views/sitePersonnel/work-attendance": { + "description": "考勤记录" } } \ No newline at end of file diff --git a/src/assets/images/zw.png b/src/assets/images/zw.png new file mode 100644 index 0000000000000000000000000000000000000000..df7a82c26b8daa54fd7482d395afabd23659149a GIT binary patch literal 11633 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

@ybep~Mj_ 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 Rk0A{vB`zmcEutUz{{YN7t!V%N literal 0 HcmV?d00001 diff --git a/src/views/constructionScheduling/progress-monitoring/echartsOptions.js b/src/views/constructionScheduling/progress-monitoring/echartsOptions.js index 96398040..0681b5e3 100644 --- a/src/views/constructionScheduling/progress-monitoring/echartsOptions.js +++ b/src/views/constructionScheduling/progress-monitoring/echartsOptions.js @@ -6,7 +6,9 @@ export function echartsZhe({ ydata2, ydata1, xdata }) { let server = [{ type: "line", name: "计划进度", - symbolSize: 1, + showAllSymbol: true, + symbol: "circle", + symbolSize: 8, animation: false, itemStyle: { normal: { @@ -18,17 +20,21 @@ export function echartsZhe({ ydata2, ydata1, xdata }) { }, position: "top", }, - color: color[0], + color: '#fff', + borderColor: color[0], + borderWidth: 2, lineStyle: { color: color[0], - width: 1, + width: 2, }, }, }, data: ydata1 ? ydata1 : [], }, { type: "line", - symbolSize: 1, + showAllSymbol: true, + symbol: "circle", + symbolSize: 8, name: "实际进度", animation: false, itemStyle: { @@ -41,10 +47,12 @@ export function echartsZhe({ ydata2, ydata1, xdata }) { }, position: "top", }, - color: color[1], + color: '#fff', + borderColor: color[1], + borderWidth: 2, lineStyle: { color: color[1], - width: 1, + width: 2, }, }, }, @@ -63,7 +71,7 @@ export function echartsZhe({ ydata2, ydata1, xdata }) { textStyle: { fontSize: 14, }, - data: xdata, + data: xdata ? xdata : [], }, tooltip: { trigger: "axis", @@ -88,7 +96,7 @@ export function echartsZhe({ ydata2, ydata1, xdata }) { axisTick: { show: true, }, - data: [1, 2, 3, 4], + data: xdata ? xdata : [], }, ], yAxis: [ diff --git a/src/views/constructionScheduling/progress-monitoring/index.vue b/src/views/constructionScheduling/progress-monitoring/index.vue index 163f9b97..4b3f377e 100644 --- a/src/views/constructionScheduling/progress-monitoring/index.vue +++ b/src/views/constructionScheduling/progress-monitoring/index.vue @@ -48,15 +48,14 @@ function getList(params) { let ydata1 = [] let ydata2 = [] nextTick(() => { + console.log(res.data.datelist); res.data.namelist.map((item, index) => { - ydata1.push(res.data.actuallist[index]) - ydata2.push(res.data.planlist[index]) state.echart({ id: 'staff' + index, grid: state.echartsZhe({ - ydata1: ydata1, - ydata2: ydata2, - xdata: res.data.namelist + ydata1: res.data.actuallist, + ydata2: res.data.planlist, + xdata: res.data.datelist }), }); }) @@ -126,5 +125,8 @@ function getList(params) { /* 子元素超出宽度时换行 */ } -.app-container {} +.app-container { + height: calc(100vh - 140px); + overflow: auto; +} diff --git a/src/views/large-screen/index.vue b/src/views/large-screen/index.vue index 23a71c43..690541f1 100644 --- a/src/views/large-screen/index.vue +++ b/src/views/large-screen/index.vue @@ -2,7 +2,7 @@

- 智慧工地数据大屏 + 智慧工地数据看板
@@ -33,7 +33,8 @@ 总工期
- {{ parseFloat(state.gk.gcjd).toFixed(0) }}% + {{ parseFloat(state.gk.gcjd).toFixed(0) + }}% 工程进度
@@ -57,8 +58,11 @@
智能资源调度
-
- +
+ +
+ 暂无资源调度 +
@@ -150,9 +154,13 @@
进度预警
-
- +
+
+ +
+ 暂无进度预警 +
+
@@ -166,7 +174,7 @@
-
预警信息：{{ item.warnInfo?item.warnInfo:'-' }}
+
预警信息：{{ item.warnInfo ? item.warnInfo : '-' }}
@@ -198,7 +206,10 @@
- 暂无数据 + +
+ 暂无进度监控 +
@@ -243,7 +254,10 @@
- 暂无数据 + +
+ 暂无门禁记录 +
@@ -302,9 +316,8 @@ onMounted(async () => { await engineeringLog() await getQuerywarn() await getStatistics() - // await getVehiclestat() - // await accessControl() - + await getVehiclestat() + await accessControl() state.loading = false }) function Jump() { @@ -454,6 +467,18 @@ function engineeringLog(params) { text-align: center; color: #fff; padding: .625rem; + display: flex; + flex-direction: column; + align-items: center; + position: relative; +} + +.zwtext { + position: absolute; + bottom: .9375rem; + width: 100%; + text-align: center; + color: #ccc; } .table-item>div { diff --git a/src/views/sitePersonnel/access-control/index.vue b/src/views/sitePersonnel/access-control/index.vue index dff6d45b..dac90701 100644 --- a/src/views/sitePersonnel/access-control/index.vue +++ b/src/views/sitePersonnel/access-control/index.vue @@ -35,6 +35,9 @@ const state = reactive({ delete: 'accessControl:page:list', detail: 'accessControl:page:list', }, + tableResult:{ + successCode:0 + }, pageInfo: { total: 0, base: { limit: 8, current: 1 } }, tableDataFormatter: function (params, res) { res.data.total = res.data.totalRows @@ -49,6 +52,7 @@ onMounted(() => {