Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

src/layout/common/newmenu.vue

@@ -5,7 +5,7 @@
       <el-menu-item index="2">成果展示</el-menu-item>
       <el-menu-item index="3">计算服务</el-menu-item>
       <el-menu-item index="4">交流活动</el-menu-item>
-      <el-menu-item index="5"><a href="https://www.ele.me" target="_blank">党建学院</a></el-menu-item>
+      <el-menu-item index="5" @click="toPartisan">党建学院</el-menu-item>
     </el-menu>
   </div>
 </template>
@@ -23,6 +23,9 @@ export default {
   computed: {},
   methods: {
     handleSelect() {},
+    toPartisan() {
+      this.$router.push({ path: '/partisan/index' });
+    },
   },
 };
 </script>

src/layout/index/left.vue

@@ -0,0 +1,102 @@
+<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>
+    <el-col :span="24">
+      <el-col :span="12" class="leftcontext">
+        统计图
+      </el-col>
+    </el-col>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'left',
+  props: {},
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+.main .maintopleft .maintoplefttitle {
+  padding: 20px;
+  // border-bottom: 1px dashed #ccc;
+}
+.main .maintopleft .maintoplefttitle span:first-child {
+  font-weight: 1000;
+  padding: 10px 5px 0 0px;
+  font-size: 20px;
+  color: #005293;
+}
+
+.main .maintopleft .maintoplefttitle span:nth-child(2) {
+  font-size: 20px;
+  color: #005293;
+  padding: 0 10px 0 0;
+}
+.main .maintopleft .maintoplefttitle span:nth-child(3) {
+  font-size: 20px;
+  color: #005293;
+  float: right;
+}
+
+.maintopleft .leftcontext {
+  padding: 0 20px 0 20px;
+  font-size: 16px;
+}
+
+.maintopright {
+  height: 300px;
+  background-color: #fff;
+  width: 595px;
+}
+
+.maintopright .leftcontext {
+  padding: 0 20px 0 20px;
+}
+
+.main .maintopright .maintoplefttitle {
+  padding: 20px;
+  // border-bottom: 1px dashed #ccc;
+}
+.main .maintopright .maintoplefttitle span:first-child {
+  font-weight: 1000;
+  padding: 10px 5px 0 0px;
+  font-size: 20px;
+  color: #005293;
+}
+
+.main .maintopright .maintoplefttitle span:nth-child(2) {
+  font-size: 20px;
+  color: #005293;
+  padding: 0 10px 0 0;
+}
+.main .maintopright .maintoplefttitle span:nth-child(3) {
+  font-size: 20px;
+  color: #005293;
+  float: right;
+}
+
+.maintopright .leftcontext {
+  padding: 0 20px 0 20px;
+  font-size: 16px;
+}
+
+.maintopright .leftcontext p {
+  margin: 0;
+  padding: 0;
+}
+
+.maintopright .leftcontext p span:first-child {
+  font-weight: 1000;
+  padding: 5px;
+}
+</style>

src/layout/index/right.vue

@@ -0,0 +1,88 @@
+<template>
+  <div id="right">
+    <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>
+    <el-col :span="24">
+      <el-col :span="24" class="leftcontext" v-for="(item, index) in list" :key="index">
+        <div>
+          <span>.</span><span>{{ item.title }}</span>
+        </div>
+        <div></div>
+      </el-col>
+    </el-col>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'right',
+  props: { list: null },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+.maintopright {
+  height: 300px;
+  background-color: #fff;
+  width: 595px;
+}
+
+.maintopright .leftcontext {
+  padding: 0 20px 0 20px;
+}
+
+.main .maintopright .maintoplefttitle {
+  padding: 20px;
+  // border-bottom: 1px dashed #ccc;
+}
+.main .maintopright .maintoplefttitle span:first-child {
+  font-weight: 1000;
+  padding: 10px 5px 0 0px;
+  font-size: 20px;
+  color: #005293;
+}
+
+.main .maintopright .maintoplefttitle span:nth-child(2) {
+  font-size: 20px;
+  color: #005293;
+  padding: 0 10px 0 0;
+}
+.main .maintopright .maintoplefttitle span:nth-child(3) {
+  font-size: 20px;
+  color: #005293;
+  float: right;
+}
+
+.maintopright .leftcontext {
+  padding: 0 20px 0 20px;
+  font-size: 16px;
+}
+
+.maintopright .leftcontext p {
+  margin: 0;
+  padding: 0;
+}
+
+.maintopright .leftcontext p span:first-child {
+  font-weight: 1000;
+  padding: 5px;
+}
+
+.maintopright .leftcontext p span:nth-child(2) {
+  width: 449px;
+  display: inline-flex;
+  height: 27px;
+  line-height: 27px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+</style>

src/router/index.js

@@ -9,6 +9,11 @@ const routes = [
     name: '',
     component: () => import('../views/index.vue'),
   },
+  {
+    path: '/partisan/index',
+    name: '党建学苑',
+    component: () => import('../views/partisan/index.vue'),
+  },
   // 新闻动态
   {
     path: '/news/index',

src/views/index.vue

@@ -11,32 +11,11 @@
         </el-col>
         <el-col :span="24" class="main">
           <el-col :span="24">
-            <el-col :span="12" class="maintopleft"
-              ><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-outline"></i></span>
-                </div>
-              </el-col>
-              <el-col :span="24">
-                <el-col :span="12" class="leftcontext">
-                  统计图
-                </el-col>
-              </el-col>
+            <el-col :span="12" class="maintopleft">
+              <left></left>
             </el-col>
             <el-col :span="12" class="maintopright">
-              <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-outline"></i></span>
-                </div>
-              </el-col>
-              <el-col :span="24">
-                <el-col :span="24" class="leftcontext" v-for="(item, index) in list" :key="index">
-                  <p>
-                    <span>.</span><span>{{ item.title }}</span
-                    ><span>{{ item.date }}</span>
-                  </p>
-                </el-col>
-              </el-col>
+              <right :list="list"></right>
             </el-col>
           </el-col>
         </el-col>
@@ -49,7 +28,8 @@
 <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 moment from 'moment';
 export default {
   name: 'index',
@@ -57,18 +37,15 @@ export default {
   components: {
     top,
     newmenu,
+    left,
+    right,
   },
   data: () => ({
-    activeIndex: '1',
-    activeIndex2: '1',
-
     week: '',
     date: '',
-    src: require('@/assets/logo.png'),
-    newsrc: require('@/assets/123.jpg'),
     list: [
       {
-        title: '运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态',
+        title: '运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态运行动态',
         date: '2018-03-04',
       },
     ],

src/views/partisan/index.vue

@@ -0,0 +1,39 @@
+<template>
+  <div id="partisan">
+    <el-row>
+      <div class="w_1200">
+        <top></top>
+        <div class="w_1200">
+          <newmenu></newmenu>
+        </div>
+        <el-col class="main"> </el-col>
+      </div>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import top from '@/layout/common/top.vue';
+import newmenu from '@/layout/common/newmenu.vue';
+export default {
+  name: 'partisan',
+  props: {},
+  components: { top, newmenu },
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+.w_1200 {
+  width: 1200px;
+  margin: 0 auto;
+}
+.main {
+  height: 740px;
+  overflow: hidden;
+  margin: 10px 0;
+}
+</style>