Преглед изворни кода

Merge branch 'V2.0' into V2.0_CF.APP

Yue пре 2 недеља
родитељ
комит
18565f6641

+ 3 - 0
UI/CF.APP/chicken_farm/.dart_tool/widget_preview_scaffold/devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

+ 3 - 1
UI/VB.VUE/src/views/device/inspection/index.vue

@@ -453,7 +453,9 @@ function handleLogs(row: any) {
 						:size="qrCode.size"
 						:color-dark="qrCode.colorDark"
 						:logo-image="qrCode.logo"
-						:logo-scale="0.2"
+						:logo-scale="0.15"
+						:logo-margin="0"
+						:logo-corner-radius="20"
 						:margin="20" />
 				</div>
 				<div class="text-center">

+ 4 - 1
UI/VB.VUE/src/views/experiment/sample/_sample.vue

@@ -4,6 +4,7 @@ import dayjs from "dayjs"
 import ChickenModal from "@v/common/modal/chickenModal.vue"
 import type { ToolBtn } from "@@@/table/models"
 import EDetail from "../experiment/_detail.vue"
+import { Vue3NextQrcode } from "vue3-next-qrcode"
 
 const props = withDefaults(
 	defineProps<{
@@ -579,7 +580,9 @@ function handlePreviewPdf(file: string) {
 						:size="qrCode.size"
 						:color-dark="qrCode.colorDark"
 						:logo-image="qrCode.logo"
-						:logo-scale="0.2"
+						:logo-scale="0.15"
+						:logo-margin="0"
+						:logo-corner-radius="20"
 						:margin="20" />
 				</div>
 				<div class="text-center">