Browse Source

[Improvement][UI] Improve long host display in K8s (#4756)

pull/3/MERGE
Shiwen Cheng 4 years ago committed by GitHub
parent
commit
5f40fce1f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 22
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
  2. 2
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue

22
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue

@ -21,8 +21,8 @@
<div class="row-box" v-for="(item,$index) in masterList" :key="$index"> <div class="row-box" v-for="(item,$index) in masterList" :key="$index">
<div class="row-title"> <div class="row-title">
<div class="left"> <div class="left">
<span class="sp">IP: {{item.host}}</span> <span class="sp">Host: {{item.host}}</span>
<span class="sp">{{$t('Zk registration directory')}}: {{item.zkDirectory}}</span> <span>{{$t('Zk registration directory')}}: <a href="javascript:" @click="_showZkDirectories(item)" class="links">{{$t('Directory detail')}}</a></span>
</div> </div>
<div class="right"> <div class="right">
<span class="sp">{{$t('Create Time')}}: {{item.createTime | formatDate}}</span> <span class="sp">{{$t('Create Time')}}: {{item.createTime | formatDate}}</span>
@ -57,6 +57,11 @@
</div> </div>
</div> </div>
</div> </div>
<el-drawer
:visible.sync="drawer"
:with-header="false">
<zookeeper-directories-popup :zkDirectories = zkDirectories></zookeeper-directories-popup>
</el-drawer>
<div v-if="!masterList.length"> <div v-if="!masterList.length">
<m-no-data></m-no-data> <m-no-data></m-no-data>
</div> </div>
@ -72,6 +77,7 @@
import mNoData from '@/module/components/noData/noData' import mNoData from '@/module/components/noData/noData'
import themeData from '@/module/echarts/themeData.json' import themeData from '@/module/echarts/themeData.json'
import mListConstruction from '@/module/components/listConstruction/listConstruction' import mListConstruction from '@/module/components/listConstruction/listConstruction'
import zookeeperDirectoriesPopup from './_source/zookeeperDirectories'
export default { export default {
name: 'servers-master', name: 'servers-master',
@ -79,12 +85,18 @@
return { return {
isLoading: false, isLoading: false,
masterList: [], masterList: [],
color: themeData.color color: themeData.color,
drawer: false,
zkDirectories: []
} }
}, },
props: {}, props: {},
methods: { methods: {
...mapActions('monitor', ['getMasterData']) ...mapActions('monitor', ['getMasterData']),
_showZkDirectories (item) {
this.zkDirectories = [{ zkDirectory: item.zkDirectory }]
this.drawer = true
}
}, },
watch: {}, watch: {},
created () { created () {
@ -103,7 +115,7 @@
this.isLoading = false this.isLoading = false
}) })
}, },
components: { mListConstruction, mSpin, mNoData, mGauge } components: { mListConstruction, mSpin, mNoData, mGauge, zookeeperDirectoriesPopup }
} }
</script> </script>
<style lang="scss" rel="stylesheet/scss"> <style lang="scss" rel="stylesheet/scss">

2
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue

@ -21,7 +21,7 @@
<div class="row-box" v-for="(item,$index) in workerList" :key="$index"> <div class="row-box" v-for="(item,$index) in workerList" :key="$index">
<div class="row-title"> <div class="row-title">
<div class="left"> <div class="left">
<span class="sp">IP: {{item.host}}</span> <span class="sp">Host: {{item.host}}</span>
<span>{{$t('Zk registration directory')}}: <a href="javascript:" @click="_showZkDirectories(item)" class="links">{{$t('Directory detail')}}</a></span> <span>{{$t('Zk registration directory')}}: <a href="javascript:" @click="_showZkDirectories(item)" class="links">{{$t('Directory detail')}}</a></span>
</div> </div>
<div class="right"> <div class="right">

Loading…
Cancel
Save