增加通告，以及优化代码

2020-09-29 14:17:16 +08:00 · 2020-09-29 14:17:16 +08:00 · 17cbb47c51
commit 17cbb47c51
parent 9fea70b5b7
28 changed files with 158 additions and 80 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -2318,6 +2318,11 @@
      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
      "dev": true
    },
+    "animate.css": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npm.taobao.org/animate.css/download/animate.css-4.1.1.tgz",
+      "integrity": "sha1-YU7FqBEx1+TcNipYFD90BqvWgHU="
+    },
    "ansi-colors": {
      "version": "3.2.4",
      "resolved": "https://registry.npm.taobao.org/ansi-colors/download/ansi-colors-3.2.4.tgz",
--- a/package.json
+++ b/package.json
@ -8,6 +8,7 @@
    "lint": "vue-cli-service lint"
  },
  "dependencies": {
+    "animate.css": "^4.1.1",
    "core-js": "^3.6.5",
    "element-ui": "^2.13.2",
    "nprogress": "^0.2.0",
--- a/src/assets/honor/1.jpg
+++ b/src/assets/honor/1.jpg
--- a/src/assets/honor/2.jpg
+++ b/src/assets/honor/2.jpg
--- a/src/assets/honor/3.jpg
+++ b/src/assets/honor/3.jpg
--- a/src/assets/honor/index.js
+++ b/src/assets/honor/index.js
@ -1,15 +0,0 @@
-import image1 from "@/assets/honor/1.jpg";
-import image2 from "@/assets/honor/2.jpg";
-import image3 from "@/assets/honor/3.jpg";
-
-export default {
-  Hr01: {
-    src: image1
-  },
-  Hr02: {
-    src: image2
-  },
-  Hr04: {
-    src: image3
-  }
-};
--- a/src/assets/images/atlas.js
+++ b/src/assets/images/atlas.js
--- a/src/assets/images/honor.js
+++ b/src/assets/images/honor.js
@ -0,0 +1,11 @@
+export default {
+  Hr01: {
+    src: "honor/1.jpg"
+  },
+  Hr02: {
+    src: "honor/2.jpg"
+  },
+  Hr04: {
+    src: "honor/3.jpg"
+  }
+};
--- a/src/assets/wchat/wchat.png
+++ b/src/assets/wchat/wchat.png
--- a/src/components/eLogo/index.vue
+++ b/src/components/eLogo/index.vue
@ -1,7 +1,7 @@
 <template>
-  <router-link class="logo" :to="home">
+  <router-link :to="home" class="logo animate__animated animate__heartBeat">
    <el-image style="width:40px; height:40px" :src="logo" />
-    <h2>北京玖琏技术有限公司</h2>
+    <h2>北京玖琏科技有限公司</h2>
  </router-link>
 </template>

--- a/src/main.js
+++ b/src/main.js
@ -5,6 +5,7 @@ import store from "./store";
 import ElementUI from "element-ui";
 import VueVideoPlayer from "vue-video-player";
 import VueClipboard from "vue-clipboard2";
+import Animated from "animate.css";

 import "./permission";
 import "element-ui/lib/theme-chalk/index.css";
@ -22,6 +23,7 @@ Vue.config.productionTip = false;
 Vue.use(ElementUI);
 Vue.use(VueVideoPlayer);
 Vue.use(VueClipboard);
+Vue.use(Animated);

 new Vue({
  router,
--- a/src/views/About.vue
+++ b/src/views/About.vue
@ -30,7 +30,7 @@
          为进一步加快行业职教互联网化进程，提高职业教育的教学水平，提升个人能力的共享实训平台，我公司长期面向社会寻求代理合作，
          代理商主要负责市场推广及商务交流、项目招投标等内容，详情咨询
          <strong><em>13289398171</em></strong>
-          。
+          宋经理。
        </p>
      </article>

@ -94,6 +94,7 @@ export default {
 .main {
  text-align: left;
  background: #f7f7f9;
+  padding: 10px;

  .container {
    width: 55%;
--- a/src/views/Exhibition/index.vue
+++ b/src/views/Exhibition/index.vue
@ -49,7 +49,7 @@ export default {
        {
          platform: "电厂电力",
          name: "系统入口",
-          href: "https://test.joylink.club/tpsq/dashboard/home"
+          href: "https://test.joylink.club/tpsq/home"
        },
        {
          platform: "化学化工",
@ -86,7 +86,7 @@ export default {
 .main {
  background: #f7f7f9;
  .container {
-    padding: 80px;
+    padding: 10px;
    width: 70%;
    max-width: 1430.016px;
    margin: auto;
--- a/src/views/Home/Announce/index.vue
+++ b/src/views/Home/Announce/index.vue
@ -0,0 +1,60 @@
+<template>
+  <div class="announce animate__animated animate__bounceIn"></div>
+</template>
+<script>
+import { Notification } from "element-ui";
+
+export default {
+  data() {
+    return {
+      show: true
+    };
+  },
+  mounted() {
+    Notification.closeAll();
+    this.notify(
+      "<div><strong>尊敬的用户：</strong></div>" +
+        "<p style='text-indent:2em'>由于系统改版升级，原云平台网址（<em>https://www.joylink.club</em>）现已变更为官方网站。</p>" +
+        "<p style='text-indent:2em'>新实训平台入口：<a style='color:blue' target='_blank' href='https://joylink.club/cbtc/'>https://joylink.club/cbtc/</a></p>" +
+        "<p style='text-indent:2em'>新设计平台入口：<a style='color:blue' target='_blank' href='https://joylink.club/cbtc/design/'>https://joylink.club/cbtc/design/</a></p>" +
+        "<p style='text-indent:2em'><a style='color:blue' href='/exhibition'>点此查看其他系统入口。</a></p>"
+    );
+  },
+  beforeDestroy() {
+    Notification.closeAll();
+  },
+  methods: {
+    notify(message) {
+      this.$notify({
+        title: "网站域名变更公告",
+        duration: 0,
+        position: "top-right",
+        dangerouslyUseHTMLString: true,
+        customClass: "notify animate__animated animate__fadeInTopRight",
+        message
+      });
+    }
+  }
+};
+</script>
+<style lang="scss">
+.notify {
+  width: 420px !important;
+  word-break: break-all;
+  a {
+    &:hover {
+      color: #000;
+    }
+  }
+  /deep/ {
+    .el-notification__title {
+      text-align: center !important;
+    }
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.announce {
+}
+</style>
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@ -6,21 +6,24 @@
      <e-product />
    </div>
    <e-honor />
+    <e-anounce />
  </div>
 </template>

 <script>
-import EHonor from "./main/eHonor";
-import ERecommend from "./main/eRecommend";
-import EPropaganda from "./main/ePropaganda";
-import EProduct from "./main/eProduct";
+import eHonor from "./main/eHonor";
+import eRecommend from "./main/eRecommend";
+import ePropaganda from "./main/ePropaganda";
+import eProduct from "./main/eProduct";
+import eAnounce from "./Announce";

 export default {
  components: {
-    EHonor,
-    ERecommend,
-    EPropaganda,
-    EProduct
+    eHonor,
+    eRecommend,
+    ePropaganda,
+    eProduct,
+    eAnounce
  }
 };
 </script>
--- a/src/views/Home/main/eHonor.vue
+++ b/src/views/Home/main/eHonor.vue
@ -13,7 +13,7 @@
      >
        <el-carousel-item v-for="(el, i) in imageList" :key="i">
          <router-link to="/honor">
-            <el-image :src="el.src"></el-image>
+            <el-image :src="buildUrl(el.src)"></el-image>
          </router-link>
        </el-carousel-item>
      </el-carousel>
@ -24,7 +24,8 @@

 <script>
 import eButtonGroup from "@/components/eButtonGroup/index.vue";
-import hrs from "@/assets/honor/index.js";
+import hrs from "@/assets/images/honor.js";
+import { buildUrl } from "@/utils/resourceUrl";

 export default {
  components: {
@ -37,6 +38,9 @@ export default {
    title() {
      return "成果及荣誉";
    },
+    buildUrl() {
+      return buildUrl;
+    },
    imageList() {
      return Object.values(hrs);
    },
@ -71,11 +75,11 @@ export default {
      font-size: 1.9em;
      &::after {
        content: "";
-        width: 50%;
-        height: 2px;
-        background-color: darkred;
+        width: 100%;
+        height: 7px;
+        background-color: red;
        position: absolute;
-        left: 25%;
+        left: 0;
        margin-left: 0px;
        bottom: 0;
        min-width: 35px;
--- a/src/views/Home/main/eProduct.vue
+++ b/src/views/Home/main/eProduct.vue
@ -13,7 +13,11 @@
          :key="i"
          @click="goLinkPage(el, i)"
        >
-          <el-image :src="el.src" fit="cover" />
+          <el-image
+            :src="el.src"
+            style="width:100%;height:460px;"
+            fit="cover"
+          />
          <div
            class="type"
            :style="{
@ -122,11 +126,11 @@ a {
      font-size: 1.9em;
      &::after {
        content: "";
-        width: 50%;
-        height: 2px;
-        background-color: darkred;
+        width: 100%;
+        height: 7px;
+        background-color: brown;
        position: absolute;
-        left: 25%;
+        left: 0;
        margin-left: 0px;
        bottom: 0;
        min-width: 35px;
@ -144,10 +148,6 @@ a {
      position: relative;
      cursor: pointer;
      border: 1px solid #e4e7ed;
-      .el-image {
-        width: 100%;
-        height: 460px;
-      }

      &:hover {
        // /deep/ img {
--- a/src/views/Home/main/ePropaganda.vue
+++ b/src/views/Home/main/ePropaganda.vue
@ -2,7 +2,7 @@
  <div class="main">
    <el-carousel height="640px">
      <el-carousel-item v-for="(el, i) in imageList" :key="i">
-        <el-image style="height: 100%;width: 100%" :src="el.src" />
+        <el-image style="height:100%;width:100%" :src="el.src" />
      </el-carousel-item>
    </el-carousel>
    <div class="content">
--- a/src/views/Home/main/eRecommend.vue
+++ b/src/views/Home/main/eRecommend.vue
@ -46,13 +46,6 @@
                :src="buildUrl(el.src)"
              />
            </router-link>
-            <!-- <el-carousel :interval="5000" arrow="always" height="480px">
-              <el-carousel-item v-for="(el, j) in el.sources" :key="j">
-                <router-link :to="`/preview/image?id=${i}`">
-                  <el-image style="width:100%; height: 100%"  :src="el" />
-                </router-link>
-              </el-carousel-item>
-            </el-carousel> -->
          </div>
        </div>
      </el-card>
@ -194,11 +187,11 @@ a {
      font-size: 1.9em;
      &::after {
        content: "";
-        width: 50%;
-        height: 2px;
-        background-color: darkred;
+        width: 100%;
+        height: 7px;
+        background-color: navy;
        position: absolute;
-        left: 25%;
+        left: 0;
        margin-left: 0px;
        bottom: 0;
        min-width: 35px;
--- a/src/views/Honor/index.vue
+++ b/src/views/Honor/index.vue
@ -2,7 +2,7 @@
  <div class="main">
    <div class="container">
      <article id="knowledge">
-        <h2 style="background: #ff8181;">知识产权</h2>
+        <h2 style="background:yellowgreen;">知识产权</h2>
        <div class="gird">
          <el-card
            class="image"
@ -11,14 +11,17 @@
            :key="i"
          >
            <a target="_blank" :href="buildUrl(el.src)">
-              <el-image :src="buildUrl(el.src)" lazy style="height:560px" />
+              <el-image
+                :src="buildUrl(el.src)"
+                lazy
+                style="width: 100%;height:560px"
+              />
            </a>
          </el-card>
        </div>
      </article>
-
      <article id="honor">
-        <h2 style="background: #7baf4a;">荣&ensp;&ensp;誉</h2>
+        <h2 style="background:crimson;">荣&ensp;&ensp;誉</h2>
        <div class="gird">
          <el-card
            class="image"
@ -27,7 +30,11 @@
            :key="i"
          >
            <a target="_blank" :href="buildUrl(el.src)">
-              <el-image :src="el.src" lazy style="height:300px" />
+              <el-image
+                :src="buildUrl(el.src)"
+                lazy
+                style="width: 100%;height:300px;"
+              />
            </a>
          </el-card>
        </div>
@ -37,7 +44,7 @@
 </template>
 <script>
 import pdfs from "@/assets/images/knowledge.js";
-import hrs from "@/assets/honor/index.js";
+import hrs from "@/assets/images/honor.js";
 import { buildUrl } from "@/utils/resourceUrl";

 export default {
--- a/src/views/Layout/eFooter/eCustom.vue
+++ b/src/views/Layout/eFooter/eCustom.vue
@ -8,7 +8,12 @@
      </div>
    </div>
    <div class="footer-nav">
-      <div class="col-md" v-for="(it, i) in abouts" :key="i">
+      <div
+        class="col-md"
+        v-for="(it, i) in abouts"
+        :key="i"
+        :style="{ 'text-align': i == abouts.length - 1 ? 'center' : '' }"
+      >
        <h3 class="collapsed">
          {{ it.name }}
          <span class="iconfont icon-arrow-down hidden-md hidden-lg"></span>
@ -25,7 +30,7 @@
                {{ el.name }}
              </router-link>
              <el-image
-                style="width:80px;height:80px"
+                style="width:100px;height:100px"
                v-else-if="el.src"
                :src="el.src"
              />
@ -39,7 +44,7 @@
      <ul class="list-unstyled share">
        <li v-for="(el, i) in images" :key="i">
          <router-link :to="el.href">
-            <el-image style="width: 80px;height: 80px;" :src="el.src" />
+            <el-image style="width:80px;height:80px;" :src="el.src" />
          </router-link>
        </li>
      </ul>
--- a/src/views/Layout/eHeader/eMenuItem.vue
+++ b/src/views/Layout/eHeader/eMenuItem.vue
@ -1,6 +1,6 @@
 <template>
  <li class="menu-item" @mouseenter="onMouseEnter" @mouseleave="onMouseLeave">
-    <div class="title" @click="goLinkPage(item)">{{ item.name }}</div>
+    <div class="title" @click.self="goLinkPage(item)">{{ item.name }}</div>
    <ul class="list" v-if="show && item.children && item.children.length">
      <e-menu-item
        v-for="(el, i) in item.children"
@ -54,10 +54,15 @@ export default {
  position: relative;
  text-align: left;
  min-width: 100px;
+  font-size: 16px;
+  color: #333333;

  background-color: #fff;
  border: 1px solid #d4d4d4;
  border-top: 0;
+  &:hover {
+    color: slateblue;
+  }

  ul {
    padding: 0;
--- a/src/views/Layout/eHeader/eMenuList.vue
+++ b/src/views/Layout/eHeader/eMenuList.vue
@ -7,7 +7,10 @@
      @mouseenter="onMouseEnter(i + 1)"
      @mouseleave="onMouseLeave(0)"
    >
-      <router-link :to="node.href || ''">{{ node.name }} </router-link>
+      <router-link v-if="node.href" :to="node.href"
+        >{{ node.name }}
+      </router-link>
+      <a v-else>{{ node.name }}</a>
      <div
        class="context"
        v-if="node.children"
@ -80,17 +83,7 @@ export default {
    }

    &:hover {
-      &::after {
-        content: "";
-        width: 100%;
-        height: 2px;
-        background-color: rgb(84, 92, 100);
-        position: absolute;
-        left: 50%;
-        right: 0;
-        bottom: -1px;
-        transform: translateX(-50%);
-      }
+      background: #ebeef5;
    }

    .context {
--- a/src/views/Layout/index.vue
+++ b/src/views/Layout/index.vue
@ -12,6 +12,7 @@
        style="{
        height: 100%;
        width: 100%;
+        z-index: 1000;
        background-color: #f2f5f6;
        box-shadow: 0 0 6px rgba(0,0,0, .12);
        text-align: center;
--- a/src/views/PreviewImage/eList.vue
+++ b/src/views/PreviewImage/eList.vue
@ -46,7 +46,7 @@ export default {
      margin: 5px 10px;
      cursor: pointer;
      &:hover {
-        color: #ff6428;
+        color: #fff;
      }
    }
  }
--- a/src/views/PreviewImage/index.vue
+++ b/src/views/PreviewImage/index.vue
@ -19,7 +19,7 @@

 <script>
 import eList from "./eList";
-import acts from "@/assets/images";
+import acts from "@/assets/images/atlas";
 import { buildUrl } from "@/utils/resourceUrl";

 export default {
--- a/src/views/PreviewPdf/index.vue
+++ b/src/views/PreviewPdf/index.vue
@ -36,6 +36,8 @@ export default {
 .pdf {
  background: #f7f7f9;
  padding: 10px 0;
+  min-height: 100vh;
+
  .page {
    width: 60%;
    margin: auto;
--- a/src/views/PreviewPlayer/eList.vue
+++ b/src/views/PreviewPlayer/eList.vue
@ -47,7 +47,7 @@ export default {
      margin: 5px 10px;
      cursor: pointer;
      &:hover {
-        color: #ff6428;
+        color: #fff;
      }
    }
  }