From 5e697a70c7e49e18bc3bc2f75c2e9ad5bda17489 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 15:40:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html | 85 +++++++++---------------------------------
1 files changed, 19 insertions(+), 66 deletions(-)
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 b9be8f5..81b12f8 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
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
- <th:block th:include="include :: header('椤圭洰鍒楄〃')" />
+ <th:block th:include="include :: header('鍦哄湴鍒楄〃')" />
</head>
<body class="gray-bg">
<div class="container-div">
@@ -12,8 +12,12 @@
<ul>
<li>
- <p>椤圭洰鍚嶇О锛�</p>
+ <p>鍦哄湴鍚嶇О锛�</p>
<input type="text" name="fullName"/>
+ </li>
+ <li>
+ <p>鍦哄湴缂栧彿锛�</p>
+ <input type="text" name="code"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 鎼滅储</a>
@@ -25,9 +29,9 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
-<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:project:add">-->
-<!-- <i class="fa fa-plus"></i> 娣诲姞-->
-<!-- </a>-->
+ <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:project:add">
+ <i class="fa fa-plus"></i> 娣诲姞
+ </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="geo:project:edit">
<i class="fa fa-edit"></i> 淇敼
</a>
@@ -53,21 +57,22 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
- modalName: "椤圭洰",
+ modalName: "鍦哄湴",
columns: [{
checkbox: true
},
{
+ field : 'code',
+ title : '鍦哄湴缂栧彿',
+ sortable:true
+ },
+ {
field : 'fullName',
- title : '椤圭洰鍚嶇О',
+ title : '鍦哄湴鍚嶇О',
formatter: function(value, row, index) {
return '<a onclick="navigate(\'' + row.ids + '\')">'+row.fullName+'</a>'
},
sortable:true
- },
- {
- field : 'companyName',
- title : '鍕樺療鍗曚綅'
},
{
field : 'laborUnit',
@@ -76,58 +81,10 @@
{
field : 'district',
title : '鍖哄幙',
- formatter: function(value, row, index) {
- if(row.district === 1){
- return "涓滃煄鍖�";
- }else if(row.district === 17){
- return "瀵嗕簯鍘�";
- }else if(row.district === 16){
- return "骞宠胺鍖�";
- }else if(row.district === 15){
- return "鎬�鏌斿尯";
- }else if(row.district === 14){
- return "澶у叴鍖�";
- }else if(row.district === 13){
- return "鏄屽钩鍖�";
- }else if(row.district === 12){
- return "椤轰箟鍖�";
- }else if(row.district === 11){
- return "閫氬窞鍖�";
- }else if(row.district === 10){
- return "鎴垮北鍖�";
- }else if(row.district === 9){
- return "闂ㄥご娌熷尯";
- }else if(row.district === 8){
- return "娴锋穩鍖�";
- }else if(row.district === 7){
- return "鐭虫櫙灞卞尯";
- }else if(row.district === 6){
- return "涓板彴鍖�";
- }else if(row.district === 5){
- return "鏈濋槼鍖�";
- }else if(row.district === 4){
- return "瀹ｆ鍖�";
- }else if(row.district === 3){
- return "宕囨枃鍖�";
- }else if(row.district === 2){
- return "瑗垮煄鍖�";
- }else if(row.district === 18){
- return "寤跺簡鍘�";
- }else if(row.district === 99){
- return "澶栧煚";
- }else {
- return "";
- }
- }
},
- {
- field : 'owner',
- title : '涓氫富鍚嶇О'
- },
-
{
field : 'leaderName',
- title : '椤圭洰璐熻矗浜�'
+ title : '鍦哄湴璐熻矗浜�'
},
{
field : 'createTime',
@@ -135,7 +92,7 @@
},
{
field : 'status',
- title : '椤圭洰鐘舵��',
+ title : '鍦哄湴鐘舵��',
formatter: function(value, row, index) {
if(row.status =='0'){
return "鏈獙鏀�";
@@ -143,10 +100,6 @@
return "楠屾敹";
}
}
- },
- {
- field : 'dataSource',
- title : '鏁版嵁鏉ユ簮'
},
{
title: '鎿嶄綔',
@@ -165,7 +118,7 @@
function navigate(id){
- $.modal.openTab("椤圭洰瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
+ $.modal.openTab("鍦哄湴瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
}
</script>
</body>
--
Gitblit v1.9.1