更新

src/layout/master/index/banner.vue

@@ -5,17 +5,14 @@
         <el-image style="width:100%;height:526px;" :src="bannerinfo.banner"></el-image>
       </el-col>
       <el-col :span="24" class="search">
-        <div class="w_1200">
-          <el-col :span="4">
-            <p>&nbsp;</p>
-          </el-col>
-          <el-col :span="14" class="input">
-            <el-input v-model="input" placeholder=""></el-input>
-          </el-col>
-          <el-col :span="1" class="button">
-            <el-button><i class="el-icon-search"></i></el-button>
-          </el-col>
-        </div>
+        <el-col :span="7">
+          &nbsp;
+        </el-col>
+        <el-col :span="10">
+          <el-input placeholder="请输入内容" v-model="input" class="input-with-select">
+            <el-button slot="append" icon="el-icon-search"></el-button>
+          </el-input>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -44,28 +41,21 @@ export default {
 }
 .search {
   position: absolute;
-  bottom: -35px;
-  text-align: center;
+  bottom: -27px;
 }
-.search .input {
-  width: 734px;
-  height: 82px;
-}
-/deep/.search .el-input__inner {
-  border-radius: 0;
-  height: 82px;
-  line-height: 82px;
-  font-size: 25px;
+/deep/.el-input-group__append {
+  background: #415285;
+  color: #ffff;
+  font-size: 35px;
+  border: 1px solid #415285;
 }
-.button {
-  text-align: left;
+/deep/.el-input__inner {
+  height: 60px;
+  line-height: 60px;
+  font-size: 20px;
+  color: #415285;
 }
-/deep/.search .button .el-button {
-  border-radius: 0;
-  padding: 20px 22px;
-  background: #415285;
-  color: #fff;
-  border: 0;
-  font-size: 40px;
+/deep/.el-button {
+  padding: 12px;
 }
 </style>

src/layout/master/index/fast.vue

@@ -2,26 +2,21 @@
   <div id="fast">
     <el-row>
       <el-col :span="24">
-        <el-col :span="24" class="top">
-          <el-col :span="24" class="english">
-            {{ fasttop.english }}
-          </el-col>
-          <el-col :span="24" class="title">
-            {{ fasttop.title }}
-          </el-col>
+        <el-col :span="6" class="info">
+          <el-image style="width:88px;height:88px;" :src="zhiye"></el-image>
+          <el-link href="http://ccut.51langtu.com/improperBrowser.htm" :underline="false">职业测评</el-link>
         </el-col>
-        <el-col :span="24" class="fast">
-          <el-col :span="6" class="fastlist" v-for="(item, index) in fastlist" :key="index">
-            <el-col :span="24" class="image">
-              <el-image style="width:109px;height:113px;" :src="item.url"></el-image>
-            </el-col>
-            <el-col :span="24" class="title">
-              <el-link :underline="false" :href="item.link">{{ item.title }}</el-link>
-            </el-col>
-            <el-col :span="24" class="content">
-              <p>{{ item.content }}</p>
-            </el-col>
-          </el-col>
+        <el-col :span="6" class="info">
+          <el-image style="width:88px;height:88px;" :src="jiuye"></el-image>
+          <el-link href="http://xlzx.zt.ccut.edu.cn/" :underline="false">就业心理咨询</el-link>
+        </el-col>
+        <el-col :span="6" class="info">
+          <el-image style="width:88px;height:88px;" :src="xinli"></el-image>
+          <el-link href="http://www.jilinjobs.cn/" :underline="false">就业信息网</el-link>
+        </el-col>
+        <el-col :span="6" class="info">
+          <el-image style="width:88px;height:88px;" :src="yingzheng"></el-image>
+          <el-link href="http://wzb.dept.ccut.edu.cn/" :underline="false">应征入伍</el-link>
         </el-col>
       </el-col>
     </el-row>
@@ -31,12 +26,14 @@
 <script>
 export default {
   name: 'fast',
-  props: {
-    fasttop: null,
-    fastlist: null,
-  },
+  props: {},
   components: {},
-  data: () => ({}),
+  data: () => ({
+    zhiye: require('../../../assets/zhiye.png'),
+    jiuye: require('../../../assets/jiuye.png'),
+    xinli: require('../../../assets/xinli.png'),
+    yingzheng: require('../../../assets/yingzheng.png'),
+  }),
   created() {},
   computed: {},
   methods: {},
@@ -44,54 +41,26 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.top {
-  text-align: center;
-}
-.top .english {
-  text-transform: uppercase;
-  color: #5b5e66;
-  font-family: 微软雅黑;
-  font-size: 42px;
-}
-.top .title {
-  color: #415285;
-  font-size: 36px;
-  font-family: 微软雅黑;
-  padding: 25px 0 50px 0;
-}
-.fast {
-  text-align: center;
-}
-.fastlist {
-  text-align: center;
-  width: 197px;
-  height: 326px;
-  margin: 0 50px;
-  box-shadow: 0 0 10px #ccc;
+.info {
+  width: 150px;
+  height: 150px;
   border-radius: 10px;
+  background-color: #fff;
+  -webkit-box-shadow: 0 0 5px #ccc;
+  box-shadow: 0 0 5px #ccc;
+  border: 1px solid #efefef;
+  margin: 0 52px 0 1px;
+  text-align: center;
 }
-.fastlist .image {
-  padding: 15px 0;
-  border-bottom: 1px solid #ccc;
+.info:last-child {
+  margin: 0;
 }
-.fastlist .title {
-  padding: 20px 0;
+.info .el-image {
+  padding: 8px 30px;
 }
-.fastlist .title .el-link {
+/deep/.info .el-link {
   color: #415285;
-  font-size: 24px;
-}
-.fastlist .content {
-  padding: 0 25px;
-}
-.fastlist .content p {
-  font-size: 12px;
-  color: #999;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 3;
-  word-break: break-all;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
+  font-size: 18px;
+  font-weight: bold;
 }
 </style>

src/layout/master/index/huodong.vue

@@ -2,84 +2,67 @@
   <div id="huodong">
     <el-row>
       <el-col :span="24">
-        <el-col :span="24" class="top">
-          <el-col :span="24" class="english">{{ huodonginfo.english }}</el-col>
-          <el-col :span="24" class="title">{{ huodonginfo.title }}</el-col>
-        </el-col>
-        <el-col :span="24" class="infoone">
-          <el-col :span="24" class="infoonebei">
-            <span>01招聘</span>
-          </el-col>
-          <el-col :span="24" class="infoonelist">
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-              <el-tab-pane label="双选会" name="1">
-                <el-col :span="24" class="list">
-                  <el-col :span="24" class="talksList" v-for="(item, index) in fairsList" :key="index" @click.native="toPath('jobfair', item.id)">
-                    <el-col :span="24" style="padding:0 0 12px 0;">
-                      <el-col :span="20">
-                        <span class="qiu"></span>
-                        <el-link :underline="false">
-                          <p class="title">{{ item.title }}</p>
-                        </el-link>
-                      </el-col>
-                      <el-col :span="4">
-                        <p class="date">{{ item.date }}</p>
-                      </el-col>
-                    </el-col>
-                    <el-col :span="24" class="text">
-                      <span>开始时间：{{ item.time }}</span
-                      >&nbsp;
-                      <span>招聘会地点：{{ item.address }}</span>
-                    </el-col>
-                  </el-col>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="双选会" name="1">
+            <el-col :span="24" class="talksList" v-for="(item, index) in fairsList" :key="index" @click.native="toPath('jobfair', item.id)">
+              <el-col :span="24">
+                <el-col :span="20">
+                  <span class="qiu"></span>
+                  <el-link :underline="false">
+                    <p class="title">{{ item.title }}</p>
+                  </el-link>
                 </el-col>
-              </el-tab-pane>
-              <el-tab-pane label="宣讲会" name="2">
-                <el-col :span="24" class="list">
-                  <el-col :span="24" class="talksList" v-for="(item, index) in talksList" :key="index" @click.native="toPath('talk', item.id)">
-                    <el-col :span="24" style="padding:0 0 12px 0;">
-                      <el-col :span="20">
-                        <span class="qiu"></span>
-                        <el-link :underline="false">
-                          <p class="title">{{ item.title }}</p>
-                        </el-link>
-                      </el-col>
-                      <el-col :span="4">
-                        <p class="date">{{ item.date }}</p>
-                      </el-col>
-                    </el-col>
-                    <el-col :span="24" class="text">
-                      <span>宣讲时间：{{ item.time }}</span
-                      >&nbsp;
-                      <span>宣讲地点：{{ item.address }}</span>
-                    </el-col>
-                  </el-col>
+                <el-col :span="4">
+                  <p class="date">{{ item.date }}</p>
                 </el-col>
-              </el-tab-pane>
-              <el-tab-pane label="招聘快讯" name="3">
-                <el-col :span="24" class="list">
-                  <el-col :span="24" class="talksList" v-for="(item, index) in infoList" :key="index" @click.native="toPath('jobinfo', item.id)">
-                    <el-col :span="24" style="padding:0 0 12px 0;">
-                      <el-col :span="20">
-                        <span class="qiu"></span>
-                        <el-link :underline="false">
-                          <p class="title">{{ item.title }}</p>
-                        </el-link>
-                      </el-col>
-                      <el-col :span="4">
-                        <p class="date">{{ item.date }}</p>
-                      </el-col>
-                    </el-col>
-                    <el-col :span="24" class="text">
-                      <span>招聘企业：{{ item.corpname }}</span>
-                    </el-col>
-                  </el-col>
+              </el-col>
+              <el-col :span="24" class="text">
+                <span>开始时间：{{ item.time }}</span
+                >&nbsp;
+                <span>招聘会地点：{{ item.address }}</span>
+              </el-col>
+            </el-col>
+          </el-tab-pane>
+          <el-tab-pane label="宣讲会" name="2">
+            <el-col :span="24" class="talksList" v-for="(item, index) in talksList" :key="index" @click.native="toPath('talk', item.id)">
+              <el-col :span="24">
+                <el-col :span="20">
+                  <span class="qiu"></span>
+                  <el-link :underline="false">
+                    <p class="title">{{ item.title }}</p>
+                  </el-link>
                 </el-col>
-              </el-tab-pane>
-            </el-tabs>
-            <el-link :underline="false" class="add" @click="turnTo()"><i class="el-icon-plus"></i></el-link>
-          </el-col>
-        </el-col>
+                <el-col :span="4">
+                  <p class="date">{{ item.date }}</p>
+                </el-col>
+              </el-col>
+              <el-col :span="24" class="text">
+                <span>宣讲时间：{{ item.time }}</span
+                >&nbsp;
+                <span>宣讲地点：{{ item.address }}</span>
+              </el-col>
+            </el-col>
+          </el-tab-pane>
+          <el-tab-pane label="招聘快讯" name="3">
+            <el-col :span="24" class="talksList" v-for="(item, index) in infoList" :key="index" @click.native="toPath('jobinfo', item.id)">
+              <el-col :span="24">
+                <el-col :span="20">
+                  <span class="qiu"></span>
+                  <el-link :underline="false">
+                    <p class="title">{{ item.title }}</p>
+                  </el-link>
+                </el-col>
+                <el-col :span="4">
+                  <p class="date">{{ item.date }}</p>
+                </el-col>
+              </el-col>
+              <el-col :span="24" class="text">
+                <span>招聘企业：{{ item.corpname }}</span>
+              </el-col>
+            </el-col>
+          </el-tab-pane>
+        </el-tabs>
+        <el-link :underline="false" class="add" @click="turnTo()"><i class="el-icon-plus"></i></el-link>
       </el-col>
     </el-row>
   </div>
@@ -89,7 +72,6 @@
 export default {
   name: 'huodong',
   props: {
-    huodonginfo: null,
     talksList: null,
     fairsList: null,
     infoList: null,
@@ -124,113 +106,63 @@ p {
   margin: 0;
   padding: 0;
 }
-.top {
-  height: 90px;
-  text-align: center;
-  margin-bottom: 30px;
-}
-.top .english {
-  text-transform: uppercase;
-  color: #5b5e66;
-  font-family: 微软雅黑;
-  font-size: 42px;
-}
-.top .title {
-  color: #415285;
-  font-size: 36px;
-  font-family: 微软雅黑;
-}
-.infoone {
-  height: 512px;
-}
-.infoonebei {
-  width: 294px;
-  height: 512px;
-  background: #415285;
-}
-.infoonebei span {
-  display: inline-block;
-  width: 294px;
-  text-align: center;
-  height: 108px;
-  line-height: 108px;
-  font-size: 42px;
-  color: #fff;
-}
-.infoonelist {
-  width: 1130px;
-  height: 372px;
-  background: #fff;
-  position: absolute;
-  top: 232px;
-  left: 71px;
-  box-shadow: 0px 0px 5px #ccc;
-}
 .add {
   position: absolute;
-  top: 20px;
-  right: 20px;
-  width: 43px;
-  height: 43px;
-  line-height: 43px;
+  top: 15px;
+  right: 15px;
+  width: 20px;
+  height: 20px;
   text-align: center;
   border: 1px solid #ccc;
   border-radius: 5px;
-}
-.add .el-link--inner {
-  font-size: 30px;
+  color: #000;
+  background: #fff;
+  font-weight: bold;
 }
 /deep/.el-tabs__header {
   margin: 0;
-}
-/deep/.el-tabs__nav-wrap {
-  height: 90px;
+  background: #415285;
 }
 /deep/.el-tabs__item {
-  font-size: 30px;
-  height: 90px;
-  line-height: 90px;
+  color: #bfc4d3;
+  font-size: 18px;
+  height: 50px;
+  line-height: 50px;
 }
 /deep/.el-tabs__item.is-active {
-  color: #415285;
-}
-/deep/.el-tabs__nav-wrap::after {
-  background-color: transparent;
-}
-/deep/.el-tabs__active-bar {
-  background-color: #415285;
-  height: 6px;
+  color: #fff;
 }
 /deep/.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px;
 }
-.infoonelist .list {
-  height: 284px;
-  overflow: hidden;
-}
-.list .title {
-  font-size: 30px;
-  color: #000;
-}
-.list .date {
-  color: #999;
-  font-size: 25px;
-  text-align: right;
-  padding: 0 15px;
+/deep/.el-tabs__active-bar {
+  background-color: transparent;
 }
-.list .text {
-  font-size: 24px;
-  color: #b1b1b1;
-  padding: 0 50px;
+/deep/.el-tabs__nav-wrap::after {
+  background-color: transparent;
 }
-.list .qiu {
+.qiu {
   display: inline-block;
   width: 4px;
   height: 5px;
   background: #999;
-  margin: 0 16px 0 31px;
+  margin: 0 15px;
 }
 .talksList {
-  padding: 43px 0 0 0;
+  padding: 9px 0;
+}
+/deep/.talksList .el-link {
+  font-size: 16px;
+  color: #000;
+}
+.talksList .date {
+  font-size: 18px;
+  color: #999;
+  text-align: center;
+}
+.talksList .text {
+  font-size: 12px;
+  color: #b1b1b1;
+  padding: 5px 0 5px 30px;
 }
 </style>

src/layout/master/index/login.vue

@@ -2,12 +2,25 @@
   <div id="login">
     <el-row>
       <el-col :span="24">
-        <el-col :span="24" class="login">
+        <el-col :span="8" class="login">
           <el-link :underline="false" href="http://hr.smart.cc-lotus.info/www/login">
-            <el-image :src="qiye"></el-image>
+            <el-image style="width:75px;height:75px;" :src="shengyuan"></el-image>
+            <p class="mainTwoTit">生源信息</p>
+          </el-link>
+        </el-col>
+        <el-col :span="8" class="login">
+          <el-link :underline="false" href="http://hr.smart.cc-lotus.info/www/login">
+            <el-image style="width:75px;height:75px;" :src="qiye"></el-image>
             <p class="mainTwoTit">单位登录/注册</p>
           </el-link>
         </el-col>
+
+        <el-col :span="8" class="login">
+          <el-link :underline="false" href="http://hr.smart.cc-lotus.info/www/login">
+            <el-image style="width:75px;height:75px;" :src="xuesheng"></el-image>
+            <p class="mainTwoTit">学生登录</p>
+          </el-link>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -32,12 +45,13 @@ export default {
 <style lang="less" scoped>
 .login {
   text-align: center;
+  padding: 10px 0 0 0;
 }
 .mainTwoTit {
-  font-size: 33px;
+  font-size: 18px;
   color: #666;
   font-family: 微软雅黑;
   margin: 0;
-  padding: 0;
+  padding: 10px 0;
 }
 </style>

src/layout/master/index/news.vue

@@ -5,12 +5,12 @@
         <el-col :span="24" class="title">
           <span>{{ title }}</span>
         </el-col>
-        <el-col :span="24">
+        <!-- <el-col :span="24">
           <el-col :span="13" class="block">
             <el-carousel ref="shubiao">
               <el-carousel-item v-for="(item, index) in newsList" :key="index" :name="`${index}`">
                 <el-link :underline="false" @click="$router.push({ path: `/master/detail/news/${item.id}` })">
-                  <el-image style="width:620px;height:350px;" :src="item.pic" class="newsList"></el-image>
+                  <el-image style="width:396px;height:280px;" :src="item.pic" class="newsList"></el-image>
                 </el-link>
               </el-carousel-item>
             </el-carousel>
@@ -35,6 +35,40 @@
               </li>
             </ul>
           </el-col>
+        </el-col> -->
+        <el-col :span="24" class="list">
+          <el-col :span="13" class="block">
+            <el-carousel ref="shubiao">
+              <el-carousel-item v-for="(item, index) in newsList" :key="index" :name="`${index}`">
+                <el-link :underline="false" @click="$router.push({ path: `/master/detail/news/${item.id}` })">
+                  <el-image style="width:396px;height:280px;" :src="item.pic" class="newsList"></el-image>
+                  <el-col :span="24" class="content"
+                    ><p>{{ item.parent }}</p></el-col
+                  >
+                </el-link>
+              </el-carousel-item>
+            </el-carousel>
+          </el-col>
+          <el-col :span="11" class="newsLi">
+            <ul>
+              <li class="listdata">
+                <span class="qiudata"></span>
+                <el-link :underline="false">今天（3月8日星期五）</el-link>
+              </li>
+              <li
+                class="newsTitle"
+                v-for="(tag, index) in newsList"
+                :key="index"
+                :type="tag.type"
+                @mouseover="shuYi(index)"
+                :class="newListActive(tag)"
+                @click="$router.push({ path: `/master/detail/news/${tag.id}` })"
+              >
+                <span class="qiu"></span>
+                <p class="textOver">{{ tag.title }}</p>
+              </li>
+            </ul>
+          </el-col>
         </el-col>
       </el-col>
     </el-row>
@@ -71,12 +105,28 @@ ul {
 li {
   list-style: none;
 }
+p {
+  padding: 0;
+  margin: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .title {
+  height: 90px;
+  padding: 50px 0 0 10px;
   color: #333;
   font-size: 24px;
   font-family: 微软雅黑;
-  font-weight: bold;
-  margin-bottom: 15px;
+}
+.list {
+  height: 280px;
+  background: #eeeeee;
+}
+/deep/.el-carousel__container {
+  height: 280px;
 }
 /deep/.el-carousel__indicators--horizontal {
   display: none;
@@ -84,47 +134,56 @@ li {
 /deep/.el-carousel__arrow {
   display: none;
 }
-/deep/.el-carousel__container {
-  height: 350px;
+.content {
+  position: absolute;
+  bottom: 0;
+  height: 50px;
+  line-height: 20px;
+  padding: 0 10px;
+  background-color: rgba(0, 0, 0, 0.5);
 }
+.content p {
+  font-size: 12px;
+  color: #fff;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+
 .block {
-  width: 620px;
-  height: 350px;
+  width: 396px;
+  height: 280px;
 }
 .newsLi {
-  width: 580px;
-  height: 350px;
+  width: 334px;
+  height: 280px;
   background-color: #eeeeee;
   overflow: hidden;
 }
-.list {
-  height: 50px;
-  line-height: 50px;
-  border-left: 5px solid #eeeeee;
-}
 .listdata {
-  height: 50px;
-  line-height: 50px;
-  border-left: 5px solid #eeeeee;
+  height: 32px;
+  line-height: 32px;
+  border-left: 3px solid #eeeeee;
 }
 .listdata .el-link {
   color: #999999;
-  font-size: 20px;
+  font-size: 13px;
   font-family: 微软雅黑;
 }
-.list .el-link {
-  color: #999999;
-  font-size: 20px;
-  font-family: 微软雅黑;
+.newsTitle {
+  height: 32px;
+  line-height: 32px;
+  border-left: 3px solid transparent;
 }
-.list:hover {
-  border-left: 5px solid #415285;
+.newsTitle:hover {
+  border-left: 3px solid #415285;
   background: #fff;
+  cursor: pointer;
 }
-.list:hover .el-link {
-  color: #333;
-}
-.list:hover .qiu {
+.newsTitle:hover .qiu {
   background: #415285;
 }
 .qiudata {
@@ -137,11 +196,11 @@ li {
   margin: 0 15px;
 }
 .qiu {
-  display: inline-block;
+  float: left;
   width: 10px;
   height: 10px;
   background: #d5d5d5;
   border-radius: 90px;
-  margin: 0 15px;
+  margin: 11px 15px 0 17px;
 }
 </style>

src/layout/master/index/notice.vue

@@ -2,38 +2,27 @@
   <div id="notice">
     <el-row>
       <el-col :span="24">
-        <el-col :span="24" class="top">
-          <el-col :span="24" class="english">{{ noticeinfo.english }}</el-col>
-          <el-col :span="24" class="title">{{ noticeinfo.title }}</el-col>
+        <el-col :span="24" class="topTitle">
+          <span>{{ noticeinfo.title }}</span>
         </el-col>
-        <el-col :span="24" class="info">
-          <el-col :span="24" class="infoBei">
-            <span>{{ title }}</span>
-          </el-col>
-          <el-col :span="24" class="infolist">
-            <el-col :span="24" class="button">
-              <el-button class="icon" style="margin: 0 43px 0 0;"><i class="el-icon-plus" @click="turnTo()"></i></el-button>
-              <!-- <el-button class="icon" style="margin: 0 10px;"><i class="el-icon-arrow-right"></i></el-button> -->
-            </el-col>
-            <el-col :span="24" class="noticelist">
-              <el-col :span="8" class="content" v-for="(item, index) in noticelist" :key="index">
-                <el-link :underline="false" @click.native="$router.push({ path: `/master/detail/news/${item.id}` })">
-                  <el-col :span="24" class="image">
-                    <el-image style="width:100%;height:226px;" :src="item.pic"></el-image>
-                  </el-col>
-                  <el-col :span="24" class="title">
-                    <p>{{ item.title }}</p>
-                  </el-col>
-                  <el-col :span="24" class="text">
-                    <p v-html="item.content"></p>
-                  </el-col>
-                  <el-col :span="24" class="time">
-                    {{ item.publish_time }}
-                  </el-col>
-                </el-link>
+        <el-col :span="24" class="list">
+          <ul>
+            <li class="listdata">
+              <span class="qiudata"></span>
+              <el-link :underline="false">今天（3月8日星期五）</el-link>
+            </li>
+            <li v-for="(item, index) in noticelist" :key="index">
+              <el-col :span="24" @click.native="$router.push({ path: `/master/detail/news/${item.id}` })">
+                <P>{{ item.title }}</P>
               </el-col>
-            </el-col>
-          </el-col>
+            </li>
+            <li class="listTitle">
+              <el-col :span="24" class="title">
+                <span class="qiu"></span>
+                <P class="textOver">昆侖山搭街坊擴大技法盧卡斯房間阿里山看</P>
+              </el-col>
+            </li>
+          </ul>
         </el-col>
       </el-col>
     </el-row>
@@ -49,7 +38,6 @@ export default {
   },
   components: {},
   data: () => ({
-    title: '最新公告',
     skip: 0,
     limit: 3,
   }),
@@ -77,122 +65,71 @@ export default {
 </script>
 
 <style lang="less" scoped>
-p {
+ul {
   margin: 0;
   padding: 0;
 }
-.top {
-  height: 100px;
-  text-align: center;
-  margin-bottom: 42px;
+li {
+  list-style: none;
 }
-.top .english {
-  text-transform: uppercase;
-  color: #5b5e66;
-  font-family: 微软雅黑;
-  font-size: 42px;
-}
-.top .title {
-  color: #415285;
-  font-size: 36px;
-  font-family: 微软雅黑;
-}
-
-.info {
-  height: 513px;
+p {
+  padding: 0;
+  margin: 0;
 }
-.info .infoBei {
-  width: 294px;
-  height: 512px;
-  background-color: #415285;
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
-.info .infoBei span {
-  margin: 52px 0 0 69px;
-  display: inline-block;
-  font-size: 22px;
+.topTitle {
+  height: 90px;
+  padding: 50px 0 0 10px;
+  color: #333;
+  font-size: 24px;
   font-family: 微软雅黑;
-  color: #fff;
-}
-.infolist {
-  width: 1130px;
-  height: 470px;
-  position: absolute;
-  top: 166px;
-  left: 72px;
 }
-.button {
-  text-align: right;
-  height: 40px;
-  margin-bottom: 30px;
+.list {
+  height: 280px;
+  background: #eeeeee;
 }
-.button .icon {
-  width: 40px;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  padding: 0;
-  border-radius: 90px;
-  border: 2px solid #ccc;
+.listdata {
+  height: 32px;
+  line-height: 32px;
+  border-left: 5px solid #eeeeee;
 }
-.button .icon .el-icon-arrow-left {
-  font-size: 20px;
-  font-weight: bold;
-  color: #ccc;
-}
-.button .icon .el-icon-arrow-right {
-  font-size: 20px;
-  font-weight: bold;
-  color: #ccc;
+.listdata .el-link {
+  color: #999999;
+  font-size: 13px;
+  font-family: 微软雅黑;
 }
-.noticelist {
-  height: 400px;
+.qiudata {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
   background: #fff;
+  border: 1px solid #ccc;
+  border-radius: 90px;
+  margin: 0 15px;
 }
-.content {
-  width: 346px;
-  height: 400px;
-  margin-right: 45px;
-  box-shadow: 0 0 5px #ccc;
+.qiu {
+  float: left;
+  width: 10px;
+  height: 10px;
+  background: #d5d5d5;
+  border-radius: 90px;
+  margin: 11px 15px 0 18px;
 }
-.content:last-child {
-  margin-right: 0;
+.listTitle {
+  height: 32px;
+  line-height: 32px;
+  border-left: 3px solid transparent;
 }
-.content .image {
-  width: 346px;
-  height: 226px;
-  margin-bottom: 15px;
+.listTitle:hover {
+  background-color: #fff;
+  border-left: 3px solid #415285;
+  cursor: pointer;
 }
-.content .title p {
-  font-size: 24px;
-  color: #5b5e66;
-  font-family: 微软雅黑;
-  margin-bottom: 12px;
-  padding: 0 24px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 2;
-  word-break: break-all;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-}
-.content .text p {
-  font-size: 12px;
-  color: #999999;
-  font-family: 宋体;
-  margin-bottom: 12px;
-  padding: 0 24px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 3;
-  word-break: break-all;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-}
-.content .time {
-  font-size: 18px;
-  color: #999999;
-  font-family: 宋体;
-  text-align: right;
-  padding: 0 24px;
+.listTitle:hover .qiu {
+  background-color: #415285;
 }
 </style>

src/layout/master/index/other.vue

@@ -2,37 +2,28 @@
   <div id="other">
     <el-row>
       <el-col :span="24">
-        <el-col :span="24" class="infoone">
-          <el-col :span="24" class="infoonebei">
-            <span>03其他</span>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="infoonelist">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane v-for="(item, index) in otherList" :key="index" :label="item.title" :name="`${index}`">
-              <el-col :span="24" class="list">
-                <el-col
-                  :span="24"
-                  class="listinfo"
-                  v-for="(child, index) in item.children"
-                  :key="index"
-                  @click.native="$router.push({ path: `/master/detail/news/${item.id}` })"
-                >
-                  <el-col :span="21">
-                    <span class="qiu"></span>
-                    <el-link :underline="false">
-                      <p class="title">{{ child.title }}</p>
-                    </el-link>
-                  </el-col>
-                  <el-col :span="3" class="date">
-                    {{ child.publish_time }}
-                  </el-col>
-                </el-col>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane v-for="(item, index) in otherList" :key="index" :label="item.title" :name="`${index}`">
+            <el-col
+              :span="24"
+              class="listinfo"
+              v-for="(child, index) in item.children"
+              :key="index"
+              @click.native="$router.push({ path: `/master/detail/news/${item.id}` })"
+            >
+              <el-col :span="20">
+                <span class="qiu"></span>
+                <el-link :underline="false">
+                  <p class="title">{{ child.title }}</p>
+                </el-link>
               </el-col>
-            </el-tab-pane>
-          </el-tabs>
-          <el-link :underline="false" class="add" @click="turnTo()"><i class="el-icon-plus"></i></el-link>
-        </el-col>
+              <el-col :span="4" class="date">
+                {{ child.publish_time }}
+              </el-col>
+            </el-col>
+          </el-tab-pane>
+        </el-tabs>
+        <el-link :underline="false" class="add" @click="turnTo()"><i class="el-icon-plus"></i></el-link>
       </el-col>
     </el-row>
   </div>
@@ -53,10 +44,11 @@ export default {
   methods: {
     handleClick(tab, event) {
       // eslint-disable-next-line no-console
+      // console.log(tab, event);
     },
     turnTo() {
-      let column = this.otherList[this.activeName].id;
-      let title = this.otherList[this.activeName].title;
+      let column = this.recruitList[this.activeName].id;
+      let title = this.recruitList[this.activeName].title;
       this.$router.push({ path: `/master/notice/${column}`, query: { news_type: '0', title: title } });
     },
   },
@@ -68,90 +60,60 @@ p {
   margin: 0;
   padding: 0;
 }
-.infoone {
-  height: 476px;
-}
-.infoonebei {
-  width: 294px;
-  height: 476px;
-  background: #415285;
-}
-.infoonebei span {
-  display: inline-block;
-  width: 294px;
-  text-align: center;
-  height: 108px;
-  line-height: 108px;
-  font-size: 42px;
-  color: #fff;
-}
-.infoonelist {
-  width: 1130px;
-  height: 348px;
-  background: #fff;
-  position: absolute;
-  top: 100px;
-  left: 71px;
-  box-shadow: 0px 0px 5px #ccc;
-}
 .add {
   position: absolute;
-  top: 40px;
-  right: 20px;
-  width: 30px;
-  height: 30px;
-  line-height: 30px;
+  top: 15px;
+  right: 15px;
+  width: 20px;
+  height: 20px;
   text-align: center;
   border: 1px solid #ccc;
   border-radius: 5px;
-}
-.add .el-link--inner {
-  font-size: 30px;
+  color: #000;
+  background: #fff;
+  font-weight: bold;
 }
 /deep/.el-tabs__header {
   margin: 0;
-}
-/deep/.el-tabs__nav-wrap {
-  height: 90px;
+  background: #415285;
 }
 /deep/.el-tabs__item {
-  font-size: 26px;
-  height: 90px;
-  line-height: 112px;
+  color: #bfc4d3;
+  font-size: 18px;
+  height: 50px;
+  line-height: 50px;
 }
 /deep/.el-tabs__item.is-active {
-  color: #415285;
-}
-/deep/.el-tabs__nav-wrap::after {
-  background-color: transparent;
-}
-/deep/.el-tabs__active-bar {
-  background-color: #415285;
-  height: 4px;
+  color: #fff;
 }
 /deep/.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px;
 }
-.list {
-  height: 259px;
-  overflow: hidden;
+/deep/.el-tabs__active-bar {
+  background-color: transparent;
 }
-.listinfo {
-  padding: 26px 0 0 0;
+/deep/.el-tabs__nav-wrap::after {
+  background-color: transparent;
 }
-.list .qiu {
+.qiu {
   display: inline-block;
   width: 4px;
   height: 5px;
   background: #999;
-  margin: 0 5px 0 25px;
+  margin: 0 15px;
 }
-.list .title {
-  font-size: 24px;
+.listinfo {
+  padding: 20px 0;
+}
+.listinfo .el-link {
+  font-size: 16px;
   color: #000;
 }
-.list .date {
-  font-size: 24px;
+.listinfo:hover .el-link {
+  color: #415285;
+}
+.listinfo .date {
+  font-size: 18px;
   color: #999;
 }
 </style>

src/layout/master/index/recruit.vue

@@ -1,36 +1,29 @@
 <template>
-  <div id="recruit">
+  <div id="huodong">
     <el-row>
       <el-col :span="24">
-        <el-col :span="24" class="recruitbei">
-          <span>02活动</span>
-        </el-col>
-        <el-col :span="24" class="infoonelist">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane v-for="(item, index) in recruitList" :key="index" :label="item.title" :name="`${index}`">
-              <el-col :span="24" class="list">
-                <el-col
-                  :span="24"
-                  class="listinfo"
-                  v-for="(child, index) in item.children"
-                  :key="index"
-                  @click.native="$router.push({ path: `/master/detail/news/${item.id}` })"
-                >
-                  <el-col :span="21">
-                    <span class="qiu"></span>
-                    <el-link :underline="false">
-                      <p class="title">{{ child.title }}</p>
-                    </el-link>
-                  </el-col>
-                  <el-col :span="3" class="date">
-                    {{ child.publish_time }}
-                  </el-col>
-                </el-col>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane v-for="(item, index) in recruitList" :key="index" :label="item.title" :name="`${index}`">
+            <el-col
+              :span="24"
+              class="listinfo"
+              v-for="(child, index) in item.children"
+              :key="index"
+              @click.native="$router.push({ path: `/master/detail/news/${item.id}` })"
+            >
+              <el-col :span="20">
+                <span class="qiu"></span>
+                <el-link :underline="false">
+                  <p class="title">{{ child.title }}</p>
+                </el-link>
               </el-col>
-            </el-tab-pane>
-          </el-tabs>
-          <el-link :underline="false" class="add" @click="turnTo()"><i class="el-icon-plus"></i></el-link>
-        </el-col>
+              <el-col :span="4" class="date">
+                {{ child.publish_time }}
+              </el-col>
+            </el-col>
+          </el-tab-pane>
+        </el-tabs>
+        <el-link :underline="false" class="add" @click="turnTo()"><i class="el-icon-plus"></i></el-link>
       </el-col>
     </el-row>
   </div>
@@ -38,7 +31,7 @@
 
 <script>
 export default {
-  name: 'recruit',
+  name: 'huodong',
   props: {
     recruitList: null,
   },
@@ -67,88 +60,60 @@ p {
   margin: 0;
   padding: 0;
 }
-.recruitbei {
-  text-align: right;
-}
-.recruitbei span {
-  display: inline-block;
-  width: 294px;
-  height: 469px;
-  background: #415285;
-  color: #fff;
-  text-align: center;
-  font-size: 48px;
-  font-family: 宋体;
-  font-weight: bold;
-  padding: 43px 0 0 0;
-}
-.infoonelist {
-  width: 1130px;
-  height: 372px;
-  background: #fff;
-  position: absolute;
-  right: 47px;
-  top: 118px;
-  box-shadow: 0px 0px 5px #ccc;
-}
 .add {
   position: absolute;
-  top: 20px;
-  right: 20px;
-  width: 43px;
-  height: 43px;
-  line-height: 43px;
+  top: 15px;
+  right: 15px;
+  width: 20px;
+  height: 20px;
   text-align: center;
   border: 1px solid #ccc;
   border-radius: 5px;
-}
-/deep/.add .el-link--inner {
-  font-size: 30px;
+  color: #000;
+  background: #fff;
+  font-weight: bold;
 }
 /deep/.el-tabs__header {
   margin: 0;
-}
-/deep/.el-tabs__nav-wrap {
-  height: 90px;
+  background: #415285;
 }
 /deep/.el-tabs__item {
-  font-size: 30px;
-  height: 90px;
-  line-height: 90px;
+  color: #bfc4d3;
+  font-size: 18px;
+  height: 50px;
+  line-height: 50px;
 }
 /deep/.el-tabs__item.is-active {
-  color: #415285;
-}
-/deep/.el-tabs__nav-wrap::after {
-  background-color: transparent;
-}
-/deep/.el-tabs__active-bar {
-  background-color: #415285;
-  height: 6px;
+  color: #fff;
 }
 /deep/.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px;
 }
-.list {
-  height: 284px;
-  overflow: hidden;
+/deep/.el-tabs__active-bar {
+  background-color: transparent;
 }
-.listinfo {
-  padding: 30px 0 0 0;
+/deep/.el-tabs__nav-wrap::after {
+  background-color: transparent;
 }
-.list .qiu {
+.qiu {
   display: inline-block;
   width: 4px;
   height: 5px;
   background: #999;
-  margin: 0 16px 0 31px;
+  margin: 0 15px;
 }
-.list .title {
-  font-size: 24px;
-  color: #828282;
+.listinfo {
+  padding: 20px 0;
+}
+.listinfo .el-link {
+  font-size: 16px;
+  color: #000;
+}
+.listinfo:hover .el-link {
+  color: #415285;
 }
-.list .date {
-  font-size: 24px;
+.listinfo .date {
+  font-size: 18px;
   color: #999;
 }
 </style>

src/layout/master/index/top.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <el-col :span="12">
           <el-col :span="4" class="logo">
-            <img style="width:77px;height:75px;" :src="topinfo.logo" />
+            <img style="width:75px;height:75px;" :src="topinfo.logo" />
           </el-col>
           <el-col :span="20" class="title">
             {{ topinfo.name }}
@@ -84,7 +84,7 @@ export default {
   text-align: center;
 }
 .menulist .text .el-link {
-  font-size: 25px;
+  font-size: 24px;
   color: #415285;
 }
 .search {

src/layout/master/index/yizhan.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="yizhan">
     <el-row>
-      <el-col :span="24" class="yizhanshi">
+      <!-- <el-col :span="24" class="yizhanshi">
         <div class="w_1200">
           <el-col :span="24" class="top">
             <el-image :src="yizhanshi"></el-image>
@@ -29,6 +29,23 @@
             </el-col>
           </el-col>
         </div>
+      </el-col> -->
+      <el-col :span="24" class="info">
+        <el-link :underline="false">
+          <el-image style="width:294px;height:55px;padding: 0 0 0 40px;" :src="yizhanshi"></el-image>
+        </el-link>
+        <el-link :underline="false" href="http://jilinbys.ncss.org.cn/login">
+          <el-image style="width:112px;height:55px;padding: 0 0 0 15px;" :src="xuesheng"></el-image>
+        </el-link>
+        <el-link :underline="false" href="http://jilinbys.ncss.org.cn/rec/login">
+          <el-image style="width:112px;height:55px;padding: 0 0 0 15px;" :src="qiye"></el-image>
+        </el-link>
+        <el-link :underline="false" href="http://file.ncss.org.cn/ncsFile/ncss/guidebook/student_guide.pdf">
+          <el-image style="width:167px;height:55px;padding: 0 0 0 190px;" :src="shouce"></el-image>
+        </el-link>
+        <el-link :underline="false" href="http://file.ncss.org.cn/ncsFile/ncss/guidebook/rec_guide.pdf">
+          <el-image style="width:167px;height:55px;padding: 0 0 0 15px;" :src="shouces"></el-image>
+        </el-link>
       </el-col>
     </el-row>
   </div>
@@ -41,10 +58,10 @@ export default {
   components: {},
   data: () => ({
     yizhanshi: require('../../../assets/yizhan.png'),
-    xuesheng: require('../../../assets/studentlogin.png'),
-    company: require('../../../assets/companylogin.png'),
-    xueshengzhidao: require('../../../assets/zhidao.png'),
-    yongren: require('../../../assets/yongren.png'),
+    xuesheng: require('../../../assets/xuesheng.png'),
+    qiye: require('../../../assets/qiye.png'),
+    shouce: require('../../../assets/shouce.png'),
+    shouces: require('../../../assets/shouces.png'),
   }),
   created() {},
   computed: {},
@@ -53,21 +70,11 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.w_1200 {
-  width: 1200px;
-  margin: 0 auto;
+.info {
+  height: 55px;
+  background-color: #4193c5;
 }
-.yizhanshi {
-  height: 274px;
-  background: #4193c5;
-}
-.top {
-  margin: 30px 0;
-}
-.login {
-  text-align: center;
-}
-.login .el-image {
-  border-radius: 35px;
+.info .el-link {
+  height: 55px;
 }
 </style>

src/views/master/index/index.vue

@@ -9,22 +9,60 @@
       <el-col :span="24" class="banner">
         <banner :bannerinfo="bannerinfo"></banner>
       </el-col>
-      <el-col :span="24" class="news">
-        <div class="w_1200">
-          <news :newsList="newsList"></news>
-        </div>
-      </el-col>
-      <el-col :span="24" class="notice">
-        <div class="w_1200">
-          <notice :noticeinfo="noticeinfo" :noticelist="noticelist"></notice>
-        </div>
-      </el-col>
-      <el-col :span="24" class="login">
-        <div class="w_1200">
-          <login></login>
-        </div>
+      <el-col :span="24" class="main">
+        <el-col :span="24" class="newsNotice">
+          <div class="w_1200">
+            <el-col :span="15" class="news">
+              <news :newsList="newsList"></news>
+            </el-col>
+            <el-col :span="8" class="notice">
+              <notice :noticeinfo="noticeinfo" :noticelist="noticelist"></notice>
+            </el-col>
+          </div>
+        </el-col>
+        <el-col :span="24" class="mainTwo">
+          <div class="w_1200">
+            <el-col :span="8" class="mainTwoLeft">
+              <el-col :span="24" class="login">
+                <login></login>
+              </el-col>
+              <el-col :span="24" class="rili">
+                <slot name="rili"></slot>
+              </el-col>
+            </el-col>
+            <el-col :span="15" class="mainTwoRight">
+              <el-col :span="24" class="recruit">
+                <huodong :fairsList="fairsList" :talksList="talksList" :infoList="infoList"></huodong>
+              </el-col>
+              <el-col :span="24" class="jilin">
+                <recruit :recruitList="recruitList"></recruit>
+              </el-col>
+              <el-col :span="24" class="cause">
+                <other :otherList="otherList"></other>
+              </el-col>
+              <el-col :span="24" class="linkOut">
+                <fast></fast>
+              </el-col>
+            </el-col>
+          </div>
+        </el-col>
+        <el-col :span="24" class="yizhan">
+          <div class="w_1200">
+            <yizhan></yizhan>
+          </div>
+        </el-col>
+        <el-col :span="24" class="contUnit">
+          <div class="w_1200">
+            <el-col :span="8">
+              联系
+            </el-col>
+            <el-col :span="16">
+              招聘企业
+            </el-col>
+          </div>
+        </el-col>
       </el-col>
-      <el-col :span="24" class="huodong">
+      <!-- <el-col :span="24" class="huodong">
         <div class="w_1200">
           <huodong :huodonginfo="huodonginfo" :fairsList="fairsList" :talksList="talksList" :infoList="infoList"></huodong>
         </div>
@@ -67,7 +105,7 @@
       </el-col>
       <el-col :span="24" class="foot">
         <foot :footinfo="footinfo"></foot>
-      </el-col>
+      </el-col>  -->
     </el-row>
   </div>
 </template>
@@ -81,7 +119,7 @@ import login from '../../../layout/master/index/login.vue';
 import huodong from '../../../layout/master/index/huodong.vue';
 import recruit from '../../../layout/master/index/recruit.vue';
 import other from '../../../layout/master/index/other.vue';
-import calendar from '../../../layout/master/index/calendar.vue';
+// import calendar from '../../../layout/master/index/calendar.vue';
 import fast from '../../../layout/master/index/fast.vue';
 import contact from '../../../layout/master/index/contact.vue';
 import yizhan from '../../../layout/master/index/yizhan.vue';
@@ -124,13 +162,12 @@ export default {
     huodong,
     recruit,
     other,
-    calendar,
     fast,
-    contact,
     yizhan,
-    company,
-    unit,
-    foot,
+    // contact,
+    // company,
+    // unit,
+    // foot,
   },
   data: () => ({}),
   created() {},
@@ -145,40 +182,93 @@ export default {
   margin: 0 auto;
 }
 .top {
-  height: 143px;
+  height: 140px;
 }
 .banner {
-  height: 526px;
-  margin-bottom: 75px;
+  height: 556px;
+  overflow: hidden;
+}
+.main {
+  height: 1846px;
+  overflow: hidden;
+}
+.newsNotice {
+  height: 370px;
+  overflow: hidden;
 }
 .news {
-  height: 390px;
-  margin-bottom: 100px;
+  width: 730px;
+  height: 370px;
+  margin: 0 35px 0 0;
 }
 .notice {
-  height: 654px;
-  margin-bottom: 78px;
+  width: 415px;
+  height: 370px;
+}
+.mainTwo {
+  height: 780px;
+  margin: 35px 0;
+  overflow: hidden;
+}
+.mainTwoLeft {
+  height: 780px;
+  margin: 0 20px 0 0;
+  overflow: hidden;
 }
 .login {
-  height: 208px;
-  margin-bottom: 96px;
+  height: 157px;
+  overflow: hidden;
+}
+.rili {
+  height: 623px;
+  overflow: hidden;
+}
+.mainTwoRight {
+  width: 760px;
+  height: 780px;
+  overflow: hidden;
+}
+.recruit {
+  height: 187px;
+  margin: 0 0 20px 0;
+  box-shadow: 0 0 5px #ccc;
+  border: 1px solid #efefef;
+  overflow: hidden;
+}
+.jilin {
+  height: 187px;
+  margin: 0 0 20px 0;
+  box-shadow: 0 0 5px #ccc;
+  border: 1px solid #efefef;
+  overflow: hidden;
+}
+.cause {
+  height: 187px;
+  margin: 0 0 20px 0;
+  box-shadow: 0 0 5px #ccc;
+  border: 1px solid #efefef;
+  overflow: hidden;
+}
+.linkOut {
+  height: 157px;
+  overflow: hidden;
+}
+.yizhan {
+  height: 55px;
+  overflow: hidden;
+}
+.contUnit {
+  height: 213px;
+  overflow: hidden;
 }
 .huodong {
   height: 632px;
   margin-bottom: 50px;
 }
-.recruit {
-  height: 512px;
-  margin-bottom: 80px;
-}
 .other {
   height: 476px;
   margin-bottom: 166px;
 }
-.rili {
-  height: 1026px;
-  margin-bottom: 86px;
-}
 .fast {
   height: 508px;
   margin-bottom: 110px;
@@ -187,10 +277,7 @@ export default {
   height: 270px;
   margin-bottom: 60px;
 }
-.yizhan {
-  height: 274px;
-  margin-bottom: 86px;
-}
+
 .company {
   height: 465px;
   margin-bottom: 76px;