jialong.yu
/
FE_IASF_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Compare commits

base: jialong.yu:master
Branches Tags
jialong.yu:master
..
compare: jialong.yu:V1.0.2
Branches Tags
jialong.yu:master

No commits in common. 'master' and 'V1.0.2' have entirely different histories.
master ... V1.0.2

8 changed files with 977 additions and 900 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 654
      src/const/modules.js
  2. 2
      src/pages/article/add/editor.js
  3. 13
      src/pages/article/add/index.vue
  4. 180
      src/pages/article/list/index.vue
  5. 12
      src/pages/column/page/application.vue
  6. 4
      src/pages/column/page/contactUs.vue
  7. 4
      src/pages/column/page/governance.vue
  8. 4
      src/store/modules/user.js

654
src/const/modules.js
View File

File diff suppressed because it is too large Load Diff

2
src/pages/article/add/editor.js
Unescape View File

@ -309,7 +309,7 @@ export default {
title: '人物详情', description: '', content: `
<div class="tiny-wrap">
<div class="people">
<img class="pic" src="https://www.iasf.ac.cn/images/team/5.png"/>
<img class="pic" src="https://new.iasf.ac.cn/images/team/5.png"/>
<div class="texts">
<h6>谢明远 XIE Mingyuan</h6>
<div class="text">

13
src/pages/article/add/index.vue
Unescape View File

@ -532,9 +532,9 @@ export default {
classificationId: [
{ required: false, message: '请选择所属分类', trigger: 'change' }
],
// eventProfile: [
// { required: true, message: '请输入活动简介', trigger: 'blur' }
// ],
eventProfile: [
{ required: true, message: '请输入活动简介', trigger: 'blur' }
],
releaseTime: [
{ required: true, message: '请选择发布日期', trigger: 'change' }
],
@ -1313,12 +1313,7 @@ export default {
this.$post(this.api.updateArticle, form).then(res => {
this.updateFile(fileId, form, form.id)
Util.successMsg('修改成功')
if (next) {
next()
} else {
// 更改了所属栏目，则给列表传递一个last参数，跳转到最后一页
form.columnId != this.originColumnId ? this.$router.push(`list?columnId=${form.columnId}&last=1`) : this.$router.back()
}
next ? next() : this.$router.push(`list?columnId=` + form.columnId + (form.columnId != this.originColumnId ? '&last=1' : '')) // 更改了所属栏目，则给列表传递一个last参数，跳转到最后一页
}).catch(err => {
this.submiting = false
})

180
src/pages/article/list/index.vue
Unescape View File

@ -3,99 +3,188 @@
<div style="width: 218px;border-right: 1px solid #EBEDF0">
<p class="page-name mb">全部栏目</p>
<div style="height: calc(100vh - 190px);overflow: auto">
<el-tree ref="column" :data="columns" highlight-current :expand-on-click-node="false" default-expand-all
:props="defaultProps" node-key="id" @node-click="initData">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span class="org-name" :title="node.label">{{ node.label }}</span>
<el-tree ref="column"
:data="columns"
highlight-current
:expand-on-click-node="false"
default-expand-all
:props="defaultProps"
node-key="id"
@node-click="initData">
<span class="custom-tree-node"
slot-scope="{ node, data }">
<span class="org-name"
:title="node.label">{{ node.label }}</span>
</span>
</el-tree>
</div>
</div>
<div class="p-l-20" style="width: calc(100% - 219px);">
<div class="p-l-20"
style="width: calc(100% - 219px);">
<div class="tool">
<div class="search-wrap">
<el-select v-model="field" @change="initData">
<el-option v-for="(item, i) in keywords" :key="i" :label="item.name" :value="item.id">
<el-select v-model="field"
@change="initData">
<el-option v-for="(item, i) in keywords"
:key="i"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
<el-input class="keyword" :placeholder="'请输入' + keywords.find(e => e.id === field).name"
v-model.trim="keyword" clearable></el-input>
<el-input class="keyword"
:placeholder="'请输入' + keywords.find(e => e.id === field).name"
v-model.trim="keyword"
clearable></el-input>
</div>
<div class="actions">
<el-dropdown class="setting" trigger="click" :hide-on-click="false">
<img class="icon" src="@/assets/images/setting.png" alt="">
<el-dropdown class="setting"
trigger="click"
:hide-on-click="false">
<img class="icon"
src="@/assets/images/setting.png"
alt="">
<el-dropdown-menu>
<el-dropdown-item>
<el-button @click="resetColumns" type="text">列重置</el-button>
<el-button @click="resetColumns"
type="text">列重置</el-button>
</el-dropdown-item>
<el-dropdown-item v-for="(column, i) in settings" :key="i" :divided="i === 0">
<el-dropdown-item v-for="(column, i) in settings"
:key="i"
:divided="i === 0">
<el-checkbox v-model="column.show">{{ column.name }}</el-checkbox>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:新增'" type="primary" @click="add">新增</el-button>
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'" @click="batchDel">删除</el-button>
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:新增'"
type="primary"
@click="add">新增</el-button>
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'"
@click="batchDel">删除</el-button>
</div>
</div>
<el-table :data="list" class="table" ref="table" header-align="center" @selection-change="handleSelectionChange"
row-key="id" @sort-change="sortChange">
<el-table-column v-if="settings[0].show" type="selection" width="55" align="center"
<el-table :data="list"
class="table"
ref="table"
header-align="center"
@selection-change="handleSelectionChange"
row-key="id"
@sort-change="sortChange">
<el-table-column v-if="settings[0].show"
type="selection"
width="55"
align="center"
:reserve-selection="true"></el-table-column>
<el-table-column type="index" width="60" label="序号" align="center">
<el-table-column type="index"
width="60"
label="序号"
align="center">
<template scope="scope">
<span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
<span>{{(page - 1) * pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column v-if="settings[1].show" show-overflow-tooltip prop="title" label="标题" align="center"
<el-table-column v-if="settings[1].show"
show-overflow-tooltip
prop="title"
label="标题"
align="center"
min-width="150"></el-table-column>
<el-table-column v-if="settings[2].show" prop="columnName" label="栏目" align="center"
<el-table-column v-if="settings[2].show"
prop="columnName"
label="栏目"
align="center"
min-width="120"></el-table-column>
<el-table-column v-if="settings[3].show" prop="classificationName" label="所属分类" align="center"
<el-table-column v-if="settings[3].show"
prop="classificationName"
label="所属分类"
align="center"
min-width="120"></el-table-column>
<el-table-column v-if="settings[4].show" prop="typeId" label="栏目类型" align="center" min-width="100">
<el-table-column v-if="settings[4].show"
prop="typeId"
label="栏目类型"
align="center"
min-width="100">
<template slot-scope="scope">
{{ types.find(e => e.id === scope.row.typeId).name }}
</template>
</el-table-column>
<el-table-column v-if="settings[5].show" prop="founderName" label="录入人" align="center"
<el-table-column v-if="settings[5].show"
prop="founderName"
label="录入人"
align="center"
min-width="80"></el-table-column>
<el-table-column v-if="settings[6].show" prop="editorName" label="修改人" align="center"
<el-table-column v-if="settings[6].show"
prop="editorName"
label="修改人"
align="center"
min-width="80"></el-table-column>
<el-table-column v-if="settings[7].show" prop="updateTime" label="修改日期" align="center" min-width="150"
<el-table-column v-if="settings[7].show"
prop="updateTime"
label="修改日期"
align="center"
min-width="150"
sortable="custom"></el-table-column>
<el-table-column v-if="settings[8].show" prop="releaseTime" label="发布日期" align="center" min-width="100"
<el-table-column v-if="settings[8].show"
prop="releaseTime"
label="发布日期"
align="center"
min-width="100"
sortable="custom"></el-table-column>
<el-table-column v-if="settings[9].show" prop="totalBrowsing" label="总浏览" align="center"
<el-table-column v-if="settings[9].show"
prop="totalBrowsing"
label="总浏览"
align="center"
min-width="70"></el-table-column>
<el-table-column v-if="settings[10].show" prop="workNumber" label="状态" align="center" min-width="80">
<el-table-column v-if="settings[10].show"
prop="workNumber"
label="状态"
align="center"
min-width="80">
<template slot-scope="scope">
{{ scope.row.isRelease ? '已发布' : '草稿' }}
</template>
</el-table-column>
<el-table-column v-auth="'/site/list:' + siteName + ':内容管理:文章管理:置顶'" prop="sequence" label="置顶" align="center"
min-width="80" sortable="custom">
<el-table-column v-auth="'/site/list:' + siteName + ':内容管理:文章管理:置顶'"
prop="sequence"
label="置顶"
align="center"
min-width="80"
sortable="custom">
<template slot-scope="scope">
<i v-if="scope.row.isRelease" :class="['squ-icon', scope.row.isTop ? 'el-icon-check' : 'el-icon-close']"
<i v-if="scope.row.isRelease"
:class="['squ-icon', scope.row.isTop ? 'el-icon-check' : 'el-icon-close']"
@click="sticky(scope.row)"></i>
</template>
</el-table-column>
<el-table-column v-if="settings[11].show" label="操作" align="center" width="190">
<el-table-column v-if="settings[11].show"
label="操作"
align="center"
width="190">
<template slot-scope="scope">
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:预览'" type="text"
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:预览'"
type="text"
@click="preview(scope.row)">预览</el-button>
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:编辑'" type="text"
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:编辑'"
type="text"
@click="edit(scope.row)">编辑</el-button>
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'" type="text"
<el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'"
type="text"
@click="handleDelete(scope.row)">删除</el-button>
<el-switch v-if="scope.row.isRelease" v-auth="'/site/list:' + siteName + ':内容管理:文章管理:禁用'" class="m-l-10"
v-model="scope.row.isDisable" :active-value="0" :inactive-value="1"
<el-switch v-if="scope.row.isRelease"
v-auth="'/site/list:' + siteName + ':内容管理:文章管理:禁用'"
class="m-l-10"
v-model="scope.row.isDisable"
:active-value="0"
:inactive-value="1"
@change="switchOff($event, scope.row, scope.$index)">
</el-switch>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next"
<el-pagination background
@current-change="currentChange"
:current-page="page"
layout="total, prev, pager, next"
:total="total"></el-pagination>
</div>
</div>
@ -137,9 +226,9 @@ export default {
name: '修改人'
}
],
keyword: this.$route.query.keyword || '',
keyword: '',
list: [],
page: +this.$route.query.page || 1,
page: 1,
pageSize: 10,
total: 0,
modifiedTimeSort: '',
@ -247,7 +336,7 @@ export default {
// 文章列表
getData () {
const id = this.$refs.column.getCurrentKey()
this.$router.push(`/article?columnId=${id}&page=${this.page}&keyword=${this.keyword || ''}`).catch(e => { })
this.$router.push(`/article?columnId=${id}`).catch(e => { })
const keyword = encodeURI(this.keyword)
const data = {
siteId: this.$store.state.content.site.id,
@ -408,7 +497,6 @@ export default {
display: inline-flex;
align-items: center;
}
.name {
display: inline-block;
max-width: 160px;
@ -416,21 +504,17 @@ export default {
overflow: hidden;
text-overflow: ellipsis;
}
.squ-icon {
font-size: 16px;
font-weight: 600;
cursor: pointer;
color: #f70000;
&.el-icon-check {
color: #05991e;
}
}
/deep/.squ-input {
width: auto;
.el-input__inner {
width: 60px;
padding: 0 10px;

12
src/pages/column/page/application.vue
Unescape View File

@ -82,7 +82,7 @@
</div>
<ul class="news">
<li>
<img src="https://www.iasf.ac.cn/images/home/3.png" alt="">
<img src="https://new.iasf.ac.cn/images/home/3.png" alt="">
<div class="texts">
<h6>2022 New Year Message from President Sun Dongbai</h6>
<p class="des">2021 is another challenging year for the Institute of Advanced Science Facilities,
@ -92,7 +92,7 @@
</div>
</li>
<li>
<img src="https://www.iasf.ac.cn/images/home/3.png" alt="">
<img src="https://new.iasf.ac.cn/images/home/3.png" alt="">
<div class="texts">
<h6>2022 New Year Message from President Sun Dongbai</h6>
<p class="des">2021 is another challenging year for the Institute of Advanced Science Facilities,
@ -102,7 +102,7 @@
</div>
</li>
<li>
<img src="https://www.iasf.ac.cn/images/home/3.png" alt="">
<img src="https://new.iasf.ac.cn/images/home/3.png" alt="">
<div class="texts">
<h6>2022 New Year Message from President Sun Dongbai</h6>
<p class="des">2021 is another challenging year for the Institute of Advanced Science Facilities,
@ -112,7 +112,7 @@
</div>
</li>
<li>
<img src="https://www.iasf.ac.cn/images/home/3.png" alt="">
<img src="https://new.iasf.ac.cn/images/home/3.png" alt="">
<div class="texts">
<h6>2022 New Year Message from President Sun Dongbai</h6>
<p class="des">2021 is another challenging year for the Institute of Advanced Science Facilities,
@ -122,7 +122,7 @@
</div>
</li>
<li>
<img src="https://www.iasf.ac.cn/images/home/3.png" alt="">
<img src="https://new.iasf.ac.cn/images/home/3.png" alt="">
<div class="texts">
<h6>2022 New Year Message from President Sun Dongbai</h6>
<p class="des">2021 is another challenging year for the Institute of Advanced Science Facilities,
@ -132,7 +132,7 @@
</div>
</li>
<li>
<img src="https://www.iasf.ac.cn/images/home/3.png" alt="">
<img src="https://new.iasf.ac.cn/images/home/3.png" alt="">
<div class="texts">
<h6>2022 New Year Message from President Sun Dongbai</h6>
<p class="des">2021 is another challenging year for the Institute of Advanced Science Facilities,

4
src/pages/column/page/contactUs.vue
Unescape View File

@ -91,8 +91,8 @@ export default {
.block {
padding: 2rem 0;
background: url(https://www.iasf.ac.cn/images/contactUs/3.png) 0 130px no-repeat,
url(https://www.iasf.ac.cn/images/contactUs/4.png) bottom right no-repeat;
background: url(https://new.iasf.ac.cn/images/contactUs/3.png) 0 130px no-repeat,
url(https://new.iasf.ac.cn/images/contactUs/4.png) bottom right no-repeat;
background-color: #f7f8fa;
}

4
src/pages/column/page/governance.vue
Unescape View File

@ -34,10 +34,10 @@
</div>
</div>
<div class="c-wrap">
<div class="cards">
<ul>
<li v-for="(item, i) in modules[2].list" :key="i">{{ item.title }}</li>
<div class="cover" @click="toSet(2)">点击配置文本</div>
</ul>
</div>
@ -50,8 +50,6 @@
<img class="pic" :src="modules[2].list[curYear].list[0].pic" alt="">
</div>
</div>
<div class="cover" @click="toSet(2)">点击配置文本</div>
</div>
</div>
<Module ref="module" :data.sync="curData" :visible.sync="diaVisible" @moduleSubmit="moduleSubmit" />

4
src/store/modules/user.js
Unescape View File

@ -8,7 +8,7 @@ import addRoutes from '@/libs/route/addRoutes'
export default {
namespaced: true,
state: {
avatar: 'https://www.iasf.ac.cn/images/avatar.png',
avatar: 'https://new.iasf.ac.cn/images/avatar.png',
userId: '',
userName: '',
crumbs: ''
@ -28,7 +28,7 @@ export default {
}
},
actions: {
logout ({ commit, state, dispatch }) {
logout({ commit, state, dispatch }) {
return new Promise((resolve, reject) => {
util.local.remove(Setting.storeKey)
util.local.remove(Setting.tokenKey)

Write Preview
Loading…
Cancel
Save