chengdandan
/
TransFlow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git.lgzn.space/chengdandan/TransFlow

This commit is contained in:
luoshiwen 2023-02-21 11:00:51 +08:00
parent 31fb608988 3c9bc0b0de
commit de30027f02
12 changed files with 209 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/VideoWeb/Build/APP.data.unityweb
View File

Binary file not shown.

BIN
public/VideoWeb/Build/APP.framework.js.unityweb
View File

Binary file not shown.

BIN
public/VideoWeb/Build/APP.wasm.unityweb
View File

Binary file not shown.

6
public/VideoWeb/index.html
View File

@ -261,6 +261,12 @@
window.parent.delSuccess() window.parent.delSuccess()
} }
}
//新增获取颜色
function addColor(){
if(unity!=null){
unity.SendMessage("GameManager",'Unity_AllGraphicsNotified','');
}
} }
document.body.appendChild(script); document.body.appendChild(script);

4
src/components/chart/lineChart.vue
View File

@ -1,4 +1,6 @@
<template><div id="lineChart" ref="lineChart" style="width: 100%; height: 300px"></div></template> <template>
<div id="lineChart" ref="lineChart" style="width: 100%; height: 300px"></div>
</template>
<script> <script>
export default { export default {

10
src/components/chart/regionTable.vue
View File

@ -15,8 +15,8 @@
<div v-if="msg"> <div v-if="msg">
<!-- 触发 --> <!-- 触发 -->
<el-table :data="msg" style="width: 100%" v-if="type == '触发' "> <el-table :data="msg" style="width: 100%" v-if="type == '触发' ">
<el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> <!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> -->
<el-table-column align="center" prop="graphical_id" label="区域编号"></el-table-column> <!-- <el-table-column align="center" prop="graphical_id" label="区域编号"></el-table-column> -->
<el-table-column align="center" prop="name" label="区域名称"></el-table-column> <el-table-column align="center" prop="name" label="区域名称"></el-table-column>
<el-table-column align="center" prop="time" label="时间戳"></el-table-column> <el-table-column align="center" prop="time" label="时间戳"></el-table-column>
<el-table-column align="center" label="目标类型"> <el-table-column align="center" label="目标类型">
@ -37,8 +37,8 @@
<el-table-column align="center" prop="speed" label="空间平均速度"></el-table-column> <el-table-column align="center" prop="speed" label="空间平均速度"></el-table-column>
</el-table> </el-table>
<el-table :data="msg" style="width: 100%" v-if="type == '周期时刻' "> <el-table :data="msg" style="width: 100%" v-if="type == '周期时刻' ">
<el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> <!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> -->
<el-table-column align="center" prop="graphical_id" label="区域编号"></el-table-column> <!-- <el-table-column align="center" prop="graphical_id" label="区域编号"></el-table-column> -->
<el-table-column align="center" prop="name" label="区域名称"></el-table-column> <el-table-column align="center" prop="name" label="区域名称"></el-table-column>
<el-table-column align="center" prop="time" label="时间戳"></el-table-column> <el-table-column align="center" prop="time" label="时间戳"></el-table-column>
<el-table-column align="center" label="目标类型"> <el-table-column align="center" label="目标类型">
@ -60,7 +60,7 @@
</el-table> </el-table>
<!-- 周期统计 --> <!-- 周期统计 -->
<el-table :data="msg" style="width: 100%" v-if="type == '周期统计'"> <el-table :data="msg" style="width: 100%" v-if="type == '周期统计'">
<el-table-column align="center" prop="zone_id" label="区域编号"></el-table-column> <!-- <el-table-column align="center" prop="zone_id" label="区域编号"></el-table-column> -->
<el-table-column align="center" prop="name" label="区域名称"></el-table-column> <el-table-column align="center" prop="name" label="区域名称"></el-table-column>
<el-table-column align="center" prop="timestamp" label="时间戳"></el-table-column> <el-table-column align="center" prop="timestamp" label="时间戳"></el-table-column>
<el-table-column align="center" label="目标类型"> <el-table-column align="center" label="目标类型">

4
src/components/chart/tableShow.vue
View File

@ -14,8 +14,8 @@
<!-- 触发 --> <!-- 触发 -->
<div v-if="msg"> <div v-if="msg">
<el-table :data="msg" style="width: 100%" v-if="type == '触发'"> <el-table :data="msg" style="width: 100%" v-if="type == '触发'">
<el-table-column align="center" prop="steam_id" label="视频路"></el-table-column> <!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column>
<el-table-column align="center" prop="zone_id" label="区域编号"></el-table-column> <el-table-column align="center" prop="zone_id" label="区域编号"></el-table-column> -->
<el-table-column align="center" prop="name" label="区域名称"></el-table-column> <el-table-column align="center" prop="name" label="区域名称"></el-table-column>
<el-table-column align="center" prop="timestamp" label="时间戳"></el-table-column> <el-table-column align="center" prop="timestamp" label="时间戳"></el-table-column>
<!-- <el-table-column align="center" prop="" label="视频帧"></el-table-column> --> <!-- <el-table-column align="center" prop="" label="视频帧"></el-table-column> -->

67
src/components/common/Whole.vue
View File

@ -115,6 +115,16 @@ export default {
title : '健康检测', title : '健康检测',
path: '/test1/HealthCheck', path: '/test1/HealthCheck',
},
{
title : '接口与服务器证书',
path: '/test1/InterfaceServerCertificates',
// icon : 'tool',
},
{
title : 'UDP服务设置',
path: '/test1/UDPServiceSettings',
// icon : 'tool',
} }
] ]
},{ },{
@ -132,39 +142,32 @@ export default {
}, },
] ]
},{ },
title : '系统设置', // {
path: 'SystemSettings', // title : '系统设置',
icon : 'el-icon-s-tools', // path: 'SystemSettings',
// icon : 'el-icon-s-tools',
children : [ // children : [
{ // {
title : '全局设置', // title : '全局设置',
path: '/test1/globalSettings', // path: '/test1/globalSettings',
// icon : 'bars', // // icon : 'bars',
}, // },
{ // {
title : '关于本机——导出设置', // title : '关于本机——导出设置',
path: '/test1/ExportingSettings', // path: '/test1/ExportingSettings',
// icon : 'tool', // // icon : 'tool',
}, // },
{ // {
title : '关于本机——导入设置', // title : '关于本机——导入设置',
path: '/test1/ImportSettings', // path: '/test1/ImportSettings',
// icon : 'tool', // // icon : 'tool',
}, // },
{
title : '接口与服务器证书', // ]
path: '/test1/InterfaceServerCertificates', // },
// icon : 'tool', {
},
{
title : 'UDP服务设置',
path: '/test1/UDPServiceSettings',
// icon : 'tool',
}
]
},{
title : '用户管理', title : '用户管理',
path: 'UserManagement', path: 'UserManagement',
icon : 'el-icon-user-solid', icon : 'el-icon-user-solid',

67
src/page/test1/index.vue
View File

@ -62,6 +62,16 @@ export default {
title : '健康检测', title : '健康检测',
path: 'HealthCheck', path: 'HealthCheck',
// icon : 'tool', // icon : 'tool',
},
{
title : '接口与服务器证书',
path: 'InterfaceServerCertificates',
// icon : 'tool',
},
{
title : 'UDP服务设置',
path: 'UDPServiceSettings',
// icon : 'tool',
} }
] ]
},{ },{
@ -79,39 +89,32 @@ export default {
}, },
] ]
},{ },
title : '系统设置', // {
path: 'SystemSettings', // title : '系统设置',
icon : require('@/assets/img/xtsz.png'), // path: 'SystemSettings',
// icon : require('@/assets/img/xtsz.png'),
children : [ // children : [
{ // {
title : '全局设置', // title : '全局设置',
path: 'globalSettings', // path: 'globalSettings',
// icon : 'bars', // // icon : 'bars',
}, // },
{ // {
title : '关于本机——导出设置', // title : '关于本机——导出设置',
path: 'ExportingSettings', // path: 'ExportingSettings',
// icon : 'tool', // // icon : 'tool',
}, // },
{ // {
title : '关于本机——导入设置', // title : '关于本机——导入设置',
path: 'ImportSettings', // path: 'ImportSettings',
// icon : 'tool', // // icon : 'tool',
}, // },
{
title : '接口与服务器证书', // ]
path: 'InterfaceServerCertificates', // },
// icon : 'tool', {
},
{
title : 'UDP服务设置',
path: 'UDPServiceSettings',
// icon : 'tool',
}
]
},{
title : '用户管理', title : '用户管理',
path: 'UserManagement', path: 'UserManagement',
// icon : 'el-icon-s-goods', // icon : 'el-icon-s-goods',

5
src/views/AnalysisMain.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="content-box"> <div class="content-box">
<!-- v-if="videoTypeShow" --> <!-- v-if="videoTypeShow" -->
<div class="videoTypeBox" > <div class="videoTypeBox" v-if="videoTypeShow">
<el-form :inline="true" :model="videoTypeForm" class="demo-form-inline" > <el-form :inline="true" :model="videoTypeForm" class="demo-form-inline" >
<el-form-item label="视频源类型：" > <el-form-item label="视频源类型：" >
<el-radio-group v-model="videoTypeForm.videoType"> <el-radio-group v-model="videoTypeForm.videoType">
@ -182,7 +182,6 @@ destroyed: function () {
/** 创建mqtt */ /** 创建mqtt */
createMqtt() { createMqtt() {
//创建链接，接收数据 //创建链接，接收数据
console.log(window.PubScribe,'********************');
window.PubScribe(null,-1,this.realInfo); window.PubScribe(null,-1,this.realInfo);
/*mqtt = new mqttConfig(this.topicSends); /*mqtt = new mqttConfig(this.topicSends);
@ -648,7 +647,7 @@ destroyed: function () {
} }
.videoTypeBox{ .videoTypeBox{
background: #fff; background: #fff;
width: 98%; /* width: 98%; */
margin-left: 1%; margin-left: 1%;
display: flex; display: flex;
padding-top: 20px; padding-top: 20px;

114
src/views/general/AboutMachine.vue
View File

@ -53,12 +53,36 @@
<el-button type="primary" @click="handleagain()" size="small">重新启动</el-button> <el-button type="primary" @click="handleagain()" size="small">重新启动</el-button>
</el-col> </el-col>
</el-form-item> </el-form-item>
<p>全局设置</p>
<el-form-item label="视频接入上限：">
<el-input-number v-model="videoNumber" :min="1" size="mini"
:max="8"></el-input-number>
<i class="el-icon-warning" style="color: #409EFF; margin: 0 3px 0 10px;"></i>范围1-8、默认6
</el-form-item>
<el-form-item label="跳帧设置：">
<!-- <el-input-number v-model="FPS" @change="handleChange" size="mini"></el-input-number> -->
<el-select v-model="FPS" size="mini" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<i class="el-icon-warning" style="color: #409EFF; margin: 0 3px 0 10px;"></i>默认取值：单路视频流 0 ；2-3 路视频流 1；4-6 路视频流 4
</el-form-item>
<el-button type="primary" size="small" @click="commit()">保存</el-button>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import {getQuanjszData} from "../../api/index";
import serverUrl from "../../config/apiurl.js"
import {setQuanjsz} from "@/api/index"
import axios from 'axios'
export default { export default {
data(){ data(){
return{ return{
@ -73,8 +97,28 @@ export default {
resource: '', resource: '',
desc: '' desc: ''
}, },
fileList:[] fileList:[],
videoNumber: 6,
FPS: '0',
id:'',
options:[
{
value: '0',
label: '0'
},
{
value: '1',
label: '1'
},
{
value: '4',
label: '4'
},
],
} }
},
mounted() {
this.getShipjkDatalist()
}, },
methods:{ methods:{
handleagain(){ handleagain(){
@ -122,7 +166,73 @@ export default {
}, },
beforeRemove(file, fileList) { beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${ file.name }？`); return this.$confirm(`确定移除 ${ file.name }？`);
} },
handleChangeVideoNumber(value){
console.log("videoNumber",value)
this.videoNumber=value
let formData = new FormData();
formData.append("F_NB_SHIPJRSX",value);
formData.append("F_NB_TIAOZSZ",this.FPS);
formData.append("F_VC_ID",this.id);
axios({
method: "post",
url: serverUrl.postSetQuanjsz,
data:formData
}).then((res) => {
console.log("res",res)
if(res.data.code==200){
this.$message({
message: res.data.msg,
type: 'success'
});
}else{
this.$message({
message: res.data.msg,
type: 'warning'
});
}
})
},
handleChange(value) {
console.log("FPS",value)
this.FPS=value
const formData = new URLSearchParams();
// let formData = new FormData();
formData.append("VideoAccessLimit",this.videoNumber);
formData.append("SkipFrame",value);
formData.append("GlobalSettingId",this.id);
formData(formData).then(res=>{
this.$message({
message: res.data.msg,
type: 'success'
});
})
},
//获取全局设置数据
getShipjkDatalist(){
getQuanjszData().then(res=>{
console.log("res11111",res)
if(res.data.code==200){
this.videoNumber=res.data.data.videoAccessLimit
this.FPS=res.data.data.skipFrame
this.id = res.data.data.globalSettingId
}
})
},
//点击确认
commit(){
const formData = new URLSearchParams();
// let formData = new FormData();
formData.append("VideoAccessLimit",this.videoNumber);
formData.append("SkipFrame",this.FPS);
formData.append("GlobalSettingId",this.id);
setQuanjsz(formData).then(res=>{
this.$message({
message: res.data.msg,
type: 'success'
});
})
}
} }
} }
</script> </script>

16
src/views/index.vue
View File

@ -501,6 +501,7 @@ export default {
message: res.data.msg, message: res.data.msg,
type: 'success' type: 'success'
}); });
document.getElementById('mapModule').contentWindow.addColor()
}else{ }else{
this.$message({ this.$message({
message: res.data.msg, message: res.data.msg,
@ -539,8 +540,8 @@ export default {
const u8arr = new Uint8Array(message); const u8arr = new Uint8Array(message);
const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串 const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
const msg = JSON.parse(temp); //这一步报错则返回的是二进制流图片，不报错则返回的是JSON的错误提示数据 const msg = JSON.parse(temp); //这一步报错则返回的是二进制流图片，不报错则返回的是JSON的错误提示数据
// console.log("msg",msg) console.log("msg",msg)
document.getElementById('mapModule').contentWindow.getDestination(JSON.stringify(msg)); // document.getElementById('mapModule').contentWindow.getDestination(JSON.stringify(msg));
if (msg.rate == 'high') { if (msg.rate == 'high') {
document.getElementById('mapModule').contentWindow.getDestination(JSON.stringify(msg)); document.getElementById('mapModule').contentWindow.getDestination(JSON.stringify(msg));
@ -645,8 +646,10 @@ export default {
this.ipData = "http://"+ip.split(":")[0]+':5000' this.ipData = "http://"+ip.split(":")[0]+':5000'
// document.getElementById('mapModule').contentWindow.getIpData(this.ipData); // document.getElementById('mapModule').contentWindow.getIpData(this.ipData);
document.getElementById('mapModule').contentWindow.getIpData('http://172.16.1.168:5000'); document.getElementById('mapModule').contentWindow.getIpData('http://172.16.1.168:5000');
document.getElementById('mapModule').contentWindow.postVideoId(JSON.stringify(this.$route.query.id)); if(this.$route.query.type=='离线视频'){
document.getElementById('mapModule').contentWindow.lixianVideo(JSON.stringify(this.analysis)); document.getElementById('mapModule').contentWindow.lixianVideo(JSON.stringify(this.analysis));
}
document.getElementById('mapModule').contentWindow.postVideoId(JSON.stringify(this.$route.query.id+ ',' +this.$route.query.type));
}, },
//删除图形成功获取数据 //删除图形成功获取数据
delSuccess(){ delSuccess(){
@ -952,11 +955,10 @@ export default {
// }, 3000); // }, 3000);
document.getElementById('mapModule').contentWindow.postFigureId(JSON.stringify(res.data.data)); document.getElementById('mapModule').contentWindow.postFigureId(JSON.stringify(res.data.data));
document document.getElementById('mapModule').contentWindow.postFigureName(
.getElementById('mapModule')
.contentWindow.postFigureName(
JSON.stringify(res.data.data + ',' + form.name + ',' + this.startFigureName + ',' + this.numberNew) JSON.stringify(res.data.data + ',' + form.name + ',' + this.startFigureName + ',' + this.numberNew)
); );
this.dialogFormVisible = false; this.dialogFormVisible = false;
} else { } else {
this.$message({ this.$message({