From cf2134d663e68fed100335cab05d6c1a2f68ec26 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Thu, 19 Dec 2024 17:15:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=A6=E6=9E=B6=E7=AE=A1=E7=90=86-=E5=B1=82?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/shelf/index.js | 37 +- src/assets/styles/manage.scss | 6 +- src/views/components/mark.vue | 5 +- .../visualCheck/venueDevice/area/index.vue | 2 +- .../venueDevice/bookshelf/index.vue | 95 +++-- .../venueDevice/bookshelfPosition/index.vue | 374 ++++++++++++------ 6 files changed, 350 insertions(+), 169 deletions(-) diff --git a/src/api/shelf/index.js b/src/api/shelf/index.js index a953c96..930a61f 100644 --- a/src/api/shelf/index.js +++ b/src/api/shelf/index.js @@ -42,4 +42,39 @@ export function saveBookShelfSignPoint(parameter) { }) } -export default { add, edit, del, FetchBookShelfDetails, saveBookShelfSignPoint } +// 根据书架查看架位 +export function FetchInitShelfGridByShelfId(params) { + return request({ + url: 'api/bookShelf/initShelfGridByShelfId' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 编辑架位索书号 +export function FetcheEditSortmarkByGrid(parameter) { + return request({ + url: 'api/bookShelf/editSortmarkByGrid', + method: 'post', + data: parameter + }) +} + +// 架位有序检查开关切换 +export function FetchChangeOrderByGrid(parameter) { + return request({ + url: 'api/bookShelf/changeOrderByGrid', + method: 'post', + data: parameter + }) +} + +// 架位盘点开点开关切换 +export function FetchChangeCheckByGrid(parameter) { + return request({ + url: 'api/bookShelf/changeCheckByGrid', + method: 'post', + data: parameter + }) +} + +export default { add, edit, del, FetchBookShelfDetails, saveBookShelfSignPoint, FetchInitShelfGridByShelfId, FetcheEditSortmarkByGrid, FetchChangeOrderByGrid, FetchChangeCheckByGrid } diff --git a/src/assets/styles/manage.scss b/src/assets/styles/manage.scss index 461b678..8f1d866 100644 --- a/src/assets/styles/manage.scss +++ b/src/assets/styles/manage.scss @@ -300,8 +300,9 @@ height: 100%; .cabinet-cell{ position: relative; - font-size: 20px; - border: 1px solid #A6ADB6; + font-size: 14px; + color: #000; + border: 1px solid #000; overflow: hidden; // &:nth-last-of-type(-n+4) { // margin-bottom: 0; @@ -311,6 +312,7 @@ // } span{ display: block; + width: 100%; position: absolute; left: 50%; top: 50%; diff --git a/src/views/components/mark.vue b/src/views/components/mark.vue index ed216d0..f6b1027 100644 --- a/src/views/components/mark.vue +++ b/src/views/components/mark.vue @@ -41,7 +41,7 @@

  • 书架规格

    - {{ currentMarkData && currentMarkData.shelfShelf + ' X ' + currentMarkData.shelfFloor }} + {{ currentMarkData && currentMarkData.shelfFloor+ ' X ' + currentMarkData.shelfShelf }}
  • {{ true ? '已标注': '未标注' }}
    • @@ -154,9 +154,6 @@ export default { console.log('imageUrl') } } - }, - created() { - }, mounted() { // this.$nextTick(() => { diff --git a/src/views/visualCheck/venueDevice/area/index.vue b/src/views/visualCheck/venueDevice/area/index.vue index d3353cd..519452d 100644 --- a/src/views/visualCheck/venueDevice/area/index.vue +++ b/src/views/visualCheck/venueDevice/area/index.vue @@ -143,7 +143,7 @@
    - +
    diff --git a/src/views/visualCheck/venueDevice/bookshelf/index.vue b/src/views/visualCheck/venueDevice/bookshelf/index.vue index 33a04d6..e2fd7f6 100644 --- a/src/views/visualCheck/venueDevice/bookshelf/index.vue +++ b/src/views/visualCheck/venueDevice/bookshelf/index.vue @@ -35,6 +35,7 @@ style="width: 100%;" height="540" @selection-change="selectionChangeHandler" + @row-dblclick="onRowDblclick" @row-click="clickRowHandler" > @@ -42,7 +43,7 @@ @@ -101,13 +102,13 @@ - + 单排 双排 - + - + - - ✕ + ✕ + - + - + - + - 无序 有序 + 无序 - 书架 格子 + 书架 @@ -201,7 +202,7 @@ import defaultImg from '@/assets/images/system/default-img.jpg' import MarkCover from '@/views/components/mark.vue' import { fabric } from 'fabric' -const defaultForm = { id: null, floorName: null, floorId: null, regionName: null, rowType: 1, toward: 1, shelfRow: '', shelfName: '', shelfShelf: null, shelfFloor: null, startShelf: null, shelfType: null, floorType: null, shelfRule: null, shelfErrorJudge: null, signPoint: '' } +const defaultForm = { id: null, floorName: null, floorId: null, regionName: null, rowType: 1, toward: 1, shelfRow: '', shelfName: '', shelfShelf: null, shelfFloor: null, startShelf: null, shelfType: null, floorType: null, shelfRule: 2, shelfErrorJudge: 2, signPoint: '' } export default { name: 'Bookshelf', components: { crudOperation, pagination, MarkCover }, @@ -326,6 +327,16 @@ export default { }, methods: { + formatShelfRow() { + let value = this.form.shelfRow + value = value.toString() + if (value.length < 3) { + value = value.padStart(3, '0') + } else if (value.length > 3) { + value = value.slice(0, 3) + } + this.form.shelfRow = value + }, validateShelfName(rule, value, callback) { if (this.form.shelfRow) { if (!value) { @@ -429,11 +440,15 @@ export default { } FetchInitLibraryRegionList(params).then(res => { this.regionOptions = res.content + console.log('this.regionOptions', this.regionOptions) if (this.regionOptions.length > 0) { this.selectRegionVal = this.regionOptions[0] this.crud.query.regionId = this.selectRegionVal.id - this.crud.toQuery() + } else { + this.selectRegionVal = null + this.crud.query.regionId = null } + this.crud.toQuery() }).catch(() => { }) }, @@ -451,21 +466,6 @@ export default { this.crud.toQuery() } }, - changeSingleOrDouble(value) { - console.log(value) - }, - changeAB(value) { - console.log(value) - }, - changeOrder(value) { - console.log(value) - }, - changeFloorValue(value) { - console.log(value) - }, - changeLayerSeq(value) { - console.log(value) - }, selectionChangeHandler(val) { this.crud.selections = val // 处理选择项为1且有签名点的情况 @@ -512,22 +512,14 @@ export default { console.error('666') } }, - handleCloseDialog() { - // if (this.$refs.markRefs.canvas) { - // this.$refs.markRefs.canvas.clear() - // this.$refs.markRefs.canvas.dispose() - // } - this.markVisible = false - this.crud.refresh() - }, clickRowHandler(row) { - console.log(row) - this.$refs.table.clearSelection() this.$refs.table.toggleRowSelection(row) - + }, + onRowDblclick(row) { crudShelf.FetchBookShelfDetails({ 'shelfId': row.shelfId }).then(res => { - this.$router.push({ path: '/bookshelf/bookshelfPosition', query: { 'bookShelfDetails': res }}) + this.$router.push({ path: '/bookshelf/bookshelfPosition', query: { 'floorName': row.floorName, 'regionName': row.regionName }}) + localStorage.setItem('bookShelfDetails', JSON.stringify(res)) }).catch(() => { }) }, @@ -544,19 +536,24 @@ export default { ids.push(val.id) }) console.log(ids) - crudShelf.del(ids).then(res => { - console.log(res) - this.$message({ message: res, type: 'success', offset: 8 }) - this.crud.delAllLoading = false - this.crud.refresh() - }).catch(err => { - this.crud.delAllLoading = false - console.log(err) - }) + this.$message({ message: '等后面板块做完再做这个', type: 'error', offset: 8 }) + // crudShelf.del(ids).then(res => { + // console.log(res) + // this.$message({ message: res, type: 'success', offset: 8 }) + // this.crud.delAllLoading = false + // this.crud.refresh() + // }).catch(err => { + // this.crud.delAllLoading = false + // console.log(err) + // }) }).catch(() => { this.crud.delAllLoading = false }) }, + handleCloseDialog() { + this.markVisible = false + this.crud.refresh() + }, initCanvasPreview(drawinfo) { this.canvasPreview = new fabric.Canvas('canvasPreview', { skipTargetFind: false, diff --git a/src/views/visualCheck/venueDevice/bookshelfPosition/index.vue b/src/views/visualCheck/venueDevice/bookshelfPosition/index.vue index 6c7f4dd..fa24892 100644 --- a/src/views/visualCheck/venueDevice/bookshelfPosition/index.vue +++ b/src/views/visualCheck/venueDevice/bookshelfPosition/index.vue @@ -2,26 +2,28 @@

    架位列表

    - 一楼-A区 + {{ floorName }} - {{ regionName }}

    {{ user.fonds.fondsName }}

    • 书架名称：

      {{ bookShelfDetails && bookShelfDetails.shelfName }}
      • -

    • 书架规格：

      {{ bookShelfDetails && bookShelfDetails.shelfShelf + ' X ' + bookShelfDetails.shelfFloor }}
      • +

    • 书架规格：

      {{ bookShelfDetails && bookShelfDetails.shelfFloor + ' X ' + bookShelfDetails.shelfShelf }}

    • 单/双面：

      {{ bookShelfDetails && bookShelfDetails.rowType === 1 ? '单面' :'双面' }}

    • 倒架规则：

      {{ bookShelfDetails && bookShelfDetails.shelfRule === 1 ? '无序' :'有序' }}

    • 错架判断：

      {{ bookShelfDetails && bookShelfDetails.shelfErrorJudge === 1 ? '书架' :'格子' }}
      • +
    导出层位编码 - + - {{ isBindCarme ? '摄像头预览' : '未绑定摄像头' }} + {{ cellInfo.cameraId ? '摄像头预览' : '未绑定摄像头' }}
    @@ -67,8 +69,8 @@ class="swiper-slide-content" >
      -
    • - {{ bookShelfDetails && bookShelfDetails.shelfName +''+ (index+1) }} +
    • + {{ item.gridName }}
    @@ -76,20 +78,20 @@
    - 待初始化 - - 无序倒架 + 正常盘点 + 待初始化 + 停止盘点 + 无序倒架 有序倒架
    -
    001排A面01架1层
    +
    {{ cellInfo.gridName }}
      -

    • 起始索书号

      -
      • -

    • 结束索书号

      I247.58/592:3
      • +

    • 起始索书号

      {{ cellInfo.startSortmark ? cellInfo.startSortmark : '-' }}
      • +

    • 结束索书号

      {{ cellInfo.endSortmark? cellInfo.endSortmark : '-' }}
    - + 编   辑 索书号 @@ -129,14 +131,14 @@
    - - + + - - + + - - + +
    @@ -150,8 +152,7 @@