添加规约

jc
fanluyan 1 year ago
parent 60dff2632b
commit c81d67a56f

@ -1,13 +1,13 @@
import request from "../request"; import request from "../request";
//照片统计 //照片统计
export function getphotoList(data) { // export function getphotoList(data) {
return request({ // return request({
url: "/xymanager/terminal/listWithPhoto", // url: "/xymanager/terminal/listWithPhoto",
method: "get", // method: "get",
params: data, // params: data,
}); // });
} // }
//获取电压-线路-杆塔等信息 //获取电压-线路-杆塔等信息
export function getSearchInfo(data) { export function getSearchInfo(data) {

@ -281,7 +281,7 @@ export default {
if ( if (
node.protocol == "65283" || node.protocol == "65283" ||
node.protocol == "65285" || node.protocol == "65285" ||
this.areaData.protocol == "65290" node.protocol == "65290" || node.protocol == "65298"
) { ) {
// //
console.log("湖南,河南", scheduleTimeList.length); console.log("湖南,河南", scheduleTimeList.length);

@ -13,9 +13,12 @@
<span v-if="rowInfo.protocol == '65282'"> </span> <span v-if="rowInfo.protocol == '65282'"> </span>
<span v-if="rowInfo.protocol == '65283'"> </span> <span v-if="rowInfo.protocol == '65283'"> </span>
<span v-if="rowInfo.protocol == '65284'"> </span> <span v-if="rowInfo.protocol == '65284'"> </span>
<span v-if="rowInfo.protocol == '65285'"> </span> <span v-if="rowInfo.protocol == '65285'"> </span>
<span v-if="rowInfo.protocol == '65286'"> </span> <span v-if="rowInfo.protocol == '65286'"> </span>
<span v-if="rowInfo.protocol == '65290'"> v2020 </span> <span v-if="rowInfo.protocol == '65290'"> v2020 </span>
<span v-if="rowInfo.protocol == '65298'"> </span>
<span v-if="rowInfo.protocol == '2'"> </span>
<span>{{rowInfo.protocol}}</span>
</div> </div>
<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="开始日期">

@ -13,9 +13,12 @@
<span v-if="rowInfo.protocol == '65282'"> </span> <span v-if="rowInfo.protocol == '65282'"> </span>
<span v-if="rowInfo.protocol == '65283'"> </span> <span v-if="rowInfo.protocol == '65283'"> </span>
<span v-if="rowInfo.protocol == '65284'"> </span> <span v-if="rowInfo.protocol == '65284'"> </span>
<span v-if="rowInfo.protocol == '65285'"> </span> <span v-if="rowInfo.protocol == '65285'"> </span>
<span v-if="rowInfo.protocol == '65286'"> </span> <span v-if="rowInfo.protocol == '65286'"> </span>
<span v-if="rowInfo.protocol == '65290'"> v2020 </span> <span v-if="rowInfo.protocol == '65290'"> v2020 </span>
<span v-if="rowInfo.protocol == '65298'"> </span>
<span v-if="rowInfo.protocol == '2'"> </span>
<span>{{rowInfo.protocol}}</span>
</div> </div>
<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="开始日期">

@ -13,9 +13,12 @@
<span v-if="rowInfo.protocol == '65282'"> </span> <span v-if="rowInfo.protocol == '65282'"> </span>
<span v-if="rowInfo.protocol == '65283'"> </span> <span v-if="rowInfo.protocol == '65283'"> </span>
<span v-if="rowInfo.protocol == '65284'"> </span> <span v-if="rowInfo.protocol == '65284'"> </span>
<span v-if="rowInfo.protocol == '65285'"> </span> <span v-if="rowInfo.protocol == '65285'"> </span>
<span v-if="rowInfo.protocol == '65286'"> </span> <span v-if="rowInfo.protocol == '65286'"> </span>
<span v-if="rowInfo.protocol == '65290'"> v2020 </span> <span v-if="rowInfo.protocol == '65290'"> v2020 </span>
<span v-if="rowInfo.protocol == '65298'"> </span>
<span v-if="rowInfo.protocol == '2'"> </span>
<span>{{rowInfo.protocol}}</span>
</div> </div>
<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="开始日期">

@ -16,9 +16,12 @@
<span v-if="rowData.protocol == '65282'"> </span> <span v-if="rowData.protocol == '65282'"> </span>
<span v-if="rowData.protocol == '65283'"> </span> <span v-if="rowData.protocol == '65283'"> </span>
<span v-if="rowData.protocol == '65284'"> </span> <span v-if="rowData.protocol == '65284'"> </span>
<span v-if="rowData.protocol == '65285'"> </span> <span v-if="rowData.protocol == '65285'"> </span>
<span v-if="rowData.protocol == '65286'"> </span> <span v-if="rowData.protocol == '65286'"> </span>
<span v-if="rowData.protocol == '65290'"> v2020 </span> <span v-if="rowData.protocol == '65290'"> v2020 </span>
<span v-if="rowData.protocol == '65298'"> </span>
<span v-if="rowData.protocol == '2'"> </span>
<span>{{rowData.protocol}}</span>
</span> </span>
</div> </div>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick"> <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">

@ -13,9 +13,12 @@
<span v-if="rowInfo.protocol == '65282'"> </span> <span v-if="rowInfo.protocol == '65282'"> </span>
<span v-if="rowInfo.protocol == '65283'"> </span> <span v-if="rowInfo.protocol == '65283'"> </span>
<span v-if="rowInfo.protocol == '65284'"> </span> <span v-if="rowInfo.protocol == '65284'"> </span>
<span v-if="rowInfo.protocol == '65285'"> </span> <span v-if="rowInfo.protocol == '65285'"> </span>
<span v-if="rowInfo.protocol == '65286'"> </span> <span v-if="rowInfo.protocol == '65286'"> </span>
<span v-if="rowInfo.protocol == '65290'"> v2020 </span> <span v-if="rowInfo.protocol == '65290'"> v2020 </span>
<span v-if="rowInfo.protocol == '65298'"> </span>
<span v-if="rowInfo.protocol == '2'"> </span>
<span>{{rowInfo.protocol}}</span>
</div> </div>
<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="开始日期">

@ -13,9 +13,12 @@
<span v-if="rowInfo.protocol == '65282'"> </span> <span v-if="rowInfo.protocol == '65282'"> </span>
<span v-if="rowInfo.protocol == '65283'"> </span> <span v-if="rowInfo.protocol == '65283'"> </span>
<span v-if="rowInfo.protocol == '65284'"> </span> <span v-if="rowInfo.protocol == '65284'"> </span>
<span v-if="rowInfo.protocol == '65285'"> </span> <span v-if="rowInfo.protocol == '65285'"> </span>
<span v-if="rowInfo.protocol == '65286'"> </span> <span v-if="rowInfo.protocol == '65286'"> </span>
<span v-if="rowInfo.protocol == '65290'"> v2020 </span> <span v-if="rowInfo.protocol == '65290'"> v2020 </span>
<span v-if="rowInfo.protocol == '65298'"> </span>
<span v-if="rowInfo.protocol == '2'"> </span>
<span>{{rowInfo.protocol}}</span>
</div> </div>
<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="开始日期">

@ -5,12 +5,15 @@
<span v-if="protocolInfo == '65280'"> I1 </span> <span v-if="protocolInfo == '65280'"> I1 </span>
<span v-if="protocolInfo == '65296'"> 西 </span> <span v-if="protocolInfo == '65296'"> 西 </span>
<span v-if="protocolInfo == '65281'"> </span> <span v-if="protocolInfo == '65281'"> </span>
<span v-if="protocolInfo == '65282'"> </span> <span v-if="protocolInfo == '65282'"> </span>
<span v-if="protocolInfo == '65283'"> </span> <span v-if="protocolInfo == '65283'"> </span>
<span v-if="protocolInfo == '65284'"> </span> <span v-if="protocolInfo == '65284'"> </span>
<span v-if="protocolInfo == '65285'"> </span> <span v-if="protocolInfo == '65285'"> </span>
<span v-if="protocolInfo == '65286'"> </span> <span v-if="protocolInfo == '65286'"> </span>
<span v-if="protocolInfo == '65290'"> v2020 </span> <span v-if="protocolInfo == '65290'"> v2020 </span>
<span v-if="protocolInfo == '65298'"> </span>
<span v-if="protocolInfo == '2'"> </span>
<span>{{protocolInfo}}</span>
<!-- <span>({{ terminalPhoto.length }})</span> --> <!-- <span>({{ terminalPhoto.length }})</span> -->
</div> </div>
<div class="topPic"> <div class="topPic">

@ -199,12 +199,20 @@ export default {
}, },
{ {
id: 65285, id: 65285,
name: "河南", name: "河南全景",
}, },
{ {
id: 65286, id: 65286,
name: "河南郑州", name: "河南郑州",
}, },
{
id: 65298,
name: "宁夏",
},
{
id: 2,
name: "南网",
},
], ],
PacketBaseOptions: [ PacketBaseOptions: [
{ {

@ -342,7 +342,8 @@ export default {
if ( if (
this.areaData.protocol == "65283" || this.areaData.protocol == "65283" ||
this.areaData.protocol == "65285" || this.areaData.protocol == "65285" ||
this.areaData.protocol == "65290" this.areaData.protocol == "65290" ||
this.areaData.protocol == "65298"
) { ) {
// //
console.log("湖南"); console.log("湖南");
@ -543,7 +544,8 @@ export default {
if ( if (
this.areaData.protocol == "65283" || this.areaData.protocol == "65283" ||
this.areaData.protocol == "65285" || this.areaData.protocol == "65285" ||
this.areaData.protocol == "65290" this.areaData.protocol == "65290" ||
this.areaData.protocol == "65298"
) { ) {
// //
console.log("湖南"); console.log("湖南");
@ -712,7 +714,8 @@ export default {
if ( if (
this.areaData.protocol == "65283" || this.areaData.protocol == "65283" ||
this.areaData.protocol == "65285" || this.areaData.protocol == "65285" ||
this.areaData.protocol == "65290" this.areaData.protocol == "65290" ||
this.areaData.protocol == "65298"
) { ) {
// //
console.log("湖南", scheduleTimeList.length); console.log("湖南", scheduleTimeList.length);

@ -239,10 +239,11 @@ export default {
}).then((res) => { }).then((res) => {
console.log(res.data); console.log(res.data);
console.log(this.picNum); console.log(this.picNum);
console.log(this.pzchannelId)
if (res.data == true && this.picNum < 10) { if (res.data == true && this.picNum < 10) {
// console.log(this.$parent.$parent); // console.log(this.$parent.$parent);
this.$parent.$parent.getPhotoList( this.$parent.$parent.getPhotoList(
-1, this.pzchannelId,
new Date(val.date).getTime(), new Date(val.date).getTime(),
this.termId this.termId
); // id termid ); // id termid

@ -74,16 +74,16 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item label="装置查询" class="schclass">
<el-input <el-input
v-model="formdata.search" v-model="formdata.search"
placeholder="请输入线路/杆塔/设备名称" placeholder="请输入设备名称"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit"></el-button> <el-button type="primary" @click="onSubmit"></el-button>
<el-button type="primary">导出</el-button></el-button> <el-button type="primary">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -356,7 +356,7 @@ export default {
params.protocol = this.formdata.protocol; params.protocol = this.formdata.protocol;
} }
if (this.formdata.search !== "") { if (this.formdata.search !== "") {
params.search = this.formdata.search; params.cmdid = this.formdata.search;
} }
setTimeout(() => { setTimeout(() => {
gettermAllList(params) gettermAllList(params)

@ -7,7 +7,7 @@
width="820px" width="820px"
><div class="headInfo"> ><div class="headInfo">
<span class="zzid">装置编号{{ rowData.cmdid }}</span> <span class="zzid">装置编号{{ rowData.cmdid }}</span>
<span class="pictotal">总数{{ ipListData.length }}</span> <span class="pictotal">总数{{ total }}</span>
</div> </div>
<div class="ipContain"> <div class="ipContain">
<el-table <el-table
@ -44,7 +44,20 @@
<el-table-column label="IP" prop="heartbeatIp"> </el-table-column> <el-table-column label="IP" prop="heartbeatIp"> </el-table-column>
<el-table-column label="端口" prop="heartbeatPort"> </el-table-column> <el-table-column label="端口" prop="heartbeatPort"> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pageNation">
<el-pagination
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
:current-page="page"
:page-size="pageSize"
layout="sizes, prev, pager, next, jumper,total"
:total="total"
background
>
</el-pagination>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="isShow = false"> </el-button> <el-button @click="isShow = false"> </el-button>
</div> </div>
@ -62,6 +75,9 @@ export default {
rowData: "", rowData: "",
iploading: false, iploading: false,
ipListData: [], ipListData: [],
page: 1, //
pageSize: 20, //
total: 0, //
}; };
}, },
methods: { methods: {
@ -70,11 +86,13 @@ export default {
setTimeout(() => { setTimeout(() => {
getIpList({ getIpList({
termId: this.rowData.id, termId: this.rowData.id,
pageNum: this.page,
pageSize: this.pageSize,
}) })
.then((res) => { .then((res) => {
console.log(res); console.log(res);
this.ipListData = res.data; this.ipListData = res.data.list;
// this.total = res.data.total; this.total = res.data.total;
this.iploading = false; this.iploading = false;
}) })
.catch((err) => { .catch((err) => {
@ -91,6 +109,17 @@ export default {
hide() { hide() {
this.isShow = false; this.isShow = false;
}, },
//
handleCurrentChange(val) {
this.page = val;
this.getIPList();
},
//
handleSizeChange(val) {
this.pageSize = val;
this.getIPList();
},
}, },
created() {}, created() {},
@ -111,7 +140,7 @@ export default {
} }
} }
.ipContain { .ipContain {
height: 100%; height:calc(100% - 32px);
.el-table { .el-table {
color: #000; color: #000;
thead { thead {

@ -13,6 +13,8 @@
<el-radio :label="-1">全部</el-radio> <el-radio :label="-1">全部</el-radio>
<el-radio :label="1">通道1</el-radio> <el-radio :label="1">通道1</el-radio>
<el-radio :label="2">通道2</el-radio> <el-radio :label="2">通道2</el-radio>
<el-radio :label="3">通道3</el-radio>
<el-radio :label="4">通道4</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<div class="ipContain"> <div class="ipContain">

@ -64,7 +64,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="模糊查询" class="schclass"> <el-form-item label="装置查询" class="schclass">
<el-input <el-input
v-model="formdata.search" v-model="formdata.search"
placeholder="请输入线路/杆塔/设备名称" placeholder="请输入线路/杆塔/设备名称"
@ -322,7 +322,7 @@ export default {
params.channelId = this.formdata.channelid; params.channelId = this.formdata.channelid;
} }
if (this.formdata.search !== "") { if (this.formdata.search !== "") {
params.search = this.formdata.search; params.cmdid = this.formdata.search;
} }
setTimeout(() => { setTimeout(() => {
gettermAllList(params) gettermAllList(params)

Loading…
Cancel
Save