diff --git a/escheduler-ui/.env b/escheduler-ui/.env index 52ce563e9b..d4dcd9f473 100644 --- a/escheduler-ui/.env +++ b/escheduler-ui/.env @@ -1,6 +1,6 @@ # 后端接口地址 -API_BASE = http://192.168.220.247: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/formModel/tasks/sql.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue index c474cb97fb..dcbf9928dc 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue @@ -27,6 +27,20 @@ +
{{$t('SQL Parameter')}}
@@ -83,6 +97,7 @@ import mDatasource from './_source/datasource' import mLocalParams from './_source/localParams' import disabledState from '@/module/mixin/disabledState' + import mEmail from '@/conf/home/pages/projects/pages/definition/pages/list/_source/email' import codemirror from '@/conf/home/pages/resource/pages/file/pages/_source/codemirror' let editor @@ -108,7 +123,11 @@ // Form/attachment showType: ['TABLE'], // Sql parameter - connParams: '' + connParams: '', + // recipients + receivers: [], + // copy to + receiversCc: [] } }, mixins: [disabledState], @@ -174,6 +193,8 @@ sql: editor.getValue(), udfs: this.udfs, sqlType: this.sqlType, + receivers: this.receivers.join(','), + receiversCc: this.receiversCc.join(','), showType: (() => { /** * Special processing return order TABLE,ATTACHMENT @@ -223,12 +244,23 @@ if (val) { this.showType = [] } + if (val !== 0) { + this.receivers = [] + this.receiversCc = [] + } }, // Listening data source type (val) { if (val !== 'HIVE') { this.connParams = '' } + }, + // + showType (val) { + if (!val.length) { + this.receivers = [] + this.receiversCc = [] + } } }, created () { @@ -245,6 +277,8 @@ this.connParams = o.params.connParams || '' this.localParams = o.params.localParams || [] this.showType = o.params.showType.split(',') || [] + this.receivers = o.params.receivers && o.params.receivers.split(',') || [] + this.receiversCc = o.params.receiversCc && o.params.receiversCc.split(',') || [] } }, mounted () { @@ -262,6 +296,6 @@ } }, computed: {}, - components: { mListBox, mDatasource, mLocalParams, mUdfs, mSqlType } + components: { mListBox, mDatasource, mLocalParams, mUdfs, mSqlType, mEmail } } diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js index 46c26186a6..003ce4969f 100644 --- a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js +++ b/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js @@ -37,7 +37,7 @@ export default { offset: 0, color: '#FFC539' // 70% 处的颜色 }], false) ], - [1, new echarts.graphic.LinearGradient(0, 0, 0, 1, [ { // eslint-disable-line + [1, new echarts.graphic.LinearGradient(0, 0, 0, 1, [ { // eslint-disable-line offset: 0.2, color: '#1CAD52' // 92% 处的颜色 }, { diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue index 160e6fbd91..c0405d2075 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue @@ -3,7 +3,7 @@
{{item}} - +
@@ -212,7 +212,7 @@ */ _handlerEmailWitch () { setTimeout(() => { - this.emailWidth = parseInt(688 - $(this.$refs.emailInput).position().left - 20) + this.emailWidth = parseInt($('.email-model').width() - $(this.$refs.emailInput).position().left - 20) if (this.emailWidth < 80) { this.emailWidth = 200 } @@ -274,7 +274,7 @@