From 862183b42ae0b33852a1a3fafbe8e0e042b59e54 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 5 Jul 2024 17:50:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E6=9C=AC=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=A9=B3=E5=9B=9E=E5=8A=9F=E8=83=BD=E6=9A=82?= =?UTF-8?q?=E5=81=9C=E4=BD=BF=E7=94=A8=EF=BC=8C=E6=89=AB=E6=8F=8F=E4=BB=AA?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/storagecost/index.js | 0 src/components/webCameraIMG/webCamera.vue | 36 ++- .../Warehouseinformationconfiguration.js | 190 +++++++++++ .../storagecost/Monthlyorderwarehousing.vue | 11 + .../storagecost/OrderTotalTransferDetails.vue | 11 + .../cost/storagecost/OrderTotalWarehouse.vue | 11 + .../storagecost/Transferwarehouseorders.vue | 11 + .../Transferwarehousestatistics.vue | 11 + .../cost/storagecost/WarehouseMonthly.vue | 11 + .../Warehouseinformationconfiguration.vue | 306 ++++++++++++++++++ .../storagecost/Warehouserentalmanagement.vue | 11 + .../distributionDeliveryListedt.vue | 5 + .../stockup/distributionStockupSelf.vue | 2 +- 13 files changed, 608 insertions(+), 8 deletions(-) create mode 100644 src/api/storagecost/index.js create mode 100644 src/option/storagecost/Warehouseinformationconfiguration.js create mode 100644 src/views/cost/storagecost/Monthlyorderwarehousing.vue create mode 100644 src/views/cost/storagecost/OrderTotalTransferDetails.vue create mode 100644 src/views/cost/storagecost/OrderTotalWarehouse.vue create mode 100644 src/views/cost/storagecost/Transferwarehouseorders.vue create mode 100644 src/views/cost/storagecost/Transferwarehousestatistics.vue create mode 100644 src/views/cost/storagecost/WarehouseMonthly.vue create mode 100644 src/views/cost/storagecost/Warehouseinformationconfiguration.vue create mode 100644 src/views/cost/storagecost/Warehouserentalmanagement.vue diff --git a/src/api/storagecost/index.js b/src/api/storagecost/index.js new file mode 100644 index 00000000..e69de29b diff --git a/src/components/webCameraIMG/webCamera.vue b/src/components/webCameraIMG/webCamera.vue index bca59d29..748fb872 100644 --- a/src/components/webCameraIMG/webCamera.vue +++ b/src/components/webCameraIMG/webCamera.vue @@ -74,6 +74,7 @@ const initialIndex = ref(0); // 初始显示的索引 const imagePreviewRefs = ref([]); let IMG_API_SERVER = reactive(true); //true表示线上环境，false表示开发环境 let IMG_Trimming_edge = ref(false); //图片裁边 +let rectifying = ref(0); //裁边 let IMG_startUp = ref(false); //摄像头是否启动 let IMG_API = ref('/api/blade-resource/oss/endpoint/put-file'); let zoom = ref(5); //图片缩放等级 @@ -89,7 +90,7 @@ const props = defineProps({ watch( () => props.IMGstate, - (newValue) => { + newValue => { if (newValue != IMGstate.value) { IMGstate.value = props.IMGstate; IMG_suoluetuList.value = []; //重置拍摄图片 @@ -160,9 +161,29 @@ const IsConnect = async () => { //(开启/关闭)图像裁边 const Opentrimming = () => { IMG_Trimming_edge.value = !IMG_Trimming_edge.value; - const message = IMG_Trimming_edge.value ? '图像裁边已开启' : '图像裁边已关闭'; - ElMessage({ message, type: 'success' }); - mylog(message); + if (IMG_Trimming_edge.value) { + rectifying.value = '1'; + } else { + rectifying.value = '0'; + } + let data = { + camidx: '0', // 摄像头索引，0：主头；1：副头 + open: rectifying.value, // 状态，0：关；1：开 + }; + request('http://127.0.0.1:38088/dvideo=cameradeskew', 'POST', data) + .then(response => { + const message = ''; + if (response.code !== '0') { + message = IMG_Trimming_edge.value ? '图像裁边已开启' : '图像裁边已关闭'; + ElMessage({ message, type: 'success' }); + mylog(message); + } else { + mylog(message); + } + }) + .catch(error => { + console.error('Error:', error); + }); }; // 开启摄像头 @@ -229,12 +250,13 @@ const Upload_Images = file => { const fileBlob = new Blob([file], { type: filetype }); const fileWithMetadata = new File([fileBlob], filename, { type: filetype }); formData.append('file', fileWithMetadata); - axios.post(IMG_API.value, formData) + axios + .post(IMG_API.value, formData) .then(res => { - if(res.data.code ===200){ + if (res.data.code === 200) { console.log(res, '图片上传成功'); ElMessage({ message: '图片上传成功', type: 'success' }); - $emit('upload-success', res);//图片地址传递出去 + $emit('upload-success', res); //图片地址传递出去 } }) .catch(error => { diff --git a/src/option/storagecost/Warehouseinformationconfiguration.js b/src/option/storagecost/Warehouseinformationconfiguration.js new file mode 100644 index 00000000..877ceacb --- /dev/null +++ b/src/option/storagecost/Warehouseinformationconfiguration.js @@ -0,0 +1,190 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'a', + label: '仓库名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '维护状态 ', + type: 3, + values: '', + width: '150', + checkarr: [ + { + label: '已维护', + value: '已维护', + }, + { + label: '未维护', + value: '未维护', + }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '仓库总面积（㎡）', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'aa', + label: '月租金(元/月)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '租赁合同开始时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '租赁合同结束时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '临时周转面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '库位数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '单库位面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '单库位面积(㎡)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '代作业入库费(元/件)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '代作业出库费(元/件)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '修改时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'a', + label: '修改人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/views/cost/storagecost/Monthlyorderwarehousing.vue b/src/views/cost/storagecost/Monthlyorderwarehousing.vue new file mode 100644 index 00000000..ba58b627 --- /dev/null +++ b/src/views/cost/storagecost/Monthlyorderwarehousing.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/OrderTotalTransferDetails.vue b/src/views/cost/storagecost/OrderTotalTransferDetails.vue new file mode 100644 index 00000000..baac76e0 --- /dev/null +++ b/src/views/cost/storagecost/OrderTotalTransferDetails.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/OrderTotalWarehouse.vue b/src/views/cost/storagecost/OrderTotalWarehouse.vue new file mode 100644 index 00000000..6c0e8bf9 --- /dev/null +++ b/src/views/cost/storagecost/OrderTotalWarehouse.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Transferwarehouseorders.vue b/src/views/cost/storagecost/Transferwarehouseorders.vue new file mode 100644 index 00000000..2ea14797 --- /dev/null +++ b/src/views/cost/storagecost/Transferwarehouseorders.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue new file mode 100644 index 00000000..a97aafc7 --- /dev/null +++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/WarehouseMonthly.vue b/src/views/cost/storagecost/WarehouseMonthly.vue new file mode 100644 index 00000000..72ff2614 --- /dev/null +++ b/src/views/cost/storagecost/WarehouseMonthly.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Warehouseinformationconfiguration.vue b/src/views/cost/storagecost/Warehouseinformationconfiguration.vue new file mode 100644 index 00000000..97dfbdd4 --- /dev/null +++ b/src/views/cost/storagecost/Warehouseinformationconfiguration.vue @@ -0,0 +1,306 @@ + + + + + + \ No newline at end of file diff --git a/src/views/cost/storagecost/Warehouserentalmanagement.vue b/src/views/cost/storagecost/Warehouserentalmanagement.vue new file mode 100644 index 00000000..1eb35523 --- /dev/null +++ b/src/views/cost/storagecost/Warehouserentalmanagement.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 25481450..dd3f8088 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -3955,6 +3955,11 @@ if($useStore.getters && $useStore.getters.permission){ }); }, RejectFn(row){ + ElMessage({ + message: '功能维护中', + type: 'warning', + }); + return console.log(row); this.RejectRow=row; this.dialogViReject=true; diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index 433c66ea..f780514f 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -799,7 +799,7 @@ export default { if (!a) { this.num = '3'; this.dialogFormCustomer = true; - // this.getFork(); + this.getFork(); // this.getTeam(); } else { this.$message.warning('已指派，请勿重复指派！！！');