diff --git a/New client/chameleon-client/src/main.js b/New client/chameleon-client/src/main.js index 167b5d192..8d3c07995 100644 --- a/New client/chameleon-client/src/main.js +++ b/New client/chameleon-client/src/main.js @@ -5,7 +5,8 @@ import store from './store' import vuetify from './plugins/vuetify'; import VueNativeSock from 'vue-native-websocket'; Vue.config.productionTip = false; -Vue.use(VueNativeSock,'ws://' + location.host + '/websocket',{format: 'json'}); +// Vue.use(VueNativeSock,'ws://' + location.host + '/websocket',{format: 'json'}); +Vue.use(VueNativeSock,'ws://'+location.hostname+':8888/websocket',{format:'JSON'}); new Vue({ router, store, diff --git a/New client/chameleon-client/src/router.js b/New client/chameleon-client/src/router.js index 0323c95f9..3adccdc5f 100644 --- a/New client/chameleon-client/src/router.js +++ b/New client/chameleon-client/src/router.js @@ -1,9 +1,10 @@ import Vue from 'vue' import Router from 'vue-router' -import Camera from './views/Camera.vue' -import Settings from './views/Settings.vue' Vue.use(Router) +function lazyLoad(view){ + return() => import(`@/views/${view}.vue`) +} export default new Router({ mode: 'history', base: process.env.BASE_URL, @@ -15,12 +16,12 @@ export default new Router({ { path: '/Vision', name: 'Vision', - component: Camera + component: lazyLoad('Camera') }, { path: '/Settings', name: 'Settings', - component: Settings + component: lazyLoad('Settings') } ] }) diff --git a/New client/chameleon-client/src/views/Camera.vue b/New client/chameleon-client/src/views/Camera.vue index 665c825df..c742e06fa 100644 --- a/New client/chameleon-client/src/views/Camera.vue +++ b/New client/chameleon-client/src/views/Camera.vue @@ -62,7 +62,9 @@ Normal Threshold - +
+ +
{{point}}
@@ -175,9 +177,12 @@ import CVicon from '../components/cv-icon' } .videoClass{ - display: block; - margin-right: auto; - margin-left: auto; + text-align: center; + } + .videoClass img{ + height: auto !important; + width: 75%; + vertical-align: middle; } #Point{ padding-top: 5px; diff --git a/New client/chameleon-client/src/views/Settings.vue b/New client/chameleon-client/src/views/Settings.vue index d8ce1e645..f3f9a8892 100644 --- a/New client/chameleon-client/src/views/Settings.vue +++ b/New client/chameleon-client/src/views/Settings.vue @@ -1,6 +1,6 @@