Commit 4e1a525b authored by xxx's avatar xxx

1

parent 363d7ded
This diff is collapsed.
......@@ -64,7 +64,8 @@ export default {
data() {
return {
imgSrcStart:process.env.VUE_APP_LOCAL_API2,
iframeSrc:'http://oa.gemho.cn:8088/808gps/open/player/video.html?lang=zh&devIdno=202208221701&account=admin&password=admin&channel=4',
iframeSrc:'',
defaultIframeSrc:'http://oa.gemho.cn:8088/808gps/open/player/video.html?lang=zh&channel=9&account=admin&password=admin&vehiIdno=',
aiAnalysisTableData:[],
videoData: [],
defaultProps: {
......@@ -106,7 +107,6 @@ export default {
let fenquName = [];
res.content.forEach((item,index) => {
item.ref = "video" + index;
item.hls = null;
item.label = item.carnumber;
fenquName.push(item);
});
......@@ -119,16 +119,16 @@ export default {
})
});
this.videoData = data1;
console.log(this.videoData);
})
}
})
},
handleNodeClick(data) {
console.log(data);
if (data.children) {
return
} else {
//this.iframeSrc = this.defaultIframeSrc + data.carnumber;
this.iframeSrc = this.defaultIframeSrc + '202208221701';
this.noPtz = true;
}
},
......@@ -286,7 +286,7 @@ export default {
},
//销毁
beforeDestroy() {
this.iframeSrc = '';
}
};
......@@ -314,6 +314,7 @@ export default {
padding: 0;
margin-bottom: 0px;
z-index: 3;
overflow-y: scroll;
}
.el-tree-node__content {
height: 55px;
......
......@@ -55,9 +55,8 @@
<el-table-column prop="id" label="NO." align="center" width="60"></el-table-column>
<el-table-column prop="carnumber" label="车牌号" align="left"></el-table-column>
<el-table-column prop="name" label="摄像头名称" align="center"></el-table-column>
<el-table-column prop="ip" label="ip" align="center"></el-table-column>
<el-table-column prop="port" label="端口" align="center"></el-table-column>
<!-- <el-table-column prop="card" label="商标" align="center"></el-table-column> -->
<!-- <el-table-column prop="ip" label="ip" align="center"></el-table-column>
<el-table-column prop="port" label="端口" align="center"></el-table-column> -->
<el-table-column label="操作" width="150" align="center">
<template slot-scope="scope">
<el-button size="mini" round type="danger" @click="cameraDetaileDelete(scope.row)">删除</el-button>
......@@ -74,14 +73,11 @@
<el-form-item label="摄像头名称" style="margin-bottom:15px;" prop="name">
<el-input v-model="cameraDetailData.name"></el-input>
</el-form-item>
<el-form-item label="IP" style="margin-bottom:15px;" prop="ip">
<!-- <el-form-item label="IP" style="margin-bottom:15px;" prop="ip">
<el-input v-model="cameraDetailData.ip"></el-input>
</el-form-item>
<el-form-item label="端口" style="margin-bottom:15px;">
<el-input v-model="cameraDetailData.port"></el-input>
</el-form-item>
<!-- <el-form-item label="商标" style="margin-bottom:15px;" prop="card">
<el-input v-model="cameraDetailData.card"></el-input>
</el-form-item> -->
</el-form>
<span slot="footer" class="dialog-footer">
......@@ -132,9 +128,8 @@ export default {
name: [ { required: true, message: '请输入分区名称', trigger: 'blur' },]
},
rulesDetai:{
cameraName: [ { required: true, message: '请输入名称', trigger: 'blur' },],
cameraIp: [ { required: true, message: '请输入IP', trigger: 'blur' },],
brand: [ { required: true, message: '请输入IP', trigger: 'blur' },]
carnumber: [ { required: true, message: '请输入车牌号', trigger: 'blur' },],
name: [ { required: true, message: '请输入摄像头名称', trigger: 'blur' },],
}
}
},
......@@ -159,7 +154,7 @@ export default {
})
},
getCode1(id) {
HttpReq.truckDispatching.carMonitoringCarsQuery({page:0,size:100,motorcadeId:id}).then((res) => {
HttpReq.truckDispatching.carMonitoringCarsQuery({page:0,size:9999,motorcadeId:id}).then((res) => {
console.log("mainCameraDetail",res);
this.cameraDetail = res.content;
})
......
......@@ -55,7 +55,6 @@
<el-table-column prop="id" label="NO." align="center" width="60"></el-table-column>
<el-table-column prop="cameraName" label="区域名称" align="left"></el-table-column>
<el-table-column prop="cameraIp" label="区域IP" align="left"></el-table-column>
<el-table-column prop="brand" :formatter="formatter" label="商标" align="center"></el-table-column>
<el-table-column label="操作" width="150" align="center">
<template slot-scope="scope">
<el-button size="mini" round type="danger" @click="cameraDetaileDelete(scope.row)">删除</el-button>
......@@ -72,12 +71,9 @@
<el-form-item label="IP" style="margin-bottom:15px;" prop="cameraIp">
<el-input v-model="cameraDetailData.cameraIp"></el-input>
</el-form-item>
<el-form-item label="端口" style="margin-bottom:15px;">
<!-- <el-form-item label="端口" style="margin-bottom:15px;">
<el-input v-model="cameraDetailData.cameraPort"></el-input>
</el-form-item>
<el-form-item label="商标" style="margin-bottom:15px;" prop="brand">
<el-input v-model="cameraDetailData.brand" placeholder="1(海康威视) 2(大华)"></el-input>
</el-form-item>
</el-form-item> -->
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="cameraDetaileCancel()" style="padding:10px;">取 消</el-button>
......@@ -129,7 +125,6 @@ export default {
rulesDetai:{
cameraName: [ { required: true, message: '请输入名称', trigger: 'blur' },],
cameraIp: [ { required: true, message: '请输入IP', trigger: 'blur' },],
brand: [ { required: true, message: '请输入商标', trigger: 'blur' },]
}
}
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment