Browse Source

右下角装饰线

master
x_ying 2 years ago
parent
commit
0bc0853862
  1. 10
      src/assets/styles/yxk-admin.scss
  2. 1
      src/views/archivesManage/caseManage/index.vue
  3. 1
      src/views/archivesManage/lendManage/index.vue
  4. 1
      src/views/archivesManage/outInStorage/index.vue
  5. 1
      src/views/storeManage/tagManage/index.vue
  6. 20
      src/views/system/log/errorLog.vue
  7. 8
      src/views/system/logManage/doorLog/index.vue
  8. 1
      src/views/system/logManage/index.vue
  9. 11
      src/views/system/logManage/operateLog/index.vue
  10. 25
      src/views/system/notifyManage/data1.json

10
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 {

1
src/views/archivesManage/caseManage/index.vue

@ -3,6 +3,7 @@
<div class="tab-content">
<span class="right-top-line" />
<span class="left-bottom-line" />
<span class="right-bottom-line" />
<ul class="tab-nav">
<li :class="{ 'active-tab-nav': activeIndex == 0 }" @click="changeActiveTab(0)">档案盒列表<i /></li>
<li :class="{ 'active-tab-nav': activeIndex == 1 }" @click="changeActiveTab(1)">档案盒记录<i /></li>

1
src/views/archivesManage/lendManage/index.vue

@ -5,6 +5,7 @@
<div class="tab-content">
<span class="right-top-line" />
<span class="left-bottom-line" />
<span class="right-bottom-line" />
<ul class="tab-nav">
<li :class="{ 'active-tab-nav': activeIndex == 0 }" @click="changeActiveTab(0)">待借档案<i /></li>
<li :class="{ 'active-tab-nav': activeIndex == 1 }" @click="changeActiveTab(1)">借出确认<i /></li>

1
src/views/archivesManage/outInStorage/index.vue

@ -5,6 +5,7 @@
<div class="tab-content">
<span class="right-top-line" />
<span class="left-bottom-line" />
<span class="right-bottom-line" />
<ul class="tab-nav">
<li :class="{ 'active-tab-nav': activeIndex == 0 }" @click="changeActiveTab(0)">入库<i /></li>
<li :class="{ 'active-tab-nav': activeIndex == 1 }" @click="changeActiveTab(1)">出库<i /></li>

1
src/views/storeManage/tagManage/index.vue

@ -4,6 +4,7 @@
<div class="tab-content">
<span class="right-top-line" />
<span class="left-bottom-line" />
<span class="right-bottom-line" />
<ul class="tab-nav">
<li :class="{ 'active-tab-nav': activeIndex == 0 }" @click="changeActiveTab(0)">绑定标签列表<i /></li>
<li :class="{ 'active-tab-nav': activeIndex == 1 }" @click="changeActiveTab(1)">标签使用记录<i /></li>

20
src/views/system/log/errorLog.vue

@ -21,7 +21,7 @@
<span class="left-bottom-line" />
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="expand">
<el-table-column align="center" type="expand">
<template slot-scope="props">
<el-form label-position="left" inline class="demo-table-expand">
<el-form-item label="请求方法">
@ -33,13 +33,17 @@
</el-form>
</template>
</el-table-column>
<el-table-column prop="username" label="用户名" />
<el-table-column prop="requestIp" label="IP" />
<el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
<el-table-column prop="description" label="描述" />
<el-table-column prop="browser" label="浏览器" />
<el-table-column prop="createTime" label="创建日期" />
<el-table-column label="异常详情" width="100px">
<el-table-column align="center" prop="username" label="用户名" />
<el-table-column align="center" prop="requestIp" label="IP" />
<el-table-column align="center" :show-overflow-tooltip="true" prop="address" label="IP来源" />
<el-table-column align="center" prop="description" label="描述" />
<el-table-column align="center" prop="browser" label="浏览器" />
<el-table-column align="center" prop="createTime" label="创建时间">
<template slot-scope="scope">
<div>{{ scope.row.createTime | parseTime }}</div>
</template>
</el-table-column>
<el-table-column align="center" label="异常详情" width="100px">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="info(scope.row.id)">查看详情</el-button>
</template>

8
src/views/system/logManage/doorLog/index.vue

@ -53,9 +53,6 @@
<div>{{ scope.row.createTime | parseTime }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="操作" align="center" min-width="180">
<el-button size="mini" style="background:#3A99FD" @click="handleListen">查看监控</el-button>
</el-table-column>
<el-table-column prop="alarmEvent" label="事件" min-width="150" align="center">
<template slot-scope="scope">
<span v-if="scope.row.alarmEvent===0"></span>
@ -65,8 +62,6 @@
<el-table-column prop="borrowerName" label="用户" align="center" min-width="150" />
</el-table>
<pagination />
<!-- 查看监控 -->
<Listen ref="listenDom" />
</div>
</template>
@ -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({

1
src/views/system/logManage/index.vue

@ -3,6 +3,7 @@
<div class="tab-content">
<span class="right-top-line" />
<span class="left-bottom-line" />
<span class="right-bottom-line" />
<ul class="tab-nav">
<li :class="{ 'active-tab-nav': activeIndex == 0 }" @click="changeActiveTab(0)">登录日志<i /></li>
<li :class="{ 'active-tab-nav': activeIndex == 1 }" @click="changeActiveTab(1)">操作日志<i /></li>

11
src/views/system/logManage/operateLog/index.vue

@ -49,19 +49,19 @@
<el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建日期" align="center" min-width="150">
<el-table-column prop="createTime" label="创建时间" align="center" min-width="150">
<template slot-scope="scope">
<div>{{ scope.row.createTime | parseTime }}</div>
</template>
</el-table-column>
<!-- <el-table-column prop="" label="操作时间" align="center" min-width="180" /> -->
<el-table-column prop="" label="操作" align="center" min-width="100">
<!-- <el-table-column prop="" label="操作" align="center" min-width="100">
<el-button size="mini" style="background:#3A99FD" @click="handleListen">查看监控</el-button>
</el-table-column>
</el-table-column> -->
</el-table>
<pagination />
<!-- 查看监控 -->
<Listen ref="listenDom" />
<!-- <Listen ref="listenDom" /> -->
<!-- 清空 -->
<el-dialog :visible.sync="delVisible" title="确认清空">
<span class="dialog-right-top" />
@ -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({

25
src/views/system/notifyManage/data1.json

@ -1,25 +0,0 @@
{
"rows":[
{
"notification":"内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容",
"msgType":"系统通知",
"pushObj":"全部用户",
"sendRole":"管理员",
"sendTime":""
},
{
"notification":"内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容",
"msgType":"系统通知",
"pushObj":"全部用户",
"sendRole":"管理员",
"sendTime":""
},
{
"notification":"内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容",
"msgType":"系统通知",
"pushObj":"全部用户",
"sendRole":"管理员",
"sendTime":""
}
]
}
Loading…
Cancel
Save