merge origin

This commit is contained in:
Nova
2019-02-10 13:07:31 +08:00
16 changed files with 143 additions and 90 deletions

View File

@@ -89,10 +89,11 @@ import Vue from 'vue'
import store from '../store'
import VueSocketio from 'vue-socket.io'
import io from 'socket.io-client'
import axios from 'axios'
const { mapState, mapGetters, mapActions, mapMutations } = createNamespacedHelpers('chain')
Vue.use(VueSocketio, io(`http://${window.location.hostname}:6842`), store) // todo: luk: 整个控制台应当依赖于同一个全局的节点地址变量。
Vue.use(VueSocketio, io(axios.defaults.baseURL), store)
export default {
name: 'Chain',

View File

@@ -101,7 +101,7 @@ export default {
display: flex;
$sideWidth: 260px;
$sideWidth: 240px;
$headerHeight: 64px;
.side-menus {
&.collapsed {
@@ -109,6 +109,7 @@ export default {
}
width: $sideWidth;
min-width: 120px;
background: url('../assets/images/bg.jpg') center;
background-size: cover;
overflow-y: auto;

View File

@@ -1,4 +1,4 @@
<template>
<template>
<div class="network-page">
<div class="card-content">
<div class="app-card elevation-1">
@@ -36,9 +36,9 @@
</template>
<template slot="items" slot-scope="props">
<td>{{ props.item.index }}</td>
<td>{{ props.item.address }}</td>
<td>{{ props.item.accessPoint }}</td>
<td>{{ props.item.ownerAddress }}</td>
<td>{{ props.item.status }}</td>
<td>{{ props.item.peerOwnerAddress }}</td>
</template>
<template slot="no-results">
{{ $t('network.tableNone') }}