-
+
{{name}}
diff --git a/New client/chameleon-client/src/main.js b/New client/chameleon-client/src/main.js
index 0bfc42000..5f86b9150 100644
--- a/New client/chameleon-client/src/main.js
+++ b/New client/chameleon-client/src/main.js
@@ -4,8 +4,8 @@ import router from './router'
import store from './store'
import vuetify from './plugins/vuetify';
import VueNativeSock from 'vue-native-websocket';
-Vue.config.productionTip = false
-// Vue.use(VueNativeSock,'ws://' + location.hostname + ':8888/websocket',{format:'JSON'});
+Vue.config.productionTip = false;
+// Vue.use(VueNativeSock,'ws://' + location.host + '/websocket',{format: 'json'});
new Vue({
router,
store,
diff --git a/New client/chameleon-client/src/views/Camera.vue b/New client/chameleon-client/src/views/Camera.vue
index 46d3c479e..bf11e938d 100644
--- a/New client/chameleon-client/src/views/Camera.vue
+++ b/New client/chameleon-client/src/views/Camera.vue
@@ -7,12 +7,40 @@
+
+
+
-
- add
- delete
+
+
+
+ menu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -48,6 +76,7 @@ import ThresholdTab from './CameraViewes/ThresholdTab'
import ContoursTab from './CameraViewes/ContoursTab'
import OutputTab from './CameraViewes/OutputTab'
import CVselect from '../components/cv-select'
+import CVicon from '../components/cv-icon'
export default {
name: 'CameraTab',
components:{
@@ -55,7 +84,8 @@ import CVselect from '../components/cv-select'
ThresholdTab,
ContoursTab,
OutputTab,
- CVselect
+ CVselect,
+ CVicon
},
methods:{
test(){