杆塔线路添加搜索

hn2.0
fanluyan 2 years ago
parent d57577ddc2
commit c50af173f9

@ -85,7 +85,7 @@
</el-form> </el-form>
</div> </div>
<div class="alarmContain" v-loading="loading" v-if="tableShow"> <div class="alarmContain" v-loading="loading" v-if="!tableShow">
<div class="alarmTable"> <div class="alarmTable">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@ -99,6 +99,9 @@
@row-click="handleRowClick" @row-click="handleRowClick"
highlight-current-row highlight-current-row
> >
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column min-width="45" label="序号"> <el-table-column min-width="45" label="序号">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span> <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
@ -247,15 +250,12 @@
class="box-card imgList" class="box-card imgList"
v-for="(item, index) in tableData" v-for="(item, index) in tableData"
:key="index" :key="index"
:class="current === index ? 'bgColor' : ''"
> >
<div class="bigpic"> <div class="bigpic">
<div class="picshow" @click="handlePicAlarm(item)"> <div class="picshow" @click="handlePicAlarm(item, index)">
<img :src="item.path + '!1366x768'" :ref="'picJpg' + index" /> <img :src="item.path + '!1366x768'" ref="picJpg" />
<canvas <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
:id="'myCanvas' + index"
class="myCanvas"
:ref="'myCanvas' + index"
></canvas>
</div> </div>
<div class="caption"> <div class="caption">
@ -281,10 +281,10 @@
<el-button <el-button
type="primary" type="primary"
:loading="btnpicloading" :loading="btnpicloading"
@click="handlePicList(item)" @click.stop="handlePicList(item)"
>主动拍照</el-button >主动拍照</el-button
> >
<el-button type="primary" @click="handlePicHistory(item)" <el-button type="primary" @click.stop="handlePicHistory(item)"
>历史图片</el-button >历史图片</el-button
> >
</p> </p>
@ -319,8 +319,8 @@
<img @load="imgOnload" class="maskPic img" :src="bigPhotoPic" /> <img @load="imgOnload" class="maskPic img" :src="bigPhotoPic" />
<canvas id="myCanvas" class="myCanvas" ref="myCanvasbig"></canvas> <canvas id="myCanvas" class="myCanvas" ref="myCanvasbig"></canvas>
</div> </div>
<div class="viewClose"> <div class="viewClose" @click="closePic">
<i @click="closePic" class="el-icon-close"></i> <i class="el-icon-close"></i>
</div> </div>
</div> </div>
<historyimg ref="historyimg_ref"></historyimg> <historyimg ref="historyimg_ref"></historyimg>
@ -385,6 +385,7 @@ export default {
tableShow: true, // tableShow: true, //
zoomD: 1, zoomD: 1,
canvansdata: "", canvansdata: "",
current: 0,
}; };
}, },
mounted() { mounted() {
@ -450,8 +451,6 @@ export default {
document.querySelector( document.querySelector(
".picboxI" ".picboxI"
).style.transform = `matrix(${this.zoomD}, 0, 0,${this.zoomD}, 0, 0)`; ).style.transform = `matrix(${this.zoomD}, 0, 0,${this.zoomD}, 0, 0)`;
this.drawline2(this.canvansdata);
}); });
}, },
// //
@ -463,7 +462,6 @@ export default {
document.querySelector( document.querySelector(
".picboxI" ".picboxI"
).style.transform = `matrix(${this.zoomD}, 0, 0, ${this.zoomD}, 0, 0)`; ).style.transform = `matrix(${this.zoomD}, 0, 0, ${this.zoomD}, 0, 0)`;
this.drawline2(this.canvansdata);
}); });
}, },
handleBigPicbox(val) { handleBigPicbox(val) {
@ -615,8 +613,10 @@ export default {
this.ctx.closePath(); this.ctx.closePath();
this.ctx.stroke(); this.ctx.stroke();
}, },
// //
drawline2(data) { drawline2(data) {
console.log(data);
console.log(this.canvas);
this.canvas = this.$refs.myCanvasbig; this.canvas = this.$refs.myCanvasbig;
this.imgpic = this.$refs.picJpg; this.imgpic = this.$refs.picJpg;
this.textInfo = data.enname; this.textInfo = data.enname;
@ -654,6 +654,49 @@ export default {
this.ctx.closePath(); this.ctx.closePath();
this.ctx.stroke(); this.ctx.stroke();
}, },
//
drawlineList(data, index) {
console.log(data);
console.log(this.$refs.myCanvasbig);
console.log(this.$refs.picJpg);
console.log("picJpg" + index);
this.canvas = this.$refs.myCanvasbig;
this.imgpic = this.$refs.picJpg;
this.textInfo = data.enname;
this.canvas.width = this.imgpic[index].offsetWidth; //
this.canvas.height = this.imgpic[index].offsetHeight; //
console.log(this.canvas.width, this.canvas.height);
this.ctx = this.canvas.getContext("2d");
this.ctx.beginPath();
//线
this.ctx.strokeStyle = "#ff0000";
// 线
this.ctx.lineWidth = 1;
//
var scaleX = this.canvas.width / data.photoWidth, //this.iw
scaleY = this.canvas.height / data.photoHeight; //this.ih
console.log(scaleX, scaleY);
var top = data.x * scaleX,
left = data.y * scaleY,
width = data.width * scaleX,
height = data.height * scaleY;
console.log(top, left, width, height);
// this.ctx.strokeStyle = "red"; //线
this.ctx.strokeRect(top, left, width, height); //
//this.ctx.strokeRect(data.x, data.y, data.width, data.height);
this.ctx.font = "16px normal";
this.ctx.fillStyle = "#ff0000";
//this.ctx.fillText(this.textInfo, top, left + 24);
//
if (left > 32) {
this.ctx.fillText(this.textInfo, top, left - 4);
} else if (this.canvas.height - left + height > 32) {
this.ctx.fillText(this.textInfo, top, height - 4);
}
this.ctx.closePath();
this.ctx.stroke();
},
// //
handleRowClick(row) { handleRowClick(row) {
//this.$refs.multipleTable.toggleRowSelection(row); //this.$refs.multipleTable.toggleRowSelection(row);
@ -757,16 +800,20 @@ export default {
this.selectRow = val; this.selectRow = val;
this.handleHistory(); this.handleHistory();
}, },
handlePicAlarm(val) { handlePicAlarm(val, index) {
console.log(val); console.log(val, index);
this.current = index;
this.canvansdata = val;
this.canvasloading = true; this.canvasloading = true;
if (val.path !== "" && this.tableData.length !== 0) { if (val.path !== "" && this.tableData.length !== 0) {
console.log(val); console.log(val);
this.bigPhotoPic = val.path; this.bigPhotoPic = val.path;
this.showBigpic = true; this.showBigpic = true;
// this.$nextTick(() => {
// this.drawline2(val); this.$nextTick(() => {
// }); console.log("huatu");
this.drawlineList(val, index);
});
} }
}, },
dateFormat(row, column) { dateFormat(row, column) {
@ -987,7 +1034,8 @@ export default {
border-radius: 3px; border-radius: 3px;
background: #fff; background: #fff;
height: fit-content; height: fit-content;
height: auto; //height: auto;
border: 2px solid transparent;
.el-card__body { .el-card__body {
padding: 0px; padding: 0px;
} }
@ -1004,6 +1052,7 @@ export default {
z-index: 2; z-index: 2;
left: 0; left: 0;
top: 0; top: 0;
pointer-events: none;
} }
} }
} }
@ -1046,6 +1095,9 @@ export default {
} }
} }
} }
.bgColor {
border: 2px solid #e49e61;
}
} }
} }
</style> </style>

@ -23,6 +23,9 @@
> >
<!-- <el-table-column type="index" width="55"> </el-table-column> <!-- <el-table-column type="index" width="55"> </el-table-column>
<el-table-column type="selection" width="55"> </el-table-column> --> <el-table-column type="selection" width="55"> </el-table-column> -->
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column <el-table-column
label="通道名称" label="通道名称"
show-overflow-tooltip show-overflow-tooltip

@ -24,6 +24,9 @@
> >
<!-- <el-table-column type="index" width="55"> </el-table-column> <!-- <el-table-column type="index" width="55"> </el-table-column>
<el-table-column type="selection" width="55"> </el-table-column> --> <el-table-column type="selection" width="55"> </el-table-column> -->
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column label="名称" show-overflow-tooltip> <el-table-column label="名称" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.name }}</template> <template slot-scope="scope">{{ scope.row.name }}</template>
</el-table-column> </el-table-column>

@ -1,5 +1,11 @@
<template> <template>
<el-dialog class="setimgDialog" title="基本信息" :visible.sync="isShow" :close-on-click-modal="false" width="70%"> <el-dialog
class="setimgDialog"
title="基本信息"
:visible.sync="isShow"
:close-on-click-modal="false"
width="70%"
>
<el-form :inline="true" :model="formdata" class="demo-form-inline"> <el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item label="开始日期"> <el-form-item label="开始日期">
<el-date-picker <el-date-picker
@ -34,20 +40,68 @@
style="width: 100%" style="width: 100%"
v-loading="loading" v-loading="loading"
> >
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column min-width="45" label="序号"> <el-table-column min-width="45" label="序号">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span> <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column> <el-table-column
<el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column> prop="name"
<el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column> label="采集时间"
<el-table-column prop="name" label="装置名称" min-width="80" show-overflow-tooltip></el-table-column> min-width="120"
<el-table-column prop="name" label="装置型号" min-width="80" show-overflow-tooltip></el-table-column> show-overflow-tooltip
<el-table-column prop="name" label="装置版本号" min-width="80" show-overflow-tooltip></el-table-column> ></el-table-column>
<el-table-column prop="name" label="生产厂家" min-width="100" show-overflow-tooltip></el-table-column> <el-table-column
<el-table-column prop="name" label="生产日期" min-width="120" show-overflow-tooltip></el-table-column> prop="name"
<el-table-column prop="name" label="出厂编号" min-width="100" show-overflow-tooltip></el-table-column> label="设备名称"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="设备编号"
min-width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="装置名称"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="装置型号"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="装置版本号"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="生产厂家"
min-width="100"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="生产日期"
min-width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="出厂编号"
min-width="100"
show-overflow-tooltip
></el-table-column>
</el-table> </el-table>
<div class="pageNation"> <div class="pageNation">
<el-pagination <el-pagination
@ -64,9 +118,7 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { import { getLineListJoggle } from "@/utils/api/index";
getLineListJoggle
} from "@/utils/api/index";
export default { export default {
data() { data() {
return { return {
@ -105,12 +157,11 @@ export default {
getLineListJoggle({ getLineListJoggle({
pageindex: this.page, pageindex: this.page,
pagesize: this.pageSize, pagesize: this.pageSize,
}) }).then((res) => {
.then((res) => {
this.listData = res.data.list; this.listData = res.data.list;
this.total = res.data.total; this.total = res.data.total;
this.loading = false; this.loading = false;
}) });
}, },
// //
handleCurrentChange(val) { handleCurrentChange(val) {
@ -127,10 +178,8 @@ export default {
}, },
hide() { hide() {
this.isShow = false; this.isShow = false;
} },
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>

@ -1,5 +1,11 @@
<template> <template>
<el-dialog class="setimgDialog" title="GPS位置数据" :visible.sync="isShow" :close-on-click-modal="false" width="70%"> <el-dialog
class="setimgDialog"
title="GPS位置数据"
:visible.sync="isShow"
:close-on-click-modal="false"
width="70%"
>
<el-form :inline="true" :model="formdata" class="demo-form-inline"> <el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item label="开始日期"> <el-form-item label="开始日期">
<el-date-picker <el-date-picker
@ -34,17 +40,50 @@
style="width: 100%" style="width: 100%"
v-loading="loading" v-loading="loading"
> >
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column min-width="45" label="序号"> <el-table-column min-width="45" label="序号">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span> <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column> <el-table-column
<el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column> prop="name"
<el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column> label="采集时间"
<el-table-column prop="name" label="半径" min-width="80" show-overflow-tooltip></el-table-column> min-width="120"
<el-table-column prop="name" label="维度" min-width="80" show-overflow-tooltip></el-table-column> show-overflow-tooltip
<el-table-column prop="name" label="经度" min-width="80" show-overflow-tooltip></el-table-column> ></el-table-column>
<el-table-column
prop="name"
label="设备名称"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="设备编号"
min-width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="半径"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="维度"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="经度"
min-width="80"
show-overflow-tooltip
></el-table-column>
</el-table> </el-table>
<div class="pageNation"> <div class="pageNation">
<el-pagination <el-pagination
@ -61,9 +100,7 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { import { getLineListJoggle } from "@/utils/api/index";
getLineListJoggle
} from "@/utils/api/index";
export default { export default {
data() { data() {
return { return {
@ -102,12 +139,11 @@ export default {
getLineListJoggle({ getLineListJoggle({
pageindex: this.page, pageindex: this.page,
pagesize: this.pageSize, pagesize: this.pageSize,
}) }).then((res) => {
.then((res) => {
this.listData = res.data.list; this.listData = res.data.list;
this.total = res.data.total; this.total = res.data.total;
this.loading = false; this.loading = false;
}) });
}, },
// //
handleCurrentChange(val) { handleCurrentChange(val) {
@ -124,10 +160,8 @@ export default {
}, },
hide() { hide() {
this.isShow = false; this.isShow = false;
} },
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>

@ -1,5 +1,11 @@
<template> <template>
<el-dialog class="setimgDialog" title="装置运行状态" :visible.sync="isShow" :close-on-click-modal="false" width="70%"> <el-dialog
class="setimgDialog"
title="装置运行状态"
:visible.sync="isShow"
:close-on-click-modal="false"
width="70%"
>
<el-form :inline="true" :model="formdata" class="demo-form-inline"> <el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item label="开始日期"> <el-form-item label="开始日期">
<el-date-picker <el-date-picker
@ -34,18 +40,56 @@
style="width: 100%" style="width: 100%"
v-loading="loading" v-loading="loading"
> >
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column min-width="45" label="序号"> <el-table-column min-width="45" label="序号">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span> <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column> <el-table-column
<el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column> prop="name"
<el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column> label="采集时间"
<el-table-column prop="name" label="4G信号强度" min-width="80" show-overflow-tooltip></el-table-column> min-width="120"
<el-table-column prop="name" label="2G信号强度" min-width="80" show-overflow-tooltip></el-table-column> show-overflow-tooltip
<el-table-column prop="name" label="剩余运行内存" min-width="80" show-overflow-tooltip></el-table-column> ></el-table-column>
<el-table-column prop="name" label="剩余存储内存" min-width="100" show-overflow-tooltip></el-table-column> <el-table-column
prop="name"
label="设备名称"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="设备编号"
min-width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="4G信号强度"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="2G信号强度"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="剩余运行内存"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="剩余存储内存"
min-width="100"
show-overflow-tooltip
></el-table-column>
</el-table> </el-table>
<div class="pageNation"> <div class="pageNation">
<el-pagination <el-pagination
@ -62,9 +106,7 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { import { getLineListJoggle } from "@/utils/api/index";
getLineListJoggle
} from "@/utils/api/index";
export default { export default {
data() { data() {
return { return {
@ -103,12 +145,11 @@ export default {
getLineListJoggle({ getLineListJoggle({
pageindex: this.page, pageindex: this.page,
pagesize: this.pageSize, pagesize: this.pageSize,
}) }).then((res) => {
.then((res) => {
this.listData = res.data.list; this.listData = res.data.list;
this.total = res.data.total; this.total = res.data.total;
this.loading = false; this.loading = false;
}) });
}, },
// //
handleCurrentChange(val) { handleCurrentChange(val) {
@ -125,10 +166,8 @@ export default {
}, },
hide() { hide() {
this.isShow = false; this.isShow = false;
} },
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>

@ -1,5 +1,11 @@
<template> <template>
<el-dialog class="setimgDialog" title="工作状态" :visible.sync="isShow" :close-on-click-modal="false" width="70%"> <el-dialog
class="setimgDialog"
title="工作状态"
:visible.sync="isShow"
:close-on-click-modal="false"
width="70%"
>
<el-form :inline="true" :model="formdata" class="demo-form-inline"> <el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item label="开始日期"> <el-form-item label="开始日期">
<el-date-picker <el-date-picker
@ -34,24 +40,81 @@
style="width: 100%" style="width: 100%"
v-loading="loading" v-loading="loading"
> >
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column min-width="45" label="序号"> <el-table-column min-width="45" label="序号">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span> <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column> <el-table-column
<el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column> prop="name"
<el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column> label="采集时间"
<el-table-column prop="name" label="电源电压" min-width="80" show-overflow-tooltip></el-table-column> min-width="120"
<el-table-column prop="name" label="工作温度" min-width="80" show-overflow-tooltip></el-table-column> show-overflow-tooltip
<el-table-column prop="name" label="电池电量" min-width="80" show-overflow-tooltip></el-table-column> ></el-table-column>
<el-table-column prop="name" label="浮充状态" min-width="100" show-overflow-tooltip> <el-table-column
<template slot-scope="scope">{{ scope.row.name == 0 ? '充电' : '放电' }}</template> prop="name"
label="设备名称"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="设备编号"
min-width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="电源电压"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="工作温度"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="电池电量"
min-width="80"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="浮充状态"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">{{
scope.row.name == 0 ? "充电" : "放电"
}}</template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="工作总时间" min-width="120" show-overflow-tooltip></el-table-column> <el-table-column
<el-table-column prop="name" label="连续工作时间" min-width="100" show-overflow-tooltip></el-table-column> prop="name"
<el-table-column prop="name" label="网络连接状态" min-width="100" show-overflow-tooltip> label="工作总时间"
<template slot-scope="scope">{{ scope.row.name == 0 ? '已连接' : '未连接' }}</template> min-width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="连续工作时间"
min-width="100"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="name"
label="网络连接状态"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">{{
scope.row.name == 0 ? "已连接" : "未连接"
}}</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pageNation"> <div class="pageNation">
@ -69,9 +132,7 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { import { getLineListJoggle } from "@/utils/api/index";
getLineListJoggle
} from "@/utils/api/index";
export default { export default {
data() { data() {
return { return {
@ -110,12 +171,11 @@ export default {
getLineListJoggle({ getLineListJoggle({
pageindex: this.page, pageindex: this.page,
pagesize: this.pageSize, pagesize: this.pageSize,
}) }).then((res) => {
.then((res) => {
this.listData = res.data.list; this.listData = res.data.list;
this.total = res.data.total; this.total = res.data.total;
this.loading = false; this.loading = false;
}) });
}, },
// //
handleCurrentChange(val) { handleCurrentChange(val) {
@ -132,10 +192,8 @@ export default {
}, },
hide() { hide() {
this.isShow = false; this.isShow = false;
} },
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>

@ -74,6 +74,9 @@
> >
</el-table-column> --> </el-table-column> -->
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column <el-table-column
prop="lineName" prop="lineName"
label="线路名称" label="线路名称"
@ -455,7 +458,15 @@ export default {
this.terminalList(); this.terminalList();
this.roleUser = localStorage.getItem("role"); this.roleUser = localStorage.getItem("role");
console.log(this.roleUser); console.log(this.roleUser);
var that = this;
document.onkeydown = function (e) {
var key = window.event.keyCode;
if (key === 13) {
that.onSubmit(); //
}
};
}, },
methods: { methods: {
// //
getSearchdy() { getSearchdy() {

@ -74,6 +74,9 @@
> >
</el-table-column> --> </el-table-column> -->
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column <el-table-column
prop="lineName" prop="lineName"
label="线路名称" label="线路名称"

@ -7,6 +7,20 @@
>新增</el-button >新增</el-button
> >
</div> </div>
<div class="searchBox">
<el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item>
<el-input
v-model="formdata.search"
placeholder="请输入线路名称或公司名称"
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit"></el-button>
<el-button type="primary" @click="onReset"></el-button>
</el-form-item>
</el-form>
</div>
<div class="lineTable"> <div class="lineTable">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@ -21,6 +35,9 @@
> >
<!-- <el-table-column type="selection" width="55"> </el-table-column> --> <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
<!-- <el-table-column type="index" width="55"> </el-table-column> --> <!-- <el-table-column type="index" width="55"> </el-table-column> -->
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column label="公司名称" show-overflow-tooltip> <el-table-column label="公司名称" show-overflow-tooltip>
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.bsManufacturer scope.row.bsManufacturer
@ -109,19 +126,30 @@ export default {
pageSize: 20, // pageSize: 20, //
total: 0, // total: 0, //
loading: true, loading: true,
formdata: {
search: "",
},
}; };
}, },
created() { created() {
var that = this;
document.onkeydown = function (e) {
var key = window.event.keyCode;
if (key === 13) {
that.onSubmit(); //
}
};
},
mounted() {
this.lineList(); this.lineList();
}, },
methods: { methods: {
//线 //线
lineList() { lineList() {
this.loading = true; this.loading = true;
getLineListJoggle({ this.$set(this.formdata, "pageindex", this.page);
pageindex: this.page, this.$set(this.formdata, "pagesize", this.pageSize);
pagesize: this.pageSize, getLineListJoggle(this.formdata)
})
.then((res) => { .then((res) => {
this.lineTableData = res.data.list; this.lineTableData = res.data.list;
this.total = res.data.total; this.total = res.data.total;
@ -137,7 +165,18 @@ export default {
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
//
onSubmit() {
this.page = 1;
this.lineList();
},
//
onReset() {
this.formdata = {};
this.page = 1;
this.pageSize = 20;
this.lineList();
},
// //
handleAddLine() { handleAddLine() {
this.lineDialogTitle = "新增"; this.lineDialogTitle = "新增";
@ -213,7 +252,26 @@ export default {
height: calc(100% - 24px); height: calc(100% - 24px);
padding: 12px; padding: 12px;
border-radius: 4px; border-radius: 4px;
.searchBox {
margin-top: 8px;
.ml10 {
margin-left: 10px;
}
.el-form {
.dybox {
.el-form-item__content {
width: 120px;
}
}
.xlbox {
.el-form-item__content {
width: 160px;
} }
}
}
}
}
.lineBtnGroup { .lineBtnGroup {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -221,8 +279,8 @@ export default {
} }
.lineTable { .lineTable {
margin-top: 16px; //margin-top: 16px;
height: calc(100% - 48px); height: calc(100% - 94px);
} }
} }
</style> </style>

@ -27,6 +27,9 @@
<el-form-item label="杆塔名称:" prop="name"> <el-form-item label="杆塔名称:" prop="name">
<el-input v-model="formdata.name" autocomplete="off"></el-input> <el-input v-model="formdata.name" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="杆塔地址:" prop="address">
<el-input v-model="formdata.address" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="排序号:" prop="order"> <el-form-item label="排序号:" prop="order">
<el-input-number <el-input-number
controls-position="right" controls-position="right"
@ -80,7 +83,8 @@ export default {
order: 0, order: 0,
}); });
} }
this.formdata = val; //this.formdata = val;
this.formdata = JSON.parse(JSON.stringify(val));
}, },
// //
submitForm() { submitForm() {

@ -10,6 +10,20 @@
>新增</el-button >新增</el-button
> >
</div> </div>
<div class="searchBox">
<el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item>
<el-input
v-model="formdata.search"
placeholder="请输入线路/杆塔/地址"
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit"></el-button>
<el-button type="primary" @click="onReset"></el-button>
</el-form-item>
</el-form>
</div>
<div class="deviceTable"> <div class="deviceTable">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@ -24,7 +38,9 @@
> >
<!-- <el-table-column type="index" width="55"> </el-table-column> <!-- <el-table-column type="index" width="55"> </el-table-column>
<el-table-column type="selection" width="55"> </el-table-column> --> <el-table-column type="selection" width="55"> </el-table-column> -->
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column <el-table-column
prop="lineName" prop="lineName"
label="线路名称" label="线路名称"
@ -40,8 +56,13 @@
label="杆塔名称" label="杆塔名称"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
prop="address"
label="杆塔地址"
show-overflow-tooltip
></el-table-column>
<el-table-column prop="order" label="排序号"> <el-table-column prop="order" label="排序号" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.order == null ? 0 : scope.row.order }} {{ scope.row.order == null ? 0 : scope.row.order }}
</template> </template>
@ -98,23 +119,44 @@ export default {
pageSize: 20, // pageSize: 20, //
total: 0, // total: 0, //
loading: true, loading: true,
formdata: {
search: "",
},
};
},
created() {
var that = this;
document.onkeydown = function (e) {
var key = window.event.keyCode;
if (key === 13) {
that.onSubmit(); //
}
}; };
}, },
mounted() { mounted() {
console.log("ssss");
this.deviceList(); this.deviceList();
}, },
activated() {
methods: {
//
onSubmit() {
this.page = 1;
this.deviceList();
},
//
onReset() {
this.formdata = {};
this.page = 1;
this.pageSize = 20;
this.deviceList(); this.deviceList();
}, },
methods: {
// //
deviceList() { deviceList() {
this.loading = true; this.loading = true;
getTowerListApi({ this.$set(this.formdata, "pageindex", this.page);
pageindex: this.page, this.$set(this.formdata, "pagesize", this.pageSize);
pagesize: this.pageSize, getTowerListApi(this.formdata)
})
.then((res) => { .then((res) => {
this.tableDate = res.data.list; this.tableDate = res.data.list;
this.total = res.data.total; this.total = res.data.total;
@ -201,6 +243,24 @@ export default {
height: calc(100% - 24px); height: calc(100% - 24px);
padding: 12px; padding: 12px;
border-radius: 4px; border-radius: 4px;
.searchBox {
margin-top: 8px;
.ml10 {
margin-left: 10px;
}
.el-form {
.dybox {
.el-form-item__content {
width: 120px;
}
}
.xlbox {
.el-form-item__content {
width: 160px;
}
}
}
}
} }
.deviceBtnGroup { .deviceBtnGroup {
display: flex; display: flex;
@ -208,8 +268,7 @@ export default {
align-items: center; align-items: center;
} }
.deviceTable { .deviceTable {
margin-top: 16px; height: calc(100% - 94px);
height: calc(100% - 48px);
//background: #fcc; //background: #fcc;
} }
} }

@ -67,6 +67,7 @@
<div class="zzbox"> <div class="zzbox">
<!-- <h3>装置名称</h3> --> <!-- <h3>装置名称</h3> -->
<p class="zzidname">{{ cmdid }}</p> <p class="zzidname">{{ cmdid }}</p>
<p class="addressname">这里是杆塔的地址{{ cmdid }}</p>
</div> </div>
<div class="paramsDate"> <div class="paramsDate">
<h3>日历快速查询</h3> <h3>日历快速查询</h3>
@ -977,6 +978,13 @@ export default {
} }
.zzidname { .zzidname {
font-weight: normal; font-weight: normal;
color: #169e8c;
}
.addressname {
margin-top: 16px;
font-size: 14px;
line-height: 22px;
color: #333;
} }
} }
.setTimebtn { .setTimebtn {

@ -20,6 +20,9 @@
> >
<!-- <el-table-column type="index" width="55"> </el-table-column> <!-- <el-table-column type="index" width="55"> </el-table-column>
<el-table-column type="selection" width="55"> </el-table-column> --> <el-table-column type="selection" width="55"> </el-table-column> -->
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column <el-table-column
label="用户名" label="用户名"
show-overflow-tooltip show-overflow-tooltip

Loading…
Cancel
Save