git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-29 18:00:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

added system info

Browse Source
This commit is contained in:
Marvin Zhang
2019-07-23 20:08:29 +08:00
parent fe017b4769
commit 350dfae858
6 changed files with 184 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/i18n/zh.js
View File

@@ -207,6 +207,12 @@ export default {
'Yes': '是',
'No': '否',
// 系统
'OS': '操作系统',
'ARCH': '操作架构',
'Number of CPU': 'CPU数',
'Executables': '执行文件',
// 弹出框
Notification: '提示',
'Are you sure to delete this node?': '你确定要删除该节点?',

15
frontend/src/main.js
View File

@@ -9,6 +9,11 @@ import locale from 'element-ui/lib/locale/lang/en' // lang i18n
import '@/styles/index.scss' // global css
import 'font-awesome/scss/font-awesome.scss'// FontAwesome
import { library } from '@fortawesome/fontawesome-svg-core'
import { fab } from '@fortawesome/free-brands-svg-icons'
import { fas } from '@fortawesome/free-solid-svg-icons'
import { far } from '@fortawesome/free-regular-svg-icons'
import { FontAwesomeIcon, FontAwesomeLayers, FontAwesomeLayersText } from '@fortawesome/vue-fontawesome'
import 'codemirror/lib/codemirror.css'
@@ -25,10 +30,12 @@ import utils from './utils'
Vue.use(ElementUI, { locale })
// Vue.use(ba, 'c35e3a563a06caee2524902c81975add')
// Vue.use(ba, {
// siteId: 'c35e3a563a06caee2524902c81975add'
// })
library.add(fab)
library.add(far)
library.add(fas)
Vue.component('font-awesome-icon', FontAwesomeIcon)
Vue.component('font-awesome-layers', FontAwesomeLayers)
Vue.component('font-awesome-layers-text', FontAwesomeLayersText)
Vue.config.productionTip = false

33
frontend/src/store/modules/node.js
View File

@@ -20,6 +20,23 @@ const mutations = {
},
SET_ACTIVE_SPIDER (state, value) {
state.activeSpider = value
},
SET_NODE_SYSTEM_INFO (state, payload) {
const { id, systemInfo } = payload
for (let i = 0; i < state.nodeList.length; i++) {
if (state.nodeList[i]._id === id) {
// Vue.set(state.nodeList[i], 'systemInfo', {})
state.nodeList[i].systemInfo = systemInfo
// for (const key in systemInfo) {
// if (systemInfo.hasOwnProperty(key)) {
// console.log(key)
// state.nodeList[i].systemInfo[key] = systemInfo[key]
// // Vue.set(state.nodeList[i].systemInfo, key, systemInfo[key])
// }
// }
break
}
}
}
}
@@ -27,7 +44,15 @@ const actions = {
getNodeList ({ state, commit }) {
request.get('/nodes', {})
.then(response => {
commit('SET_NODE_LIST', response.data.data)
commit('SET_NODE_LIST', response.data.data.map(d => {
d.systemInfo = {
os: '',
arch: '',
num_cpu: '',
executables: []
}
return d
}))
})
},
editNode ({ state, dispatch }) {
@@ -56,6 +81,12 @@ const actions = {
.sort((a, b) => a.create_ts < b.create_ts ? 1 : -1),
{ root: true })
})
},
getNodeSystemInfo ({ state, commit }, id) {
return request.get(`/nodes/${id}/system`)
.then(response => {
commit('SET_NODE_SYSTEM_INFO', { id, systemInfo: response.data.data })
})
}
}

93
frontend/src/views/node/NodeList.vue
View File

@@ -22,7 +22,53 @@
<el-table :data="filteredTableData"
class="table"
:header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
border>
border
@expand-change="onRowExpand">
<el-table-column type="expand">
<template slot-scope="scope">
<el-form class="node-detail" :model="scope.row" label-width="120px" inline>
<el-form-item :label="$t('OS')">
<span>{{scope.row.systemInfo ? scope.row.systemInfo.os : ''}}</span>
</el-form-item>
<el-form-item :label="$t('ARCH')">
<span>{{scope.row.systemInfo ? scope.row.systemInfo.arch : ''}}</span>
</el-form-item>
<el-form-item :label="$t('Number of CPU')">
<span>{{scope.row.systemInfo ? scope.row.systemInfo.num_cpu : ''}}</span>
</el-form-item>
</el-form>
<el-form class="node-detail executable" :model="scope.row" label-width="120px">
<el-form-item :label="$t('Executables')">
<ul v-if="true" class="executable-list">
<li
v-for="(ex, index) in getExecutables(scope.row)"
:key="index"
class="executable-item"
>
<template v-if="ex.file_name.match(/^python/)">
<font-awesome-icon :icon="['fab','python']" size="md"/>
</template>
<template v-else-if="ex.file_name.match(/^java/)">
<font-awesome-icon :icon="['fab','java']" size="md"/>
</template>
<template v-else-if="ex.file_name.match(/^bash$|^sh$/)">
<font-awesome-icon :icon="['fab','linux']" size="md"/>
</template>
<template v-else-if="ex.file_name.match(/^node/)">
<font-awesome-icon :icon="['fab','node-js']" size="md"/>
</template>
<template v-else>
<font-awesome-icon :icon="['fas', 'terminal']" size="md"/>
</template>
<span>
{{ex.display_name}}
</span>
</li>
</ul>
</el-form-item>
</el-form>
</template>
</el-table-column>
<template v-for="col in columns">
<el-table-column v-if="col.name === 'status'"
:key="col.name"
@@ -183,6 +229,13 @@ export default {
},
onPageChange () {
this.$store.dispatch('node/getNodeList')
},
onRowExpand (row) {
this.$store.dispatch('node/getNodeSystemInfo', row._id)
},
getExecutables (row) {
if (!row.systemInfo || !row.systemInfo.executables) return []
return row.systemInfo.executables
}
},
created () {
@@ -216,4 +269,42 @@ export default {
.el-table .el-button {
padding: 7px;
}
</style>
<style>
.node-detail .el-form-item {
height: 25px;
margin-bottom: 0;
}
.node-detail .el-form-item .el-form-item__label {
line-height: 25px;
height: 25px;
font-size: 12px;
}
.node-detail .el-form-item .el-form-item__content {
line-height: 25px;
height: 25px;
font-size: 12px;
}
.node-detail.executable .el-form-item,
.node-detail.executable .el-form-item .el-form-item__label,
.node-detail.executable .el-form-item .el-form-item__content {
line-height: 25px;
height: auto;
}
.node-detail .executable-list {
margin: 0;
padding: 0;
list-style: none;
display: flex;
flex-wrap: wrap;
}
.node-detail .executable-list .executable-item {
margin-right: 10px;
}
</style>