From a1f05ddf1901ef80cb10cff9af57f457c99121c6 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 03 七月 2024 17:25:03 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 2 +-
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html | 30 +++++++++++++++---------------
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml | 18 +++++++++---------
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 4 ++--
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
index 2222f77..be620f2 100644
--- a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
+++ b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
@@ -166,7 +166,7 @@
public AjaxResult totalProcess() {
AjaxResult ajaxResult = AjaxResult.success();
Hole hole = holeService.selectHoleTotalProcess();
- Double data = Arith.div(hole.getFootageCpl(), hole.getFootage(), 2);
+ Double data = Arith.div(hole.getFootageCpl(), hole.getFootage(), 4);
ajaxResult.put("pointerData", data);
return ajaxResult;
}
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
index 3a25567..bb1dc48 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -176,7 +176,7 @@
<div style="flex:4;padding-right: 20px;">
<div>
<li class="el-icon-coin" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #085abe"></li>
- <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">閽诲瓟杩涘昂</span>
+ <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">閽诲瓟鏁伴噺</span>
</div>
<div style="text-align: center">
<span style="color:#1894F6;font-size: 30px;word-break: break-all;line-height: 70px;">647
@@ -639,7 +639,7 @@
$.ajaxSettings.async = false;
$.get(url,{},function(res){
pointerData = res.pointerData;
- pointerData = (pointerData*100).toFixed(0);
+ pointerData = (pointerData*100).toFixed(2);
});
$.ajaxSettings.async = false;
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml
index e4801e7..c2f2a92 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml
@@ -65,16 +65,16 @@
</select>
<select id="countTubLogDate" resultMap="TubLogResult">
- SELECT
- a.project_id,
- a.tub_name,
- b.inbound_number,
- a.outbound_number,
- a.unit
+ SELECT
+ a.project_id,
+ a.tub_name,
+ a.inbound_number,
+ b.outbound_number,
+ a.unit
FROM
- ( SELECT project_id, tub_name, SUM( number ) AS outbound_number, unit FROM js_tub_log WHERE outbound_date IS NOT NULL GROUP BY tub_name ) a
- LEFT JOIN ( SELECT project_id, tub_name, SUM( number ) AS inbound_number, unit FROM js_tub_log WHERE inbound_date IS NOT NULL GROUP BY tub_name ) b ON a.tub_name = b.tub_name
- AND a.project_id = b.project_id
+ ( SELECT project_id, tub_name, SUM( number ) AS inbound_number, unit FROM js_tub_log WHERE inbound_date IS NOT NULL GROUP BY tub_name ) a
+ LEFT JOIN ( SELECT project_id, tub_name, SUM( number ) AS outbound_number, unit FROM js_tub_log WHERE outbound_date IS NOT NULL GROUP BY tub_name ) b ON a.tub_name = b.tub_name
+ AND a.project_id = b.project_id
<where>
<if test="projectId != null and projectId != ''"> and a.project_id = #{projectId}</if>
</where>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
index d1e4b5b..98cd77c 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
@@ -47,21 +47,21 @@
<i class="glyphicon glyphicon-retweet"></i> <a class="afont" th:href="@{/geo/deviceLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">璁惧绠＄悊</a>
</div>
</div>
-<!-- <div class="box-header ">-->
-<!-- <div class="box-title">-->
-<!-- <i class="glyphicon glyphicon-random"></i> <a class="afont" th:href="@{/geo/TubLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鏉愭枡绠＄悊</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="box-header ">-->
-<!-- <div class="box-title">-->
-<!-- <i class="glyphicon glyphicon-object-align-horizontal"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='1')}" target="mainFrame" onclick="selected(this)">璐ㄩ噺绠＄悊</a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="box-header ">-->
-<!-- <div class="box-title">-->
-<!-- <i class="glyphicon glyphicon-lock"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='2')}" target="mainFrame" onclick="selected(this)">瀹夊叏绠＄悊</a>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="box-header ">
+ <div class="box-title">
+ <i class="glyphicon glyphicon-random"></i> <a class="afont" th:href="@{/geo/TubLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鏉愭枡绠＄悊</a>
+ </div>
+ </div>
+ <div class="box-header ">
+ <div class="box-title">
+ <i class="glyphicon glyphicon-object-align-horizontal"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='1')}" target="mainFrame" onclick="selected(this)">璐ㄩ噺绠＄悊</a>
+ </div>
+ </div>
+ <div class="box-header ">
+ <div class="box-title">
+ <i class="glyphicon glyphicon-lock"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='2')}" target="mainFrame" onclick="selected(this)">瀹夊叏绠＄悊</a>
+ </div>
+ </div>
<div class="box-header ">
<div class="box-title">
<i class="glyphicon glyphicon-th-list"></i> <a class="afont" th:href="@{/geo/projectData/2(id=${project.ids},type='3')}" target="mainFrame" onclick="selected(this)">鏂藉伐鐜板満绠＄悊</a>
--
Gitblit v1.9.1