Merge branch 'fly' into wp1.0

ds1.0
fanluyan 2 years ago
commit 94cc43aed9

@ -1,10 +1,10 @@
<template>
<el-dialog
class="setimgDialog"
class="baseInforDialog"
title="基本信息"
:visible.sync="isShow"
:close-on-click-modal="false"
width="70%"
width="1280px"
>
<el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item label="开始日期">
@ -115,6 +115,9 @@
>
</el-pagination>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="isShow = false"> </el-button>
</div>
</el-dialog>
</template>
<script>
@ -124,7 +127,14 @@ export default {
return {
isShow: false,
formdata: {},
listData: [],
listData: [
{
name: "测试",
},
{
name: "测试2",
},
],
loading: false,
seltermid: "", //id
selcmdId: "", //cmdId
@ -182,4 +192,21 @@ export default {
},
};
</script>
<<<<<<< HEAD
<style lang="less">
.baseInforDialog {
.pageNation {
justify-content: flex-start;
margin-top: 16px;
.el-pagination {
padding: 0px;
.el-select .el-input {
margin-left: 0px;
}
}
}
}
</style>
=======
<style lang="less" scoped></style>
>>>>>>> hn1.0

@ -1,10 +1,10 @@
<template>
<el-dialog
class="setimgDialog"
class="gpsSiteDialog"
title="GPS位置数据"
:visible.sync="isShow"
:close-on-click-modal="false"
width="70%"
width="1280px"
>
<el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item label="开始日期">
@ -97,6 +97,9 @@
>
</el-pagination>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="isShow = false"> </el-button>
</div>
</el-dialog>
</template>
<script>
@ -106,7 +109,14 @@ export default {
return {
isShow: false,
formdata: {},
listData: [],
listData: [
{
name: "测试",
},
{
name: "测试2",
},
],
loading: false,
seltermid: "", //id
selcmdId: "", //cmdId
@ -164,4 +174,21 @@ export default {
},
};
</script>
<<<<<<< HEAD
<style lang="less">
.gpsSiteDialog {
.pageNation {
justify-content: flex-start;
margin-top: 16px;
.el-pagination {
padding: 0px;
.el-select .el-input {
margin-left: 0px;
}
}
}
}
</style>
=======
<style lang="less" scoped></style>
>>>>>>> hn1.0

@ -13,9 +13,19 @@
<el-option
v-for="item in accesslist"
:key="item.channelid"
:label="item.channelname"
:label="
item.alias !== null && item.alias !== ''
? item.alias
: item.channelname
"
:value="item.channelid"
></el-option>
>
{{
item.alias !== null && item.alias !== ""
? item.alias
: item.channelname
}}
</el-option>
</el-select>
</div>
<div class="flexno bt30">
@ -95,9 +105,19 @@
<el-option
v-for="item in accesslist"
:key="item.channelid"
:label="item.channelname"
:label="
item.alias !== null && item.alias !== ''
? item.alias
: item.channelname
"
:value="item.channelid"
></el-option>
>
{{
item.alias !== null && item.alias !== ""
? item.alias
: item.channelname
}}
</el-option>
</el-select>
</el-form-item>
<el-form-item label="色彩选择" prop="color">
@ -246,7 +266,7 @@ export default {
this.searchloading = true;
getPhotoParamApi({
channelId: this.selaccess,
cmdId: this.selcmdId,
termId: this.seltermid,
})
.then((res) => {
if (res.code == 200) {

@ -400,6 +400,8 @@ export default {
},
handleclose() {
this.isShow = false;
this.activeName = "1";
this.tabsActive = "first";
},
},
};

@ -1,10 +1,10 @@
<template>
<el-dialog
class="setimgDialog"
class="runStatusDialog"
title="装置运行状态"
:visible.sync="isShow"
:close-on-click-modal="false"
width="70%"
width="1280px"
>
<el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item label="开始日期">
@ -103,6 +103,9 @@
>
</el-pagination>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="isShow = false"> </el-button>
</div>
</el-dialog>
</template>
<script>
@ -112,7 +115,14 @@ export default {
return {
isShow: false,
formdata: {},
listData: [],
listData: [
{
name: "测试",
},
{
name: "测试2",
},
],
loading: false,
seltermid: "", //id
selcmdId: "", //cmdId
@ -170,4 +180,21 @@ export default {
},
};
</script>
<<<<<<< HEAD
<style lang="less">
.runStatusDialog {
.pageNation {
justify-content: flex-start;
margin-top: 16px;
.el-pagination {
padding: 0px;
.el-select .el-input {
margin-left: 0px;
}
}
}
}
</style>
=======
<style lang="less" scoped></style>
>>>>>>> hn1.0

@ -13,9 +13,19 @@
<el-option
v-for="item in accesslist"
:key="item.channelid"
:label="item.channelname"
:label="
item.alias !== null && item.alias !== ''
? item.alias
: item.channelname
"
:value="item.channelid"
></el-option>
>
{{
item.alias !== null && item.alias !== ""
? item.alias
: item.channelname
}}
</el-option>
</el-select>
</div>
<div class="flexno bt30">
@ -78,9 +88,19 @@
<el-option
v-for="item in accesslist"
:key="item.channelid"
:label="item.channelname"
:label="
item.alias !== null && item.alias !== ''
? item.alias
: item.channelname
"
:value="item.channelid"
></el-option>
>
{{
item.alias !== null && item.alias !== ""
? item.alias
: item.channelname
}}
</el-option>
</el-select>
</el-form-item>
<el-form-item label="视频分辨率" prop="videoFormat">
@ -142,7 +162,7 @@ export default {
selaccess: "", //
capturenr: {}, //
setForm: {
preset: 255
preset: 255,
}, //
rules: {
channelId: [{ required: true, message: "请选择通道", trigger: "blur" }],
@ -169,7 +189,7 @@ export default {
//
getSingleAccess(val) {
this.setForm = {
preset: 255
preset: 255,
};
console.log(val);
this.seltermid = val.id;

@ -1,10 +1,10 @@
<template>
<el-dialog
class="setimgDialog"
class="workStatus"
title="工作状态"
:visible.sync="isShow"
:close-on-click-modal="false"
width="70%"
width="1280px"
>
<el-form :inline="true" :model="formdata" class="demo-form-inline">
<el-form-item label="开始日期">
@ -129,6 +129,9 @@
>
</el-pagination>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="isShow = false"> </el-button>
</div>
</el-dialog>
</template>
<script>
@ -138,7 +141,14 @@ export default {
return {
isShow: false,
formdata: {},
listData: [],
listData: [
{
name: "测试",
},
{
name: "测试2",
},
],
loading: false,
seltermid: "", //id
selcmdId: "", //cmdId
@ -196,4 +206,21 @@ export default {
},
};
</script>
<<<<<<< HEAD
<style lang="less">
.workStatus {
.pageNation {
justify-content: flex-start;
margin-top: 16px;
.el-pagination {
padding: 0px;
.el-select .el-input {
margin-left: 0px;
}
}
}
}
</style>
=======
<style lang="less" scoped></style>
>>>>>>> hn1.0

@ -79,17 +79,19 @@
@row-click="handleRowClick"
v-loading="loading"
>
<!-- <el-table-column
prop="cmdid"
<el-table-column
fixed
prop="dyValueName"
label="电压等级"
show-overflow-tooltip
>
</el-table-column> -->
</el-table-column>
<template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty>
</template>
<el-table-column
fixed
prop="lineName"
label="线路名称"
show-overflow-tooltip
@ -102,6 +104,7 @@
</template>
</el-table-column>
<el-table-column
fixed
prop="towerName"
label="杆塔名称"
show-overflow-tooltip
@ -114,6 +117,7 @@
</template>
</el-table-column>
<el-table-column
fixed
prop="equipName"
label="设备名称"
show-overflow-tooltip
@ -121,62 +125,42 @@
>
</el-table-column>
<el-table-column
fixed
prop="cmdId"
label="设备编号"
show-overflow-tooltip
min-width="150"
>
</el-table-column>
<!-- <el-table-column
prop="cmdid"
label="SIM卡号"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="cmdid"
label="网络类型"
prop="isonline"
label="是否在线"
show-overflow-tooltip
fixed
>
<template slot-scope="scope">
{{ scope.row.isonline ? "在线" : "离线" }}</template
>
</el-table-column>
<el-table-column
prop="cmdid"
label="状态"
show-overflow-tooltip
>
<el-table-column prop="cmdid" label="SIM卡号" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="cmdid"
label="装置型号"
show-overflow-tooltip
>
<el-table-column prop="cmdid" label="网络类型" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="cmdid"
label="装置厂家"
show-overflow-tooltip
>
<el-table-column prop="cmdid" label="装置型号" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="cmdid"
label="规约版本"
show-overflow-tooltip
>
<el-table-column prop="cmdid" label="装置厂家" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="cmdid" label="规约版本" show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="cmdid"
label="投运日期"
show-overflow-tooltip
:formatter="dateFormat"
>
</el-table-column> -->
</el-table-column>
<el-table-column
prop="protocolName"
label="规约名称"
@ -265,10 +249,38 @@
<el-table-column
fixed="right"
label="操作"
width="540"
width="340"
v-if="roleUser != 2"
>
<template slot-scope="scope">
<el-dropdown
class="dropgps"
trigger="click"
@command="
(command) => {
handleSearchCommand(command, scope.row);
}
"
>
<span class="el-dropdown-link">
数据查询<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="info">基本信息</el-dropdown-item>
<el-dropdown-item command="workStatus"
>工作状态</el-dropdown-item
>
<el-dropdown-item command="runStatus"
>运行状态</el-dropdown-item
>
<el-dropdown-item command="GPS">GPS位置</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
@click.native.stop="handleParameterSet(scope.row)"
type="text"
>参数配置</el-button
>
<el-button
@click.native.stop="handleRevisePhoto(scope.row)"
type="text"
@ -279,7 +291,7 @@
@click.native.stop="handlepicture(scope.row)"
>图片标记</el-button
>
<el-button
<!-- <el-button
type="text"
@click.native.stop="handleDeviceReset(scope.row)"
>装置复位</el-button
@ -298,7 +310,7 @@
type="text"
@click.native.stop="handleShowGPS(scope.row)"
>获取GPS位置</el-button
>
> -->
<!-- <el-select
class="dropgps"
v-model="gpsvalue"
@ -314,7 +326,7 @@
>
</el-option>
</el-select> -->
<el-dropdown
<!-- <el-dropdown
class="dropgps"
trigger="click"
@command="
@ -330,7 +342,7 @@
<el-dropdown-item command="open">开启GPS</el-dropdown-item>
<el-dropdown-item command="close">关闭GPS</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown> -->
<el-button
type="text"
class="deleteText"
@ -339,7 +351,7 @@
>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="340" v-else>
<el-table-column fixed="right" label="操作" width="180" v-else>
<template slot-scope="scope">
<el-button
@click.native.stop="handleRevisePhoto(scope.row)"
@ -352,7 +364,7 @@
>图片标记</el-button
>
<el-button
<!-- <el-button
type="text"
@click.native.stop="handleShowGPS(scope.row)"
>获取GPS位置</el-button
@ -374,7 +386,11 @@
<el-dropdown-item command="open">开启GPS</el-dropdown-item>
<el-dropdown-item command="close">关闭GPS</el-dropdown-item>
</el-dropdown-menu>
<<<<<<< HEAD
</el-dropdown> -->
=======
</el-dropdown>
>>>>>>> hn1.0
<el-button
type="text"
class="deleteText"
@ -417,8 +433,8 @@
import {
getTerminalJoggle,
deleteTerminalJoggle,
resetTerminalApi,
setTermGPSJoggle,
// resetTerminalApi,
// setTermGPSJoggle,
getSearchInfo,
getTerminalListExcel,
} from "@/utils/api/index";
@ -561,6 +577,7 @@ export default {
this.getSearchdy();
this.page = 1;
this.pageSize = 20;
this.terminalList();
},
////
@ -613,105 +630,6 @@ export default {
this.$refs.addPhotoDialogref.getdataform(data);
console.log(data);
},
//
handleDeviceReset(data) {
this.$confirm("此操作将复位装置, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
resetTerminalApi({ cmId: data.cmdId })
.then((res) => {
if (res.code == 200) {
this.$message({
duration: 1500,
showClose: true,
message: "装置已复位",
type: "success",
});
} else {
this.$message({
duration: 1500,
showClose: true,
message: res.msg,
type: "error",
});
}
})
.catch((err) => {});
})
.catch(() => {
// this.$message({
// duration: 1500,
// showClose: true,
// type: "info",
// message: "",
// });
});
},
//GPS
handleShowGPS(data) {
// this.$refs.gpsdialog_ref.display();
// this.$refs.gpsdialog_ref.getgpsData(data);
this.$refs.gpsdialog_ref.display(data);
this.$refs.gpsdialog_ref.getgpssql();
console.log(data);
},
//gps
changeGPS(val, row) {
console.log(val, row);
setTermGPSJoggle({ gpsstatus: val, cmdId: row.cmdId })
.then((res) => {
console.log(res);
if (val == 0) {
this.$message({
duration: 1500,
message: "关闭GPS",
type: "success",
showClose: true,
});
} else {
this.$message({
duration: 1500,
message: "成功开启GPS",
type: "success",
showClose: true,
});
}
})
.catch((err) => {
console.log(err); //
});
},
handleCommand(command, row) {
console.log(command, row);
switch (command) {
case "open": //
this.changeGPS(1, row);
break;
case "close": //
this.changeGPS(0, row);
break;
}
},
//
// gpsChange(val) {
// console.log(val);
// },
//
handleImageCapture(data) {
this.$refs.imageCaptureref.display();
this.$refs.imageCaptureref.getSingleAccess(data);
this.$refs.imageCaptureref.getRatio();
},
//
handleVideoCapture(data) {
this.$refs.videoCaptureref.display();
this.$refs.videoCaptureref.getSingleAccess(data);
this.$refs.videoCaptureref.getRatio();
},
//线
handlepicture(data) {
@ -846,7 +764,7 @@ export default {
}
.dropgps {
color: @color-primary;
margin-left: 16px;
// margin-left: 16px;
// margin-right: 16px;
cursor: pointer;
font-size: 12px;

@ -67,6 +67,17 @@
>
</el-table-column>
<el-table-column
prop="status"
label="是否启用"
show-overflow-tooltip
min-width="120"
>
<template slot-scope="scope">
{{ scope.row.status == 1 ? "已启用" : "未启用" }}</template
>
</el-table-column>
<el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope">
<el-button

@ -341,6 +341,7 @@ export default {
//
getPicData() {
this.loading = true;
this.picList = [];
getPictureList({
pageindex: this.page,
pagesize: this.rowNum * this.colNum,

@ -393,6 +393,7 @@ export default {
//
getPicData() {
this.loading = true;
this.picList = [];
this.$set(this.formdata, "pageindex", this.page);
this.$set(this.formdata, "pagesize", this.pageSize);
// this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);

@ -1,5 +1,5 @@
<template>
<div class="camerChannel">
<div class="usermanagement">
<div class="deviceBox">
<div class="deviceBtnGroup">
<h4>用户管理</h4>
@ -173,7 +173,7 @@ export default {
};
</script>
<style lang="less">
.camerChannel {
.usermanagement {
width: calc(100% - 24px);
height: calc(100% - 24px);
padding: 12px 12px;

@ -29,11 +29,11 @@ module.exports = defineConfig({
proxy: {
"/api": {
//表示拦截以/api开头的请求路径
target: "http://47.96.238.157:8093", //阿里云服务器环境
// target: "http://180.166.218.222:40080", //dell
//target: "http://47.96.238.157:8093", //阿里云服务器环境
target: "http://180.166.218.222:40080", //dell
changOrigin: true, //是否开启跨域
pathRewrite: {
"^/api": "", //重写api把api变成空字符因为我们真正请求的路径是没有api的
"^/api": "/api", //重写api把api变成空字符因为我们真正请求的路径是没有api的
},
},
},

Loading…
Cancel
Save