From e7a6822bc1c1c1ba8cd15926485ffcd9153bc464 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 3 Apr 2024 14:14:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AF=BC=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/productComponent/addProduct.vue | 24 +++++++++++++++---- .../productComponent/productPicUpload.vue | 5 ++-- src/tool/https.js | 1 + src/views/LoginPage.vue | 2 +- src/views/childView/exportExcil.vue | 4 +++- .../childView/systemSetting/roleManage.vue | 2 +- vue.config.js | 3 ++- 7 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/component/productComponent/addProduct.vue b/src/component/productComponent/addProduct.vue index fee9c61..fb471d0 100644 --- a/src/component/productComponent/addProduct.vue +++ b/src/component/productComponent/addProduct.vue @@ -196,16 +196,15 @@ export default defineComponent({ Https.axiosPost(Https.httpUrls.batchUploadProductRelation, data).then( (rv: any) => { if (rv) { - submitLoading.value = false - showDesignMark.value = false - emit('confirmSubmitAdd') + // submitLoading.value = false + // showDesignMark.value = false formState.value = { pictureList: '', productLabel:[], storeInventory:'', } clearChildData() - addProductModal.value = false + // addProductModal.value = false storeNameList.value = '' designProgress.value = 0 uploadType.value = 'Attribute' @@ -226,6 +225,8 @@ export default defineComponent({ let submitProcess = () =>{ Https.axiosPost(Https.httpUrls.countProductUpdateProcess, {}).then( (rv: any) => { + console.log(rv.process); + if(rv.status != 1 && showDesignMark.value){ let designProgressNew:any = rv.process * 100 designProgress.value = parseInt(designProgressNew) @@ -233,7 +234,20 @@ export default defineComponent({ setTimeout(()=>{ submitProcess() },2000) - } + }else{ + + let designProgressNew:any = rv.process * 100 + designProgress.value = parseInt(designProgressNew) + setTimeout(() => { + submitLoading.value = false + showDesignMark.value = false + addProductModal.value = false + emit('confirmSubmitAdd') + + }, 1000); + + + } } ); } diff --git a/src/component/productComponent/productPicUpload.vue b/src/component/productComponent/productPicUpload.vue index 27cdafa..a1ec6b8 100644 --- a/src/component/productComponent/productPicUpload.vue +++ b/src/component/productComponent/productPicUpload.vue @@ -130,8 +130,7 @@ export default defineComponent({ let beforeUpload = (file:any,fileList:any) => { const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp'; beforeUploadIndex = beforeUploadIndex +1 - console.log(file, 66) - if(fileList.length > 10 && beforeUploadIndex == fileList.length){ + if(fileList.length > 100 && beforeUploadIndex == fileList.length){ message.error('You can only upload 10 pictures at a time!'); } if (!isJpgOrPng) { @@ -144,7 +143,7 @@ export default defineComponent({ if(beforeUploadIndex == fileList.length) { beforeUploadIndex = 0 } - return (isJpgOrPng && isLt2M && fileList.length <= 10) || Upload.LIST_IGNORE; + return (isJpgOrPng && isLt2M && fileList.length <= 100) || Upload.LIST_IGNORE; } let deleteFile = (index:any) =>{ diff --git a/src/tool/https.js b/src/tool/https.js index d72e0fe..d2436fc 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -33,6 +33,7 @@ axios.interceptors.response.use((res) =>{ return Promise.resolve(res.data.data); } else if(!res.data.errMsg){ + console.log(res); let obj = { data:res.data, type:res.headers['content-type'], diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue index 1ecb5f1..a933d95 100644 --- a/src/views/LoginPage.vue +++ b/src/views/LoginPage.vue @@ -99,7 +99,7 @@ export default defineComponent({ ] }, { - name:'Export Excil', + name:'Report Exporting', code:'MI_TU_EXPORT', route:'/home/exportExcil', icon:'icon-xiazaiwenjian', diff --git a/src/views/childView/exportExcil.vue b/src/views/childView/exportExcil.vue index 14af33d..87fa021 100644 --- a/src/views/childView/exportExcil.vue +++ b/src/views/childView/exportExcil.vue @@ -4,7 +4,7 @@
- + { Https.axiosGet(Https.httpUrls.miTuExportExport+`/${data.id}`,{responseType: 'blob'}).then((rv)=>{ + console.log(rv.name); + let name = rv.name.split('=')[1]; let url = window.URL.createObjectURL(new Blob([rv.data], { type: rv.type })); const link = document.createElement('a'); diff --git a/src/views/childView/systemSetting/roleManage.vue b/src/views/childView/systemSetting/roleManage.vue index 1470828..2ddf50f 100644 --- a/src/views/childView/systemSetting/roleManage.vue +++ b/src/views/childView/systemSetting/roleManage.vue @@ -53,7 +53,7 @@
Role Permission
All - +
{{ rolePermission }}
{{role.resource}}
diff --git a/vue.config.js b/vue.config.js index a2dbbc0..b5906ed 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,7 +9,8 @@ module.exports = defineConfig({ proxy: { "/api": { // target: 'http://18.167.251.121:5568', //后端接口地址 - target: 'http://192.168.1.9:5560/', //后端接口地址 + // target: 'http://192.168.1.9:5560/', //后端接口地址 + target: 'http://18.167.251.121:10220/', //后端接口地址 changeOrigin: true, //是否允许跨越 } },