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-11-12 14:06:41 +08:00
parent 299301d4f7
commit 27e0dd3abd
10 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/govern/alarm/Transient.vue
View File

@@ -44,7 +44,7 @@
<el-button
v-if="view2"
@click="backbxlb"
type="primary"
class="el-icon-refresh-right"
icon="el-icon-Back"
style="float: right"

2
src/views/govern/analyze/DVR/index.vue
View File

@@ -19,7 +19,7 @@
</div>
</el-col>
<el-col :span="12">
<el-button v-if="view2" @click="backbxlb" type="primary" class="el-icon-refresh-right"
<el-button v-if="view2" @click="backbxlb" class="el-icon-refresh-right"
icon="el-icon-Back" style="float: right">
返回
</el-button>

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

@@ -469,7 +469,7 @@ const deviceId: any = ref('')
const lineId: any = ref('')
const dataLevel: any = ref('')
const nodeClick = async (e: anyObj) => {
console.log("🚀 ~ nodeClick ~ e:", e)
// console.log("🚀 ~ nodeClick ~ e:", e)
if (e.level == 2) return
deviceId.value = e?.pid
lineId.value = e?.id
@@ -585,8 +585,8 @@ const getRealDataMqttMsg = async () => {
// )
let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
if (lineId.value != obj.lineId && adminInfo.userIndex != obj.userId) return
console.log("🚀 ~ mqttRef.value.on ~ obj:", obj)
console.log("🚀 ~ mqttRef.value.on ~ formInline.dataLevel:", obj.dataLevel, formInline.dataLevel)
// console.log("🚀 ~ mqttRef.value.on ~ obj:", obj)
// console.log("🚀 ~ mqttRef.value.on ~ formInline.dataLevel:", obj.dataLevel, formInline.dataLevel)
//处理mqtt数据 1转2除 2转1乘
//如果消息返回值是二次值，下拉框是二次值只需要单位换算 除以1000
@@ -624,36 +624,36 @@ const getRealDataMqttMsg = async () => {
obj = {
...obj,
// 电压有效值
vRmsA: ((obj.vRmsA * obj.pt) || 0) / 1000,
vRmsB: ((obj.vRmsA * obj.pt) || 0) / 1000,
vRmsC: ((obj.vRmsA * obj.pt) || 0) / 1000,
vRmsA: ((obj.vRmsA * obj.pt)) / 1000,
vRmsB: ((obj.vRmsA * obj.pt)) / 1000,
vRmsC: ((obj.vRmsA * obj.pt)) / 1000,
// 电流有效值
iRmsA: (obj.iRmsA * obj.ct) || 0,
iRmsB: (obj.iRmsA * obj.ct) || 0,
iRmsC: (obj.iRmsA * obj.ct) || 0,
iRmsA: (obj.iRmsA * obj.ct),
iRmsB: (obj.iRmsA * obj.ct),
iRmsC: (obj.iRmsA * obj.ct),
//基波电压幅值
v1A: ((obj.v1A * obj.pt) || 0) / 1000,
v1B: ((obj.v1B * obj.pt) || 0) / 1000,
v1C: ((obj.v1C * obj.pt) || 0) / 1000,
v1A: ((obj.v1A * obj.pt)) / 1000,
v1B: ((obj.v1B * obj.pt)) / 1000,
v1C: ((obj.v1C * obj.pt)) / 1000,
//基波电流幅值
i1A: (obj.i1A * obj.ct) || 0,
i1B: (obj.i1B * obj.ct) || 0,
i1C: (obj.i1C * obj.ct) || 0,
i1A: (obj.i1A * obj.ct),
i1B: (obj.i1B * obj.ct),
i1C: (obj.i1C * obj.ct),
//有功功率
pA: ((obj.pA * obj.pt * obj.ct) || 0) / 1000,
pB: ((obj.pB * obj.pt * obj.ct) || 0) / 1000,
pC: ((obj.pC * obj.pt * obj.ct) || 0) / 1000,
pTot: ((obj.pTot * obj.pt * obj.ct) || 0) / 1000,
pA: ((obj.pA * obj.pt * obj.ct)) / 1000,
pB: ((obj.pB * obj.pt * obj.ct)) / 1000,
pC: ((obj.pC * obj.pt * obj.ct)) / 1000,
pTot: ((obj.pTot * obj.pt * obj.ct)) / 1000,
//无功功率
qA: ((obj.qA * obj.pt * obj.ct) || 0) / 1000,
qB: ((obj.qB * obj.pt * obj.ct) || 0) / 1000,
qC: ((obj.qC * obj.pt * obj.ct) || 0) / 1000,
qTot: ((obj.qTot * obj.pt * obj.ct) || 0) / 1000,
qA: ((obj.qA * obj.pt * obj.ct)) / 1000,
qB: ((obj.qB * obj.pt * obj.ct)) / 1000,
qC: ((obj.qC * obj.pt * obj.ct)) / 1000,
qTot: ((obj.qTot * obj.pt * obj.ct)) / 1000,
//视在功率
sA: ((obj.sA * obj.pt * obj.ct) || 0) / 1000,
sB: ((obj.sB * obj.pt * obj.ct) || 0) / 1000,
sC: ((obj.sC * obj.pt * obj.ct) || 0) / 1000,
sTot: ((obj.sTot * obj.pt * obj.ct) || 0) / 1000
sA: ((obj.sA * obj.pt * obj.ct)) / 1000,
sB: ((obj.sB * obj.pt * obj.ct)) / 1000,
sC: ((obj.sC * obj.pt * obj.ct)) / 1000,
sTot: ((obj.sTot * obj.pt * obj.ct)) / 1000
}
}
//如果消息返回值是一次值，下拉框是二次值需要单位换算 乘以1000 并且除以pt ct

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

@@ -25,7 +25,7 @@
</el-button>
</div>
<div :style="tableHeight">
<vxe-table border auto-resize height="auto" :data="offLineFileList" v-bind="defaultAttribute">
<vxe-table border auto-resize height="auto" :data="offLineFileList" v-bind="defaultAttribute" :key="updateKey">
<vxe-column field="name" align="center" title="文件名"></vxe-column>
<vxe-column field="webkitRelativePath" align="center" title="文件地址"></vxe-column>
<vxe-column field="status" align="center" title="状态" width="250">

6
src/views/govern/device/control/tabs/components/harmonicSpectrum.vue
View File

@@ -283,9 +283,11 @@ const setChildRef = (index: any) => {
const childRefs: any = {}
const init = () => {
loading.value = true
searchForm.value.index.map((item: any, index: any) => {
item?.children.map((vv: any, vvs: any) => {
if (mqttMessage.value[vv.name]) {
if (mqttMessage.value[vv.name] !=undefined) {
item.data.push({
// time: mqttMessage.value.dataTime,
value: mqttMessage.value[vv.name],
@@ -301,6 +303,7 @@ const init = () => {
xAixsTimeList.value.push(mqttMessage.value.dataTime.split(" ")[1])
searchForm.value.index.map((item: any, index: any) => {
//循环渲染图表
@@ -360,6 +363,7 @@ const init = () => {
? (height = mainHeight(275, 3).height)
: (height = mainHeight(275, searchForm.value.index.length).height)
item.children.map((zz: any, zzIndex: any) => {
item.echartsData.series.push({
name: zz.phase,
type: 'line',

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

@@ -98,7 +98,7 @@
</el-collapse-item>
</el-collapse>
<div v-if="JSON.stringify(echartsData) != '{}'">
<div v-if="JSON.stringify(echartsData) != '{}' && deviceData?.records?.length != 0">
<h3 class="mt10 mb10">历史趋势</h3>
<div class="history_trend">
<div class="history_header" ref="headerRef">

2
src/views/govern/reportForms/look.vue
View File

@@ -12,7 +12,7 @@
<el-button icon="el-icon-Upload" type="primary" class="mr10">导入excel</el-button>
</el-upload>
<el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出excel</el-button>
<el-button type="primary" icon="el-icon-ArrowLeftBold" @click="emit('shutDown')">返回</el-button>
<el-button icon="el-icon-ArrowLeftBold" @click="emit('shutDown')">返回</el-button>
</div>
<div style="display: flex">

2
src/views/govern/reportForms/luckysheet.vue
View File

@@ -13,7 +13,7 @@
</el-upload>
<el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出excel</el-button>
<el-button type="primary" icon="el-icon-Check" @click="preservation">保存</el-button>
<el-button type="primary" icon="el-icon-ArrowLeftBold" @click="emit('shutDown')">返回</el-button>
<el-button icon="el-icon-ArrowLeftBold" @click="emit('shutDown')">返回</el-button>
</div>
<div style="display: flex">

2
src/views/system/reportForms/look.vue
View File

@@ -12,7 +12,7 @@
<el-button icon="el-icon-Upload" type="primary" class="mr10">导入excel</el-button>
</el-upload>
<el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出excel</el-button>
<el-button type="primary" icon="el-icon-ArrowLeftBold" @click="emit('shutDown')">返回</el-button>
<el-button icon="el-icon-ArrowLeftBold" @click="emit('shutDown')">返回</el-button>
</div>
<div style="display: flex">

2
src/views/system/reportForms/luckysheet.vue
View File

@@ -13,7 +13,7 @@
</el-upload>
<el-button @click="downloadExcel" class="" type="primary" icon="el-icon-Download">导出excel</el-button>
<el-button type="primary" icon="el-icon-Check" @click="preservation">保存</el-button>
<el-button type="primary" icon="el-icon-ArrowLeftBold" @click="emit('shutDown')">返回</el-button>
<el-button icon="el-icon-ArrowLeftBold" @click="emit('shutDown')">返回</el-button>
</div>
<div style="display: flex">