ly.fan
/
xy-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

覆冰数据优化

Browse Source
jc
fanluyan 12 months ago
parent 7f8d952032
commit f676381bc6
2 changed files with 307 additions and 47 deletions
Show Stats Download Patch File Download Diff File

350
src/views/iceWeather/icing/index.vue
Unescape Escape View File

@ -58,6 +58,7 @@
</div> </div>
<div class="childTableShowBox" v-if="!echartsShow"> <div class="childTableShowBox" v-if="!echartsShow">
<el-table <el-table
v-if="!gantatable"
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
v-loading="loading" v-loading="loading"
@ -73,16 +74,203 @@
min-width="120px" min-width="120px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.updateTime"> <span v-if="scope.row.lastLeadPulls !== null">
{{ {{
$moment(scope.row.updateTime * 1000).format( $moment(
"YYYY-MM-DD HH:mm:ss" scope.row.lastLeadPulls.updateTime * 1000
) ).format("YYYY-MM-DD HH:mm:ss")
}}</span }}</span
> >
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="funcCode" label="功能单元识别码">
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span
v-if="
scope.row.lastLeadPulls.phase !== '' &&
scope.row.lastLeadPulls.funcCode
"
>
{{ scope.row.lastLeadPulls.phase }}({{
scope.row.lastLeadPulls.funcCode
}})</span
><span v-else-if="scope.row.lastLeadPulls.funcCode"
>({{ scope.row.lastLeadPulls.funcCode }})</span
>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="maxpullPull" label="最大拉力(Kg)">
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.maxpullPull != 65535">
{{ scope.row.lastLeadPulls.maxpullPull }}</span
><span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="maxpullWind" label="最大拉力时风偏角(°)">
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.maxpullWind != 65535">
{{ scope.row.lastLeadPulls.maxpullWind }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="maxpullTilt" label="最大拉力时倾斜角(°)">
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.maxpullTilt != 65535">
{{ scope.row.lastLeadPulls.maxpullTilt }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="minpullPull" label="最小拉力(Kg)">
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.minpullPull != 65535">
{{ scope.row.lastLeadPulls.minpullPull }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="minpullWind" label="最小拉力时风偏角(°)">
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.minpullWind != 65535">
{{ scope.row.lastLeadPulls.minpullWind }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="minpullTilt" label="最小拉力时倾斜角(°)">
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.minpullTilt != 65535">
{{ scope.row.lastLeadPulls.minpullTilt }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="maxwindWind" label="最大风偏角(°)">
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.maxwindWind != 65535">
{{ scope.row.lastLeadPulls.maxwindWind }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column
prop="maxwindTilt"
label="最大风偏角时倾斜角(°)"
>
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.maxwindTilt != 65535">
{{ scope.row.lastLeadPulls.maxwindTilt }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column
prop="maxwindPull"
label="最大风偏角时拉力(Kg)"
>
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.maxwindPull != 65535">
{{ scope.row.lastLeadPulls.maxwindPull }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="minwindWind" label="最小风偏角(°)">
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.minwindWind != 65535">
{{ scope.row.lastLeadPulls.minwindWind }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column
prop="minwindTilt"
label="最小风偏角时倾斜角(°)"
>
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.minwindTilt != 65535">
{{ scope.row.lastLeadPulls.minwindTilt }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column
prop="minwindPull"
label="最小风偏角时拉力(Kg)"
>
<template slot-scope="scope">
<span v-if="scope.row.lastLeadPulls !== null">
<span v-if="scope.row.lastLeadPulls.minwindPull != 65535">
{{ scope.row.lastLeadPulls.minwindPull }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
</el-table>
<el-table
v-else
:data="tableData"
style="width: 100%"
v-loading="loading"
height="calc(100% - 0px)"
>
<el-table-column
prop="cmdid"
label="监测终端编号"
></el-table-column>
<el-table-column
prop="updateTime"
label="时间"
min-width="120px"
>
<template slot-scope="scope">
{{
$moment(scope.row.updateTime * 1000).format(
"YYYY-MM-DD HH:mm:ss"
)
}}
</template>
</el-table-column>
<el-table-column prop="funcCode" label="功能单元识别码"> <el-table-column prop="funcCode" label="功能单元识别码">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.phase !== '' && scope.row.funcCode"> <span v-if="scope.row.phase !== '' && scope.row.funcCode">
@ -90,84 +278,150 @@
><span v-else-if="scope.row.funcCode" ><span v-else-if="scope.row.funcCode"
>({{ scope.row.funcCode }})</span >({{ scope.row.funcCode }})</span
> >
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="maxpullPull" label="最大拉力(Kg)"> <el-table-column prop="maxpullPull" label="最大拉力(Kg)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.maxpullPull != 65535"> <span v-if="scope.row !== null">
{{ scope.row.maxpullPull }}</span <span v-if="scope.row.maxpullPull != 65535">
> {{ scope.row.maxpullPull }}</span
><span v-else> - </span>
</span>
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="maxpullWind" label="最大拉力时风偏角(°)"> <el-table-column prop="maxpullWind" label="最大拉力时风偏角(°)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.maxpullWind != 65535"> <span v-if="scope.row !== null">
{{ scope.row.maxpullWind }}</span <span v-if="scope.row.maxpullWind != 65535">
> {{ scope.row.maxpullWind }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="maxpullTilt" label="最大拉力时倾斜角(°)"> <el-table-column prop="maxpullTilt" label="最大拉力时倾斜角(°)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.maxpullTilt != 65535"> <span v-if="scope.row !== null">
{{ scope.row.maxpullTilt }}</span <span v-if="scope.row.maxpullTilt != 65535">
> {{ scope.row.maxpullTilt }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="minpullPull" label="最小拉力(Kg)"> <el-table-column prop="minpullPull" label="最小拉力(Kg)">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.minpullPull != 65535"> <span v-if="scope.row !== null">
{{ scope.row.minpullPull }}</span <span v-if="scope.row.minpullPull != 65535">
> {{ scope.row.minpullPull }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="minpullWind" label="最小拉力时风偏角(°)">
<template slot-scope="scope">
<span v-if="scope.row !== null">
<span v-if="scope.row.minpullWind != 65535">
{{ scope.row.minpullWind }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="minpullTilt" label="最小拉力时倾斜角(°)">
<template slot-scope="scope">
<span v-if="scope.row !== null">
<span v-if="scope.row.minpullTilt != 65535">
{{ scope.row.minpullTilt }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="maxwindWind" label="最大风偏角(°)">
<template slot-scope="scope">
<span v-if="scope.row !== null">
<span v-if="scope.row.maxwindWind != 65535">
{{ scope.row.maxwindWind }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="minpullWind"
label="最小拉力时风偏角(°)"
></el-table-column>
<el-table-column
prop="minpullTilt"
label="最小拉力时倾斜角(°)"
></el-table-column>
<el-table-column
prop="maxwindWind"
label="最大风偏角(°)"
></el-table-column>
<el-table-column <el-table-column
prop="maxwindTilt" prop="maxwindTilt"
label="最大风偏角时倾斜角(°)" label="最大风偏角时倾斜角(°)"
></el-table-column> >
<template slot-scope="scope">
<span v-if="scope.row !== null">
<span v-if="scope.row.maxwindTilt != 65535">
{{ scope.row.maxwindTilt }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="maxwindPull" prop="maxwindPull"
label="最大风偏角时拉力(Kg)" label="最大风偏角时拉力(Kg)"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.maxwindPull != 65535"> <span v-if="scope.row !== null">
{{ scope.row.maxwindPull }}</span <span v-if="scope.row.maxwindPull != 65535">
> {{ scope.row.maxwindPull }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="minwindWind" label="最小风偏角(°)">
<template slot-scope="scope">
<span v-if="scope.row !== null">
<span v-if="scope.row.minwindWind != 65535">
{{ scope.row.minwindWind }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="minwindWind"
label="最小风偏角(°)"
></el-table-column>
<el-table-column <el-table-column
prop="minwindTilt" prop="minwindTilt"
label="最小风偏角时倾斜角(°)" label="最小风偏角时倾斜角(°)"
></el-table-column> >
<template slot-scope="scope">
<span v-if="scope.row !== null">
<span v-if="scope.row.minwindTilt != 65535">
{{ scope.row.minwindTilt }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="minwindPull" prop="minwindPull"
label="最小风偏角时拉力(Kg)" label="最小风偏角时拉力(Kg)"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.minwindPull != 65535"> <span v-if="scope.row !== null">
{{ scope.row.minwindPull }}</span <span v-if="scope.row.minwindPull != 65535">
> {{ scope.row.minwindPull }}</span
>
<span v-else> - </span>
</span>
<span v-else> - </span> <span v-else> - </span>
</template> </template>
</el-table-column> </el-table-column>
@ -236,6 +490,8 @@ export default {
chartsData: [], chartsData: [],
dyFlag: true, dyFlag: true,
lineFlag: false, lineFlag: false,
gantatable: false, //点击了装置之后，显示的数据
}; };
}, },
watch: { watch: {
@ -281,9 +537,10 @@ export default {
console.log("电压-公司"); console.log("电压-公司");
this.dyFlag = true; this.dyFlag = true;
this.lineFlag = true; this.lineFlag = true;
this.gantatable = false;
pullParams = { pullParams = {
dyId: data.id, dyId: data.id,
pageNum: this.page, pageNum: 1,
pageSize: this.pageSize, pageSize: this.pageSize,
start: sTime, start: sTime,
end: eTime, end: eTime,
@ -293,10 +550,11 @@ export default {
} else if (data.bsManufacturer) { } else if (data.bsManufacturer) {
this.dyFlag = false; this.dyFlag = false;
this.lineFlag = true; this.lineFlag = true;
this.gantatable = false;
console.log("线路-电压"); console.log("线路-电压");
pullParams = { pullParams = {
lineId: data.id, lineId: data.id,
pageNum: this.page, pageNum: 1,
pageSize: this.pageSize, pageSize: this.pageSize,
start: sTime, start: sTime,
end: eTime, end: eTime,
@ -307,16 +565,18 @@ export default {
this.dyFlag = false; this.dyFlag = false;
this.lineFlag = false; this.lineFlag = false;
console.log("装置-杆塔"); console.log("装置-杆塔");
this.gantatable = true;
// const sTime = Math.floor(this.formdata.starttime / 1000); // const sTime = Math.floor(this.formdata.starttime / 1000);
// const eTime = Math.floor(this.formdata.endtime / 1000); // const eTime = Math.floor(this.formdata.endtime / 1000);
console.log(data); console.log(data);
pullParams = { pullParams = {
lineId: data.lineid, lineId: data.lineid,
termId: data.id, termId: data.id,
towerId: data.towerid, towerId: data.towerid,
start: sTime, start: sTime,
end: eTime, end: eTime,
pageNum: this.page, pageNum: 1,
pageSize: this.pageSize, pageSize: this.pageSize,
}; };
this.getIcingListData(pullParams); this.getIcingListData(pullParams);
@ -331,8 +591,8 @@ export default {
.then((res) => { .then((res) => {
console.log(res); console.log(res);
this.tableData = res.data.list.map((item) => item.lastLeadPulls); // this.tableData = res.data.list.map((item) => item.lastLeadPulls);
// this.tableData = res.data.list; this.tableData = res.data.list;
this.total = res.data.total; this.total = res.data.total;
this.loading = false; this.loading = false;
this.echartsShow = false; this.echartsShow = false;

4
vue.config.js
Unescape Escape View File

@ -23,8 +23,8 @@ module.exports = defineConfig({
//表示拦截以/api开头的请求路径 //表示拦截以/api开头的请求路径
//target: "http://192.168.1.190:8080", //190 需要去掉/Api //target: "http://192.168.1.190:8080", //190 需要去掉/Api
target: "http://61.169.135.146:9911/", //运维 覆冰 // target: "http://61.169.135.146:9911/", //运维 覆冰
//target: "http://61.169.135.146:40080/", //dell target: "http://61.169.135.146:40080/", //dell
changOrigin: true, //是否开启跨域 changOrigin: true, //是否开启跨域
pathRewrite: { pathRewrite: {
"^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的 "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的

Write Preview
Loading…
Cancel
Save