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 6028cff2fa
commit 3fbd7af3cc
7 changed files with 172 additions and 74 deletions
Show Stats Download Patch File Download Diff File

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

@ -213,6 +213,7 @@ export default {
if ( if (
[ [
"dyInformation",
"lineInformation", "lineInformation",
"towerInformation", "towerInformation",
"cameraChannel", "cameraChannel",

20
src/views/homePage/index.vue
Unescape Escape View File

@ -98,16 +98,30 @@
tooltip-effect="dark" tooltip-effect="dark"
height="calc(100% - 54px)" height="calc(100% - 54px)"
> >
<el-table-column prop="lineName" label="线路名称"></el-table-column> <el-table-column
<el-table-column prop="towerName" label="杆塔名称"></el-table-column> prop="lineName"
<el-table-column prop="cmdId" label="装置ID"></el-table-column> label="线路名称"
min-width="120"
></el-table-column>
<el-table-column
prop="towerName"
label="杆塔名称"
min-width="120"
></el-table-column>
<el-table-column
prop="cmdId"
label="装置ID"
min-width="120"
></el-table-column>
<el-table-column <el-table-column
prop="hearttime" prop="hearttime"
label="最新心跳时间" label="最新心跳时间"
min-width="120"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="pictime" prop="pictime"
label="最新图片拍照时间" label="最新图片拍照时间"
min-width="120"
></el-table-column> ></el-table-column>
<el-table-column prop="isonline" label="是否在线"></el-table-column> <el-table-column prop="isonline" label="是否在线"></el-table-column>
<el-table-column prop="longitude" label="经度"></el-table-column> <el-table-column prop="longitude" label="经度"></el-table-column>

58
src/views/photographicDevice/index.vue
Unescape Escape View File

@ -174,7 +174,7 @@
v-else-if="scope.row.onlinestatus == 0" v-else-if="scope.row.onlinestatus == 0"
>离线</span >离线</span
> >
<span style="color: #e6a23c" v-else>休眠</span> <!-- <span style="color: #e6a23c" v-else>休眠</span> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -234,7 +234,7 @@
<el-table-column <el-table-column
fixed="right" fixed="right"
label="操作" label="操作"
width="420" width="320"
v-if="roleUser != 2" v-if="roleUser != 2"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -264,7 +264,7 @@
> >
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button <!-- <el-button
:disabled=" :disabled="
scope.row.onlinestatus == 0 || scope.row.onlinestatus != 1 scope.row.onlinestatus == 0 || scope.row.onlinestatus != 1
" "
@ -279,7 +279,7 @@
@click.native.stop="handlehqSet(scope.row)" @click.native.stop="handlehqSet(scope.row)"
type="text" type="text"
>唤起</el-button >唤起</el-button
> > -->
<el-button <el-button
@click.native.stop="handleParameterSet(scope.row)" @click.native.stop="handleParameterSet(scope.row)"
type="text" type="text"
@ -456,31 +456,31 @@ export default {
this.terminalList(); this.terminalList();
}, },
methods: { methods: {
//休眠 // //休眠
handlexmSet(row) { // handlexmSet(row) {
console.log(row); // console.log(row);
this.$message({ // this.$message({
duration: 1000, // duration: 1000,
type: "success", // type: "success",
message: "休眠命令已下发...", // message: "休眠命令已下发...",
showClose: true, // showClose: true,
}); // });
setTimeout(() => { // setTimeout(() => {
row.onlinestatus = -1; // row.onlinestatus = -1;
}, 1500); // }, 1500);
}, // },
//唤起 // //唤起
handlehqSet(row) { // handlehqSet(row) {
this.$message({ // this.$message({
duration: 1000, // duration: 1000,
type: "success", // type: "success",
message: "唤起命令已下发...", // message: "唤起命令已下发...",
showClose: true, // showClose: true,
}); // });
setTimeout(() => { // setTimeout(() => {
row.onlinestatus = 1; // row.onlinestatus = 1;
}, 1500); // }, 1500);
}, // },
getRowKeys(row) { getRowKeys(row) {
return row.id; return row.id;
}, },

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

@ -37,10 +37,17 @@
> >
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<div class="photoinfo">
<el-form-item label="照片大小" class="photoSize"> <el-form-item label="照片大小" class="photoSize">
<el-input v-model="channelForm.resolutionCX"></el-input> <el-input v-model="channelForm.resolutionCX"></el-input>
<el-input v-model="channelForm.resolutionCY"></el-input> <el-input v-model="channelForm.resolutionCY"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="压缩率">
<el-input v-model="channelForm.ysl"></el-input>
<span class="infoSpan">(0-100的整数)</span>
</el-form-item>
</div>
<div class="picZoomClass"> <div class="picZoomClass">
<el-form-item label="图片放大"> <el-form-item label="图片放大">
<el-radio-group v-model="channelForm.isImageZoomEnabled"> <el-radio-group v-model="channelForm.isImageZoomEnabled">
@ -80,10 +87,7 @@
<span class="infoSpan">(秒)</span> <span class="infoSpan">(秒)</span>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item label="压缩率">
<el-input v-model="channelForm.ysl"></el-input>
<span class="infoSpan">(0-100的整数)</span>
</el-form-item>
<el-form-item label="参数设置"> <el-form-item label="参数设置">
<el-checkbox <el-checkbox
label="USB接口" label="USB接口"
@ -118,6 +122,7 @@
v-model="channelForm.ywchecked" v-model="channelForm.ywchecked"
></el-checkbox> ></el-checkbox>
</el-form-item> </el-form-item>
<div class="roteAiBox">
<el-form-item label="旋转角度"> <el-form-item label="旋转角度">
<el-select v-model="channelForm.roteval" placeholder="请选择"> <el-select v-model="channelForm.roteval" placeholder="请选择">
<el-option <el-option
@ -140,6 +145,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div>
<el-form-item label="左上OSD"> <el-form-item label="左上OSD">
<el-input v-model="channelForm.ltosd"></el-input> <el-input v-model="channelForm.ltosd"></el-input>
<span class="infoSpan">(多行使用\n换行)</span> <span class="infoSpan">(多行使用\n换行)</span>
@ -200,8 +207,8 @@ export default {
videoDuration: 15, videoDuration: 15,
ysl: 80, ysl: 80,
usbchecked: "", usbchecked: "",
zzdjchecked: "", zzdjchecked: 1,
zdbgchecked: "", zdbgchecked: 1,
bgsj: "", bgsj: "",
iso: "", iso: "",
hdrchecked: "", hdrchecked: "",
@ -804,8 +811,8 @@ export default {
this.channelForm.zzbh = ""; this.channelForm.zzbh = "";
this.channelForm.ysl = 80; this.channelForm.ysl = 80;
this.channelForm.usbchecked = ""; this.channelForm.usbchecked = "";
this.channelForm.zzdjchecked = ""; this.channelForm.zzdjchecked = 1;
this.channelForm.zdbgchecked = ""; this.channelForm.zdbgchecked = 1;
this.channelForm.bgsj = ""; this.channelForm.bgsj = "";
this.channelForm.iso = ""; this.channelForm.iso = "";
this.channelForm.hdrchecked = ""; this.channelForm.hdrchecked = "";
@ -859,6 +866,18 @@ export default {
} }
} }
} }
.photoinfo {
display: flex;
.el-input {
width: 80px;
}
}
.roteAiBox {
display: flex;
.el-input {
width: 150px;
}
}
.picZoomClass { .picZoomClass {
display: flex; display: flex;

64
src/views/reportData/equipmentStatus/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="equipmentStatusBox"> <div class="equipmentStatusBox" ref="statisRef">
<div class="searchBox" ref="searchref"> <div class="searchBox" ref="searchref" v-if="drawerSearch">
<el-form :inline="true" :model="formdata" class="demo-form-inline"> <el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item label="电压等级" class="dyclass"> <el-form-item label="电压等级" class="dyclass">
<el-select v-model="formdata.dyid" @change="getSearchxl"> <el-select v-model="formdata.dyid" @change="getSearchxl">
@ -76,7 +76,7 @@
tooltip-effect="dark" tooltip-effect="dark"
stripe stripe
style="width: 100%" style="width: 100%"
height="calc(100% - 0px)" :height="tableheight"
fit fit
> >
<template slot="empty"> <template slot="empty">
@ -88,10 +88,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="dyName" label="电压等级" fixed> </el-table-column> <el-table-column prop="dyName" label="电压等级" fixed show-overflow-tooltip> </el-table-column>
<el-table-column prop="lineName" label="线路名称" min-width="180" fixed> </el-table-column> <el-table-column prop="lineName" label="线路名称" min-width="180" fixed> </el-table-column>
<el-table-column prop="towerName" label="杆塔名称" min-width="180" show-overflow-tooltip fixed> </el-table-column> <el-table-column prop="towerName" label="杆塔名称" min-width="180" show-overflow-tooltip fixed> </el-table-column>
<el-table-column prop="displayName" label="设备名称" min-width="180" fixed> </el-table-column> <!-- <el-table-column prop="displayName" label="设备名称" min-width="180" fixed> </el-table-column> -->
<el-table-column prop="cmdid" label="装置id" min-width="180" fixed> <el-table-column prop="cmdid" label="装置id" min-width="180" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.cmdid }} {{ scope.row.cmdid }}
@ -100,7 +100,20 @@
</el-table-column> </el-table-column>
<el-table-column prop="sim" label="SIM卡号" min-width="180"> </el-table-column> <el-table-column prop="sim" label="SIM卡号" min-width="180"> </el-table-column>
<el-table-column prop="netType" label="网络类型"> </el-table-column> <el-table-column prop="netType" label="网络类型"> </el-table-column>
<el-table-column prop="onlinestatus" label="状态"> </el-table-column> <el-table-column prop="onlinestatus" label="状态">
<template slot-scope="scope">
<span style="color: #169e8c" v-if="scope.row.onlinestatus == 1"
>在线</span
>
<span
style="color: #f56c6c"
v-else-if="scope.row.onlinestatus == 0"
>离线</span
>
</template>
</el-table-column>
<el-table-column prop="model" label="装置型号" min-width="120"> </el-table-column> <el-table-column prop="model" label="装置型号" min-width="120"> </el-table-column>
<el-table-column prop="bsManufacturer" label="装置厂家"> </el-table-column> <el-table-column prop="bsManufacturer" label="装置厂家"> </el-table-column>
<el-table-column prop="protocolName" label="规约版本" min-width="180"> </el-table-column> <el-table-column prop="protocolName" label="规约版本" min-width="180"> </el-table-column>
@ -222,6 +235,8 @@ export default {
pageSize: 20, // 每页数量 pageSize: 20, // 每页数量
total: 0, //总条数 total: 0, //总条数
termLoading: false, termLoading: false,
drawerSearch: false,
tableheight: "100%",
}; };
}, },
created() {}, created() {},
@ -331,6 +346,24 @@ export default {
// handleShowIp(row) { // handleShowIp(row) {
// this.$refs.ipDialogref.display(row); // this.$refs.ipDialogref.display(row);
// }, // },
showSearch() {
this.drawerSearch = !this.drawerSearch;
console.log(this.drawerSearch);
this.$nextTick(() => {
if (this.drawerSearch) {
// 如果抽屉现在是可见的，获取其高度
console.log(this.$refs.statisRef.offsetHeight);
const searchBoxHeight = this.$refs.searchref.offsetHeight;
console.log("搜索框的高度:", searchBoxHeight);
this.tableheight =
this.$refs.statisRef.offsetHeight - searchBoxHeight - 36;
console.log(this.tableheight);
} else {
this.tableheight = "100%";
}
});
},
}, },
}; };
</script> </script>
@ -366,7 +399,7 @@ export default {
} }
} }
.deviceTable { .deviceTable {
height: calc(100% - 94px); height: calc(100% - 32px);
//background: #fcc; //background: #fcc;
.el-table { .el-table {
.cell { .cell {
@ -374,6 +407,23 @@ export default {
vertical-align: middle; /* 如果需要垂直居中 */ vertical-align: middle; /* 如果需要垂直居中 */
} }
} }
.el-table {
color: #000;
thead {
color: #000;
font-weight: bold;
}
th.el-table__cell {
background: #dcdcdc !important;
}
td.el-table__cell,
th.el-table__cell.is-leaf {
border-bottom: 1px solid #dcdcdc;
}
.el-table__cell {
border-right: 1px solid #dcdcdc;
}
}
} }
} }
</style> </style>

5
src/views/reportData/index.vue
Unescape Escape View File

@ -18,6 +18,7 @@
<span slot="label"> <span slot="label">
设备状态列表 设备状态列表
<el-button <el-button
@click.stop="handlestatusSearch"
v-if="statusFlag" v-if="statusFlag"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -76,6 +77,10 @@ export default {
console.log("aaaaaaaaaaaa"); console.log("aaaaaaaaaaaa");
this.$refs.photoStatisRef.showSearch(); this.$refs.photoStatisRef.showSearch();
}, },
handlestatusSearch() {
console.log("bbbbbb");
this.$refs.equipmentStatusRef.showSearch();
},
}, },
}; };
</script> </script>

11
src/views/reportData/photostatis/index.vue
Unescape Escape View File

@ -106,7 +106,12 @@
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column prop="cmdid" label="装置id" min-width="140"> <el-table-column
prop="cmdid"
label="装置id"
min-width="140"
show-overflow-tooltip
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
type="primary" type="primary"
@ -122,6 +127,7 @@
prop="lastHeartbeat" prop="lastHeartbeat"
label="最后心跳时间" label="最后心跳时间"
min-width="130" min-width="130"
show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-link <el-link
@ -142,6 +148,7 @@
prop="firstPhotoTime" prop="firstPhotoTime"
label="当天第一张照片时间" label="当天第一张照片时间"
min-width="130" min-width="130"
show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.photoInfo.firstPhotoTime }} {{ scope.row.photoInfo.firstPhotoTime }}
@ -151,6 +158,7 @@
prop="lastRecvTime" prop="lastRecvTime"
label="照片最后接收时间" label="照片最后接收时间"
min-width="130" min-width="130"
show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.photoInfo.lastRecvTime }} {{ scope.row.photoInfo.lastRecvTime }}
@ -161,6 +169,7 @@
prop="workingStatus.bootTime" prop="workingStatus.bootTime"
label="最后重启时间" label="最后重启时间"
min-width="130" min-width="130"
show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ {{

Write Preview
Loading…
Cancel
Save