Merge branch 'release' into dev

src/views/snapshot/centerMark/components/record-Edit.vue

@@ -48,7 +48,6 @@ const ruleFormRef = ref<RefType>();
 const snapshotLabel = ref<EmptyArrayType>([]);
 const orderTitle = ref<string>('');
 const openDialog = (val: any) => {
-	console.log(val, '11');
 	state.dialogVisible = true;
 	getDetail(val.orderId);
 };
@@ -57,10 +56,18 @@ const getDetail = async (id: string) => {
 	loading.value = true;
 	try {
 		const { result } = await centerMarkDetail(id);
-		snapshotLabel.value = result.lables;
+		snapshotLabel.value = result.labelsBaseData;
 		orderTitle.value = result.title;
+		state.ruleForm = {
+			snapshotLabel: result.lables?.map((item: any) => {
+				return {
+					dicDataValue: item.key,
+					dicDataName: item.value,
+				};
+			}),
+			id: result.id,
+		};
 		loading.value = false;
-		console.log(result);
 	} catch (e) {
 		console.log(e);
 		loading.value = false;