修改辽宁反馈问题

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

6
.env.LN Normal file
View File

@@ -0,0 +1,6 @@
# 辽宁嵌入
NODE_ENV = LN
VITE_NAME="LN"
# 电网一张图 地图图层
VITE_NARIMAP=null
VITE_NRGISCOMMON=null

View File

@@ -8,12 +8,14 @@
"dev:jibei": "vite --mode jibei",
"dev:hainan": "vite --mode hainan",
"dev:qujing": "vite --mode qujing",
"dev:LN": "vite --mode LN",
"dev:LNqr": "vite --mode LNqr",
"dev:removeMode": "vite --mode removeMode",
"build": "vite build --mode dev",
"build:jibei": "vite build --mode jibei",
"build:hainan": "vite build --mode hainan",
"build:qujing": "vite build --mode qujing",
"build:LN": "vite build --mode LN",
"build:LNqr": "vite build --mode LNqr",
"build:removeMode": "vite build --mode removeMode",
"preview": "vite preview"

View File

@@ -126,7 +126,8 @@ const prop = defineProps({
width: { type: [String, Number] },
height: { type: [String, Number] },
timeKey: { type: [String, Number] },
timeValue: { type: Object }
timeValue: { type: Object },
searchKey: { type: [String, Number] }
})
const headerHeight = ref(57)
@@ -347,22 +348,22 @@ onMounted(() => {
tableStore.index()
})
watch(
() => prop.timeKey,
() => prop.searchKey,
val => {
tableStore.index()
}
)
watch(
() => prop.timeValue,
// watch(
// () => prop.timeValue,
val => {
tableStore.index()
},
// val => {
// tableStore.index()
// },
{
deep: true
}
)
// {
// deep: true
// }
// )
</script>
<style lang="scss" scoped>
@import '@/assets/font/iconfont.css';

View File

@@ -122,7 +122,8 @@ const prop = defineProps({
width: { type: [String, Number] },
height: { type: [String, Number] },
timeKey: { type: [String, Number] },
timeValue: { type: Object }
timeValue: { type: Object },
searchKey: { type: [String, Number] }
})
const headerHeight = ref(57)
@@ -329,22 +330,22 @@ onMounted(() => {
tableStore.index()
})
watch(
() => prop.timeKey,
() => prop.searchKey,
val => {
tableStore.index()
}
)
watch(
() => prop.timeValue,
// watch(
// () => prop.timeValue,
val => {
tableStore.index()
},
// val => {
// tableStore.index()
// },
{
deep: true
}
)
// {
// deep: true
// }
// )
</script>
<style lang="scss" scoped>
@import '@/assets/font/iconfont.css';

View File

@@ -7,7 +7,8 @@
@selectChange="selectChange"
datePicker
v-if="fullscreen"
></TableHeader>
>
</TableHeader>
<div
class="monitoringPoints"
:style="{
@@ -120,7 +121,8 @@ const prop = defineProps({
width: { type: [String, Number] },
height: { type: [String, Number] },
timeKey: { type: [String, Number] },
timeValue: { type: Object }
timeValue: { type: Object },
searchKey: { type: [String, Number] }
})
const headerHeight = ref(57)
@@ -328,22 +330,22 @@ onMounted(() => {
tableStore.index()
})
watch(
() => prop.timeKey,
() => prop.searchKey,
val => {
tableStore.index()
}
)
watch(
() => prop.timeValue,
// watch(
// () => prop.timeValue,
val => {
tableStore.index()
},
// val => {
// tableStore.index()
// },
{
deep: true
}
)
// {
// deep: true
// }
// )
</script>
<style lang="scss" scoped>
@import '@/assets/font/iconfont.css';

View File

@@ -150,7 +150,8 @@ const prop = defineProps({
width: { type: [String, Number] },
height: { type: [String, Number] },
timeKey: { type: [String, Number] },
timeValue: { type: Object }
timeValue: { type: Object },
searchKey: { type: [String, Number] }
})
const headerHeight = ref(57)
@@ -233,7 +234,7 @@ const tableStore: any = new TableStore({
if (tableStore.table.params.statisticalType.name == '终端厂家') {
return k.count != 0
} else {
return !k.citName.includes('上送')
return !k.name.includes('上送')
}
})
}
@@ -246,22 +247,28 @@ onMounted(() => {
tableStore.index()
})
watch(
() => prop.timeKey,
() => prop.searchKey,
val => {
tableStore.index()
}
)
watch(
() => prop.timeValue,
// watch(
// () => prop.timeKey,
// val => {
// tableStore.index()
// }
// )
// watch(
// () => prop.timeValue,
val => {
tableStore.index()
},
// val => {
// tableStore.index()
// },
{
deep: true
}
)
// {
// deep: true
// }
// )
</script>
<style lang="scss" scoped>
@import '@/assets/font/iconfont.css';

View File

@@ -1,22 +1,22 @@
<template>
<div style="width: 540px">
<div :style="{ width: isMinuteData ? '750px' : '610px' }">
<el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange">
<el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-date-picker
v-model="timeValue"
type="daterange"
:type="pickerType"
:disabled="disabledPicker"
:disabled-date="isFutureDate"
style="width: 220px; margin-right: 10px"
:style="{ width: isMinuteData ? '360px' : '220px', marginRight: '10px' }"
unlink-panels
:clearable="false"
range-separator=""
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
:shortcuts="shortcuts"
:start-placeholder="isMinuteData ? '开始时间' : '开始日期'"
:end-placeholder="isMinuteData ? '结束时间' : '结束日期'"
:value-format="pickerValueFormat"
:shortcuts="isMinuteData ? undefined : shortcuts"
/>
<el-button :disabled="backDisabled" type="primary" :icon="DArrowLeft" @click="preClick"></el-button>
<el-button type="primary" :icon="VideoPause" @click="nowTime">当前</el-button>
@@ -26,18 +26,41 @@
<script lang="ts" setup>
import { DArrowLeft, VideoPause, DArrowRight } from '@element-plus/icons-vue'
import { ref, onMounted, nextTick, watch } from 'vue'
import { ref, onMounted, computed, watch } from 'vue'
interface Props {
nextFlag?: boolean
theCurrentTime?: boolean
isStatisticData?: number | string
}
const props = withDefaults(defineProps<Props>(), {
nextFlag: false,
theCurrentTime: false
theCurrentTime: false,
isStatisticData: 1
})
const isMinuteData = computed(() => Number(props.isStatisticData) === 0)
const pickerType = computed(() => (isMinuteData.value ? 'datetimerange' : 'daterange'))
const pickerValueFormat = computed(() => (isMinuteData.value ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))
const toDatePart = (value: string) => (value?.includes(' ') ? value.split(' ')[0] : value)
const toMinuteStart = (date: string) => `${toDatePart(date)} 00:00:00`
const toMinuteEnd = (date: string) => `${toDatePart(date)} 23:59:59`
const normalizeRange = (start: string, end: string) => {
if (!isMinuteData.value) {
return [toDatePart(start), toDatePart(end)]
}
return [toMinuteStart(start), toMinuteEnd(end)]
}
const setRangeValue = (start: string, end: string) => {
timeValue.value = normalizeRange(start, end)
}
const interval = ref(3)
const timeFlag = ref(1)
const count = ref(0)
@@ -95,13 +118,13 @@ const timeChange = (e: number) => {
if (e == 1) {
disabledPicker.value = true
timeValue.value = [setTime(1), setTime()]
setRangeValue(setTime(1), setTime())
} else if (e == 2) {
disabledPicker.value = true
timeValue.value = [setTime(2), setTime()]
setRangeValue(setTime(2), setTime())
} else if (e == 3) {
disabledPicker.value = true
timeValue.value = [setTime(3), setTime()]
setRangeValue(setTime(3), setTime())
} else if (e == 4) {
let year = parseInt(setTime().substring(0, 4))
let month = parseInt(setTime().substring(5, 7))
@@ -111,12 +134,12 @@ const timeChange = (e: number) => {
var dayOfWeek = start.getDay() == 0 ? 7 : start.getDay() - 1 // 如果为周日则置为7天
disabledPicker.value = true
timeValue.value = [setTime(0, dayOfWeek), setTime(0, -6 + dayOfWeek)]
setRangeValue(setTime(0, dayOfWeek), setTime(0, -6 + dayOfWeek))
} else if (e == 5) {
disabledPicker.value = false
backDisabled.value = true
preDisabled.value = props.nextFlag ? false : true
timeValue.value = [setTime(), setTime()]
setRangeValue(setTime(), setTime())
}
if (e == 1 || e == 2) {
timeFlag.value = 0
@@ -186,7 +209,7 @@ const preClick = () => {
startTime = year + '-01-01'
endTime = year + '-12-31'
}
timeValue.value = [startTime, endTime]
setRangeValue(startTime, endTime)
// 判断向后键的状态
// var temp = NowgetEndTime()
@@ -415,16 +438,27 @@ const next = () => {
}
if (!props.nextFlag) {
if (
new Date(endTime + ' 00:00:00').getTime() >=
new Date(toDatePart(endTime) + ' 00:00:00').getTime() >=
new Date(window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd ') + ' 00:00:00').getTime()
) {
preDisabled.value = props.nextFlag ? false : true
}
}
timeValue.value = [startTime, endTime]
setRangeValue(startTime, endTime)
}
watch(
() => props.isStatisticData,
() => {
if (timeValue.value?.length === 2) {
setRangeValue(timeValue.value[0], timeValue.value[1])
} else {
timeChange(interval.value)
}
}
)
const setTime = (flag = 0, e = 0) => {
let dd = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'dd')

View File

@@ -3,13 +3,14 @@
<div class="table-header ba-scroll-style">
<el-form style="flex: 1; height: 32px; display: flex; flex-wrap: wrap" ref="headerForm" @submit.prevent=""
@keyup.enter="onComSearch" label-position="left" :inline="true">
<el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 630px">
<el-form-item v-if="datePicker" style="grid-column: span 2; "
:style="{ maxWidth: isStatisticData == 0 ? '750px' : '610px' }">
<template #label>
<el-checkbox v-if="showTimeAll" v-model="timeAll" label="统计时间" />
<span v-else>{{ dateLabel }}</span>
</template>
<DatePicker ref="datePickerRef" v-if="timeAll" :nextFlag="nextFlag"
:theCurrentTime="theCurrentTime"></DatePicker>
<DatePicker ref="datePickerRef" v-if="timeAll" :nextFlag="nextFlag" :theCurrentTime="theCurrentTime"
:isStatisticData="isStatisticData"></DatePicker>
</el-form-item>
<el-form-item label="区域" v-if="area">
@@ -72,6 +73,7 @@ interface Props {
showExport?: boolean //导出控制
showTimeAll?: boolean //控制时间是否显示
dateLabel?: string //设置时间名称
isStatisticData?: number | string // 0分钟数据 1统计数据
}
const props = withDefaults(defineProps<Props>(), {
@@ -83,7 +85,8 @@ const props = withDefaults(defineProps<Props>(), {
showReset: true,
showExport: false,
showTimeAll: false,
dateLabel: '统计日期'
dateLabel: '统计日期',
isStatisticData: 1
})
// 动态计算table高度
const resizeObserver = new ResizeObserver(entries => {

View File

@@ -37,21 +37,21 @@ const setupAll = async () => {
const app = createApp(App)
//开启离线地图
app.use(BaiduMapOffline, {
offline: true,
offlineConfig: {
imgext: '.png',
customstyle: '',
tiles_dir: '',
tiles_hybrid: '',
tiles_self: '',
tiles_v_dir: '',
tiles_satellite_dir: '',
tiles_road_dir: '',
tiles_v_road_dir: '',
home: './plugin/offline/'
}
})
// app.use(BaiduMapOffline, {
// offline: true,
// offlineConfig: {
// imgext: '.png',
// customstyle: '',
// tiles_dir: '',
// tiles_hybrid: '',
// tiles_self: '',
// tiles_v_dir: '',
// tiles_satellite_dir: '',
// tiles_road_dir: '',
// tiles_v_road_dir: '',
// home: './plugin/offline/'
// }
// })
app.use(BaiduMap, {
// ak: 'Yp57V71dkOPiXjiN8VdcFRsVELzlVNKK',
ak: 'RpQi6WNFZ9tseKzhdwOQsXwFsoVntnsN',

View File

@@ -53,82 +53,23 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
export const yMethod = (arr: any) => {
let num = 0.2
let numList = dataProcessing(arr)
let maxValue = 0
let minValue = 0
let max = 0
if (numList.length === 0) {
return [0, 0]
}
const maxValue = Math.max(...numList)
const minValue = Math.min(...numList)
let min = 0
maxValue = Math.max(...numList)
minValue = Math.min(...numList)
const o = maxValue - minValue == 0 ? maxValue : maxValue - minValue
let max = 0
// 一正一负时各自按绝对值范围计算,不用 max - min 作为跨度
if (maxValue > 0 && minValue < 0) {
min = calculateValue(Math.abs(minValue), minValue, num, true)
max = calculateValue(Math.abs(maxValue), maxValue, num, false)
} else {
const o = maxValue - minValue === 0 ? maxValue : maxValue - minValue
min = calculateValue(o, minValue, num, true)
max = calculateValue(o, maxValue, num, false)
// if (-100 >= minValue) {
// min = Math.floor((minValue + num * minValue) / 100) * 100
// } else if (-10 >= minValue && minValue > -100) {
// min = Math.floor((minValue + num * minValue) / 10) * 10
// } else if (-1 >= minValue && minValue > -10) {
// min = Math.floor(minValue + num * minValue)
// } else if (0 > minValue && minValue > -1) {
// min = parseFloat((minValue + num * minValue).toFixed(1))
// } else if (minValue == 0) {
// min = 0
// } else if (0 < minValue && minValue < 1) {
// min = parseFloat((minValue - num * minValue).toFixed(1))
// } else if (1 <= minValue && minValue < 10) {
// min = Math.floor(minValue - num * minValue)
// } else if (10 <= minValue && minValue < 100) {
// min = Math.floor((minValue - num * minValue) / 10) * 10
// } else if (100 <= minValue) {
// min = Math.floor((minValue - num * minValue) / 100) * 100
// }
// if (-100 >= maxValue) {
// max = Math.ceil((maxValue - num * maxValue) / 100) * 100
// } else if (-10 >= maxValue && maxValue > -100) {
// max = Math.ceil((maxValue - num * maxValue) / 10) * 10
// } else if (-1 >= maxValue && maxValue > -10) {
// max = Math.ceil(maxValue - num * maxValue)
// } else if (0 > maxValue && maxValue > -1) {
// max = parseFloat((maxValue - num * maxValue).toFixed(1))
// } else if (maxValue == 0) {
// max = 0
// } else if (0 < maxValue && maxValue < 1) {
// max = parseFloat((maxValue + num * maxValue).toFixed(1))
// } else if (1 <= maxValue && maxValue < 10) {
// max = Math.ceil(maxValue + num * maxValue)
// } else if (10 <= maxValue && maxValue < 100) {
// max = Math.ceil((maxValue + num * maxValue) / 10) * 10
// } else if (100 <= maxValue) {
// max = Math.ceil((maxValue + num * maxValue) / 100) * 100
// }
// if (maxValue > 1000 || minValue < -1000) {
// max = Math.ceil(maxValue / 100) * 100
// if (minValue == 0) {
// min = 0
// } else {
// min = Math.floor(minValue / 100) * 100
// }
// } else if (maxValue < 60 && minValue > 40) {
// max = 60
// min = 40
// } else if (maxValue == minValue && maxValue < 10 && minValue > 0) {
// max = Math.ceil(maxValue / 10) * 10
// min = Math.floor(minValue / 10) * 10
// } else if (maxValue == minValue && maxValue != 0 && minValue != 0) {
// max = Math.ceil(maxValue / 10 + 1) * 10
// min = Math.floor(minValue / 10 - 1) * 10
// } else {
// max = Math.ceil(maxValue / 10) * 10
// min = Math.floor(minValue / 10) * 10
// }
// if (maxValue > 0 && maxValue < 1) {
// max = 1
// } else if (max == 0 && minValue > -1 && minValue < 0) {
// min = -1
// }
}
return [min, max]
}

View File

@@ -150,18 +150,21 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
if (IS_LN_VERSION) {
//辽宁版本
return lnRefreshTokenTo().then(res => {
return lnRefreshTokenTo()
.then(res => {
adminInfo.setToken(res.data.access_token, 'auth')
adminInfo.setToken(res.data.refresh_token, 'refresh')
window.requests.forEach(cb => cb(res.data.access_token))
window.requests = []
return Axios(response.config)
}).catch(err => {
})
.catch(err => {
// refresh_token + CAS 都过期 → 重新走CAS登录
window.location.href = '/api/pqs-auth/oauth/lnCheck'
return Promise.reject(err)
}).finally(() => {
})
.finally(() => {
window.tokenRefreshing = false
})
} else {
@@ -185,7 +188,6 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
window.tokenRefreshing = false
})
}
} else {
return new Promise(resolve => {
// 用函数形式将 resolve 存入,等待刷新后再执行

View File

@@ -110,7 +110,8 @@ export default class SocketService {
}
} else {
this.callBackMapping['message']!({ Flag: false })
// ElMessage.error(event.data)
if(event.data == 'connect')return
ElMessage.error(event.data)
}
}

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(() => {

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)

View File

@@ -10,53 +10,30 @@
<DatePicker ref="datePickerRef" :theCurrentTime="true"></DatePicker>
</el-form-item>
<el-form-item label="指标类型:">
<el-select
v-model="formData.condition"
multiple
collapse-tags
:multiple-limit="checked ? 1 : 3"
filterable
placeholder="请选择指标"
@change="conditionChange"
>
<el-select v-model="formData.condition" multiple collapse-tags :multiple-limit="checked ? 1 : 3"
filterable placeholder="请选择指标" @change="conditionChange">
<el-option-group v-for="group in indexOptions" :key="group.label" :label="group.label">
<el-option
v-for="item in group.options"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-option v-for="item in group.options" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-option-group>
</el-select>
</el-form-item>
<el-form-item label="数值类型:">
<el-select style="width: 100%" v-model="formData.valueType" placeholder="请选择类型">
<el-option
v-for="item in typeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-option v-for="item in typeOptions" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="谐波次数:" v-show="showXieBoCiShu">
<el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波">
<el-option
v-for="item in harmonicOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-option v-for="item in harmonicOptions" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="showJianXieBoCiShu" label="间谐波次数:">
<el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波">
<el-option
v-for="item in inharmonicOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-option v-for="item in inharmonicOptions" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</template>
@@ -67,21 +44,10 @@
<!-- <el-form :inline="true">
</el-form> -->
<div
id="canvas"
class="mt10"
:style="height1"
style="overflow-y: auto; overflow-x: hidden"
v-loading="loading"
>
<my-echart
:options="item.option"
v-for="item in list"
style="min-height: 190px"
:style="height"
@triggerPoint="triggerPoint"
@group="group"
/>
<div id="canvas" class="mt10" :style="height1" style="overflow-y: auto; overflow-x: hidden"
v-loading="loading">
<my-echart :options="item.option" v-for="item in list" style="min-height: 190px" :style="height"
@triggerPoint="triggerPoint" @group="group" />
</div>
</div>
<div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
@@ -232,8 +198,8 @@ const shujuchuli = (res: any) => {
let cvalue = []
let topLimit = []
let lowerLimit = []
item.maxValue = item.topLimit
item.minValue = item.lowerLimit
item.maxValue = (item.topLimit > item.maxValue ? item.topLimit : item.maxValue)
item.minValue = (item.lowerLimit < item.minValue ? item.lowerLimit : item.minValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -270,7 +236,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([
item.eventDetail[k].time,
item.minValue.toFixed(3),
(0).toFixed(3),
item.eventDetail[k].id,
99
])
@@ -293,6 +259,7 @@ const shujuchuli = (res: any) => {
lowerLimit: lowerLimit,
chufa: chufa
}
list.value.push(shuju)
}
//图列为频率等,暂降,上限,下限
@@ -300,8 +267,8 @@ const shujuchuli = (res: any) => {
let gvalue = []
let topLimit = []
let lowerLimit = []
item.maxValue = item.topLimit
item.minValue = item.lowerLimit
item.maxValue = (item.topLimit > item.maxValue ? item.topLimit : item.maxValue)
item.minValue = (item.lowerLimit < item.minValue ? item.lowerLimit : item.minValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -324,7 +291,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([
item.eventDetail[k].time,
item.minValue.toFixed(3),
(0).toFixed(3),
item.eventDetail[k].id,
99
])
@@ -378,7 +345,7 @@ const shujuchuli = (res: any) => {
let bvalue = []
let cvalue = []
let topLimit = []
item.maxValue = item.topLimit
item.maxValue = (item.topLimit > item.maxValue ? item.topLimit : item.maxValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -414,7 +381,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([
item.eventDetail[k].time,
item.minValue.toFixed(3),
(0).toFixed(3),
item.eventDetail[k].id,
99
])
@@ -442,7 +409,7 @@ const shujuchuli = (res: any) => {
if (item.phaiscType.length == 3) {
let gvalue = []
let topLimit = []
item.maxValue = item.topLimit
item.maxValue = (item.topLimit > item.maxValue ? item.topLimit : item.maxValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -462,7 +429,7 @@ const shujuchuli = (res: any) => {
//不存在一个暂降点或1个 //处理暂降点
if (item.eventDetail.length > 0) {
for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
chufa.push([item.eventDetail[k].time, (0).toFixed(3)])
}
}
let shuju = {
@@ -512,7 +479,7 @@ const shujuchuli = (res: any) => {
let bvalue = []
let cvalue = []
let lowerLimit = []
item.minValue = item.lowerLimit
item.minValue = (item.lowerLimit < item.minValue ? item.lowerLimit : item.minValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -546,7 +513,7 @@ const shujuchuli = (res: any) => {
//不存在一个暂降点或1个 //处理暂降点
if (item.eventDetail.length > 0) {
for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
chufa.push([item.eventDetail[k].time, (0).toFixed(3)])
}
}
let shuju = {
@@ -571,7 +538,7 @@ const shujuchuli = (res: any) => {
if (item.phaiscType.length == 3) {
let gvalue = []
let lowerLimit = []
item.minValue = item.lowerLimit
item.minValue = (item.lowerLimit < item.minValue ? item.lowerLimit : item.minValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -591,7 +558,7 @@ const shujuchuli = (res: any) => {
//不存在一个暂降点或1个 //处理暂降点
if (item.eventDetail.length > 0) {
for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
chufa.push([item.eventDetail[k].time, (0).toFixed(3)])
}
}
let shuju = {
@@ -632,6 +599,7 @@ const shujuchuli = (res: any) => {
}
//无限值
if (item.topLimit == 0 && item.lowerLimit == 0) {
if (item.minValue !== null && item.maxValue !== null) {
//最小值等于下限值
//图列为A,B,C,暂降
@@ -672,7 +640,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([
item.eventDetail[k].time,
item.minValue.toFixed(3),
(0).toFixed(3),
item.eventDetail[k].id,
99
])
@@ -717,7 +685,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([
item.eventDetail[k].time,
item.minValue.toFixed(3),
(0).toFixed(3),
item.eventDetail[k].id,
99
])
@@ -772,8 +740,8 @@ const shujuchuli = (res: any) => {
let cvalue = []
let topLimit = []
let lowerLimit = []
item.maxValue = item.topLimit
item.minValue = item.lowerLimit
item.maxValue = (item.topLimit > item.maxValue ? item.topLimit : item.maxValue)
item.minValue = (item.lowerLimit < item.minValue ? item.lowerLimit : item.minValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -828,8 +796,8 @@ const shujuchuli = (res: any) => {
let gvalue = []
let topLimit = []
let lowerLimit = []
item.maxValue = item.topLimit
item.minValue = item.lowerLimit
item.maxValue = (item.topLimit > item.maxValue ? item.topLimit : item.maxValue)
item.minValue = (item.lowerLimit < item.minValue ? item.lowerLimit : item.minValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -895,7 +863,7 @@ const shujuchuli = (res: any) => {
let bvalue = []
let cvalue = []
let topLimit = []
item.maxValue = item.topLimit
item.maxValue = (item.topLimit > item.maxValue ? item.topLimit : item.maxValue)
// item.minValue=item.lowerLimit
//判断数据是否存在
if (item.value !== null) {
@@ -948,7 +916,7 @@ const shujuchuli = (res: any) => {
if (item.phaiscType.length == 2) {
let gvalue = []
let topLimit = []
item.maxValue = item.topLimit
item.maxValue = (item.topLimit > item.maxValue ? item.topLimit : item.maxValue)
// item.minValue=item.lowerLimit
//判断数据是否存在
if (item.value !== null) {
@@ -1013,7 +981,7 @@ const shujuchuli = (res: any) => {
let cvalue = []
let lowerLimit = []
// item.maxValue=item.topLimit
item.minValue = item.lowerLimit
item.minValue = (item.lowerLimit < item.minValue ? item.lowerLimit : item.minValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -1066,7 +1034,7 @@ const shujuchuli = (res: any) => {
let gvalue = []
let lowerLimit = []
// item.maxValue=item.topLimit
item.minValue = item.lowerLimit
item.minValue = (item.lowerLimit < item.minValue ? item.lowerLimit : item.minValue)
//判断数据是否存在
if (item.value !== null) {
for (let j = 0; j < item.value.length; j++) {
@@ -1227,19 +1195,85 @@ const shujuchuli = (res: any) => {
})
rendering()
}
const getSeriesDataValues = (data: any[]) => {
if (!data?.length) return []
return data
.map(d => (Array.isArray(d) && d[1] != null && d[1] !== '' ? Number(d[1]) : null))
.filter((v): v is number => v != null && !Number.isNaN(v))
}
const buildItemYAxis = (item: any) => {
if (item.useDualAxis && item.serise?.length) {
const uniqueUnits = [...new Set(item.units.filter((u: string) => u != null && u !== ''))] as string[]
const valuesByUnit: Record<string, number[]> = {}
uniqueUnits.forEach(u => {
valuesByUnit[u] = []
})
item.serise.forEach((s: any) => {
const axisIdx = s.yAxisIndex ?? 0
const unit = uniqueUnits[axisIdx]
if (unit) valuesByUnit[unit].push(...getSeriesDataValues(s.data))
})
return uniqueUnits.map((unit, index) => {
const [min, max] = yMethod(valuesByUnit[unit].length ? valuesByUnit[unit] : [0])
return {
type: 'value',
min,
max,
name: unit,
position: index === 0 ? 'left' : 'right',
minInterval: index === 0 ? 1 : undefined,
axisLine: {
show: true,
onZero: false
},
splitLine: index === 0 ? undefined : { show: false }
}
})
}
const values = item.value?.length ? item.value.map((k: any) => k[1]) : [0]
const [min, max] = yMethod([item.maxValue, item.minValue, ...values])
return [
{
type: 'value',
min,
max,
name: item.valueName,
minInterval: 1,
axisLine: {
show: true,
onZero: false
}
}
]
}
const rendering = () => {
height.value = mainHeight(160, list.value.length > 3 ? 3 : list.value.length)
list.value.forEach((item: any) => {
const idx = parseInt(String(item.id).replace('qushifenx', ''))
item.units = (tableData.value[idx] as any)?.unit || (item.valueName ? [item.valueName] : [''])
const uniqueUnits = [...new Set(item.units.filter((u: string) => u != null && u !== ''))] as string[]
item.useDualAxis = uniqueUnits.length > 1
const getAxisIndex = (unitIndex: number) => {
if (!item.useDualAxis) return 0
const unit = item.units[unitIndex] ?? item.units[0]
return uniqueUnits.indexOf(unit)
}
const withAxis = (data: any, unitIndex: number) => {
if (item.useDualAxis) data.yAxisIndex = getAxisIndex(unitIndex)
return data
}
const isShanBian = item.targetName.includes('闪变')
const lineSeriesOpts = isShanBian ? { smooth: false, step: 'end' as const } : { smooth: true }
if (item.targetName == '电压不平衡') {
item.valueName = ''
const phaseNames = ['零序电压', '正序电压', '负序电压']
item.legend = item.legend.map((item2: any) => {
if (item2 == '零序电压') {
item2 = item2 + '(V)'
} else if (item2 == '正序电压') {
item2 = item2 + '(kV)'
} else if (item2 == '负序电压') {
item2 = item2 + '(V)'
const phaseIdx = phaseNames.indexOf(item2)
if (phaseIdx >= 0 && item.units[phaseIdx]) {
return item2 + '(' + item.units[phaseIdx] + ')'
}
return item2
})
@@ -1247,13 +1281,16 @@ const rendering = () => {
let opitonserise: any[] = []
item.legend.forEach((item2: any) => {
if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压(V)')) {
if (
item.avalue !== undefined &&
(item2 == 'A相' || item2 == 'AB相' || item2.startsWith('零序电压'))
) {
let data = {
name: item2,
symbol: 'none',
symbolSize: 5,
type: 'line',
smooth: true,
...lineSeriesOpts,
itemStyle: {
normal: {
color: '#DAA520'
@@ -1262,14 +1299,17 @@ const rendering = () => {
data: item.avalue
}
opitonserise.push(data)
} else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压(kV)')) {
opitonserise.push(withAxis(data, 0))
} else if (
item.bvalue !== undefined &&
(item2 == 'B相' || item2 == 'BC相' || item2.startsWith('正序电压'))
) {
let data = {
name: item2,
symbol: 'none',
symbolSize: 5,
type: 'line',
smooth: true,
...lineSeriesOpts,
itemStyle: {
normal: {
color: '#2E8B57'
@@ -1278,14 +1318,17 @@ const rendering = () => {
data: item.bvalue
}
opitonserise.push(data)
} else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压(V)')) {
opitonserise.push(withAxis(data, 1))
} else if (
item.cvalue !== undefined &&
(item2 == 'C相' || item2 == 'CA相' || item2.startsWith('负序电压'))
) {
let data = {
name: item2,
symbol: 'none',
symbolSize: 5,
type: 'line',
smooth: true,
...lineSeriesOpts,
barWidth: 22,
itemStyle: {
normal: {
@@ -1294,14 +1337,14 @@ const rendering = () => {
},
data: item.cvalue
}
opitonserise.push(data)
opitonserise.push(withAxis(data, 2))
} else if (item.topLimit !== undefined && item2 == '上限') {
let data = {
name: item2,
symbol: 'none',
symbolSize: 5,
type: 'line',
smooth: true,
...lineSeriesOpts,
itemStyle: {
normal: {
color: '#FF33FF',
@@ -1314,14 +1357,14 @@ const rendering = () => {
},
data: item.topLimit
}
opitonserise.push(data)
opitonserise.push(withAxis(data, 0))
} else if (item.lowerLimit !== undefined && item2 == '下限') {
let data = {
name: item2,
symbol: 'none',
symbolSize: 5,
type: 'line',
smooth: true,
...lineSeriesOpts,
barWidth: 22,
itemStyle: {
normal: {
@@ -1335,7 +1378,7 @@ const rendering = () => {
},
data: item.lowerLimit
}
opitonserise.push(data)
opitonserise.push(withAxis(data, 0))
} else if (item.chufa !== undefined && item2 == '暂态触发点') {
let data = {
name: item2,
@@ -1348,14 +1391,14 @@ const rendering = () => {
},
data: item.chufa
}
opitonserise.push(data)
opitonserise.push(withAxis(data, 0))
} else if (item.gvalue !== undefined && item2 == '频率') {
let data = {
name: item2,
symbol: 'none',
symbolSize: 5,
type: 'line',
smooth: true,
...lineSeriesOpts,
itemStyle: {
normal: {
color: '#990099',
@@ -1368,7 +1411,7 @@ const rendering = () => {
},
data: item.gvalue
}
opitonserise.push(data)
opitonserise.push(withAxis(data, 0))
} else if (item.gvalue !== undefined && item2 == '负序电流') {
let data = {
name: item2,
@@ -1383,7 +1426,7 @@ const rendering = () => {
},
data: item.gvalue
}
opitonserise.push(data)
opitonserise.push(withAxis(data, 0))
} else if (item.gvalue !== undefined && item2 == '三相电压不平衡度') {
let data = {
name: item2,
@@ -1398,7 +1441,7 @@ const rendering = () => {
},
data: item.gvalue
}
opitonserise.push(data)
opitonserise.push(withAxis(data, 0))
} else if (
item.gvalue !== undefined &&
(item2 == '三相总有功功率' || item2 == '三相总无功功率' || item2 == '三相总视在功率')
@@ -1411,12 +1454,12 @@ const rendering = () => {
barWidth: 22,
itemStyle: {
normal: {
color: '#0033ff'
color: '#526ADE'
}
},
data: item.gvalue
}
opitonserise.push(data)
opitonserise.push(withAxis(data, 0))
} else if (item.gvalue !== undefined && (item2 == '总视在功率因数' || item2 == '总位移功率因数')) {
let data = {
name: item2,
@@ -1426,32 +1469,91 @@ const rendering = () => {
barWidth: 22,
itemStyle: {
normal: {
color: '#00FF00'
color: '#526ADE'
}
},
data: item.gvalue
}
opitonserise.push(data)
opitonserise.push(withAxis(data, 0))
}
// else {
// opitonserise.push([])
// }
})
if (item.valueName == undefined) {
item.valueName = ''
item.valueName = ''
}
//console.log('渲染数据体',opitonserise)
item.serise = opitonserise
})
getEcharts()
}
const measureTextWidth = (text: string, fontSize = 14) => {
const canvas = document.createElement('canvas')
const ctx = canvas.getContext('2d')
if (!ctx) return text.length * fontSize * 0.6
ctx.font = `${fontSize}px dinproRegular, sans-serif`
return ctx.measureText(text).width
}
const getYAxisLeftPadding = (yAxis: any) => {
const splitNumber = yAxis.splitNumber ?? 5
const min = yAxis.min ?? 0
const max = yAxis.max ?? 0
let maxLabelWidth = 0
const formatter = yAxis.axisLabel?.formatter
const formatLabel = (value: number) => {
if (formatter) {
const result = formatter(value)
return result != null && result !== '' ? String(result) : ''
}
return String(parseFloat(value.toFixed(1)))
}
if (yAxis.interval) {
for (let v = min; v <= max + yAxis.interval * 0.01; v += yAxis.interval) {
const label = formatLabel(v)
if (label) maxLabelWidth = Math.max(maxLabelWidth, measureTextWidth(label))
}
} else {
const step = splitNumber > 0 ? (max - min) / splitNumber : 0
for (let i = 0; i <= splitNumber; i++) {
const label = formatLabel(min + step * i)
if (label) maxLabelWidth = Math.max(maxLabelWidth, measureTextWidth(label))
}
}
const nameWidth = yAxis.name ? measureTextWidth(yAxis.name) : 0
return Math.ceil(Math.max(maxLabelWidth, nameWidth)) + 15
}
const alignChartsYAxis = () => {
let maxLeft = 50
let maxRight = 70
let hasDualAxis = false
list.value.forEach((item: any) => {
const yAxes = item.option?.yAxis || []
if (yAxes.length > 1) hasDualAxis = true
yAxes.forEach((yAxis: any, index: number) => {
const padding = getYAxisLeftPadding(yAxis)
if (yAxis.position === 'right' || (yAxes.length > 1 && index > 0)) {
maxRight = Math.max(maxRight, padding)
} else {
maxLeft = Math.max(maxLeft, padding)
}
})
})
if (list.value.length <= 1 && !hasDualAxis) return
list.value.forEach((item: any) => {
const gridUpdate: any = { containLabel: false }
if (list.value.length > 1 || hasDualAxis) gridUpdate.left = maxLeft
if (hasDualAxis) gridUpdate.right = maxRight
item.option.grid = {
...item.option.grid,
...gridUpdate
}
})
}
const getEcharts = () => {
list.value.forEach((item: any, i: number) => {
const values = item.value && item.value.length > 0 ? item.value.map(k => k[1]) : [0]
let [min, max] = yMethod([item.maxValue, item.minValue, ...values])
const yAxisConfig = buildItemYAxis(item)
item.option = {
backgroundColor: '#fff',
title: {
@@ -1470,14 +1572,14 @@ const getEcharts = () => {
},
tooltip: {
trigger: 'axis',
axisPointer: {
//type: "shadow",
type: 'cross', // 默认为直线,可选为:'line' | 'shadow'
label: {
color: '#fff',
fontSize: 16
}
},
// axisPointer: {
// //type: "shadow",
// type: 'cross', // 默认为直线,可选为:'line' | 'shadow'
// label: {
// color: '#fff',
// fontSize: 16
// }
// },
textStyle: {
color: '#fff',
fontStyle: 'normal',
@@ -1526,31 +1628,40 @@ const getEcharts = () => {
: params[i].value[1] == 0
? '总谐波电流方向:无<br/>'
: '总谐波电流方向:流出<br/>'
} else if (params[i].seriesName == '正序电压(kV)') {
} else if (params[i].seriesName.includes('正序电压')) {
let str = (params[i].value[1] * 1).toString()
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
let str1 = str.replace(reg, '$1,')
let cleanStr = str1.replace(/,/g, '')
let num = Number(cleanStr)
const unitMatch = params[i].seriesName.match(/\(([^)]+)\)$/)
const unit = unitMatch ? unitMatch[1] : 'kV'
tips +=
params[i].marker +
params[i].seriesName.replace('(kV)', '') +
params[i].seriesName.replace(/\([^)]+\)$/, '') +
':' +
(Number.isNaN(Number(num)) ? '/' : num) +
'kV<br/>'
} else if (params[i].seriesName == '零序电压(V)' || params[i].seriesName == '负序电压(V)') {
unit +
'<br/>'
} else if (
params[i].seriesName.includes('零序电压') ||
params[i].seriesName.includes('负序电压')
) {
let str = (params[i].value[1] * 1).toString()
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
let str1 = str.replace(reg, '$1,')
let cleanStr = str1.replace(/,/g, '')
let num = Number(cleanStr)
const unitMatch = params[i].seriesName.match(/\(([^)]+)\)$/)
const unit = unitMatch ? unitMatch[1] : 'V'
tips +=
params[i].marker +
params[i].seriesName.replace('(V)', '') +
params[i].seriesName.replace(/\([^)]+\)$/, '') +
':' +
(Number.isNaN(Number(num)) ? '/' : num) +
'V<br/>'
} else if (params[i].seriesName !== '正序电压(kV)') {
unit +
'<br/>'
} else if (!params[i].seriesName.includes('正序电压')) {
let str = (params[i].value[1] * 1).toString()
let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
let str1 = str.replace(reg, '$1,')
@@ -1639,8 +1750,24 @@ const getEcharts = () => {
}
},
grid: {
top: '70px'
top: '50px',
bottom: '45px'
},
dataZoom: [
{
type: 'inside',
height: 13,
start: 0,
bottom: '10px',
end: 100
},
{
start: 0,
height: 13,
bottom: '10px',
end: 100
}
],
xAxis: [
{
name: '时间',
@@ -1665,38 +1792,7 @@ const getEcharts = () => {
// }
// }
// },
yAxis: [
{
type: 'value',
min: min,
max: max,
name: item.valueName,
minInterval: 1,
// max:10,
// min:0,
// axisLabel: {
// interval: 0,
// // formatter: function (value: any) {
// // return value.toFixed(0)
// // },
// left: '20px'
// },
axisLine: {
show: true,
onZero: false, //-----------重点
lineStyle: {}
}
// splitLine: {
// lineStyle: {
// // 使用深浅的间隔色
// type: 'dashed',
// opacity: 0.5
// }
// }
}
],
yAxis: yAxisConfig,
series: item.serise
}
let aValues = []
@@ -1801,13 +1897,14 @@ const getEcharts = () => {
symbolSize: 0,
itemStyle: {
normal: {
color: '#0033ff'
color: '#526ADE'
}
}
}
]
}
})
alignChartsYAxis()
echarts.connect('group')
}
const conditionChange = () => {

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) {

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>

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)
}

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)

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>
@@ -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,9 +119,7 @@
<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 == '运行'
<el-tag :type="row.runFlag == '运行'
? 'success'
: row.runFlag == '停运'
? 'danger'
@@ -157,8 +128,7 @@
: 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;