修复人物列表bug
This commit is contained in:
4
.env.dev
4
.env.dev
@@ -1,8 +1,8 @@
|
|||||||
NODE_ENV = 'development'
|
NODE_ENV = 'development'
|
||||||
# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
|
# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
|
||||||
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
|
VUE_APP_BASE_URL = 'https://api.aida.com.hk'
|
||||||
|
|
||||||
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
|
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
|
||||||
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
|
# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
|
||||||
# VUE_APP_BASE_URL = 'http://192.168.1.9:17088'
|
# VUE_APP_BASE_URL = 'http://192.168.1.9:17088'
|
||||||
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
|
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
|
||||||
|
|||||||
@@ -90,6 +90,7 @@
|
|||||||
<a-slider id="system_silder"
|
<a-slider id="system_silder"
|
||||||
v-model:value="workspaceItem.systemDesignerPercentage"
|
v-model:value="workspaceItem.systemDesignerPercentage"
|
||||||
@afterChange="systemDesigner"
|
@afterChange="systemDesigner"
|
||||||
|
:tooltip-visible="openType.slider"
|
||||||
:tip-formatter="formatter"
|
:tip-formatter="formatter"
|
||||||
>
|
>
|
||||||
</a-slider>
|
</a-slider>
|
||||||
|
|||||||
@@ -152,13 +152,13 @@ export default defineComponent({
|
|||||||
init(data:any){
|
init(data:any){
|
||||||
this.visible = true
|
this.visible = true
|
||||||
// this.getTaskList()
|
// this.getTaskList()
|
||||||
this.isShowMark = true
|
let time = 100
|
||||||
let time = 0
|
|
||||||
if(data){
|
if(data){
|
||||||
time = 1000
|
time = 1000
|
||||||
}
|
}
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.currentPage = 1
|
this.currentPage = 1
|
||||||
|
this.isShowMark = true
|
||||||
this.getTaskMoreList()
|
this.getTaskMoreList()
|
||||||
this.getTaskTime = null
|
this.getTaskTime = null
|
||||||
}, time);
|
}, time);
|
||||||
@@ -236,11 +236,11 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
|
Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
|
||||||
this.isShowMark = false
|
this.isShowMark = false
|
||||||
this.currentPage += 1
|
if(this.currentPage != 1 && rv.content.length == 0){
|
||||||
if(this.currentPage > 1 && rv.content.length == 0){
|
|
||||||
this.currentPage = 1
|
this.currentPage = 1
|
||||||
this.getTaskMoreList()
|
this.getTaskMoreList()
|
||||||
}else{
|
}else{
|
||||||
|
this.currentPage += 1
|
||||||
this.taskListMore.push(...rv.content)
|
this.taskListMore.push(...rv.content)
|
||||||
this.total = rv.total
|
this.total = rv.total
|
||||||
this.taskListUnfinished = []
|
this.taskListUnfinished = []
|
||||||
|
|||||||
@@ -518,7 +518,6 @@ export default defineComponent({
|
|||||||
this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
|
this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
|
||||||
|
|
||||||
this.workspacePosition.forEach((positionItem:any) => {
|
this.workspacePosition.forEach((positionItem:any) => {
|
||||||
console.log(sketchItem,positionItem);
|
|
||||||
|
|
||||||
if(positionItem.value == sketchItem.category){
|
if(positionItem.value == sketchItem.category){
|
||||||
num ++
|
num ++
|
||||||
@@ -635,6 +634,7 @@ export default defineComponent({
|
|||||||
"setDesignCollectionList",
|
"setDesignCollectionList",
|
||||||
rv.designCollectionItems
|
rv.designCollectionItems
|
||||||
);
|
);
|
||||||
|
|
||||||
this.store.commit("setLikeDesignCollectionList", []);
|
this.store.commit("setLikeDesignCollectionList", []);
|
||||||
this.store.commit("deleteUserGroupId");
|
this.store.commit("deleteUserGroupId");
|
||||||
this.store.commit(
|
this.store.commit(
|
||||||
@@ -644,7 +644,6 @@ export default defineComponent({
|
|||||||
this.store.commit("setDesignId", rv.designId);
|
this.store.commit("setDesignId", rv.designId);
|
||||||
// this.designProgress = 0;
|
// this.designProgress = 0;
|
||||||
this.startDesignType = "design";
|
this.startDesignType = "design";
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((res) => {
|
.catch((res) => {
|
||||||
@@ -679,6 +678,7 @@ export default defineComponent({
|
|||||||
);
|
);
|
||||||
// this.designProgress = 0,
|
// this.designProgress = 0,
|
||||||
this.startDesignType = "resDesign";
|
this.startDesignType = "resDesign";
|
||||||
|
this.store.commit("setDesignId", rv.designId);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((res) => {
|
.catch((res) => {
|
||||||
@@ -828,6 +828,7 @@ export default defineComponent({
|
|||||||
if (this.likeLoading) {
|
if (this.likeLoading) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.likeLoading = true;
|
this.likeLoading = true;
|
||||||
Https.axiosPost(Https.httpUrls.designLike, data)
|
Https.axiosPost(Https.httpUrls.designLike, data)
|
||||||
.then((rv: any) => {
|
.then((rv: any) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user