diff --git a/src/api/shelf/index.js b/src/api/shelf/index.js index 9555d85..e21c7b4 100644 --- a/src/api/shelf/index.js +++ b/src/api/shelf/index.js @@ -26,7 +26,7 @@ export function edit(data) { export function del(ids) { return request({ - url: '', + url: 'api/bookShelf/delBookShelf', method: 'post', data: ids }) @@ -110,4 +110,12 @@ export function FetchFastDownShelf(ids) { }) } -export default { add, edit, del, FetchInitBookShelfList, FetchBookShelfDetails, saveBookShelfSignPoint, FetchInitShelfGridByShelfId, FetcheEditSortmarkByGrid, FetchChangeOrderByGrid, FetchChangeCheckByGrid, FetchShelfGridAllByShelfId, FetchShelfAllByRegionId, FetchFastDownShelf } +// 根据书架和架位查看层架位 +export function FetchShelfGridByShelfIdAndGridShelf(params) { + return request({ + url: 'api/bookShelf/getShelfGridByShelfIdAndGridShelf' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +export default { add, edit, del, FetchInitBookShelfList, FetchBookShelfDetails, saveBookShelfSignPoint, FetchInitShelfGridByShelfId, FetcheEditSortmarkByGrid, FetchChangeOrderByGrid, FetchChangeCheckByGrid, FetchShelfGridAllByShelfId, FetchShelfAllByRegionId, FetchFastDownShelf, FetchShelfGridByShelfIdAndGridShelf } diff --git a/src/api/stockTask/index.js b/src/api/stockTask/index.js index b854e24..42c2d08 100644 --- a/src/api/stockTask/index.js +++ b/src/api/stockTask/index.js @@ -67,4 +67,60 @@ export function FetchInitHomeInfo(params) { }) } -export default { add, edit, del, FetchUpdateStockTaskStatus, FetchInitSuggestTilting, FetchInitSetting, FetchEditSetting, FetchInitHomeInfo } +// 初始化盘点概况 +export function FetchInitStockInfo(params) { + return request({ + url: 'api/stocktask-task/initStockInfo' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 初始化热门图书 +export function FetchInitHotBookList(params) { + return request({ + url: 'api/stocktask-task/initHotBookList' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 初始化热门架位 +export function FetchInitHotShelfList(params) { + return request({ + url: 'api/stocktask-task/initHotShelfList' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 根据层架位id获取架位图书 +export function FetchInitBookDetailsByGrids(params) { + return request({ + url: 'api/stocktask-task/initBookDetailsByGrids' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// AI处理终端状态查询 +export function FetchAITerminalStatusQuery(params) { + return request({ + url: 'api/stocktask-task/AITerminalStatusQuery' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 根据书架和书架层获取盘点单信息 +export function FetchBillByShelfIdAndGridShelf(params) { + return request({ + url: 'api/stocktask-task/getBillByShelfIdAndGridShelf' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 根据盘点单号和层架位id获取是否完美切割 +export function FetchIsGoodcutByBillNoAndGridId(params) { + return request({ + url: 'api/stocktask-task/getIsGoodcutByBillNoAndGridId' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +export default { add, edit, del, FetchUpdateStockTaskStatus, FetchInitSuggestTilting, FetchInitSetting, FetchEditSetting, FetchInitHomeInfo, FetchInitStockInfo, FetchInitHotBookList, FetchInitHotShelfList, FetchInitBookDetailsByGrids, FetchAITerminalStatusQuery, FetchBillByShelfIdAndGridShelf, FetchIsGoodcutByBillNoAndGridId } diff --git a/src/assets/iconfonts/light/iconfont.css b/src/assets/iconfonts/light/iconfont.css index a8c956d..3e6f252 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=1735544677759') format('woff2'), - url('iconfont.woff?t=1735544677759') format('woff'), - url('iconfont.ttf?t=1735544677759') format('truetype'); + src: url('iconfont.woff2?t=1736498949884') format('woff2'), + url('iconfont.woff?t=1736498949884') format('woff'), + url('iconfont.ttf?t=1736498949884') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-zhongduanjiankong:before { + content: "\e691"; +} + +.icon-lianjieduankai:before { + content: "\e600"; +} + .icon-stop:before { content: "\e714"; } diff --git a/src/assets/iconfonts/light/iconfont.js b/src/assets/iconfonts/light/iconfont.js index d9b942c..be5617b 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 ada5671..a60bbcd 100644 --- a/src/assets/iconfonts/light/iconfont.json +++ b/src/assets/iconfonts/light/iconfont.json @@ -5,6 +5,20 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "18610501", + "name": "终端监控", + "font_class": "zhongduanjiankong", + "unicode": "e691", + "unicode_decimal": 59025 + }, + { + "icon_id": "10596948", + "name": "链接断开", + "font_class": "lianjieduankai", + "unicode": "e600", + "unicode_decimal": 58880 + }, { "icon_id": "10014347", "name": "终止", diff --git a/src/assets/iconfonts/light/iconfont.ttf b/src/assets/iconfonts/light/iconfont.ttf index 94877c5..b39f9f4 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 1d01280..b8a208f 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 8b3775d..4f0bdb3 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff2 and b/src/assets/iconfonts/light/iconfont.woff2 differ diff --git a/src/utils/request.js b/src/utils/request.js index d27feee..b142a0d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,7 @@ import Cookies from 'js-cookie' // 创建axios实例 const service = axios.create({ - baseURL: process.env.NODE_ENV === 'production' ? window.g.ApiUrl : '/', // api 的 base_url + baseURL: '/', // api 的 base_url // baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url timeout: Config.timeout // 请求超时时间 }) @@ -27,6 +27,13 @@ service.interceptors.request.use( if (getToken()) { config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 } + + if (config.urlType === 'device') { + config.baseURL = process.env.NODE_ENV === 'production' ? window.g.DevUrl : process.env.VUE_APP_DEVICE_API + } else { + config.baseURL = process.env.NODE_ENV === 'production' ? window.g.ApiUrl : '/' + } + config.headers['Content-Type'] = 'application/json' return config }, diff --git a/src/views/components/bookSwiper.vue b/src/views/components/bookSwiper.vue index b150f1d..8fe8dca 100644 --- a/src/views/components/bookSwiper.vue +++ b/src/views/components/bookSwiper.vue @@ -46,11 +46,15 @@ height="150" > + > + + diff --git a/src/views/components/canvasPreview.vue b/src/views/components/canvasPreview.vue index 74d8093..e27fb84 100644 --- a/src/views/components/canvasPreview.vue +++ b/src/views/components/canvasPreview.vue @@ -20,11 +20,13 @@ - - diff --git a/src/views/visualCheck/checkManage/dataScreening/shelfList.vue b/src/views/visualCheck/checkManage/dataScreening/shelfList.vue index 4fe78ec..d8eda7f 100644 --- a/src/views/visualCheck/checkManage/dataScreening/shelfList.vue +++ b/src/views/visualCheck/checkManage/dataScreening/shelfList.vue @@ -18,8 +18,8 @@