Merge remote-tracking branch 'origin/StableVersion' into localDevelop

src/component/Detail/habit.vue

@@ -97,18 +97,19 @@
 			<div class="habit_System_Designer">
                 <a-slider id="system_silder"
                     v-model:value="workspaceItem.systemDesignerPercentage"
-                    @afterChange="systemDesigner"
+                    @afterChange="setSystemDesigner"
 					:tip-formatter="formatter"
+					:tooltipVisible="false"
 				>
                 </a-slider>
                 <div class="habit_System_Designer_text_max">
                     <div class="habit_System_Designer_text">
 						
-						{{ $t('Habit.System') }}<span>(100%)</span>
+						{{ $t('Habit.System') }}<span>({{systemDesigner.system}}%)</span>
 					</div>
                     <div class="habit_System_Designer_text">
 					
-						{{ $t('Habit.Designer') }}<span>(100%)</span>
+						{{ $t('Habit.Designer') }}<span>({{systemDesigner.designer}}%)</span>
 					</div>
                 </div>
             </div>
@@ -202,6 +203,10 @@ export default defineComponent({
 			mannequinType:'',
 			mannequinId:'',
 		})
+		let systemDesigner:any = ref({
+			system:0,
+			designer:0,
+		})
 		let mannequins:any = ref([{},{}])
 		let systemSeleves= ref(false);
 		let total= ref(0);
@@ -240,6 +245,7 @@ export default defineComponent({
 	return{
 			systemSeleves,
 			mannequins,
+			systemDesigner,
 			openType,
 			total,
 			driver__,
@@ -473,6 +479,7 @@ export default defineComponent({
 					// 	v.putName = false
 					// });
 					this.workspace.id = rv.id
+					if(str == 'detail') this.getDetail(rv.id)
 					this.total = rv.page.total
 					this.workspace.workspaceList = rv.page.content
 					
@@ -653,10 +660,12 @@ export default defineComponent({
 			}
 		},
 		//设置系统设计占比
-        systemDesigner(num: number) {
+        setSystemDesigner(num: number) {
 			this.workspaceItem.systemDesignerPercentage = num
         },
 		formatter(value: number) {
+			this.systemDesigner.system = 100 - value
+			this.systemDesigner.designer = value
 			let num = Math.abs((value-50)*2)
 			return `${num}%`;
 		},
@@ -968,7 +977,7 @@ export default defineComponent({
 			
         }
         .habit_System_Designer {
-			margin-top: calc(8rem*1.2);
+			// margin-top: calc(8rem*1.2);
             :deep(.ant-slider-track),
             :deep(.ant-slider-rail) {