#532 关系图跳转问题修复

vipshop · Dec 4, 2018 · e54aacf · e54aacf
1 parent 6e8efe3
commit e54aacf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/saturn-console-web/src/components/common/charts/relate.vue b/saturn-console-web/src/components/common/charts/relate.vue
@@ -17,7 +17,9 @@ export default {
       option: {
         tooltip: {
           show: true,
-          formatter: '点击跳转到作业 {b} 详情页面',
+          formatter(params) {
+            return params.dataType === 'node' ? `点击跳转到作业 ${params.name} 详情页面` : params.name;
+          },
         },
         animationDurationUpdate: 1500,
         animationEasingUpdate: 'quinticInOut',
@@ -119,11 +121,12 @@ export default {
     },
     handleClick() {
       this.myChart.on('click', (handler) => {
-        this.$emit('job-redirect', handler.data.name);
+        if (handler.dataType === 'node') {
+          this.$emit('job-redirect', handler.data.name);
+        }
       });
     },
     drawLine() {
-      console.log(this.optionInfo);
       if (this.optionInfo) {
         this.option.series[0].data = this.optionInfo.data;
         this.option.series[0].links = this.optionInfo.links;

diff --git a/saturn-console-web/src/pages/job_list/job_overview.vue b/saturn-console-web/src/pages/job_list/job_overview.vue
@@ -62,7 +62,7 @@
                                 <el-button @click="handleAdd()" v-if="$common.hasPerm('job:add', domainName)"><i class="fa fa-plus-circle text-btn"></i>添加</el-button>
                                 <el-button @click="handleImport()" v-if="$common.hasPerm('job:import', domainName)"><i class="fa fa-arrow-circle-o-down text-btn"></i>导入</el-button>
                                 <el-button @click="handleExport()"><i class="fa fa-arrow-circle-o-up text-btn"></i>导出</el-button>
-                                <el-button @click="handleArrangeLayout()"><i class="fa fa-arrows text-btn"></i>作业依赖图</el-button>
+                                <el-button @click="handleArrangeLayout()"><i class="fa fa-line-chart text-btn"></i>作业依赖图</el-button>
                             </div>
                         </div>
                         <el-table stripe border ref="multipleTable" @selection-change="handleSelectionChange" :data="jobList" @sort-change="scope.onSortChange" style="width: 100%">