From b2ce4cf46bda0570ad91636fab8760694cf0b3f0 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 18:47:58 +0800
Subject: [PATCH] 提交代码

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html |   49 +++++++++++++++++++++++++------------------------
 1 files changed, 25 insertions(+), 24 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..1b70522 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>
@@ -148,17 +149,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 +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>
@@ -217,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();
         });
 
@@ -260,7 +252,11 @@
                         emphasis: {
                             focus: 'series'
                         },
-                        data: []
+                        data: [],
+                        itemStyle: {
+                            // 淇敼鏌卞瓙鐨勯鑹�
+                            color: '#e2b507'
+                        }
                     },
                     {
                         name: '鍏ュ簱',
@@ -269,7 +265,11 @@
                         emphasis: {
                             focus: 'series'
                         },
-                        data: []
+                        data: [],
+                        itemStyle: {
+                            // 淇敼鏌卞瓙鐨勯鑹�
+                            color: '#2992c6'
+                        }
                     },
 
                 ]
@@ -299,6 +299,7 @@
             el: "#app",
             data() {
                 return {
+                    holeProcess:"",
                     project: "",
                     holeData: [],
                     tubLogs:[],

--
Gitblit v1.9.1