From 9293fcd88772d5230530488908e49250117df187 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 17:13:00 +0800
Subject: [PATCH] 调代码
---
javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java | 2 +-
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 10 +++++-----
javaweb-plus/javaweb-admin/src/main/resources/templates/index.html | 4 +++-
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 4 ++++
javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ShiroConfig.java | 1 +
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 10 +++++-----
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
index 865861d..27f5aee 100644
--- a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
+++ b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
@@ -122,7 +122,7 @@
// 绯荤粺浠嬬粛
@ResponseBody
- @GetMapping("/system/project")
+ @GetMapping("/system/stat/project")
public AjaxResult project() {
AjaxResult ajaxResult = AjaxResult.success();
List<Project> projects = projectService.selectProjectList(new Project());
@@ -135,7 +135,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/totalProcess")
+ @GetMapping("/system/stat/totalProcess")
public AjaxResult totalProcess() {
AjaxResult ajaxResult = AjaxResult.success();
Hole hole = holeService.selectHoleTotalProcess();
@@ -149,7 +149,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/projectProcess")
+ @GetMapping("/system/stat/projectProcess")
public AjaxResult projectProcess() {
AjaxResult ajaxResult = AjaxResult.success();
List<Hole> holes = holeService.selectHoleProjectProcess();
@@ -205,7 +205,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/indexDataCount")
+ @GetMapping("/system/stat/indexDataCount")
public AjaxResult indexDataCount() {
IndexVo result = new IndexVo();
//=============================鏌ヨ鍦哄湴鏁伴噺===============================
@@ -249,7 +249,7 @@
* @return
*/
@ResponseBody
- @GetMapping("/system/tubLogData")
+ @GetMapping("/system/stat/tubLogData")
public AjaxResult tubLogData() {
AjaxResult ajaxResult = new AjaxResult();
List<TubLog> tubLogs = tubLogMapper.countTubLogDate();
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
index 3fd61a8..2dfe104 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
@@ -32,7 +32,8 @@
<span class="logo-lg" >閽绘帰宸ョ▼骞冲彴</span>
</li>
</a>
- <li>
+
+<!-- <li>-->
<!-- <div class="user-panel">-->
<!-- <a class="menuItem" title="涓汉涓績" th:href="@{/system/user/profile}"> -->
<!-- <div class="hide" th:text="涓汉涓績"></div>-->
@@ -47,6 +48,7 @@
<!-- </div>-->
<!-- </div>-->
<!-- </li>-->
+
<li th:each="menu : ${menus}">
<a th:class="@{${menu.url != '' && menu.url != '#'} ? ${menu.target}}" th:href="@{${menu.url == ''} ? |#| : ${menu.url}}">
<i class="fa fa-bar-chart-o" th:class="${menu.icon}"></i>
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
index 89c9673..7fec47c 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -371,7 +371,7 @@
}
function tubLogs() {
- let url = ctx + "/system/tubLogData";
+ let url = ctx + "/system/stat/tubLogData";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.tubLogs = res.tubLogs;
@@ -382,7 +382,7 @@
//棣栭〉绗竴琛屼釜鏁扮粺璁�
function indexCount() {
- let url = ctx + "/system/indexDataCount";
+ let url = ctx + "/system/stat/indexDataCount";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.indexDataCount = res.data;
@@ -392,7 +392,7 @@
}
//鍦哄湴杩涘害
function stationProcess() {
- let url = ctx + "/system/projectProcess";
+ let url = ctx + "/system/stat/projectProcess";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.stationProcessData = res.projectData;
@@ -483,7 +483,7 @@
// 鑾峰彇鏁版嵁搴撶湡瀹炴暟鎹�
function getReallyData() {
- let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/project";
+ let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/stat/project";
$.get(url,function(res){
var data = res.projects;
showProjectPoint(data);
@@ -543,7 +543,7 @@
function totalProcess() {
var Chart1 = echarts.init(document.getElementById('Chart1'));
var pointerData = 0; // 浠〃鎸囬拡鏁版嵁
- let url = ctx + "/system/totalProcess";
+ let url = ctx + "/system/stat/totalProcess";
$.ajaxSettings.async = false;
$.get(url,{},function(res){
pointerData = res.pointerData;
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
index 180fb5e..dcd8d16 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
@@ -77,6 +77,7 @@
</template>
{{project.code}}
</el-descriptions-item>
+
<el-descriptions-item>
<template slot="label">
<i class="el-icon-map-location"></i>
@@ -154,6 +155,9 @@
</div>
</el-card>
</el-col>
+
+
+
</el-row>
<el-row style="height: 200px;">
<el-col :span="24">
diff --git a/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java b/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java
index b288bea..4d1fbfd 100644
--- a/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java
+++ b/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ResourcesConfig.java
@@ -64,6 +64,6 @@
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/webgis/**");
- registry.addMapping("/geotdp/**");
+ registry.addMapping("/system/stat/**");
}
}
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ShiroConfig.java b/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ShiroConfig.java
index c139bc6..c1854e2 100644
--- a/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ShiroConfig.java
+++ b/javaweb-plus/javaweb-framework/src/main/java/com/javaweb/framework/config/ShiroConfig.java
@@ -268,6 +268,7 @@
filterChainDefinitionMap.put("/webgis/**", "anon");//娉ㄦ剰鍓嶅彴璇锋眰涓嶆嫤鎴�
filterChainDefinitionMap.put("/geotdp/**", "anon");//娉ㄦ剰鍓嶅彴璇锋眰涓嶆嫤鎴�
filterChainDefinitionMap.put("/geo/**", "anon");//娉ㄦ剰鍓嶅彴璇锋眰涓嶆嫤鎴�
+ filterChainDefinitionMap.put("/system/stat/**", "anon");//娉ㄦ剰鍓嶅彴璇锋眰涓嶆嫤鎴�
filterChainDefinitionMap.put("/page/view", "anon");
filterChainDefinitionMap.put("/images/**", "anon");
filterChainDefinitionMap.put("/img/**", "anon");
--
Gitblit v1.9.1