优化

.classpath

@@ -13,17 +13,18 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

.gitignore

@@ -15,3 +15,4 @@ hs_err_pid*
 /target/
 .idea/
 *.iml
+.settings/

.project

@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -15,9 +20,17 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,11 @@
 eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/java/com/ylcm/sys/controller/PermissionController.java=UTF-8
+encoding//src/main/java/com/ylcm/sys/controller/RoleController.java=UTF-8
+encoding//src/main/java/com/ylcm/sys/controller/UserController.java=UTF-8
+encoding//src/main/resource=UTF-8
+encoding//src/main/resource/env/dev=UTF-8
 encoding//src/main/resource/env/dev/application.properties=UTF-8
 encoding//src/main/resource/env/dev/config.properties=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8

src/main/webapp/WEB-INF/jsp/admedia/index.jsp

@@ -8,13 +8,14 @@
 <div class="screen main">
     <%@ include file="../common/left.jsp" %>
     <div class="main-content">
-        <div class="btn-radius">媒体管理</div>
-        <form name="dataForm" action="export.do" method="post">
+        <div class="main-title">媒体管理</div>
+        <form name="dataForm" class="search-form" action="export.do" method="post">
         <div class="search-group">
             <input type="hidden" name="download" value="1" />
-            <div class="search-item">媒体名称：<input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="11" /></div>
+            <div class="search-item"><div class="label">媒体名称：</div><input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="11" /></div>
             <div class="search-item">
-	            <div class="select {width:120}"> 媒体等级：
+                <div class="label">媒体等级：</div>
+	            <div class="select {width:120}"> 
 	                    <select id="rank" name="rank">
 	                        <option value="">媒体等级</option>
 	                        <option value="0">央视频道</option>
@@ -29,49 +30,51 @@
 	            </div>
             </div>
             <div class="search-item">
-                <a href="javascript:void(0);" onclick="getList(1)" class="btn-radius">搜 索</a>
+                <a href="javascript:void(0);" onclick="getList(1)" class="search-btn">查 询</a>
             </div>
         </div>
         </form>
-        <div class="rFloat buttons">
-            <c:if test="${funcMap['media_add'] eq 1}">
-                <a href="javascript:platformModfiy('add','品牌型号信息');" class="btn">+新增</a>
-            </c:if>
-            <a href="${staticPath}excel/媒体导入模板.xlsx" class="btn">下载模板</a>
-            <c:if test="${funcMap['media_import_excel'] eq 1}">
-                <span class="btn upfile">
-                <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
-                    <span class="webuploader-pick">导入表</span>
-                    <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
-                </form>
-                </span>
-            </c:if>
-            <c:if test="${funcMap['media_import_pic'] eq 1}">
-                <div id="picker" class="btn"></div>
-            </c:if>
-            <c:if test="${funcMap['media_export'] eq 1}">
-                <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+        <div class="table-content">
+            <div class="rFloat buttons">
+                <c:if test="${funcMap['media_add'] eq 1}">
+                    <a href="javascript:platformModfiy('add','品牌型号信息');" class="btn">+新增</a>
+                </c:if>
+                <a href="${staticPath}excel/媒体导入模板.xlsx" class="btn">下载模板</a>
+                <c:if test="${funcMap['media_import_excel'] eq 1}">
+                    <span class="btn upfile">
+                    <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
+                        <span class="webuploader-pick">导入表</span>
+                        <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
+                    </form>
+                    </span>
+                </c:if>
+                <c:if test="${funcMap['media_import_pic'] eq 1}">
+                    <div id="picker" class="btn"></div>
+                </c:if>
+                <c:if test="${funcMap['media_export'] eq 1}">
+                    <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+                </c:if>
+            </div>
+            已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
+            <c:if test="${funcMap['media_all_delete'] eq 1}">
+                <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
             </c:if>
-        </div>
-        已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
-        <c:if test="${funcMap['media_all_delete'] eq 1}">
-            <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
-        </c:if>
-        <table class="table mTop10" cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
-                    <th>媒体名称</th>
-                    <th width="98" class="nop">媒体等级</th>
-                    <th width="198" class="nop">媒体LOGO</th>
-                    <th width="198">操作</th>
-                </tr>
-            </thead>
-            <tbody id="list"></tbody>
-        </table>
-        <div class="mTop20">
-            <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">10</span> 条
+            <table class="table mTop10" cellpadding="0" cellspacing="0">
+                <thead>
+                    <tr>
+                        <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
+                        <th>媒体名称</th>
+                        <th width="98" class="nop">媒体等级</th>
+                        <th width="198" class="nop">媒体LOGO</th>
+                        <th width="198">操作</th>
+                    </tr>
+                </thead>
+                <tbody id="list"></tbody>
+            </table>
+            <div class="mTop20">
+                <div id="page" class="rFloat"></div>
+                累计 <span id="count" class="blue">10</span> 条
+            </div>
         </div>
     </div>
     <div class="clear"></div>

src/main/webapp/WEB-INF/jsp/adplatform/index.jsp

@@ -8,66 +8,70 @@
 <div class="screen main">
     <%@ include file="../common/left.jsp" %>
     <div class="main-content">
-        <div class="btn-radius">栏目管理</div>
-        <form name="dataForm" action="export.do" method="post">
+        <div class="main-title">栏目管理</div>
+        <form name="dataForm" class="search-form" action="export.do" method="post">
         <div class="search-group">
             <input type="hidden" name="download" value="1" />
-            <div class="search-item">栏目名称：<input type="text" id="platformName" name="platformName" class="text {text:'请输入关键字'}" size="11" /></div>
-            <div class="search-item">一级行业：         
+            <div class="search-item"><div class="label">栏目名称：</div><input type="text" id="platformName" name="platformName" class="text {text:'请输入关键字'}" size="11" /></div>
+            <div class="search-item">
+                <div class="label">一级行业：</div>       
 				<select id ="firstInd" name="firstInd">
 					<option value=""></option>
 				</select>
             </div>
-            <div class="search-item">二级行业：          
+            <div class="search-item">
+                <div class="label">二级行业：</div>          
                 <select id="secondInd" name="secondInd">
                     <option value=""></option>
                 </select>
             </div>
             <div class="search-item">
-                <a href="javascript:void(0);" onclick="getList(1)" class="btn-radius">搜 索</a>
+                <a href="javascript:void(0);" onclick="getList(1)" class="search-btn">搜 索</a>
             </div>
         </div>
         </form>
-        <div class="rFloat buttons">
-            <c:if test="${funcMap['platform_add'] eq 1}">
-                <a href="javascript:platformModfiy('add','栏目信息');" class="btn">+新增</a>
-            </c:if>
-            <a href="${staticPath}excel/栏目导入模板.xlsx" class="btn">下载模板</a>
-            <c:if test="${funcMap['platform_import_excel'] eq 1}">
-                <span class="btn upfile">
-                <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
-                    <span class="webuploader-pick">导入表</span>
-                    <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
-                </form>
-                </span>
-            </c:if>
-            <c:if test="${funcMap['platform_import_pic'] eq 1}">
-                <div id="picker" class="btn"></div>
-            </c:if>
-            <c:if test="${funcMap['platform_export'] eq 1}">
-                <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+        <div class="table-content">
+            <div class="rFloat buttons">
+                <c:if test="${funcMap['platform_add'] eq 1}">
+                    <a href="javascript:platformModfiy('add','栏目信息');" class="btn">+新增</a>
+                </c:if>
+                <a href="${staticPath}excel/栏目导入模板.xlsx" class="btn">下载模板</a>
+                <c:if test="${funcMap['platform_import_excel'] eq 1}">
+                    <span class="btn upfile">
+                    <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
+                        <span class="webuploader-pick">导入表</span>
+                        <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
+                    </form>
+                    </span>
+                </c:if>
+                <c:if test="${funcMap['platform_import_pic'] eq 1}">
+                    <div id="picker" class="btn"></div>
+                </c:if>
+                <c:if test="${funcMap['platform_export'] eq 1}">
+                    <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+                </c:if>
+            </div>
+            已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
+            <c:if test="${funcMap['platform_all_delete'] eq 1}">
+                <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
             </c:if>
-        </div>
-        已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
-        <c:if test="${funcMap['platform_all_delete'] eq 1}">
-            <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
-        </c:if>
-        <table class="table mTop10" cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
-                    <th>栏目名称</th>
-                    <th width="198" class="nop">栏目LOGO</th>
-                    <th width="98" class="nop">一级行业</th>
-                    <th width="98" class="nop">二级行业</th>
-                    <th width="198">操作</th>
-                </tr>
-            </thead>
-            <tbody id="list"></tbody>
-        </table>
-        <div class="mTop20">
-            <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">0</span> 条
+            <table class="table mTop10" cellpadding="0" cellspacing="0">
+                <thead>
+                    <tr>
+                        <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
+                        <th>栏目名称</th>
+                        <th width="198" class="nop">栏目LOGO</th>
+                        <th width="98" class="nop">一级行业</th>
+                        <th width="98" class="nop">二级行业</th>
+                        <th width="198">操作</th>
+                    </tr>
+                </thead>
+                <tbody id="list"></tbody>
+            </table>
+            <div class="mTop20">
+                <div id="page" class="rFloat"></div>
+                累计 <span id="count" class="blue">0</span> 条
+            </div>
         </div>
     </div>
     <div class="clear"></div>

src/main/webapp/WEB-INF/jsp/adproduct/index.jsp

@@ -8,68 +8,74 @@
 <div class="screen main">
     <%@ include file="../common/left.jsp" %>
     <div class="main-content">
-        <div class="btn-radius">产品管理</div>
-        <form name="dataForm" action="export.do" method="post">
+        <div class="main-title">产品管理</div>
+        <form name="dataForm" class="search-form" action="export.do" method="post">
         <div class="search-group">
             <input type="hidden" name="download" value="1" />
-            <div class="search-item">产品名称：<input type="text" id="productName" name="productName" class="text {text:'请输入关键字'}" size="11" /></div>
-            <div class="search-item">品牌：<input type="text" id="brandName" name="brandName" class="text {text:'请输入关键字'}" size="11" /></div>
-            <div class="search-item">一级行业：     
+            <div class="search-item"><div class="label">产品名称：</div><input type="text" id="productName" name="productName" class="text {text:'请输入关键字'}" size="11" /></div>
+            <div class="search-item"><div class="label">品牌：</div><input type="text" id="brandName" name="brandName" class="text {text:'请输入关键字'}" size="11" /></div>
+            <div class="search-item">
+                <div class="label">一级行业：</div>     
 				<select id ="firstInd" name="firstInd">
 					<option value=""></option>
 				</select>
             </div>
-            <div class="search-item">二级行业：      
+            <div class="search-item"> 
+                <div class="label">二级行业：</div>     
                 <select id="secondInd" name="secondInd">
                     <option value=""></option>
                 </select>
             </div>
+        </div>
+        <div class="search-group">
             <div class="search-item">
-                <a href="javascript:void(0);" onclick="getList(1)" class="btn-radius">搜 索</a>
+                <a href="javascript:void(0);" onclick="getList(1)" class="search-btn">查 询</a>
             </div>
         </div>
         </form>
-        <div class="rFloat buttons">
-            <c:if test="${funcMap['product_add'] eq 1}">
-                <a href="javascript:platformModfiy('add','产品信息');" class="btn">+新增</a>
-            </c:if>
-            <a href="${staticPath}excel/产品导入模板.xlsx" class="btn">下载模板</a>
-            <c:if test="${funcMap['product_import_excel'] eq 1}">
-                <span class="btn upfile">
-                <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
-                    <span class="webuploader-pick">导入表</span>
-                    <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
-                </form>
-                </span>
-            </c:if>
-            <c:if test="${funcMap['product_import_pic'] eq 1}">
-                <div id="picker" class="btn"></div>
-            </c:if>
-            <c:if test="${funcMap['product_export'] eq 1}">
-                <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+        <div class="table-content">
+            <div class="rFloat buttons">
+                <c:if test="${funcMap['product_add'] eq 1}">
+                    <a href="javascript:platformModfiy('add','产品信息');" class="btn">+新增</a>
+                </c:if>
+                <a href="${staticPath}excel/产品导入模板.xlsx" class="btn">下载模板</a>
+                <c:if test="${funcMap['product_import_excel'] eq 1}">
+                    <span class="btn upfile">
+                    <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
+                        <span class="webuploader-pick">导入表</span>
+                        <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
+                    </form>
+                    </span>
+                </c:if>
+                <c:if test="${funcMap['product_import_pic'] eq 1}">
+                    <div id="picker" class="btn"></div>
+                </c:if>
+                <c:if test="${funcMap['product_export'] eq 1}">
+                    <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+                </c:if>
+            </div>
+            已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
+            <c:if test="${funcMap['product_all_delete'] eq 1}">
+                <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
             </c:if>
-        </div>
-        已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
-        <c:if test="${funcMap['product_all_delete'] eq 1}">
-            <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
-        </c:if>
-        <table class="table mTop10" cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
-                    <th>产品名称</th>
-                    <th width="198" class="nop">产品LOGO</th>
-                    <th width="98" class="nop">所属品牌</th>
-                    <th width="98" class="nop">一级行业</th>
-                    <th width="98" class="nop">二级行业</th>
-                    <th width="198">操作</th>
-                </tr>
-            </thead>
-            <tbody id="list"></tbody>
-        </table>
-        <div class="mTop20">
-            <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">0</span> 条
+            <table class="table mTop10" cellpadding="0" cellspacing="0">
+                <thead>
+                    <tr>
+                        <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
+                        <th>产品名称</th>
+                        <th width="198" class="nop">产品LOGO</th>
+                        <th width="98" class="nop">所属品牌</th>
+                        <th width="98" class="nop">一级行业</th>
+                        <th width="98" class="nop">二级行业</th>
+                        <th width="198">操作</th>
+                    </tr>
+                </thead>
+                <tbody id="list"></tbody>
+            </table>
+            <div class="mTop20">
+                <div id="page" class="rFloat"></div>
+                累计 <span id="count" class="blue">0</span> 条
+            </div>
         </div>
     </div>
     <div class="clear"></div>

src/main/webapp/WEB-INF/jsp/adspecial/index.jsp

@@ -13,19 +13,20 @@
             <a href="index.do?type=0" class="button button-16 <c:if test="${type==0}">active</c:if>">专题广告管理</a>
             <a href="index.do?type=1" class="button button-16 <c:if test="${type==1}">active</c:if>">专题栏目管理</a>
         </div>
-        <form name="dataForm" action="export.do" method="post">
+        <form name="dataForm" class="search-form" action="export.do" method="post">
         <div class="search-group">
             <input type="hidden" id="type" name="type" value="${type}" />
             <c:if test="${type==0}">
-	            <div class="search-item">产品名称：<input type="text" id="productName" name="productName" class="text {text:'请输入产品名称'}" value="${productName}" size="12"/></div>
-	            <div class="search-item">品牌名称：<input type="text" id="brandName" name="brandName" class="text {text:'请输入品牌名称'}" value="${brandName}" size="12"/></div>
+	            <div class="search-item"><div class="label">产品名称：</div><input type="text" id="productName" name="productName" class="text {text:'请输入产品名称'}" value="${productName}" size="12"/></div>
+	            <div class="search-item"><div class="label">品牌名称：</div><input type="text" id="brandName" name="brandName" class="text {text:'请输入品牌名称'}" value="${brandName}" size="12"/></div>
             </c:if>
             <c:if test="${type==1}">
-	            <div class="search-item">栏目名称：<input type="text" id="productName" name="productName" class="text {text:'请输入栏目名称'}" value="${productName}" size="12"/></div>
-	            <div class="search-item">内容名称：<input type="text" id="brandName" name="brandName" class="text {text:'请输入内容名称'}" value="${brandName}" size="12"/></div>
+	            <div class="search-item"><div class="label">栏目名称：</div><input type="text" id="productName" name="productName" class="text {text:'请输入栏目名称'}" value="${productName}" size="12"/></div>
+	            <div class="search-item"><div class="label">内容名称：</div><input type="text" id="brandName" name="brandName" class="text {text:'请输入内容名称'}" value="${brandName}" size="12"/></div>
             </c:if>
-            <div class="search-item">广告主：<input type="text" id="advMaster" name="advMaster" class="text {text:'请输入广告主'}" value="${advMaster}" size="12"/></div>
-            <div class="search-item">播出环境：
+            <div class="search-item"><div class="label">广告主：</div><input type="text" id="advMaster" name="advMaster" class="text {text:'请输入广告主'}" value="${advMaster}" size="12"/></div>
+            <div class="search-item">
+                <div class="label">播出环境：</div>
               <select id="showEnv" name="showEnv">
                   <option value="">请选择</option>
                   <option value="0">新闻</option>
@@ -42,89 +43,92 @@
             </div>
          </div>   
          <div class="search-group">  
-            <div class="search-item">播出媒体：
+            <div class="search-item">
+                <div class="label">播出媒体：</div>
                 <select id="mediaName" name="mediaName">
                     <option value="">请选择</option>
                 </select>
             </div>
-            <div class="search-item">播出节目：<input type="text" id="tvName" name="tvName" class="text {text:'请输入播出节目'}" value="${tvName}" size="11"/></div>
-            <div class="search-item">联系方式：<input type="text" id="phone" name="phone" class="text {text:'请输入联系方式'}" value="${phone}" size="11" onkeyup="isNumber(this,true)" maxlength="11"/></div>
-            <div class="search-item">播出日期：<input type="text" name="showDateStart" id="showDateStart" class="text {text:'开始时间'}" size="7" /> - <input type="text" name="showDateEnd" id="showDateEnd" class="text {text:'结束时间'}" size="7" /></div>
+            <div class="search-item"><div class="label">播出节目</div>：<input type="text" id="tvName" name="tvName" class="text {text:'请输入播出节目'}" value="${tvName}" size="11"/></div>
+            <div class="search-item"><div class="label">联系方式：</div><input type="text" id="phone" name="phone" class="text {text:'请输入联系方式'}" value="${phone}" size="11" onkeyup="isNumber(this,true)" maxlength="11"/></div>
+            <div class="search-item"><div class="label">播出日期：</div><div class="twoContent"><input type="text" name="showDateStart" id="showDateStart" class="text {text:'开始时间'}" size="7" /><span>-</span><input type="text" name="showDateEnd" id="showDateEnd" class="text {text:'结束时间'}" size="7" /></div></div>
          </div>
          <div class="search-group">     
-            <div class="search-item">播出时间：<input type="text" name="showTimeStart" id="showTimeStart" class="text {text:'开始日期'}"  size="7"/> - <input type="text" name="showTimeEnd" id="showTimeEnd" class="text {text:'结束日期'}"  size="7"/></div> 
-            <div class="search-item">刊例(万)：<input type="text" name="priceMin" id="priceMin" class="text {text:'最小刊例'}"  size="7"  onkeyup="isNumber(this)" /> - <input  type="text" name="priceMax" id="priceMax" class="text {text:'最大刊例'}"  size="7"  onkeyup="isNumber(this)" /></div>
-            <div class="search-item">时长(秒)：<input type="text" name="showDurationMin" id="showDurationMin" class="text {text:'最小时长'}" size="7" onkeyup="isNumber(this,true)" /> - <input  type="text" name="showDurationMax" id="showDurationMax" class="text {text:'最大时长'}" size="7" onkeyup="isNumber(this,true)"/></div>                    
+            <div class="search-item"><div class="label">播出时间：</div><div class="twoContent"><input type="text" name="showTimeStart" id="showTimeStart" class="text {text:'开始日期'}"  size="7"/><span>-</span><input type="text" name="showTimeEnd" id="showTimeEnd" class="text {text:'结束日期'}"  size="7"/></div></div>
+            <div class="search-item"><div class="label">刊例(万)：</div><div class="twoContent"><input type="text" name="priceMin" id="priceMin" class="text {text:'最小刊例'}"  size="7"  onkeyup="isNumber(this)" /><span>-</span><input  type="text" name="priceMax" id="priceMax" class="text {text:'最大刊例'}"  size="7"  onkeyup="isNumber(this)" /></div></div>
+            <div class="search-item"><div class="label">时长(秒)：</div><div class="twoContent"><input type="text" name="showDurationMin" id="showDurationMin" class="text {text:'最小时长'}" size="7" onkeyup="isNumber(this,true)" /><span>-</span><input  type="text" name="showDurationMax" id="showDurationMax" class="text {text:'最大时长'}" size="7" onkeyup="isNumber(this,true)"/></div></div>                    
             <div class="search-item">
-                <a href="javascript:void(0);" onclick="getList(1)" class="btn-radius">搜 索</a>
+                <a href="javascript:void(0);" onclick="getList(1)" class="search-btn">查 询</a>
             </div>          
          </div>
         </form>
-        <div class="rFloat buttons">
-            
-            <c:if test="${type==0}">
-	            <c:if test="${funcMap['special_advertise_add'] eq 1}">
-	                <a href="javascript:platformModfiy('add','专题广告信息' ,'','${type}');" class="btn">+新增</a>
-	            </c:if>
-	            <a href="${staticPath}excel/专题产品模板.xlsx" class="btn">下载模板</a>
-            </c:if>
-            <c:if test="${type==1}">
-	            <c:if test="${funcMap['special_advertise_add'] eq 1}">
-	                <a href="javascript:platformModfiy('add','专题栏目信息' ,'','${type}');" class="btn">+新增</a>
-	            </c:if>
-	            <a href="${staticPath}excel/专题栏目模板.xlsx" class="btn">下载模板</a>
-            </c:if>
+        <div class="table-content">
+            <div class="rFloat buttons">
             
-            <c:if test="${funcMap['special_advertise_import'] eq 1}">
-	            <span class="btn upfile">
-	                <form id="fileForm" action="import_excel.do?type=${type}" method="post" enctype="multipart/form-data" target="hframe">
-	                <span class="webuploader-pick">导入</span>
-	                <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
-	                <input type="hidden" id="isSure" name="isSure" >
-	                </form>
-	            </span>
-            </c:if>
-            <c:if test="${funcMap['special_advertise_export'] eq 1}">
-                <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
-            </c:if>
-        </div>
-        已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
-        <c:if test="${funcMap['special_advertise_delete'] ne 1}">
-            <a href="javascript:void(0);" onclick="delRecordBatch();" class="btn del" style="visibility:hidden;">xxxxxx</a>
-        </c:if>
-
-        <c:if test="${funcMap['special_advertise_delete'] eq 1}">
-            <a href="javascript:void(0);" onclick="delRecordBatch();" class="btn del">批量删除</a>
-        </c:if>
-        <table class="table mTop10" cellpadding="0" cellspacing="0">
-            <thead>
-            <tr>
-                <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
                 <c:if test="${type==0}">
-	               <th>产品名称</th>
-	               <th>品牌</th>
+                    <c:if test="${funcMap['special_advertise_add'] eq 1}">
+                        <a href="javascript:platformModfiy('add','专题广告信息' ,'','${type}');" class="btn">+新增</a>
+                    </c:if>
+                    <a href="${staticPath}excel/专题产品模板.xlsx" class="btn">下载模板</a>
                 </c:if>
                 <c:if test="${type==1}">
-	               <th>栏目名称</th>
-	               <th>内容</th>
+                    <c:if test="${funcMap['special_advertise_add'] eq 1}">
+                        <a href="javascript:platformModfiy('add','专题栏目信息' ,'','${type}');" class="btn">+新增</a>
+                    </c:if>
+                    <a href="${staticPath}excel/专题栏目模板.xlsx" class="btn">下载模板</a>
+                </c:if>
+                
+                <c:if test="${funcMap['special_advertise_import'] eq 1}">
+                    <span class="btn upfile">
+                        <form id="fileForm" action="import_excel.do?type=${type}" method="post" enctype="multipart/form-data" target="hframe">
+                        <span class="webuploader-pick">导入</span>
+                        <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
+                        <input type="hidden" id="isSure" name="isSure" >
+                        </form>
+                    </span>
+                </c:if>
+                <c:if test="${funcMap['special_advertise_export'] eq 1}">
+                    <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
                 </c:if>
-                <th>广告主</th>
-                <th>媒体</th>
-                <th>播出日期</th>
-                <th>播出时间</th>
-                <th>播出环境</th>
-                <th>前节目</th>
-                <th>联系方式</th>
-                <th>时长(秒)</th>
-                <th>刊例价格(万)</th>
-                <th width="36">操作</th>
-            </tr>
-            </thead>
-            <tbody id="list">
-            </tbody>
-        </table>
-        <div class="mTop20">
-            <div id="page" class="rFloat"></div>累计 <span id="count" class="orange">0</span> 条
+            </div>
+            已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
+            <c:if test="${funcMap['special_advertise_delete'] ne 1}">
+                <a href="javascript:void(0);" onclick="delRecordBatch();" class="btn del" style="visibility:hidden;">xxxxxx</a>
+            </c:if>
+    
+            <c:if test="${funcMap['special_advertise_delete'] eq 1}">
+                <a href="javascript:void(0);" onclick="delRecordBatch();" class="btn del">批量删除</a>
+            </c:if>
+            <table class="table mTop10" cellpadding="0" cellspacing="0">
+                <thead>
+                <tr>
+                    <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
+                    <c:if test="${type==0}">
+                       <th>产品名称</th>
+                       <th>品牌</th>
+                    </c:if>
+                    <c:if test="${type==1}">
+                       <th>栏目名称</th>
+                       <th>内容</th>
+                    </c:if>
+                    <th>广告主</th>
+                    <th>媒体</th>
+                    <th>播出日期</th>
+                    <th>播出时间</th>
+                    <th>播出环境</th>
+                    <th>前节目</th>
+                    <th>联系方式</th>
+                    <th>时长(秒)</th>
+                    <th>刊例价格(万)</th>
+                    <th width="36">操作</th>
+                </tr>
+                </thead>
+                <tbody id="list">
+                </tbody>
+            </table>
+            <div class="mTop20">
+                <div id="page" class="rFloat"></div>累计 <span id="count" class="blue">0</span> 条
+            </div>
         </div>
     </div>
     <div class="clear"></div>

src/main/webapp/WEB-INF/jsp/adtheatre/index.jsp

@@ -9,24 +9,26 @@
 <div class="screen main">
     <%@ include file="../common/left.jsp" %>
     <div class="main-content">
-        <div class="btn-radius">剧场数据管理</div>
-        <form id="dataForm" name="dataForm" action="export.do" method="post">
+        <div class="main-title">剧场数据管理</div>
+        <form id="dataForm" name="dataForm" class="search-form" action="export.do" method="post">
         <div class="search-group">
-            <div class="search-item">电视剧名：<input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="11" /></div>
-            <div class="search-item">产品名称：<input type="text" id="typeName" name="typeName" class="text {text:'请输入关键字'}" size="11" /></div>
-            <div class="search-item">体裁：
+            <div class="search-item"><div class="label">电视剧名：</div><input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="11" /></div>
+            <div class="search-item"><div class="label">产品名称：</div><input type="text" id="typeName" name="typeName" class="text {text:'请输入关键字'}" size="11" /></div>
+            <div class="search-item"><div class="label">体裁：</div>
 				<select id ="firstTheme" name="firstTheme">
 					<option value=""></option>
 				</select>
             </div>
-            <div class="search-item">细分体裁：
+            <div class="search-item">
+                <div class="label">细分体裁：</div>
                 <select id="secondTheme" name="secondTheme">
                     <option value=""></option>
                 </select>
             </div>
         </div>
         <div class="search-group">
-            <div class="search-item">媒体等级：
+            <div class="search-item">
+                <div class="label">媒体等级：</div>
                 <div class="select {width:120}">
                     <select id="mediaRank" name="mediaRank">
                         <option value="">媒体等级</option>
@@ -41,78 +43,97 @@
                     </select>
                 </div>
             </div>
-            <div class="search-item">播出媒体：
+            <div class="search-item">
+                <div class="label">播出媒体：</div>
                 <select id="mediaName" name="mediaName">
                     <option value=""></option>
                 </select>
             </div>
             <div class="search-item">
-                集数：<input type="text" name="mediaNumMin" id="mediaNumMin" class="text {text:'最小集数'}"  size="14" />
-                &nbsp;-&nbsp;<input type="text" name="mediaNumMax" id="mediaNumMax" class="text {text:'最大集数'}"  size="14" />
+                <div class="label">集数：</div>
+                <div class="twoContent">
+	                <input type="text" name="mediaNumMin" id="mediaNumMin" class="text {text:'最小集数'}"  size="14" />
+	                <span>-</span>
+	                <input type="text" name="mediaNumMax" id="mediaNumMax" class="text {text:'最大集数'}"  size="14" />
+                </div>
             </div>
-        </div>
-        <div class="search-group">
             <div class="search-item">
-                播出日期：<input type="text" name="showDateStart" id="showDateStart" class="text {text:'开始日期'}" size="10" />
-                &nbsp;-&nbsp;<input type="text" name="showDateEnd" id="showDateEnd" class="text {text:'结束日期'}" size="10" />
+                <div class="label">播出日期：</div>
+                <div class="twoContent">
+	                <input type="text" name="showDateStart" id="showDateStart" class="text {text:'开始日期'}" size="10" />
+	               	<span>-</span>
+	               	<input type="text" name="showDateEnd" id="showDateEnd" class="text {text:'结束日期'}" size="10" />
+                </div>
             </div>
+        </div>
+        <div class="search-group">
             <div class="search-item">
-                播出时间：<input type="text" name="showTimeStart" id="showTimeStart" class="text {text:'开始时间'}"  size="3"/>
-                &nbsp;-&nbsp;<input type="text" name="showTimeEnd" id="showTimeEnd" class="text {text:'结束时间'}"  size="3"/>
+                <div class="label">播出时间：</div>
+                <div class="twoContent">
+	                <input type="text" name="showTimeStart" id="showTimeStart" class="text {text:'开始时间'}"  size="3"/>
+	                <span>-</span>
+	                <input type="text" name="showTimeEnd" id="showTimeEnd" class="text {text:'结束时间'}"  size="3"/>
+                </div>
             </div>
             <div class="search-item">
-                进线预估：<input type="text" name="jinxianMin" id="jinxianMin" class="text {text:'最小'}"  size="5" />
-                &nbsp;-&nbsp;<input type="text" name="jinxianMax" id="jinxianMax" class="text {text:'最大'}"  size="5" />
+                <div class="label">进线预估：</div>
+                <div class="twoContent">
+	                <input type="text" name="jinxianMin" id="jinxianMin" class="text {text:'最小'}"  size="5" />
+	                <span>-</span>
+	                <input type="text" name="jinxianMax" id="jinxianMax" class="text {text:'最大'}"  size="5" />
+                </div>
             </div>
             <div class="search-item">
-                <a href="javascript:void(0);" onclick="getList(1)" class="btn-radius">搜 索</a>
+                <a href="javascript:void(0);" onclick="getList(1)" class="search-btn">查 询</a>
             </div>
         </div>
         </form>
-        <div class="rFloat buttons">
-            <c:if test="${funcMap['adtheatre_add'] eq 1}">
-                <a href="javascript:platformModfiy('add','剧场信息');" class="btn">+新增</a>
-            </c:if>
-            <a href="${staticPath}excel/剧场数据导入模板.xlsx" class="btn">下载模板</a>
-            <c:if test="${funcMap['adtheatre_importExcel'] eq 1}">
-                <span class="btn upfile">
-                <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
-                    <span class="webuploader-pick">导入表</span>
-                    <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
-                </form>
-                </span>
-            </c:if>
-            <c:if test="${funcMap['adtheatre_export'] eq 1}">
-                <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+        <div class="table-content">
+            <div class="rFloat buttons">
+                <c:if test="${funcMap['adtheatre_add'] eq 1}">
+                    <a href="javascript:platformModfiy('add','剧场信息');" class="btn">+新增</a>
+                </c:if>
+                <a href="${staticPath}excel/剧场数据导入模板.xlsx" class="btn">下载模板</a>
+                <c:if test="${funcMap['adtheatre_importExcel'] eq 1}">
+                    <span class="btn upfile">
+                    <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
+                        <span class="webuploader-pick">导入表</span>
+                        <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
+                    </form>
+                    </span>
+                </c:if>
+                <c:if test="${funcMap['adtheatre_export'] eq 1}">
+                    <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+                </c:if>
+            </div>
+            已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
+            <c:if test="${funcMap['adtheatre_batchDelete'] eq 1}">
+                <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
             </c:if>
-        </div>
-        已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
-        <c:if test="${funcMap['adtheatre_batchDelete'] eq 1}">
-            <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
-        </c:if>
-        <table class="table mTop10" cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
-                    <th class="nop">剧名</th>
-                    <th class="nop">媒体</th>
-                    <th class="nop">集数</th>
-                    <th class="nop">体裁</th>
-                    <th class="nop">细分体裁</th>
-                    <th class="nop">播出日期</th>
-                    <th class="nop">播出时间</th>
-                    <th class="nop">类型</th>
-                    <th class="nop">产品/栏目</th>
-                    <th class="nop">进线预估</th>
-                    <th class="nop">节目数据</th>
-                    <th width="198">操作</th>
-                </tr>
-            </thead>
-            <tbody id="list"></tbody>
-        </table>
-        <div class="mTop20">
-            <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">0</span> 条
+            <table class="table mTop10" cellpadding="0" cellspacing="0">
+                <thead>
+                    <tr>
+                        <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
+                        <th class="nop">剧名</th>
+                        <th class="nop">媒体</th>
+                        <th class="nop">集数</th>
+                        <th class="nop">体裁</th>
+                        <th class="nop">细分体裁</th>
+                        <th class="nop">播出日期</th>
+                        <th class="nop">播出时间</th>
+                        <th class="nop">类型</th>
+                        <th class="nop">产品/栏目</th>
+                        <th class="nop">进线预估</th>
+                        <th class="nop">节目数据</th>
+                        <th width="198">操作</th>
+                    </tr>
+                </thead>
+                <tbody id="list"></tbody>
+            </table>
+            <div class="mTop20">
+                <div id="page" class="rFloat"></div>
+                累计 <span id="count" class="blue">0</span> 条
+            </div>
         </div>
     </div>
     <div class="clear"></div>

src/main/webapp/WEB-INF/jsp/adtv/index.jsp

@@ -8,66 +8,70 @@
 <div class="screen main">
     <%@ include file="../common/left.jsp" %>
     <div class="main-content">
-        <div class="btn-radius">电视剧管理</div>
-        <form name="dataForm" action="export.do" method="post">
+        <div class="main-title">电视剧管理</div>
+        <form name="dataForm" class="search-form" action="export.do" method="post">
         <div class="search-group">
             <input type="hidden" name="download" value="1" />
-            <div class="search-item">名称：<input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="11" /></div>
-            <div class="search-item">体裁：	            
+            <div class="search-item"><div class="label">名称：</div><input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="11" /></div>
+            <div class="search-item">
+                <div class="label">体裁：</div>	            
 				<select id ="firstTheme" name="firstTheme">
 					<option value=""></option>
 				</select>
             </div>
-            <div class="search-item">细分体裁：         
+            <div class="search-item">   
+                <div class="label">细分体裁：</div>      
                 <select id="secondTheme" name="secondTheme">
                     <option value=""></option>
                 </select>
             </div>
             <div class="search-item">
-                <a href="javascript:void(0);" onclick="getList(1)" class="btn-radius">搜 索</a>
+                <a href="javascript:void(0);" onclick="getList(1)" class="search-btn">查 询</a>
             </div>
         </div>
         </form>
-        <div class="rFloat buttons">
-            <c:if test="${funcMap['tv_add'] eq 1}">
-                <a href="javascript:platformModfiy('add','电视剧信息');" class="btn">+新增</a>
-            </c:if>
-            <a href="${staticPath}excel/电视剧导入模板.xlsx" class="btn">下载模板</a>
-            <c:if test="${funcMap['tv_import_excel'] eq 1}">
-                <span class="btn upfile">
-                <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
-                    <span class="webuploader-pick">导入表</span>
-                    <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
-                </form>
-                </span>
-            </c:if>
-            <c:if test="${funcMap['tv_import_pic'] eq 1}">
-                <div id="picker" class="btn"></div>
-            </c:if>
-            <c:if test="${funcMap['tv_export'] eq 1}">
-                <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+        <div class="table-content">
+            <div class="rFloat buttons">
+                <c:if test="${funcMap['tv_add'] eq 1}">
+                    <a href="javascript:platformModfiy('add','电视剧信息');" class="btn">+新增</a>
+                </c:if>
+                <a href="${staticPath}excel/电视剧导入模板.xlsx" class="btn">下载模板</a>
+                <c:if test="${funcMap['tv_import_excel'] eq 1}">
+                    <span class="btn upfile">
+                    <form id="fileForm" action="import_excel.do" method="post" enctype="multipart/form-data" target="hframe">
+                        <span class="webuploader-pick">导入表</span>
+                        <input type="file" name="excelfile" id="excelfile" onchange="importExcel()"; />
+                    </form>
+                    </span>
+                </c:if>
+                <c:if test="${funcMap['tv_import_pic'] eq 1}">
+                    <div id="picker" class="btn"></div>
+                </c:if>
+                <c:if test="${funcMap['tv_export'] eq 1}">
+                    <a href="javascript:document.dataForm.submit();" class="btn">导出</a>
+                </c:if>
+            </div>
+            已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
+            <c:if test="${funcMap['tv_all_delete'] eq 1}">
+                <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
             </c:if>
-        </div>
-        已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;
-        <c:if test="${funcMap['tv_all_delete'] eq 1}">
-            <a href="javascript:void(0);" onclick="delRecordBatch()" class="btn del">批量删除</a>
-        </c:if>
-        <table class="table mTop10" cellpadding="0" cellspacing="0">
-            <thead>
-                <tr>
-                    <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
-                    <th>电视剧</th>
-                    <th width="98" class="nop">体裁</th>
-                    <th width="98" class="nop">细分体裁</th>
-                    <th width="198" class="nop">电视剧海报</th>
-                    <th width="198">操作</th>
-                </tr>
-            </thead>
-            <tbody id="list"></tbody>
-        </table>
-        <div class="mTop20">
-            <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">0</span> 条
+            <table class="table mTop10" cellpadding="0" cellspacing="0">
+                <thead>
+                    <tr>
+                        <th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
+                        <th>电视剧</th>
+                        <th width="98" class="nop">体裁</th>
+                        <th width="98" class="nop">细分体裁</th>
+                        <th width="198" class="nop">电视剧海报</th>
+                        <th width="198">操作</th>
+                    </tr>
+                </thead>
+                <tbody id="list"></tbody>
+            </table>
+            <div class="mTop20">
+                <div id="page" class="rFloat"></div>
+                累计 <span id="count" class="blue">0</span> 条
+            </div>
         </div>
     </div>
     <div class="clear"></div>

src/main/webapp/WEB-INF/jsp/advertise/brand_list.jsp

@@ -81,7 +81,7 @@
         </table>
         <div class="mTop20">
             <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">10</span> 条
+            累计 <span id="count" class="blue">10</span> 条
         </div>
     </div>
     <div class="clear"></div>

src/main/webapp/WEB-INF/jsp/advertise/brand_placement_info.jsp

@@ -127,7 +127,7 @@
                             <td>${item.frequency}</td>
                             <td>${item.length}</td>
                             <td class="edit">
-                                <a href="javascript:placementModfiy('edit','植入方式', ${item.id}, ${status.index});">编辑</a><br />
+                                <a href="javascript:placementModfiy('edit','植入方式', ${item.id}, ${status.index});">编辑</a>&nbsp;&nbsp;
                                 <a class="del">删除</a>
                             </td>
                         </tr>

src/main/webapp/WEB-INF/jsp/advertise/brand_placement_list.jsp

@@ -126,7 +126,7 @@
         </table>
         <div class="mTop20">
             <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">10</span> 条
+            累计 <span id="count" class="blue">10</span> 条
         </div>
     </div>
     <div class="clear"></div>

src/main/webapp/WEB-INF/jsp/advertise/notice_list.jsp

@@ -54,7 +54,7 @@
         </table>
         <div class="mTop20">
             <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">0</span> 条
+            累计 <span id="count" class="blue">0</span> 条
         </div>
         <input type="hidden" id="curPage" >
     </div>

src/main/webapp/WEB-INF/jsp/advertise/platform_list.jsp

@@ -63,7 +63,7 @@
         </table>
         <div class="mTop20">
             <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">10</span> 条
+            累计 <span id="count" class="blue">10</span> 条
         </div>
     </div>
     <div class="clear"></div>

src/main/webapp/WEB-INF/jsp/advertise/program_schedule_list.jsp

@@ -69,7 +69,7 @@
         </table>
         <div class="mTop20">
             <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">0</span> 条
+            累计 <span id="count" class="blue">0</span> 条
         </div>
         <input type="hidden" id="curPage" >
     </div>

src/main/webapp/WEB-INF/jsp/advertise/resource_recom_list.jsp

@@ -68,7 +68,7 @@
         </table>
         <div class="mTop20">
             <div id="page" class="rFloat"></div>
-            累计 <span id="count" class="orange">0</span> 条
+            累计 <span id="count" class="blue">0</span> 条
         </div>
         <input type="hidden" id="curPage" >
     </div>

src/main/webapp/WEB-INF/jsp/analysis/brand_analysis_type1.jsp

@@ -1,93 +1,98 @@
 <%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
 <div class="box-pd">
-	<div class="hd-title">产品/栏目广告投放媒体分布</div>
-	<div class="box-sub-pad">
-		<div class="box-row">
-			<div class="row-50">
-				<div class="sub-title"><span name="brand_tag"></span> <span name="type_tag"></span>投放频次分布 <span class="orange font12">单位（次）</span></div>
-				<div class="padContent">
-					<div id="frequency_pie" style="height:300px;"></div>
+	<div class="table-content">
+		<div class="hd-title">产品/栏目广告投放媒体分布</div>
+		<div class="box-sub-pad">
+			<div class="box-row">
+				<div class="row-50">
+					<div class="sub-title"><span name="brand_tag"></span> <span name="type_tag"></span>投放频次分布 <span class="orange font12">单位（次）</span></div>
+					<div class="padContent">
+						<div id="frequency_pie" style="height:300px;"></div>
+					</div>
 				</div>
-			</div>
-			<div class="row-50">
-				<div class="sub-title"><span name="brand_tag"></span> <span name="type_tag"></span>投放时长分布 <span class="orange font12">单位（秒）</span></div>
-				<div class="padContent">
-					<div id="length_pie" style="height:300px;"></div>
+				<div class="row-50">
+					<div class="sub-title"><span name="brand_tag"></span> <span name="type_tag"></span>投放时长分布 <span class="orange font12">单位（秒）</span></div>
+					<div class="padContent">
+						<div id="length_pie" style="height:300px;"></div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-
-	<div class="hd-title mTop20" id="tv_title">产品/栏目广告投放电视剧分布</div>
-	<div class="box-sub-pad" id="tv_div">
-		<div class="box-row">
-			<div class="row-50">
-				<div class="sub-title"><span name="brand_tag"></span> <span name="tv_tag"></span>电视剧投放频次分布  <span class="orange font12">单位（次）</span></div>
-				<div class="padContent">
-					<div id="rating_35" style="height:300px;"></div>
-				</div>		
-			</div>
-			<div class="row-50">
-				<div class="sub-title"><span name="brand_tag"></span> <span name="tv_tag"></span>电视剧时长分布 <span class="orange font12">单位（秒）</span></div>
-				<div class="padContent">
-					<div id="rating_29" style="height:300px;"></div>
+	<div class="table-content">
+		<div class="hd-title" id="tv_title">产品/栏目广告投放电视剧分布</div>
+		<div class="box-sub-pad" id="tv_div">
+			<div class="box-row">
+				<div class="row-50">
+					<div class="sub-title"><span name="brand_tag"></span> <span name="tv_tag"></span>电视剧投放频次分布  <span class="orange font12">单位（次）</span></div>
+					<div class="padContent">
+						<div id="rating_35" style="height:300px;"></div>
+					</div>		
+				</div>
+				<div class="row-50">
+					<div class="sub-title"><span name="brand_tag"></span> <span name="tv_tag"></span>电视剧时长分布 <span class="orange font12">单位（秒）</span></div>
+					<div class="padContent">
+						<div id="rating_29" style="height:300px;"></div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-
-	<div class="hd-title mTop20">行业广告投放品牌分布</div>
-	<div class="box-sub-pad">
-		<div class="box-row">
-			<div class="row-50">
-				<div class="sub-title"><span name="brand_tag"></span> <span name="net_title1"></span>行业各产品投放频次  <span class="orange font12">单位（次）</span></div>
-				<div class="padContent">
-					<div id="net_chart" style="height:300px;"></div>
+	<div class="table-content">
+		<div class="hd-title">行业广告投放品牌分布</div>
+		<div class="box-sub-pad">
+			<div class="box-row">
+				<div class="row-50">
+					<div class="sub-title"><span name="brand_tag"></span> <span name="net_title1"></span>行业各产品投放频次  <span class="orange font12">单位（次）</span></div>
+					<div class="padContent">
+						<div id="net_chart" style="height:300px;"></div>
+					</div>
 				</div>
-			</div>
-			<div class="row-50">
-				<div class="sub-title"><span name="brand_tag"></span> <span name="net_title2"></span>行业各产品投放时长 <span class="orange font12">单位（秒）</span></div>
-				<div class="padContent">
-					<div id="douban_chart" style="height:300px;"></div>
+				<div class="row-50">
+					<div class="sub-title"><span name="brand_tag"></span> <span name="net_title2"></span>行业各产品投放时长 <span class="orange font12">单位（秒）</span></div>
+					<div class="padContent">
+						<div id="douban_chart" style="height:300px;"></div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-
-	<div class="hd-title mTop20">产品专题广告投放排名</div>
-	<div class="box-pd">
-		<div class="box-row">
-			<div class="row-50">
-				<div class="hd-title mTop10">产品投放TOP30</div>
-				<table class="table table-gray" cellpadding="0" cellspacing="0">
-					<thead>
-						<tr>
-							<th>排名</th>
-							<th>产品</th>
-							<th>行业细分</th>
-							<th>频次</th>
-							<th>时长</th>
-						</tr>
-					</thead>
-					<tbody id="program_rank_list">
-					</tbody>
-				</table>
-			</div>
-			<div class="row-50">
-				<div class="hd-title mTop10">栏目投放TOP30</div>
-				<table class="table table-gray" cellpadding="0" cellspacing="0">
-					<thead>
-						<tr>
-							<th>排名</th>
-							<th>产品</th>
-							<th>行业细分</th>
-							<th>频次</th>
-							<th>时长</th>
-						</tr>
-					</thead>
-					<tbody id="brand_rank_list">
-					</tbody>
-				</table>
+	<div class="table-content">
+		<div class="hd-title">产品专题广告投放排名</div>
+		<div class="box-pd">
+			<div class="box-row">
+				<div class="row-50">
+					<div class="hd-title mTop10">产品投放TOP30</div>
+					<table class="table table-gray" cellpadding="0" cellspacing="0">
+						<thead>
+							<tr>
+								<th>排名</th>
+								<th>产品</th>
+								<th>行业细分</th>
+								<th>频次</th>
+								<th>时长</th>
+							</tr>
+						</thead>
+						<tbody id="program_rank_list">
+						</tbody>
+					</table>
+				</div>
+				<div class="row-50">
+					<div class="hd-title mTop10">栏目投放TOP30</div>
+					<table class="table table-gray" cellpadding="0" cellspacing="0">
+						<thead>
+							<tr>
+								<th>排名</th>
+								<th>产品</th>
+								<th>行业细分</th>
+								<th>频次</th>
+								<th>时长</th>
+							</tr>
+						</thead>
+						<tbody id="brand_rank_list">
+						</tbody>
+					</table>
+				</div>
 			</div>
 		</div>
 	</div>

src/main/webapp/WEB-INF/jsp/analysis/program_analysis_type1.jsp

@@ -1,118 +1,124 @@
 <%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
 <div class="box-pd">
-	<div class="hd-title"><span name="type_tag"></span>电视剧收视分析</div>
-	<div class="box-sub-pad">
-		<div class="box-row">
-			<div class="row-50">
-				<div class="sub-title"><span name="program_tag"></span>收视趋势</div>
-				<div class="padContent">
-					<div id="trend_bar" style="height:300px;"></div>
+	<div class="table-content">
+		<div class="hd-title"><span name="type_tag"></span>电视剧收视分析</div>
+		<div class="box-sub-pad">
+			<div class="box-row">
+				<div class="row-50">
+					<div class="sub-title"><span name="program_tag"></span>收视趋势</div>
+					<div class="padContent">
+						<div id="trend_bar" style="height:300px;"></div>
+					</div>
 				</div>
-			</div>
-			<div class="row-50">
-				<div class="sub-title"><span name="program_tag"></span>人群构成</div>
-				<div class="padContent">
-					<div id="people_bar" style="height:300px;"></div>
+				<div class="row-50">
+					<div class="sub-title"><span name="program_tag"></span>人群构成</div>
+					<div class="padContent">
+						<div id="people_bar" style="height:300px;"></div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-
-	<div class="hd-title mTop20" id="tv_title"><span name="type_tag"></span>电视剧收视区域分步</div>
-	<div class="box-sub-pad" id="tv_div">
-		<div class="box-row">
-			<div class="row-50">
-				<div class="sub-title"><span name="program_tag"></span>触达千人</div>
-				<div class="padContent">
-					<div id="tvNum_bar" style="height:300px;"></div>
+	<div class="table-content">
+		<div class="hd-title" id="tv_title"><span name="type_tag"></span>电视剧收视区域分步</div>
+		<div class="box-sub-pad" id="tv_div">
+			<div class="box-row">
+				<div class="row-50">
+					<div class="sub-title"><span name="program_tag"></span>触达千人</div>
+					<div class="padContent">
+						<div id="tvNum_bar" style="height:300px;"></div>
+					</div>
 				</div>
-			</div>
-			<div class="row-50">
-				<div class="sub-title"><span name="program_tag"></span>触达千人</div>
-				<div class="padContent">
-					<div id="mediaNum_bar" style="height:300px;"></div>
+				<div class="row-50">
+					<div class="sub-title"><span name="program_tag"></span>触达千人</div>
+					<div class="padContent">
+						<div id="mediaNum_bar" style="height:300px;"></div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-
-	<div class="hd-title mTop20"><span name="type_tag"></span>电视剧产品投放分析</div>
-	<div class="box-sub-pad">
-		<div class="box-row">
-			<div class="row-50">
-				<div class="sub-title"><span name="program_tag"></span> <span name="group_title1"></span></div>
-				<div class="padContent">
-					<div id="product_time_pie" style="height:300px;"></div>
+	<div class="table-content">
+		<div class="hd-title"><span name="type_tag"></span>电视剧产品投放分析</div>
+		<div class="box-sub-pad">
+			<div class="box-row">
+				<div class="row-50">
+					<div class="sub-title"><span name="program_tag"></span> <span name="group_title1"></span></div>
+					<div class="padContent">
+						<div id="product_time_pie" style="height:300px;"></div>
+					</div>
+					<div align="center"  id="tv_group_ratios">
+					</div>
 				</div>
-				<div align="center"  id="tv_group_ratios">
+				<div class="row-50">
+					<div class="sub-title"><span name="program_tag"></span> <span name="group_title2"></span></div>
+					<div class="padContent">
+						<div id="product_freq_pie" style="height:300px;"></div>
+					</div>
 				</div>
 			</div>
-			<div class="row-50">
-				<div class="sub-title"><span name="program_tag"></span> <span name="group_title2"></span></div>
-				<div class="padContent">
-					<div id="product_freq_pie" style="height:300px;"></div>
+		</div>
+	</div>
+	<div class="table-content">
+		<div class="hd-title"><span name="type_tag"></span>电视剧体裁结构分析</div>
+		<div class="box-sub-pad">
+			<div class="box-row">
+				<div class="row-50">
+					<div class="sub-title"><span name="program_tag"></span> <span name="group_title1"></span></div>
+					<div class="padContent">
+						<div id="tvTheme_pie" style="height:300px;"></div>
+					</div>
+					<div align="center"  id="tv_group_ratios">
+					</div>
+				</div>
+				<div class="row-50">
+					<div class="sub-title"><span name="program_tag"></span> <span name="group_title2"></span></div>
+					<div class="padContent">
+						<div id="mediaTheme_pie" style="height:300px;"></div>
+					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-
-	<div class="hd-title mTop20"><span name="type_tag"></span>电视剧体裁结构分析</div>
-    	<div class="box-sub-pad">
-    		<div class="box-row">
-    			<div class="row-50">
-    				<div class="sub-title"><span name="program_tag"></span> <span name="group_title1"></span></div>
-    				<div class="padContent">
-    					<div id="tvTheme_pie" style="height:300px;"></div>
-    				</div>
-    				<div align="center"  id="tv_group_ratios">
-    				</div>
-    			</div>
-    			<div class="row-50">
-    				<div class="sub-title"><span name="program_tag"></span> <span name="group_title2"></span></div>
-    				<div class="padContent">
-    					<div id="mediaTheme_pie" style="height:300px;"></div>
-    				</div>
-    			</div>
-    		</div>
-    	</div>
-
-	<div class="hd-title mTop20"><span name="type_tag"></span>电视剧及卫视剧场排名</div>
-	<div class="box-sub-pad">
-		<div class="box-row">
-			<div class="row-50">
-				<div class="hd-title mTop10">剧场电视剧收视排名</div>
-                <table class="table table-gray" cellpadding="0" cellspacing="0">
-                    <thead>
-                        <tr>
-                            <th>排名</th>
-                            <th>剧名</th>
-                            <th>卫视</th>
-                            <th>题材</th>
-                            <th>集数</th>
-                            <th>收视率%</th>
-                            <th>到达千人</th>
-                        </tr>
-                    </thead>
-                    <tbody id="rank_char_1">
-                    </tbody>
-                </table>
-			</div>
-			<div class="row-50">
-				<div class="hd-title mTop10">剧场电视剧收视排名</div>
-                <table class="table table-gray" cellpadding="0" cellspacing="0">
-                    <thead>
-                        <tr>
-                            <th>排名</th>
-                            <th>频道</th>
-                            <th>卫视级别</th>
-                            <th>集数</th>
-                            <th>收视率%</th>
-                            <th>到达千人</th>
-                        </tr>
-                    </thead>
-                    <tbody id="rank_char_2">
-                    </tbody>
-                </table>
+	<div class="table-content">
+		<div class="hd-title mTop20"><span name="type_tag"></span>电视剧及卫视剧场排名</div>
+		<div class="">
+			<div class="box-row">
+				<div class="row-50">
+					<div class="hd-title mTop10">剧场电视剧收视排名</div>
+					<table class="table table-gray" cellpadding="0" cellspacing="0">
+						<thead>
+							<tr>
+								<th>排名</th>
+								<th>剧名</th>
+								<th>卫视</th>
+								<th>题材</th>
+								<th>集数</th>
+								<th>收视率%</th>
+								<th>到达千人</th>
+							</tr>
+						</thead>
+						<tbody id="rank_char_1">
+						</tbody>
+					</table>
+				</div>
+				<div class="row-50">
+					<div class="hd-title mTop10">剧场电视剧收视排名</div>
+					<table class="table table-gray" cellpadding="0" cellspacing="0">
+						<thead>
+							<tr>
+								<th>排名</th>
+								<th>频道</th>
+								<th>卫视级别</th>
+								<th>集数</th>
+								<th>收视率%</th>
+								<th>到达千人</th>
+							</tr>
+						</thead>
+						<tbody id="rank_char_2">
+						</tbody>
+					</table>
+				</div>
 			</div>
 		</div>
 	</div>

src/main/webapp/WEB-INF/jsp/analysis/resource_evaluation_analysis_list.jsp

@@ -47,7 +47,7 @@
         </table>
         <div class="mTop20">
             <div id="analysisPage" class="rFloat"></div>
-            累计 <span id="analysisCount" class="orange">0</span> 条
+            累计 <span id="analysisCount" class="blue">0</span> 条
         </div>
     </div>
     <div class="main-content">
@@ -83,7 +83,7 @@
 	        </table>
 	        <div class="mTop20">
 	            <div id="evaluatePage" class="rFloat"></div>
-	            累计 <span id="evaluateCount" class="orange">0</span> 条
+	            累计 <span id="evaluateCount" class="blue">0</span> 条
 	        </div>
         </div>
     </div>

src/main/webapp/WEB-INF/jsp/analysis/special_analysis.jsp

@@ -27,36 +27,33 @@
 </head>
 <body>
 <%@ include file="../common/head.jsp" %>
-<div class="screen main">
+<div class="screen main bg-gray">
 	<div class="radius-tabs">
 		<a href="${basePath}special_analysis/index.do" class="button active">专题广告分析</a>
 		<a href="${basePath}theatre_analysis/index.do" class="button">央卫视剧场分析</a>
 	</div>
 	<div class="mTop20">
-	    <form name="dataForm" action="export.do" method="post">
+	    <form name="dataForm" class="search-form" action="export.do" method="post">
 		<div class="search-group">
-			<div class="buttons inline" id="tabMenu">
-				<span class="btn btn-disabled" data-day="0">全部</span>
-				<span class="btn" data-day="7">最近一周</span>
-				<span class="btn btn-disabled" data-day="90">最近三月</span>
-				<span class="btn btn-disabled" data-day="365">最近一年</span>
+			<div class="buttons button-wrap inline search-item5" id="tabMenu">
+				<span class="btn btn-disabled" data-day="0">全部</span><span class="btn" data-day="7">最近一周</span><span class="btn btn-disabled" data-day="90">最近三月</span><span class="btn btn-disabled" data-day="365">最近一年</span>
 			</div>    
-		    <span class="pLeft20"><input type="text" name="startDate" id="start_time" class="text {text:'开始时间'}" size="7" /> - <input type="text" name="endDate" id="end_time" class="text {text:'结束时间'}" size="7" /></span>
-		    <div class="search-item">           
+		    <span class="search-item5"><div class="twoContent"><input type="text" name="startDate" id="start_time" class="text {text:'开始时间'}" size="7" /><span>-</span><input type="text" name="endDate" id="end_time" class="text {text:'结束时间'}" size="7" /></div></span>
+		    <div class="search-item5">          
 	            <select id="type" name="type">
 	                <option value="0">产品广告</option>
 	                <option value="1">栏目广告</option>
 	            </select>
 		    </div>
-		    <div class="search-item"><input type="text" id="keyword" name="keyword" class="text {text:'请输入产品栏目/品牌/广告主/节目名称'}" size="30" /></div>
-			<div class="search-item">
+		    <div class="search-item5"><input type="text" id="keyword" name="keyword" class="text {text:'请输入产品栏目/品牌/广告主/节目名称'}" size="30" /></div>
+			<div class="search-item5">
 				<select name="mediaName" id="mediaName">
 		             <option value=""></option> 
 		        </select>
 	        </div>
-        </div>
+		</div>
         <div class="search-group">
-            <div class="search-item">
+            <div class="search-item5">
               <select id="showEnv" name="showEnv">
                   <option value="">请选择</option>
                   <option value="0">新闻</option>
@@ -71,53 +68,53 @@
                   <option value="9">记录片</option>
               </select>
             </div>
-			<div class="search-item">
+			<div class="search-item5">
 				<select id ="firstInd" name="firstInd">
 					<option value=""></option>
 				</select>
             </div>
-            <div class="search-item">     
+            <div class="search-item5"> 
                 <select id="secondInd" name="secondInd">
                     <option value=""></option>
                 </select>
-            </div>            
-            <div style="float:right;">
-				<div class="search-item"><a href="javascript:getBrandAnalysisList(1);" class="btn-radius">搜 索</a></div>
-				<div class="search-item"><a onclick="javascript:setBenchmark();" class="btn-radius">对 标</a></div>
-		    </div>
+			</div>
+			<div class="search-item5"><a href="javascript:getBrandAnalysisList(1);" class="search-btn">搜 索</a><a onclick="javascript:setBenchmark();" class="search-btn">对 标</a></div>        
 		</div>
 		</form>
 	</div>
-	<div class="mTop20 hd-title">专题广告电视投放一览</div>
-	<div class="box-pd">
-	    <a href="javascript:document.dataForm.submit();" class="rFloat btn">导出</a>
-		<table class="table table-gray" cellpadding="0" cellspacing="0">
-			<thead>
-			<tr>
-				<th>序号</th>
-				<th>媒体</th>
-				<th>播出时间</th>
-				<th>播出日期</th>
-				<th>播出环境</th>
-				<th>节目名称</th>
-				<th>时长(秒)</th>
-				<th>产品/栏目</th>
-				<th>品牌</th>
-				<th>一级行业</th>
-				<th>二级行业</th>
-				<th>广告主</th>
-				<th>联系方式</th>
-				<th>价格(万)</th>
-				<th width="7%"><input type="checkbox" class="checkbox {click:checkAll}" name="all" value="对标" /></th>
-			</tr>
-			</thead>
-			<tbody id="brand_analysis_list"></tbody>
-		</table>
-		<div class="mTop10">
-			<div id="brand_analysis_page" class="rFloat"></div>
-			累计 <span id="brand_analysis_count" class="orange">0</span> 条
+	<div class="table-content">
+		<div class="hd-title">专题广告电视投放一览</div>
+		<div class="box-pd">
+			<a href="javascript:document.dataForm.submit();" class="rFloat btn">导出</a>
+			<table class="table table-gray" cellpadding="0" cellspacing="0">
+				<thead>
+				<tr>
+					<th>序号</th>
+					<th>媒体</th>
+					<th>播出时间</th>
+					<th>播出日期</th>
+					<th>播出环境</th>
+					<th>节目名称</th>
+					<th>时长(秒)</th>
+					<th>产品/栏目</th>
+					<th>品牌</th>
+					<th>一级行业</th>
+					<th>二级行业</th>
+					<th>广告主</th>
+					<th>联系方式</th>
+					<th>价格(万)</th>
+					<th width="7%"><input type="checkbox" class="checkbox {click:checkAll}" name="all" value="对标" /></th>
+				</tr>
+				</thead>
+				<tbody id="brand_analysis_list"></tbody>
+			</table>
+			<div class="mTop10">
+				<div id="brand_analysis_page" class="rFloat"></div>
+				累计 <span id="brand_analysis_count" class="blue">0</span> 条
+			</div>
 		</div>
 	</div>
+	
 	<hr class="mTop10">
 	<div class="analyse-tabs">
 		<div class="tab-content-box">

src/main/webapp/WEB-INF/jsp/analysis/theatre_analysis.jsp

@@ -33,16 +33,21 @@ $(function(){
 </head>
 <body>
 <%@ include file="../common/head.jsp" %>
-<div class="screen main">
+<div class="screen main bg-gray">
 	<div class="radius-tabs">
 		<a href="${basePath}special_analysis/index.do" class="button">专题广告分析</a>
 		<a href="${basePath}theatre_analysis/index.do" class="button active">央卫视剧场分析</a>
 	</div>
-	<div class="mTop20">
-		<div class="rFloat search-group" style="margin: 0;">
-			<div class="search-item"><input type="text" name="product_item" id="keyword" class="text {text:'请输入节目/媒体'}" /></div>
-			<div class="search-item"><a href="javascript:search();" class="btn-radius">搜 索</a></div>
-			<div class="search-item">
+	<div class="search-form mTop20">
+		<div class="search-group">
+			<div class="buttons button-wrap inline search-item5" id="tabMenu">
+				<span class="btn btn-disabled" data-day="0">全部</span><span class="btn" data-day="7">最近一周</span><span class="btn btn-disabled" data-day="90">最近三月</span><span class="btn btn-disabled" data-day="365">最近一年</span>
+			</div>
+			<div class="search-item5">
+				<div class="twoContent"><input type="text" name="start_time" id="start_time" class="text {text:'开始时间'}" size="10" /><span>-</span><input type="text" name="end_time" id="end_time" class="text {text:'结束时间'}" size="10" /></div>
+			</div>
+			<div class="search-item5"><input type="text" name="product_item" id="keyword" class="text {text:'请输入节目/媒体'}" /></div>
+			<div class="search-item5">
                 <div class="select {width:120,onchange:search}">
                     <select id="type" name="type">
                         <option value="1">综艺</option>
@@ -52,71 +57,68 @@ $(function(){
                     </select>
                 </div>
             </div>
-			<div class="search-item"><a onclick="javascript:setBenchmark();" class="btn-radius">对 标</a></div>
+			<div class="search-item5"><a href="javascript:search();" class="search-btn">搜 索</a><a onclick="javascript:setBenchmark();" class="search-btn">对 标</a></div>
 		</div>
-		<div class="buttons inline" id="tabMenu">
-			<span class="btn btn-disabled" data-day="0">全部</span>
-			<span class="btn" data-day="7">最近一周</span>
-			<span class="btn btn-disabled" data-day="90">最近三月</span>
-			<span class="btn btn-disabled" data-day="365">最近一年</span>
-		</div>
-		<span class="pLeft20"><input type="text" name="start_time" id="start_time" class="text {text:'开始时间'}" size="10" /> - <input type="text" name="end_time" id="end_time" class="text {text:'结束时间'}" size="10" /></span>
 	</div>
-	<div class="mTop20 hd-title">央卫视电视剧收视指标一览</div>
-	<div class="box-pd">
-		<table class="table table-gray" cellpadding="0" cellspacing="0" id="program_analysis_list_table">
-			<thead>
-				<tr>
-					<th width="5%">序号</th>
-					<th width="8%">剧名</th>
-					<th width="7%">媒体</th>
-					<th width="auto">题材</th>
-					<th width="6%">细分题材</th>
-					<th width="8%">剧场</th>
-					<th width="6%">频道体系</th>
-					<th width="10%">季度</th>
-					<th width="7%">集次</th>
-					<th width="5%">省网收视%</th>
-					<th width="5%">省到达千人</th>
-					<th width="5%">频道收视率%</th>
-					<th width="7%">频道到达千人</th>
-					<th width="7%">效果</th>
-					<th width="7%"><input type="checkbox" class="checkbox {click:checkAll}" name="all" value="对标" /></th>
-				</tr>
-			</thead>
-			<tbody id="program_analysis_list"></tbody>
-		</table>
-		<div class="mTop10">
-			<div id="program_analysis_page" class="rFloat"></div>
-			累计 <span id="program_analysis_count" class="orange">0</span> 条
+	<div class="table-content">
+		<div class="hd-title">央卫视电视剧收视指标一览</div>
+		<div class="box-pd">
+			<table class="table table-gray" cellpadding="0" cellspacing="0" id="program_analysis_list_table">
+				<thead>
+					<tr>
+						<th width="5%">序号</th>
+						<th width="8%">剧名</th>
+						<th width="7%">媒体</th>
+						<th width="auto">题材</th>
+						<th width="6%">细分题材</th>
+						<th width="8%">剧场</th>
+						<th width="6%">频道体系</th>
+						<th width="10%">季度</th>
+						<th width="7%">集次</th>
+						<th width="5%">省网收视%</th>
+						<th width="5%">省到达千人</th>
+						<th width="5%">频道收视率%</th>
+						<th width="7%">频道到达千人</th>
+						<th width="7%">效果</th>
+						<th width="7%"><input type="checkbox" class="checkbox {click:checkAll}" name="all" value="对标" /></th>
+					</tr>
+				</thead>
+				<tbody id="program_analysis_list"></tbody>
+			</table>
+			<div class="mTop10">
+				<div id="program_analysis_page" class="rFloat"></div>
+				累计 <span id="program_analysis_count" class="blue">0</span> 条
+			</div>
 		</div>
 	</div>
-	<div class="mTop20 hd-title" id="program_placement_div_1"><span name="type_tag"></span>央卫视电视剧收视明细</div>
-	<div class="box-pd" id="program_placement_div_2">
-		<table class="table table-gray" cellpadding="0" cellspacing="0" id="program_placement_table">
-			<thead id="program_placement_thead">
-				<tr>
-					<th width="5%">序号</th>
-					<th width="7%">剧名</th>
-					<th width="7%">媒体</th>
-					<th width="7%">题材</th>
-					<th width="7%">细分题材</th>
-					<th width="10%">日期</th>
-					<th width="10%">播出时间</th>
-					<th width="7%">产品/栏目</th>
-					<th width="7%">时长(分钟)</th>
-					<th width="7%">进线预估</th>
-					<th width="7%">省网收视%</th>
-					<th width="7%">省网到达千人</th>
-					<th width="7%">市网收视%</th>
-					<th width="7%">市网到达千人</th>
-				</tr>
-			</thead>
-			<tbody id="placement_detail_list"></tbody>
-		</table>
-		<div class="mTop10">
-			<div id="placement_detail_page" class="rFloat"></div>
-			累计 <span id="placement_detail_count" class="orange">0</span> 条
+	<div class="table-content">
+		<div class="mTop20 hd-title" id="program_placement_div_1"><span name="type_tag"></span>央卫视电视剧收视明细</div>
+		<div class="box-pd" id="program_placement_div_2">
+			<table class="table table-gray" cellpadding="0" cellspacing="0" id="program_placement_table">
+				<thead id="program_placement_thead">
+					<tr>
+						<th width="5%">序号</th>
+						<th width="7%">剧名</th>
+						<th width="7%">媒体</th>
+						<th width="7%">题材</th>
+						<th width="7%">细分题材</th>
+						<th width="10%">日期</th>
+						<th width="10%">播出时间</th>
+						<th width="7%">产品/栏目</th>
+						<th width="7%">时长(分钟)</th>
+						<th width="7%">进线预估</th>
+						<th width="7%">省网收视%</th>
+						<th width="7%">省网到达千人</th>
+						<th width="7%">市网收视%</th>
+						<th width="7%">市网到达千人</th>
+					</tr>
+				</thead>
+				<tbody id="placement_detail_list"></tbody>
+			</table>
+			<div class="mTop10">
+				<div id="placement_detail_page" class="rFloat"></div>
+				累计 <span id="placement_detail_count" class="blue">0</span> 条
+			</div>
 		</div>
 	</div>
 	<hr class="mTop10">

src/main/webapp/WEB-INF/jsp/common/head.jsp

@@ -5,6 +5,6 @@
 			<a href="javascript:$.openWindow('个人信息', 'current_account.do', 500, 470, true);" class="u-info"><i class="icon ion-users"></i> ${manager.nickName}</a>
 			<a href="${basePath}logout.do"><i class="icon ion-exit"></i></a>
 		</div>
-		<a href="${basePath}${empty nextUrl ? 'login.do' : nextUrl}" class="logo"><h1>引力智能品牌管理系统</h1></a>
+		<a href="${basePath}${empty nextUrl ? 'login.do' : nextUrl}" class="logo"><h1>央广联合智能大数据</h1></a>
 	</div>
 </div>

src/main/webapp/WEB-INF/jsp/log/log_list.jsp

@@ -9,39 +9,42 @@
 		<%@ include file="../common/left.jsp" %>
 		
 		<div class="main-content">
-			<div class="btn-radius">日志查看</div>
-			<form id="logForm">
+			<div class="main-title">日志查看</div>
+			<form id="logForm" class="search-form">
 				<div class="search-group">
-					<div class="search-item">姓名&nbsp;&nbsp;
+					<div class="search-item">
+						<div class="label">姓名：</div>
 						<input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="40" />
 					</div>
-	                <div class="search-item">起止时间&nbsp;&nbsp;<input type="text" name="startDate" id="startDate" class="text {text:'开始日期'}" size="11" /> - <input type="text" name="endDate" id="endDate" class="text {text:'结束日期'}" size="11" /></div>
-						<div class="search-item">
-							<a href="javascript:void(0)" onclick="getList(1)" class="btn-radius">搜 索</a>
-						</div>	
-						<div class="rFloat buttons">
-							<a href="javascript:exportExcelForLog()" class="btn">导出</a>
-						</div>
+	                <div class="search-item"><div class="label">起止时间：</div><div class="twoContent"><input type="text" name="startDate" id="startDate" class="text {text:'开始日期'}" size="11" /><span>-</span><input type="text" name="endDate" id="endDate" class="text {text:'结束日期'}" size="11" /></div></div>
+					<div class="search-item">
+						<a href="javascript:void(0)" onclick="getList(1)" class="search-btn">搜 索</a>
+					</div>	
 				</div>
-			</form> 		
-			<table class="table mTop10" cellpadding="0" cellspacing="0">
-				<thead>
-					<tr>
-						<th>序号</th>
-						<th>账号</th>
-						<th>姓名</th>
-						<th>内容</th>
-						<th>ip地址</th>
-						<th>登录时间</th>
-					</tr>
-				</thead>
-				<tbody id="list">
-				</tbody>
-			</table>
-			<div class="mTop20">
-				<div id="page" class="rFloat"></div>
-				累计 <span id="count" class="orange">0</span> 条
-			</div>
+			</form> 
+			<div class="table-content">
+				<div class="rFloat buttons">
+					<a href="javascript:exportExcelForLog()" class="btn">导出</a>
+				</div>
+				<table class="table mTop10" cellpadding="0" cellspacing="0">
+					<thead>
+						<tr>
+							<th>序号</th>
+							<th>账号</th>
+							<th>姓名</th>
+							<th>内容</th>
+							<th>ip地址</th>
+							<th>登录时间</th>
+						</tr>
+					</thead>
+					<tbody id="list">
+					</tbody>
+				</table>
+				<div class="mTop20">
+					<div id="page" class="rFloat"></div>
+					累计 <span id="count" class="blue">0</span> 条
+				</div>
+			</div>		
 		</div>
 		<div class="clear"></div>
 </div>

src/main/webapp/WEB-INF/jsp/login/login.jsp

@@ -18,13 +18,12 @@ $(function(){
 <div class="login-bg">
 	<div class="warp-table">
 		<div class="warp-cell">
-			<div class="screen">
+			<div class="screen login-screen">
 				<div class="login-box rFloat">
-					<img src="static/img/login_logo.png" />
-					<p class="orange font14">中国领先的整合营销传播服务平台</p>
 					<div class="login-info">
+						<img src="static/img/login_logo.png" />
 						<form id="loginForm">
-							<h4 class="font16 normal" align="center">用户登录</h4>
+							<h4 class="font16 normal mTop20" align="center">账户登录</h4>
 							<input type="hidden" name="next" value="${next}"/>
 							<div class="login-input login-user">
 								<input type="text" name="loginName" />

src/main/webapp/WEB-INF/jsp/program/program.jsp

@@ -102,7 +102,7 @@
 		</table>
 		<div class="mTop20">
 			<div id="page" class="rFloat"></div>
-			累计 <span id="count" class="orange">10</span> 条
+			累计 <span id="count" class="blue">10</span> 条
 		</div>
 	</div>
 	<div class="clear"></div>

src/main/webapp/WEB-INF/jsp/system/add_role.jsp

@@ -8,8 +8,8 @@
 <div class="screen main">
 	<%@ include file="../common/left.jsp" %>
 	<div class="main-content">
-		<div class="btn-radius">新增角色</div>
-		<div class="open-content open-pad">
+		<div class="main-title">新增角色</div>
+		<div class="table-content">
 			<form id="addRoleForm">
 			<ul class="ulFrm">
 				<li>
@@ -25,7 +25,7 @@
 					<textarea rows="5"  class="textarea" name="info" id="info" cols="42"></textarea>
 				</li>
 				<li>
-					<span class="label labelW120 labelRight alignTop">菜单权限：</span>
+					<span class="label labelW80 labelRight alignTop">菜单权限：</span>
 					<ul class="auth inline">
 						<c:forEach var="first" items="${permissionList}">
 							<li>
@@ -40,7 +40,7 @@
 					</ul>
 				</li>
 				<li>
-					<span class="label labelW120 labelRight alignTop">功能权限：</span>
+					<span class="label labelW80 labelRight alignTop">功能权限：</span>
 					<div class="auth inline">
 					<c:forEach var="func" items="${funcList}">
 						<input type="checkbox" name="permissionId" value="${func.permissionId}" class="checkbox"/><label>${func.name }</label>
@@ -48,7 +48,7 @@
 					</div>
 				</li>
 				<li class="p85 mTop20">
-					<input class="btn-radius max-btn" value="提交" onclick="checkRoleAdd();" />
+					<input class="btn max-btn" value="提交" onclick="checkRoleAdd();" />
 				</li>
 			</ul>
 			</form>

src/main/webapp/WEB-INF/jsp/system/permission_list.jsp

@@ -8,35 +8,39 @@
 <div class="screen main">
 	<%@ include file="../common/left.jsp" %>
 	<div class="main-content">
-		<div class="btn-radius">权限管理</div>
-		<div class="search-group" style="margin-right:0;">
-			<%--<a href="javascript:$.openWindow('新增权限', 'addpermission.do', 650, 330, true);" class="btn rFloat">+新增</a>--%>
-			<div class="search-item">权限名称:&nbsp;&nbsp;
-				<input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="30" />
-			</div>
-			<div class="search-item">
-				<a href="javascript:void(0)" onclick="getList(1)" class="btn-radius">搜  索</a>
+		<div class="main-title">权限管理</div>
+		<div class="search-form">
+			<div class="search-group" style="margin-right:0;">
+				<%--<a href="javascript:$.openWindow('新增权限', 'addpermission.do', 650, 330, true);" class="btn rFloat">+新增</a>--%>
+				<div class="search-item">
+					<div class="label">权限名称：</div>
+					<input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="30" />
+				</div>
+				<div class="search-item">
+					<a href="javascript:void(0)" onclick="getList(1)" class="search-btn">搜  索</a>
+				</div>
 			</div>
 		</div>
-		<table class="table mTop10" cellpadding="0" cellspacing="0">
-			<thead>
-				<tr>
-					<th>序号</th>
-					<th>权限名称</th>
-					<th>权限编码</th>
-					<th>权限链接</th>
-					<th>权限优先级</th>
-					<%--<th>操作</th>--%>
-				</tr>
-			</thead>
-			<tbody id="list">
-			</tbody>
-		</table>
-		<div class="mTop20">
-			<div id="page" class="rFloat"></div>
-			累计 <span id="count" class="orange">0</span> 条
+		<div class="table-content">
+			<table class="table mTop10" cellpadding="0" cellspacing="0">
+				<thead>
+					<tr>
+						<th>序号</th>
+						<th>权限名称</th>
+						<th>权限编码</th>
+						<th>权限链接</th>
+						<th>权限优先级</th>
+						<%--<th>操作</th>--%>
+					</tr>
+				</thead>
+				<tbody id="list">
+				</tbody>
+			</table>
+			<div class="mTop20">
+				<div id="page" class="rFloat"></div>
+				累计 <span id="count" class="blue">0</span> 条
+			</div>
 		</div>
-		
 	</div>
 	<div class="clear"></div>
 </div>

src/main/webapp/WEB-INF/jsp/system/role_list.jsp

@@ -8,32 +8,38 @@
 <div class="screen main">
 	<%@ include file="../common/left.jsp" %>
 	<div class="main-content">
-		<div class="btn-radius">角色管理</div>
-		<div class="search-group" style="margin-right:0;">
-			<a href="addrole.do" class="btn rFloat">+新增</a>
-			<div class="search-item">
-				角色名称:&nbsp;&nbsp;
-				<input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="30" />
-			</div>
-			<div class="search-item">
-				<a href="javascript:void(0)" onclick="getList(1)" class="btn-radius">搜  索</a>
+		<div class="main-title">角色管理</div>
+		<div class="search-form">
+			<div class="search-group" style="margin-right:0;">
+				<div class="search-item">
+					<div class="label">角色名称：</div>
+					<input type="text" id="name" name="name" class="text {text:'请输入关键字'}" size="30" />
+				</div>
+				<div class="search-item">
+					<a href="javascript:void(0)" onclick="getList(1)" class="search-btn">搜  索</a>
+				</div>
 			</div>
 		</div>
-		<table class="table mTop10" cellpadding="0" cellspacing="0">
-			<thead>
-				<tr>
-					<th>序号</th>
-					<th>角色名称</th>
-					<th>角色编码</th>
-					<th>角色描述</th>
-					<th>操作</th>
-				</tr>
-			</thead>
-			<tbody id="list"></tbody>
-		</table>
-		<div class="mTop20">
-			<div id="page" class="rFloat"></div>
-			累计 <span id="count" class="orange">0</span> 条
+		<div class="table-content">
+			<div class="rFloat buttons">
+				<a href="addrole.do" class="btn">+新增</a>
+			</div>
+			<table class="table mTop10" cellpadding="0" cellspacing="0">
+				<thead>
+					<tr>
+						<th>序号</th>
+						<th>角色名称</th>
+						<th>角色编码</th>
+						<th>角色描述</th>
+						<th>操作</th>
+					</tr>
+				</thead>
+				<tbody id="list"></tbody>
+			</table>
+			<div class="mTop20">
+				<div id="page" class="rFloat"></div>
+				累计 <span id="count" class="blue">0</span> 条
+			</div>
 		</div>
 	</div>
 	<div class="clear"></div>

src/main/webapp/WEB-INF/jsp/system/update_role.jsp

@@ -9,7 +9,7 @@
 <div class="screen main">
 	<%@ include file="../common/left.jsp" %>
 		<div class="main-content">
-			<div class="btn-radius">修改角色</div>
+			<div class="main-title">修改角色</div>
 			<div class="open-content open-pad">
 			<form id="modfiyRoleForm">
 			<input type="hidden" name="roleId" id="roleId" value="${role.roleId}">

src/main/webapp/WEB-INF/jsp/user/user_list.jsp

@@ -8,24 +8,30 @@
 		<%@ include file="../common/left.jsp" %>
 		
 		<div class="main-content">
-			<div class="btn-radius">用户管理</div>
-				
-			<div class="search-group">
-				<div class="search-item">用户名&nbsp;&nbsp;
-					<input type="text" id="loginName" name="loginName" class="text {text:'请输入关键字'}" size="40" />
-				</div>
-				<div class="search-item">姓名&nbsp;&nbsp;
-					<input type="text" id="nickName" name="nickName" class="text {text:'请输入关键字'}" size="40" />
-				</div>
-				<div class="search-item">手机号&nbsp;&nbsp;
-					<input type="text" id="telephone" name="telephone" class="text {text:'请输入关键字'}" size="40" />
-				</div>
-				<div class="mTop10">
-					<div class="search-item">邮箱&nbsp;&nbsp;
+			<div class="main-title">用户管理</div>
+			<div class="search-form">
+				<div class="search-group">
+					<div class="search-item">
+						<div class="label">用户名：</div>
+						<input type="text" id="loginName" name="loginName" class="text {text:'请输入关键字'}" size="40" />
+					</div>
+					<div class="search-item">
+						<div class="label">姓名：</div>
+						<input type="text" id="nickName" name="nickName" class="text {text:'请输入关键字'}" size="40" />
+					</div>
+					<div class="search-item">
+						<div class="label">手机号：</div>
+						<input type="text" id="telephone" name="telephone" class="text {text:'请输入关键字'}" size="40" />
+					</div>
+					<div class="search-item">
+						<div class="label">邮箱：</div>
 						<input type="text" id="email" name="email" class="text {text:'请输入关键字'}" size="40" />
 					</div>
-					<div class="search-item">性别
-						<div class="select selectW200 {width:200}">
+				</div>
+				<div class="search-group">
+					<div class="search-item">
+						<div class="label">性别：</div>
+						<div class="select">
 							<select name="userSex" id="userSex">
 								<option value="">全部</option>
 								<option value="0">男</option>
@@ -33,8 +39,9 @@
 							</select>
 						</div>
 					</div>
-					<div class="search-item">角色
-						<div class="select selectW200 {width:200}">
+					<div class="search-item">
+						<div class="label">角色：</div>
+						<div class="select">
 							<select name="userRole" id="userRole">
 								<option value="">全部</option>
 								<c:forEach items="${roleList}" var="role">
@@ -44,41 +51,42 @@
 						</div>
 					</div>
 					<div class="search-item">
-						<a href="javascript:void(0)" onclick="getList(1)" class="btn-radius">搜 索</a>
+						<a href="javascript:void(0)" onclick="getList(1)" class="search-btn">搜 索</a>
 					</div>
 				</div>
 			</div>
-			
-			<div class="rFloat buttons">
-				<a href="javascript:$.openWindow('新增用户', 'adduser.do', 650, 370, true);" class="btn">+新增</a>
-				<a href="${staticPath}excel/用户导入模板.xlsx" target="_blank" class="btn">下载模板</a>
-				<a href="javascript:void(0);" class="btn upfile">
-					<form id="excelInfo" action="" method="POST" enctype="multipart/form-data" target="hframe">
-						<input type="file" name="uploadfile" onchange="uploadExcel(this);"/><span>导入表</span>
-					</form>
-				</a>
-				<a href="user_export.do?type=4" class="btn">导出</a>
-			</div>
-			已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;<a href="javascript:delUser();" class="btn del">批量删除</a>
-			<table class="table mTop10" cellpadding="0" cellspacing="0">
-				<thead>
-					<tr>
-						<th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
-						<th>用户名</th>
-						<th>姓名</th>
-						<th>手机号</th>
-						<th>邮箱</th>
-						<th>性别</th>
-						<th>角色</th>
-						<th width="98">操作</th>
-					</tr>
-				</thead>
-				<tbody id="list">
-				</tbody>
-			</table>
-			<div class="mTop20">
-				<div id="page" class="rFloat"></div>
-				累计 <span id="count" class="orange">0</span> 条
+			<div class="table-content">
+				<div class="rFloat buttons">
+					<a href="javascript:$.openWindow('新增用户', 'adduser.do', 650, 370, true);" class="btn">+新增</a>
+					<a href="${staticPath}excel/用户导入模板.xlsx" target="_blank" class="btn">下载模板</a>
+					<a href="javascript:void(0);" class="btn upfile">
+						<form id="excelInfo" action="" method="POST" enctype="multipart/form-data" target="hframe">
+							<input type="file" name="uploadfile" onchange="uploadExcel(this);"/><span>导入表</span>
+						</form>
+					</a>
+					<a href="user_export.do?type=4" class="btn">导出</a>
+				</div>
+				已选 <span id="checkCount" class="orange">0</span> 条&nbsp;&nbsp;<a href="javascript:delUser();" class="btn del">批量删除</a>
+				<table class="table mTop10" cellpadding="0" cellspacing="0">
+					<thead>
+						<tr>
+							<th width="44"><input type="checkbox" class="checkbox checkbox-white {click:checkAll}" name="all" value="" /></th>
+							<th>用户名</th>
+							<th>姓名</th>
+							<th>手机号</th>
+							<th>邮箱</th>
+							<th>性别</th>
+							<th>角色</th>
+							<th width="98">操作</th>
+						</tr>
+					</thead>
+					<tbody id="list">
+					</tbody>
+				</table>
+				<div class="mTop20">
+					<div id="page" class="rFloat"></div>
+					累计 <span id="count" class="blue">0</span> 条
+				</div>
 			</div>
 		</div>
 		<div class="clear"></div>

src/main/webapp/static/js/admedia/admedia.js

@@ -18,7 +18,7 @@ function getList(page){
 					'<td>'+ (item.rankName == undefined || item.rankName == null ? '' : item.rankName ) +'</td>'+
     				'<td class="nop">'+(item.imgUrl ? '<img src="'+item.imgUrl.toNull()+'" width="98" height="58" valign="middle" onerror="this.src=_PUBLIC_ + \'static/img/noimg.jpg\'"/>':'&nbsp;')+'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'品牌型号信息\','+item.id+');">编辑</a><br />' : '') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'品牌型号信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/adplatform/adplatform.js

@@ -87,7 +87,7 @@ function getList(page){
     				'<td>'+ (item.firstInd == undefined || item.firstInd == null ? '' : item.firstInd ) +'</td>'+
     				'<td>'+ (item.secondInd == undefined || item.secondInd == null ? '' : item.secondInd ) +'</td>'+
     				'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'栏目信息\','+item.id+');">编辑</a><br />' : '') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'栏目信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/adproduct/adproduct.js

@@ -89,7 +89,7 @@ function getList(page){
 					'<td>'+ (item.firstInd == undefined || item.firstInd == null ? '' : item.firstInd ) +'</td>'+
     				'<td>'+ (item.secondInd == undefined || item.secondInd == null ? '' : item.secondInd ) +'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'产品信息\','+item.id+');">编辑</a><br />' : '') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'产品信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/adresource/advertise.js

@@ -30,7 +30,7 @@ function getList(page){
                     '<td>'+item.customer.toNull()+'</td>'+
                     '<td>'+item.remarks.toNull()+'</td>'+
                     '<td class="edit">'+
-                        (update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'电视硬广\','+item.id+');">编辑</a><br />' : '') +
+                        (update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'电视硬广\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
                         (delete_flag == 1 ? '<a href="javascript:delAdvertise('+item.id+');">删除</a>' : '' ) +
                     '</td>'+
                 '</tr>';

src/main/webapp/static/js/adresource/app.js

@@ -30,7 +30,7 @@ function getAppList(page){
 					'<td>'+item.customer.toString().decode("","-",item.customer)+'</td>'+
 					'<td>'+item.remarks.toString().decode("","-",item.remarks)+'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'App资源信息\','+item.id+');">编辑</a><br />' : '') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'App资源信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/adresource/long.js

@@ -33,7 +33,7 @@ function getLongList(page){
 					'<td>'+item.customer.toString().decode("","-",item.customer)+'</td>'+
 					'<td>'+item.remarks.toString().decode("","-",item.remarks)+'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'长视频资源信息\','+item.id+');">编辑</a><br />' : '') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'长视频资源信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
     					(score_flag == 1&& 1 == item.type? '<a href="javascript:platformModfiyFormScore(\''+item.name+'\');">'+item.scoreId.toString().decode("0","评价", "已评")+'</a>': '') +
 					'</td>'+

src/main/webapp/static/js/adresource/other.js

@@ -30,7 +30,7 @@ function getList(page){
 					'<td>'+item.customer.toNull()+'</td>'+
 					'<td>'+item.remarks.toNull()+'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'网络其他资源信息\','+item.id+');">编辑</a><br />' : '') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'网络其他资源信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/adresource/play.js

@@ -33,7 +33,7 @@ function getList(page){
                     '<td>'+(item.customer ? item.customer : "")+'</td>'+
                     '<td>'+(item.remarks ? item.remarks : "")+'</td>'+
                     '<td class="edit">'+
-                        (update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'电视硬广\','+item.id+');">编辑</a><br />' : '') +
+                        (update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'电视硬广\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
                         (delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a><br / >' : '' ) +
                         (score_flag == 1 && 1 == item.type ? '<a href="javascript:platformModfiyFormScore(\''+item.name+'\');">'+item.scoreId.toString().decode("0","评价", "已评")+'</a>' : '') +
                     '</td>'+

src/main/webapp/static/js/adresource/project.js

@@ -28,7 +28,7 @@ function getList(page){
                       '<td>'+ item.totalEquity + '</td>'+  
                       '<td>' + (item.uploadTime ? new Date(item.uploadTime.time).Format("yyyy-MM-dd hh:mm:ss"):"")  + '</td>' + 
                   	'<td class="edit"> '+
-                  	(update_flag == 1 ? '<a href="resource_project_info.do?projectId=' + item.id +'">编辑</a><br />' :'') +
+                  	(update_flag == 1 ? '<a href="resource_project_info.do?projectId=' + item.id +'">编辑</a>&nbsp;&nbsp;' :'') +
                   	(delete_flag == 1 ? '<a href="javascript:delProject('+ item.id  + ')">删除</a>' :'') +
                   	'</td>' +
       			'</tr>';

src/main/webapp/static/js/adresource/project_info.js

@@ -32,7 +32,7 @@ function getList(page){
 						'<td>'+ item.equity + '</td>'+
 						'<td>'+ item.totalEquity + '</td>'+
 						'<td class="edit">'+
-							'<a href="javascript:projectInfoModfiy(\'edit\',\'电视台下单\','+item.id+');">编辑</a><br />' +
+							'<a href="javascript:projectInfoModfiy(\'edit\',\'电视台下单\','+item.id+');">编辑</a>&nbsp;&nbsp;' +
 							'<a href="javascript:delProjectInfo('+item.id+');">删除</a>' +
 						'</td>'+
       			'</tr>';

src/main/webapp/static/js/adresource/short.js

@@ -30,7 +30,7 @@ function getShortList(page){
 					'<td>'+item.customer.toString().decode("","-",item.customer)+'</td>'+
 					'<td>'+item.remarks.toString().decode("","-",item.remarks)+'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'短视频资源信息\','+item.id+');">编辑</a><br />' : '') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'短视频资源信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/adspecial/adspecial.js

@@ -185,8 +185,8 @@ function getList(page){
 					'<td>'+ (item.showDuration == undefined || item.showDuration == null ? '' : item.showDuration) +'</td>'+
 					'<td>'+ (item.price == undefined || item.price == null ? '' : item.price) +'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 && item.type == 0 ? '<a href="javascript:platformModfiy(\'edit\',\'专题广告信息\','+item.id+','+item.type+');">编辑</a><br />' : '') +
-    					(update_flag == 1 && item.type == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'专题栏目信息\','+item.id+','+item.type+');">编辑</a><br />' : '') +
+    					(update_flag == 1 && item.type == 0 ? '<a href="javascript:platformModfiy(\'edit\',\'专题广告信息\','+item.id+','+item.type+');">编辑</a>&nbsp;&nbsp;' : '') +
+    					(update_flag == 1 && item.type == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'专题栏目信息\','+item.id+','+item.type+');">编辑</a>&nbsp;&nbsp;' : '') +
 	                    (delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/adtheatre/adtheatre.js

@@ -44,7 +44,7 @@ function getList(page){
                     (delete_flag == 1 ? '<a href="'+ _PUBLIC_ +'ad-theatre-tv/detail.do?id='+item.id+'&edit=1" target="_blank">编辑</a>' : '' ) +
                     '</td>'+
                     '<td class="edit">'+
-                    (update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'剧场信息\','+item.id+');">编辑</a><br />' : '') +
+                    (update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'剧场信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
                     (delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
                     '</td>'+
                     '</tr>';

src/main/webapp/static/js/adtv/adtv.js

@@ -87,7 +87,7 @@ function getList(page){
     				'<td>'+ (item.secondTheme == undefined || item.secondTheme == null ? '' : item.secondTheme ) +'</td>'+
 					'<td class="nop">'+(item.imgUrl ? '<img src="'+item.imgUrl.toNull()+'" width="98" height="58" valign="middle" onerror="this.src=_PUBLIC_ + \'static/img/noimg.jpg\'"/>':'&nbsp;')+'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'电视剧信息\','+item.id+');">编辑</a><br />' : '') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'电视剧信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/advertise/brand.js

@@ -26,7 +26,7 @@ function getList(page){
 					'<td>'+item.firstInd.toNull()+'</td>'+
 					'<td>'+item.secondInd.toNull()+'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'品牌型号信息\','+item.id+');">编辑</a><br />' : '') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'品牌型号信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/advertise/brand_placement.js

@@ -42,7 +42,7 @@ function getList(page){
 					'<td>'+(item.length != -1 ? item.length : "")+'</td>'+// 时长
 					'<td>'+item.price+'</td>'+// 预估价格
     				'<td class="edit">'+
-						(update_flag == 1 ? '<a href="brand_placement_info.do?id='+item.id+'" target="_blank" >编辑</a><br />' : '')+
+						(update_flag == 1 ? '<a href="brand_placement_info.do?id='+item.id+'" target="_blank" >编辑</a>&nbsp;&nbsp;' : '')+
 						(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '')+
 					'</td>'+
 				'</tr>';
@@ -324,7 +324,7 @@ function saveInfoBox(){
 	    <td>'+data.frequency+'</td>\n\
 	    <td>'+data.length+'</td>\n\
 	    <td class="edit">\n\
-	        <a href="javascript:placementModfiy(\'edit\',\'植入方式\',\''+data.id+'\','+(data['act'] == "edit" ? $.getParam("index") : table.length)+');">编辑</a><br />\n\
+	        <a href="javascript:placementModfiy(\'edit\',\'植入方式\',\''+data.id+'\','+(data['act'] == "edit" ? $.getParam("index") : table.length)+');">编辑</a>&nbsp;&nbsp;\n\
 	        <a class="del">删除</a>\n\
 	    </td>\n\
 	</tr>';

src/main/webapp/static/js/advertise/platform.js

@@ -18,7 +18,7 @@ function getList(page){
     				'<td>'+item.type.toString().decode(1,"电视频道",2,"视频平台","其他")+'</td>'+
     				'<td class="nop">'+(item.imgUrl ? '<img src="'+item.imgUrl.toNull()+'" width="98" height="58" valign="middle" onerror="this.src=\'static/img/noimg.jpg\'"/>':'&nbsp;')+'</td>'+
     				'<td class="edit">'+
-    					'<a href="javascript:platformModfiy(\'edit\',\'媒体信息\','+item.id+');">编辑</a><br />'+
+    					'<a href="javascript:platformModfiy(\'edit\',\'媒体信息\','+item.id+');">编辑</a>&nbsp;&nbsp;'+
     					'<a href="javascript:delRecord('+item.id+');">删除</a>'+
     				'</td>'+
     			'</tr>';

src/main/webapp/static/js/advertise/program_schedule.js

@@ -22,7 +22,7 @@ function getList(page){
     				'<td><a href="'+item.associatedFile+'" style="color: #65AAFF" target="_blank">'+item.associatedFileName+'</a></td>'+
                     '<td>'+item.crtUname.toString().decode("","-",item.crtUname)+'</td>'+
 					'<td class="edit">'+
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'节目编排信息\','+item.id+');">编辑</a><br />' : '<br />') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'节目编排信息\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '<br />') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '<br />' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/advertise/resource_recom.js

@@ -31,7 +31,7 @@ function getList(page){
 						(update_status_flag == 1 ? 
 							(item.status==2 ? '<a href="javascript:setStatus('+item.id+');">设为隐藏</a><br />' :
 							 item.status==0 ? '<a href="javascript:setStatus('+item.id+');">设为显示</a><br />' : '' ):'<br />') + 
-    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'资源推荐\','+item.id+');">编辑</a><br />' : '<br />') +
+    					(update_flag == 1 ? '<a href="javascript:platformModfiy(\'edit\',\'资源推荐\','+item.id+');">编辑</a>&nbsp;&nbsp;' : '<br />') +
     					(delete_flag == 1 ? '<a href="javascript:delRecord('+item.id+');">删除</a>' : '<br />' ) +
 					'</td>'+
 				'</tr>';

src/main/webapp/static/js/program/program.js

@@ -25,11 +25,11 @@ function getList(page){
                       '<td>'+(item.startTime ? new Date(item.startTime.time).Format("hh:mm"):"")+'</td>'+                     
                       '<td>'+(item.endTime ? new Date(item.endTime.time).Format("hh:mm"):"")+ '</td>'+        
                   	'<td class="edit">'+
-                  	' <a href="'+item.type.toString().decode("1","program_data_vareity.do?id="+item.id + "&mode=1", "2","program_data_vareity.do?id="+ item.id + "&mode=1", "3","program_data_tv.do?id=" + item.id + "&mode=1","4", "program_data_movie.do?id=" + item.id + "&mode=1","") +'">查看</a><br />'+
+                  	' <a href="'+item.type.toString().decode("1","program_data_vareity.do?id="+item.id + "&mode=1", "2","program_data_vareity.do?id="+ item.id + "&mode=1", "3","program_data_tv.do?id=" + item.id + "&mode=1","4", "program_data_movie.do?id=" + item.id + "&mode=1","") +'">查看</a>&nbsp;&nbsp;'+
                   	(data_update_flag == 1 ? ' <a href="'+item.type.toString().decode("1","program_data_vareity.do?id="+item.id + "&mode=2", "2","program_data_vareity.do?id="+ item.id + "&mode=2", "3","program_data_tv.do?id=" + item.id + "&mode=2","4", "program_data_movie.do?id=" + item.id + "&mode=2","") +'">编辑</a>' : '') +
                   	'</td>' +
                   	'<td class="edit"> '+
-                  	(update_flag == 1 ? '<a href="javascript:programModfiy(\'edit\',\'节目\','+item.id+')">编辑</a><br />' : '')+
+                  	(update_flag == 1 ? '<a href="javascript:programModfiy(\'edit\',\'节目\','+item.id+')">编辑</a>&nbsp;&nbsp;' : '')+
                   	(delete_flag == 1 ? '<a href="javascript:delProgram('+item.id+')">删除</a>' : '') +
                   	'</td>' +
       			'</tr>';