From 8890c3cef398629ac46e5cd331a5e9ea8964e1ab Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 12 六月 2024 17:15:45 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 77 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
index 67711b1..0d09f3b 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html
@@ -77,6 +77,7 @@
</template>
{{project.code}}
</el-descriptions-item>
+
<el-descriptions-item>
<template slot="label">
<i class="el-icon-map-location"></i>
@@ -123,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>
@@ -148,17 +151,20 @@
</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>
</el-card>
</el-col>
+
+
+
</el-row>
<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>
@@ -178,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">-->
-<!-- <!– <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-card>-->
-
</el-col>
@@ -217,12 +203,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();
});
@@ -260,7 +254,11 @@
emphasis: {
focus: 'series'
},
- data: []
+ data: [],
+ itemStyle: {
+ // 淇敼鏌卞瓙鐨勯鑹�
+ color: '#e2b507'
+ }
},
{
name: '鍏ュ簱',
@@ -269,7 +267,11 @@
emphasis: {
focus: 'series'
},
- data: []
+ data: [],
+ itemStyle: {
+ // 淇敼鏌卞瓙鐨勯鑹�
+ color: '#2992c6'
+ }
},
]
@@ -299,6 +301,7 @@
el: "#app",
data() {
return {
+ holeProcess:"",
project: "",
holeData: [],
tubLogs:[],
--
Gitblit v1.9.1