From e27f9d475c8732b64dbc863640e25d5253d707f1 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期五, 24 五月 2024 10:45:07 +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 | 230 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 148 insertions(+), 82 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 cf01935..b8aa1a6 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
@@ -2,103 +2,169 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('鍩烘湰淇℃伅')" />
- <th:block th:include="include :: datetimepicker-css" />
+<!-- <link th:href="@{/js/elementUI/index.css}" rel="stylesheet" />-->
+ <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+ <script th:src="@{/js/jquery.min.js}"></script>
+ <script th:src="@{/js/vue.min.js}"></script>
+<!-- <script th:src="@{/js/elementUI/index.js}"></script>-->
+ <script src="https://unpkg.com/element-ui/lib/index.js"></script>
<style type="text/css">
- * {
- padding: 0px;
- margin: 0px;
- box-sizing: border-box;
- user-select: none;
- }
-
- html,
body {
height: 100%;
}
-
- #container {
+ .el-card__header{
+ height: 40px;
+ padding: 8px 20px;
+ }
+ #app {
height: 100%;
padding: 20px;
}
-
- .basic-info {
- border-collapse: collapse;
- width: 100%;
-
- }
-
- .basic-info td {
- border: 1px solid #8080807a;
- padding: 8px 0px 8px 5px;
- }
-
- .project-name{
- font-size: 16px;
- }
-
- .map-model{
- margin-top: 10px;
- text-align: right;
- }
-
- .map-model button{
- background-color: rgb(66,139,202);
- height: 30px;
- line-height: 30px;
- color: white;
- padding: 0px 10px;
- border-width: 0px;
- border-radius: 3px;
+ .el-progress-circle{
+ width: 180px !important;
+ height: 180px !important;
}
</style>
</head>
-<body class="white-bg">
- <div id="container">
- <p class="project-name">
- <span class="name-label">鍦哄湴鍚嶇О锛�</span>
- <span class="name-val" th:text="${project.fullName}"></span>
- </p>
- <table class="basic-info">
- <tr>
- <td>寤鸿鍗曚綅锛�</td>
- <td colspan="3" th:text="${project.companyName}"></td>
- <td>鍔冲姟鍗曚綅锛�</td>
- <td colspan="3" th:text="${project.laborUnit}"></td>
- </tr>
- <tr>
- <td>寤鸿鍦扮偣锛�</td>
- <td colspan="7" th:text="${project.address}"></td>
- </tr>
- <tr>
- <td>鍦哄湴鍚嶇О锛�</td>
- <td colspan="5" th:text="${project.fullName}"></td>
- <td>鍦哄湴缂栧彿锛�</td>
- <td th:text="${project.code}"></td>
- </tr>
- <tr>
- <td>閽诲瓟涓暟锛�</td>
- <td th:text="${project.holeNum}"></td>
- <td>寮�濮嬫椂闂达細</td>
- <td th:text="${#dates.format(project.createTime,'yyyy-MM-dd')}"></td>
- <td>缁堟鏃堕棿锛�</td>
- <td th:text="${#dates.format(project.endTime,'yyyy-MM-dd')}"></td>
- <td>璐熻矗浜猴細</td>
- <td th:text="${project.leaderName}"></td>
- </tr>
- </table>
-<!-- <div class="map-model">-->
-<!-- <button onclick="map()" type="button">鍦板浘妯″紡</button>-->
-<!-- </div>-->
+<body>
+ <div id="app" v-cloak>
+ <el-row style="height: 200px;">
+ <el-col :span="8">
+ <el-card class="box-card" style="height: 320px;">
+ <div slot="header" class="clearfix">
+ <span>鍦哄湴绠�浠�</span>
+ </div>
+ <el-descriptions class="margin-top" title="" :column="1" size="small" border>
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-s-tools"></i>
+ 椤圭洰鍚嶇О
+ </template>
+ {{project.fullName}}
+ </el-descriptions-item>
+
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-menu"></i>
+ 鍦哄湴缂栧彿
+ </template>
+ {{project.code}}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-map-location"></i>
+ 鎵�鍦ㄥ尯鍩�
+ </template>
+ {{project.district}}
+ </el-descriptions-item>
+
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-location"></i>
+ 鍦哄湴浣嶇疆
+ </template>
+ {{project.address}}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-user"></i>
+ 璐熻矗浜猴細
+ </template>
+ {{project.leaderName}}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-s-operation"></i>
+ 褰撳墠杩涘害
+ </template>
+ {{project.rate}}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-price-tag"></i>
+ 鍔冲姟鍗曚綅
+ </template>
+ {{project.laborUnit}}
+ </el-descriptions-item>
+
+ </el-descriptions>
+ </el-card>
+ </el-col>
+
+ <el-col :span="10" >
+ <el-card class="box-card" style="height: 320px;">
+ <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>
+
+ </el-table>
+ </template>
+
+ </el-card>
+ </el-col>
+
+ <el-col :span="6" >
+ <el-card class="box-card" style="height: 320px;">
+ <div slot="header" class="clearfix">
+ <span>鍦哄湴杩涘害</span>
+ </div>
+ <div style="">
+ <el-progress type="dashboard" :percentage="50">
+ </el-progress>
+ </div>
+ </el-card>
+ </el-col>
+ </el-row>
</div>
+
+
<th:block th:include="include :: footer" />
- <th:block th:include="include :: datetimepicker-js" />
-
+
<script th:inline="javascript">
var project =[[${project}]];
+ var projectId=[[${projectId}]];
+ var statusDatas = [[${@dict.getType('hole_status')}]];
+ var prefix = ctx + "geo/hole";
- function map(){
- parent.$.modal.openTab("椤圭洰鍦板浘",ctx+"/geo/projectwork/map?id=" + project.ids);
- }
+ $(function() {
+ var url = prefix + "/holelist?projectId=" + projectId;
+ $.ajaxSettings.async = false;
+ $.get(url,{},function(res){
+ vm.holeData = res.data;
+ });
+ vm.project = project;
+
+ console.log(vm.project);
+ console.log(vm.holeData);
+ });
+
+ var vm = new Vue({
+ el: "#app",
+ data() {
+ return {
+ project: "",
+ holeData: [],
+ };
+ },
+ methods: {
+ }
+ });
+
+ //
+ // function map(){
+ // parent.$.modal.openTab("椤圭洰鍦板浘",ctx+"/geo/projectwork/map?id=" + project.ids);
+ // }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1