From 41750848c6cc6506fa107036d04b28c0f28cfba8 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 03 七月 2024 16:19:07 +0800
Subject: [PATCH] 提交
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 2 ++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 12 ++++++------
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html | 40 ++++++++++++++++++++--------------------
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 5 +++++
4 files changed, 33 insertions(+), 26 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 ddcebdd..2222f77 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
@@ -142,6 +142,8 @@
public String main(ModelMap mmap) {
mmap.put("version", Global.getVersion());
+ String loginname = ShiroUtils.getLoginName();
+ mmap.put("loginuser",loginname);
return "main";
}
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 5ebcb91..3a25567 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -356,8 +356,13 @@
<th:block th:include="include :: footer" />
<script th:inline="javascript">
+ var loginuser = [[${loginuser}]];
$(function() {
+ if(loginuser=='admin'){
+ window.open("http://49.4.115.102:8000/onemap/onemap.html","_blank");
+ }
+
loadMap();
getReallyData();
totalProcess();
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 c2cb4dc..567316f 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
@@ -55,7 +55,7 @@
</head>
<body>
<div id="app" v-cloak>
- <el-row style="height: 200px;">
+ <el-row>
<el-col :span="8">
<el-card class="box-card card-blue" style="height: 320px;margin-right: 20px;">
<div slot="header" class="clearfix">
@@ -151,15 +151,15 @@
</el-row>
- <el-row style="height: 200px;">
+ <el-row style="margin-top: 10px;">
<el-col :span="24" >
- <el-card class="box-card card-blue" style="height: 320px;margin-top: 20px">
+ <el-card class="box-card card-blue" style="height: 400px;">
<div slot="header" class="clearfix">
<span>閽诲瓟杩涘害</span>
</div>
- <div style="height: 250px;">
+ <div style="height: 320px;">
<template>
- <el-table :data="holeData" size="small" style="width: 99%" height="250">
+ <el-table :data="holeData" size="small" style="width: 99%" height="320">
<el-table-column prop="code" label="缂栧彿"></el-table-column>
<el-table-column prop="type" label="绫诲瀷"></el-table-column>
<el-table-column prop="footage" label="鎬昏繘灏�(m)"></el-table-column>
@@ -179,7 +179,7 @@
</el-row>
- <el-row style="height: 200px;">
+ <el-row>
<el-col :span="24">
<el-card class="box-card card-blue" style="height: 320px;margin-top: 20px">
<div slot="header" class="clearfix">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
index 13e714e..d1e4b5b 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
@@ -37,31 +37,31 @@
<i class="glyphicon glyphicon-list-alt"></i> <a class="afont" th:href="@{/geo/holeLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">閽诲瓟杩涘害鏃ュ織</a>
</div>
</div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-user"></i> <a class="afont" th:href="@{/geo/projectPerson(id=${project.ids})}" target="mainFrame" onclick="selected(this)">浜哄憳绠＄悊</a>
- </div>
- </div>
+<!-- <div class="box-header ">-->
+<!-- <div class="box-title">-->
+<!-- <i class="glyphicon glyphicon-user"></i> <a class="afont" th:href="@{/geo/projectPerson(id=${project.ids})}" target="mainFrame" onclick="selected(this)">浜哄憳绠＄悊</a>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="box-header ">
<div class="box-title">
<i class="glyphicon glyphicon-retweet"></i> <a class="afont" th:href="@{/geo/deviceLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">璁惧绠＄悊</a>
</div>
</div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-random"></i> <a class="afont" th:href="@{/geo/TubLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鏉愭枡绠＄悊</a>
- </div>
- </div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-object-align-horizontal"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='1')}" target="mainFrame" onclick="selected(this)">璐ㄩ噺绠＄悊</a>
- </div>
- </div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-lock"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='2')}" target="mainFrame" onclick="selected(this)">瀹夊叏绠＄悊</a>
- </div>
- </div>
+<!-- <div class="box-header ">-->
+<!-- <div class="box-title">-->
+<!-- <i class="glyphicon glyphicon-random"></i> <a class="afont" th:href="@{/geo/TubLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鏉愭枡绠＄悊</a>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="box-header ">-->
+<!-- <div class="box-title">-->
+<!-- <i class="glyphicon glyphicon-object-align-horizontal"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='1')}" target="mainFrame" onclick="selected(this)">璐ㄩ噺绠＄悊</a>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="box-header ">-->
+<!-- <div class="box-title">-->
+<!-- <i class="glyphicon glyphicon-lock"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='2')}" target="mainFrame" onclick="selected(this)">瀹夊叏绠＄悊</a>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="box-header ">
<div class="box-title">
<i class="glyphicon glyphicon-th-list"></i> <a class="afont" th:href="@{/geo/projectData/2(id=${project.ids},type='3')}" target="mainFrame" onclick="selected(this)">鏂藉伐鐜板満绠＄悊</a>
--
Gitblit v1.9.1