From 82f24882cc03a5d8ee3d0f70f465241a6f1c2442 Mon Sep 17 00:00:00 2001 From: ori Date: Wed, 1 May 2019 19:57:03 +0300 Subject: [PATCH] mirrored dic keys in ui from backend --- chameleon-client/src/components/SystemTab.vue | 6 +++--- chameleon-client/src/store.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chameleon-client/src/components/SystemTab.vue b/chameleon-client/src/components/SystemTab.vue index b85415f05..b1983d51c 100644 --- a/chameleon-client/src/components/SystemTab.vue +++ b/chameleon-client/src/components/SystemTab.vue @@ -71,10 +71,10 @@ socketSendAll: function(){ this.$socket.sendObj([ {'team_number':this.teamNum}, - {'connectionType':this.connectionType}, + {'connection_type':this.connectionType}, {'ip':this.ip}, - {'gateWay':this.gateWay}, - {'hostName':this.hostName}]); + {'gateway':this.gateWay}, + {'hostname':this.hostName}]); } }, computed: { diff --git a/chameleon-client/src/store.js b/chameleon-client/src/store.js index 9094d9117..cbd526919 100644 --- a/chameleon-client/src/store.js +++ b/chameleon-client/src/store.js @@ -45,7 +45,7 @@ export const store = new Vuex.Store({ state['camera'] = value; state['pipeline'] = "0"; }, - pipeline: set('pipeline'), + pipeline: set('curr_pipeline'), brightness: set('brightness'), exposure: set('exposure'), orientation:set('orientation'), @@ -58,11 +58,11 @@ export const store = new Vuex.Store({ area: set('area'), ratio: set('ratio'), extent: set('extent'), - teamValue: set('teamValue'), - connectionType: set('connectionType'), + teamValue: set('team_number'), + connectionType: set('connection_type'), ip: set('ip'), - gateWay : set('gateWay'), - hostName : set('hostName'), + gateWay : set('gateway'), + hostName : set('hostname'), streamAdress : set('streamAdress'), isBinaryImage: set('isBinaryImage'), cameraList : set('cameraList'),