Skip to content

E
ec-report-refactor
Commit 252e0a04 authored by Jenny's avatar Jenny
Browse files
Options

feat: canvas 画布坐标显示

parent 84475c0a
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 194 deletions
components/BarMixMap/BarMixMap.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="bar-mix-map"
ref="barMixMapCanvas"
canvas-id="bar-mix-map-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
<uni-ec-canvas
class="uni-ec-canvas"
id="bar-mix-map"
ref="barMixMapCanvas"
canvas-id="bar-mix-map-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
components/ChinaMap/ChinaMap.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="china-map"
ref="chinaMapCanvas"
canvas-id="china-map-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
<uni-ec-canvas
class="uni-ec-canvas"
id="china-map"
ref="chinaMapCanvas"
canvas-id="china-map-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
components/DashboardProgress/DashboardProgress.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="dashboard-progress"
<uni-ec-canvas
class="uni-ec-canvas"
id="dashboard-progress"
ref="dashboardProgressCanvas"
canvas-id="dashboard-progress-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
canvas-id="dashboard-progress-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
components/HorizontalBar/HorizontalBar.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="horizontal-bar"
ref="horizontalBarCanvas"
canvas-id="horizontal-bar-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
<uni-ec-canvas
class="uni-ec-canvas"
id="horizontal-bar"
ref="horizontalBarCanvas"
canvas-id="horizontal-bar-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
components/LineMixBar/LineMixBar.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="line-mix-bar"
ref="lineMixBarCanvas"
canvas-id="line-mix-bar-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
<uni-ec-canvas
class="uni-ec-canvas"
id="line-mix-bar"
ref="lineMixBarCanvas"
canvas-id="line-mix-bar-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
components/NormalBar/NormalBar.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normal-bar"
ref="normalbarCanvas"
canvas-id="normal-bar-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normal-bar"
ref="normalbarCanvas"
canvas-id="normal-bar-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
components/NormalGauge/NormalGauge.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normal-gauge"
ref="normalGaugeCanvas"
canvas-id="normal-gauge-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normal-gauge"
ref="normalGaugeCanvas"
canvas-id="normal-gauge-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
components/NormalLine/NormalLine.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normal-line"
ref="normalLineCanvas"
canvas-id="normal-line-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normal-line"
ref="normalLineCanvas"
canvas-id="normal-line-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
components/NormalPie/NormalPie.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normal-pie"
ref="normalPieCanvas"
canvas-id="normal-pie-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normal-pie"
ref="normalPieCanvas"
canvas-id="normal-pie-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
components/NormalProgress/NormalProgress.vue
View file @ 252e0a04
<template>
<view class="container">
<u-line-progress
class="u-line"
v-if="elementInfo.option.progress.type === 'line'"
:style="{'width': elementInfo.width + 'rpx'}"
:height="elementInfo.option.progress.height"
:active-color="elementInfo.option.progress.strokeColor"
:inactive-color="elementInfo.option.progress.trailColor"
:round="elementInfo.option.progress.strokeLinecap == 'round' ? true : false"
:percent="elementInfo.data.dataList.endVal"
:show-percent="elementInfo.option.progress.showInfo">
</u-line-progress>
<u-circle-progress
class="u-circle"
v-if="elementInfo.option.progress.type === 'circle'"
:width="elementInfo.option.progress.width"
:border-width="elementInfo.option.progress.strokeWidth"
:active-color="elementInfo.option.progress.strokeColor"
:inactive-color="elementInfo.option.progress.trailColor"
:percent="elementInfo.data.dataList.endVal"
:bg-color="00000000">
<view class="u-progress-text">{{elementInfo.data.dataList.endVal}}%</view>
</u-circle-progress>
<DashboardProgress v-if="elementInfo.option.progress.type === 'dashboard'" :elementInfo="elementInfo"></DashboardProgress>
<u-line-progress
class="u-line"
v-if="elementInfo.option.progress.type === 'line'"
:style="{'width': elementInfo.width + 'rpx'}"
:height="elementInfo.option.progress.height"
:active-color="elementInfo.option.progress.strokeColor"
:inactive-color="elementInfo.option.progress.trailColor"
:round="elementInfo.option.progress.strokeLinecap == 'round' ? true : false"
:percent="elementInfo.data.dataList.endVal"
:show-percent="elementInfo.option.progress.showInfo"
>
</u-line-progress>
<u-circle-progress
class="u-circle"
v-if="elementInfo.option.progress.type === 'circle'"
:width="elementInfo.option.progress.width"
:border-width="elementInfo.option.progress.strokeWidth"
:active-color="elementInfo.option.progress.strokeColor"
:inactive-color="elementInfo.option.progress.trailColor"
:percent="elementInfo.data.dataList.endVal"
:bg-color="00000000"
>
<view class="u-progress-text">{{elementInfo.data.dataList.endVal}}%</view>
</u-circle-progress>
<DashboardProgress style="height: 100%;" v-if="elementInfo.option.progress.type === 'dashboard'" :elementInfo="elementInfo"></DashboardProgress>
</view>
</template>
......@@ -43,21 +45,22 @@ export default {
</script>
<style>
.container {
width: 100%;
display: flex;
flex-direction: column;
justify-content: center;
}
.u-line {
align-self: center;
}
.u-circle {
align-self: center;
}
.u-progress-text {
font-size: 40rpx;
font-weight: bold;
color: white;
}
.container {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
}
.u-line {
align-self: center;
}
.u-circle {
align-self: center;
}
.u-progress-text {
font-size: 40rpx;
font-weight: bold;
color: white;
}
</style>
\ No newline at end of file
components/NormalRadar/NormalRadar.vue
View file @ 252e0a04
<template>
<view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normalra-dar"
ref="normalRadarCanvas"
canvas-id="normalra-dar-chart"
:ec="ec"
:style="[elStyleObject]"
></uni-ec-canvas>
</view>
<uni-ec-canvas
class="uni-ec-canvas"
id="normalra-dar"
ref="normalRadarCanvas"
canvas-id="normalra-dar-chart"
:ec="ec"
></uni-ec-canvas>
</template>
<script>
......
mixins/echartElementData.js
View file @ 252e0a04
......@@ -11,16 +11,6 @@ export default {
required: true
}
},
computed: {
elStyleObject() {
const { windowWidth } = uni.getSystemInfoSync()
const { width, height } = this.elementInfo
return {
'width': `${width > windowWidth ? '100%' : width + 'px'}`,
'height': `${width > windowWidth ? height / width * windowWidth : height}px`
}
}
},
methods: {
/**
* 静态数据
......
pages/index/index.vue
View file @ 252e0a04
......@@ -3,44 +3,59 @@
class="canvas"
:style="[styleObject]"
>
<view v-for="element in reportData" :key="item.id">
<template v-if="!element.hide">
<!-- 普通柱状图 -->
<NormalBar v-if="element.type == 'NormalBar'" :elementInfo="element"></NormalBar>
<!-- 普通折线图 -->
<NormalLine v-if="element.type == 'NormalLine'" :elementInfo="element"></NormalLine>
<!-- 横向柱状图 -->
<HorizontalBar v-if="element.type == 'HorizontalBar'" :elementInfo="element"></HorizontalBar>
<!-- 折柱图 -->
<LineMixBar v-if="element.type == 'LineMixBar'" :elementInfo="element"></LineMixBar>
<!-- 仪表盘 -->
<NormalGauge v-if="element.type == 'NormalGauge'" :elementInfo="element"></NormalGauge>
<!-- 饼图 -->
<NormalPie v-if="element.type == 'NormalPie'" :elementInfo="element"></NormalPie>
<!-- 中国地图 -->
<ChinaMap v-if="element.type == 'ChinaMap'" :elementInfo="element"></ChinaMap>
<!-- 柱状图混合地图 -->
<BarMixMap v-if="element.type == 'BarMixMap'" :elementInfo="element"></BarMixMap>
<!-- 雷达图 -->
<NormalRadar v-if="element.type == 'NormalRadar'" :elementInfo="element"></NormalRadar>
<!-- 普通数字滚动 -->
<CountTo v-if="element.type == 'CountTo'" :elementInfo="element"></CountTo>
<!-- 数字滚动 -->
<NumberScroll v-if="element.type == 'NumberScroll'" :elementInfo="element"></NumberScroll>
<!-- 普通选项卡 -->
<NormalTabs v-if="element.type == 'NormalTabs'" :elementInfo="element"></NormalTabs>
<!-- 文本框 -->
<BasicText v-if="element.type == 'BasicText'" :elementInfo="element"></BasicText>
<!-- 真实时间 -->
<RealTime v-if="element.type == 'RealTime'" :elementInfo="element"></RealTime>
<!-- 普通进度条 -->
<NormalProgress v-if="element.type == 'NormalProgress'" :elementInfo="element"></NormalProgress>
<!-- 普通图片 -->
<NormalImage v-if="element.type == 'NormalImage'" :elementInfo="element"></NormalImage>
<!-- 远程图片 -->
<RemoteImage v-if="element.type == 'RemoteImage'" :elementInfo="element"></RemoteImage>
<!-- 普通表格 -->
<NormalTable v-if="element.type == 'NormalTable'" :elementInfo="element"></NormalTable>
<view class="viewport-wrapper" :style="{
width: `${reportInfo.width * scale}px`,
height: `${reportInfo.height * scale}px`
}">
<template v-for="(element, index) in reportData">
<view
class="view-element"
v-if="!element.hide"
:key="element.id"
:style="{
width: `${element.width * scale}px`,
height: `${element.height * scale}px`,
transform: `translate(${element.left * scale}px, ${element.top * scale}px)`,
zIndex: index + 1
}"
>
<!-- 普通柱状图 -->
<NormalBar v-if="element.type == 'NormalBar'" :elementInfo="element"></NormalBar>
<!-- 普通折线图 -->
<NormalLine v-if="element.type == 'NormalLine'" :elementInfo="element"></NormalLine>
<!-- 横向柱状图 -->
<HorizontalBar v-if="element.type == 'HorizontalBar'" :elementInfo="element"></HorizontalBar>
<!-- 折柱图 -->
<LineMixBar v-if="element.type == 'LineMixBar'" :elementInfo="element"></LineMixBar>
<!-- 仪表盘 -->
<NormalGauge v-if="element.type == 'NormalGauge'" :elementInfo="element"></NormalGauge>
<!-- 饼图 -->
<NormalPie v-if="element.type == 'NormalPie'" :elementInfo="element"></NormalPie>
<!-- 中国地图 -->
<ChinaMap v-if="element.type == 'ChinaMap'" :elementInfo="element"></ChinaMap>
<!-- 柱状图混合地图 -->
<BarMixMap v-if="element.type == 'BarMixMap'" :elementInfo="element"></BarMixMap>
<!-- 雷达图 -->
<NormalRadar v-if="element.type == 'NormalRadar'" :elementInfo="element"></NormalRadar>
<!-- 普通数字滚动 -->
<CountTo v-if="element.type == 'CountTo'" :elementInfo="element"></CountTo>
<!-- 数字滚动 -->
<NumberScroll v-if="element.type == 'NumberScroll'" :elementInfo="element"></NumberScroll>
<!-- 普通选项卡 -->
<NormalTabs v-if="element.type == 'NormalTabs'" :elementInfo="element"></NormalTabs>
<!-- 文本框 -->
<BasicText v-if="element.type == 'BasicText'" :elementInfo="element"></BasicText>
<!-- 真实时间 -->
<RealTime v-if="element.type == 'RealTime'" :elementInfo="element"></RealTime>
<!-- 普通进度条 -->
<NormalProgress v-if="element.type == 'NormalProgress'" :elementInfo="element"></NormalProgress>
<!-- 普通图片 -->
<NormalImage v-if="element.type == 'NormalImage'" :elementInfo="element"></NormalImage>
<!-- 远程图片 -->
<RemoteImage v-if="element.type == 'RemoteImage'" :elementInfo="element"></RemoteImage>
<!-- 普通表格 -->
<NormalTable v-if="element.type == 'NormalTable'" :elementInfo="element"></NormalTable>
</view>
</template>
</view>
</view>
......@@ -52,7 +67,7 @@
return {
reportInfo: {},
reportData: [],
timer: null
timename: null
}
},
computed: {
......@@ -64,6 +79,11 @@
'background-color': backgroundColor,
...params
}
},
scale() {
const { windowWidth } = uni.getSystemInfoSync()
const { width, height } = this.reportInfo
return windowWidth / width
}
},
onLoad() {
......@@ -89,7 +109,7 @@
onUnload() {
// 移除监听事件
uni.$off('handleLinkParams')
clearInterval(this.timer)
clearInterval(this.timename)
},
methods: {
//检查是否登录
......@@ -127,14 +147,14 @@
* 获取页面报表配置
*/
async getReportList() {
clearInterval(this.timer)
clearInterval(this.timename)
let res = await this.$u.api.getReportList({id: '61cd2ba1c06bffbdae442c4f'})
const { Status, Result: { info, list } } = res.data
if (Status === 'true') {
if(info.dataUrl) {
this.getGlobalData(info)
if(info.dataPollingInterval) {
this.timer = setInterval(() => {
this.timename = setInterval(() => {
this.getGlobalData(info)
}, parseInt(info.dataPollingInterval) * 1000)
}
......@@ -186,11 +206,23 @@
.canvas {
position: relative;
height: 100%;
padding: 20rpx;
user-select: none;
overflow: auto;
background-repeat: no-repeat;
background-size: cover;
background-position: center;
}
.viewport-wrapper {
position: relative;
}
.view-element {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
will-change: transform;
user-select: none;
cursor: move;
}
</style>
static/style/common.scss
View file @ 252e0a04
......@@ -24,7 +24,6 @@
.uni-ec-canvas{
width: 100%;
height: 750rpx;
height: 100%;
display:block;
margin: 20rpx auto;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment