From 880c8f54cddc8533f00f674da3f14c2cf0d34340 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 25 六月 2024 17:58:17 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 73 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 21 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 1b70522..c2cb4dc 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
@@ -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>
@@ -156,19 +149,45 @@
</el-card>
</el-col>
+ </el-row>
+ <el-row style="height: 200px;">
+ <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>
+ <div style="height: 250px;">
+ <template>
+ <el-table :data="holeData" size="small" style="width: 99%" 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>
+
+ </div>
+ </el-card>
+ </el-col>
</el-row>
+
<el-row style="height: 200px;">
<el-col :span="24">
-
- <el-card class="box-card card-yellow" style="height: 320px;margin-top: 20px">
+ <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>
@@ -195,6 +214,14 @@
<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";
@@ -215,6 +242,8 @@
vm.holeProcess = res.data==null ? 0 :(res.data*100).toFixed(0);
});
+ vm.src = projectUrl;
+ vm.srcList = arrayImg;
tubLogs();
});
@@ -303,6 +332,8 @@
project: "",
holeData: [],
tubLogs:[],
+ src:"",
+ srcList:[],
};
},
methods: {
--
Gitblit v1.9.1