iMerge branch 'fly' into xy-ly

master
fanluyan 2 years ago
commit cb1fde7cf3

@ -69,3 +69,6 @@
.el-dropdown-menu--small .el-dropdown-menu__item {
font-size: 12px;
}
.el-popper[x-placement^="bottom"] {
margin-top: 6px !important;
}

@ -14,7 +14,11 @@
</el-select>
</el-form-item>
<el-form-item label="线路名称" class="xlbox">
<el-select v-model="formdata.lineId" @change="getSearchgt">
<el-select
v-model="formdata.lineId"
@change="getSearchgt"
filterable
>
<el-option
v-for="item in xlOptions"
:key="item.id"
@ -24,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item label="杆塔名称">
<el-select v-model="formdata.towerId">
<el-select v-model="formdata.towerId" filterable>
<el-option
v-for="item in gtOptions"
:key="item.id"
@ -115,7 +119,7 @@
>
</el-table-column>
<el-table-column
label="通道名称"
label="通道"
min-width="75"
:show-overflow-tooltip="true"
>
@ -161,12 +165,28 @@
</div>
<div class="alarmPic">
<div class="imgshow" @click="handleBigPicbox(selectRow)">
<img ref="picJpg" :src="photoPic" />
<img
ref="picJpg"
:src="photoPic"
v-if="selectRow.path !== '' && tableData.length !== 0"
/>
<img ref="picJpg" src="../../assets/img/nopic.jpg" v-else />
<canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
</div>
<div class="editorBtn">
<el-button type="primary" :loading="btnpicloading" @click="handleCommandpic"></el-button>
<el-button type="primary" @click="handleHistory"></el-button>
<el-button
type="primary"
:loading="btnpicloading"
@click="handleCommandpic"
:disabled="tableData.length == 0"
>主动拍照</el-button
>
<el-button
type="primary"
@click="handleHistory"
:disabled="tableData.length == 0"
>历史图片</el-button
>
</div>
</div>
</div>
@ -192,11 +212,11 @@ import {
getReturnedPhotoJoggle,
readAlarm,
} from "@/utils/api/index";
import historyimg from './components/historyimg.vue'
import historyimg from "./components/historyimg.vue";
import moment from "moment";
export default {
components: {
historyimg
historyimg,
},
data() {
return {
@ -233,18 +253,19 @@ export default {
new Date(new Date().toLocaleDateString()).getTime(),
new Date().getTime(),
]);
this.getTableList();
// this.getTableList();
this.getSearchdy();
this.getSearchgj();
},
methods: {
handleBigPicbox(val) {
console.log(val);
this.bigPhotoPic = val.path;
this.showBigpic = true;
this.$nextTick(() => {
this.drawline(val);
});
if (val.path !== "" && tableData.length !== 0) {
console.log(val);
this.bigPhotoPic = val.path;
this.showBigpic = true;
this.$nextTick(() => {
this.drawline(val);
});
}
},
closePic() {
this.showBigpic = false;
@ -277,6 +298,7 @@ export default {
this.gtOptions = [{ id: 0, name: "全部" }];
this.gtOptions = this.gtOptions.concat(res.data.list);
this.formdata.towerId = this.gtOptions[0].id;
this.getSearchgj();
})
.catch((err) => {});
},
@ -289,12 +311,17 @@ export default {
console.log(this.gjOptions);
this.formdata.label = this.gjOptions[0].label;
console.log(this.formdata.label);
this.getTableList();
})
.catch((err) => {});
},
//
getTableList() {
this.loading = true;
// this.$set(this.formdata, "dyId", this.page);
// this.$set(this.formdata, "label", this.page);
// this.$set(this.formdata, "lineId", this.page);
// this.$set(this.formdata, "towerId", this.page);
this.$set(this.formdata, "pageindex", this.page);
this.$set(this.formdata, "pagesize", this.pageSize);
this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
@ -375,17 +402,19 @@ export default {
this.selectRow = row;
//
if (row.isread == 0) {
readAlarm({
id: row.id,
})
.then((res) => {
console.log(res);
row.isread = 1;
console.log(row.isread);
setTimeout(function () {
readAlarm({
id: row.id,
})
.catch((err) => {
console.log(err);
});
.then((res) => {
console.log(res);
row.isread = 1;
console.log(row.isread);
})
.catch((err) => {
console.log(err);
});
}, 300);
}
this.drawline(row);
},
@ -421,10 +450,10 @@ export default {
this.i = 0;
this.btnpicloading = false;
this.$notify({
title: '通知信息',
message: '已返回最新图片',
type: 'success',
position: 'bottom-right'
title: "通知信息",
message: "已返回最新图片",
type: "success",
position: "bottom-right",
});
} else if (res.data == false && this.i > 10) {
clearInterval(this.timer);
@ -432,16 +461,16 @@ export default {
this.i = 0;
this.btnpicloading = false;
this.$notify({
title: '通知信息',
message: '装置暂无响应,请稍后再试!',
type: 'warning',
position: 'bottom-right'
title: "通知信息",
message: "装置暂无响应,请稍后再试!",
type: "warning",
position: "bottom-right",
});
}
});
},
//
handleHistory(){
handleHistory() {
this.$refs.historyimg_ref.display();
this.$refs.historyimg_ref.getdataform(this.selectRow);
},

@ -37,7 +37,7 @@
prop="towerName"
label="杆塔名称"
show-overflow-tooltip
min-width="120"
min-width="150"
>
</el-table-column>
<el-table-column

@ -27,6 +27,13 @@
<el-form-item label="杆塔名称:" prop="name">
<el-input v-model="formdata.name" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="排序号:" prop="order">
<el-input-number
controls-position="right"
v-model="formdata.order"
:min="0"
></el-input-number>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="isShow = false"> </el-button>
@ -51,6 +58,7 @@ export default {
lineId: [
{ required: true, message: "请选择线路编号", trigger: "blur" },
],
order: [{ required: true, message: "请输入排序号", trigger: "blur" }],
},
};
},
@ -68,7 +76,9 @@ export default {
//
getdataform(val) {
if (val == null) {
return (this.formdata = {});
return (this.formdata = {
order: 0,
});
}
this.formdata = val;
},
@ -142,5 +152,11 @@ export default {
.el-select {
width: 100%;
}
.el-input-number {
width: 100%;
}
.el-input-number .el-input__inner {
text-align: left;
}
}
</style>

@ -41,11 +41,7 @@
show-overflow-tooltip
></el-table-column>
<!-- <el-table-column
prop="id"
label="杆塔编号"
show-overflow-tooltip
></el-table-column> -->
<el-table-column prop="order" label="排序号"></el-table-column>
<el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope">

@ -14,7 +14,11 @@
</el-select>
</el-form-item>
<el-form-item label="线路名称">
<el-select v-model="formdata.lineid" @change="getSearchgt">
<el-select
v-model="formdata.lineid"
@change="getSearchgt"
filterable
>
<el-option
v-for="item in xlOptions"
:key="item.id"
@ -24,7 +28,11 @@
</el-select>
</el-form-item>
<el-form-item label="杆塔名称">
<el-select v-model="formdata.towerid" @change="getSearchzz">
<el-select
v-model="formdata.towerid"
@change="getSearchzz"
filterable
>
<el-option
v-for="item in gtOptions"
:key="item.id"
@ -34,7 +42,11 @@
</el-select>
</el-form-item>
<el-form-item label="装置名称">
<el-select v-model="formdata.termid" @change="getSearchtd">
<el-select
v-model="formdata.termid"
@change="getSearchtd"
filterable
>
<el-option
v-for="item in zzOptions"
:key="item.id"
@ -94,9 +106,7 @@
}}
</p>
<p class="infoBottom">
拍照时间{{
$moment(item.photoTime).format("MM-DD HH:mm")
}}
拍照时间{{ $moment(item.photoTime).format("MM-DD HH:mm") }}
/
{{
item.alias !== null && item.alias !== ""
@ -127,9 +137,7 @@
}}
</p>
<p class="infoBottom">
拍照时间{{
$moment(item.photoTime).format("MM-DD HH:mm")
}}
拍照时间{{ $moment(item.photoTime).format("MM-DD HH:mm") }}
/
{{
item.alias !== null && item.alias !== ""

@ -1,7 +1,7 @@
<template>
<div class="globalBox">
<div class="setBox">
<!-- <el-card class="box-card globalDrawLine">
<el-card class="box-card globalDrawLine">
<div slot="header" class="clearfix">
<span>线缆开启关闭</span>
</div>
@ -11,10 +11,11 @@
v-model="lineValue"
active-text="开启"
inactive-text="关闭"
@change="showLine"
>
</el-switch>
</div>
</el-card> -->
</el-card>
<el-card class="box-card globalprob">
<div slot="header" class="clearfix">
<span>设置告警可信度</span>
@ -43,7 +44,8 @@ export default {
components: {},
data() {
return {
lineValue: true,
lineValue: false,
lineNum: 0,
probList: [],
};
},
@ -51,6 +53,16 @@ export default {
this.getalarmList();
},
methods: {
//线
showLine(val) {
if (val) {
this.lineNum = 1;
} else {
this.lineNum = 0;
}
console.log(val, this.lineNum, "开关");
},
getalarmList() {
getAlarmTypeList().then((res) => {
console.log(res);

Loading…
Cancel
Save