-
+
+
+
+
+
diff --git a/chameleon-client/src/components/ch-select.vue b/chameleon-client/src/components/ch-select.vue
index c8999a18a..229c78d2a 100644
--- a/chameleon-client/src/components/ch-select.vue
+++ b/chameleon-client/src/components/ch-select.vue
@@ -4,7 +4,7 @@
{{title}}
-
+
{{item}}
@@ -16,7 +16,6 @@
name: 'ch-select',
props:[
'title',
- 'placeholdert',
'list'
],
data() {
@@ -36,11 +35,11 @@
h4 {
color: #e6ebf1;
}
- .ivu-select-selection{
+ /* .ivu-select-selection{
background-color: #2c3e50 !important;
- }
- .ivu-select-selected-value{
+ } */
+ /* .ivu-select-selected-value{
color: #fff !important;
- }
+ } */
\ No newline at end of file
diff --git a/chameleon-client/src/components/ch-slider.vue b/chameleon-client/src/components/ch-slider.vue
index faca79567..c564a0182 100644
--- a/chameleon-client/src/components/ch-slider.vue
+++ b/chameleon-client/src/components/ch-slider.vue
@@ -34,9 +34,9 @@
h4 {
color: #e6ebf1;
}
- .ivu-input-number-input{
+ /* .ivu-input-number-input{
background-color: #2c3e50 !important;
color: #fff !important;
- }
+ } */
diff --git a/chameleon-client/src/main.js b/chameleon-client/src/main.js
index d45662fd7..d51ce89d9 100644
--- a/chameleon-client/src/main.js
+++ b/chameleon-client/src/main.js
@@ -4,10 +4,11 @@ import VueRouter from 'vue-router'
import iView from 'iview';
import router from "./routes";
import '../theme/index.less';
-import VueNativeSock from 'vue-native-websocket'
+import VueNativeSock from 'vue-native-websocket';
+import locale from 'iview/dist/locale/en-US';
Vue.use(VueRouter);
-Vue.use(iView);
+Vue.use(iView , { locale });
Vue.use(VueNativeSock,'ws://'+location.hostname+':8888/websocket');
Vue.config.productionTip = false
diff --git a/chameleon-client/src/routes.js b/chameleon-client/src/routes.js
index 243d2b002..9a927d4b0 100644
--- a/chameleon-client/src/routes.js
+++ b/chameleon-client/src/routes.js
@@ -7,7 +7,7 @@ import Camera from "./components/CameraTab.vue";
const routes = [
{ path: '/', redirect: '/vision/input'},
{ path: '/vision/input', component: Input, name:'input' },
- { path: '/vision/3d', component: Threshold ,name:'threshold'},
+ { path: '/vision/threshold', component: Threshold ,name:'threshold'},
{path:'/settings/system', component: System },
{path:'/settings/camera', component: Camera}
]