diff --git a/.env.production b/.env.production index 9fbb141..e6e0e99 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http -VUE_APP_BASE_API = 'http://27.16.212.58:11100' +VUE_APP_BASE_API = 'http://192.168.3.220:12010' # 如果接口是 http 形式， wss 需要改为 ws -VUE_APP_WS_API = 'ws://27.16.212.58:11100' -VUE_APP_CAMERA_API = '192.168.99.107:3000' +#VUE_APP_WS_API = 'ws://27.16.212.58:11100' +#VUE_APP_CAMERA_API = '192.168.99.107:3000' diff --git a/public/static/config.js b/public/static/config.js index 7efc6c8..29aefbd 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -1,6 +1,6 @@ window.g = { AXIOS_TIMEOUT: 10000, - ApiUrl: 'http://27.16.212.58:11100', // 配置服务器地址, + ApiUrl: 'http://192.168.3.220:12010', // 配置服务器地址, // ParentPage: { // 后续看需求配置 // CrossDomainProxyUrl: '/Home/CrossDomainProxy', // BtnsApi: '/api/services/app/Authorization/GetBtns', diff --git a/src/api/stockTaskLog/index.js b/src/api/stockTaskLog/index.js index 68f88bc..6273ec3 100644 --- a/src/api/stockTaskLog/index.js +++ b/src/api/stockTaskLog/index.js @@ -83,6 +83,14 @@ export function FetchStockGirdNum(params) { }) } +// 获取目标区域层架位总数量 +export function FetchTotalGirdNum(params) { + return request({ + url: 'api/stocktask-task/getTotalGirdNum' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + // 手动创建盘点任务 export function add(data) { return request({ @@ -92,4 +100,4 @@ export function add(data) { }) } -export default { del, FetchStopStockBill, FetchInitStockLogList, FetchInitStockLogDetails, FetchProgressByStockBillAndGridCode, FetchInitStockTaskDetails, FetchNewBillNo, FetchStockGirdNum, add } +export default { del, FetchStopStockBill, FetchInitStockLogList, FetchInitStockLogDetails, FetchProgressByStockBillAndGridCode, FetchInitStockTaskDetails, FetchNewBillNo, FetchStockGirdNum, FetchTotalGirdNum, add } diff --git a/src/assets/styles/manage.scss b/src/assets/styles/manage.scss index 7680d7c..cf36451 100644 --- a/src/assets/styles/manage.scss +++ b/src/assets/styles/manage.scss @@ -538,4 +538,104 @@ margin-left: 10px; } } +} + +.tooltip-style, +.popover-external-set { + width: 250px; + background:rgba(0,0,0,1); + color: #fff; + border-radius: 6px; +} + +.tooltip-style{ + display:none; + position:absolute; +} + +.popover-external-set { + position: fixed; + z-index: 1000; +} + +.tooltip-style, +.popover-content-set{ + .tooltip-top{ + display: flex; + justify-content: space-between; + align-items: center; + font-size: 14px; + height: 40px; + line-height: 40px; + padding: 0 10px; + border-bottom: 1px solid #fff; + } + .tooltip-top span, + .tooltip-top i{ + font-size: 12px; + font-style: normal; + } + ul{ + padding: 10px; + } + ul li{ + display: flex; + justify-content: flex-start; + align-items: center; + line-height: 24px; + font-style: normal; + font-size: 12px; + } + + ul li p{ + width: 60px; + font-weight: bold; + text-align: right; + } + ul li span, + ul li em{ + width: 100px; + display: block; + text-align: right; + font-style: normal; + } + ul li i{ + font-style: normal; + font-weight: bold; + padding: 0 10px; + color: #0348f3; + } + ul li span.percentage, + ul li em.percentage{ + width: auto; + } + + .tag-item{ + display: block; + // width: 50px; + height: 18px; + line-height: 16px; + padding: 0 4px; + border-radius: 3px; + font-size: 12px; + color: #A6ADB6; + border: 1px solid #E6E8ED; + background-color: #F3F5F9; + text-align: center; + &.tag-sort{ + color: #FD7359 !important; + border-color: #FBC0B5 !important; + background-color: #FCECE9 !important; + } + &.tag-place{ + color: #018BFF !important; + border-color: #9BD1FF !important; + background-color: #DCEDFD !important; + } + &.tag-all{ + color: #0C0E1E; + border-color: #545B65 !important; + background-color: #E6E8ED !important; + } + } } \ No newline at end of file diff --git a/src/views/components/canvasPreview.vue b/src/views/components/canvasPreview.vue index 2d1c479..cb7eace 100644 --- a/src/views/components/canvasPreview.vue +++ b/src/views/components/canvasPreview.vue @@ -267,59 +267,6 @@ export default { } } - diff --git a/src/views/visualCheck/checkManage/dataScreening/module/form.vue b/src/views/visualCheck/checkManage/dataScreening/module/form.vue index 9a094a5..79105ea 100644 --- a/src/views/visualCheck/checkManage/dataScreening/module/form.vue +++ b/src/views/visualCheck/checkManage/dataScreening/module/form.vue @@ -34,7 +34,7 @@ import crudStockTaskLog from '@/api/stockTaskLog/index' import CRUD, { form } from '@crud/crud' -const defaultForm = { stockTypeName: '', stockType: null, stockBill: null, stockRegion: '', stockGridNum: null, stockGridNumName: null, stockRemarks: null, regionId: null, shelfId: null, gridShelf: null, gridId: null } +const defaultForm = { stockTypeName: '', stockType: null, stockBill: null, stockRegion: '', stockGridNum: null, stockGridNumName: null, totalGridNum: null, stockRemarks: null, regionId: null, shelfId: null, gridShelf: null, gridId: null } export default { name: 'DataForm', mixins: [ @@ -106,11 +106,13 @@ export default { this.form.stockTypeName = stockTypeName Promise.all([ crudStockTaskLog.FetchNewBillNo(), - crudStockTaskLog.FetchStockGirdNum(params) - ]).then(([newBillNoRes, stockGridNumRes]) => { + crudStockTaskLog.FetchStockGirdNum(params), + crudStockTaskLog.FetchTotalGirdNum(params) + ]).then(([newBillNoRes, stockGridNumRes, totalGirdNumRes]) => { this.form.stockBill = newBillNoRes - this.form.stockGridNumName = stockGridNumRes + ' / 层位' - this.form.stockGridNum = stockGridNumRes + this.crud.form.stockGridNumName = stockGridNumRes + ' / ' + totalGirdNumRes + ' 层位' + this.crud.form.stockGridNum = stockGridNumRes + this.crud.form.totalGridNum = totalGirdNumRes }).catch(error => { console.error(error) }) @@ -127,17 +129,17 @@ export default { delete this.form.stockGridNumName delete this.form.stockTypeName console.log('this.form', this.form) - // crudStockTaskLog.add(this.form).then((res) => { - // if (res.code !== 500) { - // this.$message({ message: '新增盘点成功', type: 'success', offset: 8 }) - // } else { - // this.$message({ message: res.message, type: 'error', offset: 8 }) - // } - // this.handleCloseForm() - // // this.$emit('refresh') - // }).catch(err => { - // console.log(err) - // }) + crudStockTaskLog.add(this.form).then((res) => { + if (res.code !== 500) { + this.$message({ message: '新增盘点成功', type: 'success', offset: 8 }) + } else { + this.$message({ message: res.message, type: 'error', offset: 8 }) + } + this.handleCloseForm() + // this.$emit('refresh') + }).catch(err => { + console.log(err) + }) } else { return false } diff --git a/src/views/visualCheck/checkManage/dataScreening/shelfList.vue b/src/views/visualCheck/checkManage/dataScreening/shelfList.vue index 92876e2..091df09 100644 --- a/src/views/visualCheck/checkManage/dataScreening/shelfList.vue +++ b/src/views/visualCheck/checkManage/dataScreening/shelfList.vue @@ -53,16 +53,17 @@