clay commit : 新闻中心对接完成

src/utils/sist.js

@@ -42,6 +42,25 @@ export function getParentNode(id) {
   }
 }
 
+
+export function getNodeMenu(id) {
+  try {
+    let menuList = JSON.parse(sessionStorage.getItem("menu"));
+    for (let menu of menuList) {
+      for (let child of menu.children) {
+        for (let item of child.children) {
+          if (id == item.encodeId) {
+            return item
+          }
+        }
+      }
+    }
+    return null
+  } catch (e) {
+    return null
+  }
+}
+
 export function setAppLanguage() {
   let lang = sessionStorage.getItem("lang");
   if (lang != null) {

src/views/content/components/file_list.vue

@@ -20,15 +20,15 @@
     </div>
     <div class="list">
       <!--<el-row>-->
-      <div class="file" v-for="(file ,index) in value.data" :key="index">
+      <div class="article" v-for="(file ,index) in value.data" :key="index">
-        <div class="file_name">
+        <div class="article_name">
             <span class="span">
               <img class="def_img" src="@/assets/file_list/xz_icon_xz.png">
               <img class="hover_img" src="@/assets/file_list/xz_icon_xzls.png">
             </span>
           <a :href="file.fileAddr">{{ file.fileName }}</a>
         </div>
-        <div class="file_time">
+        <div class="article_time">
           {{ getDateTime(file.createTime) }}
         </div>
 
@@ -43,8 +43,8 @@
     </div>
     <el-row>
       <el-col class="pagination_p">
-        <el-pagination class="pagination"
+        <el-pagination v-if="!smallType"
-                       :small="small"
+                       :small="!smallType"
                        @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="value.pageNum"
@@ -52,6 +52,14 @@
                        layout="prev, pager,next,sizes,  jumper"
                        :total="value.total">
         </el-pagination>
+        <el-pagination v-if="smallType"
+                       :small="smallType"
+                       @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="value.pageNum"
+                       layout="prev ,pager,next"
+                       :total="value.total">
+        </el-pagination>
       </el-col>
     </el-row>
   </div>
@@ -66,8 +74,8 @@ export default {
     value: {
       type: Object,
       default() {
-        return{
+        return {
-          data:[],
+          data: [],
           pageNum: 1,
           pageSize: 10,
         }
@@ -77,11 +85,14 @@ export default {
   data() {
     return {
       width: document.documentElement.clientWidth,
-      small: document.documentElement.clientWidth <= 992,
+      smallType: document.documentElement.clientWidth <= 992,
       query: '',
-      pageSize:value.pageSize
+      pageSize: value.pageSize
     }
   },
+  created() {
+    this.smallType = document.documentElement.clientWidth <= 992
+  },
   methods: {
     getDateTime(date) {
       let time = new Date(date);
@@ -125,7 +136,7 @@ export default {
       if (this.type != null && this.type != 0) {
         data.id = this.value.secondId
       }
-      console.log(data,"data")
+      console.log(data, "data")
       getNode(data).then(res => {
         this.value.data = res.rows
         this.value.total = res.total
@@ -150,13 +161,18 @@ export default {
   padding-top: 5rem;
   font-size: 1.6rem;
 
-  .file {
+  .article {
     color: #757575;
     clear: both;
     padding: 2rem 3rem;
 
-    .file_name {
+    .article_name {
       float: left;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box; //作为弹性伸缩盒子模型显示。
+      -webkit-box-orient: vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
+      -webkit-line-clamp: 1; //显示的行
 
       .span {
         padding-right: 1rem;
@@ -175,7 +191,7 @@ export default {
       }
     }
 
-    .file_time {
+    .article_time {
       float: right;
     }
 
@@ -184,7 +200,7 @@ export default {
     }
   }
 
-  .file:hover {
+  .article:hover {
     //background-color: gray;
     color: #1956BC;
 
@@ -193,7 +209,7 @@ export default {
       font-weight: bold;
     }
 
-    .file_name {
+    .article_name {
       .def_img {
         display: none;
       }

src/views/content/components/list.vue

@@ -54,14 +54,21 @@
 
       <el-row>
         <el-col class="pagination_p">
-          <el-pagination class="pagination" v-if="listData"
+          <el-pagination  v-if="!small"
+                          :small="!small"
+                          @size-change="handleSizeChange"
+                          @current-change="handleCurrentChange"
+                          :current-page.sync="listData.pageNum"
+                          :page-sizes="[10,20, 30, 50, 100]"
+                          layout="prev, pager,next,sizes,  jumper"
+                          :total="listData.total">
+          </el-pagination>
+          <el-pagination v-if="small"
                          :small="small"
                          @size-change="handleSizeChange"
                          @current-change="handleCurrentChange"
                          :current-page.sync="listData.pageNum"
-                         :page-sizes="[5,10,20, 30, 50, 100]"
+                         layout="prev ,pager,next"
-                         :page-size="4"
-                         layout="prev, pager, next,sizes, jumper"
                          :total="listData.total">
           </el-pagination>
         </el-col>
@@ -165,15 +172,6 @@ export default {
   }
 }
 </script>
-<style>
-.el-input__inner {
-
-  border-color: #1956BC !important;
-  border-radius: 0 !important;
-  /*line-height: 3.5rem !important;*/
-  /*height: 3.5rem !important;*/
-}
-</style>
 
 <style scoped lang="scss">
 
@@ -280,15 +278,6 @@ export default {
   }
 }
 
-.pagination_p {
-  text-align: center;
-  margin-bottom: 2rem;
-
-  .pagination {
-    display: inline-block;
-    float: none;
-  }
-}
 
 .query {
   //margin: 1rem 0;
@@ -312,7 +301,8 @@ export default {
     width: 80% !important;
   }
   .context {
-    margin-top: 6rem;
+    width: 80% !important;
+    margin-top: 4rem;
   }
 }
 </style>

src/views/content/components/simple_list.vue

@@ -0,0 +1,288 @@
+<template>
+  <div class="article_list" style="background-color:#fff; margin-top: 3rem;">
+    <div class="query">
+      <el-row>
+        <el-col :xs="14" :sm="14" :md="14" :lg="20" :xl="20">
+          <!--<div style="width: 95%;">-->
+          <div>
+            <!--<input class="query_input" v-model="query"/>-->
+            <el-input class="query_input" v-model="query" size="small"
+                      :placeholder="$t('message.placeholder')"></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="10" :sm="10" :md="10" :lg="4" :xl="4" style="float: right">
+          <el-button class="query_button" type="primary" size="small" icon="el-icon-search"
+                     @click="handleCurrentChange(-1)">
+            {{ $t('message.search') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="list">
+      <!--<el-row>-->
+      <div class="article" v-for="(item ,index) in listData.data" :key="index">
+        <el-row>
+          <el-col :span="20">
+            <div class="article_name" @click="getContext(item)">
+              <span class="span">
+                <img class="def_img" src="@/assets/index/scientific_research_trends/huidian@2x.png">
+                <img class="hover_img" src="@/assets/index/scientific_research_trends/sy_icon_b1@2x.png">
+              </span>
+              <!--          <a :href="file.fileAddr">{{ file.fileName }}</a>-->
+              {{ item.title }}
+            </div>
+          </el-col>
+          <el-col :span="4">
+            <div class="article_time">
+              {{ getDateTime(item.publishTime) }}
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+    <el-row>
+      <el-col class="pagination_p">
+        <el-pagination  v-if="!small"
+                       :small="!small"
+                       @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="listData.pageNum"
+                       :page-sizes="[10,20, 30, 50, 100]"
+                       layout="prev, pager,next,sizes,  jumper"
+                       :total="listData.total">
+        </el-pagination>
+        <el-pagination v-if="small"
+                       :small="small"
+                       @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="listData.pageNum"
+                       layout="prev ,pager,next"
+                       :total="listData.total">
+        </el-pagination>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import {getNode} from "@/api";
+
+export default {
+  name: "list",
+  props: {
+    list: {
+      type: Object,
+      default() {
+        return {
+          data: [],
+          pageNum: 1,
+          pageSize: 10,
+        }
+      },
+    },
+  },
+  data() {
+    return {
+      listData : this.list,
+      width: document.documentElement.clientWidth,
+      small: document.documentElement.clientWidth <= 992,
+      query: '',
+    }
+  },
+  watch:{
+    list(val){
+      this.listData = val
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    getDateTime(date) {
+      let time = new Date(date);
+      let year = time.getFullYear();
+      let month = time.getMonth() + 1
+      let day = time.getDate();
+      return year + "-" + month + "-" + day;
+    },
+    getContext(context) {
+      let type = this.$route.query && this.$route.query.type
+      let router = ''
+      if (type != null) {
+        router = "?id=" + context.id + '&type=' + type + "&lang=" + sessionStorage.getItem("lang")
+      } else {
+        router = "/" + this.listData.navId + "?id=" + context.id + "&lang=" + sessionStorage.getItem("lang")
+      }
+      let routeData = null;
+      if (this.width <= 992) {
+        routeData = this.$router.resolve({path: "/mobile/" + this.listData.secondId + router});
+      } else {
+        routeData = this.$router.resolve({path: "/pc/" + this.listData.secondId + router});
+      }
+      window.open(routeData.href,"_blank")
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      if (val === -1) {
+        this.listData.pageSize = 1
+      } else {
+        this.listData.pageSize = val
+      }
+      this.getData()
+    },
+    handleCurrentChange(val) {
+      if (val === -1) {
+        this.listData.pageNum = 1
+      } else {
+        this.listData.pageNum = val
+      }
+      this.getData()
+    },
+    getData() {
+      let data = {
+        title: this.query,
+        id: this.listData.navId,
+        pageNum: this.listData.pageNum,
+        pageSize: this.listData.pageSize
+      }
+      if (this.small){
+        data.pageSize = 20
+      }
+      this.type = this.$route.query && this.$route.query.type
+      if (this.type != null && this.type !== 0) {
+        data.id = this.listData.secondId
+      } else {
+        console.log(this.listData);
+      }
+      // console.log(data);
+      getNode(data).then(res => {
+        this.listData.data = res.rows
+        this.listData.total = res.total
+      })
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+.list {
+  padding-top: 5rem;
+  font-size: 1.6rem;
+
+  .article {
+    color: #757575;
+    clear: both;
+    padding: 1rem 3rem;
+
+    .article_name {
+      float: left;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box; //作为弹性伸缩盒子模型显示。
+      -webkit-box-orient: vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
+      -webkit-line-clamp: 1; //显示的行
+
+      .span {
+        padding-right: 1rem;
+
+        .def_img, .hover_img {
+          width: 1.5rem;
+        }
+
+        .def_img {
+          display: inline-block;
+        }
+
+        .hover_img {
+          display: none;
+        }
+      }
+    }
+
+    .article_time {
+      float: right;
+    }
+
+    a {
+      color: #757575 !important;
+    }
+  }
+
+  .article:hover {
+    //background-color: gray;
+    color: #1956BC;
+
+    a {
+      color: #1956BC !important;
+      font-weight: bold;
+    }
+
+    .article_name {
+      .def_img {
+        display: none;
+      }
+
+      .hover_img {
+        display: inline-block;
+      }
+    }
+
+
+  }
+
+  a {
+    text-decoration: none;
+  }
+}
+
+.pagination_p {
+  text-align: center;
+  margin-bottom: 2rem;
+  margin-top: 5rem;
+
+  .pagination {
+    display: inline-block;
+    float: none;
+  }
+}
+
+.query {
+  //margin: 1rem 0;
+  z-index: 999;
+  width: 30%;
+  position: absolute;
+  right: 3rem;
+  top: -2.4rem;
+  //float: right;
+
+  .query_input {
+    border-color: #1956BC !important;
+    border-radius: 0 !important;
+
+  }
+
+  .query_button {
+    //height: 3.5rem;
+    border-radius: 0rem 1rem 1rem 0rem;
+    background-color: #1956BC;
+    border-color: #1956BC !important;
+  }
+
+}
+
+@media screen and (min-width: 1100px) and (max-width: 1400px) {
+  .query {
+    width: 40% !important;
+  }
+}
+
+@media screen and (max-width: 1100px) {
+  .query {
+    height: 1rem;
+    width: 80% !important;
+    margin-top: 4rem;
+  }
+}
+
+</style>

src/views/content/index.vue

@@ -100,7 +100,8 @@
           <el-row>
             <el-col>
               <Introduction :introduction="contextData" v-if="type === 1"/>
-              <List :list="contextData" v-if="type === 2"/>
+              <List :list="contextData" v-if="type === 2 && listDataType == 0"/>
+              <SimpleList :list="contextData" v-if="type === 2 && listDataType == 1"/>
               <FileList :value="contextData" v-if="type === 4"/>
               <DireData :value="contextData" v-if="type === 3 && dreDataType == '1'"/>
               <DireDataTow :value="contextData" v-if="type === 3 && dreDataType == '2'"/>
@@ -139,7 +140,8 @@
           <el-row>
             <el-col>
               <Introduction :introduction="contextData" v-if="type === 1"/>
-              <List :list="contextData" v-if="type === 2"/>
+              <List :list="contextData" v-if="type === 2 && listDataType == 0"/>
+              <SimpleList :list="contextData" v-if="type === 2 && listDataType == 1"/>
               <FileList :value="contextData" v-if="type === 4"/>
               <DireData :value="contextData" v-if="type === 3 && dreDataType == '1'"/>
               <DireDataTow :value="contextData" v-if="type === 3 && dreDataType == '2'"/>
@@ -164,6 +166,7 @@ import DireData from './components/dire_data.vue'
 import DireDataTow from './components/dire_data_tow.vue'
 import Details from './components/details.vue'
 import FileList from './components/file_list.vue'
+import SimpleList from './components/simple_list.vue'
 import {handleTree} from "@/utils/ebts";
 import {getParentNode, setLanguage} from "@/utils/sist";
 
@@ -175,7 +178,8 @@ export default {
     DireData,
     Details,
     FileList,
-    DireDataTow
+    DireDataTow,
+    SimpleList
   },
   data() {
     return {
@@ -183,6 +187,7 @@ export default {
       secondId: null,
       navId: null,
       dreDataType: "",
+      listDataType: 0,
       navList: [],
       showIndex: 0,
       showSecond: true,
@@ -387,8 +392,10 @@ export default {
           pageNum: 1,
           pageSize: 5
         }
-        if (this.type === 4) {
+        this.listDataType = 0
+        if (this.type === 4||menu.isSimple == 1) {
           data.pageSize = 10
+          this.listDataType = 1
         }
       } else {
         data = {

src/views/header/index.vue

@@ -47,7 +47,8 @@
         <div class="bottom-div" style="margin-left: 1rem;">
           <el-col v-show="width" :xs="1" :sm="1" :md="4" :lg="4" :xl="5">
             <div class="icon">
-              <div class="icont"><img src="@/assets/header/logo@2x.png" alt=""></div>
+<!--              <div class="icont"><img src="@/assets/header/logo@2x.png" alt=""></div>-->
+              <div class="icont"><img src="@/assets/header/sy_logo1@2x.png" alt=""></div>
               <!--            <div class="iconb"><img src="@/assets/header/sy_logo2@2x.png" alt=""></div>-->
             </div>
           </el-col>
@@ -233,8 +234,8 @@ export default {
       .icont {
         img {
           // todo logo有问题
-          //  width: 23.3rem;
+            width: 23.3rem;
-          width: 15rem;
+          //width: 15rem;
         }
       }
 
@@ -264,7 +265,7 @@ export default {
         font-size: 1.6rem;
         font-family: "微软雅黑";
         font-weight: 400;
-        color: #FFFFFF;
+        color: #C5DCFE;
         cursor: pointer;
         display: flex;
         align-items: center;

src/views/header/mobile_herder.vue

@@ -1,58 +1,69 @@
 <template>
-<div class="mobile_herder">
+  <div class="mobile_herder">
-  <div class="bottom">
+    <div class="bottom">
-    <div @click="drawer = true">
+      <div @click="drawer = true">
-      <i class="el-icon-s-fold"></i>
+        <i class="el-icon-s-fold"></i>
+      </div>
+      <div class="img">
+        <img src="@/assets/header/sy_logo1@2x.png" alt="">
+      </div>
+      <!--    <div class="img">-->
+      <!--      <img src="@/assets/header/sy_logo2@2x.png" alt="">-->
+      <!--    </div>-->
+      <div class="switchLang" @click="switchLang">{{ $t('message.switch') }}</div>
     </div>
-    <div class="img">
+    <el-drawer
-      <img src="@/assets/header/sy_logo1@2x.png" alt="">
+      size="60%"
-    </div>
+      :append-to-body="true"
-    <div class="img">
+      :withHeader="false"
-      <img src="@/assets/header/sy_logo2@2x.png" alt="">
+      :visible.sync="drawer"
-    </div>
+      :direction="direction"
-    <div class="switchLang" @click="switchLang">{{ $t('message.switch') }}</div>
+    >
-  </div>
+      <!--    <div class="banner">导航</div>-->
-  <el-drawer
+      <el-menu
-    size="60%"
+        default-active="2"
-    :append-to-body="true"
+        class="el-menu-vertical-demo"
-    :withHeader="false"
+        @open="handleOpen"
-    :visible.sync="drawer"
+        @close="handleClose">
-    :direction="direction"
+        <el-menu-item index="1" @click="home">
-  >
+          <span slot="title">{{ $t('message.home') }}</span>
-<!--    <div class="banner">导航</div>-->
+        </el-menu-item>
-    <el-menu
+        <el-submenu v-for="(menu,menuIndex) in menuData" :index="menuIndex+2" :key="menuIndex">
-      default-active="2"
+          <template slot="title">
-      class="el-menu-vertical-demo"
+            <span v-if="$i18n.locale  === 'cn'">{{ menu.title }}</span>
-      @open="handleOpen"
+            <span v-if="$i18n.locale  === 'en'">{{ menu.englishTitle }}</span>
-      @close="handleClose">
-      <el-menu-item index="1" @click="home">
-        <span slot="title">{{ $t('message.home') }}</span>
-      </el-menu-item>
-      <el-submenu :index="menuIndex+2"  v-for="(menu,menuIndex) in menuData" :key="menuIndex">
-        <template slot="title" >
-          <span v-if="$i18n.locale  === 'cn'">{{ menu.title }}</span>
-          <span v-if="$i18n.locale  === 'en'">{{ menu.englishTitle }}</span>
-        </template>
-        <el-submenu :index="menuIndex +'-'+itemIndex" v-for="(item,itemIndex) in menu.children" :key="itemIndex" >
-
-          <template slot="title" v-if="item.children.length == 0 && $i18n.locale  === 'cn'">
-            <span  @click="clickSecondMenu(item)">{{item.title}}</span>
-          </template>
-          <template  slot="title" v-if="item.children.length == 0&& $i18n.locale  === 'en'">
-            <span  @click="clickSecondMenu(item)">{{item.englishTitle}}</span>
           </template>
 
-          <template slot="title" v-if="item.children.length > 0 &&$i18n.locale  === 'cn' " >{{item.title}}</template>
+          <span v-for="(item,itemIndex) in menu.children" :key="itemIndex">
-          <template slot="title" v-if="item.children.length > 0 && $i18n.locale  === 'en'" >{{item.englishTitle}}</template>
+            <el-submenu :index="menuIndex +'-'+itemIndex" v-if="item.children.length > 0">
-          <el-menu-item v-for="(chile ,chileIndex) in item.children" :key="chileIndex" :index="menuIndex +'-'+itemIndex +'-' +chileIndex" @click="clickMenu(chile,item)">
+
-            <span v-if="$i18n.locale  === 'cn'">{{ chile.title }}</span>
+              <template slot="title" v-if="item.children.length == 0 && $i18n.locale  === 'cn'">
-            <span v-if="$i18n.locale  === 'en'">{{ chile.englishTitle }}</span>
+                <span @click="clickSecondMenu(item)">{{ item.title }}</span>
-          </el-menu-item>
+              </template>
+              <template slot="title" v-if="item.children.length == 0&& $i18n.locale  === 'en'">
+                <span @click="clickSecondMenu(item)">{{ item.englishTitle }}</span>
+              </template>
+
+              <template slot="title" v-if="item.children.length > 0 &&$i18n.locale  === 'cn' ">{{ item.title }}</template>
+              <template slot="title"
+                        v-if="item.children.length > 0 && $i18n.locale  === 'en'">{{ item.englishTitle }}</template>
+              <el-menu-item v-for="(chile ,chileIndex) in item.children" :key="chileIndex"
+                            :index="menuIndex + '-' +itemIndex + '-' +chileIndex" @click="clickMenu(chile,item)">
+                <span v-if="$i18n.locale  === 'cn'">{{ chile.title }}</span>
+                <span v-if="$i18n.locale  === 'en'">{{ chile.englishTitle }}</span>
+              </el-menu-item>
+            </el-submenu>
+            <el-menu-item v-if="!item.children.length>0" :key="itemIndex" :index="menuIndex +'-'+itemIndex" @click="clickSecondMenu(item)">
+              <span v-if="$i18n.locale  === 'cn'">{{ item.title }}</span>
+              <span v-if="$i18n.locale  === 'en'">{{ item.englishTitle }}</span>
+            </el-menu-item>
+          </span>
+
+
         </el-submenu>
-      </el-submenu>
+      </el-menu>
-    </el-menu>
+    </el-drawer>
-  </el-drawer>
+  </div>
-</div>
 
 </template>
 
@@ -67,30 +78,33 @@ export default {
     return {
       drawer: false,
       direction: 'ltr',
-      mobile:document.documentElement.clientWidth <=992,
+      mobile: document.documentElement.clientWidth <= 992,
-      menuData:[],
+      menuData: [],
     };
   },
   created() {
-    if (this.mobile){
+    if (this.mobile) {
-      getNavigation({}).then(res=>{
+      getNavigation({}).then(res => {
         this.menuData = res.data
-        sessionStorage.setItem("menu",JSON.stringify(res.data))
+        sessionStorage.setItem("menu", JSON.stringify(res.data))
       })
     }
   },
   methods: {
-    home(){
+    home() {
-      this.$router.push("/home?lang="+sessionStorage.getItem("lang"))
+      this.$router.push("/home?lang=" + sessionStorage.getItem("lang"))
     },
-    clickSecondMenu(menu){
+    // 二级菜单点击
+    clickSecondMenu(menu) {
       this.drawer = false
-      this.$router.push("/mobile/" +menu.encodeId+"?type="+menu.type+"&lang="+sessionStorage.getItem("lang"));
+      this.$router.push("/mobile/" + menu.encodeId + "?type=" + menu.type + "&lang=" + sessionStorage.getItem("lang"));
 
     },
-    clickMenu(menu,parent){
+    //三级菜单点击
+    clickMenu(menu, parent) {
+      console.log("三级菜单点击")
       this.drawer = false
-      this.$router.push("/mobile/" +parent.encodeId+"/"+menu.encodeId+"&lang="+sessionStorage.getItem("lang"));
+      this.$router.push("/mobile/" + parent.encodeId + "/" + menu.encodeId + "?type=" + menu.type + "&lang=" + sessionStorage.getItem("lang"));
     },
     switchLang() {
       let lang = ''
@@ -99,9 +113,9 @@ export default {
       } else {
         lang = 'en'
       }
-      sessionStorage.setItem("lang",lang)
+      sessionStorage.setItem("lang", lang)
       let fullPath = this.$route.fullPath
-      window.location.replace(fullPath.substr(0,fullPath.length-2)+lang)
+      window.location.replace(fullPath.substr(0, fullPath.length - 2) + lang)
     },
     handleOpen(key, keyPath) {
       console.log(key, keyPath);
@@ -113,60 +127,69 @@ export default {
 }
 </script>
 <style>
-.el-drawer__wrapper{
+.el-drawer__wrapper {
-  z-index: 9999!important;
+  z-index: 9999 !important;
 }
+
 /*#el-drawer__title{*/
 /*  display: none !important;*/
 /*}*/
 </style>
 
 <style scoped lang="scss">
-.banner{
+.banner {
   text-align: center;
   height: 4rem;
   font-size: 3rem;
-  margin-top: 3rem ;
+  margin-top: 3rem;
 }
-  .mobile_herder{
+
-    .top{
+.mobile_herder {
-      padding-left: 2rem;
+  .top {
-      height: 4rem;
+    padding-left: 2rem;
-      background-color: #1956BC;
+    height: 4rem;
-      line-height: 4rem;
+    background-color: #1956BC;
-      font-size: 1.6rem;
+    line-height: 4rem;
-      color: #ffffff;
+    font-size: 1.6rem;
-    }
+    color: #ffffff;
-    .bottom{
-      background-color: #1956BC;
-      padding-left: 2rem;
-      font-size: 5rem;
-      height: 6.3rem;
-      line-height: 6rem;
-      cursor: pointer;
-      clear: left;
-      .el-icon-s-fold{
-        width: 6rem;
-        height: 6rem;
-        color: white;
-      }
-      div{
-        float: left;
-      }
-      .switchLang{
-        float: right;
-        font-size: 2rem;
-        color: #ffffff;
-        margin-right: 3rem;
-      }
-      img{
-        height: 3rem;
-        line-height: 6rem;
-      }
-      .img{
-        margin-left: 3rem;
-      }
-      //width: 100%;
-    }
   }
+
+  .bottom {
+    background-color: #1956BC;
+    padding-left: 2rem;
+    font-size: 5rem;
+    height: 6.3rem;
+    line-height: 6rem;
+    cursor: pointer;
+    clear: left;
+
+    .el-icon-s-fold {
+      width: 6rem;
+      height: 6rem;
+      color: white;
+    }
+
+    div {
+      float: left;
+    }
+
+    .switchLang {
+      float: right;
+      font-size: 2rem;
+      color: #ffffff;
+      margin-right: 3rem;
+    }
+
+    img {
+      height: 3rem;
+      line-height: 6rem;
+    }
+
+    .img {
+      margin-left: 3rem;
+    }
+
+    //width: 100%;
+  }
+}
 </style>

src/views/index/components/news_center.vue

@@ -20,71 +20,23 @@
     <!--轮播图下的新闻-->
     <div class="news">
       <el-row>
-        <el-col :span="6">
+        <el-col :span="6" v-for="(item,index) in newsData" :key="index">
           <div class="news_context">
             <div class="news_context_img">
-              <img src="../../../assets/index/news_center/t4.png" alt="">
+              <img v-if="!item.imgurl" src="../../../assets/index/news_center/t4.png" alt="">
+              <img v-if="item.imgurl" :src="item.imgurl" alt="">
             </div>
             <div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
-              <div class="news_context_text-title">信息引领，勇于拼领，勇于拼搏—信息搏…</div>
+              <div class="news_context_text-title">{{ item.title }}</div>
-              <div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
+              <div class="news_context_text-content" v-html="item.content">
               </div>
               <div class="news_context_time">
                 <div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
-                <span class="time">2022-10-2</span>
+                <span class="time">{{getDateTime(item.publishTime)}}</span>
               </div>
             </div>
           </div>
         </el-col>
-        <el-col :span="6">
-          <div class="news_context">
-            <div class="news_context_img">
-              <img src="../../../assets/index/news_center/t4.png" alt="">
-            </div>
-            <div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
-              <div class="news_context_text-title">信息引领，勇于拼搏—信息搏…</div>
-              <div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
-              </div>
-              <div class="news_context_time">
-                <div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
-                <span class="time">2022-10-2</span>
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="news_context">
-            <div class="news_context_img">
-              <img src="../../../assets/index/news_center/t4.png" alt="">
-            </div>
-            <div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
-              <div class="news_context_text-title">信息引领，勇于拼搏—信息搏…</div>
-              <div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
-              </div>
-              <div class="news_context_time">
-                <div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
-                <span class="time">2022-10-2</span>
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6">
-          <div class="news_context">
-            <div class="news_context_img">
-              <img src="../../../assets/index/news_center/t4.png" alt="">
-            </div>
-            <div class="news_context_text">
-              <div class="news_context_text-title">信息引领，勇于拼搏—信息搏…</div>
-              <div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
-              </div>
-              <div class="news_context_time">
-                <div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
-                <span class="time">2022-10-2</span>
-              </div>
-              <div class="vline"></div>
-            </div>
-          </div>
-        </el-col>
       </el-row>
     </div>
 
@@ -92,22 +44,20 @@
 </template>
 
 <script>
-import {banner, getArticleList} from "@/api";
+import {getArticleList} from "@/api";
-import {toArticle, lookMoreComment} from "@/utils/sist";
+import {toArticle} from "@/utils/sist";
 import {lookMoreFixedComment} from "../../../utils/sist";
 
 export default {
   name: "news_center",
   data() {
     return {
-      newsDate: [],
+      newsData: [],
-      bannerDate: [],
       width: document.documentElement.clientWidth > 992
     };
   },
   created() {
     this.getList();
-    this.getBanner();
   },
   methods: {
     clickTo(link) {
@@ -122,19 +72,21 @@ export default {
     },
     getList() {
       getArticleList({
-        type: "NEd5n92EMIpyyBslaNqsRgE",
+        navId: "DpHktHeXJp3MX-FZoZdjz3w",
         pageNum: 1,
         pageSize: 4
       }).then(res => {
-        this.newsDate = res.rows;
+        this.newsData = res.rows;
       });
     },
-    getBanner() {
+    getDateTime(date) {
-      banner("NEd5n92EMIpyyBslaNqsRgE").then(res => {
+      let time = new Date(date);
-        this.bannerDate = res.data;
+      let year = time.getFullYear();
-      });
+      let month = time.getMonth() + 1
-    }
+      let day = time.getDate();
-  }
+      return year + "-" + month + "-" + day;
+    },
+  },
 };
 </script>
 

src/views/index/components/slideshow_card.vue

@@ -198,39 +198,39 @@ export default {
   }
 }
 
-.one {
+.five {
   z-index: 98;
   left: 1%;
   transform: scale(0.8);
 }
 
-.two {
+.six {
   z-index: 99;
   left: 21%;
   transform: scale(0.9);
 }
 
-.three {
+.one {
   left: 37%;
   z-index: 100;
   transform: scale(1);
   border: 1px solid #DA2D2D;
 }
 
-.four {
+.two {
   z-index: 99;
   left: 53%;
   transform: scale(0.9);
 }
 
-.five {
+.three {
   left: 73%;
   z-index: 98;
   transform: scale(0.8);
 }
 
-.six {
+.four {
-  left: 70%;
+  left: 37%;
   z-index: 96;
   transform: scale(0.7);
 }
@@ -271,33 +271,34 @@ export default {
     }
 
 
-    .one {
+    .five {
       left: -1%;
     }
 
-    .two {
+    .six {
       left: 15%;
     }
 
-    .three {
+    .one {
       left: 31%;
     }
 
-    .four {
+    .two {
       left: 47%;
     }
 
-    .five {
+    .three {
       left: 63%;
     }
 
-    .six {
+    .four {
       left: 31%;
     }
   }
 
 
 }
+
 @media screen and (max-width: 1100px) {
   .banner-card {
     height: 26rem;
@@ -314,27 +315,28 @@ export default {
         -webkit-line-clamp: 2; //显示的行
       }
     }
-    .one {
+
+    .five {
       left: 4%;
     }
 
-    .two {
+    .six {
       left: 17%;
     }
 
-    .three {
+    .one {
       left: 30%;
     }
 
-    .four {
+    .two {
       left: 43%;
     }
 
-    .five {
+    .three {
       left: 56%;
     }
 
-    .six {
+    .four {
       left: 10%;
     }
   }

src/views/mobile/index.vue

@@ -33,9 +33,11 @@
         <el-row>
           <el-col>
             <Introduction :introduction="contextData" v-if="type === 1"/>
-            <List :list="contextData" v-if="type === 2"/>
+            <List :list="contextData" v-if="type === 2 && listDataType == 0"/>
+            <SimpleList :list="contextData" v-if="type === 2 && listDataType == 1"/>
             <FileList :value="contextData" v-if="type === 4"/>
-            <DireData :value="contextData" v-if="type === 3"/>
+            <DireData :value="contextData" v-if="type === 3 && dreDataType == '1'"/>
+            <DireDataTow :value="contextData" v-if="type === 3 && dreDataType == '2'"/>
             <Details :value="detailsData" v-if="type == null"/>
           </el-col>
         </el-row>
@@ -53,11 +55,13 @@
 import {getNode, crumbs, article} from "@/api";
 import Introduction from '@/views/content/components/Introduction.vue'
 import List from '@/views/content/components/list.vue'
+import SimpleList from '@/views/content/components/simple_list.vue'
 import DireData from '@/views/content/components/dire_data.vue'
+import DireDataTow from '@/views/content/components/dire_data_tow.vue'
 import Details from '@/views/content/components/details.vue'
 import FileList from '@/views/content/components/file_list.vue'
 import {handleTree} from "@/utils/ebts";
-import {getParentNode, setLanguage} from "@/utils/sist";
+import {getParentNode, setLanguage, getNodeMenu} from "@/utils/sist";
 
 export default {
   name: "index",
@@ -66,12 +70,16 @@ export default {
     List,
     DireData,
     Details,
-    FileList
+    FileList,
+    DireDataTow,
+    SimpleList,
   },
   data() {
     return {
       width: document.documentElement.clientWidth,
       navId: null,
+      dreDataType: "1",
+      listDataType: 0,
       navList: [],
       showIndex: 0,
       contextData: {},
@@ -90,28 +98,56 @@ export default {
     }
   },
   watch: {
+    // $route(to, from) {
+    //   console.log(to, "路由跳转")
+    //   this.secondId = this.$route.params && this.$route.params.secondId;
+    //   this.navId = this.$route.params && this.$route.params.navId;
+    //   let arcId = this.$route.query && this.$route.query.id
+    //   this.type = this.$route.query && this.$route.query.type
+    //   this.getCrumbs()
+    //   if (this.type != null&&this.type!=0){
+    //     console.log(111,this.navId)
+    //     let info = getNodeMenu(this.navId);
+    //     if (arcId != undefined) {
+    //       this.getContext(arcId)
+    //     } else {
+    //       this.getContent(info)
+    //     }
+    //     return
+    //   }
+    //   if (arcId != undefined) {
+    //     this.getContext(arcId)
+    //   } else {
+    //     this.menuData = getParentNode(this.navId)
+    //     console.log(this.menuData, "menuData")
+    //     this.getContent(this.menuData.three)
+    //   }
+    // }
     $route(to, from) {
-      console.log(to)
+      console.log(to, "路由跳转")
-
       this.secondId = this.$route.params && this.$route.params.secondId;
       this.navId = this.$route.params && this.$route.params.navId;
       let arcId = this.$route.query && this.$route.query.id
       this.type = this.$route.query && this.$route.query.type
-      if (this.type != null&&this.type!=0){
+      this.getCrumbs()
-        let info = getParentNode(this.secondId);
+      if (this.type != null && this.type != 0) {
+        //当三级菜单id没有是,使用二级
         if (arcId != undefined) {
+          console.log("getContext")
           this.getContext(arcId)
-        } else {
+          return;
-          this.getContent(info.second)
+        }
+        let info = null;
+        if (this.navId == null) {
+          console.log("1")
+          info = getParentNode(this.secondId);
+          this.getContent(info.second)
+
+        } else {
+          console.log("2")
+          info = getParentNode(this.navId)
+          this.getContent(info.three)
         }
-        return
-      }
-      if (arcId != undefined) {
-        this.getContext(arcId)
-      } else {
-        this.menuData = getParentNode(this.navId)
-        console.log(this.menuData,"menuData")
-        this.getContent(this.menuData.three)
       }
     }
   },
@@ -125,34 +161,55 @@ export default {
     }, 200);
   },
   methods: {
-    init(){
+    init() {
-      console.log(this.navId)
+      let arcId = this.$route.params && this.$route.query.id
-      this.menuData = getParentNode(this.navId)
+      this.getCrumbs()
+      if (this.type != null && this.type != 0) {
+        //当三级菜单id没有是,使用二级
+        if (arcId != undefined) {
+          console.log("getContext")
+          this.getContext(arcId)
+          return;
+        }
+        let info = null;
+        if (this.navId == null) {
+          console.log("1")
+          info = getParentNode(this.secondId);
+          this.getContent(info.second)
+        } else {
+          console.log("2")
+          info = getParentNode(this.navId)
+          this.getContent(info.three)
+        }
+        //this.showSecond = false
+        // let info = null
+        // info = getParentNode(this.secondId);
+        // if (info == null) {
+        //   location.reload();
+        // }
+        // let arcId = this.$route.query && this.$route.query.id
+        // if (arcId != undefined) {
+        //   this.getContext(arcId)
+        // } else {
+        //   this.getContent(this.menuData.three)
+        // }
+        // return
+      }
+      // let arcId = this.$route.params && this.$route.query.id
+      // if (arcId != undefined) {
+      //   this.getContext(arcId)
+      // } else {
+      //   console.log(this.menuData, "menuData")
+      //   this.getContent(this.menuData.three)
+      // }
+    },
+    /**
+     * 获得面包屑导航
+     */
+    getCrumbs() {
       crumbs(this.secondId).then(res => {
         this.crumbs = res.data
       })
-      if (this.type != null&&this.type!=0){
-        //this.showSecond = false
-        let info =null
-        info = getParentNode(this.secondId);
-        if (info == null){
-          location.reload();
-        }
-        let arcId = this.$route.query && this.$route.query.id
-        if (arcId != undefined) {
-          this.getContext(arcId)
-        } else {
-          this.getContent(info.second)
-        }
-        return
-      }
-      let arcId = this.$route.params && this.$route.query.id
-      if (arcId != undefined) {
-        this.getContext(arcId)
-      } else {
-        console.log(this.menuData,"menuData")
-        this.getContent(this.menuData.three)
-      }
     },
 
     getContext(arcId) {
@@ -169,14 +226,16 @@ export default {
       this.contextData = null
       this.bgImage = menu.link
       let data = null
-      if (this.type === 2||this.type === 4) {
+      if (this.type === 2 || this.type === 4) {
         data = {
           id: menu.encodeId,
           pageNum: 1,
           pageSize: 5
         }
-        if (this.type === 4){
+        this.listDataType = 0
-          data.pageSize=10
+        if (this.type === 4||menu.isSimple == 1) {
+          data.pageSize = 20
+          this.listDataType = 1
         }
       } else {
         data = {
@@ -184,7 +243,7 @@ export default {
         }
       }
       getNode(data).then(res => {
-        if (this.type === 2||this.type === 4) {
+        if (this.type === 2 || this.type === 4) {
           this.contextData = {
             data: res.rows,
             total: res.total,
@@ -196,6 +255,11 @@ export default {
         } else if (this.type == 1) {
           this.contextData = res.data
         } else if (this.type == 3) {
+          if (res.additional == "") {
+            this.dreDataType = "1"
+          } else {
+            this.dreDataType = res.additional
+          }
           this.contextData = handleTree(res.data, "id", "pid", null, null)
         }
       })