提交代码

zmk

2024-07-03 f50f4c73e47aac76819d2ab8283cbec6b078ef80

提交代码

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

File was deleted

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

@@ -260,32 +260,7 @@
        <el-row>
            <el-col :span="16">
                <el-card class="box-card">
                    <div style="height: 200px;width: 100%;">
                        <h3>材料统计</h3>
                        <el-col :span="10" style="height: 200px;">
                            <div style="margin-top: 15px">
                                <template>
                                    <el-table :data="tubLogs" border size="small" style="width: 100%"
                                              :header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
                                              :row-class-name="tableRowClassName">
                                        <!--                                    <el-table-column prop="code" label="序号"></el-table-column>-->
                                        <el-table-column prop="tubName" label="名称"></el-table-column>
                                        <el-table-column prop="inboundNumber" label="入库数量"></el-table-column>
                                        <el-table-column prop="outboundNumber" label="出库数量"></el-table-column>
                                        <el-table-column prop="unit" label="单位"></el-table-column>

                                    </el-table>
                                </template>
                            </div>
                        </el-col>
                        <el-col :span="14" style="height: 200px;">
                            <div id="column-chart" style="height: 180px; width: 100%;"></div>
                        </el-col>
                    </div>
                </el-card>

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

            </el-col>
@@ -302,10 +277,10 @@

                <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">
<!--                        <div style="width: 100%;height: 20px;margin-bottom: 10px;text-align: center;">-->
<!--                            <h3>场地详细进度(%)</h3>-->
<!--                        </div>-->
                        <div style="width: 100%;height: 330px;overflow: auto">

                            <el-row class="rankrow" v-for='entity in stationProcessData' @click.native='viewStation(entity)'>
                                <el-col :span="2" >

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

File was renamed from javaweb-plus/javaweb-admin/src/main/resources/templates/main3.html
@@ -15,9 +15,6 @@
        background-color: rgba(0,0,0,0.01) !important;
        padding:10px;
    }
    body{
        padding: 10px;
    }
    [v-cloak]{
        display: none;
    }
@@ -88,11 +85,51 @@
        padding: 0 40px;
        align-content: center;
    }
    .ilblock span{
    .ilblock>span{
        display: block;
        line-height: 30px;
    }


    <!-- 表格样式 -->
    .el-table, .el-table__expanded-cell {
        background-color: transparent;
        color: #4D4D4D;
        font-size: 13px;
    }

    .el-table th,
    .el-table tr,
    .el-table td {
        background-color: transparent;
        border: 0px;
        color: #4D4D4D;
        font-size: 13px;
        font-family: Source Han Sans CN Normal, Source Han Sans CN Normal-Normal;
        font-weight: Normal;
    }
    .el-table::before {
        height: 0px;
    }
    .el-table__body tr,
    .el-table__body td {
        padding: 0;
        height: 22px;
    }
    .el-table__row.warning-row {
        background:rgb(252,212,165);
    }
    .el-table__body-wrapper::-webkit-scrollbar-track {
        background-color: rgb(252,212,165);
    }
    .el-table__body-wrapper::-webkit-scrollbar {
        width: 10px;
        opacity: 0.5;
    }
    .el-table__body-wrapper::-webkit-scrollbar-thumb {
        border-radius: 15px;
        background-color:rgb(252,212,165);
    }
</style>
</head>

@@ -107,25 +144,24 @@
                            <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>

                    <div style="flex:6;" class="ilblock">
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            协调中
                            <span style="float: right">
                                {{indexDataCount.projectStatus0}}
                            </span>
                            <span style="float: right">{{indexDataCount.projectStatus0}}</span>
<!--                            <li class="el-icon-caret-bottom" style="color: #f56c6c">-->

                        </span>
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            待开工
                            <span style="float: right">{{indexDataCount.projectStatus1}}</span>
<!--                            <li class="el-icon-caret-bottom" style="color: #e6a23c">-->
                        </span>
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            进行中
                            <span style="float: right">{{indexDataCount.projectStatus2}}</span>
<!--                            <li class="el-icon-caret-top" style="color: #409eff">-->
@@ -140,20 +176,20 @@
                    <div style="flex:4;padding-right: 20px;">
                        <div>
                            <li class="el-icon-coin" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #085abe"></li>
                            <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">钻孔进尺</span>
                            <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>

                    <div style="flex:6;" class="ilblock">
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            总进尺 <span style="float: right">{{indexDataCount.footageCount}}m</span>
<!--                            <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
                        </span>
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            已完成   <span style="float: right">{{indexDataCount.footageCplCount}}m</span>
<!--                            <li class="el-icon-caret-bottom" style="color: #409eff">-->
                        </span>
@@ -169,7 +205,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>
@@ -178,12 +214,12 @@
                        <div>
                            
                        </div>
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                            已安装  <span style="float: right">0</span>
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            已安装  <span style="float: right">{{indexDataCount.cameraCount}}</span>
<!--                            <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
                        </span>
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                            未安装   <span style="float: right">68</span>
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            未安装   <span style="float: right">{{indexDataCount.cameraCountNaN}}</span>
<!--                            <li class="el-icon-caret-bottom" style="color: #409eff">-->
                        </span>
                    </div>
@@ -197,22 +233,22 @@
                            <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>
                    </div>

                    <div style="flex:6;" class="ilblock">
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            施工资料  <span style="float: right">0</span>
<!--                            <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
                        </span>
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            安全资料   <span style="float: right">0</span>
<!--                            <li class="el-icon-caret-bottom" style="color: #409eff">-->
                        </span>
                        <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                        <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                            质量资料   <span style="float: right">0</span>
<!--                            <li class="el-icon-caret-bottom" style="color: #409eff">-->
                        </span>
@@ -224,60 +260,76 @@
        <el-row>
            <el-col :span="16">
                <el-card class="box-card">
                    <div>
                    <div style="height: 200px;width: 100%;">
                        <h3>材料统计</h3>

                        <el-col :span="10" style="height: 200px;">
                            <div style="margin-top: 15px">
                                <template>
                                    <el-table :data="tubLogs" border size="small" style="width: 100%"
                                              :header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
                                              :row-class-name="tableRowClassName">
                                        <!--                                    <el-table-column prop="code" label="序号"></el-table-column>-->
                                        <el-table-column prop="tubName" label="名称"></el-table-column>
                                        <el-table-column prop="inboundNumber" label="入库数量"></el-table-column>
                                        <el-table-column prop="outboundNumber" label="出库数量"></el-table-column>
                                        <el-table-column prop="unit" label="单位"></el-table-column>

                                    </el-table>
                                </template>
                            </div>
                        </el-col>
                        <el-col :span="14" style="height: 200px;">
                            <div id="column-chart" style="height: 180px; width: 100%;"></div>
                        </el-col>
                    </div>

                </el-card>

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

            </el-col>

            <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>项目总体进度(%)</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>
@@ -304,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();
@@ -313,6 +370,7 @@
        indexCount();
        tubLogs();
    })
    //场地和地图点击联动
    function viewStation(station) {
        var lng = station.lng;
        var lat = station.lat;
@@ -320,32 +378,101 @@
    }

    function tubLogs() {
        let url = ctx + "/system/tubLogData";

        const chart = echarts.init(document.getElementById("column-chart"));
        const option = {
            tooltip: {
                trigger: 'axis',
                axisPointer: {
                    type: 'shadow'
                }
            },
            legend: {},
            grid: {
                left: '3%',
                right: '4%',
                bottom: '3%',
                containLabel: true
            },
            xAxis: [
                {
                    type: 'category',
                    data: []
                }
            ],
            yAxis: [
                {
                    type: 'value'
                }
            ],
            series: [
                {
                    name: '出库',
                    type: 'bar',
                    emphasis: {
                        focus: 'series'
                    },
                    data: [],
                    itemStyle: {
                        // 修改柱子的颜色
                        color: '#e2b507'
                    }
                },
                {
                    name: '入库',
                    type: 'bar',
                    stack: 'Ad',
                    emphasis: {
                        focus: 'series'
                    },
                    data: [],
                    itemStyle: {
                        // 修改柱子的颜色
                        color: '#2992c6'
                    }
                },

            ]
        };

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

            res.tubLogs.forEach(function(value, index, array) {
                const tubName = value.tubName;
                const inboundNumber = value.inboundNumber;
                const outboundNumber = value.outboundNumber;
                const unit = value.unit;
                option.xAxis[0].data[index] = tubName;
                option.series[0].data[index] = outboundNumber;
                option.series[1].data[index] = inboundNumber;
            });
            chart.setOption(option, true);
        })
        $.ajaxSettings.async = false;
    }

    //首页第一行个数统计
    function indexCount() {
        let url = ctx + "/system/indexDataCount";
        let url = ctx + "/system/stat/indexDataCount";
        $.ajaxSettings.async = false;
        $.get(url,{},function(res){
            vm.indexDataCount = res.data;
            vm.indexDataCount.cameraCountNaN = 68 -vm.indexDataCount.cameraCount;
        })
        $.ajaxSettings.async = false;
    }

    }
    //场地进度
    function stationProcess() {
        let url = ctx + "/system/projectProcess";
        let url = ctx + "/system/stat/projectProcess";
        $.ajaxSettings.async = false;
        $.get(url,{},function(res){
            vm.stationProcessData = res.projectData;
        })
        $.ajaxSettings.async = false;
        console.log(vm.stationProcessData);

    }
    var vm = new Vue({
        el: "#app",
@@ -353,10 +480,17 @@
            return {
                stationProcessData: [],
                indexDataCount :"",
                tubLogData:[],
                tubLogs:[],
            };
        },
        methods: {
            tableRowClassName({ row, rowIndex }) {
                if (rowIndex % 2 == 0) {
                    return "";
                } else {
                    return "warning-row";
                }
            },
        }
    });
    // 加载地图
@@ -379,6 +513,8 @@
            map.addOverLay(countriesOverlay1)
            countriesOverlay.bringToBack();
        });

        //map.setStyle("indigo");
    }

    function init(sel, transform) {
@@ -422,7 +558,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);
@@ -430,12 +566,28 @@
    }
    //地图上展示项目点
    function showProjectPoint(data){
        var projectIcon = new T.Icon({
            iconUrl: '/bjfw/images/icon/6.png',
            iconSize: new T.Point(30, 30),
            iconAnchor: new T.Point(6, 40),
        });
        var projectIcon ;
        for(let i =0;i<data.length;i++){
            if (data[i].status === '1'){
                projectIcon = new T.Icon({
                    iconUrl: '/bjfw/images/icon/yellow.png',
                    iconSize: new T.Point(30, 30),
                    iconAnchor: new T.Point(6, 40),
                });
            }else if (data[i].status === '2'){
                projectIcon = new T.Icon({
                    iconUrl: '/bjfw/images/icon/blue.png',
                    iconSize: new T.Point(30, 30),
                    iconAnchor: new T.Point(6, 40),
                });
            }else {
                projectIcon = new T.Icon({
                    iconUrl: '/bjfw/images/icon/red.png',
                    iconSize: new T.Point(30, 30),
                    iconAnchor: new T.Point(6, 40),
                });
            }

            let lng = data[i].lng;
            let lat = data[i].lat;
            let marker = new T.Marker(new T.LngLat(lng, lat), { title: "场地位置",icon:projectIcon});
@@ -478,16 +630,18 @@
        map.openInfoWindow(markerInfoWin, point); //开启信息窗口
    }


    //总进度仪表盘
    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;
            pointerData = (pointerData*100).toFixed(0);
        })
            pointerData = (pointerData*100).toFixed(2);
        });

        $.ajaxSettings.async = false;
        var option = {
            backgroundColor: "#fff",

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

File was deleted