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

report-ui/src/router/index.js

@@ -40,7 +40,7 @@ export const constantRouterMap = [
     component: Layout,
     redirect: '/access/accessAuthority',
     name: '首页',
-    meta: { title: '首页1', icon: 'iconhome2' },
+    meta: { title: '首页', icon: 'iconhome2' },
     children: [
       { path: '', name: 'accessUser', component: () => import('@/views/home/index'), meta: { title: '首页', icon: 'iconhome2', keepAlive: true, isBack: true } },
     ]
@@ -83,8 +83,6 @@ export const constantRouterMap = [
     meta: { title: '大屏报表', icon: 'iconnavicon-ywcs' },
     children: [
       { path: 'bigscreen', name: 'bigscreen', component: () => import('@/views/report/bigscreen/index'), meta: { title: '大屏报表', icon: 'iconchufaqipeizhi-hui', keepAlive: true, isBack: true } },
-      // { path: '/bigscreen/viewer', name: 'bigscreenViewer', component: () => import('@/views/report/bigscreen/viewer'), meta: { title: '预览', icon: 'i', keepAlive: false, isBack: true } },
-      // { path: '/bigscreen/designer', name: 'bigscreenDesigner', component: () => import('@/views/report/bigscreen/designer'), meta: { title: '设计', icon: 'i', keepAlive: false, isBack: true } },
     ]
   },
   { path: '/bigscreen/viewer', component: () => import('@/views/report/bigscreen/viewer'), hidden: true },

report-ui/src/views/report/resultset/index.vue

@@ -37,6 +37,18 @@
                       class="filter-item" />
           </el-form-item>
         </el-col>
+        <el-col :xs="24"
+                :sm="20"
+                :md="4"
+                :lg="4"
+                :xl="4">
+          <el-button type="primary"
+                     size="mini"
+                     @click="search('form')">查询</el-button>
+          <el-button type="danger"
+                     size="mini"
+                     @click="reset('form')">重置</el-button>
+        </el-col>
       </el-row>
     </el-form>
     <el-button type="primary"
@@ -45,6 +57,7 @@
 
     <!--表格渲染-->
     <el-table ref="table"
+              v-loading="listLoading"
               border
               :data="data"
               size="small"
@@ -392,6 +405,7 @@ export default {
   data () {
     return {
       data: [],
+      listLoading: true,
       permission: {
         add: ['admin', 'alipayConfig:add'],
         edit: ['admin', 'alipayConfig:edit'],
@@ -503,6 +517,32 @@ export default {
     this.getAllDataSourceSet()
   },
   methods: {
+    // 查询
+    search () {
+      this.params.pageNumber = 1
+      this.queryByPage()
+    },
+    // 重置
+    reset (formName) {
+      // this.$refs[formName].resetFields()
+      this.query.setName = ''
+      this.query.setCode = ''
+      this.params.pageNumber = 1
+      this.queryByPage()
+    },
+    async queryByPage () {
+      const res = await pageList(this.params)
+      if (res.code != '200') return
+      this.listLoading = true
+      this.data = res.data.records
+
+      this.totalCount = res.data.total
+      this.totalPage = res.data.pages
+      this.listLoading = false
+    },
+
+
+
     onJsonChange (value) { },
     onJsonSave (value) { },
     handleClose (done) {