wuhongyu преди 5 години
родител
ревизия
488a247a0b

+ 5 - 5
src/layout/common/foot.vue

@@ -4,16 +4,12 @@
       <p>版权所有:吉林省技术算中心</p>
       <p>
         <span>技术支持:长春福瑞科技有限公司</span>
-        &nbsp;&nbsp;&nbsp;&nbsp;
         <span>邮编:130000</span>
-        &nbsp;&nbsp;&nbsp;&nbsp;
         <span>传真:239823982</span>
       </p>
       <p>
         <span>地址:吉林省长春市朝阳区前进大街1244号</span>
-        &nbsp;&nbsp;&nbsp;&nbsp;
         <span>电话:0134-1234567</span>
-        &nbsp;&nbsp;&nbsp;&nbsp;
         <span>邮箱:123456@163.com</span>
       </p>
     </div>
@@ -45,6 +41,10 @@ export default {
   font-size: 14px;
   color: #868f9e;
   font-family: '微软雅黑';
-  padding: 0 200px;
+  padding: 5px 200px;
+}
+
+.down p span {
+  padding: 0 20px 0 0;
 }
 </style>

+ 1 - 1
src/layout/common/lianjie.vue

@@ -17,7 +17,7 @@ export default {
   data: () => ({
     linklist: [
       { src: require('@/assets/zz.jpg') },
-      { src: require('@/assets/23.jpg') },
+      { src: require('@/assets/zz.jpg') },
       { src: require('@/assets/zz.jpg') },
       { src: require('@/assets/zz.jpg') },
     ],

+ 2 - 0
src/layout/common/newmenu.vue

@@ -54,6 +54,7 @@ export default {
   border-right: 2px solid #76bdfe;
   font-size: 22px;
   color: #fff;
+  background: #2152994f;
 }
 
 /deep/.el-menu--horizontal > .el-menu-item:nth-child(5) {
@@ -69,6 +70,7 @@ export default {
   text-align: center;
   border: none;
   font-size: 22px;
+  background: #2152994f;
 }
 
 /deep/.el-menu-item:hover {

+ 4 - 1
src/layout/common/top.vue

@@ -67,7 +67,10 @@ export default {
   color: #fff;
   line-height: 40px;
 }
-
+.w_1200 {
+  width: 1200px;
+  margin: 0 auto;
+}
 .logo {
   height: 200px;
   overflow: hidden;

+ 3 - 7
src/layout/index/left.vue

@@ -1,10 +1,6 @@
 <template>
-  <div id="left">
-    <el-col :span="24" class="maintoplefttitle">
-      <div style="padding:10px 0 0 0;border-bottom: 1px dashed #ccc;">
-        <span>|</span><span>运行动态</span><span><i class="el-icon-more"></i></span>
-      </div>
-    </el-col>
+  <div id="dynamic">
+    <el-col :span="24" class="maintoplefttitle"> </el-col>
     <el-col :span="24">
       <el-col :span="12" class="leftcontext">
         统计图
@@ -15,7 +11,7 @@
 
 <script>
 export default {
-  name: 'left',
+  name: 'dynamic',
   props: {},
   components: {},
   data: () => ({}),

+ 19 - 17
src/layout/index/right.vue

@@ -1,13 +1,13 @@
 <template>
-  <div id="right">
+  <div id="jobs">
     <el-col :span="24" class="maintoplefttitle">
-      <div style="padding:10px 0 0 0;border-bottom: 1px dashed #ccc;">
-        <span>|</span><span>工作动态</span><span><i class="el-icon-more"></i></span>
+      <div style="padding:10px 0 0 0;border-bottom: 1px solid  #ccc;">
+        <span></span><span>工作动态</span><span><i class="el-icon-more"></i></span>
       </div>
     </el-col>
     <el-col :span="24">
-      <el-col :span="24" class="leftcontext" v-for="(item, index) in list" :key="index">
-        <el-col :span="20" class="title"> <span>.</span>{{ item.title }} </el-col>
+      <el-col :span="24" class="leftcontext" v-for="(item, index) in jobsList" :key="index">
+        <el-col :span="20" class="title"> <span></span>{{ item.title }} </el-col>
         <el-col :span="4" class="date">{{ item.date }}</el-col>
       </el-col>
     </el-col>
@@ -16,8 +16,8 @@
 
 <script>
 export default {
-  name: 'right',
-  props: { list: null },
+  name: 'jobs',
+  props: { jobsList: null },
   components: {},
   data: () => ({}),
   created() {},
@@ -42,10 +42,11 @@ export default {
   // border-bottom: 1px dashed #ccc;
 }
 .main .maintopright .maintoplefttitle span:first-child {
-  font-weight: 1000;
-  padding: 10px 5px 0 0px;
-  font-size: 20px;
-  color: #005293;
+  display: inline-block;
+  width: 4px;
+  height: 20px;
+  background: #005293;
+  margin: 0 10px -3px 0;
 }
 
 .main .maintopright .maintoplefttitle span:nth-child(2) {
@@ -69,18 +70,19 @@ export default {
   padding: 0;
 }
 
-.maintopright .leftcontext title span:first-child {
-  font-weight: 1000;
-  padding: 5px;
-}
-
 .title {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   height: 38px;
 }
-
+.title span:first-child {
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  margin: 9px 10px 3px 0;
+  background: #ccc;
+}
 .date {
   float: right;
   color: #777777;

+ 19 - 11
src/layout/index/contextright.vue

@@ -1,13 +1,13 @@
 <template>
-  <div id="right">
+  <div id="notice">
     <el-col :span="24" class="maintoplefttitle">
-      <div style="padding:10px 0 0 0;border-bottom: 1px dashed #ccc;">
-        <span>|</span><span>技术问答</span><span><i class="el-icon-more"></i></span>
+      <div style="padding:10px 0 0 0;border-bottom: 1px solid #ccc;">
+        <span></span><span>通知公告</span><span><i class="el-icon-more"></i></span>
       </div>
     </el-col>
     <el-col :span="24">
-      <el-col :span="24" class="leftcontext" v-for="(item, index) in jishulsit" :key="index">
-        <el-col :span="21" class="title"> <span>.</span>{{ item.title }} </el-col>
+      <el-col :span="24" class="leftcontext" v-for="(item, index) in noticeList" :key="index">
+        <el-col :span="21" class="title"> <span></span>{{ item.title }} </el-col>
         <el-col :span="3" class="date">{{ item.date }}</el-col>
       </el-col>
     </el-col>
@@ -16,9 +16,9 @@
 
 <script>
 export default {
-  name: 'context',
+  name: 'notice',
   props: {
-    jishulsit: null,
+    noticeList: null,
   },
   components: {},
   data: () => ({}),
@@ -44,10 +44,11 @@ export default {
   // border-bottom: 1px dashed #ccc;
 }
 .main .context .maintoplefttitle span:first-child {
-  font-weight: 1000;
-  padding: 10px 5px 0 0px;
-  font-size: 20px;
-  color: #005293;
+  display: inline-block;
+  width: 4px;
+  height: 20px;
+  background: #005293;
+  margin: 0 10px -3px 0;
 }
 
 .main .context .maintoplefttitle span:nth-child(2) {
@@ -82,6 +83,13 @@ export default {
   white-space: nowrap;
   height: 38px;
 }
+.title span:first-child {
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  margin: 9px 10px 3px 0;
+  background: #ccc;
+}
 
 .date {
   float: right;

+ 19 - 11
src/layout/index/contextbetween.vue

@@ -1,13 +1,13 @@
 <template>
-  <div id="right">
+  <div id="service">
     <el-col :span="24" class="maintoplefttitle">
-      <div style="padding:10px 0 0 0;border-bottom: 1px dashed #ccc;">
-        <span>|</span><span>科级合作</span><span><i class="el-icon-more"></i></span>
+      <div style="padding:10px 0 0 0;border-bottom: 1px solid #ccc;">
+        <span></span><span>科级合作</span><span><i class="el-icon-more"></i></span>
       </div>
     </el-col>
     <el-col :span="24">
-      <el-col :span="24" class="leftcontext" v-for="(item, index) in servicelist" :key="index">
-        <el-col :span="20" class="title"> <span>.</span>{{ item.title }} </el-col>
+      <el-col :span="24" class="leftcontext" v-for="(item, index) in serviceList" :key="index">
+        <el-col :span="20" class="title"> <span></span>{{ item.title }} </el-col>
         <el-col :span="4" class="date">{{ item.date }}</el-col>
       </el-col>
     </el-col>
@@ -16,9 +16,9 @@
 
 <script>
 export default {
-  name: 'context',
+  name: 'service',
   props: {
-    servicelist: null,
+    serviceList: null,
   },
   components: {},
   data: () => ({}),
@@ -45,10 +45,11 @@ export default {
   // border-bottom: 1px dashed #ccc;
 }
 .main .between .maintoplefttitle span:first-child {
-  font-weight: 1000;
-  padding: 10px 5px 0 0px;
-  font-size: 20px;
-  color: #005293;
+  display: inline-block;
+  width: 4px;
+  height: 20px;
+  background: #005293;
+  margin: 0 10px -3px 0;
 }
 
 .main .between .maintoplefttitle span:nth-child(2) {
@@ -83,6 +84,13 @@ export default {
   white-space: nowrap;
   height: 38px;
 }
+.title span:first-child {
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  margin: 9px 10px 3px 0;
+  background: #ccc;
+}
 
 .date {
   float: right;

+ 19 - 12
src/layout/index/context.vue

@@ -1,13 +1,13 @@
 <template>
-  <div id="right">
+  <div id="technology">
     <el-col :span="24" class="maintoplefttitle">
-      <div style="padding:10px 0 0 0;border-bottom: 1px dashed #ccc;">
-        <span>|</span><span>通知公告</span><span><i class="el-icon-more"></i></span>
+      <div style="padding:10px 0 0 0;border-bottom: 1px solid #ccc;">
+        <span></span><span>技术问答</span><span><i class="el-icon-more"></i></span>
       </div>
     </el-col>
     <el-col :span="24">
-      <el-col :span="24" class="leftcontext" v-for="(item, index) in infolist" :key="index">
-        <el-col :span="21" class="title"> <span>.</span>{{ item.title }} </el-col>
+      <el-col :span="24" class="leftcontext" v-for="(item, index) in jishuList" :key="index">
+        <el-col :span="21" class="title"> <span></span>{{ item.title }} </el-col>
         <el-col :span="3" class="date">{{ item.date }}</el-col>
       </el-col>
     </el-col>
@@ -16,9 +16,9 @@
 
 <script>
 export default {
-  name: 'context',
+  name: 'technology',
   props: {
-    infolist: null,
+    jishuList: null,
   },
   components: {},
   data: () => ({}),
@@ -44,10 +44,11 @@ export default {
   // border-bottom: 1px dashed #ccc;
 }
 .main .context .maintoplefttitle span:first-child {
-  font-weight: 1000;
-  padding: 10px 5px 0 0px;
-  font-size: 20px;
-  color: #005293;
+  display: inline-block;
+  width: 4px;
+  height: 20px;
+  background: #005293;
+  margin: 0 10px -3px 0;
 }
 
 .main .context .maintoplefttitle span:nth-child(2) {
@@ -82,7 +83,13 @@ export default {
   white-space: nowrap;
   height: 38px;
 }
-
+.title span:first-child {
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  margin: 9px 10px 3px 0;
+  background: #ccc;
+}
 .date {
   float: right;
   color: #777777;

+ 20 - 21
src/views/index.vue

@@ -1,9 +1,8 @@
 <template>
   <div id="index">
     <el-row>
+      <top></top>
       <div class="w_1200">
-        <top></top>
-
         <el-col :span="24" class="menu">
           <div class="w_1200">
             <newmenu></newmenu>
@@ -12,20 +11,20 @@
         <el-col :span="24" class="main">
           <el-col :span="24">
             <el-col :span="12" class="maintopleft">
-              <left></left>
+              <dynamic></dynamic>
             </el-col>
             <el-col :span="12" class="maintopright">
-              <right :list="list"></right>
+              <jobs :jobsList="jobsList"></jobs>
             </el-col>
 
             <el-col :span="8" class="context">
-              <context :infolist="infolist"></context>
+              <notice :noticeList="noticeList"></notice>
             </el-col>
             <el-col :span="8" class="between">
-              <contextbetween :servicelist="servicelist"></contextbetween>
+              <service :servicelist="serviceList"></service>
             </el-col>
             <el-col :span="8" class="context">
-              <contextright :jishulsit="jishulsit"></contextright>
+              <technology :jishuList="jishuList"></technology>
             </el-col>
 
             <el-col :span="24" class="lianjie">
@@ -42,11 +41,11 @@
 <script>
 import top from '@/layout/common/top.vue';
 import newmenu from '@/layout/common/newmenu.vue';
-import left from '@/layout/index/left.vue';
-import right from '@/layout/index/right.vue';
-import context from '@/layout/index/context.vue';
-import contextbetween from '@/layout/index/contextbetween.vue';
-import contextright from '@/layout/index/contextright.vue';
+import dynamic from '@/layout/index/dynamic.vue';
+import jobs from '@/layout/index/jobs.vue';
+import notice from '@/layout/index/notice.vue';
+import service from '@/layout/index/service.vue';
+import technology from '@/layout/index/technology.vue';
 import lianjie from '@/layout/common/lianjie.vue';
 import foot from '@/layout/common/foot.vue';
 export default {
@@ -55,18 +54,18 @@ export default {
   components: {
     top,
     newmenu,
-    left,
-    right,
-    context,
-    contextbetween,
-    contextright,
+    dynamic,
+    jobs,
+    notice,
+    service,
+    technology,
     lianjie,
     foot,
   },
   data: () => ({
     week: '',
     date: '',
-    servicelist: [
+    serviceList: [
       {
         title:
           '运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态',
@@ -77,7 +76,7 @@ export default {
         date: '03-04',
       },
     ],
-    jishulsit: [
+    jishuList: [
       {
         title:
           '运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态',
@@ -88,7 +87,7 @@ export default {
         date: '03-04',
       },
     ],
-    infolist: [
+    noticeList: [
       {
         title:
           '运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态',
@@ -99,7 +98,7 @@ export default {
         date: '03-04',
       },
     ],
-    list: [
+    jobsList: [
       {
         title:
           '运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态',