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

修改辽宁反馈问题

Browse Source
This commit is contained in:
guanj
2026-06-23 21:27:15 +08:00
parent ed60e2b7f3
commit 070e404bbb
20 changed files with 2369 additions and 2260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
View File

@@ -491,7 +491,7 @@ const makeUpSubmit = () => {
}, 500)
}
const socket = async (form: any) => {
const url = (localStorage.getItem('WebSocketUrl2') || 'null')//'ws://192.168.1.68:10405/api/recell/'
const url = (localStorage.getItem('WebSocketUrl2') || 'null')//'ws://192.168.1.68:10405/api/recell/')
logList.value = []
await dataSocket.socketServe.connect(`${url}${adminInfo.id}`)
setTimeout(() => {

7
src/views/pqs/harmonicMonitoring/embed/dataOverview_JB/index.vue
View File

@@ -12,6 +12,7 @@
</el-form-item>
</template>
<template v-slot:operation>
<el-button type="primary" icon="el-icon-Search" @click="Search">查询</el-button>
<el-button type="primary" icon="el-icon-Download" @click="exportTemplate">导出</el-button>
</template>
</TableHeader>
@@ -51,6 +52,7 @@
:interval="datePickerRef?.interval"
:w="item.w"
:h="item.h"
:searchKey="searchKey"
/>
<div v-else class="pd10">组件加载失败...</div>
</div>
@@ -114,6 +116,7 @@ const layout: any = ref([
// path: '/src/views/pqs/runManage/assessment/components/uese/index.vue'
// },
])
const searchKey = ref(0)
const layoutCopy: any = ref([])
const flag = ref(true)
// 组件映射
@@ -293,6 +296,10 @@ const fetchLayoutData = async () => {
// 可以添加错误提示逻辑
}
}
const Search = () => {
searchKey.value += 1
}
// 导出
const exportTemplate = () => {
console.log(123)

4069
src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
View File

File diff suppressed because it is too large Load Diff

38
src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
View File

@@ -10,8 +10,14 @@
></PointTree>
</pane>
<pane style="background: #fff" :style="height">
<TableHeader ref="TableHeaderRef" datePicker @selectChange="selectChange">
<TableHeader ref="TableHeaderRef" datePicker :isStatisticData="isStatisticData" @selectChange="selectChange">
<template v-slot:select>
<el-form-item >
<el-radio-group v-model="isStatisticData" @change="onStatisticDataChange">
<el-radio-button value="1">统计数据</el-radio-button>
<el-radio-button value="0">分钟数据</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="模板策略">
<el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
<el-option
@@ -22,22 +28,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="报表类型">
<!-- <el-form-item label="报表类型">
<el-input readonly type="text" value="分析报表"></el-input>
<!-- <el-select-->
<!-- :disabled="true"-->
<!-- v-model="reportForm"-->
<!-- :popper-append-to-body="false"-->
<!-- placeholder="请选择报表类型"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in reportFormList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item>
</el-form-item> -->
</template>
<template #operation>
<el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
@@ -85,6 +79,7 @@ const dotList: any = ref({})
const Template: any = ref({})
const reportForm: any = ref('')
const name = ref('')
const isStatisticData = ref('1')
const templatePolicy: any = ref([])
const reportFormList: any = ref([
{
@@ -108,6 +103,11 @@ const tableStore = new TableStore({
tableStore.table.params.tempId = Template.value.id
tableStore.table.params.lineId = dotList.value.id
name.value = dotList.value.name
if (Number(isStatisticData.value) === 0) {
tableStore.table.params.isStatisticData = 0
} else {
delete tableStore.table.params.isStatisticData
}
},
loadCallback: () => {
tableStore.table.data.forEach((item: any) => {
@@ -160,6 +160,12 @@ getTemplateByDept({ id: dictData.state.area[0].id })
const changetype = (val: any) => {
reportForm.value = val.reportForm
}
const onStatisticDataChange = () => {
TableHeaderRef.value?.setTheDate(3)
if (dotList.value?.id) {
// tableStore.index()
}
}
const selectChange = () => {
//console.log('🚀 ~ selectChange ~ tableStore.table.data.lnegth :', tableStore.table.data.length)
if (tableStore.table.data.length != 0) {

2
src/views/pqs/panorama/components/line/info.vue
View File

@@ -3,7 +3,7 @@
<DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
<el-page-header :icon="ArrowLeft" @back="emit('back')">
<template #content>
<span style="font-size: 16px">{{ dropList.lineName }}详情　</span>
<span style="font-size: 16px">{{ dropList.objName ? dropList.objName + '_' : '' }}{{ dropList.lineName }}详情　</span>
<span style="font-weight: 500">最新数据时间：</span>
<span style="color: var(--color-primary-default)">{{ dropList.updateTime }}</span>
</template>

14
src/views/pqs/panorama/components/map.vue
View File

@@ -7,7 +7,7 @@
v-model.trim="inputQuery"
style="height: 46px; width: 334px"
@keyup.enter="DeviceQ"
placeholder="请输入终端名称"
placeholder="请输入监测点相关信息"
>
<template #prefix>
<div class="Icon"></div>
@@ -37,7 +37,7 @@
@click="flyTo(k)"
>
<p>{{ k.psrName }}</p>
<p>{{ k.vlevelName }}|{{ k.maintOrgName }}</p>
<p>{{ k.vlevelName }} | {{ k.maintOrgName }} {{ k.objName ? `| ${k.objName}` : '' }}</p>
</div>
</div>
</el-collapse-item>
@@ -484,6 +484,9 @@ const lookPoint = (e: any) => {
emit('show', true)
}
// 搜索
const matchLineItem = (item: any, regex: RegExp) =>
regex.test(item.lineName) || (item.objName && regex.test(item.objName))
const DeviceQ = () => {
showCollapse.value = true
if (inputQuery.value.length == 0) return
@@ -491,13 +494,14 @@ const DeviceQ = () => {
let list = []
let regex = new RegExp(inputQuery.value, 'i')
let data = areaLineInfo.value
.filter((item: any) => regex.test(item.lineName))
.filter((item: any) => matchLineItem(item, regex))
.map((item: any) => {
return {
psrName: item.lineName,
vlevelName: item.voltageScale,
maintOrgName: item.gdName,
coordinate: [item.lng, item.lat]
coordinate: [item.lng, item.lat],
objName: item.objName
}
})
// data.replace(//s/g,',')
@@ -522,7 +526,7 @@ const flyTo = (e: any, zoom?: number) => {
zoomMap.value = zoom
} else {
zoomMap.value = 15
let data = areaLineInfo.value.filter((item: any) => regex.test(item.lineName))[0]
let data = areaLineInfo.value.filter((item: any) => matchLineItem(item, regex))[0]
if (data) {
markerClick(data)
}

15
src/views/pqs/panorama/components/mapL.vue
View File

@@ -31,8 +31,8 @@
<div>
<div class="vcl mt2">
<p
v-for="(item, i) in vList"
:style="i == 0 ? 'width: 60px' : i == vList?.length - 1 ? 'width: 32px' : 'flex:1'"
v-for="(item, i) in displayVList"
:style="i == 0 ? 'width: 60px' : i == displayVList?.length - 1 ? IS_LN ? 'flex:1' : 'width: 32px' : 'flex:1'"
>
{{ item }}
</p>
@@ -43,7 +43,7 @@
{{ item.title }}
</p>
<p
v-for="(k, i) in vList?.slice(0, vList.length - 2)"
v-for="(k, i) in dataVList"
class="numOne"
@click="LookMap(item.list[i].numOneList, item.list[i].numTwoList, 0)"
>
@@ -58,7 +58,7 @@
<p class="numOne" @click="LookMap(item.list[3].numOneList, item.list[3].numTwoList, 0)">
{{ item.list[3].numOne }}
</p> -->
<p
<p v-if="!IS_LN"
style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
@click.stop="open(i)"
>
@@ -165,7 +165,7 @@
</template>
<script setup lang="ts">
import { onMounted, reactive, ref, provide } from 'vue'
import { onMounted, reactive, ref, provide, computed } from 'vue'
import { useDictData } from '@/stores/dictData'
import { mainHeight } from '@/utils/layout'
import { ArrowRight, View } from '@element-plus/icons-vue'
@@ -180,6 +180,7 @@ import {
getGridDiagramRunData, getAreaObjAlarm
} from '@/api/device-boot/panorama'
const emit = defineEmits(['LookMap', 'GridDiagram'])
const IS_LN = import.meta.env.VITE_NAME == 'LN' || import.meta.env.VITE_NAME == 'LNqr'
const dictData = useDictData()
const show = ref(false)
const standRef = ref()
@@ -391,6 +392,10 @@ const legengList = [
]
const panoramicVoltage: any = dictData.getBasicData('Dev_Voltage_Stand')
const vList = ref(['', '500kV', '220kV', '110kV', '35kV', ''])
const displayVList = computed(() => (IS_LN && vList.value.length ? vList.value.slice(0, -1) : vList.value))
const dataVList = computed(() =>
IS_LN ? vList.value.slice(1, -1) : vList.value.slice(0, vList.value.length - 2)
)
const formRow: any = ref({})
const height = mainHeight(30)
const boxHeight = mainHeight(290, 2)

136
src/views/pqs/runManage/runEvaluate/index_JB.vue
View File

@@ -4,12 +4,8 @@
<template v-slot:select>
<el-form-item label="运行状态">
<el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
<el-option
v-for="item in runFlagList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
<el-option v-for="item in runFlagList" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="筛选数据">
@@ -40,14 +36,8 @@
</div>
</template>
<div class="mb5" style="height: 40px">
<el-segmented
style="height: 100%"
v-model="segmented"
:props="props"
:options="segmentedList"
block
@change="tableStore.index()"
>
<el-segmented style="height: 100%" v-model="segmented" :props="props" :options="segmentedList"
block @change="tableStore.index()">
<template #default="scope">
<div>
<div>{{ scope.item.name }}</div>
@@ -61,8 +51,8 @@
segmented == 'Power_Network'
? '区域'
: segmented == 'Manufacturer'
? '终端厂家'
: '电网标志'
? '终端厂家'
: '电网标志'
}}
</span>
<span style="width: 90px">终端总数</span>
@@ -77,33 +67,21 @@
{{ o.name }}
</span>
<!-- 终端总数 -->
<span
style="width: 90px; color: #388e3c"
class="text text-style"
@click="renderTable(o.list, o.name + '_')"
>
<span style="width: 90px; color: #388e3c" class="text text-style"
@click="renderTable(o.list, o.name + '_')">
{{ o.count }}
</span>
<!-- -->
<span
style="flex: 1; color: #388e3c"
class="text"
:class="` ${o.integrity < 90 ? 'text-red' : ''}`"
>
<span style="flex: 1; color: #388e3c" class="text"
:class="` ${o.integrity < 90 ? 'text-red' : ''}`">
{{ o.integrity }}
</span>
<span
style="width: 80px; color: #388e3c"
:class="` ${o.online < 90 ? 'text-red' : ''}`"
class="text"
>
<span style="width: 80px; color: #388e3c" :class="` ${o.online < 90 ? 'text-red' : ''}`"
class="text">
{{ o.online }}
</span>
<span
style="width: 80px; color: #388e3c"
:class="` ${o.qualified > 10 ? 'text-red' : ''}`"
class="text"
>
<span style="width: 80px; color: #388e3c" :class="` ${o.qualified > 10 ? 'text-red' : ''}`"
class="text">
{{ o.qualified }}
</span>
</div>
@@ -120,13 +98,8 @@
<!--表格-->
<div :style="{ height: tableStore.table.height }" v-loading="loading">
<vxe-table
height="auto"
:data="dataList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
v-bind="defaultAttribute"
ref="tableRef"
:scroll-y="{ enabled: true }"
>
<vxe-table height="auto" :data="dataList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
v-bind="defaultAttribute" ref="tableRef" :scroll-y="{ enabled: true }">
<vxe-column type="seq" title="序号" width="80px">
<template #default="{ rowIndex }">
<span>
@@ -146,19 +119,16 @@
<vxe-column field="ip" title="终端IP" :formatter="formatter" width="120px"></vxe-column>
<vxe-column field="runFlag" title="运行状态" width="100px">
<template #default="{ row }">
<el-tag
:type="
row.runFlag == '运行'
? 'success'
: row.runFlag == '停运'
<el-tag :type="row.runFlag == '运行'
? 'success'
: row.runFlag == '停运'
? 'danger'
: row.runFlag == '检修'
? 'warning'
: row.runFlag == '调试'
? 'warning'
: 'danger'
"
>
? 'warning'
: row.runFlag == '调试'
? 'warning'
: 'danger'
">
{{ row.runFlag }}
</el-tag>
</template>
@@ -169,14 +139,9 @@
</vxe-table>
</div>
<div class="table-pagination">
<el-pagination
v-model:currentPage="pageNum"
v-model:page-size="pageSize"
:page-sizes="[10, 20, 50, 100, 200]"
background
layout="sizes,total, ->, prev, pager, next, jumper"
:total="dataList.length"
></el-pagination>
<el-pagination v-model:currentPage="pageNum" v-model:page-size="pageSize"
:page-sizes="[10, 20, 50, 100, 200]" background
layout="sizes,total, ->, prev, pager, next, jumper" :total="dataList.length"></el-pagination>
</div>
</el-card>
</div>
@@ -187,7 +152,7 @@
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { onMounted, provide, ref, nextTick } from 'vue'
import { defaultAttribute } from '@/components/table/defaultAttribute'
import { useDictData } from '@/stores/dictData'
import { mainHeight } from '@/utils/layout'
@@ -273,7 +238,7 @@ const tableStore = new TableStore({
if (tableStore.table.params.statisticalType.name == '终端厂家') {
return k.count != 0
} else {
return !k.citName.includes('上送')
return !k.name.includes('上送')
}
})
// 合并子集数据 并去重
@@ -465,15 +430,9 @@ const onExport = () => {
})
}
onMounted(() => {
// TableHeaderRef.value.setDatePicker([
// { label: '年份', value: 1 },
// { label: '季度', value: 2 },
// { label: '月份', value: 3 }
// ])
// 加载数据
tableStore.index()
nextTick(() => {
TableHeaderRef.value?.onComSearch()
})
})
tableStore.table.params.name = ''
@@ -482,14 +441,17 @@ provide('tableStore', tableStore)
<style lang="scss" scoped>
.card-list {
display: flex;
.monitoringPoints {
width: 460px;
position: relative;
.statistics {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
margin-bottom: 10px;
.divBox {
width: 215x;
height: 70px;
@@ -500,33 +462,41 @@ provide('tableStore', tableStore)
font-size: 40px;
margin-right: 5px;
}
.divBox_title {
font-weight: 550;
}
.divBox_num {
font-size: 20px;
font-weight: 550;
margin-left: auto;
font-family: AlimamaDongFangDaKai;
}
align-items: center;
// text-align: center;
border-radius: 5px;
&:nth-child(1) {
background-color: #eef8f0;
}
&:nth-child(2) {
background-color: #fff6ed;
}
&:nth-child(3) {
background-color: #e5f8f6;
}
}
}
}
.detail {
flex: 1;
}
.abnormal {
width: 100%;
background-color: #f3f6f9;
@@ -535,9 +505,11 @@ provide('tableStore', tableStore)
// justify-content: space-between;
align-items: center;
padding: 5px 0px 5px 10px;
.iconDiv {
display: flex;
align-items: center;
div {
width: 4px;
height: 18px;
@@ -545,6 +517,7 @@ provide('tableStore', tableStore)
background-color: var(--el-color-primary);
}
}
.text {
font-weight: 700;
font-size: 16px;
@@ -555,6 +528,7 @@ provide('tableStore', tableStore)
}
}
}
.header {
display: flex;
text-align: center;
@@ -562,40 +536,50 @@ provide('tableStore', tableStore)
font-weight: 700;
padding: 5px;
}
:deep(.el-card__header) {
padding: 10px;
span {
font-weight: 600;
}
}
:deep(.el-card__body) {
padding: 10px;
}
.iconFont {
font-size: 18px;
display: inline-block;
vertical-align: middle;
}
.form {
position: relative;
.form_but {
position: absolute;
right: -22px;
}
}
.card-header {
font-size: 16px;
}
:deep(.table_name) {
color: var(--el-color-primary);
cursor: pointer;
text-underline-offset: 4px;
}
.echartTitle {
display: flex;
justify-content: space-between;
font-size: 14px;
font-weight: 600;
div:nth-child(2) {
font-size: 16px;
color: #ff6600;
@@ -605,20 +589,25 @@ provide('tableStore', tableStore)
:deep(.el-segmented__item-selected, ) {
clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
}
:deep(.el-segmented__item, ) {
clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
position: relative;
}
:deep(.el-segmented) {
clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
}
.text-red {
color: #ff9100 !important;
}
.text-style {
cursor: pointer;
text-decoration: underline;
}
.segmentedIcon {
position: absolute;
top: 1px;
@@ -631,6 +620,7 @@ provide('tableStore', tableStore)
color: #fff;
border-radius: 8px;
}
.table-pagination {
height: 58px;
box-sizing: border-box;