@@ -11,12 +11,14 @@
{{ form.summary }}
-
+
附件下载
-
- {{ form.file }}
- 下载
-
+ -
+
- + {{ file.fileName }} + 下载 + +
@@ -66,7 +68,8 @@ export default {
value: 'id',
label: 'columnName'
},
- news: []
+ news: [],
+ files: []
}
},
components: {
@@ -81,6 +84,7 @@ export default {
mounted() {
this.getColumn()
this.getArticle()
+ this.getFile()
},
methods: {
// 获取文章详情
@@ -105,10 +109,16 @@ export default {
}
}
},
+ // 获取附件
+ getFile() {
+ this.$post(`${this.api.theAttachmentUnderTheQueryColumn}?contentId=${this.id}`).then(({ data }) => {
+ this.files = data
+ }).catch(err => {})
+ },
// 资讯
getColumn() {
this.$post(this.api.listWithTree, {
- siteId: 1,
+ siteId: this.$route.query.siteId || this.$store.state.content.site,
columnName: '',
templateId: '',
typeId : '',
@@ -123,14 +133,14 @@ export default {
this.$post(this.api.newlyPublishedArticles, {
pageNum: 1,
pageSize: 5,
- siteId: 1
+ siteId: this.$route.query.siteId || this.$store.state.content.site
}).then(({ data }) => {
this.news = data.records
}).catch(res => {})
},
// 下载附件
- download() {
- Util.downloadFile('附件', this.form.file)
+ download(e) {
+ Util.downloadFile(e.fileName, e.filePath)
}
}
};
@@ -149,7 +159,7 @@ export default {
display: flex;
justify-content: space-between;
.left {
- width: 1090px;
+ width: 920px;
}
h2 {
font-size: 36px;
@@ -178,9 +188,10 @@ export default {
color: #333;
border-left: 2px solid #1583FF;
}
- .file {
+ li {
display: flex;
align-items: center;
+ margin-bottom: 10px;
}
.name {
margin-right: 8px;
diff --git a/src/pages/careers/index.vue b/src/pages/careers/index.vue
index d138095..fa27312 100644
--- a/src/pages/careers/index.vue
+++ b/src/pages/careers/index.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index ead10a6..d7c1461 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -1,19 +1,20 @@
- IASF的最新新闻、公告、活动
+ ![]()
+
{{ info.columnName }}
- 文章类型：
+ 所属分类：
@@ -96,12 +97,18 @@ export default {
data() {
return {
id: this.$route.query.id,
+ site: this.$store.state.content.site,
columnId: '',
+ info: {
+ columnName: '',
+ columnBanner: ''
+ },
searchTimer: null,
form: {
title: ''
},
- labels: {},
+ classifications: [],
+ labels: [],
columns: [],
curColumn: 0,
page: 1,
@@ -128,33 +135,42 @@ export default {
}
},
mounted() {
+ this.getInfo()
this.getColumn()
this.getNews()
+ this.getArticle([this.id])
+ this.getClassification()
+ this.getLabel()
},
methods: {
- // 获取banner 规则：当前文章有上传的，用上传的，没有上传的栏目有图片，读取上级栏目的（上级没有读上上级，以此类推）都没有的读取默认的
- getBanner(data) {
- this.columnBanner = ''
- for (const e of data) {
- if (e.columnBanner) this.columnBanner = e.columnBanner
- if (e.id == this.columnId) {
- break
- } else {
- this.getBanner(e.children)
- }
- }
+ // 获取栏目详情
+ getInfo() {
+ this.$post(`${this.api.findColumn}?id=${this.id}`).then(({ data }) => {
+ this.info = data
+ }).catch(res => {})
+ },
+ // 获取所属分类
+ getClassification() {
+ this.$post(`${this.api.queryClassif}?siteId=${this.$route.query.siteId || this.site}`).then(({ data }) => {
+ this.classifications = data
+ }).catch(err => {})
+ },
+ // 获取标签
+ getLabel() {
+ this.$post(`${this.api.queryLabel}?siteId=${this.$route.query.siteId || this.site}`).then(({ data }) => {
+ this.labels = data
+ }).catch(err => {})
},
// 资讯
getColumn() {
this.$post(this.api.listWithTree, {
- siteId: 1,
+ siteId: this.$route.query.siteId || this.$store.state.content.site,
columnName: '',
templateId: '',
typeId : '',
isSort: 0
}).then(({ data }) => {
this.columns = data
- this.initData()
}).catch(err => {})
},
// 最新资讯
@@ -162,7 +178,7 @@ export default {
this.$post(this.api.newlyPublishedArticles, {
pageNum: 1,
pageSize: 5,
- siteId: 1
+ siteId: this.$route.query.siteId || this.$store.state.content.site
}).then(({ data }) => {
this.news = data.records
}).catch(res => {})
@@ -173,10 +189,10 @@ export default {
this.initData()
},
// 查询文章列表
- getArticle() {
+ getArticle(columnIds) {
this.$post(this.api.queryArticle, {
- siteId: 1,
- columnIds: [this.columns[this.curColumn].id],
+ siteId: this.$route.query.siteId || this.$store.state.content.site,
+ columnIds,
pageNum: this.page,
pageSize: this.pageSize,
...this.form
@@ -187,7 +203,7 @@ export default {
},
initData() {
this.page = 1
- this.getArticle()
+ this.getArticle([this.columns[this.curColumn].id])
},
currentChange(val) {
this.page = val
@@ -199,11 +215,15 @@ export default {
\ No newline at end of file
diff --git a/src/router/modules/application.js b/src/router/modules/application.js
new file mode 100644
index 0000000..fcc9178
--- /dev/null
+++ b/src/router/modules/application.js
@@ -0,0 +1,14 @@
+import BasicLayout from '@/layouts/home'
+const name = 'application'
+export default {
+ path: `/${name}`,
+ component: BasicLayout,
+ children: [
+ {
+ name,
+ path: `/${name}`,
+ component: () => import(`@/pages/${name}`),
+ meta: { title: '' }
+ }
+ ]
+};
diff --git a/src/store/modules/content.js b/src/store/modules/content.js
new file mode 100644
index 0000000..d5df6d6
--- /dev/null
+++ b/src/store/modules/content.js
@@ -0,0 +1,24 @@
+/**
+ * 内容管理
+ * */
+
+ import Router from '@/router'
+ export default {
+ namespaced: true,
+ state: {
+ site: 1,
+ },
+ getters: {
+ site: state => {
+ return Router.app.query.site || state.site
+ }
+ },
+ mutations: {
+ setSite: (state, site) => {
+ state.site = +site
+ },
+ },
+ actions: {
+
+ }
+};
\ No newline at end of file
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
deleted file mode 100644
index 5549770..0000000
--- a/src/store/modules/user.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import Setting from "@/setting";
-import util from "@/libs/util";
-import { post, get, del, put } from "@/plugins/requests/index.js";
-import api from "@/api";
-/**
- * 用户信息
- * */
-export default {
- namespaced: true,
- state: {
- activeTab: "/station/list", // 当前激活菜单
- title: '',
- logoUrl: '',
- avatar: "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
- userId: '',
- studentId: '',
- userName: '',
- customerName: '',
- schoolId: '',
- roleId: '',
- dataTime: '',
- logView: false // 是否查询过日志状态，如果有，则不再调接口
- },
- mutations: {
- SET_INFO: (state, info) => {
- if (info.avatar) state.avatar = info.avatar;
- state.userId = info.userId;
- state.studentId = info.studentId;
- state.schoolId = info.schoolId;
- state.userName = info.userName;
- state.roleId = info.roleId;
- state.dataTime = info.dataTime;
- },
- SET_TITLE: (state, title) => {
- state.title = title;
- },
- SET_LOGO_URL: (state, logoUrl) => {
- state.logoUrl = logoUrl;
- },
- SET_AVATAR: (state, avatar) => {
- state.avatar = avatar;
- },
- SET_USERNAME: (state, userName) => {
- state.userName = userName;
- },
- SET_CUSTOMERNAME: (state, customerName) => {
- state.customerName = customerName;
- },
- SET_ACTIVE_TAB: (state, activeTab) => {
- state.activeTab = activeTab;
- },
- SET_LOG: (state) => {
- state.logView = true
- },
- },
- actions: {
- login({ state, commit }, userInfo) {
- return new Promise((resolve, reject) => {
- post(api.logins, userInfo).then(res => {
- if (res.status == 200) {
- let { data } = res;
- // 生成路由权限
- // 每个系统都是用这套角色权限代码的,后端也是基本一样,除了个别字段可能会不一样
- // 总体来说就两个步骤: 1是生成能够访问的路由的数组集合,2是生成能看到的按钮的数组集合
- //res.message.listValue && Setting.dynamicRoute && addRoutes(res.message.listValue)
- util.local.set(Setting.tokenKey, data.token, Setting.tokenExpires);
- util.successMsg("登录成功");
- // console.log(data, "登录保存的数据");
- commit("SET_INFO", data);
- resolve();
- } else {
- util.errorMsg(res.message);
- reject(res);
- }
- }).catch(error => {
- reject(error);
- });
- });
- },
- logout({ commit, state, dispatch }) {
- return new Promise((resolve, reject) => {
- util.local.remove(Setting.storeKey);
- util.local.remove(Setting.tokenKey);
- location.reload();
- resolve();
- });
- },
- setInfo({ state, commit }, info) {
- commit("SET_INFO", info);
- },
- setTitle({ state, commit }, title) {
- commit("SET_TITLE", title);
- },
- setLogoUrl({ state, commit }, logoUrl) {
- commit("SET_LOGO_URL", logoUrl);
- },
- setAvatar({ state, commit }, avatar) {
- commit("SET_AVATAR", avatar);
- },
- setUserName({ state, commit }, userName) {
- commit("SET_USERNAME", userName);
- },
- setActiveTab({ state, commit }, activeTab) {
- commit("SET_ACTIVE_TAB", activeTab);
- }
- }
-};
\ No newline at end of file
diff --git a/src/styles/page/page.scss b/src/styles/page/page.scss
index 58b35e5..6418650 100644
--- a/src/styles/page/page.scss
+++ b/src/styles/page/page.scss
@@ -8,7 +8,6 @@
line-height: 59px;
text-align: center;
color: #1F1F1F;
- @include ellipsis;
&:after {
content: '';
position: absolute;