diff --git a/src/assets/iconfonts/light/iconfont.css b/src/assets/iconfonts/light/iconfont.css index 1073bfa..a8c956d 100644 --- a/src/assets/iconfonts/light/iconfont.css +++ b/src/assets/iconfonts/light/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3966148 */ - src: url('iconfont.woff2?t=1735178700019') format('woff2'), - url('iconfont.woff?t=1735178700019') format('woff'), - url('iconfont.ttf?t=1735178700019') format('truetype'); + src: url('iconfont.woff2?t=1735544677759') format('woff2'), + url('iconfont.woff?t=1735544677759') format('woff'), + url('iconfont.ttf?t=1735544677759') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-stop:before { + content: "\e714"; +} + .icon-zhuangtai1:before { content: "\e690"; } diff --git a/src/assets/iconfonts/light/iconfont.js b/src/assets/iconfonts/light/iconfont.js index 4f4a4e9..d9b942c 100644 --- a/src/assets/iconfonts/light/iconfont.js +++ b/src/assets/iconfonts/light/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_3966148='',(c=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,t,s,z=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_3966148,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?z(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=c.document,s=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,v())})}function v(){s||(s=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}v()}})(window); \ No newline at end of file +window._iconfont_svg_string_3966148='',(c=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,t,s,z=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_3966148,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?z(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=c.document,s=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,v())})}function v(){s||(s=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(p,50)}v()}})(window); \ No newline at end of file diff --git a/src/assets/iconfonts/light/iconfont.json b/src/assets/iconfonts/light/iconfont.json index 4af03b9..ada5671 100644 --- a/src/assets/iconfonts/light/iconfont.json +++ b/src/assets/iconfonts/light/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "10014347", + "name": "终止", + "font_class": "stop", + "unicode": "e714", + "unicode_decimal": 59156 + }, { "icon_id": "13446589", "name": "状态", diff --git a/src/assets/iconfonts/light/iconfont.ttf b/src/assets/iconfonts/light/iconfont.ttf index 40db737..94877c5 100644 Binary files a/src/assets/iconfonts/light/iconfont.ttf and b/src/assets/iconfonts/light/iconfont.ttf differ diff --git a/src/assets/iconfonts/light/iconfont.woff b/src/assets/iconfonts/light/iconfont.woff index 1fcd7ab..1d01280 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff and b/src/assets/iconfonts/light/iconfont.woff differ diff --git a/src/assets/iconfonts/light/iconfont.woff2 b/src/assets/iconfonts/light/iconfont.woff2 index 38a6dc2..8b3775d 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff2 and b/src/assets/iconfonts/light/iconfont.woff2 differ diff --git a/src/assets/images/shelf03-1.png b/src/assets/images/shelf03-1.png new file mode 100644 index 0000000..f3bf322 Binary files /dev/null and b/src/assets/images/shelf03-1.png differ diff --git a/src/assets/images/shelf03.png b/src/assets/images/shelf03.png index f3bf322..5568510 100644 Binary files a/src/assets/images/shelf03.png and b/src/assets/images/shelf03.png differ diff --git a/src/assets/images/shelf05.png b/src/assets/images/shelf05.png new file mode 100644 index 0000000..3065cd3 Binary files /dev/null and b/src/assets/images/shelf05.png differ diff --git a/src/assets/images/shelf06.png b/src/assets/images/shelf06.png new file mode 100644 index 0000000..8df7aff Binary files /dev/null and b/src/assets/images/shelf06.png differ diff --git a/src/views/visualCheck/checkManage/bookSearch/index.vue b/src/views/visualCheck/checkManage/bookSearch/index.vue index 57b32db..88d9d6b 100644 --- a/src/views/visualCheck/checkManage/bookSearch/index.vue +++ b/src/views/visualCheck/checkManage/bookSearch/index.vue @@ -244,6 +244,7 @@ export default { ] }, tabIndex: 0, + defaultImg: defaultImg, imageUrl: defaultImg } }, diff --git a/src/views/visualCheck/checkManage/bookshelfSearch/index.vue b/src/views/visualCheck/checkManage/bookshelfSearch/index.vue index c342d03..61bcfdb 100644 --- a/src/views/visualCheck/checkManage/bookshelfSearch/index.vue +++ b/src/views/visualCheck/checkManage/bookshelfSearch/index.vue @@ -3,13 +3,11 @@
- - - + + - - - + + @@ -38,8 +36,8 @@ > - - + + - - diff --git a/src/views/visualCheck/checkManage/checkPlan/index.vue b/src/views/visualCheck/checkManage/checkPlan/index.vue index a9a91da..f4d28ce 100644 --- a/src/views/visualCheck/checkManage/checkPlan/index.vue +++ b/src/views/visualCheck/checkManage/checkPlan/index.vue @@ -566,7 +566,7 @@ export default { ids.push(val.id) }) console.log(ids) - // crudRegion.del(ids).then(res => { + // crudStocktask.del(ids).then(res => { // console.log(res) // this.$message({ message: res, type: 'success', offset: 8 }) // this.crud.delAllLoading = false @@ -587,12 +587,25 @@ export default { type: 'warning', dangerouslyUseHTMLString: true }).then(() => { - // crudStocktask.FetchUpdateStockTaskStatus(data).then(res => { - // this.$message({ message: '修改成功', type: 'success', offset: 8 }) - // this.crud.refresh() - // }).catch(() => { - // data.status = !data.status - // }) + if (data.startTime) { + data.startTime = timeToTimestamp(data.startTime) + } else { + data.startTime = null + } + if (data.endTime) { + data.endTime = timeToTimestamp(data.endTime) + } else { + data.endTime = null + } + + delete data.lastExecute + delete data.nextExecute + crudStocktask.FetchUpdateStockTaskStatus(data).then(res => { + this.$message({ message: '修改成功', type: 'success', offset: 8 }) + this.crud.refresh() + }).catch(() => { + data.status = !data.status + }) }).catch(() => { this.$message({ message: '已取消修改', offset: 8 }) data.status = data.status ? 0 : 1 diff --git a/src/views/visualCheck/checkManage/dataScreening/girdList.vue b/src/views/visualCheck/checkManage/dataScreening/girdList.vue index 20471c6..005a6aa 100644 --- a/src/views/visualCheck/checkManage/dataScreening/girdList.vue +++ b/src/views/visualCheck/checkManage/dataScreening/girdList.vue @@ -48,7 +48,7 @@
@@ -592,7 +592,7 @@ export default { width: calc(100% - 240px); height: 130px; margin-right: 5px; - padding: 0 12px; + padding: 0 16px 0 20px; background: url('~@/assets/images/shelf02.png') repeat left top; background-size: 10% 100%; overflow: hidden; @@ -605,16 +605,17 @@ export default { .book-item{ position: relative; display: inline-block; - width: 24px; - height: 100px; + width: 42px; + height: 120px; margin-top: 18px; background: url('~@/assets/images/shelf03.png') no-repeat left top; background-size: 100% 100%; + margin-left: -15px; cursor: pointer; span.book-name{ position: absolute; - left: 0; - top: 14px; + left: 13px; + top: 16px; display: block; height: 90px; writing-mode:vertical-rl; @@ -622,6 +623,14 @@ export default { white-space: nowrap; text-overflow: ellipsis; } + &.red-active{ + background: url('~@/assets/images/shelf05.png') no-repeat left top; + background-size: 100% 100%; + } + &.blue-active{ + background: url('~@/assets/images/shelf06.png') no-repeat left top; + background-size: 100% 100%; + } } } diff --git a/src/views/visualCheck/checkManage/dataScreening/shelfList.vue b/src/views/visualCheck/checkManage/dataScreening/shelfList.vue index ec7d853..b2ee98d 100644 --- a/src/views/visualCheck/checkManage/dataScreening/shelfList.vue +++ b/src/views/visualCheck/checkManage/dataScreening/shelfList.vue @@ -39,7 +39,7 @@
-

{{ index+1 + '架' }}

+

{{ item + '架' }}

    @@ -169,7 +169,7 @@ export default { regionName: null, rowType: null, bookShelfDetails: null, - booShelfGrid: null, + booShelfGrid: [], cellInfo: { gridName: null, startSortmark: null, @@ -240,6 +240,20 @@ export default { const h = '76px' const w = '100%/' + this.rackNum return { width: `calc(${w} )`, height: `calc(${h})` } + }, + reversedRackNum() { + if (this.booShelfGrid && this.booShelfGrid.length > 0) { + console.log('ddd') + console.log('this.booShelfGrid[0].gridShelf', this.booShelfGrid[0].gridShelf) + if (this.booShelfGrid[0].gridShelf === '07') { + return Array.from({ length: this.rackNum }, (_, i) => this.rackNum - i).map(x => x.toString()) + } else { + return Array.from({ length: this.rackNum }, (_, i) => i + 1).map(x => x.toString()) + } + } else { + console.log('fff') + return [] + } } }, async created() { @@ -305,6 +319,8 @@ export default { const sortMethod = sortFunction[shelfType][floorType] this.booShelfGrid = this[sortMethod](res) + console.log(this.booShelfGrid[0].gridShelf) + this.popoverVisible = Array(this.booShelfGrid.length).fill(false) setTimeout(() => { this.listLoading = false