Merge branch 'develop/neulive_0901' into release/0820_neulive_SN066

src/app/main.js

@@ -53,9 +53,9 @@ Vue.use(VueWorker)
 Vue.use(VueAxios, axios)
 
 // Vue.use(VueMqtt, 'ws://52.194.17.114:8083')
-// Vue.use(VueMqtt, 'ws://' + location.href.split('/')[2] + ':8083')
+Vue.use(VueMqtt, 'ws://' + location.href.split('/')[2] + ':8083')
+// Vue.use(VueMqtt, 'ws://' + '192.168.151.125' + ':8083')
 // Vue.use(VueMqtt, 'ws://' + '192.168.151.125' + ':8083')
-Vue.use(VueMqtt, 'ws://' + '192.168.151.125' + ':8083')
 
 Vue.prototype.GLOBAL = global_
 

src/components/devices/DevicesOverview.vue

@@ -348,7 +348,7 @@ export default {
     getControllerList: async function () {
       const update = async () => {
         this.controllerList.push({
-          id: 'tommy_test',
+          id: 'BPS-HUB-SN066',
           mac: '',
           status: 'loading',
           isScan: true,

src/components/download/Download.vue

@@ -43,7 +43,7 @@ export default {
     getControllerList: async function () {
       const update = async () => {
         this.controllerList.push({
-          id: 'tommy_test',
+          id: 'BPS-HUB-SN066',
           mac: '',
           status: 'loading',
           isScan: true,

src/components/download/_Download.vue

@@ -530,7 +530,7 @@ export default {
     getControllerList: async function () {
       const update = async () => {
         this.controllerList.push({
-          id: 'tommy_test',
+          id: 'BPS-HUB-SN066',
           mac: '',
           status: 'loading',
           isScan: true,

src/components/file/File.vue

@@ -23,7 +23,7 @@ export default {
     getControllerList: async function () {
       const update = async () => {
         this.controllerList.push({
-          id: 'tommy_test',
+          id: 'BPS-HUB-SN066',
           mac: '',
           status: 'loading',
           isScan: true,

src/components/file/file-table/FileTable.vue

@@ -173,9 +173,9 @@
           {{transDeviceInfo(props.rowData.configuration)}}
         </template>
         <template slot="actions" slot-scope="props" >
-          <va-popover :message="`download ${props.rowData.name} in csv format`" placement="top">
+          <!-- <va-popover :message="`download ${props.rowData.name} in csv format`" placement="top">
             <va-button flat small color="gray" icon="fa fa-download" v-if="props.rowData.type !== 'folder' && props.rowData.device.library_name.indexOf('Neulive') >= 0" @click.stop="downloadCsv(props.rowData)"/>
-          </va-popover>
+          </va-popover> -->
           <va-popover :message="`download ${props.rowData.name} in excel format`" placement="top">
             <va-button flat small color="gray" icon="fa fa-download" v-if="props.rowData.type !== 'folder' && props.rowData.device.library_name.indexOf('Elite') >= 0" @click.stop="downloadExcel(props.rowData)"/>
           </va-popover>
@@ -185,9 +185,9 @@
           <va-popover :message="`replay ${props.rowData.name}`" placement="top">
             <va-button flat small color="gray" icon="fa fa-eye" v-if="props.rowData.type !== 'folder'" @click.stop="replay(props.rowData)"/>
           </va-popover>
-          <va-popover :message="`spike ${props.rowData.name}`" placement="top">
+          <!-- <va-popover :message="`spike ${props.rowData.name}`" placement="top">
             <va-button flat small color="gray" icon="fa fa-filter" v-if="props.rowData.type !== 'folder'" @click.stop="spike(props.rowData)"/>
-          </va-popover>
+          </va-popover> -->
           <va-popover :message="`edit ${props.rowData.name}`" placement="top">
             <va-button flat small color="gray" icon="fa fa-pencil" @click.stop="editFileConfirm(props.rowData)"/>
           </va-popover>

src/components/setting/controllerInfo.vue

@@ -12,13 +12,13 @@
           <va-item :key="controller.device_mac" class="pa-0 ma-0"
           >
             <va-item-section avatar class="ml-4 mr-4">
-              <img
+              <!-- <img
                 :src="getImageUrl()"
                 :alt="'BPS-CONTROLLER'"
                 width="200px"
                 height="200px"
                 contain
-              />
+              /> -->
             </va-item-section>
             <va-item-section class="ml-5 mr-4" >
               <va-item-label style="font-size: 2rem;">