diff --git a/src/views/mobile/home/Home.vue b/src/views/mobile/home/Home.vue index 8d9a09d..4ee8636 100644 --- a/src/views/mobile/home/Home.vue +++ b/src/views/mobile/home/Home.vue @@ -376,44 +376,46 @@ export default { }, // 初始化 实时示功图 initIndicatorDiagram (data) { - // 没有渲染出组件就不执行 - if (!this.$refs.indicatorDiagram) { - return - } - // 置空数据 - if (!data || Object.keys(data).length === 0) { - this.$refs.indicatorDiagram.updateMyChartOption() - return - } - // 获取基础配置 - const legendData = ['上冲程', '下冲程'] - const option = generateBaseOption() - option.legend.data = legendData - option.xAxis[0].data = data['X轴'] - option.yAxis[0].name = '载荷(KN)' - option.yAxis[0].nameTextStyle.padding = [0, 0, 0, 5] - option.series = [ - { - name: legendData[0], - type: 'line', - stack: 'upStroke', - color: '#FF5353', - symbol: 'none', - smooth: true, - data: data['上冲程'] - }, - { - name: legendData[1], - type: 'line', - stack: 'downStroke', - color: '#8FC7FF', - symbol: 'none', - smooth: true, - data: data['下冲程'] + this.$nextTick(() => { + // 没有渲染出组件就不执行 + if (!this.$refs.indicatorDiagram) { + return } - ] - // 设置数据 - this.$refs.indicatorDiagram && this.$refs.indicatorDiagram.updateMyChartOption(option) + // 置空数据 + if (!data || Object.keys(data).length === 0) { + this.$refs.indicatorDiagram.updateMyChartOption() + return + } + // 获取基础配置 + const legendData = ['上冲程', '下冲程'] + const option = generateBaseOption() + option.legend.data = legendData + option.xAxis[0].data = data['X轴'] + option.yAxis[0].name = '载荷(KN)' + option.yAxis[0].nameTextStyle.padding = [0, 0, 0, 5] + option.series = [ + { + name: legendData[0], + type: 'line', + stack: 'upStroke', + color: '#FF5353', + symbol: 'none', + smooth: true, + data: data['上冲程'] + }, + { + name: legendData[1], + type: 'line', + stack: 'downStroke', + color: '#8FC7FF', + symbol: 'none', + smooth: true, + data: data['下冲程'] + } + ] + // 设置数据 + this.$refs.indicatorDiagram && this.$refs.indicatorDiagram.updateMyChartOption(option) + }) }, // 油井下拉 loadOilWellList (wellheadArea) { diff --git a/src/views/mobile/manage/Manage.vue b/src/views/mobile/manage/Manage.vue index 45260f6..c1c55bb 100644 --- a/src/views/mobile/manage/Manage.vue +++ b/src/views/mobile/manage/Manage.vue @@ -442,6 +442,7 @@ export default { .overview-card-main { display: flex; justify-content: space-between; + height: 0.78rem; .overview-card-img { flex: 0 0 0.56rem; diff --git a/src/views/mobile/mine/Mine.vue b/src/views/mobile/mine/Mine.vue index 58ba7ac..feaa5a1 100644 --- a/src/views/mobile/mine/Mine.vue +++ b/src/views/mobile/mine/Mine.vue @@ -153,9 +153,14 @@ export default { width: 0.14rem; height: 0.14rem; } + /deep/ .van-uploader__preview { + margin: 0.02rem; + width: 1.2rem; + height: 1.2rem; + } /deep/ .van-uploader__preview-image { - width: 1.24rem; - height: 1.24rem; + width: 100%; + height: 100%; } /deep/ .van-uploader__upload { width: 1.24rem; diff --git a/src/views/systemOverview/systemSettings/SystemSettings.vue b/src/views/systemOverview/systemSettings/SystemSettings.vue index 32a5151..9d73d65 100644 --- a/src/views/systemOverview/systemSettings/SystemSettings.vue +++ b/src/views/systemOverview/systemSettings/SystemSettings.vue @@ -531,6 +531,7 @@ export default {