From 98eeae12e48f85a4144c22742c0ff3e45f6c4c8f Mon Sep 17 00:00:00 2001 From: Jack <1638169491@qq.com> Date: Mon, 22 Aug 2022 15:49:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(BIM?= =?UTF-8?q?=E4=B8=AD=E5=BF=83)=EF=BC=9A=E5=AE=8C=E6=88=90BIM=E5=8D=8F?= =?UTF-8?q?=E5=90=8C=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectAdmin/jlw/CIM/BimCoordination.vue | 56 +++++++ src/views/projectAdmin/jlw/CIM/index.vue | 138 ++++++++++-------- 2 files changed, 135 insertions(+), 59 deletions(-) create mode 100644 src/views/projectAdmin/jlw/CIM/BimCoordination.vue diff --git a/src/views/projectAdmin/jlw/CIM/BimCoordination.vue b/src/views/projectAdmin/jlw/CIM/BimCoordination.vue new file mode 100644 index 00000000..c0354292 --- /dev/null +++ b/src/views/projectAdmin/jlw/CIM/BimCoordination.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/views/projectAdmin/jlw/CIM/index.vue b/src/views/projectAdmin/jlw/CIM/index.vue index ff5fda6d..88d7aafe 100644 --- a/src/views/projectAdmin/jlw/CIM/index.vue +++ b/src/views/projectAdmin/jlw/CIM/index.vue @@ -1,7 +1,13 @@ + + diff --git a/src/views/projectAdmin/jlw/CIM/index.vue b/src/views/projectAdmin/jlw/CIM/index.vue index 88d7aafe..5810077a 100644 --- a/src/views/projectAdmin/jlw/CIM/index.vue +++ b/src/views/projectAdmin/jlw/CIM/index.vue @@ -2,7 +2,15 @@
- +
+ +
+
+ +
+
+ +
@@ -35,6 +43,7 @@ // import rightTop from './rightTop' // import rightCenter from './rightCenter' import BimCoordination from './BimCoordination' +import Model from './Model' import { projectJlwBimListApi, getJlwTokenApi } from '@/assets/js/api/project' export default { @@ -43,7 +52,8 @@ export default { // leftCenter, // rightTop, // rightCenter - BimCoordination + BimCoordination, + Model }, mounted() { this.iframe = document.getElementById('iframe') @@ -87,7 +97,14 @@ export default { width: 100%; height: 100%; .charts { - width: 420px; + width: 23%; + height: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + .chart { + height: 32%; + } } .bim { padding: 8px; From 7afe58f0c5c2b19d6bf72d8d6a893fe349bf471c Mon Sep 17 00:00:00 2001 From: Jack <1638169491@qq.com> Date: Mon, 22 Aug 2022 17:53:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(BIM?= =?UTF-8?q?=E4=B8=AD=E5=BF=83)=EF=BC=9A=E6=9B=B4=E6=94=B9BIM=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectAdmin/jlw/CIM/index.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/projectAdmin/jlw/CIM/index.vue b/src/views/projectAdmin/jlw/CIM/index.vue index 5810077a..0d99eb6b 100644 --- a/src/views/projectAdmin/jlw/CIM/index.vue +++ b/src/views/projectAdmin/jlw/CIM/index.vue @@ -96,9 +96,11 @@ export default { .container { width: 100%; height: 100%; + display: flex; + justify-content: space-between; .charts { width: 23%; - height: 100%; + height: calc(100% - 8px); display: flex; flex-direction: column; justify-content: space-between; @@ -108,8 +110,9 @@ export default { } .bim { padding: 8px; - width: calc(100% - 440px); - height: 100%; + width: 75%; + height: 97%; + border: 1px solid #0081c3; } } // .container { From c77ab15260b8c0b1ec6beb93e124fa7695fb842e Mon Sep 17 00:00:00 2001 From: Jack <1638169491@qq.com> Date: Tue, 23 Aug 2022 10:43:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86)=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/jChart/line/JLineChart.vue | 41 +++++++++++-------- .../projectAdmin/jlw/safeManage/index.vue | 4 +- .../jlw/safeManage/leftBottom.vue | 2 +- .../jlw/safeManage/leftCenter.vue | 30 ++++++++------ .../projectAdmin/jlw/safeManage/leftTop.vue | 1 - .../jlw/safeManage/rightBottom.vue | 5 ++- 6 files changed, 49 insertions(+), 34 deletions(-) diff --git a/src/views/projectAdmin/jlw/jChart/line/JLineChart.vue b/src/views/projectAdmin/jlw/jChart/line/JLineChart.vue index 1b4935a5..4762da1d 100644 --- a/src/views/projectAdmin/jlw/jChart/line/JLineChart.vue +++ b/src/views/projectAdmin/jlw/jChart/line/JLineChart.vue @@ -36,24 +36,24 @@ export default { data() { return { JLineChart: null } }, - watch:{ - xData:{ - handler(newVal,oldVal){ - if(newVal != oldVal){ - this.createChart(); - } - }, - deep:true, - immediate:true, + watch: { + xData: { + handler(newVal, oldVal) { + if (newVal != oldVal) { + this.createChart() + } + }, + deep: true, + immediate: true }, - series:{ - handler(newVal,oldVal){ - if(newVal != oldVal){ - this.createChart(); - } - }, - deep:true, - immediate:true, + series: { + handler(newVal, oldVal) { + if (newVal != oldVal) { + this.createChart() + } + }, + deep: true, + immediate: true } }, methods: { @@ -62,6 +62,7 @@ export default { const fmtSeries = (series => { return series.map(item => ({ + name: item.name, type: 'line', smooth: true, data: item.data, @@ -88,6 +89,12 @@ export default { fontWeight: 'normal' } }, + legend: { + left: 20, + textStyle: { + color: '#fff' + } + }, grid: { top: grid[0], right: grid[1], diff --git a/src/views/projectAdmin/jlw/safeManage/index.vue b/src/views/projectAdmin/jlw/safeManage/index.vue index b5e75b9f..5878fa72 100644 --- a/src/views/projectAdmin/jlw/safeManage/index.vue +++ b/src/views/projectAdmin/jlw/safeManage/index.vue @@ -14,10 +14,10 @@
- +
- +
diff --git a/src/views/projectAdmin/jlw/safeManage/leftBottom.vue b/src/views/projectAdmin/jlw/safeManage/leftBottom.vue index 58fb65c2..857277cc 100644 --- a/src/views/projectAdmin/jlw/safeManage/leftBottom.vue +++ b/src/views/projectAdmin/jlw/safeManage/leftBottom.vue @@ -23,7 +23,7 @@
- {{ `${item.rectifyPeopleAme} 有一条 ${status[item.state]} 的问题` }} + {{ `${item.rectifyPeopleAme}有一条${status[item.state]}的问题` }}
无数据
diff --git a/src/views/projectAdmin/jlw/safeManage/leftCenter.vue b/src/views/projectAdmin/jlw/safeManage/leftCenter.vue index 9694a3c5..c90a4dac 100644 --- a/src/views/projectAdmin/jlw/safeManage/leftCenter.vue +++ b/src/views/projectAdmin/jlw/safeManage/leftCenter.vue @@ -17,7 +17,7 @@
--> - + @@ -38,12 +38,18 @@ export default { const totals = res.result.total this.series = [ { - color: ['#FE6C7F', '#786FF0', '#5CE2F6'], + color: ['#3DACFE', '#6DE4F0', '#FE6C7F'], data: [ { value: totals.weekInspectNum, name: '周检' }, { value: totals.monthInspectNum, name: '月检' }, { value: totals.otherInspectNum, name: '其他' } ] + }, + { + roseType: 'area', + radius: ['58%', '54%'], + color: ['#0B1B35', '#244D8F'], + data: [30, 40, 30, 40] } ] this.totalNum = totals.totalNum @@ -57,16 +63,16 @@ export default { } }, computed: { - legend() { - const data = (this.series[0] || []).data || [] - const formatter = name => { - const value = ((data.filter(item => item.name === name) || [])[0] || {}).value - return `${name} ${value}` - } - return { - formatter - } - } + // legend() { + // const data = (this.series[0] || []).data || [] + // const formatter = name => { + // const value = ((data.filter(item => item.name === name) || [])[0] || {}).value + // return `${name} ${value}` + // } + // return { + // formatter + // } + // } } } diff --git a/src/views/projectAdmin/jlw/safeManage/leftTop.vue b/src/views/projectAdmin/jlw/safeManage/leftTop.vue index 58ce901b..bb7b9a4e 100644 --- a/src/views/projectAdmin/jlw/safeManage/leftTop.vue +++ b/src/views/projectAdmin/jlw/safeManage/leftTop.vue @@ -76,7 +76,6 @@ export default { margin-bottom: 5px; padding-bottom: 5px; color: #6ee4f0; - border-bottom: 1px solid #fff; } &.tbody { height: calc(100% - 42px); diff --git a/src/views/projectAdmin/jlw/safeManage/rightBottom.vue b/src/views/projectAdmin/jlw/safeManage/rightBottom.vue index c86cc76b..460f3b55 100644 --- a/src/views/projectAdmin/jlw/safeManage/rightBottom.vue +++ b/src/views/projectAdmin/jlw/safeManage/rightBottom.vue @@ -17,9 +17,10 @@ export default { }, data() { return { - xData: ['地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师', '地理老师'], + xData: new Array(10).fill('12-24'), series: [ { + name: '新增隐患', data: [100, 235, 232, 532, 112, 532, 449, 269, 998, 33], areaColor: ['rgba(250, 201, 21, .3)', 'rgba(250, 201, 21, .1)'], emphasis: { @@ -29,6 +30,7 @@ export default { } }, { + name: '消除隐患', data: [22, 432, 44, 55, 123, 433, 369, 269, 436, 203], areaColor: ['rgba(255, 108, 127, .3)', 'rgba(255, 108, 127, .1)'], emphasis: { @@ -38,6 +40,7 @@ export default { } }, { + name: '未消除隐患', data: [655, 111, 224, 152, 65, 541, 334, 556, 326, 203], areaColor: ['rgba(102, 212, 224, .3)', 'rgba(102, 212, 224, .1)'], emphasis: {