Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-28 3f1889e77f861a8284770c85bdd83204f6863f39

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html

@@ -149,7 +149,7 @@
                    </div>
                    <div>
                        <div style="padding-left: 20%;">
                            <el-progress  type="dashboard" color="#FF0000" :percentage="50">
                            <el-progress  type="dashboard" color="#FF0000" :percentage=holeProcess>
                            </el-progress>
                        </div>
                    </div>
@@ -221,12 +221,21 @@
        var prefix2 = ctx + "geo/TubLog";

        $(function() {
            //场地钻孔列表
            var url = prefix + "/holelist?projectId=" + projectId;
            $.ajaxSettings.async = false;
            $.get(url,{},function(res){
                vm.holeData = res.data;
            });
            vm.project = project;
            //场地进度
            var url2 = prefix + "/holeProcess?projectId=" + projectId;
            $.ajaxSettings.async = false;
            $.get(url2,{},function(res){
                vm.holeProcess = (res.data*100).toFixed(0);
                alert(vm.holeProcess);
            });

            tubLogs();
        });

@@ -264,7 +273,11 @@
                        emphasis: {
                            focus: 'series'
                        },
                        data: []
                        data: [],
                        itemStyle: {
                            // 修改柱子的颜色
                            color: '#e2b507'
                        }
                    },
                    {
                        name: '入库',
@@ -273,7 +286,11 @@
                        emphasis: {
                            focus: 'series'
                        },
                        data: []
                        data: [],
                        itemStyle: {
                            // 修改柱子的颜色
                            color: '#2992c6'
                        }
                    },

                ]
@@ -303,6 +320,7 @@
            el: "#app",
            data() {
                return {
                    holeProcess:"",
                    project: "",
                    holeData: [],
                    tubLogs:[],