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

src/layout/altai/index/ditu.vue

@@ -2,7 +2,9 @@
   <div id="ditu">
     <el-row>
       <el-col :span="24">
+        <a href="#">
         <el-image :src="mapUrl" style="margin:20px"></el-image>
+        </a>
       </el-col>
     </el-row>
   </div>

src/layout/altai/index/foot.vue

@@ -24,7 +24,7 @@ export default {
   },
   components: {},
   data: () => ({}),
-  created() { },
+  created() {},
   computed: {},
   methods: {},
 };

src/layout/altai/index/keji.vue

@@ -11,28 +11,10 @@
           </el-link>
         </el-col>
         <ul>
-          <li>
+          <li v-for="(item,index) in keJiList" :key="index">
             <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-11</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
+              <span>{{item.title}}</span>
+              <span class="tt">{{item.time}}</span>
             </a>
           </li>
         </ul>
@@ -44,7 +26,9 @@
 <script>
 export default {
   name: 'keji',
-  props: {},
+  props: {
+    keJiList:null,
+  },
   components: {},
   data: () => ({
     dian: require('../../../assets/dot.png'),
@@ -81,8 +65,9 @@ a {
   height: 60px;
 }
 ul {
-  padding-left: 20px;
+  padding: 0;
   margin: 8px 20px;
+  list-style-position: inside;
 }
 li {
   padding: 3px 0;
@@ -96,4 +81,11 @@ li a {
   color: #abaab8;
   float: right;
 }
+a > span {
+  display: inline-block;
+  max-width: 230px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

src/layout/altai/index/law.vue

@@ -11,28 +11,10 @@
           </el-link>
         </el-col>
         <ul>
-          <li>
+           <li v-for="(item,index) in lawList" :key="index">
             <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-11</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
+              <span>{{item.title}}</span>
+              <span class="tt">{{item.time}}</span>
             </a>
           </li>
         </ul>
@@ -44,7 +26,9 @@
 <script>
 export default {
   name: 'law',
-  props: {},
+  props: {
+    lawList:null,
+  },
   components: {},
   data: () => ({
     dian: require('../../../assets/dot.png'),
@@ -81,8 +65,9 @@ a {
   height: 60px;
 }
 ul {
-  padding-left: 20px;
+  padding: 0;
   margin: 8px 20px;
+  list-style-position: inside;
 }
 li {
   padding: 3px 0;
@@ -96,4 +81,11 @@ li a {
   color: #abaab8;
   float: right;
 }
+a > span {
+  display: inline-block;
+  max-width: 230px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

src/layout/altai/index/lianjie.vue

@@ -23,7 +23,7 @@ export default {
   },
   components: {},
   data: () => ({}),
-  created() { },
+  created() {},
   computed: {},
   methods: {},
 };

src/layout/altai/index/notice.vue

@@ -11,28 +11,10 @@
           </el-link>
         </el-col>
         <ul>
-          <li>
+           <li v-for="(item,index) in noticeList" :key="index">
             <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-11</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
+              <span>{{item.title}}</span>
+              <span class="tt">{{item.time}}</span>
             </a>
           </li>
         </ul>
@@ -44,7 +26,9 @@
 <script>
 export default {
   name: 'notice',
-  props: {},
+  props: {
+    noticeList:null,
+  },
   components: {},
   data: () => ({
     dian: require('../../../assets/dot.png'),
@@ -81,8 +65,9 @@ a {
   height: 60px;
 }
 ul {
-  padding-left: 20px;
+  padding: 0;
   margin: 8px 20px;
+  list-style-position: inside;
 }
 li {
   padding: 3px 0;
@@ -96,4 +81,11 @@ li a {
   color: #abaab8;
   float: right;
 }
+a > span {
+  display: inline-block;
+  max-width: 230px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

src/layout/altai/index/zixun.vue

@@ -11,28 +11,10 @@
           </el-link>
         </el-col>
         <ul>
-          <li>
+           <li v-for="(item,index) in ziXunList" :key="index">
             <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-11</span>
-            </a>
-          </li>
-          <li>
-            <a href="#">
-              <span>国内外参展商和广大客户的广泛好评。尤其是参展的“太阳能无线充电</span>
-              <span class="tt">2018-02-01</span>
+              <span>{{item.title}}</span>
+              <span class="tt">{{item.time}}</span>
             </a>
           </li>
         </ul>
@@ -44,7 +26,9 @@
 <script>
 export default {
   name: 'zixun',
-  props: {},
+  props: {
+    ziXunList:null,
+  },
   components: {},
   data: () => ({
     dian: require('../../../assets/dot.png'),
@@ -81,8 +65,9 @@ a {
   height: 60px;
 }
 ul {
-  padding-left: 20px;
+  padding: 0;
   margin: 8px 20px;
+  list-style-position: inside;
 }
 li {
   padding: 3px 0;
@@ -96,4 +81,11 @@ li a {
   color: #abaab8;
   float: right;
 }
+a > span {
+  display: inline-block;
+  max-width: 450px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

src/views/altai/index.vue

@@ -13,16 +13,16 @@
             <ditu :mapUrl="mapUrl"></ditu>
           </el-col>
           <el-col :span="12" class="zixun">
-            <zixun></zixun>
+            <zixun :ziXunList="ziXunList"></zixun>
           </el-col>
           <el-col :span="8" class="notice">
-            <notice></notice>
+            <notice :noticeList="noticeList"></notice>
           </el-col>
           <el-col :span="8" class="law">
-            <law></law>
+            <law :lawList="lawList"></law>
           </el-col>
           <el-col :span="8" class="keji">
-            <keji></keji>
+            <keji :keJiList="keJiList"></keji>
           </el-col>
           <el-col :span="24" class="lianjie">
             <lianjie :linkList="linkList"></lianjie>
@@ -50,6 +50,10 @@ export default {
   name: 'index',
   props: {
     mapUrl: null,//首页地图图片
+    ziXunList:null,
+    noticeList:null,
+    lawList:null,
+    keJiList:null,
     linkList: null,//友情链接
     foot:null,//头部信息+底部信息
   },
@@ -65,7 +69,7 @@ export default {
     native,//导航
   },
   data: () => ({}),
-  created() { },
+  created() {},
   computed: {},
   methods: {},
 };