diff --git a/src/api/book/index.js b/src/api/book/index.js index b952bce..650dc11 100644 --- a/src/api/book/index.js +++ b/src/api/book/index.js @@ -57,4 +57,12 @@ export function FetchInitBookDetailsSearchInto(params) { }) } -export default { add, edit, del, FetchInitBookBasiceList, FetchBookBasiceByISBN, FetchFastDownShelf, FetchInitBookDetailsSearchInto } +// 图书基本信息总数 +export function FetchInitBookBasiceCount(params) { + return request({ + url: 'api/bookBasice/initBookBasiceCount' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +export default { add, edit, del, FetchInitBookBasiceList, FetchBookBasiceByISBN, FetchFastDownShelf, FetchInitBookDetailsSearchInto, FetchInitBookBasiceCount } diff --git a/src/api/system/new.js b/src/api/system/new.js index f4d018c..ca1f462 100644 --- a/src/api/system/new.js +++ b/src/api/system/new.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 我的系统通知 export function FetchMySystemNotice(params) { return request({ - url: 'api/news/mySystemNotice', + url: 'api/notice/mySystemNotice', method: 'get', params }) @@ -12,7 +12,7 @@ export function FetchMySystemNotice(params) { // 通知详情 export function FetchInitNoticeDetails(data) { return request({ - url: 'api/news/initNoticeDetails', + url: 'api/notice/initNoticeDetails', method: 'post', data }) @@ -21,7 +21,7 @@ export function FetchInitNoticeDetails(data) { // 全部已读 export function FetchReadedAll(data) { return request({ - url: 'api/news/readedAll', + url: 'api/notice/readedAll', method: 'post', data }) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 2b2beca..85dd5f9 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -323,4 +323,24 @@ ul{ left: 0 !important; margin-top: 0 !important; margin-right: 30px !important; +} + +.login-info{ + .el-dialog__body{ + padding: 10px 20px 30px 20px; + line-height: 30px; + color:#0C0E1E; + h4{ + font-size: 18px; + } + .text-item{ + margin-bottom: 10px; + h5{ + font-size: 14px; + } + p{ + text-indent: 2em; + } + } + } } \ No newline at end of file diff --git a/src/assets/styles/manage.scss b/src/assets/styles/manage.scss index cb1c517..584cc79 100644 --- a/src/assets/styles/manage.scss +++ b/src/assets/styles/manage.scss @@ -52,7 +52,7 @@ } .double-click-btn{ position: inherit; - margin-left: 20px; + margin: 0 0 0 20px !important; font-weight: normal; border: 1px solid #545b65; border-radius: 13px; @@ -640,6 +640,11 @@ } } } +.tip-bottom{ + font-size: 12px; + padding: 5px 0 10px 0; + text-align: center; +} .positionDialog{ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index e6bebe4..259c12b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -3,7 +3,7 @@
- + diff --git a/src/main.js b/src/main.js index 49e3fce..b6cacb6 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ import 'normalize.css/normalize.css' import Element from 'element-ui' // 数据字典 -import dict from './components/Dict' +// import dict from './components/Dict' // 权限指令 import checkPer from '@/utils/permission' @@ -39,11 +39,24 @@ if (localStorage.getItem('themeValue')) { } // 全局注册过滤 - 时间 -import { parseTime } from '@/utils/index.js' +import { parseTime, removeQUPrefix, removeQuLayerPrefix, removeMianBeforeRefix } from '@/utils/index.js' + Vue.filter('parseTime', function(time, cFormat) { return parseTime(time, cFormat) }) +Vue.filter('removeQUPrefix', function(gridNames) { + return removeQUPrefix(gridNames) +}) + +Vue.filter('removeQuLayerPrefix', function(gridNames) { + return removeQuLayerPrefix(gridNames) +}) + +Vue.filter('removeMianBeforeRefix', function(gridNames) { + return removeMianBeforeRefix(gridNames) +}) + // 解决el-radio报错 Vue.directive('removeAriaHidden', { bind(el, binding) { @@ -59,7 +72,7 @@ Vue.use(checkPer) Vue.use(VueHighlightJS) Vue.use(VueViewer) Vue.use(permission) -Vue.use(dict) +// Vue.use(dict) Vue.use(Element, { size: Cookies.get('size') || 'small' // set element-ui default size }) diff --git a/src/utils/index.js b/src/utils/index.js index b817911..6cad9da 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -486,3 +486,47 @@ export function timeToTimestamp(time) { // timestamp = timestamp / 1000 return timestamp } + +// 01区001排A面01架1层 +// 过滤去掉'区' 001排A面01架1层 +export function removeQUPrefix(gridNames) { + // 首先判断 gridNames 是否不为 null 且不为 undefined + if (gridNames !== null && gridNames !== undefined) { + const index = gridNames.indexOf('区') + if (index !== -1) { + return gridNames.substring(index + 1) + } + return gridNames + } else { + // 如果 gridNames 为 null 或 undefined，则可以根据需要返回一个默认值，这里返回 null + return null + } +} + +// 过滤去掉‘面’后的架和层 01区001排A面 +export function removeMianAfterRefix(gridNames) { + const index = gridNames.indexOf('面') + if (index !== -1) { + return gridNames.substring(0, index + 1) + } + return gridNames +} + +// 过滤去掉‘面’前面的区/排/面 01架1层 +export function removeMianBeforeRefix(gridNames) { + const index = gridNames.indexOf('面') + if (index !== -1) { + return gridNames.substring(index + 1) + } + return gridNames +} + +// 过滤去掉‘区/层’ 001排A面01架 +export function removeQuLayerPrefix(gridNames) { + return gridNames.replace(/\d*区|\d*层/g, '') +} + +// 只保留排和面 001排A面 +export function removePrefix(gridNames) { + return gridNames.replace(/\d+区(\d+排)([A-Z]面)\d+架\d+层/g, '$1$2') +} diff --git a/src/views/components/bookSwiper.vue b/src/views/components/bookSwiper.vue index f60fd5b..39ea28c 100644 --- a/src/views/components/bookSwiper.vue +++ b/src/views/components/bookSwiper.vue @@ -44,12 +44,23 @@ style="width: 100%" height="150" > + + + +

在架

${this.tooltipInfo.onShelfNum}册

  • 错架

    ${this.tooltipInfo.errorShelfNum}册 （${this.tooltipInfo.errorShelfProbo}）

  • 错序

    ${this.tooltipInfo.errorOrderNum}册（${this.tooltipInfo.errorOrderProbo}）
    • - ` + +
    提示：双击查看详情
    ` } else if (self.pagePreview === 'region') { document.getElementById('tooltip').innerHTML = `
    @@ -235,7 +236,8 @@ export default {

  • 在架

    ${this.tooltipInfo.onShelfNum}册

  • 错架

    ${this.tooltipInfo.errorShelfNum}册 （${this.tooltipInfo.errorShelfProbo}）

  • 错序

    ${this.tooltipInfo.errorOrderNum}册（${this.tooltipInfo.errorOrderProbo}）
    • - ` + +
    提示：双击查看详情
    ` } // var rectLeft = e.target.left + e.target.width - 100 diff --git a/src/views/components/checkSwiper.vue b/src/views/components/checkSwiper.vue index 7dcb9a4..ef8e1d1 100644 --- a/src/views/components/checkSwiper.vue +++ b/src/views/components/checkSwiper.vue @@ -55,7 +55,11 @@ + > + +
    未完成({{ stockLogIncompleteData.length !==0? stockLogIncompleteData.length: 0 }}) - 已完成({{ stockLogCompletedData.length !==0? stockLogCompletedData.length: 0 }}) + 已结束({{ stockLogCompletedData.length !==0? stockLogCompletedData.length: 0 }})
    - + @@ -104,7 +203,10 @@ export default { ] }, loading: false, - redirect: undefined + redirect: undefined, + helpVisible: false, + secretVisible: false, + termVisible: false } }, watch: { @@ -207,6 +309,11 @@ export default { this.$message({ message: '当前登录状态已过期，请重新登录！', type: 'warning', duration: 5000, offset: 8 }) Cookies.remove('point') } + }, + handleClose() { + this.helpVisible = false + this.secretVisible = false + this.termVisible = false } } } @@ -336,4 +443,5 @@ export default { } } } + diff --git a/src/views/system/log/search.vue b/src/views/system/log/search.vue index fed8027..e01de10 100644 --- a/src/views/system/log/search.vue +++ b/src/views/system/log/search.vue @@ -199,8 +199,9 @@ export default { position: relative; } .double-click-btn{ - top: 4px !important; - right: 0; - left: -156px !important; + margin: 0 20px 0 0 !important; + // top: 4px !important; + // right: 20px; + // left: -156px !important; } diff --git a/src/views/system/notify/index.vue b/src/views/system/notify/index.vue index 9d2bea0..a0cdbcd 100644 --- a/src/views/system/notify/index.vue +++ b/src/views/system/notify/index.vue @@ -242,12 +242,10 @@ export default { } } -::v-deep .crud-opts-left{ - position: relative; -} .double-click-btn{ - top: 4px !important; - right: 0; - left: -156px !important; + margin: 0 20px 0 0 !important; + // top: 4px !important; + // right: 20px; + // left: -156px !important; } diff --git a/src/views/visualCheck/bookstore/book/index.vue b/src/views/visualCheck/bookstore/book/index.vue index ee93204..193e663 100644 --- a/src/views/visualCheck/bookstore/book/index.vue +++ b/src/views/visualCheck/bookstore/book/index.vue @@ -1,5 +1,22 @@ @@ -116,6 +134,7 @@ import pagination from '@crud/Pagination' import UploadCover from '@/views/components/upload.vue' import { mapGetters } from 'vuex' +// queryOnPresenterCreated: false const defaultForm = { id: null, title: null, author: null, isbn: null, classNo: null, publisher: null, bookCover: null, bookRecNo: null } export default { name: 'Book', @@ -170,7 +189,10 @@ export default { publisher: [ { required: true, message: '出版社不可为空', trigger: 'blur' } ] - } + }, + totalBookCount: 0, + isResult: false, + search: '' } }, computed: { @@ -178,6 +200,13 @@ export default { 'baseApi' ]) }, + created() { + // crudBook.FetchInitBookBasiceCount().then(res => { + // this.totalBookCount = res + // }).catch(err => { + // console.log(err) + // }) + }, methods: { [CRUD.HOOK.beforeRefresh]() { if (this.status === null) { @@ -206,6 +235,24 @@ export default { console.log(crud.form) return true }, + handleSearch() { + if (this.search) { + this.isResult = true + this.keyWord = this.search + this.crud.toQuery() + } else { + this.$message({ message: '请输入检索关键字段', type: 'error', offset: 8 }) + } + }, + toSearch() { + if (this.keyWord) { + this.search = '' + this.isResult = true + this.crud.toQuery() + } else { + this.$message({ message: '请输入检索关键字段', type: 'error', offset: 8 }) + } + }, searchChange(val) { if (val) { this.keyWord = '' @@ -217,10 +264,12 @@ export default { } }, resetQuery() { + this.search = '' this.keyWord = '' this.crud.query[this.optionVal] = this.keyWord this.status = null - this.crud.toQuery() + this.crud.data = [] + // this.crud.toQuery() }, handleCover(value) { console.log(value) @@ -296,4 +345,92 @@ export default { height: 180px; } } + +.search-main{ + position: relative; + width: 100%; + height: calc(100vh - 182px); + background: url('~@/assets/images/archives/bg.png') no-repeat; + background-size: 100% 100%; + & span{ + display: block; + } + .bg_icon1{ + position: absolute; + left: 110px; + top: 400px; + width: 236px; + height: 116px; + background: url('~@/assets/images/archives/ys1.png') no-repeat; + background-size: 100% 100%; + } + .bg_icon2{ + position: absolute; + left: 50%; + bottom: 60px; + width: 472px; + height: 377px; + margin-left: -236px; + background: url('~@/assets/images/archives/ys2.png') no-repeat; + background-size: 100% 100%; + } + .bg_icon3{ + position: absolute; + right: 240px; + bottom: 40px; + width: 136px; + height: 152px; + background: url('~@/assets/images/archives/ys3.png') no-repeat; + background-size: 100% 100%; + } + .bg_icon4{ + position: absolute; + right: 110px; + top: 50%; + width: 170px; + height: 136px; + margin-top: -58px; + background: url('~@/assets/images/archives/ys4.png') no-repeat; + background-size: 100% 100%; + } + } + .search-content{ + padding-top: 120px; + h2{ + font-size: 40px; + text-align: center; + color: #1C1C1C; + margin-bottom: 40px; + } + } + + .common-search{ + width: 800px; + margin: 0 auto; + .search-input{ + position: relative; + display: flex; + justify-content: space-between; + width: 800px; + height: 54px; + background-color: #fff; + border-radius: 3px; + .input-with-select{ + ::v-deep .el-input__inner{ + width: 664px; + height: 54px !important; + font-size: 14px; + padding: 0 20px; + border: none; + } + } + .el-button{ + width: 136px; + background-color: #0348F3; + font-size: 16px; + color: #fff; + border-radius: 0 3px 3px 0; + } + } + } diff --git a/src/views/visualCheck/bookstore/collection/index.vue b/src/views/visualCheck/bookstore/collection/index.vue index 413556f..359fc94 100644 --- a/src/views/visualCheck/bookstore/collection/index.vue +++ b/src/views/visualCheck/bookstore/collection/index.vue @@ -141,7 +141,11 @@ - + + +