提交代码

zmk

2024-05-28 b2ce4cf46bda0570ad91636fab8760694cf0b3f0

 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>
@@ -162,7 +162,7 @@
        <el-row style="height: 200px;">
            <el-col :span="24">

                <el-card class="box-card  card-green"  style="height: 320px;margin-top: 20px">
                <el-card class="box-card  card-yellow"  style="height: 320px;margin-top: 20px">
                        <div slot="header" class="clearfix">
                            <span>材料统计</span>
                        </div>
@@ -182,26 +182,6 @@
                            <div id="column-chart" style="height: 250px; width: 100%;"></div>
                        </el-col>
                </el-card>
<!--                <el-card class="box-card  card-green" style="height: 320px;margin-top: 20px">-->
<!--                    <div slot="header" class="clearfix">-->
<!--                        <span>材料信息</span>-->
<!--                    </div>-->
<!--                    <div>-->
<!--                        <template>-->
<!--                            <el-table :data="tubLogs" border size="small" style="width: 100%"-->
<!--                                      :header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"-->
<!--                                      :row-class-name="tableRowClassName">-->
<!--                                &lt;!&ndash;                           <el-table-column prop="code" label="序号"></el-table-column>&ndash;&gt;-->
<!--                                <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-card>-->



            </el-col>
@@ -221,12 +201,20 @@
        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==null ? 0 :(res.data*100).toFixed(0);
            });

            tubLogs();
        });

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