From 0bc0853862ed79fdd456fc51c56ab19fb0ef7aca Mon Sep 17 00:00:00 2001 From: x_ying <2438792676@qq.com> Date: Thu, 25 Aug 2022 14:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B3=E4=B8=8B=E8=A7=92=E8=A3=85=E9=A5=B0?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/yxk-admin.scss | 10 ++++++-- src/views/archivesManage/caseManage/index.vue | 1 + src/views/archivesManage/lendManage/index.vue | 1 + .../archivesManage/outInStorage/index.vue | 1 + src/views/storeManage/tagManage/index.vue | 1 + src/views/system/log/errorLog.vue | 20 +++++++++------ src/views/system/logManage/doorLog/index.vue | 8 +----- src/views/system/logManage/index.vue | 1 + .../system/logManage/operateLog/index.vue | 11 ++++---- src/views/system/notifyManage/data1.json | 25 ------------------- 10 files changed, 31 insertions(+), 48 deletions(-) delete mode 100644 src/views/system/notifyManage/data1.json diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 1dd7e2f..ceb5e53 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -257,7 +257,8 @@ } .right-top-line, -.left-bottom-line{ +.left-bottom-line, +.right-bottom-line{ display: block; position: absolute; width: 17px; @@ -278,7 +279,12 @@ border-right: 1px solid #339CFF; border-top: 1px solid #339CFF; } - +.right-bottom-line{ + right: -1px; + bottom: -1px; + border-right: 1px solid #339CFF; + border-bottom: 1px solid #339CFF; +} .el-tree{ background: transparent !important; .el-tree-node:focus>.el-tree-node__content { diff --git a/src/views/archivesManage/caseManage/index.vue b/src/views/archivesManage/caseManage/index.vue index c11a4bd..1778216 100644 --- a/src/views/archivesManage/caseManage/index.vue +++ b/src/views/archivesManage/caseManage/index.vue @@ -3,6 +3,7 @@
+
  • 档案盒列表
  • 档案盒记录
    • diff --git a/src/views/archivesManage/lendManage/index.vue b/src/views/archivesManage/lendManage/index.vue index 48d8d7d..8047418 100644 --- a/src/views/archivesManage/lendManage/index.vue +++ b/src/views/archivesManage/lendManage/index.vue @@ -5,6 +5,7 @@
    +
    • 待借档案
    • 借出确认
      • diff --git a/src/views/archivesManage/outInStorage/index.vue b/src/views/archivesManage/outInStorage/index.vue index b8939e1..5146cc5 100644 --- a/src/views/archivesManage/outInStorage/index.vue +++ b/src/views/archivesManage/outInStorage/index.vue @@ -5,6 +5,7 @@
      +
      • 入库
      • 出库
        • diff --git a/src/views/storeManage/tagManage/index.vue b/src/views/storeManage/tagManage/index.vue index 9a82786..69bde2e 100644 --- a/src/views/storeManage/tagManage/index.vue +++ b/src/views/storeManage/tagManage/index.vue @@ -4,6 +4,7 @@
        +
        • 绑定标签列表
        • 标签使用记录
          • diff --git a/src/views/system/log/errorLog.vue b/src/views/system/log/errorLog.vue index f0cc834..c6d0077 100644 --- a/src/views/system/log/errorLog.vue +++ b/src/views/system/log/errorLog.vue @@ -21,7 +21,7 @@ - + - - - - - - - + + + + + + + + + diff --git a/src/views/system/logManage/doorLog/index.vue b/src/views/system/logManage/doorLog/index.vue index 834fb21..6d8e7c8 100644 --- a/src/views/system/logManage/doorLog/index.vue +++ b/src/views/system/logManage/doorLog/index.vue @@ -53,9 +53,6 @@
          {{ scope.row.createTime | parseTime }}
           - - 查看监控 - @@ -75,12 +70,11 @@ import rrOperation from '@crud/RR.operation' import CRUD, { presenter, crud } from '@crud/crud' import DateRangePicker from '@/components/DateRangePicker' import pagination from '@crud/Pagination' -import Listen from '../module/listen.vue' import { exportFile } from '@/utils/index' import { mapGetters } from 'vuex' export default { name: 'DoorLog', - components: { rrOperation, DateRangePicker, pagination, Listen }, + components: { rrOperation, DateRangePicker, pagination }, mixins: [presenter(), crud()], cruds() { return CRUD({ diff --git a/src/views/system/logManage/index.vue b/src/views/system/logManage/index.vue index 2e407df..8e55fa5 100644 --- a/src/views/system/logManage/index.vue +++ b/src/views/system/logManage/index.vue @@ -3,6 +3,7 @@
          +
          • 登录日志
          • 操作日志
            • diff --git a/src/views/system/logManage/operateLog/index.vue b/src/views/system/logManage/operateLog/index.vue index 6fb18f2..f37e4c5 100644 --- a/src/views/system/logManage/operateLog/index.vue +++ b/src/views/system/logManage/operateLog/index.vue @@ -49,19 +49,19 @@ {{ scope.row.time }}ms - + - + - + @@ -81,14 +81,13 @@ import CRUD, { presenter, crud } from '@crud/crud' // import DateRangePicker from '@/components/DateRangePicker' import pagination from '@crud/Pagination' -import Listen from '../module/listen.vue' import Search from '@/views/system/log/search.vue' import crudOperation from '@crud/CRUD.operation' import { delAllInfo } from '@/api/monitor/log' export default { name: 'LoginLog', - components: { crudOperation, pagination, Search, Listen }, + components: { crudOperation, pagination, Search }, mixins: [presenter(), crud()], cruds() { return CRUD({ diff --git a/src/views/system/notifyManage/data1.json b/src/views/system/notifyManage/data1.json deleted file mode 100644 index 6a08b07..0000000 --- a/src/views/system/notifyManage/data1.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "rows":[ - { - "notification":"内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容", - "msgType":"系统通知", - "pushObj":"全部用户", - "sendRole":"管理员", - "sendTime":"" - }, - { - "notification":"内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容", - "msgType":"系统通知", - "pushObj":"全部用户", - "sendRole":"管理员", - "sendTime":"" - }, - { - "notification":"内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容", - "msgType":"系统通知", - "pushObj":"全部用户", - "sendRole":"管理员", - "sendTime":"" - } - ] -} \ No newline at end of file