From 11e283794602dc1ae27b7b0274d47516f377688f Mon Sep 17 00:00:00 2001
From: clay <209192278@qq.com>
Date: Fri, 7 Oct 2022 18:57:48 +0800
Subject: [PATCH] =?UTF-8?q?dengjie=20commit=20:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=B0=E9=97=BB=E4=B8=AD=E5=BF=83=E7=AC=AC=E5=9B=9B=E4=B8=AA?=
 =?UTF-8?q?border-right=E4=B8=BAnone=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/content/index.vue                | 300 +++++++++++----------
 src/views/index/components/news_center.vue |  14 +-
 2 files changed, 174 insertions(+), 140 deletions(-)

diff --git a/src/views/content/index.vue b/src/views/content/index.vue
index 672de20..95ee674 100644
--- a/src/views/content/index.vue
+++ b/src/views/content/index.vue
@@ -16,7 +16,7 @@
 
     <div style="background-color:#F8F8F8 ; padding-bottom: 19rem">
       <!--有三级菜单-->
-      <el-row v-show="false">
+      <el-row v-show="showSecond">
         <el-col v-if="$i18n.locale  === 'cn'" :xs="2" :sm="2" :md="1.5" :lg="2" :xl="4">
           <div class="grid-content"></div>
         </el-col>
@@ -80,7 +80,7 @@
           <el-row>
             <el-col>
               <div class="tab">
-                <router-link style="color: #1956BC; font-size: 16px;" to="/home">{{ $t('message.home') }}</router-link>
+                <router-link style="color: #1956BC; font-size: 16px;" to="/home">{{ $t("message.home") }}</router-link>
                 <span> > </span>
                 <span>
                 <!--<router-link to="">-->
@@ -109,16 +109,29 @@
           </el-row>
         </el-col>
       </el-row>
-      <el-row v-show="true">
+      <el-row v-show="false">
         <el-col v-if="$i18n.locale  === 'cn'" :xs="2" :sm="2" :md="1.5" :lg="2" :xl="4">
           <div class="grid-content"></div>
         </el-col>
 
         <el-col v-if="$i18n.locale  === 'cn'" v-show="width" :md="6" :lg="6" :xl="4">
-          <div class="left_bgc">
-              <div class="right_bgc">
-
+          <div class="left_lab">
+            <div class="lab">
+              <div class="lab_div">
+                <div class="lab_list">
+                  <img src="@/assets/school_profile/eji_icon_xz.png" alt="">
+                  <span class="lab_title">教师名录</span>
+                </div>
+                <div class="lab_list">
+                  <img src="@/assets/school_profile/eji_icon_xz.png" alt="">
+                  <span class="lab_title">教师名录</span>
+                </div>
+                <div class="lab_list">
+                  <img src="@/assets/school_profile/eji_icon_xz.png" alt="">
+                  <span class="lab_title">教师名录</span>
+                </div>
               </div>
+            </div>
           </div>
         </el-col>
 
@@ -156,7 +169,7 @@
           <el-row>
             <el-col>
               <div class="tab">
-                <router-link style="color: #1956BC; font-size: 16px;" to="/home">{{ $t('message.home') }}</router-link>
+                <router-link style="color: #1956BC; font-size: 16px;" to="/home">{{ $t("message.home") }}</router-link>
                 <span> > </span>
                 <span>
                 <!--<router-link to="">-->
@@ -194,7 +207,7 @@
           <el-row>
             <el-col>
               <div class="tab">
-                <router-link style="color: #1956BC; font-size: 16px;" to="/">{{ $t('message.home') }}</router-link>
+                <router-link style="color: #1956BC; font-size: 16px;" to="/">{{ $t("message.home") }}</router-link>
                 <span> > </span>
                 <span>
                 <!--<router-link to="">-->
@@ -235,13 +248,13 @@
 
 <script>
 import {getNode, crumbs, article} from "@/api";
-import Introduction from './components/Introduction.vue'
-import List from './components/list.vue'
-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 Introduction from "./components/Introduction.vue";
+import List from "./components/list.vue";
+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";
 
@@ -271,74 +284,74 @@ export default {
       bgImage: null,
       crumbs: {
         "two": {
-          "title": "学院领导",
+          "title": "学院领导"
         },
         "one": {
-          "title": "学院概况",
+          "title": "学院概况"
         }
       },
       detailsData: {}
-    }
+    };
   },
   watch: {
     $route(to, from) {
-      console.log("我被触发了")
-      this.showIndex = 0
-      let arcId = this.$route.params && this.$route.query.id
+      console.log("我被触发了");
+      this.showIndex = 0;
+      let arcId = this.$route.params && this.$route.query.id;
       this.navId = this.$route.params && this.$route.params.navId;
-      let id = this.$route.params && this.$route.params.secondId
-      this.type = this.$route.query && this.$route.query.type
+      let id = this.$route.params && this.$route.params.secondId;
+      this.type = this.$route.query && this.$route.query.type;
       if (this.type == 3 || this.type == 1 || this.type == 2) {
-        this.secondId = id
+        this.secondId = id;
         this.getCrumbs();
-        this.showSecond = false
+        this.showSecond = false;
         let info = getParentNode(this.secondId);
-        console.log("获取到info", info)
+        console.log("获取到info", info);
         if (arcId != undefined) {
-          console.log("getContext")
-          this.getContext(arcId)
+          console.log("getContext");
+          this.getContext(arcId);
         } else {
-          console.log("getContent")
-          this.getContent(info.second)
+          console.log("getContent");
+          this.getContent(info.second);
         }
-        return
+        return;
       } else {
-        console.log(this.navId, "this.navId")
+        console.log(this.navId, "this.navId");
         if (undefined == this.navId) {
-          this.getNodes()
+          this.getNodes();
         }
       }
-      this.showSecond = true
+      this.showSecond = true;
       if (arcId != undefined) {
-        this.getContext(arcId)
+        this.getContext(arcId);
       }
       try {
-        this.$refs.lab.style.height = this.navList.length * 8 + 10 + 'rem'
+        this.$refs.lab.style.height = this.navList.length * 8 + 10 + "rem";
       } catch (e) {
       }
       if (this.secondId == id && this.navList) {
         for (let i = 0; i < this.navList.length; i++) {
           if (this.navId == this.navList[i].encodeId) {
-            this.showIndex = i
-            this.getContent(this.navList[i])
+            this.showIndex = i;
+            this.getContent(this.navList[i]);
           }
         }
       } else {
-        this.navList = []
-        this.secondId = id
-        this.getNav()
+        this.navList = [];
+        this.secondId = id;
+        this.getNav();
       }
     }
   },
   created() {
-    setLanguage(this)
-    this.showIndex = 0
+    setLanguage(this);
+    this.showIndex = 0;
     this.secondId = this.$route.params && this.$route.params.secondId;
     this.navId = this.$route.params && this.$route.params.navId;
-    this.type = this.$route.query && this.$route.query.type
-    console.log(this.type, "this.type")
+    this.type = this.$route.query && this.$route.query.type;
+    console.log(this.type, "this.type");
     setTimeout(() => {
-      this.getNav()
+      this.getNav();
     }, 200);
     //this.getNav()
     this.getCrumbs();
@@ -349,8 +362,8 @@ export default {
      */
     getCrumbs() {
       crumbs(this.secondId).then(res => {
-        this.crumbs = res.data
-      })
+        this.crumbs = res.data;
+      });
     },
     /**
      * 获得内容
@@ -358,9 +371,9 @@ export default {
      */
     getContext(arcId) {
       article(arcId).then(res => {
-        this.detailsData = res.data.data
-        this.type = null
-      })
+        this.detailsData = res.data.data;
+        this.type = null;
+      });
     },
     /**
      *  获得菜单下的信息
@@ -368,34 +381,34 @@ export default {
     getNav() {
       this.getCrumbs();
       if (this.type == 3 || this.type == 1 || this.type == 2) {
-        console.log("进入二级")
-        this.showSecond = false
-        let info = null
+        console.log("进入二级");
+        this.showSecond = false;
+        let info = null;
         info = getParentNode(this.secondId);
         if (info == null) {
           location.reload();
         }
-        let arcId = null
+        let arcId = null;
 
-        arcId = this.$route.query && this.$route.query.id
-        console.log(arcId)
+        arcId = this.$route.query && this.$route.query.id;
+        console.log(arcId);
         if (arcId != undefined) {
-          this.getContext(arcId)
+          this.getContext(arcId);
         } else {
-          console.log("获取二级列表")
-          this.getContent(info.second)
+          console.log("获取二级列表");
+          this.getContent(info.second);
         }
-        return
+        return;
       }
-      this.showSecond = true
-      this.getNodes()
+      this.showSecond = true;
+      this.getNodes();
     },
 
     /**
      * 获得节点信息
      */
     async getNodes() {
-      this.navList = []
+      this.navList = [];
       // await getNode({id: this.secondId}).then(res => {
       //   this.navList = res.data
       //   try {
@@ -425,29 +438,29 @@ export default {
       //     }
       //   }
       // })
-      let res = await getNode({id: this.secondId})
+      let res = await getNode({id: this.secondId});
       // todo 延时异步问题
       setTimeout(() => {
-        this.$refs.lab.style.height = res.data.length * 8 + 10 + 'rem'
+        this.$refs.lab.style.height = res.data.length * 8 + 10 + "rem";
       }, 100);
-      this.navList = res.data
+      this.navList = res.data;
       // if (!this.navList){
       //   return
       // }
       for (let i = 0; i < this.navList.length; i++) {
         if (this.navId == this.navList[i].encodeId) {
-          this.showIndex = i
+          this.showIndex = i;
         }
       }
-      let arcId = this.$route.query && this.$route.query.id
+      let arcId = this.$route.query && this.$route.query.id;
       if (arcId != undefined) {
-        this.getContext(arcId)
+        this.getContext(arcId);
       } else {
-        console.log("测试,我被触发了!")
+        console.log("测试,我被触发了!");
         if (this.navId == undefined) {
-          this.getContent(this.navList[0])
+          this.getContent(this.navList[0]);
         } else {
-          this.getContent(this.navList[this.showIndex])
+          this.getContent(this.navList[this.showIndex]);
         }
       }
     },
@@ -456,39 +469,39 @@ export default {
      * @param menu
      */
     getContent(menu) {
-      console.log("getContent内部,menu:", menu)
-      console.log(menu)
+      console.log("getContent内部,menu:", menu);
+      console.log(menu);
       if (menu == undefined) {
-        return
+        return;
       }
-      this.type = menu.type
-      this.contextData = null
-      this.bgImage = menu.link
-      let data = null
+      this.type = menu.type;
+      this.contextData = null;
+      this.bgImage = menu.link;
+      let data = null;
       if (this.type === 2 || this.type === 4) {
         data = {
           id: menu.encodeId,
           pageNum: 1,
           pageSize: 5
-        }
-        this.listDataType = 0
+        };
+        this.listDataType = 0;
         if (this.type === 4 || menu.isSimple == 1) {
-          data.pageSize = 10
-          this.listDataType = 1
+          data.pageSize = 10;
+          this.listDataType = 1;
         }
       } else {
         data = {
-          id: menu.encodeId,
-        }
+          id: menu.encodeId
+        };
       }
       getNode(data).then(res => {
-        console.log(res, "res值")
+        console.log(res, "res值");
         console.log(this.type);
         if (null == res.data && null == res.rows) {
-          this.contextData = null
-          console.log("将值设为null", this.contextData)
-          this.type = 0
-          return
+          this.contextData = null;
+          console.log("将值设为null", this.contextData);
+          this.type = 0;
+          return;
         }
         if (this.type === 2 || this.type === 4) {
           this.contextData = {
@@ -497,21 +510,21 @@ export default {
             pageNum: data.pageNum,
             pageSize: data.pageSize,
             navId: menu.encodeId,
-            secondId: this.secondId,
-          }
+            secondId: this.secondId
+          };
         } else if (this.type == 1) {
-          this.contextData = res.data
+          this.contextData = res.data;
         } else if (this.type == 3) {
           if (res.additional == "") {
-            this.dreDataType = "1"
+            this.dreDataType = "1";
           } else {
-            console.log(this.dreDataType, "this.organizationType")
-            this.dreDataType = res.additional
+            console.log(this.dreDataType, "this.organizationType");
+            this.dreDataType = res.additional;
           }
-          this.contextData = handleTree(res.data, "id", "pid", null, null)
-          console.log(this.contextData, "this.contextData")
+          this.contextData = handleTree(res.data, "id", "pid", null, null);
+          console.log(this.contextData, "this.contextData");
         }
-      })
+      });
     },
 
 
@@ -522,14 +535,14 @@ export default {
      */
     navClick(nav, index) {
       //if (index != this.showIndex) {
-      this.showIndex = index
-      this.type = nav.type
+      this.showIndex = index;
+      this.type = nav.type;
       this.$router.push("/pc/" + this.secondId + "/" + nav.encodeId + "?lang=" + sessionStorage.getItem("lang"));
       //this.getContent(nav)
       //}
     }
-  },
-}
+  }
+};
 </script>
 
 <style scoped lang="scss">
@@ -579,9 +592,9 @@ export default {
     box-shadow: 0rem 0.2rem 0.4rem 0rem rgba(6, 42, 102, 0.67);
     border-radius: 0rem 0rem 2.5rem 2rem;
 
-    .lab_list:last-child {
-      border: none;
-    }
+    //.lab_list:last-child {
+    //  border: none;
+    //}
 
     .lab_div {
       border-bottom: 0.1rem solid #94BCFF !important;
@@ -637,21 +650,33 @@ export default {
   }
 }
 
-.left_bgc{
-  width: 13.8rem;
-  //height: 250px;
-  background: #1956BC;
-  border-radius: 0px 0px 13px 0px;
-  position: relative;
-  .right_bgc{
-
-    width: 119px;
-    height: 200px;
-    background: #FFFFFF;
-    box-shadow: 0px 1px 3px 0px rgba(6,42,102,0.67);
-    border-radius: 0px 0px 16px 13px;
-  }
-}
+//.left_lab {
+//  --lab: 1.5rem;
+//  --left_lab: calc(var(--lab) * 3.2);
+//  width: 22rem;
+//  background: #1956BC;
+//  border-radius: 0 0 13px 0;
+//  padding-bottom: var(--left_lab);
+//  padding-top: 5rem;
+//  padding-left: 4.8rem;
+//  margin-left: 4rem;
+//  .lab {
+//    background: #FFFFFF;
+//    box-shadow: 0 1px 3px 0 rgba(6, 42, 102, 0.67);
+//    border-radius: 0 0 16px 13px;
+//    margin-right: -2rem!important;
+//    .lab_div {
+//      padding-left: var(--lab);
+//      .lab_list {
+//        line-height: 8rem;
+//        border-bottom: .1rem solid #94BCFF;
+//      }
+//      .lab_list:last-child {
+//        border-bottom: none !important;
+//      }
+//    }
+//  }
+//}
 
 .tab {
   margin-left: 1.9rem;
@@ -680,25 +705,26 @@ export default {
       width: 14.25rem;
       margin-bottom: 2.25rem;
       border-radius: 0rem 0rem 1.2rem 1rem;
+        .lab_list {
+          margin-left: .75rem;
+          width: 13.5rem;
+          height: 6rem;
+          line-height: 6rem;
 
-      .lab_list {
-        margin-left: .75rem;
-        width: 13.5rem;
-        height: 6rem;
-        line-height: 6rem;
+          .lab_img {
+            margin-top: .1rem;
+            width: 1.05rem;
+            height: 1.05rem;
+            display: none;
+            margin-left: 3rem;
+          }
 
-        .lab_img {
-          margin-top: .1rem;
-          width: 1.05rem;
-          height: 1.05rem;
-          display: none;
-          margin-left: 3rem;
+          .lab_title {
+            margin-left: 1.5rem;
+          }
         }
 
-        .lab_title {
-          margin-left: 1.5rem;
-        }
-      }
+
     }
   }
 }
diff --git a/src/views/index/components/news_center.vue b/src/views/index/components/news_center.vue
index 23b089f..4ffb31f 100644
--- a/src/views/index/components/news_center.vue
+++ b/src/views/index/components/news_center.vue
@@ -19,13 +19,13 @@
     <!--轮播图下的新闻-->
     <div class="news">
       <el-row>
-        <el-col :span="6" v-for="(item,index) in newsData" :key="index">
+        <el-col :span="6" v-for="(item,index) in newsData" :key="index" :class="'border_right-' + (index + 1)">
           <div class="news_context" @click="getArticle(item)">
             <div class="news_context_img">
               <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" >
               <div class="news_context_text-title">{{ item.title }}</div>
               <div class="news_context_text-content" v-html="item.content">
               </div>
@@ -223,6 +223,14 @@ export default {
   }
 }
 
+.border_right-4{
+  .news_context{
+    .news_context_text{
+      border-right: none!important;
+    }
+  }
+}
+
 .news {
   margin: 4rem auto 0 auto;
   width: 115.4rem;
@@ -261,7 +269,7 @@ export default {
     .news_context_text {
       margin: 2rem 0 2rem 2rem;
       padding-right: 2rem;
-      //border-right: 1px solid #CCCCCC;
+      border-right: 1px solid #CCCCCC;
       .news_context_text-title {
         &:hover {
           color: #0040A4;