diff --git a/report-ui/package.json b/report-ui/package.json index 5fdd0db1..bfcea186 100644 --- a/report-ui/package.json +++ b/report-ui/package.json @@ -96,4 +96,4 @@ "last 2 versions", "not ie <= 8" ] -} +} \ No newline at end of file diff --git a/report-ui/src/api/axios.js b/report-ui/src/api/axios.js index 93561583..46bae2f4 100644 --- a/report-ui/src/api/axios.js +++ b/report-ui/src/api/axios.js @@ -35,7 +35,7 @@ service.interceptors.response.use( if (res.code == 200) { return res } - else if (res.code == '0024') { + else if (res.code == '50014') { //登录超时或被登出,弹确认框,用户确认后,跳转到登录页面 MessageBox({ message: "当前登录已失效或异地登录,请重新登录", diff --git a/report-ui/src/assets/styles/index.scss b/report-ui/src/assets/styles/index.scss index 9fa399b3..b6a31c36 100644 --- a/report-ui/src/assets/styles/index.scss +++ b/report-ui/src/assets/styles/index.scss @@ -280,4 +280,12 @@ a:hover { color: #bfcbd9!important; font-weight: normal !important; } +} +.el-form-item__label { + line-height: 30px !important; + height: 30px; +} +.el-form-item__content { + line-height: 30px !important; + height: 30px; } \ No newline at end of file diff --git a/report-ui/src/views/report/datasource/index.vue b/report-ui/src/views/report/datasource/index.vue index 15395aef..aff95123 100644 --- a/report-ui/src/views/report/datasource/index.vue +++ b/report-ui/src/views/report/datasource/index.vue @@ -9,7 +9,7 @@ + label-width="120px"> - + - + + size="mini"> @@ -77,7 +74,8 @@ + label-width="120px"> - + - + - - - + :dict-key="'REPORT_TYPE'" /> - + --> - + - - + --> + \ No newline at end of file diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue index af1c5907..9e1a79e1 100644 --- a/report-ui/src/views/report/resultset/index.vue +++ b/report-ui/src/views/report/resultset/index.vue @@ -61,6 +61,7 @@ border :data="data" size="small" + class="mt10" style="width: 100%">