From 564289a4ae045a937294e20a0046790cce9f00df Mon Sep 17 00:00:00 2001
From: yanzili <978387851@qq.com>
Date: Mon, 28 Jun 2021 15:40:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/src/assets/styles/index.scss        |  8 +++++
 .../src/views/report/datasource/index.vue     | 14 ++++-----
 report-ui/src/views/report/report/index.vue   | 29 ++++++++++++-------
 .../src/views/report/resultset/index.vue      |  1 +
 4 files changed, 33 insertions(+), 19 deletions(-)

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 @@
     <el-form ref="form"
              :model="params"
              :rules="rules"
-             label-width="100px">
+             label-width="120px">
       <!-- 搜索 -->
       <el-row :gutter="10">
         <el-col :xs="24"
@@ -17,8 +17,7 @@
                 :md="12"
                 :lg="6"
                 :xl="4">
-          <el-form-item label="数据源名称"
-                        label-width="120px">
+          <el-form-item label="数据源名称">
             <el-input v-model.trim="params.sourceName"
                       size="mini"
                       clearable
@@ -32,8 +31,7 @@
                 :md="12"
                 :lg="6"
                 :xl="4">
-          <el-form-item label="数据源编码"
-                        label-width="120px">
+          <el-form-item label="数据源编码">
             <el-input v-model.trim="params.sourceCode"
                       size="mini"
                       clearable
@@ -48,8 +46,7 @@
                 :lg="6"
                 :xl="4">
           <el-form-item label="数据源类型"
-                        size="mini"
-                        label-width="120px">
+                        size="mini">
             <Dictionary v-model="params.sourceType"
                         :updata-dict="params.sourceType"
                         :dict-key="'SOURCE_TYPE'" />
@@ -77,7 +74,8 @@
     <!--表格渲染-->
     <el-table v-loading="listLoading"
               border
-              :data="list" class="mt10"
+              :data="list"
+              class="mt10"
               element-loading-text="Loading"
               style="width: 100%">
       <el-table-column align="center"
diff --git a/report-ui/src/views/report/report/index.vue b/report-ui/src/views/report/report/index.vue
index 6394cfc4..053de1e5 100644
--- a/report-ui/src/views/report/report/index.vue
+++ b/report-ui/src/views/report/report/index.vue
@@ -9,7 +9,7 @@
     <el-form ref="form"
              :model="params"
              :rules="rules"
-             label-width="100px">
+             label-width="120px">
       <!-- 搜索 -->
       <el-row :gutter="10">
         <el-col :xs="24"
@@ -17,8 +17,7 @@
                 :md="12"
                 :lg="6"
                 :xl="4">
-          <el-form-item label="名称"
-                        label-width="120px">
+          <el-form-item label="名称">
             <el-input v-model="params.reportName"
                       size="mini"
                       clearable
@@ -31,8 +30,7 @@
                 :md="12"
                 :lg="6"
                 :xl="4">
-          <el-form-item label="报表编码"
-                        label-width="120px">
+          <el-form-item label="报表编码">
             <el-input v-model="params.reportCode"
                       size="mini"
                       clearable
@@ -40,19 +38,18 @@
                       class="filter-item" />
           </el-form-item>
         </el-col>
-        <el-col :xs="24"
+        <!-- <el-col :xs="24"
                 :sm="20"
                 :md="12"
                 :lg="6"
                 :xl="4">
-          <el-form-item label="报表类型"
-                        label-width="120px"
+          <el-form-item label="报表类型" 
                         size="mini">
-            <!-- <Dictionary v-model="params.reportType"
+            <Dictionary v-model="params.reportType"
                         :updata-dict="params.reportType"
-                        :dict-key="'REPORT_TYPE'" /> -->
+                        :dict-key="'REPORT_TYPE'" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :xs="24"
                 :sm="20"
                 :md="4"
@@ -412,3 +409,13 @@ export default {
   },
 }
 </script>
+<style scoped>
+.el-form-item__label {
+  line-height: 30px !important;
+  height: 30px;
+}
+.el-form-item__content {
+  line-height: 30px !important;
+  height: 30px;
+}
+</style>
\ 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%">
       <el-table-column align="center"
                        label="序号"

From 52e040bd47bef71c66785f42875640bc52fcb555 Mon Sep 17 00:00:00 2001
From: yanzili <978387851@qq.com>
Date: Mon, 28 Jun 2021 16:04:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/package.json                      |  2 +-
 report-ui/src/api/axios.js                  |  2 +-
 report-ui/src/views/report/report/index.vue | 20 +++++---------------
 3 files changed, 7 insertions(+), 17 deletions(-)

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/views/report/report/index.vue b/report-ui/src/views/report/report/index.vue
index 053de1e5..f0aea687 100644
--- a/report-ui/src/views/report/report/index.vue
+++ b/report-ui/src/views/report/report/index.vue
@@ -80,21 +80,21 @@
                        label="序号"
                        type="index"
                        min-width="40" />
-      <el-table-column label="报表类型">
+      <!-- <el-table-column label="报表类型">
         <template slot-scope="scope">
           {{scope.row.reportType | reportTableType}}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="reportName"
                        label="名称" />
       <el-table-column prop="reportCode"
                        label="报表编码" />
-      <el-table-column prop="reportGroup"
+      <!-- <el-table-column prop="reportGroup"
                        label="分组">
         <template slot-scope="scope">
           {{scope.row.reportGroup | filterPushType}}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="reportDesc"
                        label="备注" />
       <el-table-column prop="createByView"
@@ -408,14 +408,4 @@ export default {
     },
   },
 }
-</script>
-<style scoped>
-.el-form-item__label {
-  line-height: 30px !important;
-  height: 30px;
-}
-.el-form-item__content {
-  line-height: 30px !important;
-  height: 30px;
-}
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file