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

修改bug

Browse Source
This commit is contained in:
GGJ
2024-04-18 16:03:53 +08:00
parent 5345dbd84b
commit 997e8a9252
7 changed files with 165 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/echarts/MyEchart.vue
View File

@@ -74,8 +74,8 @@ const initChart = () => {
}, },
grid: { grid: {
top: '50px', top: '50px',
left: '10px', left: '30px',
right: '60px', right: '70px',
bottom: props.options?.options?.dataZoom === null ? '10px' : '40px', bottom: props.options?.options?.dataZoom === null ? '10px' : '40px',
containLabel: true, containLabel: true,
...(props.options?.grid || null) ...(props.options?.grid || null)

16
src/utils/dictionary.ts
View File

@@ -78,14 +78,14 @@ export const indexOptions = [
value: '46', value: '46',
label: '间谐波电压含有率' label: '间谐波电压含有率'
}, },
{ // {
value: '47', // value: '47',
label: '间谐波电流含有率' // label: '间谐波电流含有率'
}, // },
{ // {
value: '48', // value: '48',
label: '间谐波电压幅值' // label: '间谐波电压幅值'
}, // },
{ {
value: '49', value: '49',
label: '间谐波电流幅值' label: '间谐波电流幅值'

36
src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue
View File

@@ -259,8 +259,8 @@ const conditionChange = () => {
} }
if ( if (
formData.condition.includes('46') || formData.condition.includes('46') ||
formData.condition.includes('47') || // formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') formData.condition.includes('49')
) { ) {
showJianXieBoCiShu.value = true showJianXieBoCiShu.value = true
@@ -275,8 +275,8 @@ const conditionChange = () => {
formData.condition.includes('43') || formData.condition.includes('43') ||
formData.condition.includes('44') || formData.condition.includes('44') ||
(formData.condition.includes('45') && formData.condition.includes('46')) || (formData.condition.includes('45') && formData.condition.includes('46')) ||
formData.condition.includes('47') || // formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') formData.condition.includes('49')
) { ) {
showXieBoCiShu.value = true showXieBoCiShu.value = true
@@ -294,8 +294,8 @@ const conditionChange = () => {
} }
if ( if (
formData.condition.includes('46') || formData.condition.includes('46') ||
formData.condition.includes('47') || // formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') formData.condition.includes('49')
) { ) {
showJianXieBoCiShu.value = true showJianXieBoCiShu.value = true
@@ -311,8 +311,8 @@ const conditionChange = () => {
formData.condition.includes('44') || formData.condition.includes('44') ||
formData.condition.includes('45')) && formData.condition.includes('45')) &&
(formData.condition.includes('46') || (formData.condition.includes('46') ||
formData.condition.includes('47') || // formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49')) formData.condition.includes('49'))
) { ) {
showXieBoCiShu.value = true showXieBoCiShu.value = true
@@ -323,8 +323,8 @@ const conditionChange = () => {
} }
if ( if (
formData.condition.includes('46') || formData.condition.includes('46') ||
formData.condition.includes('47') || // formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') formData.condition.includes('49')
) { ) {
showJianXieBoCiShu.value = true showJianXieBoCiShu.value = true
@@ -350,8 +350,8 @@ const conditionChange = () => {
formData.condition.includes('44') || formData.condition.includes('44') ||
formData.condition.includes('45')) && formData.condition.includes('45')) &&
(formData.condition.includes('46') || (formData.condition.includes('46') ||
formData.condition.includes('47') || // formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49')) formData.condition.includes('49'))
) { ) {
showXieBoCiShu.value = true showXieBoCiShu.value = true
@@ -362,8 +362,8 @@ const conditionChange = () => {
} }
if ( if (
formData.condition.includes('46') || formData.condition.includes('46') ||
formData.condition.includes('47') || // formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') formData.condition.includes('49')
) { ) {
showJianXieBoCiShu.value = true showJianXieBoCiShu.value = true
@@ -389,8 +389,8 @@ const conditionChange = () => {
formData.condition.includes('44') || formData.condition.includes('44') ||
formData.condition.includes('45')) && formData.condition.includes('45')) &&
(formData.condition.includes('46') || (formData.condition.includes('46') ||
formData.condition.includes('47') || // formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49')) formData.condition.includes('49'))
) { ) {
showXieBoCiShu.value = true showXieBoCiShu.value = true
@@ -401,8 +401,8 @@ const conditionChange = () => {
} }
if ( if (
formData.condition.includes('46') || formData.condition.includes('46') ||
formData.condition.includes('47') || // formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') formData.condition.includes('49')
) { ) {
showJianXieBoCiShu.value = true showJianXieBoCiShu.value = true

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

@@ -75,7 +75,7 @@ const pointTree = ref()
const size = ref(0) const size = ref(0)
const isReload = ref(false) const isReload = ref(false)
const height = mainHeight(40) const height = mainHeight(40)
const activeName = ref('6') const activeName = ref('1')
onMounted(() => { onMounted(() => {
const dom = document.getElementById('navigation-splitpanes') const dom = document.getElementById('navigation-splitpanes')
if (dom) { if (dom) {

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

@@ -172,19 +172,19 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
avalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
avalue.push([]) avalue.push([])
} }
//判断存在缺失值b //判断存在缺失值b
if (item.value[j][2] != undefined) { if (item.value[j][2] != undefined) {
bvalue.push([item.value[j][0], item.value[j][2].toFixed(2)]) bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
} else { } else {
bvalue.push([]) bvalue.push([])
} }
//判断存在缺失值c //判断存在缺失值c
if (item.value[j][3] != undefined) { if (item.value[j][3] != undefined) {
cvalue.push([item.value[j][0], item.value[j][3].toFixed(2)]) cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
} else { } else {
cvalue.push([]) cvalue.push([])
} }
@@ -203,7 +203,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) { for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([ chufa.push([
item.eventDetail[k].time, item.eventDetail[k].time,
item.minValue.toFixed(2), item.minValue.toFixed(3),
item.eventDetail[k].id, item.eventDetail[k].id,
99 99
]) ])
@@ -238,7 +238,7 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
gvalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
gvalue.push([]) gvalue.push([])
} }
@@ -255,7 +255,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) { for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([ chufa.push([
item.eventDetail[k].time, item.eventDetail[k].time,
item.minValue.toFixed(2), item.minValue.toFixed(3),
item.eventDetail[k].id, item.eventDetail[k].id,
99 99
]) ])
@@ -311,19 +311,19 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
avalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
avalue.push([]) avalue.push([])
} }
//判断存在缺失值b //判断存在缺失值b
if (item.value[j][2] != undefined) { if (item.value[j][2] != undefined) {
bvalue.push([item.value[j][0], item.value[j][2].toFixed(2)]) bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
} else { } else {
bvalue.push([]) bvalue.push([])
} }
//判断存在缺失值c //判断存在缺失值c
if (item.value[j][3] != undefined) { if (item.value[j][3] != undefined) {
cvalue.push([item.value[j][0], item.value[j][3].toFixed(2)]) cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
} else { } else {
cvalue.push([]) cvalue.push([])
} }
@@ -341,7 +341,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) { for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([ chufa.push([
item.eventDetail[k].time, item.eventDetail[k].time,
item.minValue.toFixed(2), item.minValue.toFixed(3),
item.eventDetail[k].id, item.eventDetail[k].id,
99 99
]) ])
@@ -373,7 +373,7 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
gvalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
gvalue.push([]) gvalue.push([])
} }
@@ -387,7 +387,7 @@ const shujuchuli = (res: any) => {
//不存在一个暂降点或1个 //处理暂降点 //不存在一个暂降点或1个 //处理暂降点
if (item.eventDetail.length > 0) { if (item.eventDetail.length > 0) {
for (let k = 0; k < item.eventDetail.length; k++) { for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([item.eventDetail[k].time, item.minValue.toFixed(2)]) chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
} }
} }
let shuju = { let shuju = {
@@ -439,24 +439,24 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
avalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
avalue.push([]) avalue.push([])
} }
//判断存在缺失值b //判断存在缺失值b
if (item.value[j][2] != undefined) { if (item.value[j][2] != undefined) {
bvalue.push([item.value[j][0], item.value[j][2].toFixed(2)]) bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
} else { } else {
bvalue.push([]) bvalue.push([])
} }
//判断存在缺失值c //判断存在缺失值c
if (item.value[j][3] != undefined) { if (item.value[j][3] != undefined) {
cvalue.push([item.value[j][0], item.value[j][3].toFixed(2)]) cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
} else { } else {
cvalue.push([]) cvalue.push([])
} }
//下限值 //下限值
lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(2)]) lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
} }
//数据为空 //数据为空
} else { } else {
@@ -467,7 +467,7 @@ const shujuchuli = (res: any) => {
//不存在一个暂降点或1个 //处理暂降点 //不存在一个暂降点或1个 //处理暂降点
if (item.eventDetail.length > 0) { if (item.eventDetail.length > 0) {
for (let k = 0; k < item.eventDetail.length; k++) { for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([item.eventDetail[k].time, item.minValue.toFixed(2)]) chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
} }
} }
let shuju = { let shuju = {
@@ -496,12 +496,12 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
gvalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
gvalue.push([]) gvalue.push([])
} }
//下限值 //下限值
lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(2)]) lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
} }
//数据为空 //数据为空
} else { } else {
@@ -510,7 +510,7 @@ const shujuchuli = (res: any) => {
//不存在一个暂降点或1个 //处理暂降点 //不存在一个暂降点或1个 //处理暂降点
if (item.eventDetail.length > 0) { if (item.eventDetail.length > 0) {
for (let k = 0; k < item.eventDetail.length; k++) { for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([item.eventDetail[k].time, item.minValue.toFixed(2)]) chufa.push([item.eventDetail[k].time, item.minValue.toFixed(3)])
} }
} }
let shuju = { let shuju = {
@@ -559,19 +559,19 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
avalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
avalue.push([]) avalue.push([])
} }
//判断存在缺失值b //判断存在缺失值b
if (item.value[j][2] != undefined) { if (item.value[j][2] != undefined) {
bvalue.push([item.value[j][0], item.value[j][2].toFixed(2)]) bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
} else { } else {
bvalue.push([]) bvalue.push([])
} }
//判断存在缺失值c //判断存在缺失值c
if (item.value[j][3] != undefined) { if (item.value[j][3] != undefined) {
cvalue.push([item.value[j][0], item.value[j][3].toFixed(2)]) cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
} else { } else {
cvalue.push([]) cvalue.push([])
} }
@@ -587,7 +587,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) { for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([ chufa.push([
item.eventDetail[k].time, item.eventDetail[k].time,
item.minValue.toFixed(2), item.minValue.toFixed(3),
item.eventDetail[k].id, item.eventDetail[k].id,
99 99
]) ])
@@ -599,7 +599,7 @@ const shujuchuli = (res: any) => {
targetName: item.targetName, targetName: item.targetName,
legend: item.phaiscType, legend: item.phaiscType,
valueName: item.unit[0], valueName: item.unit[0],
minValue: item.minValue > 1 ? (item.minValue - 0.5).toFixed(2) : item.minValue.toFixed(2), minValue: item.minValue > 1 ? (item.minValue - 0.5).toFixed(3) : item.minValue.toFixed(3),
maxValue: item.maxValue.toFixed(3), maxValue: item.maxValue.toFixed(3),
avalue: avalue, avalue: avalue,
bvalue: bvalue, bvalue: bvalue,
@@ -616,7 +616,7 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
gvalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
gvalue.push([]) gvalue.push([])
} }
@@ -630,7 +630,7 @@ const shujuchuli = (res: any) => {
for (let k = 0; k < item.eventDetail.length; k++) { for (let k = 0; k < item.eventDetail.length; k++) {
chufa.push([ chufa.push([
item.eventDetail[k].time, item.eventDetail[k].time,
item.minValue.toFixed(2), item.minValue.toFixed(3),
item.eventDetail[k].id, item.eventDetail[k].id,
99 99
]) ])
@@ -688,25 +688,25 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
avalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
avalue.push([]) avalue.push([])
} }
//判断存在缺失值b //判断存在缺失值b
if (item.value[j][2] != undefined) { if (item.value[j][2] != undefined) {
bvalue.push([item.value[j][0], item.value[j][2].toFixed(2)]) bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
} else { } else {
bvalue.push([]) bvalue.push([])
} }
//判断存在缺失值c //判断存在缺失值c
if (item.value[j][3] != undefined) { if (item.value[j][3] != undefined) {
cvalue.push([item.value[j][0], item.value[j][3].toFixed(2)]) cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
} else { } else {
cvalue.push([]) cvalue.push([])
} }
//上下限值 //上下限值
topLimit.push([item.value[j][0], item.topLimit.toFixed(2)]) topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(2)]) lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
} }
//数据为空 //数据为空
} else { } else {
@@ -742,13 +742,13 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
gvalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
gvalue.push([]) gvalue.push([])
} }
//上下限值 //上下限值
topLimit.push([item.value[j][0], item.topLimit.toFixed(2)]) topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(2)]) lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
} }
//数据为空 //数据为空
} else { } else {
@@ -805,24 +805,24 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
avalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
avalue.push([]) avalue.push([])
} }
//判断存在缺失值b //判断存在缺失值b
if (item.value[j][2] != undefined) { if (item.value[j][2] != undefined) {
bvalue.push([item.value[j][0], item.value[j][2].toFixed(2)]) bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
} else { } else {
bvalue.push([]) bvalue.push([])
} }
//判断存在缺失值c //判断存在缺失值c
if (item.value[j][3] != undefined) { if (item.value[j][3] != undefined) {
cvalue.push([item.value[j][0], item.value[j][3].toFixed(2)]) cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
} else { } else {
cvalue.push([]) cvalue.push([])
} }
//上限值 //上限值
topLimit.push([item.value[j][0], item.topLimit.toFixed(2)]) topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
} }
//数据为空 //数据为空
} else { } else {
@@ -856,12 +856,12 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
gvalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
gvalue.push([]) gvalue.push([])
} }
//上限值 //上限值
topLimit.push([item.value[j][0], item.topLimit.toFixed(2)]) topLimit.push([item.value[j][0], item.topLimit.toFixed(3)])
} }
//数据为空 //数据为空
} else { } else {
@@ -916,24 +916,24 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
avalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
avalue.push([]) avalue.push([])
} }
//判断存在缺失值b //判断存在缺失值b
if (item.value[j][2] != undefined) { if (item.value[j][2] != undefined) {
bvalue.push([item.value[j][0], item.value[j][2].toFixed(2)]) bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
} else { } else {
bvalue.push([]) bvalue.push([])
} }
//判断存在缺失值c //判断存在缺失值c
if (item.value[j][3] != undefined) { if (item.value[j][3] != undefined) {
cvalue.push([item.value[j][0], item.value[j][3].toFixed(2)]) cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
} else { } else {
cvalue.push([]) cvalue.push([])
} }
//下限值 //下限值
lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(2)]) lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
} }
//数据为空 //数据为空
} else { } else {
@@ -967,12 +967,12 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
gvalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
gvalue.push([]) gvalue.push([])
} }
//下限值 //下限值
lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(2)]) lowerLimit.push([item.value[j][0], item.lowerLimit.toFixed(3)])
} }
//数据为空 //数据为空
} else { } else {
@@ -1023,19 +1023,19 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
avalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) avalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
avalue.push([]) avalue.push([])
} }
//判断存在缺失值b //判断存在缺失值b
if (item.value[j][2] != undefined) { if (item.value[j][2] != undefined) {
bvalue.push([item.value[j][0], item.value[j][2].toFixed(2)]) bvalue.push([item.value[j][0], item.value[j][2].toFixed(3)])
} else { } else {
bvalue.push([]) bvalue.push([])
} }
//判断存在缺失值c //判断存在缺失值c
if (item.value[j][3] != undefined) { if (item.value[j][3] != undefined) {
cvalue.push([item.value[j][0], item.value[j][3].toFixed(2)]) cvalue.push([item.value[j][0], item.value[j][3].toFixed(3)])
} else { } else {
cvalue.push([]) cvalue.push([])
} }
@@ -1069,7 +1069,7 @@ const shujuchuli = (res: any) => {
for (let j = 0; j < item.value.length; j++) { for (let j = 0; j < item.value.length; j++) {
//判断存在缺失值a //判断存在缺失值a
if (item.value[j][1] != undefined) { if (item.value[j][1] != undefined) {
gvalue.push([item.value[j][0], item.value[j][1].toFixed(2)]) gvalue.push([item.value[j][0], item.value[j][1].toFixed(3)])
} else { } else {
gvalue.push([]) gvalue.push([])
} }
@@ -1607,8 +1607,8 @@ const conditionChange = () => {
} }
if ( if (
formData.condition.includes('46') || formData.condition.includes('46') ||
formData.condition.includes('47') || //formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') formData.condition.includes('49')
) { ) {
showJianXieBoCiShu.value = true showJianXieBoCiShu.value = true
@@ -1623,8 +1623,8 @@ const conditionChange = () => {
formData.condition.includes('43') || formData.condition.includes('43') ||
formData.condition.includes('44') || formData.condition.includes('44') ||
(formData.condition.includes('45') && formData.condition.includes('46')) || (formData.condition.includes('45') && formData.condition.includes('46')) ||
formData.condition.includes('47') || //formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') || formData.condition.includes('49') ||
formData.condition.includes('50') || formData.condition.includes('50') ||
formData.condition.includes('39') || formData.condition.includes('39') ||
@@ -1650,8 +1650,8 @@ const conditionChange = () => {
} }
if ( if (
formData.condition.includes('46') || formData.condition.includes('46') ||
formData.condition.includes('47') || //formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') formData.condition.includes('49')
) { ) {
showJianXieBoCiShu.value = true showJianXieBoCiShu.value = true
@@ -1671,8 +1671,8 @@ const conditionChange = () => {
formData.condition.includes('52') || formData.condition.includes('52') ||
formData.condition.includes('45')) && formData.condition.includes('45')) &&
(formData.condition.includes('46') || (formData.condition.includes('46') ||
formData.condition.includes('47') || //formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49')) formData.condition.includes('49'))
) { ) {
showXieBoCiShu.value = true showXieBoCiShu.value = true
@@ -1683,8 +1683,8 @@ const conditionChange = () => {
} }
if ( if (
formData.condition.includes('46') || formData.condition.includes('46') ||
formData.condition.includes('47') || //formData.condition.includes('47') ||
formData.condition.includes('48') || // formData.condition.includes('48') ||
formData.condition.includes('49') formData.condition.includes('49')
) { ) {
showJianXieBoCiShu.value = true showJianXieBoCiShu.value = true

97
src/views/pqs/supervise/retire/components/equipment.vue
View File

@@ -1,45 +1,36 @@
<template> <template>
<el-dialog draggable :title="title" v-model="userAdd" width="500px" :before-close="cancel"> <el-form :inline="true" ref="formRef" :model="addData" label-width="auto" class="form-one" :rules="rules">
<el-divider content-position="left" style="font-weight: bolder; font-size: 18px">基本信息</el-divider> <el-form-item label="区域:">
<el-form :inline="true" ref="formRef" :model="addData" label-width="auto" class="form-one" :rules="rules"> <Area ref="areaRef" v-model="addData.orgNo" />
<el-form-item label="区域:"> </el-form-item>
<Area ref="areaRef" v-model="addData.orgNo" /> <el-form-item label="设备编号:" prop="assetNumber">
</el-form-item> <el-input v-model="addData.assetNumber" clearable placeholder="请输入关键字"></el-input>
<el-form-item label="设备编号:" prop="assetNumber"> </el-form-item>
<el-input v-model="addData.assetNumber" clearable placeholder="请输入关键字"></el-input>
</el-form-item>
<el-form-item label="资产编号:" prop="devNumber"> <el-form-item label="资产编号:" prop="devNumber">
<el-input v-model="addData.devNumber" clearable placeholder="请输入关键字"></el-input> <el-input v-model="addData.devNumber" clearable placeholder="请输入关键字"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="item" label="报告:" style="margin-top: 10px" prop="fileList"> <el-form-item class="item" label="报告:" style="margin-top: 10px" prop="fileList">
<el-upload <el-upload
v-model:file-list="addData.fileList" v-model:file-list="addData.fileList"
ref="upload" ref="upload"
action="" action=""
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:auto-upload="false" :auto-upload="false"
> >
<template #trigger> <template #trigger>
<el-button type="primary">上传文件</el-button> <el-button type="primary">上传文件</el-button>
</template> </template>
</el-upload> </el-upload>
</el-form-item>
</el-form-item>
<el-form-item label="选择审核人:" prop="checker"> <el-form-item label="选择审核人:" prop="checker">
<el-select v-model="addData.checker" clearable placeholder="请选择审核人"> <el-select v-model="addData.checker" clearable placeholder="请选择审核人">
<el-option v-for="item in auditList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in auditList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="display: flex; justify-content: center; margin-top: 30px">
<el-button type="primary" class="ml20" @click="config(1)">保存</el-button>
<!-- <el-button type="primary" class="ml20" @click="config(2)">审核</el-button> -->
<el-button class="ml20" @click="cancel">取消</el-button>
</div>
</el-dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, onMounted } from 'vue' import { ref, reactive, onMounted } from 'vue'
@@ -50,7 +41,7 @@ import { getUserByRoleType } from '@/api/user-boot/user'
import { UploadProps, UploadRawFile, genFileId, ElMessage } from 'element-plus' import { UploadProps, UploadRawFile, genFileId, ElMessage } from 'element-plus'
const dictData = useDictData() const dictData = useDictData()
const userAdd = ref(false)
const interferenceType = dictData.getBasicData('Interference_Source') const interferenceType = dictData.getBasicData('Interference_Source')
const emit = defineEmits(['onSubmit']) const emit = defineEmits(['onSubmit'])
const rules = reactive({ const rules = reactive({
@@ -60,8 +51,9 @@ const rules = reactive({
checker: [{ required: true, message: '请选择审核人', trigger: 'change' }], checker: [{ required: true, message: '请选择审核人', trigger: 'change' }],
fileList: [{ required: true, message: '请选择文件', trigger: 'change' }] fileList: [{ required: true, message: '请选择文件', trigger: 'change' }]
}) })
const auditList: any = ref([])
const title: any = ref('') const title: any = ref('')
const auditList: any = ref([])
const addData: any = ref({ const addData: any = ref({
orgNo: dictData.state.area[0].id, orgNo: dictData.state.area[0].id,
assetNumber: '', assetNumber: '',
@@ -73,7 +65,7 @@ const addData: any = ref({
}) })
const formRef = ref() const formRef = ref()
// 新增 // 新增
const config = (num?: number) => { const config = () => {
formRef.value.validate(async (valid: any) => { formRef.value.validate(async (valid: any) => {
if (valid) { if (valid) {
if (title.value == '新增设备退役申请单') { if (title.value == '新增设备退役申请单') {
@@ -87,7 +79,7 @@ const config = (num?: number) => {
assetNumber: addData.value.assetNumber, assetNumber: addData.value.assetNumber,
devNumber: addData.value.devNumber devNumber: addData.value.devNumber
}) })
addData.value.operate = num addData.value.operate = 1
addData.value.checkerName = auditList.value.find((item: any) => item.id == addData.value.checker).name addData.value.checkerName = auditList.value.find((item: any) => item.id == addData.value.checker).name
addFlow(addData.value).then((res: any) => { addFlow(addData.value).then((res: any) => {
ElMessage.success('新增成功!') ElMessage.success('新增成功!')
@@ -107,7 +99,7 @@ const config = (num?: number) => {
assetNumber: addData.value.assetNumber, assetNumber: addData.value.assetNumber,
devNumber: addData.value.devNumber devNumber: addData.value.devNumber
}) })
addData.value.operate = num addData.value.operate = 1
addData.value.checkerName = auditList.value.find((item: any) => item.id == addData.value.checker).name addData.value.checkerName = auditList.value.find((item: any) => item.id == addData.value.checker).name
update(addData.value).then((res: any) => { update(addData.value).then((res: any) => {
ElMessage.success('修改成功!') ElMessage.success('修改成功!')
@@ -118,11 +110,12 @@ const config = (num?: number) => {
} }
}) })
} }
// 审核
const audit = () => {}
// 重置 // 重置
const cancel = () => { const cancel = () => {
formRef.value.resetFields() formRef.value.resetFields()
emit('onSubmit') emit('onSubmit')
userAdd.value = false
} }
const open = (text: string, row?: any) => { const open = (text: string, row?: any) => {
if (row) { if (row) {
@@ -130,9 +123,19 @@ const open = (text: string, row?: any) => {
addData.value.assetNumber = row.applyForm.assetNumber addData.value.assetNumber = row.applyForm.assetNumber
addData.value.devNumber = row.applyForm.devNumber addData.value.devNumber = row.applyForm.devNumber
addData.value.fileList = [{ name: row.fileName, url: row.filePath }] addData.value.fileList = [{ name: row.fileName, url: row.filePath }]
} else {
addData.value = {
orgNo: dictData.state.area[0].id,
assetNumber: '',
devNumber: '',
fileList: [],
checker: '',
applyType: 4,
type: 5
}
} }
formRef.value.resetFields()
title.value = text title.value = text
userAdd.value = true
} }
// 取消 // 取消
@@ -151,7 +154,7 @@ const handleExceed: UploadProps['onExceed'] = files => {
upload.value!.handleStart(file) upload.value!.handleStart(file)
} }
defineExpose({ open }) defineExpose({ open, config, audit })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.el-upload-list__item) { :deep(.el-upload-list__item) {

30
src/views/pqs/supervise/retire/components/retire.vue
View File

@@ -8,7 +8,14 @@
<Table ref="tableRef" /> <Table ref="tableRef" />
</div> </div>
<!-- 新增编辑 --> <!-- 新增编辑 -->
<Equipment ref="EquipmentRef" @onSubmit="tableStore.index()" /> <el-dialog draggable :title="title" v-model="userAdd" width="500px">
<Equipment ref="EquipmentRef" @onSubmit="onSubmit" />
<div style="display: flex; justify-content: center; margin-top: 30px">
<el-button type="primary" class="ml20" @click="EquipmentRef.config()">保存</el-button>
<el-button class="ml20" @click="userAdd = false">取消</el-button>
</div>
</el-dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue' import { ref, onMounted, provide, nextTick } from 'vue'
@@ -21,10 +28,10 @@ import { deleteIssues } from '@/api/process-boot/electricitymanagement'
import { createCheckflow, getFileUrl } from '@/api/process-boot/retire' import { createCheckflow, getFileUrl } from '@/api/process-boot/retire'
import { useDictData } from '@/stores/dictData' import { useDictData } from '@/stores/dictData'
const dictData = useDictData() const userAdd = ref(false)
const TableHeaderRef = ref() const TableHeaderRef = ref()
const EquipmentRef = ref() const EquipmentRef = ref()
const problemData = dictData.getBasicData('Problem_Sources') const title: any = ref('')
defineOptions({ defineOptions({
name: '/Processsupervision/retire' name: '/Processsupervision/retire'
@@ -98,7 +105,11 @@ const tableStore: any = new TableStore({
icon: 'el-icon-Plus', icon: 'el-icon-Plus',
render: 'basicButton', render: 'basicButton',
click: async row => { click: async row => {
EquipmentRef.value.open('编辑设备退役申请单', row) userAdd.value = true
title.value = '编辑设备退役申请单'
nextTick(() => {
EquipmentRef.value.open('编辑设备退役申请单', row)
})
} }
}, },
@@ -190,6 +201,15 @@ onMounted(() => {
}) })
// 新增 // 新增
const add = () => { const add = () => {
EquipmentRef.value.open('新增设备退役申请单') userAdd.value = true
title.value = '新增设备退役申请单'
nextTick(() => {
EquipmentRef.value.open('新增设备退役申请单')
})
}
// 关闭
const onSubmit = () => {
tableStore.index()
userAdd.value = false
} }
</script> </script>