diff --git a/escheduler-ui/.env b/escheduler-ui/.env index 5cd5ba736d..f87381db19 100644 --- a/escheduler-ui/.env +++ b/escheduler-ui/.env @@ -1,6 +1,6 @@ # 后端接口地址 -API_BASE = http://192.168.xx.xx:12345 +API_BASE = http://192.168.221.188:12345 # 本地开发如需ip访问项目把"#"号去掉 #DEV_HOST = 192.168.xx.xx diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue index a0225733e2..4b562f8bc0 100644 --- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue +++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue @@ -49,10 +49,16 @@ methods: { _ok (fn) { this._verification().then(res => { - return this.store.dispatch('resource/resourceVerifyName', { - name: this.name, - type: 'FILE' - }) + if (this.name === this.item.alias) { + return new Promise((resolve,reject) => { + resolve() + }) + }else{ + return this.store.dispatch('resource/resourceVerifyName', { + name: this.name, + type: 'FILE' + }) + } }).then(res => { return this.store.dispatch('resource/resourceRename', { name: this.name, @@ -78,6 +84,7 @@ } else { resolve() } + }) } }, diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue index f73be43ed6..f4db362f43 100644 --- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue +++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue @@ -49,10 +49,16 @@ methods: { _ok (fn) { this._verification().then(res => { - return this.store.dispatch('resource/resourceVerifyName', { - name: this.name, - type: 'UDF' - }) + if (this.name === this.item.alias) { + return new Promise((resolve,reject) => { + resolve() + }) + }else{ + return this.store.dispatch('resource/resourceVerifyName', { + name: this.name, + type: 'UDF' + }) + } }).then(res => { return this.store.dispatch('resource/resourceRename', { name: this.name,