diff --git a/package-lock.json b/package-lock.json index 41187d0..166bd92 100644 --- 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", diff --git a/package.json b/package.json index 1449148..047439c 100644 --- 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", diff --git a/src/assets/honor/1.jpg b/src/assets/honor/1.jpg deleted file mode 100644 index 0b99db4..0000000 Binary files a/src/assets/honor/1.jpg and /dev/null differ diff --git a/src/assets/honor/2.jpg b/src/assets/honor/2.jpg deleted file mode 100644 index fcae944..0000000 Binary files a/src/assets/honor/2.jpg and /dev/null differ diff --git a/src/assets/honor/3.jpg b/src/assets/honor/3.jpg deleted file mode 100644 index ac4471f..0000000 Binary files a/src/assets/honor/3.jpg and /dev/null differ diff --git a/src/assets/honor/index.js b/src/assets/honor/index.js deleted file mode 100644 index 2f650d5..0000000 --- a/src/assets/honor/index.js +++ /dev/null @@ -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 - } -}; diff --git a/src/assets/images/index.js b/src/assets/images/atlas.js similarity index 100% rename from src/assets/images/index.js rename to src/assets/images/atlas.js diff --git a/src/assets/images/honor.js b/src/assets/images/honor.js new file mode 100644 index 0000000..39897b4 --- /dev/null +++ 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" + } +}; diff --git a/src/assets/wchat/wchat.png b/src/assets/wchat/wchat.png index 4960fab..13e8b0b 100644 Binary files a/src/assets/wchat/wchat.png and b/src/assets/wchat/wchat.png differ diff --git a/src/components/eLogo/index.vue b/src/components/eLogo/index.vue index 120fe7e..815c5f2 100644 --- a/src/components/eLogo/index.vue +++ b/src/components/eLogo/index.vue @@ -1,7 +1,7 @@ diff --git a/src/main.js b/src/main.js index 2f0dca9..9ce5d3e 100644 --- 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, diff --git a/src/views/About.vue b/src/views/About.vue index e4f7ba5..e37b73f 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -30,7 +30,7 @@ 为进一步加快行业职教互联网化进程,提高职业教育的教学水平,提升个人能力的共享实训平台,我公司长期面向社会寻求代理合作, 代理商主要负责市场推广及商务交流、项目招投标等内容,详情咨询 13289398171 - 。 + 宋经理。

@@ -94,6 +94,7 @@ export default { .main { text-align: left; background: #f7f7f9; + padding: 10px; .container { width: 55%; diff --git a/src/views/Exhibition/index.vue b/src/views/Exhibition/index.vue index 6a48165..0b1ab98 100644 --- 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; diff --git a/src/views/Home/Announce/index.vue b/src/views/Home/Announce/index.vue new file mode 100644 index 0000000..7eeaa64 --- /dev/null +++ b/src/views/Home/Announce/index.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index ee024d5..65a6256 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -6,21 +6,24 @@ + diff --git a/src/views/Home/main/eHonor.vue b/src/views/Home/main/eHonor.vue index 729177c..c2b4ab6 100644 --- a/src/views/Home/main/eHonor.vue +++ b/src/views/Home/main/eHonor.vue @@ -13,7 +13,7 @@ > - + @@ -24,7 +24,8 @@