Merge branch 'master' of https://gitee.com/anji-plus/report

report-ui/package.json

@@ -96,4 +96,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
+}

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: "当前登录已失效或异地登录，请重新登录",

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;
 }

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"

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"
@@ -83,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"
@@ -411,4 +408,4 @@ export default {
     },
   },
 }
-</script>
+</script>

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="序号"