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

覆冰样式优化

Browse Source
jc
fanluyan 1 year ago
parent ef2398b980
commit 6028cff2fa
7 changed files with 169 additions and 93 deletions
Show Stats Download Patch File Download Diff File

8
src/components/Sidebar.vue
Unescape Escape View File

@ -142,10 +142,10 @@ export default {
index: "/roleManagement",
title: "角色管理",
},
// {
// index: "/menuManagement",
// title: "菜单功能管理",
// },
{
index: "/menuManagement",
title: "菜单功能管理",
},
{
index: "/deviceUpgrade",
title: "升级管理",

11
src/utils/api/iceApi.js
Unescape Escape View File

@ -60,8 +60,19 @@ export function funccodeJoggle(data) {
url: "/xapi/funccode.php",
method: "get",
params: data,
headers: {
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
},
});
}
//导出覆冰数据
export function exportJoggle(data) {
return request({
url: "/xymanager/leadpulls/export",
method: "get",
params: data,
responseType: "blob",
});
}

4
src/views/iceWeather/components/leftTree.vue
Unescape Escape View File

@ -109,7 +109,7 @@ export default {
},
created() {
this.getLineTreeList(); //获取树状图
//this.companyVal = this.companyOptions[0].value;
this.companyVal = this.companyOptions[0].value;
},
methods: {
handleClick(val) {
@ -259,7 +259,7 @@ export default {
> .el-tree-node__content {
// 设置颜色
color: #fff;
background: #1c77ac;
background: #169e8c;
.custom-tree-node {
color: #fff;
//overflow: hidden;

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

@ -33,7 +33,10 @@
<el-button type="primary" @click="onSubmit">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="exportExcl"
<el-button
type="primary"
@click="exportExcl"
v-if="termalFlag"
>导出数据</el-button
>
</el-form-item>
@ -82,82 +85,88 @@
</el-table-column>
<el-table-column prop="funcCode" label="功能单元识别码">
<template slot-scope="scope">
<span v-if="scope.row.funcCodeName && scope.row.funcCode">
{{ scope.row.funcCodeName }}({{
scope.row.funcCodeHex
}})</span
><span v-else-if="scope.row.funcCodeHex"
>({{ scope.row.funcCodeHex }})</span
<span v-if="scope.row.phase !== '' && scope.row.funcCode">
{{ scope.row.phase }}({{ scope.row.funcCode }})</span
><span v-else-if="scope.row.funcCode"
>({{ scope.row.funcCode }})</span
>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="maxPull" label="最大拉力(Kg)">
<el-table-column prop="maxpullPull" label="最大拉力(Kg)">
<template slot-scope="scope">
<span v-if="scope.row.maxPull != 65535">
{{ scope.row.maxPull }}</span
<span v-if="scope.row.maxpullPull != 65535">
{{ scope.row.maxpullPull }}</span
>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column
prop="maxPullWind"
label="最大拉力时风偏角(°)"
></el-table-column>
<el-table-column
prop="maxPullTilt"
label="最大拉力时倾斜角(°)"
></el-table-column>
<el-table-column prop="minPull" label="最小拉力(Kg)">
<el-table-column prop="maxpullWind" label="最大拉力时风偏角(°)">
<template slot-scope="scope">
<span v-if="scope.row.minPull != 65535">
{{ scope.row.minPull }}</span
<span v-if="scope.row.maxpullWind != 65535">
{{ scope.row.maxpullWind }}</span
>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column prop="maxpullTilt" label="最大拉力时倾斜角(°)">
<template slot-scope="scope">
<span v-if="scope.row.maxpullTilt != 65535">
{{ scope.row.maxpullTilt }}</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.minpullPull != 65535">
{{ scope.row.minpullPull }}</span
>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column
prop="minPullWind"
prop="minpullWind"
label="最小拉力时风偏角(°)"
></el-table-column>
<el-table-column
prop="minPullTilt"
prop="minpullTilt"
label="最小拉力时倾斜角(°)"
></el-table-column>
<el-table-column
prop="maxWind"
prop="maxwindWind"
label="最大风偏角(°)"
></el-table-column>
<el-table-column
prop="maxWindTilt"
prop="maxwindTilt"
label="最大风偏角时倾斜角(°)"
></el-table-column>
<el-table-column
prop="maxWindPull"
prop="maxwindPull"
label="最大风偏角时拉力(Kg)"
>
<template slot-scope="scope">
<span v-if="scope.row.maxWindPull != 65535">
{{ scope.row.maxWindPull }}</span
<span v-if="scope.row.maxwindPull != 65535">
{{ scope.row.maxwindPull }}</span
>
<span v-else> - </span>
</template>
</el-table-column>
<el-table-column
prop="minWind"
prop="minwindWind"
label="最小风偏角(°)"
></el-table-column>
<el-table-column
prop="minWindTilt"
prop="minwindTilt"
label="最小风偏角时倾斜角(°)"
></el-table-column>
<el-table-column
prop="minWindPull"
prop="minwindPull"
label="最小风偏角时拉力(Kg)"
>
<template slot-scope="scope">
<span v-if="scope.row.minWindPull != 65535">
{{ scope.row.minWindPull }}</span
<span v-if="scope.row.minwindPull != 65535">
{{ scope.row.minwindPull }}</span
>
<span v-else> - </span>
</template>
@ -199,7 +208,11 @@
</template>
<script>
import leftTree from "../components/leftTree.vue";
import { LeadPullJoggle, leadpullsListJoggle } from "@/utils/api/iceApi";
import {
LeadPullJoggle,
leadpullsListJoggle,
exportJoggle,
} from "@/utils/api/iceApi";
export default {
name: "icing",
components: {
@ -221,6 +234,8 @@ export default {
echartsShow: false, //显示曲线图页面
codeList: [], //相位码
chartsData: [],
dyFlag: true,
lineFlag: false,
};
},
watch: {
@ -262,6 +277,8 @@ export default {
console.log(data);
if (data.dyValue) {
console.log("电压-公司");
this.dyFlag = true;
this.lineFlag = true;
pullParams = {
dyId: data.id,
pageNum: this.page,
@ -270,6 +287,8 @@ export default {
this.getIcingData(pullParams);
this.termalFlag = false;
} else if (data.bsManufacturer) {
this.dyFlag = false;
this.lineFlag = true;
console.log("线路-电压");
pullParams = {
lineId: data.id,
@ -279,17 +298,20 @@ export default {
this.getIcingData(pullParams);
this.termalFlag = false;
} else {
this.dyFlag = false;
this.lineFlag = false;
console.log("装置-杆塔");
const sTime = Math.floor(this.formdata.starttime / 1000);
const eTime = Math.floor(this.formdata.endtime / 1000);
console.log(data);
pullParams = {
lineId: data.lineId,
lineId: data.lineid,
termId: data.id,
towerId: data.towerId,
towerId: data.towerid,
start: sTime,
end: eTime,
pageNum: data.childpage,
pageSize: data.childpageSize,
pageNum: this.page,
pageSize: this.pageSize,
};
this.getIcingListData(pullParams);
this.termalFlag = true;
@ -302,7 +324,9 @@ export default {
LeadPullJoggle(data)
.then((res) => {
console.log(res);
this.tableData = res.data.list;
this.tableData = res.data.list.map((item) => item.lastLeadPulls);
// this.tableData = res.data.list;
this.total = res.data.total;
this.loading = false;
this.echartsShow = false;
@ -351,7 +375,7 @@ export default {
})
.then((res) => {
console.log(res);
this.chartsData = res.data;
this.chartsData = res.data.list;
this.$nextTick(() => {
this.drawLine();
});
@ -389,16 +413,16 @@ export default {
// var codename = [
// ...new Set(this.chartsData.map((item) => item.funcCodeName)),
// ];
var code = [...new Set(this.chartsData.map((item) => item.funcCodeHex))];
var code = [...new Set(this.chartsData.map((item) => item.funcCode))];
this.codeList = code;
// var finalData = [];
console.log(this.codeList);
const groupedData = this.chartsData.reduce((acc, item) => {
if (!acc[item.funcCodeHex]) {
acc[item.funcCodeHex] = [];
if (!acc[item.funcCode]) {
acc[item.funcCode] = [];
}
acc[item.funcCodeHex].push(item);
acc[item.funcCode].push(item);
return acc;
}, []);
@ -497,14 +521,14 @@ export default {
name: "最大拉力",
type: "line",
data: result[i].map((item) =>
item.maxPull == 65535 ? "" : item.maxPull
item.maxpullPull == 65535 ? "" : item.maxpullPull
),
},
{
name: "最小拉力",
type: "line",
data: result[i].map((item) =>
item.minPull == 65535 ? "" : item.minPull
item.minpullPull == 65535 ? "" : item.minpullPull
),
},
{
@ -512,7 +536,7 @@ export default {
type: "line",
data: result[i].map((item) =>
item.maxWindPull == 65535 ? "" : item.maxWindPull
item.maxwindPull == 65535 ? "" : item.maxwindPull
),
},
{
@ -520,7 +544,7 @@ export default {
type: "line",
data: result[i].map((item) =>
item.minWindPull == 65535 ? "" : item.minWindPull
item.minwindPull == 65535 ? "" : item.minwindPull
),
},
{
@ -528,56 +552,56 @@ export default {
type: "line",
yAxisIndex: 1,
// prettier-ignore
data: result[i].map((item) => item.maxPullWind),
data: result[i].map((item) => item.maxpullWind),
},
{
name: "最大拉力时倾斜角",
type: "line",
yAxisIndex: 1,
// prettier-ignore
data: result[i].map((item) => item.maxPullTilt),
data: result[i].map((item) => item.maxpullTilt),
},
{
name: "最小拉力时风偏角",
type: "line",
yAxisIndex: 1,
// prettier-ignore
data: result[i].map((item) => item.minPullWind),
data: result[i].map((item) => item.minpullWind),
},
{
name: "最小拉力时倾斜角",
type: "line",
yAxisIndex: 1,
// prettier-ignore
data: result[i].map((item) => item.minPullTilt),
data: result[i].map((item) => item.minpullTilt),
},
{
name: "最大风偏角",
type: "line",
yAxisIndex: 1,
// prettier-ignore
data:result[i].map((item) => item.maxWind),
data:result[i].map((item) => item.maxwindWind),
},
{
name: "最大风偏角时倾斜角",
type: "line",
yAxisIndex: 1,
// prettier-ignore
data:result[i].map((item) => item.maxWindTilt),
data:result[i].map((item) => item.maxwindTilt),
},
{
name: "最小风偏角",
type: "line",
yAxisIndex: 1,
// prettier-ignore
data: result[i].map((item) => item.minWind),
data: result[i].map((item) => item.minwindWind),
},
{
name: "最小风偏角时倾斜角",
type: "line",
yAxisIndex: 1,
// prettier-ignore
data: result[i].map((item) => item.minWindTilt),
data: result[i].map((item) => item.minwindTilt),
},
],
};
@ -603,49 +627,89 @@ export default {
exportExcl() {
const sTime = Math.floor(this.formdata.starttime / 1000);
const eTime = Math.floor(this.formdata.endtime / 1000);
// window.location.href = "/api/api/getOnlineTerminalListExcel?type=" + val;
window.location.href =
"/api/xapi/query.php?act=ice_weight&qt=" +
this.qt +
"&id=" +
this.id +
"&bt=" +
"/api/xymanager/leadpulls/export?+" +
"lineId=" +
this.paramsData.lineid +
"&termId=" +
this.paramsData.id +
"&towerId=" +
this.paramsData.towerid +
"&start=" +
sTime +
"&et=" +
eTime +
"&p=1&ps=20&exp=xls";
"&end=" +
eTime;
},
onSubmit() {
console.log(this.formdata.starttime, this.formdata.endtime);
// if (
// new Date(this.formdata.starttime).getDate() ===
// new Date(this.formdata.endtime).getDate()
// ) {
// this.getIcingData(this.paramsData);
// console.log("开始时间和结束时间为同一天");
// } else {
// this.$message({
// duration: 1500,
// showClose: true,
// message: "请选择同一天",
// type: "warning",
// });
// return;
// console.log("开始时间和结束时间不是同一天");
// }
this.getIcingData(this.paramsData);
},
//点击分页
handleCurrentChange(val) {
this.page = val;
this.tableData = [];
this.getIcingData(this.paramsData);
const sTime = Math.floor(this.formdata.starttime / 1000);
const eTime = Math.floor(this.formdata.endtime / 1000);
if (this.dyFlag) {
let pullParams = {
dyId: this.paramsData.id,
pageNum: this.page,
pageSize: this.pageSize,
};
this.getIcingData(pullParams);
} else if (this.lineFlag) {
let pullParams = {
lineId: this.paramsData.id,
pageNum: this.page,
pageSize: this.pageSize,
};
this.getIcingData(pullParams);
} else if (this.termalFlag) {
let pullParams = {
lineId: this.paramsData.lineid,
termId: this.paramsData.id,
towerId: this.paramsData.towerid,
start: sTime,
end: eTime,
pageNum: this.page,
pageSize: this.pageSize,
};
this.getIcingListData(pullParams);
}
},
//每页条数
handleSizeChange(val) {
this.pageSize = val;
this.tableData = [];
this.getIcingData(this.paramsData);
const sTime = Math.floor(this.formdata.starttime / 1000);
const eTime = Math.floor(this.formdata.endtime / 1000);
if (this.dyFlag) {
let pullParams = {
dyId: this.paramsData.id,
pageNum: this.page,
pageSize: this.pageSize,
};
this.getIcingData(pullParams);
} else if (this.lineFlag) {
let pullParams = {
lineId: this.paramsData.id,
pageNum: this.page,
pageSize: this.pageSize,
};
this.getIcingData(pullParams);
} else if (this.termalFlag) {
let pullParams = {
lineId: this.paramsData.lineid,
termId: this.paramsData.id,
towerId: this.paramsData.towerid,
start: sTime,
end: eTime,
pageNum: this.page,
pageSize: this.pageSize,
};
this.getIcingListData(pullParams);
}
},
},
};

5
src/views/iceWeather/weather/index.vue
Unescape Escape View File

@ -406,7 +406,7 @@ export default {
.then((res) => {
console.log(res);
this.childTableDate = res.data.list;
//this.childtotal = Number(res.page.totalRecords);
this.childtotal = res.data.total;
this.loading = false;
//获取温度折线图
this.getAllData(row);
@ -424,12 +424,13 @@ export default {
towerId: row.towerId,
start: sTime,
end: eTime,
pageNum: this.childpage,
pageNum: 1,
pageSize: 1000,
})
.then((res) => {
console.log(res);
this.echartsData = res.data.list;
//获取温度折线图
this.getEchart4(this.echartsData);
this.getEchart5(this.echartsData);

2
src/views/realTimeMonitor/components/setChannelDialog.vue
Unescape Escape View File

@ -192,7 +192,7 @@ export default {
selectChannel: "",
resolutionCX: "",
resolutionCY: "",
isImageZoomEnabled: 1,
isImageZoomEnabled: 0,
zoomVal: 1,
videoSize: "",
videoCX: "",

2
vue.config.js
Unescape Escape View File

@ -22,7 +22,7 @@ module.exports = defineConfig({
"/api": {
//表示拦截以/api开头的请求路径
//target: "http://180.166.218.222:40080", //dell
// target: "http://192.168.1.190:8080", //liu 本机ip 需要去掉/Api
//target: "http://192.168.1.190:8080", //liu 本机ip 需要去掉/Api
//target: "http://192.168.50.7:8093", //liu 本机ip 需要去掉/Api
target: "http://192.168.111.211:80", //东视
changOrigin: true, //是否开启跨域

Write Preview
Loading…
Cancel
Save