From 8b7e5457e1b130d58ef286ccb2303ea448fd9bfd Mon Sep 17 00:00:00 2001
From: gongzijian <gongzijian@analysys.com.cn>
Date: Thu, 23 May 2019 11:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=BA=E9=97=B4=E8=A1=A5?=
 =?UTF-8?q?=E6=95=B0=20=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 escheduler-ui/.env                                       | 5 ++++-
 escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/escheduler-ui/.env b/escheduler-ui/.env
index f87381db19..2905723bd3 100644
--- a/escheduler-ui/.env
+++ b/escheduler-ui/.env
@@ -1,6 +1,9 @@
 
 # 后端接口地址
-API_BASE = http://192.168.221.188:12345
+#API_BASE = http://192.168.221.188:12345
+
+# 后端接口地址
+API_BASE = http://192.168.220.154:12345
 
 # 本地开发如需ip访问项目把"#"号去掉
 #DEV_HOST = 192.168.xx.xx
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index 989ec166dd..c60f5d3b49 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -141,6 +141,9 @@
           Dag.create()
         }
       },
+      /**
+       * copy name
+       */
       _copyName(){
         let clipboard = new Clipboard(`.copy-name`)
         clipboard.on('success', e => {
@@ -170,6 +173,10 @@
               let $item = _.filter(taskList, v => v.name === item.name)[0]
               return `<div style="text-align: left">${i18n.$t('Name')}：${$item.name}</br>${i18n.$t('State')}：${desc}</br>${i18n.$t('type')}：${$item.taskType}</br>${i18n.$t('host')}：${$item.host || '-'}</br>${i18n.$t('Retry Count')}：${$item.retryTimes}</br>${i18n.$t('Submit Time')}：${formatDate($item.submitTime)}</br>${i18n.$t('Start Time')}：${formatDate($item.startTime)}</br>${i18n.$t('End Time')}：${$item.endTime ? formatDate($item.endTime) : '-'}</br></div>`
             }
+
+            // remove tip state dom
+            $('.w').find('.state-p').html('')
+
             data.forEach(v1 => {
               idArr.forEach(v2 => {
                 if (v2.name === v1.name) {
@@ -177,7 +184,6 @@
                   let state = dom.find('.state-p')
                   dom.attr('data-state-id', v1.stateId)
                   dom.attr('data-dependent-result', v1.dependentResult || '')
-                  state.html('')
                   state.append(`<b class="iconfont ${v1.isSpin ? 'fa fa-spin' : ''}" style="color:${v1.color}" data-toggle="tooltip" data-html="true" data-container="body">${v1.icoUnicode}</b>`)
                   state.find('b').attr('title', titleTpl(v2, v1.desc))
                 }