Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 TommyXin
|
4659eba6c2 | ||
|
TommyXin
|
d082b596b0 |
Generated
+10
@@ -1168,6 +1168,16 @@
|
||||
"minimist": "^1.2.0"
|
||||
}
|
||||
},
|
||||
"@fontsource/source-code-pro": {
|
||||
"version": "4.5.0",
|
||||
"resolved": "https://registry.npmjs.org/@fontsource/source-code-pro/-/source-code-pro-4.5.0.tgz",
|
||||
"integrity": "sha512-IKB+oQfwjj9DzEM2sc5rO70BZV7+ksmZbB+1KzyiZp2VroPw7Lm1ovXBU2JYWIWXmNY+gDudvyZXZHE+6cG47Q=="
|
||||
},
|
||||
"@fontsource/source-sans-pro": {
|
||||
"version": "4.5.1",
|
||||
"resolved": "https://registry.npmjs.org/@fontsource/source-sans-pro/-/source-sans-pro-4.5.1.tgz",
|
||||
"integrity": "sha512-JYEldSfnqxoDVUL6QgqT8Fiyjh0p7WlKcqKNevzDylpWabdejVRyFzPhTk2ZceKZd02KEOaL+K462U6u0/PQiA=="
|
||||
},
|
||||
"@hapi/address": {
|
||||
"version": "2.1.4",
|
||||
"resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
"test:unit": "vue-cli-service test:unit"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fontsource/source-code-pro": "^4.5.0",
|
||||
"@fontsource/source-sans-pro": "^4.5.1",
|
||||
"@types/jest": "^24.0.11",
|
||||
"amcharts3": "^3.21.14",
|
||||
"ammap3": "^3.21.14",
|
||||
|
||||
+2
-2
@@ -3,9 +3,9 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
|
||||
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet">
|
||||
<!-- <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:400" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> -->
|
||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||
|
||||
<title>BioPro Scientific</title>
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ 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://' + '192.168.151.125' + ':8083')
|
||||
// Vue.use(VueMqtt, 'ws://' + '192.168.3.48' + ':8083')
|
||||
// Vue.use(VueMqtt, 'ws://' + '192.168.3.208' + ':8083')
|
||||
|
||||
Vue.prototype.GLOBAL = global_
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ export default {
|
||||
getControllerList: async function () {
|
||||
const update = async () => {
|
||||
this.controllerList.push({
|
||||
id: 'tommy_test',
|
||||
id: 'dc:a6:32:e2:1e:60',
|
||||
mac: '',
|
||||
status: 'loading',
|
||||
isScan: true,
|
||||
|
||||
@@ -353,7 +353,7 @@ export default {
|
||||
getControllerList: async function () {
|
||||
const update = async () => {
|
||||
this.controllerList.push({
|
||||
id: 'tommy_test',
|
||||
id: 'dc:a6:32:e2:1e:60',
|
||||
mac: '',
|
||||
status: 'loading',
|
||||
isScan: true,
|
||||
|
||||
@@ -43,7 +43,7 @@ export default {
|
||||
getControllerList: async function () {
|
||||
const update = async () => {
|
||||
this.controllerList.push({
|
||||
id: 'tommy_test',
|
||||
id: 'dc:a6:32:e2:1e:60',
|
||||
mac: '',
|
||||
status: 'loading',
|
||||
isScan: true,
|
||||
|
||||
@@ -48,7 +48,7 @@ export default {
|
||||
getControllerList: async function () {
|
||||
const update = async () => {
|
||||
this.controllerList.push({
|
||||
id: 'tommy_test',
|
||||
id: 'dc:a6:32:e2:1e:60',
|
||||
mac: '',
|
||||
status: 'loading',
|
||||
isScan: true,
|
||||
|
||||
@@ -23,7 +23,7 @@ export default {
|
||||
getControllerList: async function () {
|
||||
const update = async () => {
|
||||
this.controllerList.push({
|
||||
id: 'tommy_test',
|
||||
id: 'dc:a6:32:e2:1e:60',
|
||||
mac: '',
|
||||
status: 'loading',
|
||||
isScan: true,
|
||||
|
||||
@@ -173,7 +173,7 @@
|
||||
{{transDeviceInfo(props.rowData.configuration)}}
|
||||
</template>
|
||||
<template slot="actions" slot-scope="props" >
|
||||
<va-popover :message="`sdcard ${props.rowData.name}`" placement="top">
|
||||
<!-- <va-popover :message="`sdcard ${props.rowData.name}`" placement="top">
|
||||
<sd-card-button
|
||||
v-if="(props.rowData.type !== 'folder') && (props.rowData.device.library_name.indexOf('Neulive') >= 0) && (props.rowData.sd_data_record === true)"
|
||||
:meta="props.rowData"
|
||||
@@ -182,7 +182,7 @@
|
||||
@refreshPage="refreshPage"
|
||||
@downloadSdCard="downloadSdCard"
|
||||
/>
|
||||
</va-popover>
|
||||
</va-popover> -->
|
||||
<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>
|
||||
@@ -215,13 +215,13 @@ import { debounce } from 'lodash'
|
||||
import { file } from '../../../data/file/File'
|
||||
import { FulfillingBouncingCircleSpinner } from 'epic-spinners'
|
||||
import api from '../../../data/api/index'
|
||||
import SdCardButton from '../sdcard/SdCardButton.vue'
|
||||
// import SdCardButton from '../sdcard/SdCardButton.vue'
|
||||
|
||||
export default {
|
||||
name: 'FileTable',
|
||||
components: {
|
||||
FulfillingBouncingCircleSpinner,
|
||||
SdCardButton,
|
||||
// SdCardButton,
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
@@ -273,7 +273,7 @@ export default {
|
||||
height: '2rem',
|
||||
},
|
||||
},
|
||||
SDuuidList: [],
|
||||
// SDuuidList: [],
|
||||
controllerList: [],
|
||||
}
|
||||
},
|
||||
@@ -685,29 +685,29 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
downloadSdCard: async function (meta) {
|
||||
const href = location.href.split('/')[2]
|
||||
if (meta.device.library_name.indexOf('Neulive') >= 0) {
|
||||
if (window.navigator.onLine) {
|
||||
window.open('http://' + href + '/#/download/online/csv/' + meta.id + '/sd')
|
||||
} else {
|
||||
window.open('http://' + href + '/#/download/offline/csv/' + meta.id + '/sd')
|
||||
}
|
||||
}
|
||||
},
|
||||
async getSDuuidList () {
|
||||
// const uuidList = ['32abdb14-fc0c-11eb-9aa8-dca6326cbc6b', '940ca938-f662-11eb-8a41-dca6326cbc6b']
|
||||
if (this.controllerList.length > 0) {
|
||||
if (this.controllerList[0].sd_uploading === false) {
|
||||
api.sdcard.getuuidList().then((response) => {
|
||||
console.log('uuidList', response)
|
||||
this.SDuuidList = response
|
||||
}).catch(error => {
|
||||
console.log(error)
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
// downloadSdCard: async function (meta) {
|
||||
// const href = location.href.split('/')[2]
|
||||
// if (meta.device.library_name.indexOf('Neulive') >= 0) {
|
||||
// if (window.navigator.onLine) {
|
||||
// window.open('http://' + href + '/#/download/online/csv/' + meta.id + '/sd')
|
||||
// } else {
|
||||
// window.open('http://' + href + '/#/download/offline/csv/' + meta.id + '/sd')
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
// async getSDuuidList () {
|
||||
// // const uuidList = ['32abdb14-fc0c-11eb-9aa8-dca6326cbc6b', '940ca938-f662-11eb-8a41-dca6326cbc6b']
|
||||
// if (this.controllerList.length > 0) {
|
||||
// if (this.controllerList[0].sd_uploading === false) {
|
||||
// api.sdcard.getuuidList().then((response) => {
|
||||
// console.log('uuidList', response)
|
||||
// this.SDuuidList = response
|
||||
// }).catch(error => {
|
||||
// console.log(error)
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
replay: function (meta) {
|
||||
if (meta.device.library_name.includes('Neulive') === true) {
|
||||
// window.open('http://' + location.href.split('/')[2].split(':')[0] + '/#/admin/data-replay/' + meta.id)
|
||||
@@ -732,7 +732,7 @@ export default {
|
||||
async mounted () {
|
||||
const controllerList = await api.controller.getAll()
|
||||
this.controllerList = controllerList.data
|
||||
this.getSDuuidList()
|
||||
// this.getSDuuidList()
|
||||
},
|
||||
destroyed () {
|
||||
},
|
||||
|
||||
@@ -99,9 +99,9 @@ export default {
|
||||
name: 'notch',
|
||||
},
|
||||
order: 20,
|
||||
freq0: 0,
|
||||
freq1: 0,
|
||||
freq2: 0,
|
||||
freq0: 60,
|
||||
freq1: 60,
|
||||
freq2: 60,
|
||||
optionFilter: [
|
||||
{
|
||||
id: 1,
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
</va-item-label>
|
||||
</va-item-section>
|
||||
|
||||
<va-item-section class="mr-3" v-if="device.type == 'Neulive'" side>
|
||||
<!-- <va-item-section class="mr-3" v-if="device.type == 'Neulive'" side>
|
||||
<va-icon
|
||||
name="material-icons"
|
||||
:color="(device.sdCardStatus === true) ? 'primary' : 'grey'"
|
||||
@@ -50,7 +50,7 @@
|
||||
color="primary"
|
||||
>
|
||||
</va-icon>
|
||||
</va-item-section>
|
||||
</va-item-section> -->
|
||||
</va-item>
|
||||
|
||||
<va-item class="pa-0 ma-0 mt-2">
|
||||
@@ -120,12 +120,12 @@ export default {
|
||||
computed: {
|
||||
},
|
||||
methods: {
|
||||
sdCardStatus: function (device) {
|
||||
this.$emit('sd_card_status', {
|
||||
id: device.id,
|
||||
sdCardStatus: device.sdCardStatus,
|
||||
})
|
||||
},
|
||||
// sdCardStatus: function (device) {
|
||||
// this.$emit('sd_card_status', {
|
||||
// id: device.id,
|
||||
// sdCardStatus: device.sdCardStatus,
|
||||
// })
|
||||
// },
|
||||
removeCheck: function (device) {
|
||||
this.selectDevice = device
|
||||
this.showDeleteModal = true
|
||||
|
||||
@@ -11,7 +11,7 @@ import analysis from './analysis'
|
||||
import sdcard from './sdcard'
|
||||
import connection from './connection'
|
||||
|
||||
// axios.defaults.baseURL = 'http://192.168.3.53:3000'
|
||||
// axios.defaults.baseURL = 'http://192.168.3.208:3000'
|
||||
axios.defaults.baseURL = 'http://' + location.href.split('/')[2].split(':')[0] + ':3000'
|
||||
|
||||
const api = {
|
||||
|
||||
@@ -18,7 +18,11 @@ $icon-font-svg-id: 'glyphicons_halflingsregular';
|
||||
$icon-font-path: './../fonts/';
|
||||
|
||||
// Fonts //
|
||||
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro);
|
||||
// @import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro);
|
||||
@import '~@fontsource/source-sans-pro/index.css';
|
||||
@import '~@fontsource/source-sans-pro/400.css';
|
||||
@import '~@fontsource/source-sans-pro/700.css';
|
||||
@import '~@fontsource/source-code-pro/400.css';
|
||||
|
||||
@font-face {
|
||||
font-family: 'Glyphicons Halflings';
|
||||
|
||||
Reference in New Issue
Block a user