Skip to content

X
xmbdt
Commit b5135b38 authored by 姜启航's avatar 姜启航
Browse files
Options

修改bug 完成大事记 投资领域

parent 6311bc4a
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 40 deletions
index.html
View file @ b5135b38
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>vue项目</title> <title>厦门半导体投资集团有限公司</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
......
src/components/PageHeader.vue
View file @ b5135b38
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<!-- </router-link> --> <!-- </router-link> -->
<router-link to="/xmsig/index" tag="li">首页</router-link> <router-link to="/xmsig/index" tag="li">首页</router-link>
<router-link to="/xmsig/about" tag="li">关于我们</router-link> <router-link to="/xmsig/about/intro" tag="li" class="gywm">关于我们</router-link>
<router-link to="/xmsig/investment" tag="li">投资业务</router-link> <router-link to="/xmsig/investment" tag="li">投资业务</router-link>
<router-link to="/xmsig/news" tag="li" class="news">新闻资讯</router-link> <router-link to="/xmsig/news" tag="li" class="news">新闻资讯</router-link>
<router-link to="/xmsig/talents" tag="li">人才招聘</router-link> <router-link to="/xmsig/talents" tag="li">人才招聘</router-link>
......
src/pages/Memorabilia.vue
View file @ b5135b38
...@@ -8,25 +8,38 @@ ...@@ -8,25 +8,38 @@
<img src="../assets/images/aus07.jpg" alt=""> <img src="../assets/images/aus07.jpg" alt="">
</div> </div>
<div class="content"> <div class="content">
<div class="shiji"> <div class="shiji" v-for="(sj,k) in shiji" :key="k" :class='addDifClass(k)'>
<span class="left"> <span class="left">
<div class="date">
<h1 class="h-date">{{year}}</h1>
<div>
<p class="p-date"></p>
<i></i>
</div>
<h1 class="shuzi">{{month}}</h1>
</div>
<div class="dic">
<h1>{{sj.post_title}}</h1>
<p>{{sj.post_excerpt}}</p>
</div>
</span>
<span class="right">
<div class="dic">
<h1>{{sj.post_title}}</h1>
<p>{{sj.post_excerpt}}</p>
</div>
<div class="date"> <div class="date">
<h1 class="h-date">2017</h1> <h1 class="h-date">{{year}}</h1>
<div> <div>
<p class="p-date"></p> <p class="p-date"></p>
<i></i> <i></i>
</div> </div>
<h1 class="shuzi">10</h1> <h1 class="shuzi">{{month}}</h1>
</div> </div>
</span> </span>
<span class="right">
<div class="dic">
<h1>学习中国共产党发展</h1>
<p>2017年10月 公司党支部组织全体员工进行为期3天的井冈山红色之旅，学习中国共产党发展历史，缅怀革命先烈。</p>
</div>
</span>
</div>
</div>
</div> </div>
<div class="start"> <div class="start">
<span>START</span> <span>START</span>
...@@ -45,19 +58,35 @@ ...@@ -45,19 +58,35 @@
data() { data() {
return { return {
msg: "Memorabilia", msg: "Memorabilia",
shiji:[],
year:'',
month:''
}; };
}, },
methods: { methods: {
getLiveList() { getLiveList() {
this.$http.get('/api/postlist?category_id=3') this.$http.get('/api/postlist?category_id=3')
.then((res) => { .then((res) => {
console.log(res.body) this.shiji=res.body.data
this.shiji.forEach(e => {
this.year=e.post_keywords.substring(e.post_keywords.length-3,e.post_keywords.length-7)
this.month=e.post_keywords.substring(e.post_keywords.length-2,e.post_keywords.length)
console.log(this.month)
});
}) })
.catch((err) => { .catch((err) => {
console.log(err) console.log(err)
}) })
}, },
addDifClass(k){
if(k%2==0){
return {even:true}
}else{
return {odd:true}
}
}
}, },
created () { created () {
this.getLiveList() this.getLiveList()
...@@ -125,7 +154,7 @@ ...@@ -125,7 +154,7 @@
border: 1px solid #B5A14E; border: 1px solid #B5A14E;
background-color: #B5A14E; background-color: #B5A14E;
border-radius: 50%; border-radius: 50%;
margin-right: -5px; margin-right: -6px;
margin-top: -68px; margin-top: -68px;
} }
.left .dic{ .left .dic{
...@@ -183,5 +212,28 @@ ...@@ -183,5 +212,28 @@
margin-bottom: 300px; margin-bottom: 300px;
} }
.shiji.odd .left .date{
display: none;
}
.shiji.even .left .dic{
display: none;
}
.shiji.even .right .date{
display: none;
}
.shiji.odd .left .dic{
margin-top: 20px;
text-align: right;
word-wrap:break-word ;
}
.shiji.odd .left .dic p{
width: 562px;
padding-right: 38px;
}
.shiji.odd .right .dic{
display: none;
}
.shiji.odd .right .date i{
margin-left: -172px;
}
</style> </style>
\ No newline at end of file
src/pages/about.vue
View file @ b5135b38
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="top"> <div class="top">
<ul class="com"> <ul class="com">
<router-link to="/xmsig/about/intro" class="active" tag="li">公司简介</router-link> <router-link to="/xmsig/about/intro" class="" tag="li">公司简介</router-link>
<router-link to="/xmsig/about/company" tag="li">公司文化</router-link> <router-link to="/xmsig/about/company" tag="li">公司文化</router-link>
<router-link to="/xmsig/about/Memorabilia" tag="li">大事记</router-link> <router-link to="/xmsig/about/Memorabilia" tag="li">大事记</router-link>
<router-link to="/xmsig/about/manager" tag="li">总经理致辞</router-link> <router-link to="/xmsig/about/manager" tag="li">总经理致辞</router-link>
...@@ -50,18 +50,15 @@ ...@@ -50,18 +50,15 @@
}, },
methods: { methods: {
add(){ add(){
$('.com li').click(function(){ $('.gywm').css('border-bottom' ,'3px solid #B59F4C')
$(this).addClass('active').siblings().removeClass('active')
// $('.content ul').eq($(this).index()).css('display','block').siblings().css('display','none');
})
} }
}, },
computed: {...mapGetters(['gettersMsg'])}, computed: {...mapGetters(['gettersMsg'])},
created () { created () {
}, },
mounted(){ mounted(){
this.add() this.add()
} }
...@@ -86,7 +83,7 @@ ...@@ -86,7 +83,7 @@
color: rgba(236, 237, 223, 0.8); color: rgba(236, 237, 223, 0.8);
font-size: 120px; font-size: 120px;
width: 620px; width: 620px;
margin-left: 364px; margin-left: 454px;
padding-top: 102px; padding-top: 102px;
user-select:none; user-select:none;
} }
...@@ -117,4 +114,8 @@ ...@@ -117,4 +114,8 @@
background-color: #B5A14E; background-color: #B5A14E;
color: #fff; color: #fff;
} }
.router-link-active{
background-color: #B5A14E;
color: #fff;
}
</style> </style>
\ No newline at end of file
src/pages/index.vue
View file @ b5135b38
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
}, },
gomore(){ gomore(){
this.$router.push('/xmsig/about') this.$router.push('/xmsig/about/intro')
}, },
......
src/pages/investinfo.vue 0 → 100644
View file @ b5135b38
<template>
<div>
<img class="img-top" src="../assets/images/in02.jpg" alt="">
<h1>半导体封测</h1>
<p class="p-eng">Semiconductor packaging and testing</p>
<p>以投资、并购、资本运营和基金管理为手段，打造按市场规律运营的产业资源整合平台，涵盖集成电路设计、集成电路封装测试、产品导向的特色工艺及集成电路装备与材料等领域的重点产品、核心技术和重点应用项目（企业）等。</p>
<p class="p-dic">半导体投资集团的目标与任务半导体是核心产业，随着中国半导体产业的成长，以及中国半导体产业基金的投入，中国半导体行业成为各方关注的焦点。</p>
</div>
</template>
<script>
export default {
name: "investinfo",
// 混入
data() {
return {
msg: "investinfo",
};
}
};
</script>
<style>
.img-top{
margin-top: 114px;
margin-bottom: 46px;
width: 680px;
}
h1{
font-size: 18px;
margin-bottom: 12px;
}
.p-eng{
font-size: 18px;
margin-top: 26px;
margin-bottom: 19px;
}
.left p{
width: 680px;
color: #aaa;
/* font-size: 14px; */
}
.p-dic{
margin-top: 10px;
margin-bottom: 6vw;
}
</style>
\ No newline at end of file
src/pages/investment.vue
View file @ b5135b38
...@@ -40,8 +40,22 @@ ...@@ -40,8 +40,22 @@
var target = event.target; var target = event.target;
var index = Number(target.getAttribute("data-index")); var index = Number(target.getAttribute("data-index"));
this.navActive = index; this.navActive = index;
} },
getLiveList() {
this.$http.get('/api/postlist?category_id=4')
.then((res) => {
console.log(res)
})
.catch((err) => {
console.log(err)
})
}, },
},
mounted () {
this.getLiveList()
}
}; };
</script> </script>
......
src/pages/newinfo.vue
View file @ b5135b38
...@@ -22,15 +22,15 @@ ...@@ -22,15 +22,15 @@
<div class="right"> <div class="right">
<p class="hangye">行业资讯</p> <p class="hangye">行业资讯</p>
<div class="right-new"> <div class="right-new">
<div class="new-con"> <div class="new-con" v-for="n in news" @click='goinfo(n.id)'>
<div class="new-con-top"> <div class="new-con-top">
<div class="time">07-03</div> <div class="time">{{n.time}}</div>
<div class="kong"></div> <div class="kong"></div>
<div> <div>
<p class="t1">李克强对“华龙一号”福清核电5号机组建设工作 作出重要批示</p> <p class="t1">{{n.title}}</p>
</div> </div>
</div> </div>
<p class="new-content">中共中央政治局常委、国务院总理李克强日前对“华龙一号”福清核电5号机组建设工作作出重要批示。批示指出：我国自</p> <p class="new-content">{{n.content}}</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -49,6 +49,9 @@ ...@@ -49,6 +49,9 @@
data() { data() {
return { return {
msg: "newinfo", msg: "newinfo",
news:[
{time:'07-03',title:'李克强对“华龙一号”福清核电5号机组建设工作作出重要批示',content:'中共中央政治局常委、国务院总理李克强日前对“华龙一号”福清核电5号机组建设工作作出重要批示。批示指出：我国自'}
]
}; };
}, },
...@@ -75,7 +78,7 @@ ...@@ -75,7 +78,7 @@
// }, // },
add(){ add(){
console.log(123) // console.log(123)
$('.news').css('border-bottom' ,'3px solid #B59F4C') $('.news').css('border-bottom' ,'3px solid #B59F4C')
}, },
goinfo(id){ goinfo(id){
...@@ -243,6 +246,7 @@ ...@@ -243,6 +246,7 @@
padding-left: 0; padding-left: 0;
padding-right: 60px; padding-right: 60px;
cursor: pointer;
} }
.right-new:hover .new-con{ .right-new:hover .new-con{
transform: translate(30px, 0px); transform: translate(30px, 0px);
......
src/pages/territory.vue
View file @ b5135b38
...@@ -3,17 +3,13 @@ ...@@ -3,17 +3,13 @@
<div class="content"> <div class="content">
<div class="cen"> <div class="cen">
<div class="left"> <div class="left">
<img src="../assets/images/in02.jpg" alt=""> <router-view ></router-view>
<h1>半导体封测</h1>
<p class="p-eng">Semiconductor packaging and testing</p>
<p>以投资、并购、资本运营和基金管理为手段，打造按市场规律运营的产业资源整合平台，涵盖集成电路设计、集成电路封装测试、产品导向的特色工艺及集成电路装备与材料等领域的重点产品、核心技术和重点应用项目（企业）等。</p>
<p class="p-dic">半导体投资集团的目标与任务半导体是核心产业，随着中国半导体产业的成长，以及中国半导体产业基金的投入，中国半导体行业成为各方关注的焦点。</p>
</div> </div>
<div class="right"> <div class="right">
<div v-for="item in items"> <router-link to="/xmsig/investment/investinfo" tag="div" v-for="item in items">
<p class="p1">{{item.p1}}</p> <p class="p1">{{item.p1}}</p>
<p class="p2">{{item.p2}}</p> <p class="p2">{{item.p2}}</p>
</div> </router-link>
</div> </div>
</div> </div>
</div> </div>
...@@ -85,6 +81,7 @@ ...@@ -85,6 +81,7 @@
/* height: 25%; */ /* height: 25%; */
text-align: center; text-align: center;
padding-top: 170px; padding-top: 170px;
cursor: pointer;
} }
.right div:nth-child(1){ .right div:nth-child(1){
padding-top: 89px; padding-top: 89px;
......
src/router/index.js
View file @ b5135b38
...@@ -6,6 +6,8 @@ Vue.use(Router) ...@@ -6,6 +6,8 @@ Vue.use(Router)
import index from '@/pages/index' import index from '@/pages/index'
import about from '@/pages/about' import about from '@/pages/about'
import investment from '@/pages/investment' import investment from '@/pages/investment'
import investinfo from '@/pages/investinfo'
import news from '@/pages/news' import news from '@/pages/news'
import talents from '@/pages/talents' import talents from '@/pages/talents'
import contact from '@/pages/contact' import contact from '@/pages/contact'
...@@ -61,7 +63,19 @@ var routes = [{ ...@@ -61,7 +63,19 @@ var routes = [{
}, { }, {
name: '/investment', name: '/investment',
path: '/xmsig/investment', path: '/xmsig/investment',
component: investment component: investment,
children:[
{
path: '/xmsig/investment',
name: 'investinfo',
component: investinfo
},
{
path: '/xmsig/investment/investinfo',
name: 'investinfo',
component: investinfo
}
]
}, { }, {
name: '/news', name: '/news',
path: '/xmsig/news', path: '/xmsig/news',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment