diff --git a/src/components/charts/panel.scss b/src/components/charts/panel.scss index 59f8e302..f1d9289f 100644 --- a/src/components/charts/panel.scss +++ b/src/components/charts/panel.scss @@ -49,6 +49,46 @@ background: #e02f44; } +.chart-info-corner { + color: #767980; + cursor: pointer; + position: absolute; + display: none; + left: 0; + width: 28px; + height: 28px; + z-index: 2; + top: 0; +} +.chart-info-corner--error { + display: block; + color: #fff; +} +.chart-info-corner--error .chart-info-corner-inner { + border-left: 28px solid #e02f44; + border-right: none; + border-bottom: 28px solid rgba(0,0,0,0); +} +.chart-info-corner-inner { + width: 0; + height: 0; + position: absolute; + left: 0; + bottom: 0; +} +.chart-info-corner .fa { + position: absolute; + top: 2px; + left: 6px; + font-size: 65%; + z-index: 3; + font-style: normal; +} +.cn-chart-icon-warning:before { + content: "!"; + font-weight:normal; +} + .cn-panel, .cn-panel>.cn-chart__tabs>.el-tabs__content>.el-tab-pane { display: grid; grid-template-columns: repeat(30, 1fr); @@ -95,46 +135,6 @@ color: #333333; font-weight: bold; - .chart-info-corner { - color: #767980; - cursor: pointer; - position: absolute; - display: none; - left: 0; - width: 28px; - height: 28px; - z-index: 2; - top: 0; - } - .chart-info-corner--error { - display: block; - color: #fff; - } - .chart-info-corner--error .chart-info-corner-inner { - border-left: 28px solid #e02f44; - border-right: none; - border-bottom: 28px solid rgba(0,0,0,0); - } - .chart-info-corner-inner { - width: 0; - height: 0; - position: absolute; - left: 0; - bottom: 0; - } - .chart-info-corner .fa { - position: relative; - top: -2px; - left: 6px; - font-size: 65%; - z-index: 3; - font-style: normal; - } - .cn-chart-icon-warning:before { - content: "!"; - font-weight:normal; - } - .header__operations { .cn-icon-more-light { color: #999; @@ -149,46 +149,6 @@ display: flex; align-items: center; - - .chart-info-corner { - color: #767980; - cursor: pointer; - position: absolute; - display: none; - left: 0; - width: 28px; - height: 28px; - z-index: 2; - top: 0; - } - .chart-info-corner--error { - display: block; - color: #fff; - } - .chart-info-corner--error .chart-info-corner-inner { - border-left: 28px solid #e02f44; - border-right: none; - border-bottom: 28px solid rgba(0,0,0,0); - } - .chart-info-corner-inner { - width: 0; - height: 0; - position: absolute; - left: 0; - bottom: 0; - } - .chart-info-corner .fa { - position: relative; - top: 3px; - left: 6px; - font-size: 65%; - z-index: 3; - font-style: normal; - } - .cn-chart-icon-warning:before { - content: "!"; - } - .single-value-icon__box { display: flex; align-items: center; diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue index 131ae28a..5d1bbdce 100644 --- a/src/views/charts/Chart.vue +++ b/src/views/charts/Chart.vue @@ -310,7 +310,7 @@ export default { this.singleValue.value = response.data.result }else { this.isError = true; - this.errorInfo = response.message; + this.errorInfo = response.msg; } if (this.isSingleValueWithEcharts) { // 带曲线的单值图 const dom = document.getElementById(`chart${this.chartInfo.id}`) @@ -332,7 +332,7 @@ export default { }) }else { this.isError = true; - this.errorInfo = response.message; + this.errorInfo = response.msg; } this.myChart.setOption(this.chartOption) this.$nextTick(() => { @@ -518,7 +518,7 @@ export default { } }else { this.isError = true; - this.errorInfo = response.message; + this.errorInfo = response.msg; } }).finally(() => { setTimeout(() => { this.loading = false }, 250) @@ -627,7 +627,7 @@ export default { } }else { this.isError = true; - this.errorInfo = response.message; + this.errorInfo = response.msg; } this.myChart.setOption(this.chartOption) this.$nextTick(() => { @@ -744,7 +744,7 @@ export default { }) }else { this.isError = true; - this.errorInfo = response.message; + this.errorInfo = response.msg; } this.myChart.setOption(this.chartOption) this.$nextTick(() => { @@ -802,13 +802,13 @@ export default { this.pieTableData = response2.data.result }else { this.isError = true; - this.errorInfo = response.message; + this.errorInfo = response.msg; } }) } }else { this.isError = true; - this.errorInfo = response.message; + this.errorInfo = response.msg; } }).finally(() => { setTimeout(() => { this.loading = false }, 250) @@ -879,7 +879,7 @@ export default { this.table.currentPageData = this.getTargetPageData(1, this.table.pageSize, this.table.tableData) }else { this.isError = true; - this.errorInfo = response.message; + this.errorInfo = response.msg; } }).finally(() => { setTimeout(() => { this.loading = false }, 250)