From 3f1889e77f861a8284770c85bdd83204f6863f39 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 18:07:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 15c7106..aa84e43 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
@@ -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:[],
--
Gitblit v1.9.1