diff --git a/.env.production b/.env.production index a992137..48d69d5 100644 --- a/.env.production +++ b/.env.production @@ -3,4 +3,4 @@ ENV = 'production' # EBTS/生产环境 #VUE_APP_BASE_API = '/prod-api' -VUE_APP_BASE_API = 'http://192.168.190.67:8096/dev-api' +VUE_APP_BASE_API = 'http://192.168.190.67/dev-api' diff --git a/src/App.vue b/src/App.vue index fdfb453..21f6cc7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,7 +19,7 @@ import headers from './views/header/index' import MobileHerder from './views/header/mobile_herder' import footers from './views/footer/index' -import {setAppLanguage} from "@/utils/sist"; +import {setAppLanguage,setThis} from "@/utils/sist"; export default { name: 'App', @@ -37,6 +37,7 @@ export default { } }, created() { + setThis(this) setAppLanguage(this) }, mounted() { //监听scroll方法 diff --git a/src/assets/index/party_building_activities/1.png b/src/assets/index/party_building_activities/1.png index e442ef5..e69de29 100644 Binary files a/src/assets/index/party_building_activities/1.png and b/src/assets/index/party_building_activities/1.png differ diff --git a/src/assets/index/party_building_activities/1@2x.png b/src/assets/index/party_building_activities/1@2x.png index 5043b82..e69de29 100644 Binary files a/src/assets/index/party_building_activities/1@2x.png and b/src/assets/index/party_building_activities/1@2x.png differ diff --git a/src/assets/index/party_building_activities/2.png b/src/assets/index/party_building_activities/2.png index 2cfaf7d..e69de29 100644 Binary files a/src/assets/index/party_building_activities/2.png and b/src/assets/index/party_building_activities/2.png differ diff --git a/src/assets/index/party_building_activities/2@2x.png b/src/assets/index/party_building_activities/2@2x.png index c57a079..e69de29 100644 Binary files a/src/assets/index/party_building_activities/2@2x.png and b/src/assets/index/party_building_activities/2@2x.png differ diff --git a/src/assets/index/party_building_activities/3.png b/src/assets/index/party_building_activities/3.png index 9fb8e2b..e69de29 100644 Binary files a/src/assets/index/party_building_activities/3.png and b/src/assets/index/party_building_activities/3.png differ diff --git a/src/assets/index/party_building_activities/3@2x.png b/src/assets/index/party_building_activities/3@2x.png index 8b692f9..e69de29 100644 Binary files a/src/assets/index/party_building_activities/3@2x.png and b/src/assets/index/party_building_activities/3@2x.png differ diff --git a/src/assets/index/party_building_activities/4.png b/src/assets/index/party_building_activities/4.png index 7a948f4..e69de29 100644 Binary files a/src/assets/index/party_building_activities/4.png and b/src/assets/index/party_building_activities/4.png differ diff --git a/src/assets/index/party_building_activities/4@2x.png b/src/assets/index/party_building_activities/4@2x.png index a351ea6..e69de29 100644 Binary files a/src/assets/index/party_building_activities/4@2x.png and b/src/assets/index/party_building_activities/4@2x.png differ diff --git a/src/assets/index/party_building_activities/sy_bj3.png b/src/assets/index/party_building_activities/sy_bj3.png index baf1883..e69de29 100644 Binary files a/src/assets/index/party_building_activities/sy_bj3.png and b/src/assets/index/party_building_activities/sy_bj3.png differ diff --git a/src/assets/index/party_building_activities/sy_bj3@2x.png b/src/assets/index/party_building_activities/sy_bj3@2x.png index ad5f327..e69de29 100644 Binary files a/src/assets/index/party_building_activities/sy_bj3@2x.png and b/src/assets/index/party_building_activities/sy_bj3@2x.png differ diff --git a/src/assets/index/party_building_activities/sy_icon_zhdh.png b/src/assets/index/party_building_activities/sy_icon_zhdh.png index e49c82e..e69de29 100644 Binary files a/src/assets/index/party_building_activities/sy_icon_zhdh.png and b/src/assets/index/party_building_activities/sy_icon_zhdh.png differ diff --git a/src/assets/index/party_building_activities/sy_icon_zhdh@2x.png b/src/assets/index/party_building_activities/sy_icon_zhdh@2x.png index 85cb24a..e69de29 100644 Binary files a/src/assets/index/party_building_activities/sy_icon_zhdh@2x.png and b/src/assets/index/party_building_activities/sy_icon_zhdh@2x.png differ diff --git a/src/assets/index/party_building_activities/t10.png b/src/assets/index/party_building_activities/t10.png index 565803a..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t10.png and b/src/assets/index/party_building_activities/t10.png differ diff --git a/src/assets/index/party_building_activities/t10@2x.png b/src/assets/index/party_building_activities/t10@2x.png index 500ea5e..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t10@2x.png and b/src/assets/index/party_building_activities/t10@2x.png differ diff --git a/src/assets/index/party_building_activities/t6.png b/src/assets/index/party_building_activities/t6.png index 3d240c0..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t6.png and b/src/assets/index/party_building_activities/t6.png differ diff --git a/src/assets/index/party_building_activities/t6@2x.png b/src/assets/index/party_building_activities/t6@2x.png index 1888fab..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t6@2x.png and b/src/assets/index/party_building_activities/t6@2x.png differ diff --git a/src/assets/index/party_building_activities/t7.png b/src/assets/index/party_building_activities/t7.png index 8258a24..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t7.png and b/src/assets/index/party_building_activities/t7.png differ diff --git a/src/assets/index/party_building_activities/t7@2x.png b/src/assets/index/party_building_activities/t7@2x.png index 1b2d49c..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t7@2x.png and b/src/assets/index/party_building_activities/t7@2x.png differ diff --git a/src/assets/index/party_building_activities/t8.png b/src/assets/index/party_building_activities/t8.png index bd44625..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t8.png and b/src/assets/index/party_building_activities/t8.png differ diff --git a/src/assets/index/party_building_activities/t8@2x.png b/src/assets/index/party_building_activities/t8@2x.png index 493dcd4..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t8@2x.png and b/src/assets/index/party_building_activities/t8@2x.png differ diff --git a/src/assets/index/party_building_activities/t9.png b/src/assets/index/party_building_activities/t9.png index 6893755..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t9.png and b/src/assets/index/party_building_activities/t9.png differ diff --git a/src/assets/index/party_building_activities/t9@2x.png b/src/assets/index/party_building_activities/t9@2x.png index f626c6f..e69de29 100644 Binary files a/src/assets/index/party_building_activities/t9@2x.png and b/src/assets/index/party_building_activities/t9@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_bj2.png b/src/assets/index/scientific_research_trends/sy_bj2.png index 8953218..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_bj2.png and b/src/assets/index/scientific_research_trends/sy_bj2.png differ diff --git a/src/assets/index/scientific_research_trends/sy_bj2@2x.png b/src/assets/index/scientific_research_trends/sy_bj2@2x.png index 318d6e7..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_bj2@2x.png and b/src/assets/index/scientific_research_trends/sy_bj2@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_b1.png b/src/assets/index/scientific_research_trends/sy_icon_b1.png index e6e4b53..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_b1.png and b/src/assets/index/scientific_research_trends/sy_icon_b1.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_b1@2x.png b/src/assets/index/scientific_research_trends/sy_icon_b1@2x.png index 3eca71f..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_b1@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_b1@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh1.png b/src/assets/index/scientific_research_trends/sy_icon_bh1.png index 4f919dc..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh1.png and b/src/assets/index/scientific_research_trends/sy_icon_bh1.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh10.png b/src/assets/index/scientific_research_trends/sy_icon_bh10.png index 6626f90..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh10.png and b/src/assets/index/scientific_research_trends/sy_icon_bh10.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh10@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh10@2x.png index 2d20f70..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh10@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh10@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh1@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh1@2x.png index d49f768..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh1@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh1@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh2.png b/src/assets/index/scientific_research_trends/sy_icon_bh2.png index b0c584a..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh2.png and b/src/assets/index/scientific_research_trends/sy_icon_bh2.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh2@2x(1).png b/src/assets/index/scientific_research_trends/sy_icon_bh2@2x(1).png index f32107b..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh2@2x(1).png and b/src/assets/index/scientific_research_trends/sy_icon_bh2@2x(1).png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh2@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh2@2x.png index 9d347eb..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh2@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh2@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh3.png b/src/assets/index/scientific_research_trends/sy_icon_bh3.png index 46d5619..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh3.png and b/src/assets/index/scientific_research_trends/sy_icon_bh3.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh3@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh3@2x.png index a6e33cf..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh3@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh3@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh4.png b/src/assets/index/scientific_research_trends/sy_icon_bh4.png index 8a38df5..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh4.png and b/src/assets/index/scientific_research_trends/sy_icon_bh4.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh4@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh4@2x.png index 0e2eafa..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh4@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh4@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh5.png b/src/assets/index/scientific_research_trends/sy_icon_bh5.png index 9994c6b..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh5.png and b/src/assets/index/scientific_research_trends/sy_icon_bh5.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh5@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh5@2x.png index 7d89569..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh5@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh5@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh6.png b/src/assets/index/scientific_research_trends/sy_icon_bh6.png index 9c9678f..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh6.png and b/src/assets/index/scientific_research_trends/sy_icon_bh6.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh6@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh6@2x.png index f32107b..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh6@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh6@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh7.png b/src/assets/index/scientific_research_trends/sy_icon_bh7.png index 7c56bba..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh7.png and b/src/assets/index/scientific_research_trends/sy_icon_bh7.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh7@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh7@2x.png index c40c0a3..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh7@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh7@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh8.png b/src/assets/index/scientific_research_trends/sy_icon_bh8.png index 7a0c6e8..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh8.png and b/src/assets/index/scientific_research_trends/sy_icon_bh8.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh8@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh8@2x.png index a627817..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh8@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh8@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh9.png b/src/assets/index/scientific_research_trends/sy_icon_bh9.png index a92721c..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh9.png and b/src/assets/index/scientific_research_trends/sy_icon_bh9.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh9@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh9@2x.png index e8fc140..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh9@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh9@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_zhdb.png b/src/assets/index/scientific_research_trends/sy_icon_zhdb.png index 5f9c0ab..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_zhdb.png and b/src/assets/index/scientific_research_trends/sy_icon_zhdb.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_zhdb@2x.png b/src/assets/index/scientific_research_trends/sy_icon_zhdb@2x.png index fab64f9..e69de29 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_zhdb@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_zhdb@2x.png differ diff --git a/src/assets/index/teaching_student/tw1.png b/src/assets/index/teaching_student/tw1.png index d98675d..e69de29 100644 Binary files a/src/assets/index/teaching_student/tw1.png and b/src/assets/index/teaching_student/tw1.png differ diff --git a/src/assets/index/teaching_student/tw1@2x.png b/src/assets/index/teaching_student/tw1@2x.png index ed77a86..e69de29 100644 Binary files a/src/assets/index/teaching_student/tw1@2x.png and b/src/assets/index/teaching_student/tw1@2x.png differ diff --git a/src/router/index.js b/src/router/index.js index 62f6964..530e588 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -14,11 +14,6 @@ const routes = [ name: 'index', component: () => import(/* webpackChunkName: "about" */ '../views/anchor') }, - { - path: '/sp', - name: 'TeachingStaff', - component: () => import(/* webpackChunkName: "about" */ '../views/school_profile/index') - }, { path: '/mobile', name: 'Mobile', @@ -34,27 +29,6 @@ const routes = [ name: 'Mobile', component: () => import(/* webpackChunkName: "about" */ '../views/mobile/index') }, - { - path: '/ts', - name: 'TeachingStaff', - component: () => import(/* webpackChunkName: "about" */ '../views/teaching_staff/index') - }, - { - path: '/test', - name: 'TeachingStaff', - component: () => import(/* webpackChunkName: "about" */ '../views/Test') - }, - - { - path: '/et', - name: 'EduTeach', - component: () => import(/* webpackChunkName: "about" */ '../views/edu_teach/index') - }, - { - path: '/h', - name: 'EduTeach', - component: () => import(/* webpackChunkName: "about" */ '../components/HelloWorld') - }, { path: '/pc/:secondId/:navId', name: 'content', @@ -68,7 +42,7 @@ const routes = [ { path: '*', name: 'index', - component: () => import(/* webpackChunkName: "about" */ '../views/Test') + component: () => import(/* webpackChunkName: "about" */ '../views/other') }, ] diff --git a/src/utils/sist.js b/src/utils/sist.js index c8ed759..c8e02ee 100644 --- a/src/utils/sist.js +++ b/src/utils/sist.js @@ -4,10 +4,15 @@ * @description:sist * @email: clay@hchyun.com */ +let vm = null + +import {info} from "@/api"; +export function setThis(that) { + vm = that +} export function getParentNode(id) { try { - let menuList = JSON.parse(sessionStorage.getItem("menu")); for (let menu of menuList) { for (let child of menu.children) { @@ -15,8 +20,7 @@ export function getParentNode(id) { menu.children = [] child.children = [] return { - stair: menu, - second: child, + stair: menu, second: child, } } for (let item of child.children) { @@ -25,9 +29,7 @@ export function getParentNode(id) { child.children = [] item.children = [] return { - stair: menu, - second: child, - three: item + stair: menu, second: child, three: item } } } @@ -39,30 +41,75 @@ export function getParentNode(id) { } } -export function setAppLanguage(that){ +export function setAppLanguage() { let lang = sessionStorage.getItem("lang"); - if (lang != null){ - that.$i18n.locale = lang + if (lang != null) { + vm.$i18n.locale = lang return } var language = window.navigator.userLanguage || window.navigator.language; - if (language == 'zh-CN'){ + if (language == 'zh-CN') { lang = 'cn' - }else { + } else { lang = 'en' } - that.$i18n.locale = lang - sessionStorage.setItem("lang",lang) + vm.$i18n.locale = lang + sessionStorage.setItem("lang", lang) } -export function setLanguage(that){ - let lang = that.$route.query && that.$route.query.lang - if (lang != undefined){ - that.$i18n.locale = lang - sessionStorage.setItem("lang",lang) + +export function setLanguage() { + let lang = vm.$route.query && vm.$route.query.lang + if (lang != undefined) { + vm.$i18n.locale = lang + sessionStorage.setItem("lang", lang) } } +export function toArticle(news,width) { + info(news.id).then(res => { + let info = null + try { + info = getParentNode(res.data.encodeId) + }catch (e){} + if (info == null){ + return + } + if (width) { + vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "?id=" + news.id + "&lang=" + sessionStorage.getItem("lang")); + } else { + vm.$router.push("/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "?id=" + news.id + "&lang=" + sessionStorage.getItem("lang")); + } + }) +} + +export function lookMoreComment(item,width) { + info(item.id).then(res => { + let info = null + try { + info = getParentNode(res.data.encodeId) + }catch (e){} + if (info == null){ + return + } + if (info.three == null) { + if (width) { + vm.$router.push("/pc/" + info.second.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); + } else { + vm.$router.push("/mobile/" + info.second.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); + } + } else { + if (width) { + vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); + } else { + vm.$router.push("/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "?type=" + info.second.type + "&lang=" + sessionStorage.getItem("lang")); + } + } + }) +} + + + diff --git a/src/views/admin.vue b/src/views/admin.vue new file mode 100644 index 0000000..70958e6 --- /dev/null +++ b/src/views/admin.vue @@ -0,0 +1,31 @@ +