测试导出问题
This commit is contained in:
@@ -196,16 +196,15 @@ export default defineComponent({
|
|||||||
Https.axiosPost(Https.httpUrls.batchUploadProductRelation, data).then(
|
Https.axiosPost(Https.httpUrls.batchUploadProductRelation, data).then(
|
||||||
(rv: any) => {
|
(rv: any) => {
|
||||||
if (rv) {
|
if (rv) {
|
||||||
submitLoading.value = false
|
// submitLoading.value = false
|
||||||
showDesignMark.value = false
|
// showDesignMark.value = false
|
||||||
emit('confirmSubmitAdd')
|
|
||||||
formState.value = {
|
formState.value = {
|
||||||
pictureList: '',
|
pictureList: '',
|
||||||
productLabel:[],
|
productLabel:[],
|
||||||
storeInventory:'',
|
storeInventory:'',
|
||||||
}
|
}
|
||||||
clearChildData()
|
clearChildData()
|
||||||
addProductModal.value = false
|
// addProductModal.value = false
|
||||||
storeNameList.value = ''
|
storeNameList.value = ''
|
||||||
designProgress.value = 0
|
designProgress.value = 0
|
||||||
uploadType.value = 'Attribute'
|
uploadType.value = 'Attribute'
|
||||||
@@ -226,6 +225,8 @@ export default defineComponent({
|
|||||||
let submitProcess = () =>{
|
let submitProcess = () =>{
|
||||||
Https.axiosPost(Https.httpUrls.countProductUpdateProcess, {}).then(
|
Https.axiosPost(Https.httpUrls.countProductUpdateProcess, {}).then(
|
||||||
(rv: any) => {
|
(rv: any) => {
|
||||||
|
console.log(rv.process);
|
||||||
|
|
||||||
if(rv.status != 1 && showDesignMark.value){
|
if(rv.status != 1 && showDesignMark.value){
|
||||||
let designProgressNew:any = rv.process * 100
|
let designProgressNew:any = rv.process * 100
|
||||||
designProgress.value = parseInt(designProgressNew)
|
designProgress.value = parseInt(designProgressNew)
|
||||||
@@ -233,7 +234,20 @@ export default defineComponent({
|
|||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
submitProcess()
|
submitProcess()
|
||||||
},2000)
|
},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);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -130,8 +130,7 @@ export default defineComponent({
|
|||||||
let beforeUpload = (file:any,fileList:any) => {
|
let beforeUpload = (file:any,fileList:any) => {
|
||||||
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
|
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
|
||||||
beforeUploadIndex = beforeUploadIndex +1
|
beforeUploadIndex = beforeUploadIndex +1
|
||||||
console.log(file, 66)
|
if(fileList.length > 100 && beforeUploadIndex == fileList.length){
|
||||||
if(fileList.length > 10 && beforeUploadIndex == fileList.length){
|
|
||||||
message.error('You can only upload 10 pictures at a time!');
|
message.error('You can only upload 10 pictures at a time!');
|
||||||
}
|
}
|
||||||
if (!isJpgOrPng) {
|
if (!isJpgOrPng) {
|
||||||
@@ -144,7 +143,7 @@ export default defineComponent({
|
|||||||
if(beforeUploadIndex == fileList.length) {
|
if(beforeUploadIndex == fileList.length) {
|
||||||
beforeUploadIndex = 0
|
beforeUploadIndex = 0
|
||||||
}
|
}
|
||||||
return (isJpgOrPng && isLt2M && fileList.length <= 10) || Upload.LIST_IGNORE;
|
return (isJpgOrPng && isLt2M && fileList.length <= 100) || Upload.LIST_IGNORE;
|
||||||
}
|
}
|
||||||
|
|
||||||
let deleteFile = (index:any) =>{
|
let deleteFile = (index:any) =>{
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ axios.interceptors.response.use((res) =>{
|
|||||||
return Promise.resolve(res.data.data);
|
return Promise.resolve(res.data.data);
|
||||||
|
|
||||||
} else if(!res.data.errMsg){
|
} else if(!res.data.errMsg){
|
||||||
|
console.log(res);
|
||||||
let obj = {
|
let obj = {
|
||||||
data:res.data,
|
data:res.data,
|
||||||
type:res.headers['content-type'],
|
type:res.headers['content-type'],
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ export default defineComponent({
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name:'Export Excil',
|
name:'Report Exporting',
|
||||||
code:'MI_TU_EXPORT',
|
code:'MI_TU_EXPORT',
|
||||||
route:'/home/exportExcil',
|
route:'/home/exportExcil',
|
||||||
icon:'icon-xiazaiwenjian',
|
icon:'icon-xiazaiwenjian',
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<div class="list_top_content">
|
<div class="list_top_content">
|
||||||
<div class="list_top_search_content">
|
<div class="list_top_search_content">
|
||||||
<div class="search_content_left">
|
<div class="search_content_left">
|
||||||
<filterComponent :title="'Role Name or Id'"><a-input v-model:value="name" size="large" placeholder="Please input Role Name or Id" @keydown.enter="searchList()"/></filterComponent>
|
<filterComponent :title="'Statement Name'"><a-input v-model:value="name" size="large" placeholder="Please input Role Name or Id" @keydown.enter="searchList()"/></filterComponent>
|
||||||
<filterComponent :title="'Period'">
|
<filterComponent :title="'Period'">
|
||||||
<a-select
|
<a-select
|
||||||
v-model:value="type"
|
v-model:value="type"
|
||||||
@@ -137,6 +137,8 @@ export default defineComponent({
|
|||||||
|
|
||||||
let setExport = (data:any,index:any) =>{
|
let setExport = (data:any,index:any) =>{
|
||||||
Https.axiosGet(Https.httpUrls.miTuExportExport+`/${data.id}`,{responseType: 'blob'}).then((rv)=>{
|
Https.axiosGet(Https.httpUrls.miTuExportExport+`/${data.id}`,{responseType: 'blob'}).then((rv)=>{
|
||||||
|
console.log(rv.name);
|
||||||
|
|
||||||
let name = rv.name.split('=')[1];
|
let name = rv.name.split('=')[1];
|
||||||
let url = window.URL.createObjectURL(new Blob([rv.data], { type: rv.type }));
|
let url = window.URL.createObjectURL(new Blob([rv.data], { type: rv.type }));
|
||||||
const link = document.createElement('a');
|
const link = document.createElement('a');
|
||||||
|
|||||||
@@ -53,7 +53,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="form_item_title required">Role Permission</div>
|
<div class="form_item_title required">Role Permission</div>
|
||||||
<a-checkbox class="form_check_all" size="large" v-model:checked="permissionCheckAll" @change="perCheckAll">All</a-checkbox>
|
<a-checkbox class="form_check_all" size="large" v-model:checked="permissionCheckAll" @change="perCheckAll">All</a-checkbox>
|
||||||
<table class="permission_table">
|
<table class="permission_table">{{ rolePermission }}
|
||||||
<tr v-for="(role) in rolePermission" :key="role.code">
|
<tr v-for="(role) in rolePermission" :key="role.code">
|
||||||
<td class="first_td">
|
<td class="first_td">
|
||||||
<div class="table_td_block"><a-checkbox size="large" v-model:checked="role.select" @change="checkLevelFirst(role)">{{role.resource}}</a-checkbox></div>
|
<div class="table_td_block"><a-checkbox size="large" v-model:checked="role.select" @change="checkLevelFirst(role)">{{role.resource}}</a-checkbox></div>
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ module.exports = defineConfig({
|
|||||||
proxy: {
|
proxy: {
|
||||||
"/api": {
|
"/api": {
|
||||||
// target: 'http://18.167.251.121:5568', //后端接口地址
|
// 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, //是否允许跨越
|
changeOrigin: true, //是否允许跨越
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user