Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/component/LoginPage/login/personal.vue

@@ -373,8 +373,6 @@ export default defineComponent({
         email: this.forgetPasswordEmail,
         operationType: "FORGET_PWD",
       };
-	  this.frogetPasswordStep = 2;
-	  (this.forgetEmailCode = ["", "", "", "", "", ""]), this.createTimer();
       Https.axiosPost(Https.httpUrls.accountSendEmail, data).then((rv: any) => {
         if (rv) {
           this.frogetPasswordStep = 2;

src/component/home/index.vue

@@ -85,7 +85,7 @@ export default defineComponent({
 				const routeName = newRoute.name as string
 				const shouldCache = newRoute.meta?.cache === true
 				if (shouldCache && routeName && !data.cachedRoutes.includes(routeName)) {
-					if(routeName == 'toolsPage' && !route.query?.id)return
+					if(routeName == 'tools' && !route.query?.id)return
 					data.cachedRoutes.push(routeName)// 保证缓存只有一个项目
 				} else if ((!route.query?.id && shouldCache) || (!shouldCache && routeName && data.cachedRoutes.includes(routeName))) {
 				// } else if (!shouldCache && routeName && data.cachedRoutes.includes(routeName)) {
@@ -226,7 +226,7 @@ export default defineComponent({
 			storeData.positionList = position
 			store.commit('setProbject',storeData)
 			// setChatData()
-			if(route.name == 'toolsPage'){
+			if(route.name == 'tools'){
 				getCollection('tools',null)	
 			}else{
 				getCollection('design',null)	

src/component/home/tools/toProduct/index.vue

@@ -384,10 +384,10 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
-	isState:{
-		type:Boolean,
-		default:false,
-	},
+    isState: {
+      type: Boolean,
+      default: false
+    }
   },
   emit: ['unLike'],
   setup(props, { emit }) {
@@ -406,8 +406,7 @@ export default defineComponent({
     const createProbject: any = inject('createProbject', () => {})
     let productImgData: any = reactive({
       isShowMark: false,
-      fileList:{
-	},
+      fileList: {},
       searchName: {
         ToProductImage: '',
         Relight: ''
@@ -416,37 +415,37 @@ export default defineComponent({
       isProductimg: false, //开始生成
       selectProductimgList: [],
       generateList: {
-        ToProductImage:computed(()=>{
-			if(!route.query?.id && route.query.tools == 'toProduct'){
-				return []
-			}else{
-				return store.state.HomeStoreModule.toProductImageList.list
-			}
-		}),
-		Relight:computed(()=>{
-			if(!route.query?.id && route.query.tools == 'relight'){
-				return []
-			}else{
-				return store.state.HomeStoreModule.relightList.list
-			}
-		}),
+        ToProductImage: computed(() => {
+          if (!route.query?.id && route.query.tools == 'toProduct') {
+            return []
+          } else {
+            return store.state.HomeStoreModule.toProductImageList.list
+          }
+        }),
+        Relight: computed(() => {
+          if (!route.query?.id && route.query.tools == 'relight') {
+            return []
+          } else {
+            return store.state.HomeStoreModule.relightList.list
+          }
+        })
       },
       selectObject: computed(() => store.state.Workspace.probjects), //选择的项目
       likeList: {
-        ToProductImage:computed(()=>{
-			if(!route.query?.id && route.query.tools == 'toProduct'){
-				return []
-			}else{
-				return store.state.HomeStoreModule.toProductImageList.likedList
-			}
-		}),
-		Relight:computed(()=>{
-			if(!route.query?.id && route.query.tools == 'relight'){
-				return []
-			}else{
-				return store.state.HomeStoreModule.relightList.likedList
-			}
-		}),
+        ToProductImage: computed(() => {
+          if (!route.query?.id && route.query.tools == 'toProduct') {
+            return []
+          } else {
+            return store.state.HomeStoreModule.toProductImageList.likedList
+          }
+        }),
+        Relight: computed(() => {
+          if (!route.query?.id && route.query.tools == 'relight') {
+            return []
+          } else {
+            return store.state.HomeStoreModule.relightList.likedList
+          }
+        })
       } as any,
       similarity: 30,
       brightenValue: 1,
@@ -520,19 +519,23 @@ export default defineComponent({
       return store.state.UploadFilesModule.modularData
     })
     let userlikeGroupId = 0
-	watch(()=>store.state.HomeStoreModule.uploadElement.length,(newVal,oldVal)=>{
-		setFileList()
-	})
-	const setFileList = () => {
-		if(props.isDesignPage)return
-		if(!route.query?.id && route.query.tools){
-			productImgData.fileList[props.productimgMenu.value] = []
-		}else{
-			productImgData.fileList[props.productimgMenu.value] = store.state.HomeStoreModule.uploadElement
-			if(productImgData.fileList[props.productimgMenu.value][0]){
-				productImgData.fileList[props.productimgMenu.value][0].isChecked = true
-			}
-		}
+    watch(
+      () => store.state.HomeStoreModule.uploadElement.length,
+      (newVal, oldVal) => {
+        setFileList()
+      }
+    )
+    const setFileList = () => {
+      if (props.isDesignPage) return
+      if (!route.query?.id && route.query.tools) {
+        productImgData.fileList[props.productimgMenu.value] = []
+      } else {
+        productImgData.fileList[props.productimgMenu.value] =
+          store.state.HomeStoreModule.uploadElement
+        if (productImgData.fileList[props.productimgMenu.value][0]) {
+          productImgData.fileList[props.productimgMenu.value][0].isChecked = true
+        }
+      }
     }
     const openSetData = (designList: any) => {
       // cleardata()
@@ -545,7 +548,7 @@ export default defineComponent({
         productImgData.fileList[props.productimgMenu.value] = designList
         return
       }
-	  setFileList()
+      setFileList()
       userlikeGroupId = selectDesignList.value.userlikeGroupId
       // getLikeProductImage(selectDesignList.value.userlikeGroupId)
       productImgDom.generalDragLeft.setItemPosition()
@@ -1260,15 +1263,14 @@ export default defineComponent({
     // &.active
 
     > .item {
-      // margin-right: 1rem;
-      // width: calc(100% / 2 - 0.5rem);
-      width: 9.6rem;
+      margin-right: 1rem;
+      width: calc(100% / 2 - 0.5rem);
       cursor: pointer;
       overflow: hidden;
       display: flex;
       justify-content: center;
       flex-shrink: 0;
-      height: 13.4rem;
+      height: 25rem;
       position: relative;
       // &.active{
       // 	border: 2px solid;
@@ -1539,6 +1541,16 @@ export default defineComponent({
 }
 
 
+.upload_file_item {
+  :deep(.ant-upload-picture-card-wrapper) {
+    .ant-upload-list-picture-card {
+      .ant-upload-select-picture-card {
+        width: 9.6rem;
+        height: 13.4rem;
+      }
+    }
+  }
+}
 .prompt-container {
   margin-top: 4rem;
   margin-bottom: 3rem;
@@ -1556,7 +1568,7 @@ export default defineComponent({
       }
     }
   }
-  .input_box_btnBox{
+  .input_box_btnBox {
     padding-bottom: 4rem;
   }
   .asistant-btn {

src/component/toolsPage/index.vue

@@ -92,7 +92,7 @@ export default defineComponent({
 			(query:any, oldQuery:any) => {
 				if(oldQuery && query == oldQuery)return
 				const key = Object.keys(query)?.[0]
-				if(route.name == 'toolsPage' && key){
+				if(route.name == 'tools' && key){
 					data.openType = query[key]
 					nextTick(()=>{
 						open(query[key])

src/router/index.ts

@@ -67,7 +67,7 @@ const routes: Array<RouteRecordRaw> = [
     children: [
       {
         path: "tools",
-        name: "toolsPage",
+        name: "tools",
         meta: { enter: "all",cache:true },
         component: () => import("@/views/HomeView/Tools.vue"),
       },