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-12-11 16:14:08 +08:00
parent 9b952f2016
commit 16c25ddf6b
28 changed files with 338 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
View File

@@ -369,7 +369,7 @@ const rendering = (row: any) => {
yAxis: {
show: false
},
color: ['#77DA63', '#00BFF5', '#FFBF00', '#Ff6600', '#ff0000', '#07CCCA'],
color: ['#339966', '#00BFF5', '#FFBF00', '#Ff6600', '#ff0000', '#07CCCA'],
dataZoom: { show: false },
series: [
{

98
src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
View File

@@ -15,7 +15,8 @@
<el-form-item>
<el-button type="primary" icon="el-icon-Search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-Download" @click="exportTemplate">导出模板</el-button>
<el-upload action="" accept=".xlsx" :show-file-list="false" :auto-upload="false" :on-change="choose">
<el-upload action="" accept=".xlsx" :show-file-list="false" :auto-upload="false"
:on-change="choose">
<el-button type="primary" class="ml10" icon="el-icon-Upload">离线导入</el-button>
</el-upload>
<!-- <el-button type="primary" class="ml10" icon="el-icon-Ticket" @click="modelTrain">
@@ -51,13 +52,14 @@
<MyEChart :options="options2" />
</el-tab-pane>
<el-tab-pane label="谐波电流幅值" name="3" class="mt10" style="position: relative;">
<el-select v-model="harmonicValue" style="position: absolute;z-index:99;top:-10px; right: 185px; width: 80px"
placeholder="请选择谐波" @change="onSubmit">
<el-option v-for="item in harmonic" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
<el-select v-model="harmonicValue"
style="position: absolute;z-index:99;top:-10px; right: 185px; width: 80px"
placeholder="请选择谐波" @change="onSubmit">
<el-option v-for="item in harmonic" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
<MyEChart :options="options3" />
</el-tab-pane>
<el-tab-pane label="首端电压模型参数" name="4">
@@ -66,9 +68,10 @@
<vxe-colgroup field="group0" title="模型参数">
<vxe-column field="name" width="180" title="相别"></vxe-column>
</vxe-colgroup>
<vxe-column field="c" title="C"></vxe-column>
<vxe-column field="a" title="a"></vxe-column>
<vxe-column field="b" title="b"></vxe-column>
<vxe-column field="c" title="c"></vxe-column>
</vxe-table>
</el-tab-pane>
</el-tabs>
@@ -148,6 +151,7 @@ import {
getLineDetailData,
modelTraining
} from '@/api/advance-boot/bearingCapacity'
import { yMethod } from '@/utils/echartMethod'
import { useDictData } from '@/stores/dictData'
const props = defineProps(['rowList'])
const harmonic = harmonicOptions.filter(item => item.value < 26)
@@ -281,7 +285,7 @@ const onSubmit = async () => {
})
}
setEChart(1, res[0].data.data, '有功功率', 'w')
setEChart(2, res[1].data.data, '无功功率', 'w')
setEChart(2, res[1].data.data, '无功功率', 'Var')
setEChart(3, res[2].data.data, '谐波电流幅值', 'A')
showBtn.value = true
loading.value = false
@@ -307,24 +311,55 @@ const modelTrain = () => {
}
const setEChart = (val: any, data: any, text: string, name: string) => {
// console.log("🚀 ~ setEChart ~ data:", data.map(item => item.value))
let [min, max] = yMethod(data.map(item => item.value))
let options = {
title: {
text: text,
x: 'center',
textStyle: {
fontWeight: 'normal'
}
// textStyle: {
// fontWeight: 'normal'
// }
},
tooltip: {
axisPointer: {
type: 'cross',
label: {
color: '#fff',
fontSize: 16
}
},
textStyle: {
color: '#fff',
fontStyle: 'normal',
opacity: 0.35,
fontSize: 14
},
backgroundColor: 'rgba(0,0,0,0.55)',
borderWidth: 0,
},
xAxis: {
data: data.filter(item => item.phaseType == 'A').map(item => item.time),
// data: data.filter(item => item.phaseType == 'A').map(item => item.time),
name: '时间',
position: 'bottom' // 设置 x 轴在底部
type: 'time',
axisLabel: {
formatter: {
day: '{MM}-{dd}',
month: '{MM}',
year: '{yyyy}'
}
}
},
yAxis: {
type: 'value',
name: name,
max: Math.ceil(Math.max(...data.map(item => item.value))),
min: Math.floor(Math.min(...data.map(item => item.value)))
max: max,
min: min
// max: Math.ceil(Math.max(...data.map(item => item.value))),
// min: Math.floor(Math.min(...data.map(item => item.value)))
},
// legend: {
// data: ['A', 'B', 'C']
@@ -341,9 +376,10 @@ const setEChart = (val: any, data: any, text: string, name: string) => {
type: 'line',
// smooth: true,
symbol: 'none',
data: data
.filter(item => item.phaseType == 'A')
.map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3)))
data:
data
.filter(item => item.phaseType == 'A')
.map(item => (item.value == 3.1415926 ? '' : [item.time, item.value.toFixed(2)]))
},
{
name: 'B相',
@@ -352,7 +388,7 @@ const setEChart = (val: any, data: any, text: string, name: string) => {
symbol: 'none',
data: data
.filter(item => item.phaseType == 'B')
.map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3)))
.map(item => (item.value == 3.1415926 ? '' : [item.time, item.value.toFixed(2)]))
},
{
name: 'C相',
@@ -361,9 +397,24 @@ const setEChart = (val: any, data: any, text: string, name: string) => {
symbol: 'none',
data: data
.filter(item => item.phaseType == 'C')
.map(item => (item.value == 3.1415926 ? '' : item.value.toFixed(3)))
.map(item => (item.value == 3.1415926 ? '' : [item.time, item.value.toFixed(2)]))
}
]
],
options: {
dataZoom: [{
type: 'inside',
height: 13,
start: 0,
bottom: '20px',
end: 10
},
{
start: 0,
height: 13,
bottom: '20px',
end: 10
}]
}
}
val == 1
? (options1.value = options)
@@ -579,6 +630,7 @@ const handleNodeClick = (data: any, node: any) => {
margin-top: 5px;
color: blue;
}
.el-select {
min-width: 80px;
}

4
src/views/pqs/bearingCapacity/evaluationList/components/policy.vue
View File

@@ -89,8 +89,8 @@
<el-radio v-for="item in sign" :label="item.name">{{ item.name }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="用户名称：">
<el-input-number v-model="form.count" :disabled="disabled" :min="0" style="width: 100%" />
<el-form-item label="数量：">
<el-input-number v-model="form.count" :disabled="disabled" :min="0" :precision="0" :max="10000000" style="width: 100%" />
</el-form-item>
</el-form>
<template #footer>

62
src/views/pqs/bearingCapacity/evaluationList/index.vue
View File

@@ -4,11 +4,7 @@
<TableHeader datePicker ref="TableHeaderRef">
<template #select>
<el-form-item label="评估类型">
<el-select
v-model="tableStore.table.params.evaluateType"
clearable
placeholder="请选择评估类型"
>
<el-select v-model="tableStore.table.params.evaluateType" clearable placeholder="请选择评估类型">
<el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@@ -30,11 +26,7 @@
<el-tab-pane label="光伏电站承载能力评估" name="1" v-if="code == null || code == 1">
<photovoltaic :rowList="rowList" />
</el-tab-pane>
<el-tab-pane
label="充电站、电加热负荷、电气化铁路承载能力评估"
name="2"
v-if="code == null || code == 2"
>
<el-tab-pane label="充电站、电加热负荷、电气化铁路承载能力评估" name="2" v-if="code == null || code == 2">
<charge :rowList="rowList" />
</el-tab-pane>
</el-tabs>
@@ -75,7 +67,7 @@ const tableStore: any = new TableStore({
method: 'POST',
column: [
{
title: '序号',
width: '80',
formatter: (row: any) => {
@@ -102,22 +94,36 @@ const tableStore: any = new TableStore({
{
field: 'reslutLevel',
title: '评估结果',
type: 'html',
formatter: (row: any) => {
// 1-安全，2-III级预警，3-II级预警，4-I 级预警,5-禁止接入
return row.cellValue == 1
? '合格'
return `<span style="color: ${row.cellValue == 1
? '#339966'
: row.cellValue == 2
? 'III级预警'
: row.cellValue == 3
? 'II级预警'
: row.cellValue == 4
? 'I 级预警'
: row.cellValue == 5
? '禁止接入'
: row.cellValue == 6
? '允许接入'
: ''
? '#00BFF5'
: row.cellValue == 3
? '#FFBF00'
: row.cellValue == 4
? '#Ff6600'
: row.cellValue == 5
? '#ff0000'
: row.cellValue == 6
? '#07CCCA'
: ''
}">${row.cellValue == 1
? '安全'
: row.cellValue == 2
? 'III级预警'
: row.cellValue == 3
? 'II级预警'
: row.cellValue == 4
? 'I 级预警'
: row.cellValue == 5
? '禁止接入'
: row.cellValue == 6
? '允许接入'
: ''}</span>`
}
},
{ field: 'evaluateDate', title: '评估日期' },
@@ -165,7 +171,7 @@ const tableStore: any = new TableStore({
}
],
loadCallback: () => {}
loadCallback: () => { }
})
tableStore.table.params.evaluateType = ''
tableStore.table.params.id = dictData.state.area[0].id
@@ -179,10 +185,10 @@ const quit = () => {
onMounted(() => {
tableStore.index()
})
const addAssess=()=>{
const addAssess = () => {
addedShow.value = false
code.value = null
activeName.value='1'
code.value = null
activeName.value = '1'
}
// 配置
const configuration = () => {

9
src/views/pqs/bearingCapacity/userManagement/index.vue
View File

@@ -15,9 +15,9 @@
</TableHeader>
<Table ref="tableRef" />
<el-dialog draggable v-model="dialogVisible" :title="title" width="600" :before-close="handleClose">
<el-form ref="ruleFormRef" :model="form" label-width="180px" :disabled="disabled" :rules="rules">
<el-form ref="ruleFormRef" :model="form" label-width="auto" :disabled="disabled" :rules="rules">
<el-form-item label="用户名称：" prop="userName">
<el-input v-model.trim="form.userName" clearable placeholder="请输入用户名称" />
<el-input v-model.trim="form.userName" clearable placeholder="请输入用户名称" maxlength="32" show-word-limit/>
</el-form-item>
<el-form-item label="用户类型：" prop="userType">
<el-select v-model="form.userType" clearable placeholder="请选择用户类型" @change="useChange">
@@ -39,6 +39,8 @@
style="width: 100%"
v-model="form.protocolCapacity"
:min="0"
:precision="4"
:max="10000000"
placeholder="请输入用容量"
/>
</el-form-item>
@@ -51,6 +53,7 @@
clearable
v-model="form.area"
:autosize="{ minRows: 2, maxRows: 4 }"
maxlength="300" show-word-limit
type="textarea"
placeholder="请输入详细地址"
/>
@@ -271,12 +274,14 @@ const onSubmit = () => {
ElMessage.success('新增成功!')
dialogVisible.value = false
tableStore.index()
handleClose()
})
} else if (title.value == '编辑承载能力预评估用户') {
updateUse(form.value).then(res => {
ElMessage.success('修改成功!')
dialogVisible.value = false
tableStore.index()
handleClose()
})
}
}