From 4640dc7ce69ed3ca79b84ad739750c35e7e7be5e Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 17:17:05 +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 | 184 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 171 insertions(+), 13 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 b8aa1a6..15c7106 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
@@ -13,8 +13,11 @@
height: 100%;
}
.el-card__header{
- height: 40px;
- padding: 8px 20px;
+ height: 55px;
+ padding: 18px 20px;
+ color: #FFFFFF;
+ font-weight: 500;
+ font-size: 14px;
}
#app {
height: 100%;
@@ -24,13 +27,37 @@
width: 180px !important;
height: 180px !important;
}
+ .card1{
+ height: 320px;margin-right: 20px;
+ }
+ .card-blue .el-card__header{
+ height: 40px;
+ padding: 8px 20px;
+ background: #1894F6;
+ }
+ .card-yellow .el-card__header{
+ height: 40px;
+ padding: 8px 20px;
+ background: #F7931E;
+ }
+ .card-red .el-card__header{
+ height: 40px;
+ padding: 8px 20px;
+ background: #FF0000;
+ }
+ .card-green .el-card__header{
+ height: 40px;
+ padding: 8px 20px;
+ background: #67C23A;
+ }
+
</style>
</head>
<body>
<div id="app" v-cloak>
<el-row style="height: 200px;">
<el-col :span="8">
- <el-card class="box-card" style="height: 320px;">
+ <el-card class="box-card card-blue" style="height: 320px;margin-right: 20px;">
<div slot="header" class="clearfix">
<span>鍦哄湴绠�浠�</span>
</div>
@@ -50,6 +77,7 @@
</template>
{{project.code}}
</el-descriptions-item>
+
<el-descriptions-item>
<template slot="label">
<i class="el-icon-map-location"></i>
@@ -92,9 +120,9 @@
</el-col>
<el-col :span="10" >
- <el-card class="box-card" style="height: 320px;">
+ <el-card class="box-card card-yellow" 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%">
@@ -115,27 +143,82 @@
</el-col>
<el-col :span="6" >
- <el-card class="box-card" style="height: 320px;">
+ <el-card class="box-card card-red" style="height: 320px;">
<div slot="header" class="clearfix">
- <span>鍦哄湴杩涘害</span>
+ <span>鍦哄湴杩涘害(%)</span>
</div>
- <div style="">
- <el-progress type="dashboard" :percentage="50">
- </el-progress>
+ <div>
+ <div style="padding-left: 20%;">
+ <el-progress type="dashboard" color="#FF0000" :percentage="50">
+ </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">
+ <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%"
+ :header-cell-style="{color: '#4D4D4D',background: '#F7931E',fontWeight: '400'}"
+ :row-class-name="tableRowClassName">
+ <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>
+ </el-col>
+ <el-col :span="14" style="height: 320px;">
+ <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>
+
</el-row>
</div>
<th:block th:include="include :: footer" />
+ <script th:src="@{/ajax/libs/report/echarts/echarts-all.js}"></script>
<script th:inline="javascript">
var project =[[${project}]];
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;
@@ -144,10 +227,77 @@
vm.holeData = res.data;
});
vm.project = project;
-
- console.log(vm.project);
- console.log(vm.holeData);
+ tubLogs();
});
+
+ function tubLogs() {
+ const chart = echarts.init(document.getElementById("column-chart"));
+ const option = {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ legend: {},
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ xAxis: [
+ {
+ type: 'category',
+ data: []
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ name: '鍑哄簱',
+ type: 'bar',
+ emphasis: {
+ focus: 'series'
+ },
+ data: []
+ },
+ {
+ name: '鍏ュ簱',
+ type: 'bar',
+ stack: 'Ad',
+ emphasis: {
+ focus: 'series'
+ },
+ data: []
+ },
+
+ ]
+ };
+
+ let url = prefix2 + "/countTubLogDate/" + projectId;
+ $.ajaxSettings.async = false;
+ $.get(url,{},function(res){
+ vm.tubLogs = res.data;
+
+ res.data.forEach(function(value, index, array) {
+ const tubName = value.tubName;
+ const inboundNumber = value.inboundNumber;
+ const outboundNumber = value.outboundNumber;
+ const unit = value.unit;
+ option.xAxis[0].data[index] = tubName;
+ option.series[0].data[index] = outboundNumber;
+ option.series[1].data[index] = inboundNumber;
+ });
+ chart.setOption(option, true);
+
+ })
+ $.ajaxSettings.async = false;
+ }
var vm = new Vue({
el: "#app",
@@ -155,9 +305,17 @@
return {
project: "",
holeData: [],
+ tubLogs:[],
};
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "";
+ } else {
+ return "warning-row";
+ }
+ },
}
});
--
Gitblit v1.9.1