diff --git a/public/css/tool.css b/public/css/tool.css
index 58f1fc5..db14df0 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -75,7 +75,7 @@ body #app .hideSidebar .sidebar-container {
width: 65px !important;
}
body #app .openSidebar .sidebar-container {
- width:220px !important;
+ width:180px !important;
}
body #app .sidebar-container .nest-menu .el-sub-menu>.el-sub-menu__title,
body #app .sidebar-container .el-sub-menu .el-menu-item {
@@ -344,7 +344,7 @@ body #app .hideSidebar .main-container {
margin-left: 65px;
}
body #app .main-container {
- margin-left: 220px;
+ margin-left: 180px;
background:#f9fafe;
background-size:100%;
}
@@ -440,6 +440,34 @@ body #app .main-container .navbar .right-menu{
float: inherit;
top: 8px;
right: 16px;
+ display: flex;
+ align-items: center;
+}
+body #app .main-container .navbar .right-menu .el-badge{
+ margin: 0 20px 0 0;
+}
+body #app .main-container .navbar .right-menu .el-badge .el-badge__content.is-fixed{
+ top: 5px;
+ right: 14px;
+ border: 0;
+ padding: 0 4px;
+ min-width: 18px;
+ text-align: center;
+}
+body #app .main-container .navbar .right-menu .el-badge .top-msg{
+ background: rgba(0 64 152 / 6%);
+ color: #004098;
+ font-size: 14px;
+ height: 36px;
+ display: block;
+ padding: 0 12px;
+ line-height: 36px;
+ border-radius: 2px;
+ cursor: pointer;
+}
+body #app .main-container .navbar .right-menu .top-version{
+ margin: 0 10px 0 0;
+ font-size: 14px;
}
body #app .main-container .navbar .right-menu>.el-select{
margin-right: 15px;
@@ -1752,22 +1780,26 @@ body .el-card>.el-card__body .el-tabs--border-card{
body .el-card>.el-card__body .search-btn .el-tabs--border-card{
border: 0;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header{
border-bottom: 1px solid #e6e6e6;
background: transparent;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item{
margin: 0;
border: none;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
border: 0;
background: transparent;
color: #034aac;
font-weight: bold;
position: relative;
}
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active::after{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active::after,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item.is-active::after{
position: absolute;
left: 0;
bottom: 0;
@@ -2080,7 +2112,7 @@ body .etable1.el-table .el-table__expanded-cell tr>td:nth-child(2){
.search .el-form-item>.el-form-item__content>.el-cascader,
.search .el-form-item>.el-form-item__content>.el-date-editor.el-range-editor,
.search .el-form-item>.el-form-item__content>.el-date-editor.el-date-editor{
- width: 250px;
+ width: 230px;
}
.grab .filtrate{
display: none;
@@ -2109,7 +2141,7 @@ body .etable1.el-table .el-table__expanded-cell tr>td:nth-child(2){
.filtrate .el-form-item>.el-form-item__content>.el-cascader,
.filtrate .el-form-item>.el-form-item__content>.el-date-editor.el-range-editor,
.filtrate .el-form-item>.el-form-item__content>.el-date-editor.el-date-editor{
- width: 250px;
+ width: 230px;
}
/*operate 操作区域*/
diff --git a/src/api/message/message.js b/src/api/message/message.js
index e6a0c2b..451ff97 100644
--- a/src/api/message/message.js
+++ b/src/api/message/message.js
@@ -52,3 +52,12 @@ export function allMarkedRead(data) {
data: data
})
}
+
+
+// 获取用户统计
+export function getUserMsgCount(id) {
+ return request({
+ url: '/system/message/user/msg/count/' + id,
+ method: 'get'
+ })
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 99cc36d..6a35b7f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -5,13 +5,22 @@
+
-
+
@@ -274,6 +273,22 @@
type: Boolean,
default: true,
},
+ //是否展示下载
+ isDownload: {
+ type: Boolean,
+ default() {
+ return true
+ },
+ required: false
+ },
+ //是否展示评论
+ isComment: {
+ type: Boolean,
+ default() {
+ return true
+ },
+ required: false
+ },
},
data(){
return{
@@ -368,12 +383,25 @@
},
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 99999,
},
- total: 0
+ currentPage: 1, // 当前页
+ pageSize: 10, // 每页显示数量
}
},
+ computed: {
+ // 分页后的数据
+ paginatedData() {
+ const start = (this.currentPage - 1) * this.pageSize;
+ const end = this.currentPage * this.pageSize;
+ return this.attachmentList.slice(start, end);
+ },
+ // 总数据条数
+ total() {
+ return this.attachmentList.length;
+ },
+ },
created(){
this.getDeptTree();
this.getDocumentTree();
@@ -639,9 +667,9 @@
let self = this
this.$set(this.queryParams,'del',"0")
this.$set(this.queryParams,'businessId',this.form.docId)
- listAttachment({businessId:this.form.docId}).then(res => {
+ listAttachment(this.queryParams).then(res => {
self.attachmentList = res.rows;
- self.total = res.total;
+ // self.total = res.total;
self.loading = false;
});
},
@@ -794,7 +822,16 @@
},1000)
},
handleDelete(row){
- this.attachmentList.splice(row,1)
+ const index = this.attachmentList.findIndex(item => item.fileNewName == row.fileNewName);
+ if (index !== -1) {
+ // 从 attachmentList 中删除数据
+ this.attachmentList.splice(index, 1);
+ // 处理当前页面可能没有数据的情况,跳到上一页
+ if (this.paginatedData.length === 0 && this.currentPage > 1) {
+ this.currentPage--;
+ }
+ }
+ // this.attachmentList.splice(row,1)
},
handleBeforeClose() {
this.viewDialogOpen = false
@@ -824,7 +861,10 @@
rule.required = value;
});
});
- }
+ },
+ handlePageChange(newPage) {
+ this.currentPage = newPage;
+ },
}
}
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index dd00dfb..d43cd76 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -228,6 +228,7 @@
+
@@ -245,7 +246,21 @@
-
+
+
+
+ {{docTitle}}
+
+ 关 闭
+
+
+
+
+
+
+
@@ -288,7 +303,7 @@
-
+
@@ -302,7 +317,8 @@
-
+
+
@@ -316,10 +332,12 @@ import uploadProgress from "./uploadProgress";
import Treeselect from "@riophae/vue-treeselect";
import { exportDocx } from '@/utils/docUtil/docutil.js';
import downloadFileDetail from "./downloadFileDetail.vue";
+import docDetail from "@/views/document/detail";
+import store from "@/store";
export default {
name: "Document",
- components: { editDocument, uploadProgress, Treeselect, downloadFileDetail},
+ components: { editDocument, uploadProgress, Treeselect, downloadFileDetail, docDetail},
dicts:['doc_class','doc_source','doc_upload_status'],
data() {
return {
@@ -447,6 +465,8 @@ export default {
batchExportFlag: false,
//查询
selection: undefined,
+ docDetail: {},
+ detailDocOpen: false,
};
},
created() {
@@ -523,12 +543,12 @@ export default {
})
},
handleDetail(row){
- this.docTitle="详情"
+ this.docTitle="文档详情"
this.docTipAddOrEdit = 'detail'
this.docDetailDisable=false
- this.open = true
+ this.detailDocOpen = true
this.$nextTick(()=>{
- this.$refs.editDocumentRef.editInit(row.docId, "detail");
+ this.$refs.docDetailRef.editInit(row.docId, "detail");
})
},
handlePreview(row){
@@ -550,6 +570,10 @@ export default {
this.open = false;
this.getList();
},
+ docDetailFormSubmit: function() {
+ this.detailDocOpen = false;
+ this.getList();
+ },
/** 删除按钮操作 */
handleDelete(row) {
let self = this
@@ -648,16 +672,30 @@ export default {
},
/** 发布操作 */
handlePush(row) {
+ let self = this
const docIds = row.docId || this.ids;
if(docIds == null || docIds == undefined || docIds =='' || docIds.length < 0){
this.$modal.msgError(`最少选择一条数据`);
return;
}
+ //只能删除已上传数据
+ let delFlag = false;
+ for(let item of self.selection){
+ if(!(item.docStatus == 'ysc')){
+ delFlag = true;
+ }
+ }
+ if(delFlag){
+ this.$modal.msgError(`只能发布文档状态为[已上传]数据,请重新选择`);
+ return
+ }
+
this.$modal.confirm('是否确认发布?').then(function() {
return pushDoc(docIds);
}).then(() => {
- this.getList();
- this.$modal.msgSuccess("发布成功");
+ self.getList();
+ store.commit('SET_UNREAD_MSG_NUMBER', this.$store.state.user.unreadMsgNumber+1);
+ self.$modal.msgSuccess("发布成功");
}).catch((err) => {
console.error(err)
});
@@ -672,6 +710,10 @@ export default {
this.$refs.editDocumentRef.resetForm();
this.open = false
},
+ docDetailCancel(){
+ this.$refs.docDetailRef.resetForm();
+ this.detailDocOpen = false
+ },
previewAuth(row){
if(row.docUrl == null || row.docUrl == '' || row.docUrl == undefined){
return false
diff --git a/src/views/filestatistic/index.vue b/src/views/filestatistic/index.vue
index 6c2cdc4..bfdf9ac 100644
--- a/src/views/filestatistic/index.vue
+++ b/src/views/filestatistic/index.vue
@@ -80,7 +80,7 @@