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 00000000..df7a82c2 Binary files /dev/null and b/src/assets/images/zw.png differ 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 @@