提交代码

zmk

2024-06-12 8890c3cef398629ac46e5cd331a5e9ea8964e1ab

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

@@ -124,21 +124,23 @@
                    <div slot="header" class="clearfix">
                        <span>钻孔进度</span>
                    </div>
                    <template>
                        <el-table :data="holeData" size="small" style="width: 100%">
                            <el-table-column prop="code" label="编号"></el-table-column>
                            <el-table-column prop="type" label="类型"></el-table-column>
                            <el-table-column prop="footage" label="总进尺(m)"></el-table-column>
                            <el-table-column prop="footageCpl" label="已完成(m)"></el-table-column>
                            <el-table-column label="进度(%)">
                                <template slot-scope="scope">
                                    <el-progress  :percentage=(scope.row.rate*100).toFixed(0) ></el-progress>
                                </template>
                            </el-table-column>
                    <div style="height: 250px;">
                        <template>
                            <el-table :data="holeData" size="small" style="width: 100%" height="250">
                                <el-table-column prop="code" label="编号"></el-table-column>
                                <el-table-column prop="type" label="类型"></el-table-column>
                                <el-table-column prop="footage" label="总进尺(m)"></el-table-column>
                                <el-table-column prop="footageCpl" label="已完成(m)"></el-table-column>
                                <el-table-column label="进度(%)">
                                    <template slot-scope="scope">
                                        <el-progress  :percentage=(scope.row.rate*100).toFixed(0) ></el-progress>
                                    </template>
                                </el-table-column>

                        </el-table>
                    </template>
                            </el-table>
                        </template>

                    </div>
                </el-card>
            </el-col>

@@ -162,7 +164,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 +184,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>
@@ -232,8 +214,7 @@
            var url2 = prefix + "/holeProcess?projectId=" + projectId;
            $.ajaxSettings.async = false;
            $.get(url2,{},function(res){
                vm.holeProcess = (res.data*100).toFixed(0);
                alert(vm.holeProcess);
                vm.holeProcess = res.data==null ? 0 :(res.data*100).toFixed(0);
            });

            tubLogs();