diff --git a/package.json b/package.json index 36d999d..1bd397d 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "js-cookie": "2.2.0", "js-md5": "^0.7.3", "js-sha1": "^0.6.0", + "jsbarcode": "^3.11.6", "jsencrypt": "^3.0.0-rc.1", "jsrsasign": "^10.3.0", "jszip": "^3.7.0", diff --git a/src/api/bookBasice/index.js b/src/api/bookBasice/index.js new file mode 100644 index 0000000..dc1bc58 --- /dev/null +++ b/src/api/bookBasice/index.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/bookBasice/editCollectionLocation', + method: 'post', + data + }) +} + +export function edit(data) { + return request({ + url: 'api/bookBasice/editCollectionLocation', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/bookBasice/delCollectionLocation', + method: 'post', + data: ids + }) +} + +export default { add, edit, del } diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 80aa298..a251bdc 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -40,10 +40,6 @@ } } -.crud-opts{ - justify-content: space-between; -} - // 库房可删 .archives-handler-btn{ .el-button{ @@ -67,14 +63,6 @@ background-color: #075E6C; } } - // &.warehousing-btn{ - // border-color: $arcYellow; - // background-color: $arcYellow; - // &.is-disabled{ - // border-color:#7E4021; - // background-color: #7E4021; - // } - // } &.lending-btn{ border-color: $arcRed; background-color: $arcRed; @@ -192,11 +180,7 @@ } } } -.screenshot{ - display: block; - margin: 0 auto; - object-fit: cover; -} + .file-down, .packing-handle-btn, .packing-recall-btn, diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 8f181de..7d7a1ec 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -6,6 +6,7 @@ @import '~@/assets/iconfonts/light/iconfont.css'; @import 'yxk-admin'; @import 'archives-manage'; +@import 'manage'; body { height: 100%; diff --git a/src/assets/styles/manage.scss b/src/assets/styles/manage.scss new file mode 100644 index 0000000..6d4bd20 --- /dev/null +++ b/src/assets/styles/manage.scss @@ -0,0 +1,59 @@ +@import 'variables'; +@import 'mixin'; + +.venue-container{ + display: flex; + justify-content: space-between; +} + +.venue-left{ + width: calc(100% / 2); + margin-right: 20px; + @include bg_color; + @include box_padding; + .head-container{ + margin-bottom: 20px; + .crud-opts{ + justify-content: center; + } + } + .container-left{ + @include tree_height_min; + } +} +.venue-right{ + flex: 1; + @include bg_color; + @include box_padding; + .head-container{ + margin-bottom: 20px; + } + .container-right{ + @include table_height_min; + &.tab-content{ + @include tab_height_min; + } + } +} + +.venue-container{ + .tab-content{ + position: relative; + @include row_tab_style; + .tab-nav{ + margin-bottom: 0; + } + } +} + + +.venue-preview{ + width: 100%; + height: 690px; + margin-top: 20px; + overflow: hidden; + img{ + display: block; + width: 100%; + } +} diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index ca69d54..1116a31 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -1228,32 +1228,6 @@ input[type ='number'] { .warehouse-svg { margin: 0 10px 1px 0; } -// .title-arrow { -// position: relative; -// display: inline-block; - -// &::before { -// content: ''; -// width: 36px; -// height: 12px; -// position: absolute; -// right: -60px; -// top: 50%; -// transform: translateY(-50%); -// background: url('~@/assets/images/warehouse_arrow_left.png') no-repeat; -// } - -// &::after { -// content: ''; -// width: 36px; -// height: 12px; -// position: absolute; -// left: -60px; -// top: 50%; -// transform: translateY(-50%); -// background: url('~@/assets/images/warehouse_arrow_right.png') no-repeat; -// } -// } .el-switch .el-switch__core{ @include switch-disabled; } diff --git a/src/router/routers.js b/src/router/routers.js index d062c86..8577718 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -55,13 +55,13 @@ export const constantRouterMap = [ component: (resolve) => require(['@/views/system/user/center'], resolve), name: '个人中心', meta: { title: '个人中心' } - }, - { - path: 'cart', - component: (resolve) => require(['@/views/system/user/cart'], resolve), - name: '借阅车', - meta: { title: '借阅车' } } + // { + // path: 'cart', + // component: (resolve) => require(['@/views/system/user/cart'], resolve), + // name: '借阅车', + // meta: { title: '借阅车' } + // } ] } // { diff --git a/src/utils/index.js b/src/utils/index.js index bbd8f74..f60157e 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,3 +1,4 @@ +import { getToken } from '@/utils/auth' /** * Created by PanJiaChen on 16/11/18. */ @@ -424,11 +425,26 @@ export function getCurrentTime() { return time } +// 定义时间 +export function timeFormate() { + const date = new Date() + const Y = date.getFullYear() + const M = + date.getMonth() + 1 < 10 + ? '0' + (date.getMonth() + 1) + : date.getMonth() + 1 + const D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() + return Y + M + D +} + // 导出 export function getBlob(url, cb) { var xhr = new XMLHttpRequest() xhr.open('GET', url, true) xhr.responseType = 'blob' + + xhr.setRequestHeader('Authorization', getToken()) + xhr.onload = function() { if (xhr.status === 200) { cb(xhr.response) @@ -436,7 +452,7 @@ export function getBlob(url, cb) { } xhr.send() } - +// 与getBlob 配合使用 export function saveAs(blob, filename) { if (window.navigator.msSaveOrOpenBlob) { navigator.msSaveBlob(blob, filename) @@ -453,18 +469,6 @@ export function saveAs(blob, filename) { } } -// 定义时间 -export function timeFormate() { - const date = new Date() - const Y = date.getFullYear() - const M = - date.getMonth() + 1 < 10 - ? '0' + (date.getMonth() + 1) - : date.getMonth() + 1 - const D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() - return Y + M + D -} - // 下载文件 export function saveByteArray(fileName, byte) { var blob = new Blob([byte], { type: 'application/pdf' }) @@ -474,4 +478,3 @@ export function saveByteArray(fileName, byte) { link.download = fileName link.click() } - diff --git a/src/views/system/dict/index2.vue b/src/views/system/dict/index2.vue deleted file mode 100644 index 4b82927..0000000 --- a/src/views/system/dict/index2.vue +++ /dev/null @@ -1,425 +0,0 @@ - - - - - diff --git a/src/views/system/group/index.vue b/src/views/system/group/index.vue index 968d254..d3aa085 100644 --- a/src/views/system/group/index.vue +++ b/src/views/system/group/index.vue @@ -6,7 +6,6 @@
- @@ -74,7 +73,6 @@ - @@ -98,7 +96,6 @@ - - diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue index fa8a867..6d352cf 100644 --- a/src/views/system/user/center.vue +++ b/src/views/system/user/center.vue @@ -23,7 +23,7 @@

  • 用户名

    {{ user.nickName }}

  • 性别

    {{ user.gender ? user.gender : '-' }}

  • 用户角色

    {{ item.name }}
    • -

  • 所属全宗

    {{ user.fonds ? user.fonds.fondsName : '/' }}
    • +

  • 所属机构

    {{ user.fonds ? user.fonds.fondsName : '/' }}

  • 所属部门

    {{ user.dept ? user.dept.deptsName : '/' }}

  • 手机号码

    {{ user.email ? user.phone : '-' }}

  • 用户邮箱

    {{ user.email ? user.email : '-' }}
    • @@ -91,7 +91,6 @@ import updateEmail from './center/updateEmail' import { getToken } from '@/utils/auth' import store from '@/store' import { isvalidPhone } from '@/utils/validate' -// import crud from '@/mixins/crud' import { editUser } from '@/api/system/user' import Avatar from '@/assets/images/avatar.png' import messageCenter from './messageCenter/index' @@ -99,7 +98,6 @@ import OperateLog from '@/views/system/log/operateLog/index' export default { name: 'Center', components: { updatePass, updateEmail, myUpload, messageCenter, OperateLog }, - // mixins: [crud], data() { // 自定义验证 const validPhone = (rule, value, callback) => { @@ -323,11 +321,7 @@ export default { } } } -// [data-theme=dark] .tab-item { -// height: calc(100vh - 232px); -// } [data-theme=light] .tab-item { - // height: calc(100vh - 193px); ::v-deep .el-form.tab-form{ margin-top: 40px; } @@ -379,15 +373,10 @@ select:-webkit-autofill { input { background-color: transparent; } -// .el-pagination{ -// margin: 20px 0 10px 0 !important -// } ::v-deep .vue-image-crop-upload .vicp-wrap .vicp-operate a{ border: 1px solid #e6e8ed; background-color: transparent; color: #545b65; border-radius: 3px; - // color: #fff; - // background-color: #0348f3; } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index daea476..5c61e7c 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -7,15 +7,6 @@
    - -