Browse Source

Merge pull request #357 from millionfor/branch-1.0.2

Branch 1.0.2
pull/2/head
millionfor 6 years ago committed by GitHub
parent
commit
bb471a960b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      escheduler-ui/.env
  2. 20
      escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

6
escheduler-ui/.env

@ -1,5 +1,7 @@
# 后端接口地址 # 后端接口地址
API_BASE = http://192.168.xx.xx:12345 #API_BASE = http://192.168.221.188:12345
API_BASE = http://192.168.220.154:12345
# 本地开发如需ip访问项目把"#"号去掉 # 本地开发如需ip访问项目把"#"号去掉
#DEV_HOST = 192.168.xx.xx #DEV_HOST = 192.168.xx.xx

20
escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

@ -84,6 +84,8 @@
desc: '', desc: '',
// Global custom parameters // Global custom parameters
udpList: [], udpList: [],
// Global custom parameters
udpListCache: [],
// Whether to update the process definition // Whether to update the process definition
syncDefine: true, syncDefine: true,
// Timeout alarm // Timeout alarm
@ -159,11 +161,7 @@
* Close the popup * Close the popup
*/ */
close () { close () {
// Storage global globalParams this.$emit('close')
this._accuStore()
setTimeout(() => {
this.$emit('close')
})
} }
}, },
watch: { watch: {
@ -175,11 +173,13 @@
} }
}, },
created () { created () {
this.udpList = this.store.state.dag.globalParams const dag = _.cloneDeep(this.store.state.dag)
this.name = this.store.state.dag.name this.udpList = dag.globalParams
this.desc = this.store.state.dag.desc this.udpListCache = dag.globalParams
this.syncDefine = this.store.state.dag.syncDefine this.name = dag.name
this.timeout = this.store.state.dag.timeout || 0 this.desc = dag.desc
this.syncDefine = dag.syncDefine
this.timeout = dag.timeout || 0
this.checkedTimeout = this.timeout !== 0 this.checkedTimeout = this.timeout !== 0
}, },
mounted () {}, mounted () {},

Loading…
Cancel
Save