diff --git a/README.md b/README.md
index d97ac9f..adbe3de 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,7 @@
│ │ ├── features # 错误页面
│ │ ├── storeManage # 库房管理
│ │ ├── system # 权限管理
+│ │ │ ├── archiveStatistics # 档案统计
│ │ │ ├── dept # 部门管理
│ │ │ ├── job # 岗位管理
│ │ │ ├── menu # 菜单管理
@@ -49,6 +50,9 @@
│ │ │ ├── log # 日志
│ │ │ │ ├── errLog # 异常日志
│ │ │ │ ├── index # 操作日志
+│ │ │ ├── logManage # 日志管理
+│ │ │ ├── messageCenter # 消息中心
+│ │ │ ├── notifyManage # 通知管理
│ │ ├── home # 首页
│ │ ├── login # 登录
│ ├── App.vue # 入口页面
diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss
index 2d82af5..7e1468a 100644
--- a/src/assets/styles/archives-manage.scss
+++ b/src/assets/styles/archives-manage.scss
@@ -542,10 +542,8 @@ $arcCyan: #0FBED9;
::v-deep .el-table{
overflow-x: hidden;
overflow-y: auto;
- // background: #02255F;
border: 2px solid #02255f;
border-top: none;
- // border-right: none;
.el-table__body-wrapper{
background-color: #031435;
}
@@ -569,4 +567,14 @@ $arcCyan: #0FBED9;
opacity: 0;
height: 34px;
}
+}
+
+// 元数据
+::v-deep .hljs{
+ font-family: "Sans Mono", "Consolas", "Courier", monospace;
+ font-size: 12px;
+ .hljs-attribute{
+ display: inline-block;
+ margin: 2px 0 !important;
+ }
}
\ No newline at end of file
diff --git a/src/views/archivesManage/archivesCheck/index.vue b/src/views/archivesManage/archivesCheck/index.vue
index bfc24d6..0ac40a3 100644
--- a/src/views/archivesManage/archivesCheck/index.vue
+++ b/src/views/archivesManage/archivesCheck/index.vue
@@ -55,7 +55,7 @@
@row-click="clickRowHandler"
@row-dblclick="handleDbClick"
>
-
+
diff --git a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
index 79a54b6..8e26d66 100644
--- a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
@@ -251,12 +251,4 @@ export default {
top: 12px;
right: -320px;
}
-::v-deep .hljs{
- font-family: "Sans Mono", "Consolas", "Courier", monospace;
- font-size: 12px;
- .hljs-attribute{
- display: inline-block;
- margin: 2px 0 !important;
- }
-}
diff --git a/src/views/archivesManage/archivesSearch/index.vue b/src/views/archivesManage/archivesSearch/index.vue
index 58bce5d..6b6c921 100644
--- a/src/views/archivesManage/archivesSearch/index.vue
+++ b/src/views/archivesManage/archivesSearch/index.vue
@@ -31,8 +31,8 @@
@row-dblclick="handleDbClick"
>
-
-
+
+
@@ -41,11 +41,11 @@
案卷级
-
+
-
+
diff --git a/src/views/archivesManage/archivesSearch/module/detailDialog.vue b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
index 401d58f..8409a2e 100644
--- a/src/views/archivesManage/archivesSearch/module/detailDialog.vue
+++ b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
@@ -61,7 +61,6 @@
借阅状态:
{{ rowData.borrow_type | borrowStatus }}
-
条形码:{{ rowData.barcode }}
@@ -96,6 +95,8 @@ export default {
return '已归还'
case 5:
return '逾期'
+ case null:
+ return '-'
case -1:
return '异常'
}
diff --git a/src/views/archivesManage/lendManage/components/lendArchivesList.vue b/src/views/archivesManage/lendManage/components/lendArchivesList.vue
index fa97045..ffbcfe6 100644
--- a/src/views/archivesManage/lendManage/components/lendArchivesList.vue
+++ b/src/views/archivesManage/lendManage/components/lendArchivesList.vue
@@ -13,7 +13,7 @@
@selection-change="selectionChangeHandler"
@row-click="clickRowHandler"
>
-
+
@@ -136,7 +136,6 @@ export default {
},
selectionChangeHandler(val) {
this.selections = val
- console.log(this.selections)
},
clickRowHandler(row) {
this.$refs.table.toggleRowSelection(row)
diff --git a/src/views/archivesManage/lendManage/lendConfirm/index.vue b/src/views/archivesManage/lendManage/lendConfirm/index.vue
index b3c1a0c..d3e212d 100644
--- a/src/views/archivesManage/lendManage/lendConfirm/index.vue
+++ b/src/views/archivesManage/lendManage/lendConfirm/index.vue
@@ -19,7 +19,7 @@
@row-dblclick="handleDbClick"
@select="handleCurrentChange"
>
-
+
diff --git a/src/views/archivesManage/lendManage/lendQuery/index.vue b/src/views/archivesManage/lendManage/lendQuery/index.vue
index db8a9ea..e1bc602 100644
--- a/src/views/archivesManage/lendManage/lendQuery/index.vue
+++ b/src/views/archivesManage/lendManage/lendQuery/index.vue
@@ -43,7 +43,7 @@
@row-click="clickRowHandler"
@row-dblclick="handleDbClick"
>
-
+
diff --git a/src/views/archivesManage/lendManage/returnArchives/index.vue b/src/views/archivesManage/lendManage/returnArchives/index.vue
index 02f9908..1a11a42 100644
--- a/src/views/archivesManage/lendManage/returnArchives/index.vue
+++ b/src/views/archivesManage/lendManage/returnArchives/index.vue
@@ -30,7 +30,7 @@
@row-click="clickRowHandler"
@row-dblclick="handleDbClick"
>
-
+
diff --git a/src/views/archivesManage/lendManage/toLend/index.vue b/src/views/archivesManage/lendManage/toLend/index.vue
index 8431a33..008564f 100644
--- a/src/views/archivesManage/lendManage/toLend/index.vue
+++ b/src/views/archivesManage/lendManage/toLend/index.vue
@@ -15,7 +15,7 @@
@row-click="clickRowHandler"
@row-dblclick="handleLendDbClick"
>
-
+
diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index 19d061e..4df8127 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -40,7 +40,7 @@
@row-dblclick="handleDbClick"
@selection-change="selectionChangeHandler"
>
-
+
diff --git a/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
index 4001a1c..9fe5c8f 100644
--- a/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
@@ -8,7 +8,7 @@
该案卷存在多个档案盒,请确认全部入库!
-
+
diff --git a/src/views/archivesManage/outInStorage/outInHistory/index.vue b/src/views/archivesManage/outInStorage/outInHistory/index.vue
index 22a6946..cab62d6 100644
--- a/src/views/archivesManage/outInStorage/outInHistory/index.vue
+++ b/src/views/archivesManage/outInStorage/outInHistory/index.vue
@@ -39,7 +39,7 @@
@row-dblclick="handleDbClick"
@selection-change="selectionChangeHandler"
>
-
+
diff --git a/src/views/archivesManage/outInStorage/outStorage/index.vue b/src/views/archivesManage/outInStorage/outStorage/index.vue
index 55df66f..d983638 100644
--- a/src/views/archivesManage/outInStorage/outStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/outStorage/index.vue
@@ -16,7 +16,7 @@
-
+
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index f00a113..7cbbd88 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -74,7 +74,7 @@
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
-
+
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 13a9d48..6fb34ac 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -11,7 +11,7 @@
-
+
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index afd5ebd..87c48fd 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -109,7 +109,7 @@
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
-
+
diff --git a/src/views/system/notifyManage/index.vue b/src/views/system/notifyManage/index.vue
index 630a7d0..f6c80cb 100644
--- a/src/views/system/notifyManage/index.vue
+++ b/src/views/system/notifyManage/index.vue
@@ -316,9 +316,9 @@ export default {
if (this.pushObj === '用户') {
params.pushType = 1
if (this.selectOptions.length === this.sendObjOptions.length) {
- params.users = this.selectOptions.filter(item => item !== 0)
+ params.userId = this.selectOptions.filter(item => item !== 0)
} else {
- params.users = this.selectOptions
+ params.userId = this.selectOptions
}
}
// params.users = params.users.map(item => {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 90237e7..f83e7d7 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -62,7 +62,7 @@
角色列表
-
+
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 27aaf68..d8447c0 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -83,7 +83,7 @@
-
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ab442c2..f086711 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -155,7 +155,7 @@
-
+