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

src/component/Detail/DesignDetail.vue

@@ -301,8 +301,9 @@ export default defineComponent({
 				let color = (detailData.currentDetailType == 'color' && isCurrent && newData?.rgba?.r)?(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):(list[i].color?.rgba?.r?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'')
 				if(detailData.currentDetailType == 'sketch' && newData){
 					color = detailData.designDetail.clothes[0].color?.rgba?.r?`${detailData.designDetail.clothes[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
+					detailData.selectDetail.maskUrl = ''
+					detailData.selectDetail.maskMinioUrl = ''
 				}
-				console.log(list[i])
 				let data:any = {
 					changed:false,
 					color,

src/component/HomePage/scaleVideo.vue

@@ -4,9 +4,9 @@
 			<div class="general_video_btn" @click="clearVideo">
 				<i class="fi fi-rr-cross-small"></i>
 			</div>
-			<video ref="video" controls>
+			<video ref="video" controls :src="url">
-				<source :src="url" type="video/webm">
+				<!-- <source :src="url" type="video/webm">
-				Your browser does not support the video tag or the file format of this video.
+				Your browser does not support the video tag or the file format of this video. -->
 			</video>
 		</div>
 	</div>

src/component/home/newProject/workspace.vue

@@ -41,7 +41,7 @@
 				<div class="center">{{ selectObject?.styleName?selectObject?.styleName:'All' }}</div>
 				<div class="gallery_btn" @click="setStyle">{{ $t('Habit.Select') }}</div>
 			</div>
-			<div class="style brand marginBottom">
+			<!-- <div class="style brand marginBottom">
 				<div class="text">{{$t('Habit.Brand')}}:</div>
 				<div class="gallery_btn" @click="setBrandDNA">{{ $t('Habit.Select') }}</div>
 			</div>
@@ -56,7 +56,7 @@
 					:tip-formatter="formatterBrandDNA"
 				>
                 </a-slider>
-			</div>
+			</div> -->
 			<div class="position marginBottom" v-show="show.position" v-if="httpWorkflowType == 'SINGLE_DESIGN'">
 				<div class="text">
 					{{$t('Habit.Category')}}:

src/router/index.ts

@@ -84,10 +84,10 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import("@/views/HomeView/library.vue"),
       },
       {
-        path: "history111",
+        path: "history",
-        name: "history111",
+        name: "history",
         meta: { enter: "all" },
-        component: () => import("@/views/HomeView/history111.vue"),
+        component: () => import("@/views/HomeView/history.vue"),
       },
       {
         path: "works",

src/tool/listData.js

@@ -340,12 +340,12 @@ const navTypeList = (t)=>{
 					value:'Models',
 					router:'library=Models'
 				},
-				{
+				// {
-					icon:'fi-ss-gem',
+				// 	icon:'fi-ss-gem',
-					label:t('LibraryPage.brandDNA'),
+				// 	label:t('LibraryPage.brandDNA'),
-					value:'MyBrand',
+				// 	value:'MyBrand',
-					router:'library=MyBrand'
+				// 	router:'library=MyBrand'
-				},
+				// },
 			]
 		},
 		// history:{
@@ -361,11 +361,11 @@ const navTypeList = (t)=>{
 		// 	Earlierlist:[
 		// 	],
 		// },
-		history111:{
+		history:{
 			icon:'fi-br-time-past',
 			label:t('HistoryPage.History'),
-			value:'history111',
+			value:'history',
-			router:'/home/history111'
+			router:'/home/history'
 		},
 		gallery:{
 			icon:'fi-rr-gallery',

src/views/HomeMain.vue

@@ -18,17 +18,17 @@
 					<p>{{$t('Header.NewProject')}}</p>
 				</div>
 				<div class="navList ">
-					<div class="tools list" v-for="item in navTypeList" :class="{active:openType == item.value,history:item.value == 'history','show-history' : showHistory && item.value === 'history111','isHistory' : item.value === 'history111'}">
+					<div class="tools list" v-for="item in navTypeList" :class="{active:openType == item.value,history:item.value == 'history','show-history' : showHistory && item.value === 'history','isHistory' : item.value === 'history'}">
 						<div class="titleBox" @click="setOpenType(item.value,item.list)">
 							<div class="left">
 								<i :class="['fi',item.icon]"></i>
 								<span>{{item.label}}</span>
 							</div>
-							<div class="right" v-if="item.value !== 'history111' ">
+							<div class="right" v-if="item.value !== 'history' ">
 								<i class="fi fi-br-angle-small-down"></i>
 							</div>
 						</div>
-						<div class="detailBox" v-if="item.value != 'history111'" v-show="openType">
+						<div class="detailBox" v-if="item.value != 'history'" v-show="openType">
 							<div class="detail" v-if="item.value != 'history' && item.value != 'cloud'" v-show="openType == item.value">
 								<div class="detailItem" v-for="childItem in item.list" @click="setRouter(item,childItem)" :class="{active:openTypeChild == childItem.value}">
 									<i v-show="childItem.icon" :class="['fi',childItem.icon]"></i>
@@ -424,9 +424,9 @@ export default defineComponent({
 			{ immediate: true } // 立即触发一次以处理初始参数
 		);
 
-		// 监听路由,当路由地址为/home/history111时homeMainData.showHistory为true,改变左侧菜单颜色
+		// 监听路由,当路由地址为/home/history时homeMainData.showHistory为true,改变左侧菜单颜色
 		watch(() => route.path, () => {
-			if(route.path == '/home/history111'){
+			if(route.path == '/home/history'){
 				homeMainData.showHistory = true
 			}else{
 				homeMainData.showHistory = false
@@ -570,8 +570,8 @@ export default defineComponent({
 				homeMainData.openType = ''
 			}else {
 				homeMainData.openType = type
-				if (type === 'history111') {
+				if (type === 'history') {
-					router.push('/home/history111')
+					router.push('/home/history')
 				}
 			}
 		}
@@ -978,9 +978,9 @@ export default defineComponent({
 			let url = 'https://aida-user-manual-chinese.super.site/'
 			if(this.locale == 'ENGLISH'){
 				url = 'https://code-create.com.hk/wp-content/uploads/2025/02/aida_3.0-Manual-2_5-EN.pdf'
-				showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mov'})
+				showViewVideo({url:'https://aida.com.hk/video/AiDA_3_1_Demo_V2_EN.mp4'})
 			}else{
-				showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0_cn.mov'})
+				showViewVideo({url:'https://aida.com.hk/video/AiDA_3_1_Demo_V2_CN.mp4'})
 			}
 			this.toUserManual()
 			// //打开视频