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

public/analysisWeb/StreamingAssets/IPSettings.txt

@@ -1 +1 @@
-http://127.0.0.1:5000
+ws://172.16.1.168:10087/

public/analysisWeb/index.html

@@ -131,6 +131,13 @@
       function getDianwei(string){
           unityInstanceA.SendMessage('GameManager','ReceptionVideoIdSececeTwo',JSON.stringify(string));
       }
+      //获取ip
+      function getIpData(string){
+        console.log("获取ip",string)
+        if(unityInstanceA!=null){ 
+            unityInstanceA.SendMessage('GameManager','SetIP', string);
+        }
+      }
       function setPOS(string){
         console.log(string,'123');
         unityInstanceA.SendMessage('GameManager','WebToUnityDot',JSON.stringify(string));

src/components/target/typeChart.vue

@@ -178,7 +178,9 @@ export default {
     watch: {
         // 监听触发数据
         dataArr: {
-            handler(newVal) {},
+            handler(newVal) {
+                console.log("newVal",newVal)
+            },
 
             immediate: true
         },

src/views/bounced/analysisConfiguration.vue

@@ -735,6 +735,10 @@ export default {
             // this.$set(this.coordinateTableData, index, row);
         },
         OnSceneload(newV) {
+              var ip = window.location.host;
+            this.ipData = 'http://' + ip.split(':')[0] + ':5000';
+            // document.getElementById('mapModule').contentWindow.getIpData(this.ipData);
+            this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000');
             this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id);
             this.unityDone = true;
         },
@@ -1040,6 +1044,9 @@ export default {
             //  document.getElementById("mapModule").contentWindow.getDestination(1)
             const clientId = 'test_id_' + String(new Date().getTime()); // 用户名
             //   const host = 'ws://49.234.27.18:10087/'; // 一个测试用url，改成给的，ws://broker.emqx.io:8083/mqtt
+              var ip = window.location.host.split(":")[0];
+                console.log("ip",ip)
+            //   const host = `ws://${ip}:10087`;
             const host = 'ws://172.16.1.168:10087/';
             const options = {
                 // 配置

src/views/bounced/analysisPreview.vue

@@ -65,6 +65,9 @@ export default {
        
       const clientId = "test_id_" + String(new Date().getTime()); // 用户名
       //   const host = 'ws://49.234.27.18:10087/'; // 一个测试用url，改成给的，ws://broker.emqx.io:8083/mqtt
+      var ip = window.location.host.split(":")[0];
+        console.log("ip",ip)
+    //   const host = `ws://${ip}:10087`;
       const host = 'ws://172.16.1.168:10087/';
 
       const options = {

src/views/bounced/dataBoard.vue

@@ -382,10 +382,13 @@ export default {
     methods: {
 
         siftData() {
+             this.sectionData=[]
+             this.sectionArr=[]
             this.componentList.forEach((val) => {
                 this.sectionArr.push(val.combinationName);
                 this.sectionArr = Array.from(new Set(this.sectionArr));
             });
+           
             this.sectionData = this.sectionArr.map((item) => {
                 if (item.children == undefined) {
                     item = { title: item, children: [] };
@@ -432,7 +435,22 @@ export default {
     mounted() {
     },
     watch: {
+        activeName: {
+            handler(newVal) {
+                console.log("newVal",newVal)
+                if (newVal == "second") {
+                    getComponentSection({ VideoId: this.$route.query.id }).then(res => {
+                        // if (res.data.code == 200) {
+                            this.componentList = res.data.data;
+                            this.siftData();
+                        // } else if (res.data.code == 404) {
+                        // }
+                    });
+                }
 
+            },
+            immediate: true
+        },
         // 触发的原始数据
         triggerData: {
             handler(newVal, oldVal) {