From b6ef6cf999676129c70fcdf868a1c2ceafd5c8b4 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 6 Aug 2024 20:58:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=86=80=E5=8C=97?=
=?UTF-8?q?=E7=8E=B0=E5=9C=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pqs/business/terminal/deviceter/index.vue | 26 +++--------
.../embed/lntegruty/components/table.vue | 19 +++++++-
.../panorama/components/city/exceeded.vue | 6 +--
.../panorama/components/city/statistics.vue | 12 +++--
.../panorama/components/cityMapR.vue | 7 ++-
.../components/details/steadyState.vue | 16 +++++--
.../panorama/components/line/info.vue | 45 ++++++++++++++-----
.../panorama/components/mapR.vue | 19 +++++++-
.../terminal/components/substationLedger.vue | 3 +-
src/views/pqs/supervise/terminal/index.vue | 2 +-
.../components/terminainal/addForm.vue | 25 ++++++-----
.../components/terminainal/detail.vue | 2 +-
src/views/system/auth/userList/popupEdit.vue | 4 +-
13 files changed, 123 insertions(+), 63 deletions(-)
diff --git a/src/views/pqs/business/terminal/deviceter/index.vue b/src/views/pqs/business/terminal/deviceter/index.vue
index d9045706..d9f56539 100644
--- a/src/views/pqs/business/terminal/deviceter/index.vue
+++ b/src/views/pqs/business/terminal/deviceter/index.vue
@@ -3,7 +3,7 @@
-
+
新 增
修 改
删 除
@@ -1315,12 +1315,8 @@
>
-
-
+ 下载报告
+
-
+
diff --git a/src/views/pqs/qualityInspeection/panorama/components/city/exceeded.vue b/src/views/pqs/qualityInspeection/panorama/components/city/exceeded.vue
index ebad8082..01e21635 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/city/exceeded.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/city/exceeded.vue
@@ -1,11 +1,11 @@
-
+
- 稳态指标超标占比
+ 稳态指标超标水平评估统计
@@ -80,7 +80,7 @@ const tableData: any = ref([])
const echart = (row: any) => {
let chart = echarts.init(chartRef.value as HTMLDivElement)
- let dataname = ['频率偏差', '电压偏差', '电压总谐波畸变率', '三相电压不平衡度', '闪变']
+ let dataname = ['频率偏差(Hz)', '电压偏差(%)', '电压总谐波畸变率(%)', '三相电压不平衡度(%)', '闪变']
let datamax = [100, 100, 100, 100, 100, 100]
let indicator = []
for (let i = 0; i < dataname.length; i++) {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/city/statistics.vue b/src/views/pqs/qualityInspeection/panorama/components/city/statistics.vue
index 153975af..75bc4b06 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/city/statistics.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/city/statistics.vue
@@ -1,16 +1,20 @@
-
+
+
+
+
-
-
-
+
+
+
+
diff --git a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
index b8fe6842..87d841a7 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue
@@ -168,7 +168,7 @@ const Voltage: any = [
{
label: '试运行问题',
value: 'trialRun'
- },
+ }
]
const active: any = ref(Voltage[0].value)
@@ -356,8 +356,7 @@ const info = (row: any) => {
}),
axisLabel: {
color: '#000',
- fontSize: 12,
- interval: 0
+ fontSize: 12
}
},
grid: {
@@ -367,7 +366,7 @@ const info = (row: any) => {
},
options: {
- dataZoom: null,
+ // dataZoom: null,
series: [
{
name: '超标监测点数',
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue b/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue
index a1da575b..a5f365f2 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/steadyState.vue
@@ -39,7 +39,7 @@
- 稳态电能质量水平评估环比变化
+ 稳态电能质量超标占比环比变化
@@ -57,7 +57,7 @@
-
+
{{ scope.row.list[i].overNum }}
@@ -111,7 +111,15 @@ const echart = (row: any) => {
let chart = echarts.init(chartRef.value as HTMLDivElement)
- let dataname = ['频率偏差', '电压偏差', '电压总谐波畸变率', '三相电压不平衡度', '闪变']
+ let dataname = [ '频率偏差(Hz)',
+ '电压偏差(%)',
+ '电压总谐波畸变率(%)',
+ '三相电压不平衡度(%)',
+ '闪变',
+ '谐波电压(%)',
+ '谐波电流(%)',
+ '间谐波电压(%)',
+ '负序电流(A)']
// let datamax = [100, 100, 100, 100, 100, 100]
let indicator = []
for (let i = 0; i < dataname.length; i++) {
@@ -157,7 +165,7 @@ const echart = (row: any) => {
},
radar: {
center: ['50%', '60%'],
- radius: '75%',
+ radius: '60%',
startAngle: 90,
splitNumber: 5,
splitArea: {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
index e3feabe7..0a62c32d 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/line/info.vue
@@ -1,6 +1,6 @@
-
+
{{ dropList.lineName }}详情
@@ -385,22 +385,22 @@ const open = async (id: string) => {
dropList.value.assessData = res.data.assessLevel
evaluationData.value = [
{
- targetName: '频率偏差',
+ targetName: '频率偏差(Hz)',
avg: res.data.freqAssessLevel,
sd: res.data.freqQualifyData
},
{
- targetName: '电压偏差',
+ targetName: '电压偏差(%)',
avg: res.data.vdevAssessLevel,
sd: res.data.vdevQualifyData
},
{
- targetName: '电压总谐波畸变率',
+ targetName: '电压总谐波畸变率(%)',
avg: res.data.harmAssessLevel,
sd: res.data.harmQualifyData
},
{
- targetName: '三相电压不平衡度',
+ targetName: '三相电压不平衡度(%)',
avg: res.data.unbalanceAssessLevel,
sd: res.data.unbalanceQualifyData
},
@@ -421,13 +421,28 @@ const open = async (id: string) => {
echart([
{
time: datePickerRef.value.timeValue[0].substring(0, 7),
- targetList: ['频率偏差', '电压偏差', '电压总谐波畸变率', '三相电压不平衡度', '闪变'],
+ targetList: [
+ '频率偏差(Hz)',
+ '电压偏差(%)',
+ '电压总谐波畸变率(%)',
+ '三相电压不平衡度(%)',
+ '闪变',
+ '谐波电压(%)',
+ '谐波电流(%)',
+ '间谐波电压(%)',
+ '负序电流(A)'
+ ],
ratioList: [
res.data.freqDev == 3.14159 ? null : res.data.freqDev,
res.data.vdev == 3.14159 ? null : res.data.vdev,
res.data.vthd == 3.14159 ? null : res.data.vthd,
res.data.ubalance == 3.14159 ? null : res.data.ubalance,
- res.data.plt == 3.14159 ? null : res.data.plt
+ res.data.plt == 3.14159 ? null : res.data.plt,
+
+ res.data.uharm == 3.14159 ? null : res.data.uharm,
+ res.data.iharm == 3.14159 ? null : res.data.iharm,
+ res.data.inuHarm == 3.14159 ? null : res.data.inuHarm,
+ res.data.ineg == 3.14159 ? null : res.data.ineg
]
}
])
@@ -462,7 +477,7 @@ const open = async (id: string) => {
textStyle: {
// fontWeight: 600,
fontSize: 12
- },
+ }
// subtext: '总数',
// subtextStyle: {
// fontWeight: 550,
@@ -537,8 +552,18 @@ const open = async (id: string) => {
const echart = (row: any) => {
let chart = echarts.init(chartRef.value as HTMLDivElement)
- let dataname = ['频率偏差', '电压偏差', '电压总谐波畸变率', '三相电压不平衡度', '闪变']
- let datamax = [100, 100, 100, 100, 100, 100]
+ let dataname = [
+ '频率偏差(Hz)',
+ '电压偏差(%)',
+ '电压总谐波畸变率(%)',
+ '三相电压不平衡度(%)',
+ '闪变',
+ '谐波电压(%)',
+ '谐波电流(%)',
+ '间谐波电压(%)',
+ '负序电流(A)'
+ ]
+ let datamax = [100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]
let indicator = []
for (let i = 0; i < dataname.length; i++) {
indicator.push({
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
index 3276a5f4..e5040f45 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
@@ -298,7 +298,24 @@ const options = ref([
{
label: '三相电压不平衡度',
value: '5'
- }
+ },
+ {
+ label: '谐波电压',
+ value: '6'
+ },
+ {
+ label: '谐波电流',
+ value: '7'
+ },
+ {
+ label: '间谐波电压',
+ value: '8'
+ },
+ {
+ label: '负序电流',
+ value: '9'
+ },
+
])
const technology: any = ref({})
const harmonicType = ref('0')
diff --git a/src/views/pqs/supervise/terminal/components/substationLedger.vue b/src/views/pqs/supervise/terminal/components/substationLedger.vue
index 9d92c2ba..1310a361 100644
--- a/src/views/pqs/supervise/terminal/components/substationLedger.vue
+++ b/src/views/pqs/supervise/terminal/components/substationLedger.vue
@@ -1,6 +1,6 @@
-
+
-
+
@@ -157,8 +157,8 @@
>
-
-
+
+
{
})
}
const changeSubstationFlag = () => {
- //处理所属变电站手都输入/下拉数据
+ //处理并网变电站手都输入/下拉数据
if (form.value.customSubstationFlag == 0) {
form.value.substationName = substationList.value.find((item: any) => {
return form.value.substation == item.id
@@ -803,6 +803,8 @@ getFrontEndMachineList()
const powerCompanyList: any = ref([])
//获取所属供电公司,区域列表第三层数据
const getPowerCompanyList = async (flag: any) => {
+
+
getAllDeptList().then(res => {
powerCompanyList.value = res.data[0].children[0].children
if (flag) {
@@ -829,7 +831,8 @@ const getPowerCompanyList = async (flag: any) => {
const findSubstationVoltageLevel = async () => {
getSubstationVoltageLevel({ orgIds: [form.value.powerCompany] }).then(res => {
substationList.value = res.data
-
+ form.value.latitude = substationList.value[0]?.lat
+ form.value.longitude = substationList.value[0]?.lng
form.value.substation = substationList.value[0]?.id
form.value.substationVoltageLevel = substationList.value[0]?.voltageLevel
})
@@ -883,7 +886,7 @@ const resetForm: any = async () => {
nextTerminalInspectionTime: new Date().getTime() + 365 * 5 * 24 * 3600 * 1000, // 下次终端定检时间
powerCompany: powerCompanyList[0]?.value.id, //所属供电公司
simCardNumber: '', //SIM卡号
- substation: '', // 所属变电站
+ substation: '', // 并网变电站
substationVoltageLevel: voltageLevelList[0].id, // 变电站电压等级
summonFlag: summonFlagList[0].id, // 召唤标志
terminalIp: '', //终端IP
@@ -922,7 +925,7 @@ const devReportForm: any = ref({
//终端信息实体
supervisionTempDeviceReportParam: {
customSubstationFlag: 0, //电站类型
- substationName: '', //所属变电站名称
+ substationName: '', //并网变电站名称
alarmFunction: '0', //告警功能
commissioningTime: '', //投运时间
communicationStatus: communicationStatusList[0].id, // 通讯状态
@@ -945,7 +948,7 @@ const devReportForm: any = ref({
nextTerminalInspectionTime: '', // 下次终端定检时间
powerCompany: powerCompanyList.value[0]?.id, //所属供电公司
simCardNumber: '', //SIM卡号
- substation: '', // 所属变电站
+ substation: '', // 并网变电站
substationVoltageLevel: voltageLevelList[0].id, // 变电站电压等级
summonFlag: summonFlagList[0].id, // 召唤标志
terminalIp: '', //终端IP
@@ -1033,14 +1036,14 @@ const rules = ref({
substation: [
{
required: true,
- message: '请选择所属变电站',
+ message: '请选择并网变电站',
trigger: 'change'
}
],
substationName: [
{
required: true,
- message: '请输入所属变电站',
+ message: '请输入并网变电站',
trigger: 'blur'
}
],
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
index 4bb695f2..492a078d 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
@@ -26,7 +26,7 @@
{{ detailData.supervisionTempDeviceReport?.powerCompany }}
-
+
{{ detailData.supervisionTempDeviceReport?.substationName }}
diff --git a/src/views/system/auth/userList/popupEdit.vue b/src/views/system/auth/userList/popupEdit.vue
index 9d279f9f..085a9691 100644
--- a/src/views/system/auth/userList/popupEdit.vue
+++ b/src/views/system/auth/userList/popupEdit.vue
@@ -111,7 +111,7 @@ const tableStore = inject('tableStore') as TableStore
const form = reactive({
id: '',
name: '',
- password: '123456',
+ password: 'Jbdnzl@123',
email: '',
limitIpStart: '',
deptId: '',
@@ -233,7 +233,7 @@ const open = (text: string, data?: anyObj) => {
form.id = ''
form.limitIpStart = '0.0.0.0'
form.limitIpEnd = '255.255.255.255'
- form.password = '123456'
+ form.password = 'Jbdnzl@123'
}
form.type = adminInfo.$state.userType + 1
}