diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php
index 29a928a1..bdbd611f 100755
--- a/application/default/controllers/DataController.php
+++ b/application/default/controllers/DataController.php
@@ -41,7 +41,7 @@ class DataController extends Zend_Controller_Action
     	$state=$this->db->query("select keyword,count(*) from keyword right join normalmetadata on keyword.id=normalmetadata.id  where keytype='theme' group by keyword order by count desc limit 27");
     	//$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='theme' and (m.uuid in (select uuid from dataorder group by uuid order by count(uuid) desc limit 20)) group by k.keyword order by count(k.keyword) desc limit 20");
     	$k2=$state->fetchAll();
-    	$state=$this->db->query("select keyword,count(*) from keyword right join normalmetadata on keyword.id=normalmetadata.id  where keytype='discipline' group by keyword order by count desc limit 27");
+    	$state=$this->db->query("select keyword,count(*) from keyword right join normalmetadata on keyword.id=normalmetadata.id  where keytype='discipline' group by keyword order by count desc limit 10");
     	$k3=$state->fetchAll();
     	$state=$this->db->query("select keyword,count(*) from keyword right join normalmetadata on keyword.id=normalmetadata.id  where keytype='stratum' group by keyword order by count desc limit 27");
     	$k4=$state->fetchAll();
diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml
index db2c40c0..31e0f899 100755
--- a/application/default/views/scripts/data/index.phtml
+++ b/application/default/views/scripts/data/index.phtml
@@ -37,8 +37,11 @@ $this->headLink()->appendStylesheet('/static-sanjy-np/css/about.css');
                 <p class="font24 t_big1">DATA</p>
                 <img src="/static-sanjy-np/img/tie_suo.jpg" width="179" height="14">
                 <ul class="in_list font14">
-                    <li><a href="/data" class="active">全部数据</a></li>
-                    <li><a href="/data">最新数据</a></li>
+                    <?php $type = 'discipline'; ?>
+                    <?php foreach ($this->keywords[$type] as $cg) : ?>
+                        <li><a href="/data/tag/<?= $cg['keyword'] ?>"><?= $cg['keyword'] ?></a></li>
+                    <?php endforeach; ?>
+
                 </ul>
                 <p><img src="/static-sanjy-np/img/map_img.jpg" width="183" height="174"></p>
                 <div class="in_phone"><p class="y_1 color_3">02164057520</p><span class="y_2">欢迎您来电咨询</span></div>
@@ -49,7 +52,8 @@ $this->headLink()->appendStylesheet('/static-sanjy-np/css/about.css');
                 <?php foreach ($this->metadata as $md) : ?>
                     <li>
                         <div class="newsImgBox">
-                            <a href="/data/<?php echo $md['uuid']; ?>"><img src="/service/thumb/id/<?php echo $md['id']; ?>"></a>
+                            <a href="/data/<?php echo $md['uuid']; ?>"><img
+                                        src="/service/thumb/id/<?php echo $md['id']; ?>"></a>
                         </div>
                         <div class="newRight">
                             <div class="newTopTitle">
@@ -68,10 +72,7 @@ $this->headLink()->appendStylesheet('/static-sanjy-np/css/about.css');
                 <div class="page">
                     <div class="pagenavi">
                         <ul class="pagination">
-                            <li class="disabled"><a href="javascript:;">«</a></li>
-                            <li class="active"><a href="javascript:void(0);">1</a></li>
-                            <li><a href="javascript:void(0);">2</a></li>
-                            <li class="disabled"><a href="javascript:;">»</a></li>
+                            <li class="pagenavi"><?= $this->paginator; ?></li>
                         </ul>
                     </div>
                 </div>