diff --git a/public/VideoWeb/Build/APP.data.unityweb b/public/VideoWeb/Build/APP.data.unityweb
index 1b1f74b8..e2b2c2c5 100644
Binary files a/public/VideoWeb/Build/APP.data.unityweb and b/public/VideoWeb/Build/APP.data.unityweb differ
diff --git a/public/VideoWeb/Build/APP.framework.js.unityweb b/public/VideoWeb/Build/APP.framework.js.unityweb
index ba812993..0893541d 100644
Binary files a/public/VideoWeb/Build/APP.framework.js.unityweb and b/public/VideoWeb/Build/APP.framework.js.unityweb differ
diff --git a/public/VideoWeb/Build/APP.wasm.unityweb b/public/VideoWeb/Build/APP.wasm.unityweb
index 29f14616..a6fd94de 100644
Binary files a/public/VideoWeb/Build/APP.wasm.unityweb and b/public/VideoWeb/Build/APP.wasm.unityweb differ
diff --git a/public/VideoWeb/index.html b/public/VideoWeb/index.html
index d8844c64..6ad5046b 100644
--- a/public/VideoWeb/index.html
+++ b/public/VideoWeb/index.html
@@ -261,6 +261,12 @@
window.parent.delSuccess()
}
+ }
+ //新增获取颜色
+ function addColor(){
+ if(unity!=null){
+ unity.SendMessage("GameManager",'Unity_AllGraphicsNotified','');
+ }
}
document.body.appendChild(script);
diff --git a/src/components/chart/lineChart.vue b/src/components/chart/lineChart.vue
index c70b66d7..f7a522f0 100644
--- a/src/components/chart/lineChart.vue
+++ b/src/components/chart/lineChart.vue
@@ -1,4 +1,6 @@
-
+
+
+
diff --git a/src/views/index.vue b/src/views/index.vue
index 67e66f4a..be19c3e5 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -501,6 +501,7 @@ export default {
message: res.data.msg,
type: 'success'
});
+ document.getElementById('mapModule').contentWindow.addColor()
}else{
this.$message({
message: res.data.msg,
@@ -539,8 +540,8 @@ export default {
const u8arr = new Uint8Array(message);
const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
const msg = JSON.parse(temp); //这一步报错则返回的是二进制流图片，不报错则返回的是JSON的错误提示数据
- // console.log("msg",msg)
- document.getElementById('mapModule').contentWindow.getDestination(JSON.stringify(msg));
+ console.log("msg",msg)
+ // document.getElementById('mapModule').contentWindow.getDestination(JSON.stringify(msg));
if (msg.rate == 'high') {
document.getElementById('mapModule').contentWindow.getDestination(JSON.stringify(msg));
@@ -645,8 +646,10 @@ export default {
this.ipData = "http://"+ip.split(":")[0]+':5000'
// document.getElementById('mapModule').contentWindow.getIpData(this.ipData);
document.getElementById('mapModule').contentWindow.getIpData('http://172.16.1.168:5000');
- document.getElementById('mapModule').contentWindow.postVideoId(JSON.stringify(this.$route.query.id));
- document.getElementById('mapModule').contentWindow.lixianVideo(JSON.stringify(this.analysis));
+ if(this.$route.query.type=='离线视频'){
+ 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(){
@@ -952,11 +955,10 @@ export default {
// }, 3000);
document.getElementById('mapModule').contentWindow.postFigureId(JSON.stringify(res.data.data));
- document
- .getElementById('mapModule')
- .contentWindow.postFigureName(
+ document.getElementById('mapModule').contentWindow.postFigureName(
JSON.stringify(res.data.data + ',' + form.name + ',' + this.startFigureName + ',' + this.numberNew)
);
+
this.dialogFormVisible = false;
} else {
this.$message({