Merge branch 'main' of http://18.167.251.121:10003/aidlab/FiDA_Front

src/components/Canvas/FlowCanvas/components/tools/threeModel/model.vue

@@ -166,9 +166,15 @@ defineExpose({open})
 	<div class="modelBox">
 		<div class="model" ref="threeDom">
 		</div>
+		<div class="icon" v-show="!load.state">
+			<SvgIcon name="threeLogo" size="40" size-unit="px" />
+		</div>
 		<div class="load" v-show="load.state">
 			<i class="fi fi-rr-cubes"></i>
-			<div class="text">Load...</div>
+			<div class="text">
+				<img src="@/assets/images/threeLoading.png" alt="">
+				{{ $t('threeModel.loading') }}
+			</div>
 			<div class="loadBox">
 				<div class="schedule" :style="{width:load.progress+'%'}"></div>
 			</div>
@@ -190,30 +196,49 @@ defineExpose({open})
 			border: 1px solid #D9D9D9;
 			overflow: hidden;
 		}
+		> .icon{
+			position: absolute;
+			bottom: 2.4rem;
+			right: 2.4rem;
+		}
 		> .load{
 			position: absolute;
 			width: 100%;
 			height: 100%;
 			top: 0;
 			left: 0;
-			background: rgba(0, 0, 0, .2);
+			background: #e6e6e6;
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			flex-direction: column;
 			color: #fff;
+			> .text{
+				font-weight: 500;
+				font-size: 1.8rem;
+				line-height: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #747474;
+				> img{
+					margin-right: 1rem;
+				}
+			}
 			> i{
 				font-size: 3rem;
 			}
 			> .loadBox{
-				width: 15rem;
+				width: 26rem;
 				height: 1rem;
-				border-radius: 1rem;
+				border-radius: 3.3rem;
 				background: #fff;
 				overflow: hidden;
+				margin-top: 1.2rem;
 				> .schedule{
 					height: 100%;
-					background: greenyellow;
+					border-radius: 3.3rem;
+					background: #848484;
 				}
 			}
 		}

src/components/Canvas/FlowCanvas/components/tools/upload-file.vue

@@ -80,7 +80,7 @@
 				text-align: center;
 				line-height: 18px;
 				background-color: #fff;
-				font-size: 6px;
+				font-size: 9px;
 				color: #000;
 				border: 1px solid #d9d9d9;
 				cursor: pointer;