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

修改测试bug

Browse Source
This commit is contained in:
GGJ
2024-10-16 08:49:31 +08:00
parent 223e698c9b
commit 2c2e2df334
6 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,14 +5,8 @@
<div class="bx" id="wave"></div> <div class="bx" id="wave"></div>
</div> </div>
</div> </div>
<el-button <el-button style="position: absolute; right: 10px; top: 0px; z-index: 20000" type="primary" link
style="position: absolute; right: 10px; top: 0px; z-index: 20000" icon="el-icon-Download" title="生成图片" @click="download">
type="primary"
link
icon="el-icon-Download"
title="生成图片"
@click="download"
>
下载 下载
</el-button> </el-button>
</div> </div>
@@ -80,8 +74,8 @@ export default {
if (this.flag == 1) { if (this.flag == 1) {
this.vh = mainHeight(165).height this.vh = mainHeight(165).height
} else { } else {
this.vh = mainHeight(165,2).height this.vh = mainHeight(165, 2).height
} }
this.vw = '100%' this.vw = '100%'
}, },
@@ -97,7 +91,7 @@ export default {
} }
}, },
mounted() { mounted() {
// console.log(`123123`,this.boxoList,this.wp); // console.log(`123123`,this.boxoList,this.wp);
this.zoom = 1 / document.body.style.zoom this.zoom = 1 / document.body.style.zoom
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.zoom = 1 / document.body.style.zoom this.zoom = 1 / document.body.style.zoom
@@ -172,17 +166,17 @@ export default {
's' 's'
} }
else if (this.boxoList.systemType == 'WX') { else if (this.boxoList.systemType == 'WX') {
console.log("🚀 ~ initWaves ~ this.boxoList:", this.boxoList)
this.titles = this.titles =
// "变电站名称：" +
// this.boxoList.equipmentName +
' 监测点名称：' + ' 监测点名称：' +
this.boxoList.equipmentName + this.boxoList.lineId +
' 发生时刻：' + ' 发生时刻：' +
this.boxoList.startTime + this.boxoList.startTime +
' 暂降(骤升)幅值：' + ' 暂降(骤升)幅值：' +
this.boxoList.featureAmplitude==null?'/':this.boxoList.featureAmplitude.toFixed(2) + this.boxoList.featureAmplitude==null ? '/' : this.boxoList.featureAmplitude.toFixed(2) +
' 持续时间：' + ' 持续时间：' +
this.boxoList.persistTime==null? '/':this.boxoList.persistTime+ this.boxoList.persistTime==null ? '/' : this.boxoList.persistTime +
's' 's'
} else { } else {
this.titles = this.titles =
@@ -211,12 +205,12 @@ export default {
for (var i = 0; i < picCounts; i++) { for (var i = 0; i < picCounts; i++) {
this.fliteWaveData(this.wp, i) this.fliteWaveData(this.wp, i)
this.waveDatas.push({ this.waveDatas.push({
instantF :this.instantF, instantF: this.instantF,
instantS :this.instantS, instantS: this.instantS,
shunshiF :this.shunshiF, shunshiF: this.shunshiF,
shunshiS :this.shunshiS, shunshiS: this.shunshiS,
title :this.title, title: this.title,
unit :this.unit, unit: this.unit,
}) })
@@ -398,7 +392,7 @@ export default {
} }
return this.waveData(instantF, instantS, shunshiF, shunshiS, title, unit) return this.waveData(instantF, instantS, shunshiF, shunshiS, title, unit)
}, },
//开始画图 //开始画图
initWave(waveDatas, time, type, severity, isOpen) { initWave(waveDatas, time, type, severity, isOpen) {
@@ -547,10 +541,10 @@ export default {
let _this = this let _this = this
var myChartes = echarts.init(wave) var myChartes = echarts.init(wave)
let echartsColor = {WordColor:"#000",thread:"#000000",FigureColor:["#07CCCA ","#00BFF5","#FFBF00","#77DA63","#D5FF6B","#Ff6600","#FF9100","#5B6E96","#66FFCC","#B3B3B3","#FF00FF","#CC00FF","#FF9999"]} let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
setTimeout(() => { setTimeout(() => {
wave.style.width ='100%'; wave.style.width = '100%';
wave.style.height =_this.vh; wave.style.height = _this.vh;
}, 0); }, 0);
var option = { var option = {
tooltip: { tooltip: {
@@ -593,7 +587,7 @@ export default {
}, },
title: { title: {
left: 'center', left: 'center',
text: title, text: '电网侧-电压 ' + title,
textStyle: { textStyle: {
fontSize: '0.8rem', fontSize: '0.8rem',
color: _this.DColor ? '#fff' : echartsColor.WordColor color: _this.DColor ? '#fff' : echartsColor.WordColor
@@ -910,7 +904,7 @@ export default {
}) })
} }
var myChartes = echarts.init(waveIds) var myChartes = echarts.init(waveIds)
let echartsColor = {WordColor:"#000",thread:"#000000",FigureColor:["#07CCCA ","#00BFF5","#FFBF00","#77DA63","#D5FF6B","#Ff6600","#FF9100","#5B6E96","#66FFCC","#B3B3B3","#FF00FF","#CC00FF","#FF9999"]} let echartsColor = { WordColor: "#000", thread: "#000000", FigureColor: ["#07CCCA ", "#00BFF5", "#FFBF00", "#77DA63", "#D5FF6B", "#Ff6600", "#FF9100", "#5B6E96", "#66FFCC", "#B3B3B3", "#FF00FF", "#CC00FF", "#FF9999"] }
var option = { var option = {
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',

10
src/views/govern/device/control/index.vue
View File

@@ -12,9 +12,9 @@
<!-- <el-button v-if="deviceType == '1'" type="primary" @click="handleDownLoadTemplate"> <!-- <el-button v-if="deviceType == '1'" type="primary" @click="handleDownLoadTemplate">
模版下载 模版下载
</el-button> --> </el-button> -->
<el-button v-if="deviceType == '1'" type="primary" @click="handleImport">离线数据导入</el-button> <el-button v-if="deviceType == '1'" type="primary" icon="el-icon-Connection" @click="handleImport">离线补召</el-button>
<el-button v-if="deviceType == '1'" type="primary" @click="handleaddDevice">设备补召</el-button> <el-button v-if="deviceType == '1'" type="primary" icon="el-icon-Monitor" @click="handleaddDevice">在线补召</el-button>
<el-button v-if="deviceType == '1'" type="primary" @click="handleAnalysisList">解析列表</el-button> <el-button v-if="deviceType == '1'" type="primary" icon="el-icon-Tickets" @click="handleAnalysisList">补招日志</el-button>
</template> </template>
<el-descriptions-item label="名称"> <el-descriptions-item label="名称">
{{ deviceData.name ? deviceData.name : '/' }} {{ deviceData.name ? deviceData.name : '/' }}
@@ -26,13 +26,13 @@
<el-descriptions-item label="接入方式"> <el-descriptions-item label="接入方式">
{{ deviceData.devAccessMethod ? deviceData.devAccessMethod : '/' }} {{ deviceData.devAccessMethod ? deviceData.devAccessMethod : '/' }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="识别码"> <el-descriptions-item label="网络设备ID">
{{ deviceData.ndid ? deviceData.ndid : '/' }} {{ deviceData.ndid ? deviceData.ndid : '/' }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="型号"> <el-descriptions-item label="型号">
{{ echoName(deviceData.devModel, devModelOptions) }} {{ echoName(deviceData.devModel, devModelOptions) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="接入时间"> <el-descriptions-item label="接入日期">
{{ deviceData.time ? deviceData.time : '/' }} {{ deviceData.time ? deviceData.time : '/' }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>

2
src/views/govern/device/control/tabs/event.vue
View File

@@ -91,7 +91,7 @@ const tableStore: any = new TableStore({
row.loading = false row.loading = false
if (res != undefined) { if (res != undefined) {
boxoList.value = row boxoList.value = row
boxoList.value.systemType = 'WX' // boxoList.value.systemType = 'WX'
wp.value = res.data wp.value = res.data
view.value = false view.value = false
view2.value = true view2.value = true

6
src/views/govern/device/manage/index.vue
View File

@@ -11,7 +11,7 @@
@click="openGroup" @click="openGroup"
:loading="getGroupLoading" :loading="getGroupLoading"
> >
设备模版分组 模版数据分组
</el-button> </el-button>
</template> </template>
<el-descriptions-item label="名称"> <el-descriptions-item label="名称">
@@ -24,13 +24,13 @@
<el-descriptions-item label="接入方式"> <el-descriptions-item label="接入方式">
{{ deviceData.devAccessMethod }} {{ deviceData.devAccessMethod }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="识别码"> <el-descriptions-item label="网络设备ID">
{{ deviceData.ndid }} {{ deviceData.ndid }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="型号"> <el-descriptions-item label="型号">
{{ echoName(deviceData.devModel, devModelOptions) }} {{ echoName(deviceData.devModel, devModelOptions) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="接入时间"> <el-descriptions-item label="接入日期">
{{ deviceData.time }} {{ deviceData.time }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="应用程序版本号"> <el-descriptions-item label="应用程序版本号">

2
src/views/govern/device/manage/popup.vue
View File

@@ -4,7 +4,7 @@
<el-descriptions-item label="名称"> <el-descriptions-item label="名称">
{{ popupData.deviceData.name }} {{ popupData.deviceData.name }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="识别码"> <el-descriptions-item label="网络设备ID">
{{ popupData.deviceData.ndid }} {{ popupData.deviceData.ndid }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>

2
src/views/govern/device/planData/components/device_back.vue
View File

@@ -50,7 +50,7 @@
<vxe-column type="checkbox" width="60"></vxe-column> <vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column field="devName" title="设备名称"></vxe-column> <vxe-column field="devName" title="设备名称"></vxe-column>
<vxe-column field="devMac" title="设备MAC"></vxe-column> <vxe-column field="devMac" title="设备MAC"></vxe-column>
<vxe-column field="devNdId" title="网络识别码"></vxe-column> <vxe-column field="devNdId" title="网络设备ID"></vxe-column>
<vxe-column field="lineName" title="线路号"></vxe-column> <vxe-column field="lineName" title="线路号"></vxe-column>
<vxe-column field="startTime" title="开始时间"></vxe-column> <vxe-column field="startTime" title="开始时间"></vxe-column>
<vxe-column field="endTime" title="结束时间"></vxe-column> <vxe-column field="endTime" title="结束时间"></vxe-column>