Skip to content

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

Merge branch 'develop' of 106.15.103.105:lihuizhen/ec-report-refactor into develop 

# Conflicts:
#	components/RealTime/RealTime.vue
parents 324501af 2cd88caf
Hide whitespace changes
Inline Side-by-side
Showing with 288 additions and 331 deletions
components/DashboardProgress/DashboardProgress.vue
View file @ eb4ee270
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
export default { export default {
name: "DashboardProgress", name: "DashboardProgress",
mixins: [echartElementData], mixins: [echartElementData],
data() { data() {
return { return {
ec: { ec: {
...@@ -25,10 +24,6 @@ ...@@ -25,10 +24,6 @@
}; };
}, },
onReady() {
},
components: { components: {
uniEcCanvas uniEcCanvas
}, },
......
components/HorizontalBar/HorizontalBar.vue
View file @ eb4ee270
<template> <template>
<uni-ec-canvas <uni-ec-canvas class="uni-ec-canvas" id="horizontal-bar" ref="horizontalBarCanvas" canvas-id="horizontal-bar-chart"
class="uni-ec-canvas" :ec="ec"></uni-ec-canvas>
id="horizontal-bar" </template>
ref="horizontalBarCanvas"
canvas-id="horizontal-bar-chart" <script>
:ec="ec" import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
></uni-ec-canvas> import echartElementData from '@/mixins/echartElementData.js'
</template> let chart = null
<script> export default {
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' name: "HorizontalBar",
import echartElementData from '@/mixins/echartElementData.js' mixins: [echartElementData],
let chart = null data() {
return {
export default { ec: {
name:"HorizontalBar", lazyLoad: true
mixins: [echartElementData], }
data () { }
return { },
ec: { components: {
lazyLoad:true uniEcCanvas
} },
} methods: {
}, initChart() {
onReady () { this.$nextTick(() => {
this.$refs['horizontalBarCanvas'].init((canvas, width, height, canvasDpr) => {
}, chart = this.$echarts.init(canvas, null, {
components: { width: width,
uniEcCanvas height: height,
}, devicePixelRatio: canvasDpr
methods: { })
initChart() { canvas.setChart(chart)
this.$nextTick(() => { const {
this.$refs['horizontalBarCanvas'].init((canvas, width, height, canvasDpr) => { dataList: {
chart = this.$echarts.init(canvas, null, { categories,
width: width, series,
height: height, preview,
devicePixelRatio: canvasDpr images
}) }
canvas.setChart(chart) } = this.elementData
const { dataList: { categories, series, preview, images } } = this.elementData const options = {
const options = { ...this.elementInfo.option,
...this.elementInfo.option, tooltip: {},
tooltip: {}, yAxis: {
yAxis: { ...this.elementInfo.option.yAxis,
...this.elementInfo.option.yAxis, data: categories
data: categories },
}, series: this.dealSeriesData(series)
series: this.dealSeriesData(series) }
} chart.setOption(options)
chart.setOption(options) chart.on('click', event => {
chart.on('click', event => { // 特殊处理，如果preview为true，代表点击显示图片
// 特殊处理，如果preview为true，代表点击显示图片 if (preview) {
if(preview) { uni.previewImage({
uni.previewImage({ current: event.dataIndex,
current: event.dataIndex, urls: images,
urls:images, indicator: 'number',
indicator: 'number', loop: true
loop: true })
}) } else {
} else { this.handleEchartsClick(event)
this.handleEchartsClick(event) }
} })
}) return chart
return chart })
}) })
}) },
}, /**
/** * 处理数据
* 处理数据 */
*/ dealSeriesData(data) {
dealSeriesData (data) { if (!data) return
if(!data) return const newData = data.map(item => {
const newData = data.map(item => { const config = {
const config = { type: 'bar',
type: 'bar', ...this.elementInfo.option.bar,
...this.elementInfo.option.bar, label: {
label: { ...this.elementInfo.option.dataset,
...this.elementInfo.option.dataset, formatter: val => {
formatter: val => { return this.$u.common.converFunction(this.elementInfo.option.dataset
return this.$u.common.converFunction(this.elementInfo.option.dataset.formatter, val) .formatter, val)
} }
} }
} }
return { ...item, ...config } return {
}) ...item,
return newData ...config
} }
} })
} return newData
</script> }
<style scoped> }
}
</script>
<style scoped>
</style> </style>
components/LineMixBar/LineMixBar.vue
View file @ eb4ee270
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
lazyLoad: true lazyLoad: true
} }
} }
},
onReady() {
}, },
components: { components: {
uniEcCanvas uniEcCanvas
......
components/NormalBar/NormalBar.vue
View file @ eb4ee270
<template> <template>
<uni-ec-canvas <uni-ec-canvas class="uni-ec-canvas" id="normal-bar" ref="normalbarCanvas" canvas-id="normal-bar-chart" :ec="ec">
class="uni-ec-canvas" </uni-ec-canvas>
id="normal-bar" </template>
ref="normalbarCanvas"
canvas-id="normal-bar-chart" <script>
:ec="ec" import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
></uni-ec-canvas> import echartElementData from '@/mixins/echartElementData.js'
</template> let chart = null
<script> export default {
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' name: "Normalbar",
import echartElementData from '@/mixins/echartElementData.js' mixins: [echartElementData],
let chart = null data() {
return {
export default { ec: {
name:"Normalbar", lazyLoad: true
mixins: [echartElementData], }
data () { }
return { },
ec: { components: {
lazyLoad:true uniEcCanvas
} },
} methods: {
}, initChart() {
onReady () { this.$nextTick(() => {
this.$refs['normalbarCanvas'].init((canvas, width, height, canvasDpr) => {
}, chart = this.$echarts.init(canvas, null, {
components: { width: width,
uniEcCanvas height: height,
}, devicePixelRatio: canvasDpr
methods: { })
initChart() { canvas.setChart(chart)
this.$nextTick(() => { const {
this.$refs['normalbarCanvas'].init((canvas, width, height, canvasDpr) => { dataList: {
chart = this.$echarts.init(canvas, null, { categories,
width: width, series
height: height, }
devicePixelRatio: canvasDpr } = this.elementData
}) const options = {
canvas.setChart(chart) ...this.elementInfo.option,
const { dataList: { categories, series } } = this.elementData tooltip: {},
const options = { xAxis: {
...this.elementInfo.option, ...this.elementInfo.option.xAxis,
tooltip: {}, data: categories
xAxis: { },
...this.elementInfo.option.xAxis, series: this.dealSeriesData(series)
data: categories }
}, chart.setOption(options)
series: this.dealSeriesData(series) chart.on('click', event => {
} this.handleEchartsClick(event)
chart.setOption(options) })
chart.on('click', event => { return chart
this.handleEchartsClick(event) })
}) })
return chart },
}) /**
}) * 处理数据
}, */
/** dealSeriesData(data) {
* 处理数据 if (!data) return
*/ const newData = data.map(item => {
dealSeriesData (data) { const config = {
if(!data) return type: 'bar',
const newData = data.map(item => { ...this.elementInfo.option.bar,
const config = { label: {
type: 'bar', ...this.elementInfo.option.dataset,
...this.elementInfo.option.bar, formatter: val => {
label: { return this.$u.common.converFunction(this.elementInfo.option.dataset
...this.elementInfo.option.dataset, .formatter, val)
formatter: val => { }
return this.$u.common.converFunction(this.elementInfo.option.dataset.formatter, val) }
} }
} return {
} ...item,
return { ...item, ...config } ...config
}) }
return newData })
} return newData
} }
} }
</script> }
<style scoped> </script>
<style scoped>
</style> </style>
components/NormalGauge/NormalGauge.vue
View file @ eb4ee270
...@@ -25,10 +25,6 @@ export default { ...@@ -25,10 +25,6 @@ export default {
}; };
}, },
onReady () {
},
components: { components: {
uniEcCanvas uniEcCanvas
}, },
......
components/NormalLine/NormalLine.vue
View file @ eb4ee270
<template> <template>
<uni-ec-canvas <uni-ec-canvas class="uni-ec-canvas" id="normal-line" ref="normalLineCanvas" canvas-id="normal-line-chart" :ec="ec">
class="uni-ec-canvas" </uni-ec-canvas>
id="normal-line" </template>
ref="normalLineCanvas"
canvas-id="normal-line-chart" <script>
:ec="ec" import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas'
></uni-ec-canvas> import echartElementData from '@/mixins/echartElementData.js'
</template> let chart = null
<script> export default {
import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas' mixins: [echartElementData],
import echartElementData from '@/mixins/echartElementData.js' data() {
let chart = null return {
ec: {
export default { lazyLoad: true
mixins: [echartElementData], }
data () { }
return { },
ec: { components: {
lazyLoad:true uniEcCanvas
} },
} methods: {
}, initChart() {
onReady () { this.$nextTick(() => {
this.$refs['normalLineCanvas'].init((canvas, width, height, canvasDpr) => {
}, chart = this.$echarts.init(canvas, null, {
components: { width: width,
uniEcCanvas height: height,
}, devicePixelRatio: canvasDpr
methods: { })
initChart() { canvas.setChart(chart)
this.$nextTick(() => { const {
this.$refs['normalLineCanvas'].init((canvas, width, height, canvasDpr) => { dataList: {
chart = this.$echarts.init(canvas, null, { categories,
width: width, series
height: height, }
devicePixelRatio: canvasDpr } = this.elementData
}) const options = {
canvas.setChart(chart) ...this.elementInfo.option,
const { dataList: { categories, series } } = this.elementData color: ['#00f2f1', '#ed3f35', '#1089E7', "#F8B448", "#8B78F6", '#8cd8ff',
const options = { '#f0ad54', '#ffffff', '#000000'
...this.elementInfo.option, ],
color: ['#00f2f1', '#ed3f35', '#1089E7', "#F8B448", "#8B78F6",'#8cd8ff', '#f0ad54','#ffffff', '#000000'], tooltip: {},
tooltip: {}, xAxis: {
xAxis: { ...this.elementInfo.option.xAxis,
...this.elementInfo.option.xAxis, data: categories
data: categories },
}, series: this.dealSeriesData(series)
series: this.dealSeriesData(series) }
} chart.setOption(options)
chart.setOption(options) chart.on('click', event => {
chart.on('click', event => { this.handleEchartsClick(event)
this.handleEchartsClick(event) })
}) return chart
return chart })
}) })
}) },
}, /**
/** * 处理数据
* 处理数据 */
*/ dealSeriesData(data) {
dealSeriesData (data) { if (!data) return
if(!data) return const newData = data.map(item => {
const newData = data.map(item => { const config = {
const config = { type: 'line',
type: 'line', ...this.elementInfo.option.line,
...this.elementInfo.option.line, label: {
label: { ...this.elementInfo.option.dataset,
...this.elementInfo.option.dataset, formatter: val => {
formatter: val => { return this.$u.common.converFunction(this.elementInfo.option.dataset
return this.$u.common.converFunction(this.elementInfo.option.dataset.formatter, val) .formatter, val)
} }
} }
} }
return { ...item, ...config } return {
}) ...item,
return newData ...config
} }
} })
} return newData
</script> }
<style scoped> }
}
</script>
<style scoped>
</style> </style>
components/NormalPie/NormalPie.vue
View file @ eb4ee270
...@@ -24,11 +24,7 @@ export default { ...@@ -24,11 +24,7 @@ export default {
} }
}; };
}, },
onReady () {
},
components: { components: {
uniEcCanvas uniEcCanvas
}, },
......
components/NormalProgress/NormalProgress.vue
View file @ eb4ee270
...@@ -34,10 +34,6 @@ import echartElementData from '@/mixins/echartElementData.js' ...@@ -34,10 +34,6 @@ import echartElementData from '@/mixins/echartElementData.js'
export default { export default {
name:"NormalProgress", name:"NormalProgress",
mixins: [echartElementData], mixins: [echartElementData],
data() {
return {
};
},
methods: { methods: {
initChart() {} initChart() {}
} }
......
components/NormalRadar/NormalRadar.vue
View file @ eb4ee270
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
lazyLoad: true lazyLoad: true
} }
} }
},
onReady() {
}, },
components: { components: {
uniEcCanvas uniEcCanvas
......
components/NormalTitle/NormalTitle.vue
View file @ eb4ee270
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
required: true required: true
} }
}, },
data() {
return {
};
},
methods: { methods: {
onClick(url) { onClick(url) {
if (url != '') { if (url != '') {
......
components/NumberScroll/NumberScroll.vue
View file @ eb4ee270
<template> <template>
<view class="chart-num" :style="{height: `${height}px`,'margin-top': `${elementInfo.option.title.titleMarginTop}px`}"> <view class="chart-num" :style="{height: `${height}px`,'margin-top': `${elementInfo.option.title.titleMarginTop}px`}">
<!-- <BasicText :elementInfo="elementInfo"></BasicText> -->
<NormalTitle :elementInfo="elementInfo"></NormalTitle> <NormalTitle :elementInfo="elementInfo"></NormalTitle>
<ul class="box-item marginTop20"> <ul class="box-item marginTop20">
<li v-for="(item, index) in orderNum" :key="index" <li v-for="(item, index) in orderNum" :key="index"
...@@ -39,7 +38,6 @@ ...@@ -39,7 +38,6 @@
height: 0 height: 0
}; };
}, },
onReady() { onReady() {
this.getComponentHeight() this.getComponentHeight()
...@@ -48,7 +46,6 @@ ...@@ -48,7 +46,6 @@
methods: { methods: {
initChart() { initChart() {
this.$nextTick(() => { this.$nextTick(() => {
this.endVal = this.elementData.dataList.endVal this.endVal = this.elementData.dataList.endVal
this.toOrderNumber(this.endVal) this.toOrderNumber(this.endVal)
}) })
...@@ -156,9 +153,4 @@ ...@@ -156,9 +153,4 @@
font-size: 20px; font-size: 20px;
} }
.mark-item {
display: inline-block;
margin-right: 6px;
width: 5px !important;
}
</style> </style>
components/RealTime/RealTime.vue
View file @ eb4ee270
...@@ -41,20 +41,20 @@ ...@@ -41,20 +41,20 @@
initChart() {}, initChart() {},
// 大屏报表时间格式和uniapp的不一致，需要转换 // 大屏报表时间格式和uniapp的不一致，需要转换
getDateFormat() { getDateFormat() {
const dateFormat = this.elementInfo.option.time.dateFormat const dateFormat = this.elementInfo.option.time.dateFormat
if(dateFormat === "YYYY-MM-DD") { if(dateFormat === "YYYY-MM-DD") {
return "yyyy-mm-dd" return "yyyy-mm-dd"
} }
if(dateFormat === "YYYY-MM-DD HH:mm") { if(dateFormat === "YYYY-MM-DD HH:mm") {
return "yyyy-mm-dd hh:MM" return "yyyy-mm-dd hh:MM"
} }
if(dateFormat === "HH:mm") { if(dateFormat === "HH:mm") {
return "hh:MM" return "hh:MM"
} }
if(dateFormat === "HH:mm:ss") { if(dateFormat === "HH:mm:ss") {
return "hh:MM:ss" return "hh:MM:ss"
} }
return "yyyy-mm-dd hh:MM:ss" return "yyyy-mm-dd hh:MM:ss"
} }
} }
...@@ -69,4 +69,4 @@ ...@@ -69,4 +69,4 @@
width: 100%; width: 100%;
color: #fff; color: #fff;
} }
</style> </style>
components/Table/Table.vue
View file @ eb4ee270
...@@ -49,9 +49,6 @@ ...@@ -49,9 +49,6 @@
right: 'end' right: 'end'
} }
}; };
},
mounted() {
}, },
computed: { computed: {
tableStyle() { tableStyle() {
......
pages.json
View file @ eb4ee270
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
"text": "实时数据" "text": "实时数据"
}, { }, {
"pagePath": "pages/reports/reports", "pagePath": "pages/reports/reports",
"iconPath": "static/icon/admin_normal.png", "iconPath": "static/icon/goods_report_normal.png",
"selectedIconPath": "static/icon/admin_selected.png", "selectedIconPath": "static/icon/goods_report_selected.png",
"text": "报表" "text": "报表"
}, { }, {
"pagePath": "pages/center/index", "pagePath": "pages/center/index",
......
pages/index/index.vue
View file @ eb4ee270
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<template v-for="(element, index) in reportData"> <template v-for="(element, index) in reportData">
<view <view
class="view-element" class="view-element"
v-show="!element.hide" v-if="!element.hide"
:key="element.id" :key="element.id"
:style="{ :style="{
width: `${element.width * scale}px`, width: `${element.width * scale}px`,
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
* 组件交互 - 组件 * 组件交互 - 组件
*/ */
uni.$on('handleLinkComp', ({ showData, hideData }) => { uni.$on('handleLinkComp', ({ showData, hideData }) => {
this.reportData = this.reportData.map(item => { this.reportData.map(item => {
if(showData.includes(item.id)) item.hide = false if(showData.includes(item.id)) item.hide = false
if(hideData.includes(item.id)) item.hide = true if(hideData.includes(item.id)) item.hide = true
return item return item
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
*/ */
handleValueChange(index, paramName, value) { handleValueChange(index, paramName, value) {
if(index.length && paramName && value) { if(index.length && paramName && value) {
this.reportData = this.reportData.map(item => { this.reportData.map(item => {
const flag = index.includes(item.id) const flag = index.includes(item.id)
if(flag && item.type === 'BasicText' && item.data.dataType === 'static') { if(flag && item.type === 'BasicText' && item.data.dataType === 'static') {
this.$set(item.data.dataList, 'text', value) this.$set(item.data.dataList, 'text', value)
...@@ -191,9 +191,6 @@ ...@@ -191,9 +191,6 @@
}) })
} }
} }
},
onReachBottom() {
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.getReportCharts() this.getReportCharts()
...@@ -206,7 +203,7 @@ ...@@ -206,7 +203,7 @@
position: relative; position: relative;
height: 100%; height: 100%;
user-select: none; user-select: none;
// overflow: auto; overflow: auto;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: cover; background-size: cover;
background-position: center; background-position: center;
......
pages/login/authorized.vue
View file @ eb4ee270
...@@ -13,11 +13,6 @@ ...@@ -13,11 +13,6 @@
<script> <script>
export default { export default {
data() {
return {
}
},
methods: { methods: {
// 打电话 // 打电话
call() { call() {
......
pages/webView/webView/webView.vue
View file @ eb4ee270
...@@ -15,9 +15,6 @@ ...@@ -15,9 +15,6 @@
onLoad(option) { onLoad(option) {
this.$data.url =decodeURIComponent(option.url) this.$data.url =decodeURIComponent(option.url)
}, },
methods: {
}
} }
</script> </script>
......
utils/common.js
View file @ eb4ee270
...@@ -42,7 +42,6 @@ const install = (Vue, vm) => { ...@@ -42,7 +42,6 @@ const install = (Vue, vm) => {
let seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds(); let seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
// 拼接 // 拼接
return year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds; return year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
// return year + "-" + month + "-" + day;
} }
// px转换为rpx // px转换为rpx
......
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