提交代码

zmk

2024-05-27 17c44d69651ddae3ab2093d8560a3d46db87dd8d

提交代码

 javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java

@@ -8,13 +8,11 @@
import com.javaweb.cms.util.CmsConstants;
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.Arith;
import com.javaweb.common.utils.StringUtils;
import com.javaweb.geo.domain.Hole;
import com.javaweb.geo.domain.HoleMedia;
import com.javaweb.geo.domain.Project;
import com.javaweb.geo.domain.TubLog;
import com.javaweb.geo.enums.RecordType;
import com.javaweb.geo.mapper.HoleMapper;
import com.javaweb.geo.mapper.TubLogMapper;
import com.javaweb.geo.service.IHoleMediaService;
import com.javaweb.geo.service.IHoleService;

 javaweb-plus/javaweb-admin/src/main/resources/templates/index.html

@@ -33,20 +33,20 @@
                  </li>
                </a>
                <li>
                    <div class="user-panel">
                        <a class="menuItem" title="个人中心" th:href="@{/system/user/profile}"> 
                            <div class="hide" th:text="个人中心"></div>
                            <div class="pull-left image">
                                <img th:src="(${user.avatar} == '') ? @{/img/profile.jpg} : @{${user.avatar}}" class="img-circle" alt="User Image">
                            </div>
                        </a>
                        <div class="pull-left info">
                          <p>[[${user.loginName}]]</p>
                          <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                          <a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>
                        </div>
                    </div>
                </li>
<!--                    <div class="user-panel">-->
<!--                        <a class="menuItem" title="个人中心" th:href="@{/system/user/profile}"> -->
<!--                            <div class="hide" th:text="个人中心"></div>-->
<!--                            <div class="pull-left image">-->
<!--                                <img th:src="(${user.avatar} == '') ? @{/img/profile.jpg} : @{${user.avatar}}" class="img-circle" alt="User Image">-->
<!--                            </div>-->
<!--                        </a>-->
<!--                        <div class="pull-left info">-->
<!--                          <p>[[${user.loginName}]]</p>-->
<!--                          <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>-->
<!--                          <a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>-->
<!--                        </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>

 javaweb-plus/javaweb-admin/src/main/resources/templates/main.html

@@ -15,9 +15,6 @@
        background-color: rgba(0,0,0,0.01) !important;
        padding:10px;
    }
    body{
        padding: 10px;
    }
    [v-cloak]{
        display: none;
    }
@@ -107,7 +104,7 @@
                            <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">场地数量</span>
                        </div>
                        <div style="text-align: center;">
                        <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px">34
                        <span style="color:#ED1C24;font-size: 30px;word-break: break-all;line-height: 70px">34
                        </span>
                        </div>
                    </div>
@@ -143,7 +140,7 @@
                            <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">钻孔进尺</span>
                        </div>
                        <div style="text-align: center">
                        <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px;">647
                        <span style="color:#1894F6;font-size: 30px;word-break: break-all;line-height: 70px;">647
                        </span>
                        </div>
                    </div>
@@ -169,7 +166,7 @@
                            <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">实时监控</span>
                        </div>
                        <div style="text-align: center">
                        <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px">68
                        <span style="color:#F7931E;font-size: 30px;word-break: break-all;line-height: 70px">68
                        </span>
                        </div>
                    </div>
@@ -197,7 +194,7 @@
                            <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">资料文件</span>
                        </div>
                        <div style="text-align: center">
                        <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px;">
                        <span style="color:#F7931E;font-size: 30px;word-break: break-all;line-height: 70px;">
                            {{indexDataCount.fileCount}}
                        </span>
                        </div>
@@ -224,18 +221,12 @@
        <el-row>
            <el-col :span="16">
                <el-card class="box-card">
                    <div>
                    <div style="height: 200px;">
                        <h3>材料统计</h3>

                        <el-col :span="10" style="height: 200px;">
                        </el-col>
                        <el-col :span="14" style="height: 200px;">
                        </el-col>
                    </div>

                </el-card>

                <el-card class="box-card" style="margin-top: 4px;">
                <el-card class="box-card" style="margin-top: 20px;">
                    <div id="map_div" style="width: 100%;height: 550px;"></div>
                </el-card>

@@ -243,41 +234,44 @@

            <el-col :span="8">
                <el-card class="box-card">
                    <div style="width: 100%;height: 20px;">
                        <h3>项目总体进度(%)</h3>
                    <div style="height: 200px;width: 100%">
                        <div style="width: 100%;height: 20px;">
                            <h3>项目总体进度2(%)</h3>
                        </div>
                        <div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
                    </div>
                    <div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
                </el-card>

                <el-card class="box-card" style="margin-top: 4px;">
                    <div style="width: 100%;height: 20px;margin-bottom: 10px;text-align: center;">
                        <h3>场地详细进度(%)</h3>
                    </div>
                    <div style="width: 100%;height: 500px;overflow: auto">
                <el-card class="box-card" style="margin-top: 20px;">
                    <div style="width: 100%">
                        <div style="width: 100%;height: 20px;margin-bottom: 10px;text-align: center;">
                            <h3>场地详细进度(%)</h3>
                        </div>
                        <div style="width: 100%;height: 500px;overflow: auto">

                        <el-row class="rankrow" v-for='entity in stationProcessData' @click.native='viewStation(entity)'>
                            <el-col :span="2" >
                                <div v-if="entity.status=='协调中'" class="active-red">{{entity.ranking}}</div>
                                <div v-if="entity.status=='待开工'" class="active-yellow">{{entity.ranking}}</div>
                                <div v-if="entity.status=='进行中'" class="active-blue">{{entity.ranking}}</div>
                            <el-row class="rankrow" v-for='entity in stationProcessData' @click.native='viewStation(entity)'>
                                <el-col :span="2" >
                                    <div v-if="entity.status=='协调中'" class="active-red">{{entity.ranking}}</div>
                                    <div v-if="entity.status=='待开工'" class="active-yellow">{{entity.ranking}}</div>
                                    <div v-if="entity.status=='进行中'" class="active-blue">{{entity.ranking}}</div>

                            </el-col>
                                </el-col>

                            <el-col :span="7">
                                <div style="font-size: 16px">{{entity.station}}</div>
                            </el-col >
                                <el-col :span="7">
                                    <div style="font-size: 16px">{{entity.station}}</div>
                                </el-col >

                            <el-col :span="5">
                                <div style="font-size: 16px">{{entity.status}}</div>
                            </el-col>
                                <el-col :span="5">
                                    <div style="font-size: 16px">{{entity.status}}</div>
                                </el-col>

                            <el-col :span="8">
                                <div>
                                    <el-progress :stroke-width="10" :percentage="entity.value"></el-progress>
                                </div>
                            </el-col>
                        </el-row>

                                <el-col :span="8">
                                    <div>
                                        <el-progress :stroke-width="10" :percentage="entity.value"></el-progress>
                                    </div>
                                </el-col>
                            </el-row>
                        </div>
                    </div>

                </el-card>
@@ -311,21 +305,12 @@
        totalProcess();
        stationProcess();
        indexCount();
        tubLogs();
    })
    function viewStation(station) {
        var lng = station.lng;
        var lat = station.lat;
        map.centerAndZoom(new T.LngLat(lng, lat), 13);
    }

    function tubLogs() {
        let url = ctx + "/system/tubLogData";
        $.ajaxSettings.async = false;
        $.get(url,{},function(res){
            vm.tubLogData = res.tubLogData;
        })
        $.ajaxSettings.async = false;
        // $.modal.openTab("场地导航",ctx+"/geo/project/navigate?ids="+id);
    }

    function indexCount() {
@@ -353,7 +338,6 @@
            return {
                stationProcessData: [],
                indexDataCount :"",
                tubLogData:[],
            };
        },
        methods: {

 javaweb-plus/javaweb-admin/src/main/resources/templates/main3.html

File was renamed from javaweb-plus/javaweb-admin/src/main/resources/templates/main2.html
@@ -15,6 +15,9 @@
        background-color: rgba(0,0,0,0.01) !important;
        padding:10px;
    }
    body{
        padding: 10px;
    }
    [v-cloak]{
        display: none;
    }
@@ -221,12 +224,18 @@
        <el-row>
            <el-col :span="16">
                <el-card class="box-card">
                    <div style="height: 200px;">
                    <div>
                        <h3>材料统计</h3>

                        <el-col :span="10" style="height: 200px;">
                        </el-col>
                        <el-col :span="14" style="height: 200px;">
                        </el-col>
                    </div>

                </el-card>

                <el-card class="box-card" style="margin-top: 20px;">
                <el-card class="box-card" style="margin-top: 4px;">
                    <div id="map_div" style="width: 100%;height: 550px;"></div>
                </el-card>

@@ -234,15 +243,13 @@

            <el-col :span="8">
                <el-card class="box-card">
                    <div style="height: 200px;">
                        <div style="width: 100%;height: 20px;">
                            <h3>项目总体进度(%)</h3>
                        </div>
                        <div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
                    <div style="width: 100%;height: 20px;">
                        <h3>项目总体进度(%)</h3>
                    </div>
                    <div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
                </el-card>

                <el-card class="box-card" style="margin-top: 20px;">
                <el-card class="box-card" style="margin-top: 4px;">
                    <div style="width: 100%;height: 20px;margin-bottom: 10px;text-align: center;">
                        <h3>场地详细进度(%)</h3>
                    </div>
@@ -304,12 +311,21 @@
        totalProcess();
        stationProcess();
        indexCount();
        tubLogs();
    })
    function viewStation(station) {
        var lng = station.lng;
        var lat = station.lat;
        map.centerAndZoom(new T.LngLat(lng, lat), 13);
        // $.modal.openTab("场地导航",ctx+"/geo/project/navigate?ids="+id);
    }

    function tubLogs() {
        let url = ctx + "/system/tubLogData";
        $.ajaxSettings.async = false;
        $.get(url,{},function(res){
            vm.tubLogData = res.tubLogData;
        })
        $.ajaxSettings.async = false;
    }

    function indexCount() {
@@ -337,6 +353,7 @@
            return {
                stationProcessData: [],
                indexDataCount :"",
                tubLogData:[],
            };
        },
        methods: {