告警模块、通道昵称、bug

master
13703816893 2 years ago
parent 9cdfef7f50
commit 8da6bb5232

@ -72,12 +72,11 @@
height="calc(100% - 40px)"
@row-click="handleRowClick"
>
<el-table-column min-width="35">
<el-table-column min-width="45" label="序号">
<template slot-scope="scope">
<span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column type="selection" min-width="25"> </el-table-column>
<el-table-column
prop="alarmTime"
label="告警时间"
@ -86,32 +85,32 @@
:formatter="dateFormat"
>
</el-table-column>
<el-table-column prop="alarmLevel" label="告警级别" min-width="75">
<el-table-column prop="alarmLevel" label="电压等级" min-width="75">
</el-table-column>
<el-table-column
prop="lineName"
label="线路"
label="线路名称"
min-width="105"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
prop="meid"
label="杆塔"
label="杆塔名称"
min-width="115"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
prop="orientationName"
label="监拍朝向"
label="设备名称"
min-width="95"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
prop="companyName"
label="单位"
label="设备编号"
min-width="75"
:show-overflow-tooltip="true"
>
@ -123,28 +122,6 @@
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
prop="source"
label="分析来源"
min-width="105"
:show-overflow-tooltip="true"
>
<template>后端分析</template></el-table-column
>
<el-table-column
prop="clearDistace"
label="净空距离"
min-width="105"
:show-overflow-tooltip="true"
><template>未分析</template>
</el-table-column>
<el-table-column
prop="distanceLevel"
label="距离分级"
min-width="85"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
prop="isRead"
label="是否已读"
@ -171,13 +148,13 @@
<div class="alarmPic">
<div class="imgshow"><img :src="photoPic" /></div>
<div class="editorBtn">
<el-button type="primary">处理</el-button>
<!-- <el-button type="primary">处理</el-button>
<el-button type="primary">查看操作详情</el-button>
<el-button type="primary">设置非警告区域</el-button>
<el-button type="primary">主动拍照</el-button>
<el-button type="primary">转向GT</el-button>
<el-button type="primary">复制</el-button>
<el-button type="primary">历史图</el-button>
<el-button type="primary">复制</el-button> -->
<el-button type="primary">主动拍照</el-button>
<el-button type="primary">历史图片</el-button>
</div>
</div>
</div>
@ -367,7 +344,7 @@ export default {
justify-content: space-between;
.imgshow {
width: 100%;
height: 90%;
height: 100%;
img {
width: 100%;
height: 100%;
@ -375,9 +352,9 @@ export default {
}
.editorBtn {
margin-top: 8px;
border: 1px solid @border-color-base;
padding: 2%;
border-radius: 4px;
// border: 1px solid @border-color-base;
padding-top: 5px;
// border-radius: 4px;
}
.editorBtn {
display: flex;

@ -61,9 +61,10 @@
<el-select
v-model="channellist.channelVal"
placeholder="请选择通道号"
@change="changeHandle"
>
<el-option
v-for="item in channelOptions"
v-for="item in filterOption"
:key="item.id"
:label="item.channelname"
:value="item.id"
@ -146,6 +147,7 @@ export default {
isShow: false,
formInfo: {},
channelOptions: [], //
filterOption:[],//
lineOptions: [], //线
toweridOptions: [], //
rules: {
@ -175,34 +177,36 @@ export default {
sim: "",
list: [
{
channelVal: [],
channelVal: '',
nickname: "",
},
],
});
}
this.formInfo = val;
let channelnr = [];
val.list.forEach((item) => {
channelnr.push(item.id);
});
this.$set(this.formInfo, "channelVal", channelnr);
// let channelnr = [];
// val.list.forEach((item) => {
// channelnr.push(item.id);
// });
// this.$set(this.formInfo, "channelVal", channelnr);
},
//
changeHandle(){
this.filterOption = this.channelOptions.filter(val => !this.formInfo.list.some(item => item.channelVal === val.id))
},
//
addModule() {
//
this.formInfo.list.push({
channelVal: [],
channelVal: '',
nickname: "",
});
console.log(this.formInfo.list);
console.log(this.channelOptions);
this.filterOption = this.channelOptions.filter(val => !this.formInfo.list.some(item => item.channelVal === val.id))
this.$nextTick(() => {
console.log(this.$refs.channelBoxref);
if (this.$refs.channelBoxref) {
console.log(this.$refs.channelBoxref.scrollHeight);
this.$refs.channelBoxref.scrollTop =
this.$refs.channelBoxref.scrollHeight;
this.$refs.channelBoxref.scrollTop = this.$refs.channelBoxref.scrollHeight;
}
});
},
@ -213,6 +217,7 @@ export default {
if (itemList !== -1) {
this.formInfo.list.splice(index, 1);
}
this.filterOption = this.channelOptions.filter(val => !this.formInfo.list.some(item => item.channelVal === val.id))
},
//
submitForm() {
@ -320,9 +325,8 @@ export default {
getAllChannelListJoggle()
.then((res) => {
this.channelOptions = res.data.list;
console.log(this.channelOptions[0].id);
console.log(this.formInfo.list.channelVal);
this.formInfo.list[0].channelVal = this.channelOptions[0].id;
this.filterOption = res.data.list;
this.formInfo.list[0].channelVal = this.filterOption[0].id;
})
.catch((err) => {});
},

@ -124,7 +124,7 @@
</div>
</div>
<div class="pageNation">
<div class="pageNation" v-if="picList.length !== 0">
<el-pagination
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
@ -300,7 +300,8 @@ export default {
display: flex;
// justify-content: space-around;
flex-wrap: wrap;
height: calc(100% - 86px);
height: calc(100% - 135px);
max-height: calc(100% - 135px);
overflow: auto;
border: 1px solid #eee;

Loading…
Cancel
Save