Browse Source

查漏补缺 借阅新增-异常 首页搜索公用组件 系统管理

master
xuhuajiao 3 years ago
parent
commit
a4c7d9acc8
  1. 9
      src/api/archivesManage/lendManage.js
  2. 17
      src/assets/icons/svg/exception.svg
  3. 8
      src/layout/components/Navbar.vue
  4. 1
      src/views/archivesManage/archivesList/module/archivesInfo/index.vue
  5. 5
      src/views/archivesManage/archivesList/module/packing/index.vue
  6. 163
      src/views/archivesManage/archivesSearch/index.vue
  7. 154
      src/views/archivesManage/lendManage/components/lendArchivesList.vue
  8. 1
      src/views/archivesManage/lendManage/lendConfirm/index.vue
  9. 3
      src/views/archivesManage/lendManage/lendQuery/index.vue
  10. 4
      src/views/archivesManage/lendManage/mixins/lending.js
  11. 137
      src/views/home.vue
  12. 7
      src/views/system/logManage/doorLog/index.vue
  13. 16
      src/views/system/notifyManage/index.vue

9
src/api/archivesManage/lendManage.js

@ -135,6 +135,15 @@ export function FetchReadyReturnShowTid(parameter) {
}) })
} }
// 借阅档案异常处理
export function FetchBorrowException(parameter) {
return request({
url: 'api/borrow/borrowException',
method: 'post',
data: parameter
})
}
// 借出确认 // 借出确认
export function FetchBillBorrowConfirm(parameter) { export function FetchBillBorrowConfirm(parameter) {
return request({ return request({

17
src/assets/icons/svg/exception.svg

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 1024 931.5" style="enable-background:new 0 0 1024 931.5;" xml:space="preserve">
<style type="text/css">
</style>
<path id="路径_1382" class="st0" d="M509.1,657.6c-28.9,0-52.4,23.4-52.4,52.4c0,28.9,23.4,52.4,52.4,52.4
c28.9,0,52.4-23.4,52.4-52.4l0,0c0.1-28.8-23.1-52.3-52-52.4C509.4,657.6,509.2,657.6,509.1,657.6z"/>
<path id="路径_1383" class="st0" d="M997.8,843.9c34.9-55.1,34.9-125.3,0-180.4L672,93.3C624.6,6.5,515.7-25.4,429,22.1
c-30,16.4-54.7,41.1-71.2,71.2L26.2,663.5c-34.9,55.1-34.9,125.3,0,180.4c32.7,55.4,92.8,88.7,157.1,87.3h657.5
C905.7,935.1,967,901.1,997.8,843.9z M922.2,803.2c-18.5,30.9-51.3,50.6-87.3,52.4H177.4c-35.1,0.5-68.1-17.1-87.3-46.5
c-17.5-30.7-17.5-68.3,0-98.9l331.6-570.3c18.5-30.9,51.3-50.6,87.3-52.4c36.7-0.7,70.6,19.7,87.3,52.4l325.8,570.3
c23.3,26.6,23.3,66.3,0.1,92.9L922.2,803.2z"/>
<path id="路径_1384" class="st0" d="M497.9,292.8c-31,9.2-41,44-39.8,74.4c1.8,43.8,12.1,175.3,13.8,197.4
c2,26,6.9,57.9,44.1,57.9c18.3,0,36.3-8.8,40.2-48.9c1.9-19.3,9.6-142.6,11-196.2c0.7-25.3,0-60.2-21.7-77.5
C532.1,289.3,514.1,288,497.9,292.8z"/>
</svg>

8
src/layout/components/Navbar.vue

@ -26,7 +26,7 @@
</div> --> </div> -->
<!-- 消息中心 --> <!-- 消息中心 -->
<el-dropdown class="message-center right-menu-item hover-effect" trigger="click">
<el-dropdown ref="messageDrop" class="message-center right-menu-item hover-effect" trigger="click">
<div class="message-icon"> <div class="message-icon">
<span class="iconfont icon-xiaoxi" /> <span class="iconfont icon-xiaoxi" />
<i class="message-num">6</i> <i class="message-num">6</i>
@ -35,7 +35,7 @@
<div style="display: flex; justify-content: flex-end; padding: 0 20px; height: 40px; line-height: 40px; color: #339CFF; font-size: 14px; border-bottom: 1px solid #339CFF;"> <div style="display: flex; justify-content: flex-end; padding: 0 20px; height: 40px; line-height: 40px; color: #339CFF; font-size: 14px; border-bottom: 1px solid #339CFF;">
<span style="cursor: pointer;">全部标记为已读</span> <span style="cursor: pointer;">全部标记为已读</span>
<!-- 消息中心router --> <!-- 消息中心router -->
<router-link to="/system/messageCenter" style="color:#fff; margin-left: 10px;">去查看</router-link>
<span style="color:#fff; margin-left: 10px; cursor: pointer;" @click="toAllMessage()">去查看</span>
</div> </div>
<div style="max-height: 450px; overflow: hidden; overflow-y: scroll;"> <div style="max-height: 450px; overflow: hidden; overflow-y: scroll;">
<el-dropdown-item v-for="(item,index) in 12" :key="index" class="message-list-item"> <el-dropdown-item v-for="(item,index) in 12" :key="index" class="message-list-item">
@ -150,6 +150,10 @@ export default {
toggleSideBar() { toggleSideBar() {
this.$store.dispatch('app/toggleSideBar') this.$store.dispatch('app/toggleSideBar')
}, },
toAllMessage() {
this.$router.push('/system/messageCenter')
this.$refs.messageDrop.hide()
},
// open() { // open() {
// this.$confirm('退', '', { // this.$confirm('退', '', {
// confirmButtonText: '', // confirmButtonText: '',

1
src/views/archivesManage/archivesList/module/archivesInfo/index.vue

@ -243,5 +243,6 @@ export default {
@import "~@/assets/styles/archives-manage.scss"; @import "~@/assets/styles/archives-manage.scss";
.base-info .base-info-item span.el-tag{ .base-info .base-info-item span.el-tag{
width: auto; width: auto;
color: #fff;
} }
</style> </style>

5
src/views/archivesManage/archivesList/module/packing/index.vue

@ -279,7 +279,10 @@ export default {
this.$message.error('请选择要装盒的档案!') this.$message.error('请选择要装盒的档案!')
return return
} }
this.selectTableData.push(row)
//
if (this.selectTableData.findIndex(val => val.id === row.id) === -1) {
this.selectTableData.push(row)
}
this.tableData.splice(index, 1) this.tableData.splice(index, 1)
this.selections.forEach(item => { this.selections.forEach(item => {
item.caseId = row.id item.caseId = row.id

163
src/views/archivesManage/archivesSearch/index.vue

@ -1,69 +1,65 @@
<template> <template>
<div>
<div>
<div class="head-container">
<h2>模糊检索</h2>
<div>
<div class="search-input">
<el-input v-model="keywords" placeholder="请输入内容" class="input-with-select" style="width:50%;" @keyup.enter.native="dimSearch">
<el-select slot="prepend" v-model="select" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-button slot="append" icon="el-icon-search" @click="dimSearch" />
</el-input>
</div>
</div>
<div class="search-main">
<div class="head-container">
<h2 v-if="this.$route.path.indexOf('dashboard') === -1">模糊检索</h2>
<div class="search-input">
<el-input v-model="keywords" placeholder="请输入内容" class="input-with-select" style="width:50%;" @keyup.enter.native="dimSearch">
<el-select slot="prepend" v-model="select" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-button slot="append" icon="el-icon-search" @click="handleSearch" />
</el-input>
</div> </div>
<div class="search-result">
<div v-show="isShow" class="search-title">
<p>检索结果</p>
<p>本次检索结果共计{{ resNum }}条数据</p>
</div>
<div v-show="resNum > 0">
<el-table
ref="table"
v-loading="loading"
:data="tableData"
style="width: 100%;"
height="calc(100vh - 493px)"
@row-dblclick="handleDbClick"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column type="index" label="序号" width="90" align="center" />
<el-table-column prop="child" label="子条数目" align="center" min-width="150" />
<el-table-column prop="category_type" label="门类级别" align="center" min-width="100">
<template slot-scope="scope">
<!-- 门类级别 -->
<span v-if="scope.row.category_type === 5" style="width:56px">文件级</span>
<span v-if="scope.row.category_type === 4" style="width:56px">卷内级</span>
<span v-if="scope.row.category_type === 3" style="width:56px">案卷级</span>
</template>
</el-table-column>
<el-table-column prop="case_name" label="门类名称" align="center" min-width="150" />
<el-table-column prop="fonds_no" label="全宗号" align="center" min-width="180" />
<el-table-column prop="archive_no" label="档号" align="center" min-width="180" />
<el-table-column prop="archive_year" label="归档年度" align="center" min-width="100" />
<el-table-column prop="maintitle" label="题名" align="center" min-width="180" />
<el-table-column prop="security_class" label="保密程度" align="center" min-width="100" />
<el-table-column prop="department" label="部门" align="center" min-width="100" />
<el-table-column prop="case_name" label="盒名称" align="center" min-width="180" />
<el-table-column prop="folder_location_details" label="所在位置" align="center" min-width="180" />
<el-table-column prop="create_time" label="创建时间" align="center" min-width="180">
<template slot-scope="scope">
<div>{{ scope.row.create_time | parseTime }}</div>
</template>
</el-table-column>
</el-table>
<el-pagination :page-size.sync="page.size" :total="page.total" :current-page.sync="page.page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChangeHandler($event)" @current-change="pageChangeHandler" />
</div>
<!-- 详情 -->
<detailDialog ref="detailDom" />
</div>
<div v-if="this.$route.path.indexOf('dashboard') === -1" class="search-result">
<div v-show="isShow" class="search-title">
<p>检索结果</p>
<p>本次检索结果共计{{ resNum }}条数据</p>
</div>
<div v-show="resNum > 0">
<el-table
ref="table"
v-loading="loading"
:data="tableData"
style="width: 100%;"
height="calc(100vh - 493px)"
@row-dblclick="handleDbClick"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column type="index" label="序号" width="90" align="center" />
<el-table-column prop="child" label="子条数目" align="center" min-width="150" />
<el-table-column prop="category_type" label="门类级别" align="center" min-width="100">
<template slot-scope="scope">
<!-- 门类级别 -->
<span v-if="scope.row.category_type === 5" style="width:56px">文件级</span>
<span v-if="scope.row.category_type === 4" style="width:56px">卷内级</span>
<span v-if="scope.row.category_type === 3" style="width:56px">案卷级</span>
</template>
</el-table-column>
<el-table-column prop="case_name" label="门类名称" align="center" min-width="150" />
<el-table-column prop="fonds_no" label="全宗号" align="center" min-width="180" />
<el-table-column prop="archive_no" label="档号" align="center" min-width="180" />
<el-table-column prop="archive_year" label="归档年度" align="center" min-width="100" />
<el-table-column prop="maintitle" label="题名" align="center" min-width="180" />
<el-table-column prop="security_class" label="保密程度" align="center" min-width="100" />
<el-table-column prop="department" label="部门" align="center" min-width="100" />
<el-table-column prop="case_name" label="盒名称" align="center" min-width="180" />
<el-table-column prop="folder_location_details" label="所在位置" align="center" min-width="180" />
<el-table-column prop="create_time" label="创建时间" align="center" min-width="180">
<template slot-scope="scope">
<div>{{ scope.row.create_time | parseTime }}</div>
</template>
</el-table-column>
</el-table>
<el-pagination :page-size.sync="page.size" :total="page.total" :current-page.sync="page.page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChangeHandler($event)" @current-change="pageChangeHandler" />
</div> </div>
<!-- 详情 -->
<detailDialog ref="detailDom" />
</div> </div>
</div> </div>
</template> </template>
@ -102,7 +98,16 @@ export default {
query: null, query: null,
page: null, page: null,
size: null size: null
}
},
homeSearchWords: '',
homeSearchSelect: ''
}
},
mounted() {
if (localStorage.getItem('homeSearchWords') !== null) {
this.keywords = localStorage.getItem('homeSearchWords')
this.select = localStorage.getItem('homeSearchSelect')
this.dimSearch()
} }
}, },
methods: { methods: {
@ -111,12 +116,9 @@ export default {
const params = { const params = {
'categoryId': row.category_id, 'categoryId': row.category_id,
'archivesId': row.archives_id 'archivesId': row.archives_id
// 'categoryId': '5EB3DE8FF78BBC64729E43',
// 'archivesId': 'D63A2DFA58C02E09CB196C'
} }
FetchArchivesDetails(params).then(res => { FetchArchivesDetails(params).then(res => {
if (res) { if (res) {
// console.log(res, 'res')
const rowData = {} const rowData = {}
res.forEach(item => { res.forEach(item => {
rowData[item.fieldName] = item.context rowData[item.fieldName] = item.context
@ -130,6 +132,16 @@ export default {
} }
}) })
}, },
// /
handleSearch() {
if (this.$route.path.indexOf('dashboard') !== -1) {
this.$router.push('/archivesManage/archivesSearch')
localStorage.setItem('homeSearchWords', this.keywords)
localStorage.setItem('homeSearchSelect', this.select)
} else {
this.dimSearch()
}
},
// //
dimSearch() { dimSearch() {
this.loading = true this.loading = true
@ -141,6 +153,8 @@ export default {
this.page.total = 0 this.page.total = 0
this.page.size = 10 this.page.size = 10
this.page.page = 1 this.page.page = 1
localStorage.removeItem('homeSearchWords')
localStorage.removeItem('homeSearchSelect')
} else { } else {
this.params.criteria = this.select this.params.criteria = this.select
this.params.query = this.keywords.replace(/\s+/ig, ' ') this.params.query = this.keywords.replace(/\s+/ig, ' ')
@ -153,11 +167,12 @@ export default {
// //
doQuery(params) { doQuery(params) {
queryVagueArchives(params).then(res => { queryVagueArchives(params).then(res => {
// console.log(res, 'res')
this.tableData = res.content this.tableData = res.content
this.page.total = res.totalElements this.page.total = res.totalElements
this.resNum = res.totalElements this.resNum = res.totalElements
this.isShow = true this.isShow = true
localStorage.removeItem('homeSearchWords')
localStorage.removeItem('homeSearchSelect')
}) })
}, },
// //
@ -183,9 +198,9 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// @import "~@/assets/styles/archives-manage.scss";
// @import "~@/assets/styles/lend-manage.scss";
.search-main{
width: 100%;
}
.head-container{ .head-container{
padding: 100px 0 30px 0; padding: 100px 0 30px 0;
text-align: center; text-align: center;
@ -202,7 +217,6 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
& .search-input { & .search-input {
// width: 796px;
& .el-select .el-input { & .el-select .el-input {
width: 130px; width: 130px;
} }
@ -224,11 +238,8 @@ export default {
width: 125px; width: 125px;
background-color: #339cff; background-color: #339cff;
border: 1px solid #339cff; border: 1px solid #339cff;
border-radius: 34px;
border-radius: 34px 0 0 34px;
border-right: 0; border-right: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
} }
::v-deep .el-input__inner { ::v-deep .el-input__inner {
color: #fff; color: #fff;

154
src/views/archivesManage/lendManage/components/lendArchivesList.vue

@ -1,53 +1,71 @@
<template> <template>
<div class="container-wrap">
<span class="right-top-line" />
<span class="left-bottom-line" />
<!--表格渲染-->
<el-table
ref="table"
v-loading="tableLoading"
:data="tableData"
style="min-width: 100%"
>
<el-table-column type="index" label="序号" align="center" width="55" />
<el-table-column prop="categoryName" align="center" label="门类名称" min-width="85" />
<el-table-column prop="archiveNo" align="center" label="档号" min-width="85" />
<el-table-column prop="maintitle" align="center" label="题名" min-width="60" />
<el-table-column prop="caseName" align="center" label="盒名称" min-width="85" />
<el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="100">
<template slot-scope="scope">
<div v-if="scope.row.folderLocationDetails.includes(',')">
<el-tag
v-for="(item,index) in scope.row.folderLocationDetails.split(',')"
:key="index"
:type="item"
effect="dark"
>
{{ item }}
</el-tag>
</div>
<div v-else>
<el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
</div>
</template>
</el-table-column>
<el-table-column prop="borrowType" align="center" label="借阅状态" min-width="70">
<template slot-scope="scope">
<!-- 待借阅 -->
<span class="cell-lend no-lend" style="width:76px">{{ scope.row.borrowType | borrowStatus }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" align="center" label="操作时间" min-width="120">
<template slot-scope="scope">
<div>{{ scope.row.createTime | parseTime }}</div>
</template>
</el-table-column>
</el-table>
<div class="lendComfirm-arcList">
<el-button class="exception-btn" size="mini" :disabled="!selections.length" @click="handleBorrowException"><svg-icon icon-class="exception" class-name="lend-handle" />异常处理</el-button>
<div class="container-wrap">
<span class="right-top-line" />
<span class="left-bottom-line" />
<!--表格渲染-->
<el-table
ref="table"
v-loading="tableLoading"
:data="tableData"
style="min-width: 100%"
@selection-change="selectionChangeHandler"
@row-click="clickRowHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" align="center" width="55" />
<el-table-column prop="categoryName" align="center" label="门类名称" min-width="85" />
<el-table-column prop="archiveNo" align="center" label="档号" min-width="85" />
<el-table-column prop="maintitle" align="center" label="题名" min-width="60" />
<el-table-column prop="caseName" align="center" label="盒名称" min-width="85" />
<el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="130">
<template slot-scope="scope">
<div v-if="scope.row.folderLocationDetails.includes(',')">
<el-tag
v-for="(item,index) in scope.row.folderLocationDetails.split(',')"
:key="index"
:type="item"
effect="dark"
>
{{ item }}
</el-tag>
</div>
<div v-else>
<el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
</div>
</template>
</el-table-column>
<el-table-column prop="borrowType" align="center" label="借阅状态" min-width="70">
<template slot-scope="scope">
<!-- 待借阅 -->
<span class="cell-lend no-lend" style="width:76px">{{ scope.row.borrowType | borrowStatus }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" align="center" label="操作时间" min-width="120">
<template slot-scope="scope">
<div>{{ scope.row.createTime | parseTime }}</div>
</template>
</el-table-column>
</el-table>
</div>
<el-dialog title="异常处理" :visible.sync="exceptionVisible" :close-on-click-modal="false" :before-close="handleClose">
<span class="dialog-right-top" />
<span class="dialog-left-bottom" />
<div class="setting-dialog">
<div class="dialog-delt">
<p><span>确定当前档案存在异常情况</span></p>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click.native="handleExceptionConfirm">确定</el-button>
</div>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { FetchInitArchivesByOrderNo } from '@/api/archivesManage/lendManage'
import { FetchInitArchivesByOrderNo, FetchBorrowException } from '@/api/archivesManage/lendManage'
import { lendingCrud } from '../mixins/lending' import { lendingCrud } from '../mixins/lending'
export default { export default {
name: 'LendArchivesList', name: 'LendArchivesList',
@ -62,8 +80,10 @@ export default {
}, },
data() { data() {
return { return {
selections: [],
tableData: [], tableData: [],
tableLoading: false
tableLoading: false,
exceptionVisible: false
} }
}, },
watch: { watch: {
@ -79,6 +99,23 @@ export default {
this.getArchivesTable() this.getArchivesTable()
}, },
methods: { methods: {
//
handleBorrowException() {
this.exceptionVisible = true
},
//
handleExceptionConfirm() {
this.tableLoading = true
const params = this.selections.map(item => item.archivesId)
FetchBorrowException(params).then(data => {
if (data === this.selections.length) {
this.$message.success('已成功加入异常!')
this.exceptionVisible = false
this.tableLoading = false
}
})
},
// list
getArchivesTable() { getArchivesTable() {
this.tableLoading = true this.tableLoading = true
const params = { const params = {
@ -90,6 +127,17 @@ export default {
this.tableLoading = false this.tableLoading = false
} }
}) })
},
selectionChangeHandler(val) {
this.selections = val
console.log(this.selections)
},
clickRowHandler(row) {
this.$refs.table.toggleRowSelection(row)
},
handleClose(done) {
this.exceptionVisible = false
done()
} }
} }
} }
@ -97,8 +145,16 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/styles/lend-manage.scss'; @import '~@/assets/styles/lend-manage.scss';
.container-wrap{
min-height: auto;
margin-top: 20px;
.lendComfirm-arcList{
.exception-btn{
margin: 20px 0;
.lend-handle{
margin-right: 6px;
}
}
.container-wrap{
min-height: auto;
}
} }
</style> </style>

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

@ -7,7 +7,6 @@
<el-button size="mini" icon="el-icon-download" :disabled="!selections.length" :loading="crud.downloadLoading" @click="downloadApi">导出</el-button> <el-button size="mini" icon="el-icon-download" :disabled="!selections.length" :loading="crud.downloadLoading" @click="downloadApi">导出</el-button>
</div> </div>
<!--表格渲染--> <!--表格渲染-->
<!-- height="calc(100vh - 355px)" -->
<el-table <el-table
ref="table" ref="table"
v-loading="crud.loading" v-loading="crud.loading"

3
src/views/archivesManage/lendManage/lendQuery/index.vue

@ -131,7 +131,8 @@ export default {
{ value: '2', label: '待借阅' }, { value: '2', label: '待借阅' },
{ value: '3', label: '待归还' }, { value: '3', label: '待归还' },
{ value: '5', label: '逾期' }, { value: '5', label: '逾期' },
{ value: '4', label: '已归还' }
{ value: '4', label: '已归还' },
{ value: '-1', label: '异常' }
], ],
borrowType: '全部', borrowType: '全部',
queryOption: [ queryOption: [

4
src/views/archivesManage/lendManage/mixins/lending.js

@ -18,6 +18,8 @@ export const lendingCrud = {
return '已归还' return '已归还'
case 5: case 5:
return '逾期' return '逾期'
case -1:
return '异常'
} }
}, },
tidType(val) { tidType(val) {
@ -72,6 +74,8 @@ export const lendingCrud = {
switch (val) { switch (val) {
case '逾期': case '逾期':
return 'cell-lend have-lend' return 'cell-lend have-lend'
case '异常':
return 'cell-lend have-lend'
case '已归还': case '已归还':
return 'cell-lend has-return' return 'cell-lend has-return'
default: default:

137
src/views/home.vue

@ -11,17 +11,7 @@
<div class="container-left search-area"> <div class="container-left search-area">
<span class="right-top-line" /> <span class="right-top-line" />
<span class="left-bottom-line" /> <span class="left-bottom-line" />
<div class="search-input">
<!-- v-model="input3" v-model="select"-->
<el-input placeholder="2022,办公室" class="input-with-select">
<el-select slot="prepend" v-model="selectValue">
<el-option label="全目录" value="1" />
<el-option label="订单号" value="2" />
<el-option label="用户电话" value="3" />
</el-select>
<el-button slot="append" icon="el-icon-search" />
</el-input>
</div>
<SearchAcrives />
</div> </div>
</el-col> </el-col>
<el-col :xs="24" :sm="24" :lg="8"> <el-col :xs="24" :sm="24" :lg="8">
@ -182,6 +172,7 @@ import typePie from '@/views/components/echarts/typePie.vue'
import data1 from './data1.json' import data1 from './data1.json'
import WarehouseWarning from '@/views/components/WarehouseWarning' import WarehouseWarning from '@/views/components/WarehouseWarning'
import SecurityDoor from '@/views/components/SecurityDoor' import SecurityDoor from '@/views/components/SecurityDoor'
import SearchAcrives from '@/views/archivesManage/archivesSearch/index'
// const lineChartData = { // const lineChartData = {
// newVisitis: { // newVisitis: {
@ -211,14 +202,13 @@ export default {
PanelGroup, PanelGroup,
// LineChart, // LineChart,
// RadarChart, // RadarChart,
// PieChart
// ,
// PieChart,
// BarChart // BarChart
lendAcross, catePie, typePie
lendAcross, catePie, typePie,
SearchAcrives
}, },
data() { data() {
return { return {
selectValue: '1',
lendData: [18203, 23489, 29034, 104970], lendData: [18203, 23489, 29034, 104970],
cateData: [1000, 700], cateData: [1000, 700],
typeData: [1110, 2000, 800, 600, 900] typeData: [1110, 2000, 800, 600, 900]
@ -253,18 +243,8 @@ export default {
background-color: #031435; background-color: #031435;
position: relative; position: relative;
// .github-corner {
// position: absolute;
// top: 0;
// border: 0;
// right: 0;
// }
.chart-wrapper { .chart-wrapper {
height: calc(100% - 40px); height: calc(100% - 40px);
// background: #fff;
// padding: 16px 16px 0;
// margin-bottom: 32px;
} }
} }
@media (max-width: 1024px) { @media (max-width: 1024px) {
@ -272,15 +252,6 @@ export default {
padding: 8px; padding: 8px;
} }
} }
// .title-arrow {
// width: 100%;
// &:before{
// left: calc(50% - 100px)
// }
// &:after{
// right: calc(50% - 100px)
// }
// }
.warehouse-tab { .warehouse-tab {
color: #fff; color: #fff;
.warehouse-nav { .warehouse-nav {
@ -288,44 +259,29 @@ export default {
justify-content: space-around; justify-content: space-around;
position: absolute; position: absolute;
bottom: 15px; bottom: 15px;
// left: 20px;
z-index: 11; z-index: 11;
// width: calc(100vw - 545px);
width: 100%; width: 100%;
// height: 90px;
// min-height: 90px;
padding: 0; padding: 0;
li { li {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
flex-wrap: nowrap; flex-wrap: nowrap;
// align-items: center;
align-content: center; align-content: center;
justify-content: center; justify-content: center;
// width: 25%;
height: 90px; height: 90px;
// line-height: 90px;
text-align: right; text-align: right;
// padding-right: 20px;
// margin-right: 20px;
font-size: 14px; font-size: 14px;
position: relative; position: relative;
&:hover { &:hover {
cursor: pointer; cursor: pointer;
} }
// background: url('~@/assets/images/warehouse_tab_bg.png') no-repeat;
// background-size: 100% 100%;
span { span {
width: 72px; width: 72px;
height: 52px; height: 52px;
margin-bottom: 7px; margin-bottom: 7px;
// position: absolute;
// left: 60px;
// top: 20px;
} }
p { p {
// flex: 1;
text-align: left; text-align: left;
} }
&:first-child span { &:first-child span {
@ -341,68 +297,6 @@ export default {
background: url("~@/assets/images/tab_read_logo.png") no-repeat; background: url("~@/assets/images/tab_read_logo.png") no-repeat;
} }
} }
// .active-nav{
// color: #fff;
// background: url('~@/assets/images/warehouse_tab_active.png') no-repeat;
// background-size: 100% 100%;
// }
}
}
.search-area {
height: 100%;
margin: 0;
display: flex;
align-items: center;
justify-content: center;
& .search-input {
width: 796px;
::v-deep .el-input-group {
height: 42px;
& > input {
height: 42px;
border: 1px solid #339cff;
background-color: #021941;
&::placeholder {
color: #fff;
}
}
}
// border: 1px solid #339cff;
// background-color: #021941;
// height: 42px;
// line-height: 42px;
// color: #fff;
& ::v-deep .el-input-group__prepend {
width: 125px;
background-color: #339cff;
border: 1px solid #339cff;
border-radius: 34px;
border-right: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
.el-input__inner {
text-align: center;
color: #fff;
}
}
& ::v-deep .el-input-group__append {
width: 72px;
left: -20px;
text-align: center;
background-color: #339cff;
border: 1px solid #339cff;
border-radius: 34px;
& i {
font-size: 25px;
color: #fff;
}
}
& .el-select .el-input {
width: 130px;
}
& ::v-deep .input-with-select ::v-deep .el-input-group__prepend {
background-color: #fff;
}
} }
} }
.el-col { .el-col {
@ -460,4 +354,25 @@ export default {
td.el-table__cell { td.el-table__cell {
background: #02255f; background: #02255f;
} }
.search-area {
width: 100%;
height: 100%;
margin: 0;
display: flex;
align-items: center;
justify-content: center;
}
::v-deep .search-main{
padding: 0 62px;
.head-container{
padding: 0;
width: 100% !important;
.search-input {
width: 100% !important;
}
.input-with-select{
width: 100% !important;
}
}
}
</style> </style>

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

@ -35,16 +35,19 @@
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="100" align="center" /> <el-table-column type="index" label="序号" width="100" align="center" />
<el-table-column prop="" label="事件" min-width="150" align="center" />
<el-table-column prop="" label="用户" align="center" min-width="150" />
<el-table-column prop="" label="状态" align="center" min-width="150" />
<el-table-column prop="" label="库房" align="center" min-width="150" /> <el-table-column prop="" label="库房" align="center" min-width="150" />
<el-table-column prop="" label="设备名称" align="center" min-width="180" />
<el-table-column prop="" label="设备" align="center" min-width="180" /> <el-table-column prop="" label="设备" align="center" min-width="180" />
<el-table-column prop="" label="档案信息" align="center" min-width="180" /> <el-table-column prop="" label="档案信息" align="center" min-width="180" />
<el-table-column prop="" label="档号" align="center" min-width="180" /> <el-table-column prop="" label="档号" align="center" min-width="180" />
<el-table-column prop="" label="警情描述" align="center" min-width="180" />
<el-table-column prop="" label="报警时间" align="center" min-width="180" /> <el-table-column prop="" label="报警时间" align="center" min-width="180" />
<el-table-column prop="" label="操作" align="center" min-width="180"> <el-table-column prop="" label="操作" align="center" min-width="180">
<el-button size="mini" style="background:#3A99FD" @click="handleListen">查看监控</el-button> <el-button size="mini" style="background:#3A99FD" @click="handleListen">查看监控</el-button>
</el-table-column> </el-table-column>
<el-table-column prop="" label="事件" min-width="150" align="center" />
<el-table-column prop="" label="用户" align="center" min-width="150" />
</el-table> </el-table>
<pagination /> <pagination />
<!-- 查看监控 --> <!-- 查看监控 -->

16
src/views/system/notifyManage/index.vue

@ -112,13 +112,13 @@ export default {
], ],
personOptions: [ personOptions: [
{ value: 0, label: '全部用户' }, { value: 0, label: '全部用户' },
{ value: 1, label: '张三' },
{ value: 2, label: '李四' },
{ value: 3, label: '王五' },
{ value: 4, label: '张三' },
{ value: 5, label: '李四' },
{ value: 6, label: '王五' },
{ value: 7, label: '王五' }
{ value: 1, label: '部门名称 - 张三' },
{ value: 2, label: '部门名称 - 李四' },
{ value: 3, label: '部门名称 - 王五' },
{ value: 4, label: '部门名称 - 张三' },
{ value: 5, label: '部门名称 - 李四' },
{ value: 6, label: '部门名称 - 王五' },
{ value: 7, label: '部门名称 - 王五' }
], ],
devOptions: [ devOptions: [
{ value: 0, label: '全部设备' }, { value: 0, label: '全部设备' },
@ -216,7 +216,6 @@ export default {
// // console.log(this.sendForm.sendObj) // // console.log(this.sendForm.sendObj)
// }, // },
// el-select val // el-select val
// //
defaultSelAll() { defaultSelAll() {
this.selectOptions = this.sendObjOptions.map(item => { return item.value }) this.selectOptions = this.sendObjOptions.map(item => { return item.value })
@ -226,6 +225,7 @@ export default {
changeSelect(val) { changeSelect(val) {
if (val[val.length - 1] === 0) { // if (val[val.length - 1] === 0) { //
this.defaultSelAll() this.defaultSelAll()
this.$refs.selectBox.$el.querySelector('.el-input__inner').style.height = '34px'
} else { } else {
const arr1 = this.oldSelect.filter(item => item !== 0) const arr1 = this.oldSelect.filter(item => item !== 0)
const arr2 = val.filter(item => item !== 0) const arr2 = val.filter(item => item !== 0)

Loading…
Cancel
Save