dkyChenJiang.git

parent: ef0b0284 | 补丁 | 提交 | ignore whitespace

zmk

2024-07-03 41750848c6cc6506fa107036d04b28c0f28cfba8

提交

4个文件已修改

	javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	javaweb-plus/javaweb-admin/src/main/resources/templates/main.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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


 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();

 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">

 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>

			@@ -142,6 +142,8 @@
			public String main(ModelMap mmap) {
			mmap.put("version", Global.getVersion());

			String loginname = ShiroUtils.getLoginName();
			mmap.put("loginuser",loginname);
			return "main";
			}

			@@ -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();

			@@ -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">

			@@ -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>