commit

src/component/HomePage/Generate.vue

@@ -270,15 +270,8 @@ export default defineComponent({
                 type1: "generate",
                 type2: prop.msg,
             },
-			workspaceCom:{}
         };
     },
-	watch:{
-		workspaceCom(newVal,oldVal){
-			this.workspace = newVal
-			this.getPosition()
-		},
-	},
     mounted() {
         // this.fileList.forEach((item,index)=>{
         // 	item.checked = true
@@ -288,9 +281,6 @@ export default defineComponent({
         // this.store.commit("addGenerateFils", this.fileList);
         this.token = getCookie("token") || "";
         this.uploadUrl = getUploadUrl();
-		this.workspaceCom = computed(()=>{
-			return  this.store?.state?.Workspace?.workspace
-		})
     },
     computed: {
         getSketchLabel(value: any) {
@@ -312,28 +302,7 @@ export default defineComponent({
 			data.resData = JSON.parse(JSON.stringify(data))
             this.store.commit("addGenerateMaterialFils", data);
         },
-		getPosition(){
-			let params
-			if(this.workspace.sex == 'Female'){
-				params = 'FemalePosition'
-			}else{
-				params = 'MalePosition'
-			}
-			Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
-				if (rv) {
-					let arr:any = []
-					rv.forEach((item:any) => {
-						let obj = {
-							value:item.name,
-							label:item.name,
-						}
-						arr.push(obj)						
-					});
-					
-					this.sketchCatecoryList = arr
-				}
-			})
-		},
+		
         beforeUpload(file: any) {
             const isJpgOrPng =
                 file.type === "image/jpeg" ||
@@ -493,7 +462,6 @@ export default defineComponent({
             }
         },
 		likeFile(item:any,str:string){
-
 			if(str == 'like'){
 				let data = {
 					generateDetailId:item.id,

src/component/HomePage/Material.vue

@@ -125,7 +125,6 @@ export default defineComponent({
 				type2:prop.msg
 			},
             store: useStore(),
-			workspaceCom:{}
 		}
 	},
 	directives:{
@@ -175,9 +174,7 @@ export default defineComponent({
 		},
     },
 	mounted () {
-		this.workspaceCom = computed(()=>{
-			return  this.store?.state?.Workspace?.workspace
-		})
+		
 		// let loding = document.getElementsByClassName("material_content_list_loding")[0]
 		// let bodyLoding = document.getElementsByClassName("material_content_body")[0]
 		// const ob = new IntersectionObserver(callback,{
@@ -200,10 +197,6 @@ export default defineComponent({
 		// }
 	},
 	watch:{
-		workspaceCom(newVal,oldVal){
-			this.workspace = newVal
-			this.getPosition()
-		},
 		sketchboardList:{
 			handler(newVal:any,oldVal:any){
 				// this.store.state.Workspace.workspace
@@ -260,27 +253,6 @@ export default defineComponent({
 			this.getLibraryList()
 			
         },
-        getPosition(){
-			let params
-			if(this.workspace.sex == 'Female'){
-				params = 'FemalePosition'
-			}else{
-				params = 'MalePosition'
-			}
-			Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
-				if (rv) {
-					let arr:any = []
-					rv.forEach((item:any) => {
-						let obj = {
-							value:item.name,
-							label:item.name,
-						}
-						arr.push(obj)						
-					});
-					this.disignTypeList = arr
-				}
-			})
-		},
         selectImgItem(imgData:any){
 			imgData.type_ = this.type_
 			imgData.resData = JSON.parse(JSON.stringify(imgData))
@@ -341,7 +313,6 @@ export default defineComponent({
 						}
 						aa.push(item)
 					});
-					
 					this.imgList = aa
                     this.total = rv.total
                     this.isShowLoading = false

src/component/HomePage/RobotAssist.vue

@@ -241,10 +241,10 @@ export default defineComponent({
 				this.clearTimer()
 				this.timeTop = setInterval(() => {
 					this.robotTop = false
-				}, 10000);
+				}, 15000);
 				this.timeInput = setInterval(() => {
 					this.robotInput = false
-				}, 5000);
+				}, 10000);
 
 			}
            

src/component/HomePage/SketchboardUpload.vue

@@ -346,6 +346,7 @@ export default defineComponent({
 			}else{
 				params = 'MalePosition'
 			}
+			
 			Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
 				if (rv) {
 					let arr:any = []
@@ -356,6 +357,8 @@ export default defineComponent({
 						}
 						arr.push(obj)						
 					});
+					(this.$refs.Generate as any).sketchCatecoryList = arr
+					(this.$refs.Material as any).disignTypeList = arr
 					
 					this.sketchCatecoryList = arr
 				}