From 41750848c6cc6506fa107036d04b28c0f28cfba8 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 03 七月 2024 16:19:07 +0800
Subject: [PATCH] 提交
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 120 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 46 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..567316f 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
@@ -55,7 +55,7 @@
</head>
<body>
<div id="app" v-cloak>
- <el-row style="height: 200px;">
+ <el-row>
<el-col :span="8">
<el-card class="box-card card-blue" style="height: 320px;margin-right: 20px;">
<div slot="header" class="clearfix">
@@ -98,7 +98,7 @@
<i class="el-icon-user"></i>
璐熻矗浜猴細
</template>
- {{project.leaderName}}
+ {{project.leader}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
@@ -120,25 +120,18 @@
</el-col>
<el-col :span="10" >
- <el-card class="box-card card-yellow" style="height: 320px;margin-right: 20px;">
+ <el-card class="box-card card-blue" style="height: 320px;margin-right: 20px;">
<div slot="header" class="clearfix">
- <span>閽诲瓟杩涘害</span>
+ <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>
-
- </el-table>
- </template>
-
+ <div>
+ <el-image :src="src"
+ :preview-src-list="srcList">
+ <div slot="placeholder" class="image-slot">
+ 鍔犺浇涓�<span class="dot">...</span>
+ </div>
+ </el-image>
+ </div>
</el-card>
</el-col>
@@ -149,26 +142,52 @@
</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="margin-top: 10px;">
+ <el-col :span="24" >
+ <el-card class="box-card card-blue" style="height: 400px;">
+ <div slot="header" class="clearfix">
+ <span>閽诲瓟杩涘害</span>
+ </div>
+ <div style="height: 320px;">
+ <template>
+ <el-table :data="holeData" size="small" style="width: 99%" height="320">
+ <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>
+
+ </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-row>
+ <el-col :span="24">
+ <el-card class="box-card card-blue" style="height: 320px;margin-top: 20px">
<div slot="header" class="clearfix">
<span>鏉愭枡缁熻</span>
</div>
<el-col :span="10" style="height: 320px;">
<template>
- <el-table :data="tubLogs" border size="small" style="width: 100%"
+ <el-table :data="tubLogs" border size="small" style="width: 99%"
:header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
:row-class-name="tableRowClassName">
<el-table-column prop="tubName" label="鍚嶇О"></el-table-column>
@@ -182,26 +201,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>
@@ -215,18 +214,36 @@
<script th:inline="javascript">
var project =[[${project}]];
+
+ var winURL = window.location.protocol + "//" + window.location.host + "/bjfw/profile";
+ console.log(winURL)
+
+ var projectUrl = winURL + project.url;
+ var arrayImg= new Array();
+ arrayImg.push(projectUrl);
+
var projectId=[[${projectId}]];
var statusDatas = [[${@dict.getType('hole_status')}]];
var prefix = ctx + "geo/hole";
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);
+ });
+
+ vm.src = projectUrl;
+ vm.srcList = arrayImg;
tubLogs();
});
@@ -264,7 +281,11 @@
emphasis: {
focus: 'series'
},
- data: []
+ data: [],
+ itemStyle: {
+ // 淇敼鏌卞瓙鐨勯鑹�
+ color: '#e2b507'
+ }
},
{
name: '鍏ュ簱',
@@ -273,7 +294,11 @@
emphasis: {
focus: 'series'
},
- data: []
+ data: [],
+ itemStyle: {
+ // 淇敼鏌卞瓙鐨勯鑹�
+ color: '#2992c6'
+ }
},
]
@@ -303,9 +328,12 @@
el: "#app",
data() {
return {
+ holeProcess:"",
project: "",
holeData: [],
tubLogs:[],
+ src:"",
+ srcList:[],
};
},
methods: {
--
Gitblit v1.9.1