diff --git a/chameleon-client/src/components/InputTab.vue b/chameleon-client/src/components/InputTab.vue index 56231a185..8d7ee0e24 100644 --- a/chameleon-client/src/components/InputTab.vue +++ b/chameleon-client/src/components/InputTab.vue @@ -5,7 +5,6 @@ - @@ -23,9 +22,6 @@ import chselect from './ch-select.vue' chselect }, methods: { - test(){ - console.log(this.$store.state) - } } } diff --git a/chameleon-client/src/components/Settings.vue b/chameleon-client/src/components/Settings.vue index b3b506054..ec047a644 100644 --- a/chameleon-client/src/components/Settings.vue +++ b/chameleon-client/src/components/Settings.vue @@ -1,11 +1,7 @@ diff --git a/chameleon-client/src/components/SystemTab.vue b/chameleon-client/src/components/SystemTab.vue index 09d95522d..8e420b3f6 100644 --- a/chameleon-client/src/components/SystemTab.vue +++ b/chameleon-client/src/components/SystemTab.vue @@ -47,7 +47,7 @@ - + diff --git a/chameleon-client/src/components/Vision.vue b/chameleon-client/src/components/Vision.vue index f3561237b..c37209f63 100644 --- a/chameleon-client/src/components/Vision.vue +++ b/chameleon-client/src/components/Vision.vue @@ -11,11 +11,13 @@ - + - - + + + + @@ -37,8 +39,16 @@ }, methods: { - } + }, + computed: { + steamAdress: { + get: function(){ + return this.$store.state.streamAdress; + } + } + }, } \ No newline at end of file diff --git a/chameleon-client/src/store.js b/chameleon-client/src/store.js index f643f63c9..753df2c54 100644 --- a/chameleon-client/src/store.js +++ b/chameleon-client/src/store.js @@ -24,14 +24,16 @@ export const store = new Vuex.Store({ dilate: false, //contours area:[0,100], - ratio:[0,0], + ratio:[0,1], extent:[0,100], //Settings teamValue:0, connectionType:"DHCP", ip:0, gateWay:0, - hostName:"" + hostName:"", + //live info + streamAdress:("http://"+location.hostname + ":1181/?stream") }, mutations:{ @@ -56,7 +58,8 @@ export const store = new Vuex.Store({ connectionType: set('connectionType'), ip: set('ip'), gateWay : set('gateWay'), - hostName : set('hostName') + hostName : set('hostName'), + streamAdress : set('streamAdress') }, getters:{ camera: state => state.camera, @@ -77,7 +80,8 @@ export const store = new Vuex.Store({ connectionType: state => state.connectionType, ip: state => state.ip, gateWay: state => state.gateWay, - hostName: state => state.hostName + hostName: state => state.hostName, + streamAdress: state => state.streamAdress }, }); \ No newline at end of file