地质所 沉降监测网建设项目
29470086e5d10b134bd2c70f53c39e58b5706ed5..9166b7b4bdb84bfe499078dd68add5c3e462411f
2024-05-27 zmk
Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
9166b7 对比 | 目录
2024-05-27 zmk
提交代码
cee7c6 对比 | 目录
2个文件已修改
41 ■■■■■ 已修改文件
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
@@ -12,8 +12,10 @@
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;
import com.javaweb.geo.service.IProjectService;
@@ -60,6 +62,10 @@
    @Autowired
    private IHoleMediaService holeMediaService;
    @Autowired
    private TubLogMapper tubLogMapper;
    private String getAdminIndex() {
        return configService.selectConfigByKey(CmsConstants.KEY_ADMIN_INDEX);
@@ -240,5 +246,17 @@
        return AjaxResult.success("查询成功",result);
    }
    /**
     * 统计材料的消耗
     * @return
     */
    @ResponseBody
    @GetMapping("/system/tubLogData")
    public AjaxResult tubLogData() {
        AjaxResult ajaxResult = new AjaxResult();
        List<TubLog> tubLogs = tubLogMapper.countTubLogDate();
        ajaxResult.put("tubLogs",tubLogs);
        return  ajaxResult;
    }
}
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -15,6 +15,9 @@
        background-color: rgba(0,0,0,0.01) !important;
        padding:10px;
    }
    body{
        padding: 10px;
    }
    [v-cloak]{
        display: none;
    }
@@ -221,9 +224,15 @@
        <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: 4px;">
@@ -302,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() {
@@ -335,6 +353,7 @@
            return {
                stationProcessData: [],
                indexDataCount :"",
                tubLogData:[],
            };
        },
        methods: {