Merge branch 'master' of http://git.cc-lotus.info/smart-jobs/web-common

src/layout/master/notice/info.vue

@@ -0,0 +1,81 @@
+<template>
+  <div id="talk">
+    <el-row>
+      <el-col :span="24">
+        <el-col :span="24" class="info">
+          <el-col :span="24" class="title">
+            <p>{{ noticedetail.title }}</p>
+          </el-col>
+          <el-col :span="24" class="time">
+            {{ noticedetail.corpname }}
+          </el-col>
+          <el-col :span="24" class="image" v-if="noticedetail.url">
+            <el-image style="width:650px;height:427px;" :src="noticedetail.url"></el-image>
+          </el-col>
+          <el-col :span="24" class="content">
+            <p v-html="noticedetail.content"></p>
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'talk',
+  props: {
+    noticedetail: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  margin: 0;
+  padding: 0;
+}
+.info {
+  background: #f9f3f3;
+  padding: 0 70px 0 33px;
+}
+.info .title {
+  text-align: center;
+}
+.info .title p {
+  font-size: 36px;
+  color: #000;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding: 90px 0 30px 0;
+}
+.info .time {
+  font-size: 24px;
+  color: #333;
+  padding: 0 0 15px 0;
+  text-align: center;
+}
+.info .image {
+  padding: 0 0 75px 0;
+}
+.info .content {
+  text-align: left;
+}
+.info .content p {
+  font-size: 24px;
+  color: #4f4f4f;
+  text-indent: 2rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 16;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+</style>

src/layout/master/notice/jobfair.vue

@@ -0,0 +1,81 @@
+<template>
+  <div id="talk">
+    <el-row>
+      <el-col :span="24">
+        <el-col :span="24" class="info">
+          <el-col :span="24" class="title">
+            <p>{{ noticedetail.title }}</p>
+          </el-col>
+          <el-col :span="24" class="time">
+            {{ noticedetail.corpname }}
+          </el-col>
+          <el-col :span="24" class="image" v-if="noticedetail.url">
+            <el-image style="width:650px;height:427px;" :src="noticedetail.url"></el-image>
+          </el-col>
+          <el-col :span="24" class="content">
+            <p v-html="noticedetail.content"></p>
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'talk',
+  props: {
+    noticedetail: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  margin: 0;
+  padding: 0;
+}
+.info {
+  background: #f9f3f3;
+  padding: 0 70px 0 33px;
+}
+.info .title {
+  text-align: center;
+}
+.info .title p {
+  font-size: 36px;
+  color: #000;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding: 90px 0 30px 0;
+}
+.info .time {
+  font-size: 24px;
+  color: #333;
+  padding: 0 0 15px 0;
+  text-align: center;
+}
+.info .image {
+  padding: 0 0 75px 0;
+}
+.info .content {
+  text-align: left;
+}
+.info .content p {
+  font-size: 24px;
+  color: #4f4f4f;
+  text-indent: 2rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 16;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+</style>

src/layout/master/notice/jobinfo.vue

@@ -0,0 +1,81 @@
+<template>
+  <div id="jobinfo">
+    <el-row>
+      <el-col :span="24">
+        <el-col :span="24" class="info">
+          <el-col :span="24" class="title">
+            <p>{{ noticedetail.title }}</p>
+          </el-col>
+          <el-col :span="24" class="time">
+            {{ noticedetail.corpname }}
+          </el-col>
+          <el-col :span="24" class="image" v-if="noticedetail.url">
+            <el-image style="width:650px;height:427px;" :src="noticedetail.url"></el-image>
+          </el-col>
+          <el-col :span="24" class="content">
+            <p v-html="noticedetail.content"></p>
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'jobinfo',
+  props: {
+    noticedetail: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  margin: 0;
+  padding: 0;
+}
+.info {
+  background: #f9f3f3;
+  padding: 0 70px 0 33px;
+}
+.info .title {
+  text-align: center;
+}
+.info .title p {
+  font-size: 36px;
+  color: #000;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding: 90px 0 30px 0;
+}
+.info .time {
+  font-size: 24px;
+  color: #333;
+  padding: 0 0 15px 0;
+  text-align: center;
+}
+.info .image {
+  padding: 0 0 75px 0;
+}
+.info .content {
+  text-align: left;
+}
+.info .content p {
+  font-size: 24px;
+  color: #4f4f4f;
+  text-indent: 2rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 16;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+</style>

src/layout/master/notice/noticeright.vue

@@ -1,75 +1,51 @@
 <template>
   <div id="noticeright">
     <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="title">
-          <p>{{ noticedetail.title }}</p>
-        </el-col>
-        <el-col :span="24" class="time">
-          {{ noticedetail.time }}
-        </el-col>
-        <el-col :span="24" class="image">
-          <el-image style="width:650px;height:427px;" :src="noticedetail.url"></el-image>
-        </el-col>
-        <el-col :span="24" class="content">
-          <p>{{ noticedetail.content }}</p>
-        </el-col>
-      </el-col>
+      <span v-if="type === 'jobinfo'">
+        <jobinfo :noticedetail="noticedetail"></jobinfo>
+      </span>
+      <span v-else-if="type === 'talk'">
+        <talk :noticedetail="noticedetail"></talk>
+      </span>
+      <span v-else-if="type === 'jobfair'">
+        <jobfair :noticedetail="noticedetail"></jobfair>
+      </span>
+      <span v-else-if="type === 'info'">
+        <info :noticedetail="noticedetail"></info>
+      </span>
     </el-row>
   </div>
 </template>
 
 <script>
+import jobinfo from './jobinfo.vue';
+import talk from './talk.vue';
+import jobfair from './jobfair.vue';
+import info from './info.vue';
 export default {
   name: 'noticeright',
   props: {
     noticedetail: null,
+    talkdetail: null,
+    jobfairdetail: null,
+    info: null,
+    type: null,
+  },
+  components: {
+    jobinfo,
+    talk,
+    jobfair,
+    info,
   },
-  components: {},
   data: () => ({}),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    search(page) {
+      this.$emit('search', page);
+    },
+  },
 };
 </script>
 
-<style lang="less" scoped>
-p {
-  margin: 0;
-  padding: 0;
-}
-.info {
-  height: 1565px;
-  background: #f9f3f3;
-  padding: 0 70px 0 33px;
-  text-align: center;
-}
-.info .title p {
-  font-size: 36px;
-  color: #000;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  padding: 90px 0 30px 0;
-}
-.info .time {
-  font-size: 24px;
-  color: #333;
-  padding: 0 0 75px 0;
-}
-.info .image {
-  padding: 0 0 75px 0;
-}
-.info .content p {
-  font-size: 24px;
-  color: #4f4f4f;
-  text-indent: 2rem;
-  line-height: 45px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 16;
-  word-break: break-all;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-}
-</style>
+<style lang="less" scoped></style>

src/layout/master/notice/talk.vue

@@ -0,0 +1,81 @@
+<template>
+  <div id="talk">
+    <el-row>
+      <el-col :span="24">
+        <el-col :span="24" class="info">
+          <el-col :span="24" class="title">
+            <p>{{ noticedetail.title }}</p>
+          </el-col>
+          <el-col :span="24" class="time">
+            {{ noticedetail.corpname }}
+          </el-col>
+          <el-col :span="24" class="image" v-if="noticedetail.url">
+            <el-image style="width:650px;height:427px;" :src="noticedetail.url"></el-image>
+          </el-col>
+          <el-col :span="24" class="content">
+            <p v-html="noticedetail.content"></p>
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'talk',
+  props: {
+    noticedetail: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  margin: 0;
+  padding: 0;
+}
+.info {
+  background: #f9f3f3;
+  padding: 0 70px 0 33px;
+}
+.info .title {
+  text-align: center;
+}
+.info .title p {
+  font-size: 36px;
+  color: #000;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding: 90px 0 30px 0;
+}
+.info .time {
+  font-size: 24px;
+  color: #333;
+  padding: 0 0 15px 0;
+  text-align: center;
+}
+.info .image {
+  padding: 0 0 75px 0;
+}
+.info .content {
+  text-align: left;
+}
+.info .content p {
+  font-size: 24px;
+  color: #4f4f4f;
+  text-indent: 2rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 16;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+</style>

src/views/master/news/detail.vue

@@ -68,9 +68,6 @@ export default {
   height: 529px;
   margin-bottom: 72px;
 }
-.main {
-  height: 1622px;
-}
 .mainLeft {
   width: 303px;
   margin-right: 14px;
@@ -78,7 +75,7 @@ export default {
 }
 .mainRight {
   background-color: #f8f2f2;
-  height: 1568px;
+
   text-align: center;
 }
 </style>