From 0b0328e15b03cc69d98d26860e060b95e386b637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 1 Jun 2017 23:39:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E5=8A=9F=E8=83=BD=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/pages/manage/app.jsp       | 17 ++++++++++++-----
 src/main/webapp/pages/manage/functions.jsp |  8 ++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/pages/manage/app.jsp b/src/main/webapp/pages/manage/app.jsp
index a1cdb19f0..597a5486b 100644
--- a/src/main/webapp/pages/manage/app.jsp
+++ b/src/main/webapp/pages/manage/app.jsp
@@ -183,14 +183,21 @@
 			          { title: '链接',field: 'URL',width:100},
 			          { title: '宽度',field: 'Width',width:50},
 			          { title: '高度',field: 'Height',width:50},
-			          { title: '拉伸',field: 'ReSize',width:50},
-			          { title: '最大化',field: 'OpenMax',width:50},
-			          { title: 'Flash',field: 'Flash',width:50},
+			          { title: '拉伸',field: 'ReSize',width:50,formatter:function(value){
+						  return value? "开":"关";
+					  }},
+			          { title: '最大化',field: 'OpenMax',width:50,formatter:function(value){
+						  return value? "开":"关";
+					  }},
+			          { title: 'Flash',field: 'Flash',width:50,formatter:function(value){
+						  return value? "开":"关";
+					  }},
 			          { title: '种类',field: 'ZL',width:50},
 			          { title: '排序号',field: 'Sort',width:50},
 			          { title: '备注',field: 'Remark',width:50},
-			          { title: '启用',field: 'Enabled',width:50},
-			          
+			          { title: '启用',field: 'Enabled',width:50,formatter:function(value){
+						  return value? "开":"关";
+					  }},
 			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
 			         	{
 							var str = '';
diff --git a/src/main/webapp/pages/manage/functions.jsp b/src/main/webapp/pages/manage/functions.jsp
index 118c248f0..29c61394f 100644
--- a/src/main/webapp/pages/manage/functions.jsp
+++ b/src/main/webapp/pages/manage/functions.jsp
@@ -155,8 +155,12 @@
 			          { title: '上级编号',field: 'PNumber',width:60},
 			          { title: '链接',field: 'URL',width:120},
 			          { title: '排序',field: 'Sort',width:50},
-			          { title: '收缩',field: 'State',width:50},
-			          { title: '启用',field: 'Enabled',width:50},
+			          { title: '收缩',field: 'State',width:50,formatter:function(value){
+						  return value? "开":"关";
+					  }},
+			          { title: '启用',field: 'Enabled',width:50,formatter:function(value){
+						  return value? "开":"关";
+					  }},
 			          { title: '类型',field: 'Type',width:50},
 			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
 			         	{