tremble пре 5 година
родитељ
комит
7e609923bb

+ 1 - 1
config/index.js

@@ -13,7 +13,7 @@ module.exports = {
     proxyTable: {},
     proxyTable: {},
 
 
     // Various Dev Server settings
     // Various Dev Server settings
-    host: '192.168.0.197', // can be overwritten by process.env.HOST
+    host: 'localhost', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     autoOpenBrowser: false,
     errorOverlay: true,
     errorOverlay: true,

+ 1 - 9
index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html>
 <html>
   <head>
   <head>
-    <meta charset="UTF-8" />
+    <meta charset="UTF-8">
     <meta http-equiv="Content-Type" content="text/html" />
     <meta http-equiv="Content-Type" content="text/html" />
     <meta name="renderer" content="webkit" />
     <meta name="renderer" content="webkit" />
     <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
     <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
@@ -9,14 +9,6 @@
       name="viewport"
       name="viewport"
       content="width=device-width,initial-scale=1,user-scalable=no"
       content="width=device-width,initial-scale=1,user-scalable=no"
     />
     />
-    <meta
-      name="description"
-      content="中德人工智能研究院(CGAII),由四维时代与德国人工智能研究中心联合建设,主要研究高精度高自动化三维数字化技术、智能图像三维数字化识别技术、智能机器人及自动驾驶技术等多个方向。"
-    />
-    <meta
-      name="keywords"
-      content="中德人工智能研究院,中德研究院,三维数字化,人工智能,AR,slam,机械手臂,四维时代,四维看看,matterport,众趣,4DAGE"
-    />
     <link
     <link
       rel="shortcut icon"
       rel="shortcut icon"
       href="https://4dscene.4dage.com/cgaii/PC/images/icon/foicon.jpg"
       href="https://4dscene.4dage.com/cgaii/PC/images/icon/foicon.jpg"

+ 11 - 0
src/App.vue

@@ -67,6 +67,17 @@ export default {
     }
     }
   },
   },
   mounted () {
   mounted () {
+    document.title = '中德人工智能研究院'
+    var oMeta = document.createElement('meta')
+    oMeta.content = '中德人工智能研究院(CGAII),由四维时代与德国人工智能研究中心联合建设,主要研究高精度高自动化三维数字化技术、智能图像三维数字化识别技术、智能机器人及自动驾驶技术等多个方向。'
+    oMeta.name = 'description'
+    var tMeta = document.createElement('meta')
+    tMeta.content = '中德人工智能研究院,中德研究院,三维数字化,人工智能,AR,slam,机械手臂,四维时代,四维看看,matterport,众趣,4DAGE'
+    tMeta.name = 'keywords'
+
+    document.getElementsByTagName('head')[0].appendChild(oMeta)
+    document.getElementsByTagName('head')[0].appendChild(tMeta)
+
     this.wxShare()
     this.wxShare()
   }
   }
 }
 }

+ 0 - 1
src/components/m-about/index.vue

@@ -8,7 +8,6 @@
       <span @click="$router.push({path:'/join-us'})">加入我们</span>
       <span @click="$router.push({path:'/join-us'})">加入我们</span>
     </div>
     </div>
     <mSwiper/>
     <mSwiper/>
-
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>

+ 7 - 0
src/components/m-expert/index.vue

@@ -2,6 +2,7 @@
 <div class="m-expert">
 <div class="m-expert">
   <div class="expert-l">
   <div class="expert-l">
     <div class="e-title">{{experts.title}}</div>
     <div class="e-title">{{experts.title}}</div>
+    <p class="banquan">Photo @graphicsmedia.net</p>
     <div>{{activeTxt.name}}</div>
     <div>{{activeTxt.name}}</div>
     <p v-for="(item, i) in activeTxt.introduce" :key="i">{{item}}</p>
     <p v-for="(item, i) in activeTxt.introduce" :key="i">{{item}}</p>
   </div>
   </div>
@@ -53,9 +54,15 @@ export default {
   line-height: 1.4;
   line-height: 1.4;
   font-weight: bold;
   font-weight: bold;
 }
 }
+.banquan{
+  font-size: 10px;
+  font-weight: 100;
+  color: #8a8a8a;
+}
 
 
 .expert-l>div:first-child{
 .expert-l>div:first-child{
   font-size: 18px;
   font-size: 18px;
+  margin: 0;
 }
 }
 .expert-l>div{
 .expert-l>div{
   margin: 20px auto;
   margin: 20px auto;

+ 1 - 1
src/main.js

@@ -11,7 +11,7 @@ Vue.config.productionTip = false
 Vue.prototype.$bus = new Vue()
 Vue.prototype.$bus = new Vue()
 Vue.prototype.$cdn = 'https://4dscene.4dage.com/cgaii/PC'
 Vue.prototype.$cdn = 'https://4dscene.4dage.com/cgaii/PC'
 
 
-axios.defaults.baseURL = 'https://www.cgaii.com'
+axios.defaults.baseURL = ''
 Vue.prototype.$http = axios
 Vue.prototype.$http = axios
 /* eslint-disable no-new */
 /* eslint-disable no-new */
 new Vue({
 new Vue({

+ 3 - 0
src/pages/home/index.vue

@@ -159,6 +159,7 @@
               <img :src="require('@/assets/images/robotbg.jpg')">
               <img :src="require('@/assets/images/robotbg.jpg')">
             </div>
             </div>
             <img :src="`${$cdn}/images/robot.png`">
             <img :src="`${$cdn}/images/robot.png`">
+            <span>(Photo @DFKI)</span>
           </div>
           </div>
         </template>
         </template>
         <template v-else>
         <template v-else>
@@ -174,6 +175,7 @@
               <img :class="{robotClip:showH5}" :src="require('@/assets/images/robotbg.jpg')" alt>
               <img :class="{robotClip:showH5}" :src="require('@/assets/images/robotbg.jpg')" alt>
             </div>
             </div>
             <img :src="`${$cdn}/images/robot.png`" alt>
             <img :src="`${$cdn}/images/robot.png`" alt>
+            <span>(Photo @DFKI)</span>
           </div>
           </div>
         </template>
         </template>
       </section>
       </section>
@@ -259,6 +261,7 @@
                   </div>
                   </div>
                 </li>
                 </li>
               </ul>
               </ul>
+              <p class="chuchu">(Photo @graphicsmedia.net)</p>
             </div>
             </div>
           </div>
           </div>
         </template>
         </template>

+ 5 - 0
src/pages/home/m-home.css

@@ -133,6 +133,11 @@
   width: 52vw;
   width: 52vw;
 }
 }
 
 
+.home-2 .h2-l .h2-l-con>span{
+  width: 52vw;
+  bottom: -14vw;
+}
+
 
 
 .h6-top{
 .h6-top{
   position: relative;
   position: relative;

+ 18 - 0
src/pages/home/style.css

@@ -180,6 +180,15 @@
   width: 40vw;
   width: 40vw;
 }
 }
 
 
+.home-2 .h2-l .h2-l-con>span{
+  position: absolute;
+  bottom: -12vw;
+  right: 0vw;
+  width: 40vw;
+  text-align: center;
+  font-size: 12px;
+}
+
 .h2-r .h2-img{
 .h2-r .h2-img{
   margin-left: 200px;
   margin-left: 200px;
   position: relative;
   position: relative;
@@ -246,6 +255,15 @@
   margin-top: 2vw;
   margin-top: 2vw;
 }
 }
 
 
+.home-2 .h2-l .expert .chuchu{
+  font-size: 12px;
+  text-align: right;
+  color: #fff;
+  margin-top: 20px;
+  margin-right: 40px;
+
+}
+
 .home-2 .h2-l .expert ul li{
 .home-2 .h2-l .expert ul li{
   display: inline-block;
   display: inline-block;
   margin-right: 1vw;
   margin-right: 1vw;

+ 1 - 1
src/pages/layout/footer.vue

@@ -5,7 +5,7 @@
       <span>{{footer.phoneV}}</span>
       <span>{{footer.phoneV}}</span>
     </div>
     </div>
     <div>{{footer.copyRight}}</div>
     <div>{{footer.copyRight}}</div>
-    <a href="http://www.miitbeian.gov.cn">{{footer.banben}}</a>
+    <a href="http://www.beian.miit.gov.cn">{{footer.banben}}</a>
   </div>
   </div>
 </template>
 </template>