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

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/user/controller/LoginController.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -36,4 +37,10 @@ public class LoginController {
     public ResponseBean health() {
         return ResponseBean.builder().build();
     }
+
+
+    @RequestMapping({"/", "index.html"})
+    public String index() {
+        return "/index";
+    }
 }

report-ui/src/views/report/bigscreen/designer/tools.js

@@ -50,7 +50,7 @@ const screenConfig = {
         name: 'backgroundImage',
         required: false,
         placeholder: '',
-        value: 'http://10.108.26.197/business/file/download/adfc22ac-ed7f-4141-aeb9-ee81f16ac92d',
+        value: 'https://report.anji-plus.com/file/download/bf566e48-ccad-40e1-8ee9-228427e5466b',
       },
     ],
     data: [],

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

@@ -71,7 +71,7 @@
     <div class="block">
       <el-pagination
         :total="totalCount"
-        :page-sizes="[10, 20, 50, 100]"
+        :page-sizes="[8, 20, 50, 100]"
         :page-size="params.pageSize"
         :current-page="params.pageNumber"
         layout="total, sizes, prev, pager, next, jumper"