Merge remote-tracking branch 'origin/master'

This commit is contained in:
ori agranat
2019-03-24 20:02:55 +02:00
9 changed files with 103 additions and 32 deletions

View File

@@ -11,7 +11,7 @@
<span v-if="!isCollapsed">Vision</span>
</template>
<MenuItem name="/vision/input" to="/vision/input">Input</MenuItem>
<MenuItem name="/vision/3d" to="/vision/3d">Threshold</MenuItem>
<MenuItem name="/vision/threshold" to="/vision/threshold">Threshold</MenuItem>
</Submenu>
<Submenu name="/settings">
<template slot="title">
@@ -96,7 +96,7 @@
}
},
created () {
// this.$options.sockets.onmessage = (data) => console.log(data.data); // console writes recived data
this.$options.sockets.onmessage = (data) => console.log(data.data); // console writes recived data
}
}