Web/admin-sjzx
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 海南测试bug

Browse Source
This commit is contained in:
GGJ
2024-12-11 16:14:08 +08:00
parent 9b952f2016
commit 16c25ddf6b
28 changed files with 338 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/echarts/MyEchart.vue
View File

@@ -62,7 +62,7 @@ const initChart = () => {
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0,
confine: true,
...(props.options?.tooltip || null)
@@ -74,15 +74,15 @@ const initChart = () => {
saveAsImage: {
title: '保存图片',
},
...(props.options?.toolbox?.featureProps || null)
},
emphasis: {
iconStyle: {
borderColor: config.layout.elementUiPrimary[0], // 鼠标悬停时的边框颜色
color: config.layout.elementUiPrimary[0] // 鼠标悬停时的图标颜色
}
},
iconStyle: {
borderColor: config.layout.elementUiPrimary[0], // 鼠标悬停时的边框颜色
color: config.layout.elementUiPrimary[0] // 鼠标悬停时的图标颜色
}
},
// },
...(props.options?.toolbox || null)
},

7
src/components/echarts/MyEchartMap.vue
View File

@@ -26,7 +26,7 @@ const fetchConfig = async (name: string) => {
// fetchConfig()
const emit = defineEmits(['getRegionByRegion', 'eliminate', 'clickMap'])
onMounted(() => {})
onMounted(() => { })
const GetEchar = async (name: string) => {
let chartDom = document.getElementById('chartMap')
@@ -57,7 +57,7 @@ const GetEchar = async (name: string) => {
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
backgroundColor: 'rgba(0,0,0,0.55)',
...(props.options.tooltip || null)
},
@@ -187,7 +187,7 @@ const GetEchar = async (name: string) => {
}
}
})
}
const MapReturn = (name: string) => {
@@ -232,6 +232,7 @@ watch(
width: 100%;
height: 100%;
}
.iconfont {
cursor: pointer;
position: absolute;

23
src/components/echarts/analytics.vue
View File

@@ -6,14 +6,8 @@
</div>
<el-tabs type="border-card">
<el-tab-pane label="暂态波形上送" :style="'height:' + vhh">
<el-table
stripe
:data="Data"
:height="height"
border
style="width: 100%"
header-cell-class-name="table_header"
>
<el-table stripe :data="Data" :height="height" border style="width: 100%"
header-cell-class-name="table_header">
<el-table-column align="center" prop="number" label="事件段"></el-table-column>
<el-table-column align="center" prop="number" label="波形起始点相位(°)">
<el-table-column align="center" prop="number" label="A相"></el-table-column>
@@ -31,12 +25,7 @@
<el-table-column align="center" prop="number" label="C相"></el-table-column>
</el-table-column>
<el-table-column align="center" prop="number" label="总分段数目"></el-table-column>
<el-table-column
align="center"
prop="number"
label="三相电压不平衡度(%)"
width="180"
></el-table-column>
<el-table-column align="center" prop="number" label="三相电压不平衡度(%)" width="180"></el-table-column>
<el-table-column align="center" prop="number" label="暂降类型"></el-table-column>
<el-table-column align="center" prop="number" label="暂降原因"></el-table-column>
</el-table>
@@ -99,7 +88,7 @@ export default {
zoom: ''
}
},
created() {},
created() { },
watch: {
value: function (a, b) {
if (a == 2) {
@@ -244,10 +233,10 @@ export default {
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0
},
title: {
left: 'center',
text: '发生时刻：' + this.boxoList.startTime + ' PT变化:' + this.boxoList.measurementPointName,

38
src/components/echarts/rmsboxi.vue
View File

@@ -118,7 +118,7 @@ export default {
backbxlb() {
if (this.echartlist.length > 0) {
this.waveDatas = []
this.echartlist.forEach(item => {
item.dispose(); // 销毁echarts实例
@@ -205,7 +205,7 @@ export default {
" 发生时刻：" +
this.boxoList.startTime +
" 暂降(骤升)幅值：" +
(this.boxoList.featureAmplitude * 100).toFixed(0) +
(this.boxoList.featureAmplitude * 1).toFixed(0) +
"% 持续时间：" +
this.boxoList.duration +
"s";
@@ -231,7 +231,7 @@ export default {
" 发生时刻：" +
this.boxoList.startTime +
" 暂降(骤升)幅值：" +
(this.boxoList.featureAmplitude * 100).toFixed(0) +
(this.boxoList.featureAmplitude * 1).toFixed(0) +
"% 持续时间：" +
this.boxoList.duration +
"s";
@@ -672,10 +672,10 @@ export default {
let cu = null,
rmscu = null,
rmscm = null,
title =null,
unit =null,
max =null,
min=null;
title = null,
unit = null,
max = null,
min = null;
let a = null,
b = "",
c = "";
@@ -871,7 +871,7 @@ export default {
" 发生时刻：" +
this.time +
" 暂降(骤升)幅值：" +
(this.eventValue * 100).toFixed(0) +
(this.eventValue * 1).toFixed(0) +
"% 持续时间：" +
this.persistTime +
"s";
@@ -920,7 +920,7 @@ export default {
opacity: 0.35,
fontSize: 14,
},
backgroundColor: "rgba(0,0,0,0.35)",
backgroundColor: "rgba(0,0,0,0.55)",
borderWidth: 0,
},
title: {
@@ -1191,13 +1191,13 @@ export default {
b = "",
c = "";
let max, min, unit;
let adata =null,
bdata =null,
cdata =null;
let radata =null,
rbdata =null,
rcdata =null;
let colors =[];
let adata = null,
bdata = null,
cdata = null;
let radata = null,
rbdata = null,
rcdata = null;
let colors = [];
switch (this.iphasic) {
case 1:
a = waveDataTemp.title.aTitle;
@@ -1255,12 +1255,12 @@ export default {
let myChartes = echarts.init(document.getElementById(rmsId));
//debugger
let titlename = ''
let titlename = ''
if (this.boxoList.systemType == "ZL") {
let str = []
str = rmsId.split('s')
let str1 = Number(str[1])
this.wp.channelNames.forEach((element, i) => {
if (i == 4 || i == 7 || i == 10) {
if (str1 == 1 && i == 4) {
@@ -1341,7 +1341,7 @@ export default {
opacity: 0.35,
fontSize: 14,
},
backgroundColor: "rgba(0,0,0,0.35)",
backgroundColor: "rgba(0,0,0,0.55)",
borderWidth: 0,
},
title: {

22
src/components/echarts/shushiboxi.vue
View File

@@ -106,19 +106,19 @@ export default {
methods: {
backbxlb() {
if (this.echartlist.length>0) {
if (this.echartlist.length > 0) {
console.log(123111);
this.waveDatas = []
this.echartlist.forEach(item => {
item.dispose(); // 销毁echarts实例
})
}
},
download() {
download() {
// 转换成canvas
html2canvas(document.getElementById('boxsj'), {
scale: 2
@@ -163,7 +163,7 @@ export default {
' 发生时刻：' +
this.boxoList.startTime +
' 暂降(骤升)幅值：' +
(this.boxoList.featureAmplitude * 100).toFixed(0) +
(this.boxoList.featureAmplitude * 1).toFixed(0) +
'% 持续时间：' +
this.boxoList.duration +
's'
@@ -189,7 +189,7 @@ export default {
' 发生时刻：' +
this.boxoList.startTime +
' 暂降(骤升)幅值：' +
(this.boxoList.featureAmplitude * 100).toFixed(0) +
(this.boxoList.featureAmplitude * 1).toFixed(0) +
'% 持续时间：' +
this.boxoList.duration +
's'
@@ -406,7 +406,7 @@ export default {
},
//开始画图
initWave(waveDatas, time, type, severity, isOpen) {
this.echartlist=[]
this.echartlist = []
//清除之前增加的div
// $("#wave ~ .bx1").remove();
$('div.bx1').remove()
@@ -539,7 +539,7 @@ export default {
' 发生时刻：' +
this.time +
' 暂降(骤升)幅值：' +
(this.eventValue * 100).toFixed(0) +
(this.eventValue * 1).toFixed(0) +
'% 持续时间：' +
this.persistTime +
's'
@@ -592,7 +592,7 @@ export default {
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0
},
title: {
@@ -946,7 +946,7 @@ export default {
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0
},
title: {