From e450dfac97b3b03744043f910a3676eff130107a Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 5 Oct 2022 15:49:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?clay=20commit=20:=20=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/content/components/dire_data.vue    |  26 +++--
 .../content/components/dire_data_tow.vue      | 109 ++++++++++++++++++
 src/views/content/components/organization.vue |  13 ---
 src/views/content/index.vue                   |  21 ++--
 4 files changed, 134 insertions(+), 35 deletions(-)
 create mode 100644 src/views/content/components/dire_data_tow.vue
 delete mode 100644 src/views/content/components/organization.vue

diff --git a/src/views/content/components/dire_data.vue b/src/views/content/components/dire_data.vue
index 08fc6ef..4495f54 100644
--- a/src/views/content/components/dire_data.vue
+++ b/src/views/content/components/dire_data.vue
@@ -18,10 +18,8 @@
           {{ chile.name }}<span v-if="chile.children.length>1">({{chile.children.length}}人)</span>
         </el-col>
           <el-col class="text" :offset="1" :span="23">
-            <div v-for="(item,index) in chile.children" :key="index">
-              <a :href="item.link">
+            <div v-for="(item,index) in chile.children" :key="index" @click="linkClick(item)">
                 {{ item.name }}
-              </a>
             </div>
           </el-col>
       </el-row>
@@ -57,6 +55,13 @@ export default {
       }],
     },
   },
+  methods:{
+    linkClick(chile){
+      if (chile.link){
+        window.open(chile.link)
+      }
+    }
+  }
 }
 </script>
 
@@ -104,16 +109,13 @@ export default {
     div {
       float: left;
       margin-top: .4rem;
+      cursor: pointer;
       //width: 7.4%;
-      margin-left: 1rem;
-      margin-right: 1rem;
-      a{
-        color: #000000;
-        text-decoration: none
-      }
-      a:hover{
-        color: #1956BC;
-      }
+      margin-right: 1.5rem;
+      color: #000000;
+    }
+    div:hover{
+      color: #1956BC;
     }
   }
 }
diff --git a/src/views/content/components/dire_data_tow.vue b/src/views/content/components/dire_data_tow.vue
new file mode 100644
index 0000000..4b5d47c
--- /dev/null
+++ b/src/views/content/components/dire_data_tow.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="dire_data"  style="background-color:#fff;  margin-top: 3rem;">
+    <el-row v-for="(dire,index) in value" :key="index">
+      <!--正文内容-->
+      <el-col class="context" :span="23">
+        <el-row class="context_el-row">
+          <el-col :span="1" :offset="1">
+            <img class="context_img" src="@/assets/teaching_staff/eji_icon_ys.png" alt="">
+          </el-col>
+          <el-col :span="4" class="context_name">{{ dire.name }}</el-col>
+          <el-col :span="16">
+            <hr class="context_hr">
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :offset="1" :span="22">
+            <div class="name" v-for="(chile,index) in dire.children" :key="index" @click="linkClick(chile)">
+              {{ chile.name }}
+            </div>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "dire_data_tow",
+  data() {
+    return {
+      width: document.documentElement.clientWidth
+    }
+  },
+  props:{
+    value: {
+      type: Array,
+      default: [{
+        name: "学院",
+        children: [
+          {
+            name: "办公室",
+            children: [
+              {
+                children: [],
+                name: "人员1"
+              },
+            ],
+          }
+        ],
+      }],
+    },
+  },
+  methods:{
+    linkClick(chile){
+      if (chile.link){
+        window.open(chile.link)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+.context {
+  margin: 3rem 2rem;
+  padding-bottom: 3rem;
+  //width: 84.3rem;
+  //background: #FFFFFF;
+
+  .context_el-row {
+    margin-top: 2rem;
+
+    .context_img {
+      width: 2.2rem;
+    }
+
+    .context_name {
+      font-size: 1.8rem;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #1956BC;
+      line-height: 2.2rem;
+    }
+
+    .context_hr {
+      line-height: 2.2rem;
+      margin-top: 1.1rem;
+      border: #1956BC solid 0.1rem;
+      background-color: #1956BC;
+    }
+  }
+
+  .name {
+    margin-top: 2rem;
+    font-size: 1.6rem;
+    font-weight: 600;
+    display: inline-block;
+    margin-right: 1.5rem;
+    cursor: pointer;
+    color: #000000;
+  }
+  .name:hover {
+    color: #1956BC;
+  }
+}
+
+</style>
diff --git a/src/views/content/components/organization.vue b/src/views/content/components/organization.vue
deleted file mode 100644
index 4de1f79..0000000
--- a/src/views/content/components/organization.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: "organization"
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/content/index.vue b/src/views/content/index.vue
index 890f047..442c051 100644
--- a/src/views/content/index.vue
+++ b/src/views/content/index.vue
@@ -102,8 +102,8 @@
               <Introduction :introduction="contextData" v-if="type === 1"/>
               <List :list="contextData" v-if="type === 2"/>
               <FileList :value="contextData" v-if="type === 4"/>
-              <DireData :value="contextData" v-if="type === 3 && organizationType == '1'"/>
-              <Organization :value="contextData" v-if="type === 3 && organizationType == '2'"/>
+              <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>
@@ -141,8 +141,8 @@
               <Introduction :introduction="contextData" v-if="type === 1"/>
               <List :list="contextData" v-if="type === 2"/>
               <FileList :value="contextData" v-if="type === 4"/>
-              <DireData :value="contextData" v-if="type === 3 && organizationType == '1'"/>
-              <Organization :value="contextData" v-if="type === 3 && organizationType == '2'"/>
+              <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>
@@ -161,7 +161,7 @@ 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 Organization from './components/organization.vue'
+import DireDataTow from './components/dire_data_tow.vue'
 import Details from './components/details.vue'
 import FileList from './components/file_list.vue'
 import {handleTree} from "@/utils/ebts";
@@ -174,14 +174,15 @@ export default {
     List,
     DireData,
     Details,
-    FileList
+    FileList,
+    DireDataTow
   },
   data() {
     return {
       width: document.documentElement.clientWidth > 992,
       secondId: null,
       navId: null,
-      organizationType: "",
+      dreDataType: "",
       navList: [],
       showIndex: 0,
       showSecond: true,
@@ -416,10 +417,10 @@ export default {
           this.contextData = res.data
         } else if (this.type == 3) {
           if (res.additional == "") {
-            this.organizationType = "1"
+            this.dreDataType = "1"
           } else {
-            console.log(this.organizationType, "this.organizationType")
-            this.organizationType = 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")

From 08dfd799f60088096542d1d7cf230b84d538209c Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 5 Oct 2022 16:11:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?clay=20commit=20:=20=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=93=8D=E5=BA=94=E5=BC=8F=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/components/academy_and_sciences.vue     | 14 ++++++--------
 .../components/undergraduate_and_graduate.vue     | 15 ++++++---------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/views/index/components/academy_and_sciences.vue b/src/views/index/components/academy_and_sciences.vue
index 5b8c066..511b34b 100644
--- a/src/views/index/components/academy_and_sciences.vue
+++ b/src/views/index/components/academy_and_sciences.vue
@@ -1,12 +1,9 @@
 <template>
   <div class="academy_and_sciences">
-    <el-row>
-      <el-col :xs="1" :sm="1" :md="2" :lg="2" :xl="2" >
-        <div class="grid-content"></div>
-      </el-col>
-      <el-col :xs="23" :sm="22" :md="20" :lg="20" :xl="20" >
+    <el-row type="flex" justify="center">
+      <el-col :xs="22" :sm="22" :md="20" :lg="16" :xl="14" >
         <el-row>
-          <el-col :span="12">
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <div class="sciences_title">
               科学研究
             </div>
@@ -87,7 +84,7 @@
               <img src="../../../assets/index/academy_and_sciences/gangduobai1.png" alt="">
             </div>
           </el-col>
-          <el-col :span="12">
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <div class="academy_title">
               学术交流
             </div>
@@ -181,7 +178,7 @@ export default {
   background-size: cover;
   background-repeat: no-repeat;
   width: 100%;
-  height: 68.3rem;
+  //height: 68.3rem;
 
   .sciences_title, .academy_title {
     display: flex;
@@ -234,6 +231,7 @@ export default {
     display: flex;
     height: 2.3rem;
     margin-top: 3.4rem;
+    margin-bottom: 2rem;
     cursor: pointer;
     .more_text {
       font-size: 1.6rem;
diff --git a/src/views/index/components/undergraduate_and_graduate.vue b/src/views/index/components/undergraduate_and_graduate.vue
index ba91da7..4b97cef 100644
--- a/src/views/index/components/undergraduate_and_graduate.vue
+++ b/src/views/index/components/undergraduate_and_graduate.vue
@@ -1,12 +1,9 @@
 <template>
   <div class="undergraduate_and_graduate">
-    <el-row>
-      <el-col :xs="1" :sm="1" :md="2" :lg="2" :xl="2">
-        <div class="grid-content"></div>
-      </el-col>
-      <el-col :xs="23" :sm="22" :md="20" :lg="20" :xl="20" >
+    <el-row  type="flex" justify="center">
+      <el-col :xs="22" :sm="22" :md="20" :lg="16" :xl="14" >
         <el-row class="undergraduate_and_graduate_bgc">
-          <el-col :span="12">
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <div class="undergraduate headline">
               <img src="../../../assets/index/undergraduate_and_graduate/benka.png" alt=""/>
               <span>本科教育</span>
@@ -58,7 +55,7 @@
               </div>
             </div>
           </el-col>
-          <el-col :span="12">
+          <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <div class="graduate headline">
               <img src="../../../assets/index/undergraduate_and_graduate/boshimaobeifen.png" alt=""/>
               <span>研究生教育</span>
@@ -127,11 +124,11 @@ export default {
   background-size: cover;
   background-repeat: no-repeat;
   width: 100%;
-  height: 54.2rem;
+  //height: 54.2rem;
 
   &_bgc {
     background-color: #fff;
-    height: 33.8rem;
+    //height: 33.8rem;
     margin-top: 8.1rem;
   }