From 336a330e84c1d683fe072a89a52dc9a6c9b6a6e2 Mon Sep 17 00:00:00 2001
From: wangyan <wangyan@surfbird.cn>
Date: Fri, 29 Apr 2022 14:19:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/gateway/common/header.vue |  14 ++--
 src/views/gateway/detailedPage.vue  |  84 ++++++++++-------------
 src/views/gateway/listPage.vue      | 103 +++++++++++++++-------------
 3 files changed, 97 insertions(+), 104 deletions(-)

diff --git a/src/views/gateway/common/header.vue b/src/views/gateway/common/header.vue
index 6b1404e..b538727 100644
--- a/src/views/gateway/common/header.vue
+++ b/src/views/gateway/common/header.vue
@@ -22,7 +22,7 @@
 		<div id="MutiNav">
 			<ul class="multiUl">
 				<li class="multiUlli">
-					<a class="mulgo" href="index.html" title="首页">
+					<a class="mulgo" href="javascript:void(0);" title="首页" @click="$to('home')">
 						<span class="mulgochie">首页</span>
 					</a>
 				</li>
@@ -95,7 +95,7 @@
 					</blockquote>
 				</li>
 				<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-					<a class="mulgo" href="nycyh.html" title="农业产业化">
+					<a class="mulgo" href="javascript:void(0);" title="农业产业化" @click="$to('listPage',{pid:102,id:10201})">
 						<span class="mulgochie">农业产业化</span>
 					</a>
 					<blockquote>
@@ -121,7 +121,7 @@
 					</blockquote>
 				</li>
 				<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-					<a class="mulgo" href="bjgh.html" title="布局规划">
+					<a class="mulgo"  title="布局规划" href="javascript:void(0);"  @click="$to('listPage',{pid:103,id:10301})">
 						<span class="mulgochie">布局规划</span>
 					</a>
 					<blockquote>
@@ -151,7 +151,7 @@
 					</blockquote>
 				</li>
 				<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-					<a class="mulgo" href="lsny.html" title="绿色农业">
+					<a class="mulgo" title="绿色农业" href="javascript:void(0);"  @click="$to('listPage',{pid:104,id:10401})">
 						<span class="mulgochie">绿色农业</span>
 					</a>
 					<blockquote>
@@ -181,7 +181,7 @@
 					</blockquote>
 				</li>
 				<li class="multiUlli" @mouseenter="openMenu" @mouseleave="closeMenu">
-					<a class="mulgo" href="kydt.html" title="科研动态">
+					<a class="mulgo" title="科研动态" href="javascript:void(0);"  @click="$to('listPage',{pid:105,id:10501})">
 						<span class="mulgochie">科研动态</span>
 					</a>
 					<blockquote>
@@ -203,12 +203,12 @@
 					</blockquote>
 				</li>
 				<li class="multiUlli" >
-					<a class="mulgo" href="zlxczx.html" title="助力乡村振兴">
+					<a class="mulgo" title="助力乡村振兴" href="javascript:void(0);"  @click="$to('listPage',{pid:106,id:106})">
 						<span class="mulgochie">助力乡村振兴</span>
 					</a>
 				</li>
 				<li class="multiUlli">
-					<a class="mulgo" href="qt.html" title="其他">
+					<a class="mulgo" title="其他" href="javascript:void(0);"  @click="$to('listPage',{pid:107,id:107})">
 						<span class="mulgochie">其他</span>
 					</a>
 				</li>
diff --git a/src/views/gateway/detailedPage.vue b/src/views/gateway/detailedPage.vue
index c76689c..4a8e2e1 100644
--- a/src/views/gateway/detailedPage.vue
+++ b/src/views/gateway/detailedPage.vue
@@ -1,55 +1,42 @@
 <template>
   <div>
     <headerView/>
-    <!-- banner -->
-    <div class="er_banner">
-      <div class="bannerimg">
-        <div class="banneritem">{{$tf(parentData,"name")}}</div>
-      </div>
-    </div>
-    <!-- banner -->
-    <div class="er_cont clearfloat">
-      <div class="contl left">
-        <ul>
-          <li v-for="(column,columnIndex) in columnList" :key="columnIndex" :class="thisColumn.id==column.id?'er_active':''">
-            <a href="javascript:void(0);" @click="$to('listPage',{pid:column.parent,id:column.id})" :class="thisColumn.id==column.id?'er_active2':''">{{$tf(column,"name")}}</a>
-          </li>
-          <!-- <li >
-            <a href="javascript:void(0);" class="er_active2">通知公告</a>
-          </li> -->
-        </ul>
-      </div>
-      <div class="contr right">
-        <div class="contrupbox clearfloat">
-          <span class="contrupl left">{{$tf(thisColumn,'name')}}</span>
-          <div class="contrupr right">
-            <span>{{$t('common.currentLocation')}}</span>
-            <a href="javascript:void(0);" @click="$to('home')">{{$t('common.homeName')}} </a>
-            <a href="javascript:void(0);" @click="$to('listPage',{pid:thisColumn.parent})"> > {{$tf(parentData,"name")}}</a>
-            <a href="javascript:void(0);"> > {{$tf(thisColumn,'name')}}</a>
-          </div>
-        </div>
-
-        <div class="contrdown">
-          <h2 class="contitem">{{$tf(articleData,'title')}}</h2>
-          <div class="contdate">
-            <span style="margin-right: 14px;">{{$t('common.author')}}<span>{{$tf(articleData,'author')}}</span></span>
-            <span style="margin-right: 14px;">{{$t('common.source')}}<span>{{$tf(articleData,'source')}}</span></span>
-            <span>{{$t('common.publishTime')}}<span>{{articleData.updateTime || articleData.createTime}}</span></span>
-          </div>
-          <p class="contpp" v-html="$tf(articleData,'content')"></p>
-          <template v-if="$tFiles(articleData,'files') && $tFiles(articleData,'files').length">
-            <p class="contpp">
-              {{$t('common.enclosure')}}
-            </p>
-            <p class="contpp" v-for="(file,fileIndex) in $tFiles(articleData,'files')" :key="fileIndex">
-              <a style="color:#0082f5" :href="file" target="_blank">{{getFileName(file)}}</a>
-            </p>
+    <div class="er_bann2"></div>
+		<div class="weizhibox">
+			<div class="weizhi">
+				<span><img src="img/shouye.png" style="width: 16px;margin: 11px 4px 0 0;"></span>
+				<span>当前位置：</span>
+				<a href="javascript:void(0);" @click="$to('home')">首页 ></a>
+				<a href="javascript:void(0);" @click="$to('listPage',{pid:thisColumn.parent,id:thisColumn.id})">{{parentData.name}} > </a>
+				<!-- <a href="javascript:void(0);" >{{parentData.name}} > </a> -->
+				<a href="javascript:void(0);">{{thisColumn.name}}</a>
+			</div>
+		</div>
+		<div class="er_contant clearfloat">
+			<div class="er_contl left">
+				<div class="hjk_item">
+					<h3>{{parentData.name}}</h3>
+					<div class="" style="width: 60px;height: 3px;background-color: #3591EB;margin-top: -3px;"></div>
+				</div>
+				<ul>
+          <template v-for="(col,colIndex) in columnList" >
+            <li v-if="col.id == thisColumn.id" :key="colIndex" class="active2" ><a href="javascript:void(0);" class="active3" @click="$to('listPage',{pid:col.parent,id:col.id})">{{col.name}}</a></li>
+            <li v-if="col.id != thisColumn.id" :key="colIndex"><a href="javascript:void(0);" @click="$to('listPage',{pid:col.parent,id:col.id})">{{col.name}}</a></li>
           </template>
-
-        </div>
-      </div>
-    </div>
+				</ul>
+			</div>
+			<div class="cyh_contr right">
+				<div class="xqer_cont">
+					<h3>{{articleData.title}}</h3>
+					<div class="xqer_date">
+						<span>发布日期：<span>{{articleData.updateTime || articleData.createTime}}</span></span>
+						<span>作者：<span>{{articleData.author}}</span></span>
+					</div>
+					<p v-html="articleData.content"></p>
+					
+				</div>
+			</div>
+		</div>
     <footerView/>
   </div>
 </template>
@@ -104,6 +91,7 @@ export default {
           this.parentData =data.parentGatewayColumn
           this.thisColumn = data.currentGatewayColumn
           this.columnList = data.gatewayColumnList
+          console.log('columnList', this.columnList );
 
           // if(!this.columnId){
           //   let firstColumn = this.columnList[0]
diff --git a/src/views/gateway/listPage.vue b/src/views/gateway/listPage.vue
index b6aa2d0..632cdd2 100644
--- a/src/views/gateway/listPage.vue
+++ b/src/views/gateway/listPage.vue
@@ -1,50 +1,56 @@
 <template>
   <div>
     <headerView/>
-    <!-- banner -->
-    <div class="er_banner">
-      <div class="bannerimg" v-if="parentData">
-        <div class="banneritem">{{$tf(parentData,"name")}}</div>
-      </div>
-    </div>
-    <!-- banner -->
-    <div class="er_cont clearfloat">
-      <div class="contl left">
-        <ul>
-          <li v-for="(column,columnIndex) in columnList" :key="columnIndex" :class="id==column.id?'er_active':''">
-            <a href="javascript:void(0);" @click="$to('listPage',{pid:column.parent,id:column.id})" :class="id==column.id?'er_active2':''">{{$tf(column,"name")}}</a>
-          </li>
-          <!-- <li >
-            <a href="javascript:void(0);" class="er_active2">通知公告</a>
-          </li> -->
-        </ul>
-      </div>
-      <div class="contr right">
-        <div class="contrupbox clearfloat">
-          <span class="contrupl left">{{$tf(thisColumn,'name')}}</span>
-          <div class="contrupr right">
-            <span>{{$t('common.currentLocation')}}</span>
-            <a href="javascript:void(0);" @click="$to('home')">{{$t('common.homeName')}} </a>
-            <a href="javascript:void(0);" @click="$to('listPage',{pid:thisColumn.parent})"> > {{$tf(parentData,"name")}}</a>
-            <a href="javascript:void(0);"> > {{$tf(thisColumn,'name')}}</a>
-          </div>
-        </div>
+    <!-- <div class="er_bann2"></div> -->
+    <div class="er_bann" v-if="$route.query.pid == 101"></div>
+    <div class="er_bann2" v-if="$route.query.pid == 102"></div>
+    <div class="er_bann3" v-if="$route.query.pid == 103"></div>
+    <div class="er_bann4" v-if="$route.query.pid == 104"></div>
+    <div class="er_bann5" v-if="$route.query.pid == 105"></div>
+    <div class="er_bann6" v-if="$route.query.pid == 106"></div>
+    <div class="er_bann7" v-if="$route.query.pid == 107"></div>
+    <div class="weizhibox">
+			<div class="weizhi">
+				<span><img src="img/shouye.png" style="width: 16px;margin: 11px 4px 0 0;"></span>
+				<span>当前位置：</span>
+				<a href="javascript:void(0);" @click="$to('home')">首页 ></a>
+				<!-- <a href="javascript:void(0);" @click="$to('listPage',{pid:thisColumn.parent})">{{parentData.name}} > </a> -->
+				<a href="javascript:void(0);" >{{parentData.name}} > </a>
+				<a href="javascript:void(0);">{{thisColumn.name}}</a>
+			</div>
+		</div>
+    <div class="er_contant clearfloat">
+			<div class="er_contl left">
+				<div class="hjk_item">
+					<h3>{{parentData.name}}</h3>
+					<div class="" style="width: 60px;height: 3px;background-color: #3591EB;margin-top: -3px;"></div>
+				</div>
+				<ul>
+          <template v-for="(col,colIndex) in columnList" >
+            <li v-if="col.id == thisColumn.id" :key="colIndex" class="active2"><a href="javascript:void(0);" class="active3">{{col.name}}</a></li>
+            <li v-if="col.id != thisColumn.id" :key="colIndex"><a href="javascript:void(0);" @click="$to('listPage',{pid:col.parent,id:col.id})">{{col.name}}</a></li>
+          </template>
+				</ul>
+			</div>
+			<div class="cyh_contr right">
+				<ul>
+					<li v-for="(art,artIndex) in articleList" :key="artIndex">
+						<a href="javascript:void(0);" class="cyh_coa clearfloat" @click="$to('detailedPage',{id:art.id})">
+							<div class="cyhl left">
+								<h3 class="elli">{{art.title}}</h3>
+								<p class="over-line2">{{art.content}}</p>
+							</div>
+							<div class="cyhr right">
+								<div class="cyhr_date">{{art.createTime}}</div>
+								<div class="jianttewr">→</div>
+							</div>
+						</a>
+					</li>
+				</ul>
+			</div>
+		</div>
 
-        <div class="contrdown">
-          <ul>
 
-            <li v-for="(article,articleIndex) in articleList" :key="articleIndex">
-              <a href="javascript:void(0);" class="clearfloat" @click="$to('detailedPage',{id:article.id})">
-                <span class="dian left"></span>
-                <h3 class="left elli">{{$tf(article,"title")}}</h3>
-                <span class="right">{{article.updateTime || article.createTime}}</span>
-              </a>
-            </li>
-
-          </ul>
-        </div>
-      </div>
-    </div>
     <footerView/>
   </div>
 </template>
@@ -112,13 +118,12 @@ export default {
           this.parentData = list.find(x => !x.parent);
           this.thisColumn = list.find(x => x.id == this.id);
           this.columnList = list.filter(x => x.parent);
-
-          if(!this.id){
-            let firstColumn = this.columnList[0]
-            if(firstColumn){
-              //this.$to('listPage',{pid:firstColumn.parent,id:firstColumn.id},true)
-            }
-          }
+          // if(!this.id){
+          //   let firstColumn = this.columnList[0]
+          //   if(firstColumn){
+          //     //this.$to('listPage',{pid:firstColumn.parent,id:firstColumn.id},true)
+          //   }
+          // }
         }
       });
       //如果没有ID自动选中一个