From b2ce4cf46bda0570ad91636fab8760694cf0b3f0 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 28 五月 2024 18:47:58 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html | 25 ++-----------------------
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 5 +++--
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html | 6 +-----
3 files changed, 6 insertions(+), 30 deletions(-)
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 289da23..17d1299 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -219,7 +219,7 @@
<!-- <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
</span>
<span style="color:rgba(0,0,0,.87);font-size: 15px;">
- 鏈畨瑁� <span style="float: right">68</span>
+ 鏈畨瑁� <span style="float: right">{{indexDataCount.cameraCountNaN}}</span>
<!-- <li class="el-icon-caret-bottom" style="color: #409eff">-->
</span>
</div>
@@ -294,7 +294,7 @@
<el-card class="box-card">
<div style="height: 200px;width: 100%">
<div style="width: 100%;height: 20px;">
- <h3>椤圭洰鎬讳綋杩涘害2(%)</h3>
+ <h3>椤圭洰鎬讳綋杩涘害(%)</h3>
</div>
<div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
</div>
@@ -455,6 +455,7 @@
$.ajaxSettings.async = false;
$.get(url,{},function(res){
vm.indexDataCount = res.data;
+ vm.indexDataCount.cameraCountNaN = 68 -vm.indexDataCount.cameraCount;
})
$.ajaxSettings.async = false;
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 aa84e43..1b70522 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
@@ -162,7 +162,7 @@
<el-row style="height: 200px;">
<el-col :span="24">
- <el-card class="box-card card-green" style="height: 320px;margin-top: 20px">
+ <el-card class="box-card card-yellow" style="height: 320px;margin-top: 20px">
<div slot="header" class="clearfix">
<span>鏉愭枡缁熻</span>
</div>
@@ -182,26 +182,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>
@@ -232,8 +212,7 @@
var url2 = prefix + "/holeProcess?projectId=" + projectId;
$.ajaxSettings.async = false;
$.get(url2,{},function(res){
- vm.holeProcess = (res.data*100).toFixed(0);
- alert(vm.holeProcess);
+ vm.holeProcess = res.data==null ? 0 :(res.data*100).toFixed(0);
});
tubLogs();
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
index 0293f9e..36e1a40 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
@@ -101,13 +101,9 @@
field : 'leader',
title : '鍦哄湴璐熻矗浜�'
},
- {
- field : 'createTime',
- title : '鍒涘缓鏃堕棿'
- },
{
field : 'status',
- title : '椤圭洰鐘舵��',
+ title : '鍦哄湴鐘舵��',
formatter: function(value, row, index) {
return $.table.selectDictLabel(statusDatas, value);
}
--
Gitblit v1.9.1