From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 70 +++--------------------------------
1 files changed, 6 insertions(+), 64 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index f6ed3b6..c672429 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
@@ -15,76 +15,18 @@
return [
{field: 'selectItem', radio: true},
{title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: language==1?'添加时间':(language==2?'Add Time':'Tambahkan waktu'), field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'20%',
- formatter: function (value, row) {
- var btn = "";
- if(row.insertTime != '' && row.insertTime != null) {
- var time = row.insertTime.replace(" ",'<br>');
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.insertTime + '" onfocus="TUser.tooltip()">' + row.insertTime + '</p>']
- }
- return btn;
- }
+ {title: '省', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'20%',
},
- {title: '站点名称', field: 'name', visible: true, align: 'center', valign: 'middle',
- formatter: function (value, row) {
- var btn = "";
- if(row.name != '' && row.name != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
- }
- return btn;
- }
+ {title: '市', field: 'name', visible: true, align: 'center', valign: 'middle',
},
- {title: '添加人ID', field: 'insertUserId', visible: false, align: 'center', valign: 'middle'},
- {title: '创建者', field: 'insertUser', visible: true, align: 'center', valign: 'middle',
- formatter: function (value, row) {
- var btn = "";
- if(row.insertUser != '' && row.insertUser != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.insertUser + '" onfocus="TUser.tooltip()">' + row.insertUser + '</p>']
- }
- return btn;
- }
+ {title: '门店名称', field: 'insertUserId', visible: false, align: 'center', valign: 'middle'},
+ {title: '场地类型', field: 'insertUser', visible: true, align: 'center', valign: 'middle',
},
- {title: '所属城市', field: 'province', visible: true, align: 'center', valign: 'middle',
- formatter: function (value, row) {
- var btn = "";
- if(row.province != '' && row.province != null) {
- var str = "";
- if ("" != row.province && undefined != row.province){
- str = str + row.province+"-";
- }
- if ("" != row.city && undefined != row.city){
- str = str + row.city+"-";
- }
- if ("" != row.district && undefined != row.district){
- str = str + row.district+"-";
- }
- str = str.substring(0,str.length-1);
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="'+ str +'" onfocus="TUser.tooltip()">' + str + '</p>']
- }
- return btn;
- }
+ {title: '场地名称', field: 'province', visible: true, align: 'center', valign: 'middle',
},
- {title: '关联线路', field: 'lineNum', visible: true, align: 'center', valign: 'middle',
- formatter: function (value, row) {
- var btn = "";
- if(row.lineNum != '' && row.lineNum != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.lineNum + '" onfocus="TUser.tooltip()">' + row.lineNum + '</p>']
- }
- return btn;
- }
+ {title: '场地责任险有效期', field: 'lineNum', visible: true, align: 'center', valign: 'middle',
},
{title: language==1?'状态':(language==2?'State':'Status'), field: 'state', visible: true, align: 'center', valign: 'middle',
- formatter: function (value, row) {
- var btn = "";
- if(row.state != '' && row.state != null) {
- if(row.state == 1){
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="正常" onfocus="TUser.tooltip()">正常</p>']
- }else if(row.state == 2){
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: red;" title="冻结" onfocus="TUser.tooltip()">冻结</p>']
- }
- }
- return btn;
- }
}
];
};
--
Gitblit v1.7.1