diff --git a/src/api/index.js b/src/api/index.js
index 475055b..2c27445 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -8,6 +8,7 @@ export default {
upload: `${host}iasf/sysFiles/upload`,
listByPage: `iasf/sysFiles/listByPage`,
delFile: `iasf/sysFiles/delete`,
+ updateFile: `iasf/sysFiles/update`,
dept: `iasf/sys/dept`,
deptTree: `iasf/sys/dept/tree`,
depts: `iasf/sys/dept/tree`,
@@ -20,10 +21,12 @@ export default {
checkJobNumber: `iasf/sys/checkJobNumber`,
checkUsername: `iasf/sys/checkUsername`,
resetPwd: `iasf/sys/resetPwd`,
+ pwd: `iasf/sys/user/pwd`,
exportFailure: `${host}iasf/sys/exportFailure`,
importStaff: `${host}iasf/sys/importStaff`,
roles: `iasf/sys/roles`,
role: `iasf/sys/role`,
+ deleteRole: `iasf/sys/role/deleted`,
perTree: `iasf/sys/permission/tree/all`,
groupAdd: `iasf/sys/userGroup/add`,
groupDel: `iasf/sys/userGroup/delete`,
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index f296b8c..d994553 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -25,7 +25,7 @@
-
忘记密码
+
登录
diff --git a/src/pages/annex/list/index.vue b/src/pages/annex/list/index.vue
index a67db74..f45f8ec 100644
--- a/src/pages/annex/list/index.vue
+++ b/src/pages/annex/list/index.vue
@@ -48,7 +48,12 @@
-
+
+
+ {{ scope.row.quote || '--' }}
+
+
+
@@ -58,11 +63,6 @@
-
-
- {{ scope.row.quote || '--' }}
-
-
{{ scope.row.quote ? '是' : '否' }}
diff --git a/src/pages/article/add/editor.js b/src/pages/article/add/editor.js
index 866f68b..4aae076 100644
--- a/src/pages/article/add/editor.js
+++ b/src/pages/article/add/editor.js
@@ -9,11 +9,18 @@ export default {
table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | indent2em lineheight formatpainter',
height: 650, //编辑器高度
min_height: 400,
- /*content_css: [ //可设置编辑区内容展示的css,谨慎使用
- '/static/reset.css',
- '/static/ax.css',
- '/static/css.css',
- ],*/
+ // content_css: [ //可设置编辑区内容展示的css,谨慎使用
+ // '/static/reset.css',
+ // ],
+ content_style: `.mce-content-body:not([dir=rtl]) blockquote {
+ padding: 8px 15px;
+ border-left: 0;
+ background-color: #ededed;
+ }
+ blockquote p {
+ margin: 0;
+ font-style: italic;
+ }`,
fontsize_formats: '12px 14px 16px 18px 24px 36px 48px 56px 72px',
font_formats: '微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;知乎配置=BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;小米配置=Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif',
link_list: [
diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index fd06451..4ae7180 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -272,7 +272,7 @@ export default {
fileList: [],
editorConfig,
submiting: false, // 新增编辑防抖标识
- updateTime: 0
+ updateTime: 0,
};
},
computed: {
@@ -464,8 +464,22 @@ export default {
form.linkAddress = links.join()
}
if (((form.templateStatus && form.articleTemplate === 2) || !form.templateStatus) && !form.mainBody && isRelease) return util.errorMsg('请输入正文')
- const { columnId } = form
- if (typeof columnId === 'object') form.columnId = columnId[columnId.length - 1]
+ const { columnId, bannerImg, file, titleImg } = form
+ const fileId = []
+ if (typeof columnId === 'object') form.columnId = columnId[columnId.length - 1] // 如果更换了栏目id,值会变成数组,需要手动获取最后一个
+ // 获取几个附件的id,url后面的数字串即是附件id
+ if (bannerImg) fileId.push(bannerImg.substr(bannerImg.lastIndexOf('/') + 1))
+ if (file) fileId.push(file.substr(file.lastIndexOf('/') + 1))
+ if (titleImg) fileId.push(titleImg.substr(titleImg.lastIndexOf('/') + 1))
+ // 更新附件的状态为发布
+ fileId.map(e => {
+ this.$post(this.api.updateFile, {
+ id: e,
+ isRelease,
+ quote: form.title
+ }).then(res => {}).catch(err => {})
+ })
+
form.isRelease = isRelease
this.submiting = true
if (form.id) {
diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue
index 8ea8c40..846da4d 100644
--- a/src/pages/column/add/index.vue
+++ b/src/pages/column/add/index.vue
@@ -320,6 +320,7 @@ export default {
cropperModel: false,
isUpload: false,
file: {}, // 当前被选择的图片文件
+ fileId: ''
};
},
components: {
@@ -550,6 +551,7 @@ export default {
let url = this.form.columnBanner
url && this.$del(this.api.delFile, [url.split('/').pop()]).then(res => {}).catch(e => {})
this.form.columnBanner = res.url
+ this.fileId = res.id
},
// 预览
preview() {
@@ -576,6 +578,14 @@ export default {
if (otherArticle) form.linkAddress += '-' + otherArticle
}
}
+ // 更新附件的状态为发布
+ this.$post(this.api.updateFile, {
+ id: this.fileId,
+ isRelease: 1,
+ quote: this.form.columnName
+ }).then(res => {
+ this.fileId = ''
+ }).catch(err => {})
this.submiting = true
if (this.isEdit) {
delete form.children
diff --git a/src/pages/column/list/index.vue b/src/pages/column/list/index.vue
index 4f28bd9..55128fe 100644
--- a/src/pages/column/list/index.vue
+++ b/src/pages/column/list/index.vue
@@ -395,9 +395,9 @@ export default {
height: auto;
border-bottom: 1px solid #EBEDF0;
}
- .el-tree-node__expand-icon {
- display: none;
- }
+ // .el-tree-node__expand-icon {
+ // display: none;
+ // }
}
.sort-line {
display: flex;
@@ -406,7 +406,6 @@ export default {
padding: 12px 0;
&:first-child {
width: 230px;
- padding-left: 30px;
}
&:nth-child(2) {
position: absolute;
diff --git a/src/pages/role/list/index.vue b/src/pages/role/list/index.vue
index e627406..e993c32 100644
--- a/src/pages/role/list/index.vue
+++ b/src/pages/role/list/index.vue
@@ -130,7 +130,7 @@ export default {
this.$confirm("确定要删除吗?", "提示", {
type: "warning"
}).then(() => {
- this.$del(`${this.api.role}/${row.id}`).then(res => {
+ this.$del(this.api.deleteRole, [row.id]).then(res => {
util.successMsg("删除成功");
this.getData();
}).catch(res => {});
@@ -144,10 +144,7 @@ export default {
this.$confirm("确定要删除吗?", "提示", {
type: "warning"
}).then(() => {
- let ids = this.multipleSelection.map(item => {
- return item.id;
- });
- this.$post(`${this.api.batchRemove}?roleIds=${ids.toString()}`).then(res => {
+ this.$del(this.api.deleteRole, this.multipleSelection.map(e => e.id)).then(res => {
this.$refs.table.clearSelection();
util.successMsg("删除成功");
this.getData();
diff --git a/src/pages/setting/list/index.vue b/src/pages/setting/list/index.vue
index 130b0e8..f7bad43 100644
--- a/src/pages/setting/list/index.vue
+++ b/src/pages/setting/list/index.vue
@@ -21,10 +21,8 @@