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

修改测试问题

Browse Source
This commit is contained in:
GGJ
2024-10-15 15:31:36 +08:00
parent a05cc2deab
commit 223e698c9b
9 changed files with 1720 additions and 1812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@@ -21,6 +21,7 @@
import html2canvas from 'html2canvas' import html2canvas from 'html2canvas'
import $ from 'jquery' import $ from 'jquery'
import * as echarts from 'echarts' import * as echarts from 'echarts'
import { mainHeight } from '@/utils/layout' import { mainHeight } from '@/utils/layout'
import url from '@/assets/img/point.png' import url from '@/assets/img/point.png'
export default { export default {
@@ -96,7 +97,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
@@ -142,7 +143,6 @@ export default {
}, },
//根据后台查询的数据，清洗数据 //根据后台查询的数据，清洗数据
initWaves() { initWaves() {
console.log(this.boxoList.systemType,"this.boxoList.systemType");
if (null != this.wp) { if (null != this.wp) {
if (this.boxoList.systemType == 'pms') { if (this.boxoList.systemType == 'pms') {
this.titles = this.titles =
@@ -170,26 +170,32 @@ export default {
' 持续时间：' + ' 持续时间：' +
this.boxoList.evtParamTm + this.boxoList.evtParamTm +
's' 's'
}
else if (this.boxoList.systemType == 'WX') {
this.titles =
// "变电站名称：" +
// this.boxoList.equipmentName +
' 监测点名称：' +
this.boxoList.equipmentName +
' 发生时刻：' +
this.boxoList.startTime +
' 暂降(骤升)幅值：' +
this.boxoList.featureAmplitude==null?'/':this.boxoList.featureAmplitude.toFixed(2) +
' 持续时间：' +
this.boxoList.persistTime==null? '/':this.boxoList.persistTime+
's'
} else { } else {
if((this.boxoList.featureAmplitude * 100).toFixed(0)){
this.boxoList.featureAmplitude= (this.boxoList.featureAmplitude * 100).toFixed(0)
}
for(var key in this.boxoList) {
if(this.boxoList[key]==null||!this.boxoList[key]){
this.boxoList[key]='/'
}
}
this.titles = this.titles =
'变电站名称：' + '变电站名称：' +
this.boxoList.subName + this.boxoList.subName +
' 监测点名称：' + ' 监测点名称：' +
this.boxoList.lineName + this.boxoList.lineName +
' 发生时刻：' + ' 发生时刻：' +
this.boxoList.startTime + this.boxoList.startTime +
' 暂降(骤升)幅值：' + ' 暂降(骤升)幅值：' +
this.boxoList.featureAmplitude + (this.boxoList.featureAmplitude * 100).toFixed(0) +
'% 持续时间：' + '% 持续时间：' +
this.boxoList.duration + this.boxoList.duration +
's' 's'
} }
@@ -511,9 +517,7 @@ export default {
for (var step = 1; step < waveDatas.length; step++) { for (var step = 1; step < waveDatas.length; step++) {
var waveId = 'wave' + step var waveId = 'wave' + step
var newDivShunshi = $(` <div style="height:${this.vh};overflow: hidden;"> var newDivShunshi = $(` <div style="height:${this.vh};overflow: hidden;">
<div class='bx1' id='${waveId}' style="zoom:${this.zoom};transform:scale(${ <div class='bx1' id='${waveId}'>
1 / this.zoom
});transform-origin:0 0;">
</div> </div>
</div>`) </div>`)
newDivShunshi.insertAfter($('#shushi')) newDivShunshi.insertAfter($('#shushi'))
@@ -589,7 +593,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

27
src/components/form/datePicker/index.vue
View File

@@ -4,19 +4,9 @@
<el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
<el-date-picker <el-date-picker v-model="timeValue" type="daterange" :disabled="disabledPicker"
v-model="timeValue" style="width: 220px; margin-right: 10px" unlink-panels :clearable="false" range-separator="至"
type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" :shortcuts="shortcuts" />
:disabled="disabledPicker"
style="width: 220px; margin-right: 10px"
unlink-panels
:clearable="false"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
:shortcuts="shortcuts"
/>
<el-button :disabled="backDisabled" type="primary" :icon="DArrowLeft" @click="preClick"></el-button> <el-button :disabled="backDisabled" type="primary" :icon="DArrowLeft" @click="preClick"></el-button>
<el-button type="primary" :icon="VideoPause" @click="nowTime">当前</el-button> <el-button type="primary" :icon="VideoPause" @click="nowTime">当前</el-button>
<el-button :disabled="preDisabled" type="primary" :icon="DArrowRight" @click="next"></el-button> <el-button :disabled="preDisabled" type="primary" :icon="DArrowRight" @click="next"></el-button>
@@ -43,7 +33,7 @@ const count = ref(0)
const disabledPicker = ref(true) const disabledPicker = ref(true)
const timeValue = ref() const timeValue = ref()
const backDisabled = ref(false) const backDisabled = ref(false)
const preDisabled = ref(false) const preDisabled = ref(true)
const timeOptions: any = ref([ const timeOptions: any = ref([
{ label: '年份', value: 1 }, { label: '年份', value: 1 },
{ label: '季度', value: 2 }, { label: '季度', value: 2 },
@@ -86,7 +76,7 @@ onMounted(() => {
// 选择时间范围 // 选择时间范围
const timeChange = (e: number) => { const timeChange = (e: number) => {
backDisabled.value = false backDisabled.value = false
preDisabled.value = false preDisabled.value = true
count.value = 0 count.value = 0
if (e == 1) { if (e == 1) {
disabledPicker.value = true disabledPicker.value = true
@@ -128,6 +118,7 @@ const nowTime = () => {
} }
// 上一个 // 上一个
const preClick = () => { const preClick = () => {
preDisabled.value = false
let startTime = timeValue.value[0] let startTime = timeValue.value[0]
let endTime = timeValue.value[1] let endTime = timeValue.value[1]
let year = parseInt(startTime.substring(0, 4)) let year = parseInt(startTime.substring(0, 4))
@@ -410,6 +401,12 @@ const next = () => {
} }
} }
if (!props.nextFlag) {
if (new Date(endTime + ' 00:00:00').getTime() >= new Date(window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd ') + ' 00:00:00').getTime()) {
preDisabled.value = true
}
}
timeValue.value = [startTime, endTime] timeValue.value = [startTime, endTime]
} }

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

@@ -852,7 +852,7 @@ queryByCode('Device_Type').then(res => {
}) })
}) })
const echoName = (value: any, arr: any[]) => { const echoName = (value: any, arr: any[]) => {
return value ? arr.find(item => item.value == value).label : '/' return value ? arr.find(item => item.value == value)?.label : '/'
} }
onMounted(() => {}) onMounted(() => {})

1
src/views/govern/device/control/tabs/components/waveFormAnalysis.vue
View File

@@ -150,6 +150,7 @@ defineExpose({ getWpData })
height: 50px; height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
.el-select { .el-select {
width: 200px !important; width: 200px !important;

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

@@ -91,6 +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'
wp.value = res.data wp.value = res.data
view.value = false view.value = false
view2.value = true view2.value = true
@@ -104,6 +105,18 @@ const tableStore: any = new TableStore({
waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value) waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value)
}) })
} }
},
{
name: 'edit',
text: '暂无波形',
type: 'info',
icon: 'el-icon-DataLine',
render: 'basicButton',
disabled: row => {
return row.wavePath
},
} }
] ]
} }

389
src/views/govern/device/control/tabs/trend.vue
View File

@@ -56,6 +56,7 @@ import { position } from 'html2canvas/dist/types/css/property-descriptors/positi
import { read, writeFile, utils } from 'xlsx' import { read, writeFile, utils } from 'xlsx'
import TableStore from '@/utils/tableStore' import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue' import Table from '@/components/table/index.vue'
import { yMethod } from '@/utils/echartMethod'
import TableHeader from '@/components/table/header/index.vue' import TableHeader from '@/components/table/header/index.vue'
import { getTabsDataByType } from '@/api/cs-device-boot/EquipmentDelivery' import { getTabsDataByType } from '@/api/cs-device-boot/EquipmentDelivery'
import DatePicker from '@/components/form/datePicker/index.vue' import DatePicker from '@/components/form/datePicker/index.vue'
@@ -183,271 +184,155 @@ const init = async () => {
.then((res: any) => { .then((res: any) => {
if (res.code == 'A0000') { if (res.code == 'A0000') {
historyDataList.value = res.data historyDataList.value = res.data
echartsData.value = null let chartsList = JSON.parse(JSON.stringify(res.data))
echartsData.value = {}
//icon图标替换legend图例 //icon图标替换legend图例
const iconThree =
'path://M512 85.333333c235.637333 0 426.666667 191.029333 426.666667 426.666667S747.637333 938.666667 512 938.666667 85.333333 747.637333 85.333333 512 276.362667 85.333333 512 85.333333z m214.592 318.677334a32 32 0 0 0-45.248 0.064L544.736 541.066667l-81.792-89.109334a32 32 0 0 0-46.613333-0.576l-119.36 123.733334a32 32 0 1 0 46.058666 44.437333l95.754667-99.264 81.418667 88.704a32 32 0 0 0 46.24 0.96l160.213333-160.693333a32 32 0 0 0-0.064-45.248z'
const iconDanger =
'path://M1001.661867 796.544c48.896 84.906667 7.68 157.013333-87.552 157.013333H110.781867c-97.834667 0-139.050667-69.504-90.112-157.013333l401.664-666.88c48.896-87.552 128.725333-87.552 177.664 0l401.664 666.88zM479.165867 296.533333v341.333334a32 32 0 1 0 64 0v-341.333334a32 32 0 1 0-64 0z m0 469.333334v42.666666a32 32 0 1 0 64 0v-42.666666a32 32 0 1 0-64 0z'
let xAxis: any = [], // y轴单位数组
timeList: any = []
let unitList: any = [] let unitList: any = []
historyDataList.value.map((item: any) => {
timeList.push(item.time) let groupedData = chartsList.reduce((acc, item) => {
if (unitList.indexOf(item.unit) == -1) { let key = item.anotherName;
unitList.push(item.unit) if (!acc[key]) {
acc[key] = [];
} }
}) acc[key].push(item);
xAxis = timeList.sort((a: any, b: any) => { return acc;
return new Date(a).getTime() - new Date(b).getTime() }, {})
}) let result = Object.values(groupedData);
echartsData.value = { if (chartsList.length > 0) {
options: { unitList = result.map((item: any) => {
title: [ return item[0].unit
{
left: '10%',
top: 0,
text: chartTitle.value
}
],
toolbox: {
feature: {
// saveAsImage: {
// title: '保存'
// },
// dataView: { readOnly: false },
// }
}
},
tooltip: {
trigger: 'axis',
textStyle: {
color: '#fff',
fontStyle: 'normal',
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
borderWidth: 0,
axisPointer: {
type: 'cross',
crossStyle: {
color: '#999'
}
},
formatter: function (params: any) {
let list = params.filter((item, index, self) => {
return index === self.findIndex(t => t.seriesName === item.seriesName)
})
var res =
'<span style="margin-right:18px;"></span>' +
list[0].value[0] +
list[0].name +
'<br/>'
for (var i = 0, l = list.length; i < l; i++) {
list[i].unit =
echartsData.value.options.yAxis[
echartsData.value.options.series[list[i].seriesIndex].yAxisIndex
]?.name
res +=
list[i].seriesName +
' ' +
`<div style="width:16px;height:16px;float:left;background:${list[i].color};border-radius:50%;margin:0 15px"></div>` +
`<div style='float:right;padding-left:20px;'>${list[i].value[1]==null?'':list[i].value[1].toFixed(2)} ${list[i].unit || ''} </div><br/>`
}
return res
}
},
legend: {
//legend使用iconfont图标
data: [],
itemWidth: 20,
itemHeight: 10,
itemGap: 15,
type: 'scroll', // 开启滚动分页
// orient: 'vertical', // 垂直排列
right: '3%', // 位置调整
top: 0,
bottom: 20,
width: 430,
height: 50
},
xAxis: {
type: 'time',
axisLabel: {
formatter: {
day: '{MM}-{dd}',
month: '{MM}',
year: '{yyyy}',
}
},
},
// [
// {
// type: 'category',
// name: '时间',
// axisLabel: {
// color: '#A9AEB2',
// fontSize: 12,
// show: function (index: any, value: any) {
// // 检查数据中是否存在这个时间点
// // return data.some(item:any => item[0] === value)
// }
// },
// nameTextStyle: {
// right: 0
// },
// data: Array.from(new Set(xAxis)),
// axisLine: {
// lineStyle: {
// color: '#43485E'
// }
// }
// }
// ],
yAxis: [
{
type: 'value',
name: unitList[0],
axisLabel: {
color: '#000',
fontSize: 14
},
splitNumber: 5,
minInterval: 1,
axisTick: {
show: true
},
axisLine: {
show: true,
lineStyle: {
color: colorList[0]
}
},
nameTextStyle: {
color: '#000',
fontSize: '14'
},
splitLine: {
show: false,
lineStyle: {
color: ['#43485E'],
width: 1,
type: 'solid'
}
}
}
],
series: []
}
}
//处理多y轴
if (unitList.length != 0 && unitList.length > 1) {
// echartsData.value.options.yAxis[0].yAxisIndex = 0
unitList.map((item: any, index: any) => {
if (index != unitList.length - 1) {
echartsData.value.options.yAxis.push({
type: 'value',
position: 'right',
offset: index * 80, // y轴位置的偏移量
name: unitList[index + 1],
axisLabel: {
color: '#000',
fontSize: 14
},
splitNumber: 5,
minInterval: 1,
axisTick: {
show: true
},
axisLine: {
show: true,
lineStyle: {
color: colorList[index + 1]
}
},
nameTextStyle: {
color: '#000',
fontSize: '14'
},
splitLine: {
show: false,
lineStyle: {
color: ['#43485E'],
width: 1,
type: 'solid'
}
}
})
}
}) })
} }
list.map((item: any, index: any) => { echartsData.value = {
item.map((vv: any, indexs: any) => { legend: {
//处理legend
if (historyDataList.value.length != 0) { itemWidth: 20,
echartsData.value.options.legend.data.push({ itemHeight: 10,
name: vv.phase + '相' + vv.showName, itemGap: 15,
icon: iconThree type: 'scroll', // 开启滚动分页
}) // orient: 'vertical', // 垂直排列
} top: 5,
if ( bottom: 30,
unitList.findIndex((item: any) => { width: 400,
return item == vv.unit height: 50
}) != -1 },
) { tooltip: {
vv.yAxisIndex = unitList.findIndex((item: any) => { axisPointer: {
return item == vv.unit type: 'cross',
}) label: {
} else { color: '#fff',
vv.yAxisIndex = 0 fontSize: 16
} }
},
textStyle: {
color: '#fff',
fontStyle: 'normal',
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.35)',
borderWidth: 0,
formatter(params) {
const xname = params[0].value[0];
let str = `${xname}<br>`;
params.forEach((el, index) => {
str += `${el.marker}${el.seriesName.split('(')[0]}：${el.value[1]}${el.value[2]}<br>`;
});
return str;
},
//series数据
echartsData.value.options.series.push({
name: vv.phase + '相' + vv.showName,
type: 'line', },
smooth: true, color: ['#FFCC00', '#009900', '#CC0000', ...color],
symbol: 'none', xAxis: {
emphasis: { type: 'time',
focus: 'series' axisLabel: {
formatter: {
day: '{MM}-{dd}',
month: '{MM}',
year: '{yyyy}'
}
}
},
yAxis: [{
}],
options: {
series: [
]
}
}
if (chartsList.length > 0) {
echartsData.value.yAxis = []
unitList.forEach((item: any, index: any) => {
let right = {
position: 'right',
offset: (index - 1) * 80,
}
echartsData.value.yAxis.push({
name: item,
yAxisIndex: index,
splitNumber: 5,
minInterval: 1,
splitLine: {
show: false,
}, },
itemStyle: {}, ...(index > 0 ? right : null)
//数据
data: historyDataList.value
.map((kk: any) => {
if (kk.statisticalName == vv.name) {
return [kk.time, kk.statisticalData]
} else {
return ''
}
})
.filter((kk: any) => kk !== ''),
//数据对应的y轴
// yAxisIndex:0,
yAxisIndex: vv.yAxisIndex
}) })
}) })
})
//设置数据项颜色 result.forEach((item: any, index: any) => {
echartsData.value.options.series.map((item: any, index: any) => { let yMethodList: any = []
item.itemStyle = {
normal: { let ABCList = Object.values(item.reduce((acc, item) => {
color: colorList[index], let key = item.phase;
lineStyle: { if (!acc[key]) {
color: colorList[index] acc[key] = [];
} }
} acc[key].push(item);
} return acc;
}) }, {}));
ABCList.forEach((kk: any,) => {
let seriesList: any = []
kk.forEach((cc: any) => {
if (cc.statisticalData) {
yMethodList.push(cc.statisticalData?.toFixed(2) - 0)
}
seriesList.push([cc.time, cc.statisticalData?.toFixed(2),cc.unit])
})
echartsData.value.options.series.push({
name: kk[0].phase + '相' + item[0].anotherName,
type: 'line',
smooth: true,
symbol: 'none',
data: seriesList,
yAxisIndex: index
})
})
let [min, max] = yMethod(yMethodList)
echartsData.value.yAxis[index].min = min
echartsData.value.yAxis[index].max = max
})
}
loading.value = false loading.value = false
} }
}) })

110
src/views/govern/device/planData/index.vue
View File

@@ -424,7 +424,15 @@ const init = (flag: boolean) => {
fontSize: 14 fontSize: 14
}, },
backgroundColor: 'rgba(0,0,0,0.35)', backgroundColor: 'rgba(0,0,0,0.35)',
borderWidth: 0 borderWidth: 0,
formatter(params) {
const xname = params[0].value[0];
let str = `${xname}<br>`;
params.forEach((el, index) => {
str += `${el.marker}${el.seriesName.split('(')[0]}：${el.value[1]}${el.value[2]}<br>`;
});
return str;
},
}, },
color: ['#FFCC00', '#009900', '#CC0000', ...color], color: ['#FFCC00', '#009900', '#CC0000', ...color],
xAxis: { xAxis: {
@@ -448,66 +456,68 @@ const init = (flag: boolean) => {
} }
} }
if (chartsList.length > 0) { if (chartsList.length > 0) {
echartsData.value.yAxis=[] echartsData.value.yAxis = []
unitList.forEach((item: any, index: any) => { unitList.forEach((item: any, index: any) => {
let right = { let right = {
position: 'right', position: 'right',
offset: (index - 1) * 80, offset: (index - 1) * 80,
}
echartsData.value.yAxis.push({
name: item,
yAxisIndex: index,
splitLine: {
show: false,
},
...(index > 0 ? right : null)
})
})
result.forEach((item: any, index: any) => {
let yMethodList: any = []
let ABCList = Object.values(item.reduce((acc, item) => {
let key = item.phase;
if (!acc[key]) {
acc[key] = [];
} }
acc[key].push(item); echartsData.value.yAxis.push({
return acc; name: item,
}, {})); yAxisIndex: index,
ABCList.forEach((kk: any,) => { splitNumber: 5,
let seriesList: any = [] minInterval: 1,
kk.forEach((cc: any) => { splitLine: {
if (cc.statisticalData) { show: false,
yMethodList.push(cc.statisticalData?.toFixed(2) - 0)
},
...(index > 0 ? right : null)
})
})
result.forEach((item: any, index: any) => {
let yMethodList: any = []
let ABCList = Object.values(item.reduce((acc, item) => {
let key = item.phase;
if (!acc[key]) {
acc[key] = [];
} }
acc[key].push(item);
return acc;
}, {}));
ABCList.forEach((kk: any,) => {
let seriesList: any = []
kk.forEach((cc: any) => {
if (cc.statisticalData) {
yMethodList.push(cc.statisticalData?.toFixed(2) - 0)
seriesList.push([cc.time, cc.statisticalData?.toFixed(2)]) }
})
seriesList.push([cc.time, cc.statisticalData?.toFixed(2),cc.unit])
})
echartsData.value.options.series.push({ echartsData.value.options.series.push({
name: kk[0].phase + '相' + item[0].anotherName, name: kk[0].phase + '相' + item[0].anotherName,
type: 'line', type: 'line',
smooth: true, smooth: true,
symbol: 'none', symbol: 'none',
data: seriesList, data: seriesList,
yAxisIndex: index yAxisIndex: index
})
}) })
let [min, max] = yMethod(yMethodList)
echartsData.value.yAxis[index].min = min
echartsData.value.yAxis[index].max = max
}) })
let [min, max] = yMethod(yMethodList) }
echartsData.value.yAxis[index].min = min
echartsData.value.yAxis[index].max = max
})
}
// console.log("🚀 ~ .1111 ~ echartsData.value :", echartsData.value) // console.log("🚀 ~ .1111 ~ echartsData.value :", echartsData.value)

8
src/views/govern/log/debug.vue
View File

@@ -26,7 +26,11 @@ const tableStore = new TableStore({
column: [ column: [
{ title: '设备名称', field: 'devName', align: 'center' }, { title: '设备名称', field: 'devName', align: 'center' },
{ title: '操作用户', field: 'operatorName', align: 'center' }, { title: '操作用户', field: 'operatorName', align: 'center' },
{ title: '操作内容', field: 'processName', align: 'center', width: '300' }, {
title: '操作内容', field: 'process', align: 'center', formatter: (row: any) => {
return row.cellValue == 1 ? '设备登记' : row.cellValue == 2 ? '功能调试' : row.cellValue == 3 ? '出厂调试' : row.cellValue == 4 ? '设备投运' : ''
}
},
{ title: '开始时间', field: 'startTime', align: 'center' }, { title: '开始时间', field: 'startTime', align: 'center' },
{ title: '结束时间', field: 'endTime', align: 'center' } { title: '结束时间', field: 'endTime', align: 'center' }
], ],
@@ -52,5 +56,5 @@ onMounted(() => {
tableStore.index() tableStore.index()
}) })
const addMenu = () => {} const addMenu = () => { }
</script> </script>