aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改generate传参

Browse Source
This commit is contained in:
X1627315083
2024-01-26 13:16:47 +08:00
parent a75342fe08
commit a90333517d
11 changed files with 524 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/component/Detail/DesignPrintOperation.vue
View File

@@ -756,7 +756,7 @@ export default defineComponent({
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.4rem*1.2));
height: calc(65rem*1.2*1.2);
height: calc(65rem*1.2);
display: flex;
overflow-y: hidden;
flex-direction: column;

2
src/component/Detail/DesignPrintOperationMobile.vue
View File

@@ -758,7 +758,7 @@ export default defineComponent({
.ant-modal-body{
padding: calc(4rem*1.2) calc(5rem*1.2) calc(0rem*1.2)!important;
// height: calc(65vh - 6.4rem*1.2));
height: calc(65rem*1.2*1.2);
height: calc(65rem*1.2);
display: flex;
overflow-y: hidden;
flex-direction: column;

41
src/component/HomePage/Generate.vue
View File

@@ -173,14 +173,15 @@
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading_text" v-show="generateLineUp >= 0">
<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
</div>
<div class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading_text" v-show="generateLineUp >= 0">
<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
</div>
<div v-show="remGenerate" :class="[driver__.driver?'hideEvents':'']" class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
</div>
<scaleImage ref="scaleImage"></scaleImage>
</div>
@@ -260,7 +261,9 @@ export default defineComponent({
let userInfo:any = {}
let generateId:any = ref()
let generateTime:any = ref()
let generateLineUp:any = ref(0)
let generateLineUp:any = ref(-1)
let remGenerate:any = ref(false)
let remGenerateTime:any = ref()
return {
imgList,
selectImgList,
@@ -296,6 +299,8 @@ export default defineComponent({
generateId,
generateTime,
generateLineUp,
remGenerate,
remGenerateTime,
};
},
data(prop) {
@@ -503,6 +508,8 @@ export default defineComponent({
})
},
getgenerate(){
clearInterval(this.remGenerateTime)
this.remGenerate = false
if(this.isTest){//试用用户禁止使用
message.info(
this.t('isTest.available')
@@ -550,6 +557,9 @@ export default defineComponent({
if(rv){
this.generateId = rv
this.setGenerate()
this.remGenerateTime = setTimeout(()=>{
this.remGenerate = true
},10000)
}else{
// this.loadingShow = false
}
@@ -589,7 +599,7 @@ export default defineComponent({
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
(rv) => {
if(rv.generateId){
this.generateLineUp = 0
this.generateLineUp = -1
this.fileList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
@@ -608,12 +618,9 @@ export default defineComponent({
}
})
clearInterval(this.generateTime)
}else if(rv.rankPosition == null){
this.generateLineUp = 0
// this.loadingShow = false
}else if(rv.rankPosition == 0){
this.generateLineUp = 0
// this.loadingShow = false
clearInterval(this.remGenerateTime)
this.remGenerate = false
}else{
this.generateLineUp = rv.rankPosition
}
@@ -624,12 +631,12 @@ export default defineComponent({
},
removeGenerate(){
if(this.generateId){
let data = {uniqueId:this.generateId}
let data = {uniqueId:this.generateId,userId:this?.userInfo?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
(rv) => {
this.generateId = ''
this.loadingShow = false
this.generateLineUp = 0
this.generateLineUp = -1
clearInterval(this.generateTime)
}
).catch(res=>{

33
src/component/HomePage/PrintboardUpload.vue
View File

@@ -125,15 +125,15 @@
<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
<div class="mark_loading_text" v-show="generateLineUp >= 0">
<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
</div>
<div class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
<div v-show="remGenerate" :class="[driver__.driver?'hideEvents':'']" class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
</div>
</div>
</div>
</div>
<!-- 取消请求 -->
@@ -188,7 +188,9 @@ export default defineComponent({
let userInfo:any = {}
let generateId:any = ref()
let generateTime:any = ref()
let generateLineUp:any = ref(0)
let generateLineUp:any = ref(-1)
let remGenerate:any = ref(false)
let remGenerateTime:any = ref()
return {
fileList,
printImgList,
@@ -207,6 +209,8 @@ export default defineComponent({
generateId,
generateTime,
generateLineUp,
remGenerate,
remGenerateTime,
}
},
computed:{
@@ -578,6 +582,8 @@ export default defineComponent({
},500)
},
getgenerate(){
clearInterval(this.remGenerateTime)
this.remGenerate = false
if(this.isTest){//试用用户禁止使用
message.warning(
this.t('isTest.available')
@@ -668,6 +674,9 @@ export default defineComponent({
if(rv){
this.generateId = rv
this.setGenerate()
this.remGenerateTime = setTimeout(()=>{
this.remGenerate = true
},10000)
}else{
// this.loadingShow = false
}
@@ -682,7 +691,7 @@ export default defineComponent({
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
(rv) => {
if(rv.generateId){
this.generateLineUp = 0
this.generateLineUp = -1
this.generateList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
@@ -701,12 +710,8 @@ export default defineComponent({
}
})
clearInterval(this.generateTime)
}else if(rv.rankPosition == null){
this.generateLineUp = 0
// this.loadingShow = false
}else if(rv.rankPosition == 0){
this.generateLineUp = 0
// this.loadingShow = false
clearInterval(this.remGenerateTime)
this.remGenerate = false
}else{
this.generateLineUp = rv.rankPosition
}
@@ -717,12 +722,12 @@ export default defineComponent({
},
removeGenerate(){
if(this.generateId){
let data = {uniqueId:this.generateId}
let data = {uniqueId:this.generateId,userId:this?.userInfo?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
(rv) => {
this.generateId = ''
this.loadingShow = false
this.generateLineUp = 0
this.generateLineUp = -1
clearInterval(this.generateTime)
}
).catch(res=>{

42
src/component/HomePage/SketchboardUpload.vue
View File

@@ -247,14 +247,15 @@
<a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox>
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
</div>
<div class="mark_loading" v-show="loadingShow && remGenerate">
<a-spin size="large" />
<div class="mark_loading_text" v-show="generateLineUp >= 0">
<div>{{$t('Generate.Sequence')}}: {{ generateLineUp }}</div>
</div>
<div class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div>
<div v-show="remGenerate" class="mark_loading_btn" :class="[driver__.driver?'hideEvents':'']" @click="removeGenerate">{{$t('Generate.Close')}}</div>
</div>
</div>
</div>
</div>
<scaleImage ref="scaleImage"></scaleImage>
@@ -306,7 +307,9 @@ export default defineComponent({
let userInfo:any = {}
let generateId:any = ref()
let generateTime:any = ref()
let generateLineUp:any = ref(0)
let generateLineUp:any = ref(-1)
let remGenerate:any = ref(false)
let remGenerateTime:any = ref()
return {
fileList,
openClick,
@@ -326,6 +329,8 @@ export default defineComponent({
generateId,
generateTime,
generateLineUp,
remGenerate,
remGenerateTime,
};
},
data() {
@@ -687,6 +692,8 @@ export default defineComponent({
},
//发送请求生成图片
getgenerate(){
clearInterval(this.remGenerateTime)
this.remGenerate = false
// this.sketchCatecoryList = this.store.state.Workspace.workspacePosition
let sketchCatecoryList = this.sketchCatecoryList
if(this.isTest){//试用用户禁止使用
@@ -770,6 +777,9 @@ export default defineComponent({
if(rv){
this.generateId = rv
this.setGenerate()
this.remGenerateTime = setTimeout(()=>{
this.remGenerate = true
},10000)
}
}
).catch(res=>{
@@ -778,23 +788,29 @@ export default defineComponent({
},
setGenerate(){
let generage:any = this.$refs.Generate
let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
let sketchCatecoryList = this.sketchCatecoryList
let categoryValue:any
generage.sketchboardList.forEach((item:any) => {
if(item.checked){
categoryValue = item.categoryValue
}
});
this.generateTime = setInterval(()=>{
let data = {uniqueId:this.generateId}
Https.axiosGet(Https.httpUrls.generateResult, {params:data}).then(
(rv) => {
if(rv.generateId){
this.generateLineUp = 0
this.generateLineUp = -1
clearInterval(this.generateTime)
this.generateList = []
let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = {
id:v.generateItemId,
imgUrl:v.generateItemUrl,
category:generage.level2Type?generage.level2Type:sketchCatecoryList[0].name,
categoryValue:generage.level2Type?generage.level2Type:sketchCatecoryList[0].value,
categoryValue:categoryValue,
id_:GO.id++,
like:v.isLiked
}
@@ -806,12 +822,8 @@ export default defineComponent({
driverObj__.moveNext()
}
})
}else if(rv.rankPosition == null){
this.generateLineUp = 0
// this.loadingShow = false
}else if(rv.rankPosition == 0){
this.generateLineUp = 0
// this.loadingShow = false
clearInterval(this.remGenerateTime)
this.remGenerate = false
}else{
this.generateLineUp = rv.rankPosition
}
@@ -822,12 +834,12 @@ export default defineComponent({
},
removeGenerate(){
if(this.generateId){
let data = {uniqueId:this.generateId}
let data = {uniqueId:this.generateId,userId:this?.userInfo?.userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
(rv) => {
this.generateId = ''
this.loadingShow = false
this.generateLineUp = 0
this.generateLineUp = -1
clearInterval(this.generateTime)
}
).catch(res=>{