diff --git a/src/App.vue b/src/App.vue index 333ad51..88c3d2f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,6 +8,11 @@ import copyToclipboard from "@/shared/copyToclipboard"; import ContextMenu from "@imengyu/vue3-context-menu"; import CustomButton from '@/components/UI/CustomButton.vue' +import emergencyAndNavigate from './shablons/emergency_and_navigate.js' +import color from './shablons/color.js' +import qr from './shablons/qr.js' + + const numbers = ref([]); // Инициализируем массив с пустыми строками const clickCount = ref(1); // Счетчик нажатий const listOfTrips = ref([]); @@ -61,16 +66,14 @@ async function saveResult() { const isUsedQR = listOfTrips.value.some(item => item.isQR); if (isUsedPlatform) { - const response = await fetch("/shablons/color.txt") - let textOfCode = await response.text() + let textOfCode = color textOfCode = textOfCode.split('<>') colorDetectClass.value = textOfCode[0] colorDetectCode.value += `\t${textOfCode[1].trim()}\n`; } if (isUsedQR) { - const response = await fetch("/shablons/qr.txt") - let textOfCode = await response.text() + let textOfCode = qr textOfCode = textOfCode.split('<>') QRDetectClass.value = textOfCode[0] QRDetectCode.value += `\t${textOfCode[1].trim()}\n`; @@ -85,8 +88,7 @@ async function saveResult() { mainCode.value += QRDetectCode.value + '\n' } } - const response = await fetch("/shablons/emergency_and_navigate.txt") - let textOfCode = await response.text() + let textOfCode = emergencyAndNavigate finallyText.value = textOfCode.replace("<
>", mainCode.value); if (isUsedPlatform) { finallyText.value = finallyText.value.replace("<>", colorDetectClass.value); diff --git a/public/shablons/README.md b/src/shablons/README.md similarity index 100% rename from public/shablons/README.md rename to src/shablons/README.md diff --git a/public/shablons/color.txt b/src/shablons/color.js similarity index 93% rename from public/shablons/color.txt rename to src/shablons/color.js index 71cdb2c..5ff4784 100644 --- a/public/shablons/color.txt +++ b/src/shablons/color.js @@ -1,4 +1,4 @@ -def color_detection(data, print_type='str'): +export default `def color_detection(data, print_type='str'): '''определение цвета''' frame = bridge.imgmsg_to_cv2(data, 'bgr8') @@ -42,4 +42,4 @@ def color_detection(data, print_type='str'): <> color_sub = rospy.Subscriber('main_camera/image_raw', Image, lambda img: color_detection(img, print_type='rgb'), queue_size=1) rospy.sleep(2) - color_sub.unregister() \ No newline at end of file + color_sub.unregister()` \ No newline at end of file diff --git a/public/shablons/emergency_and_navigate.txt b/src/shablons/emergency_and_navigate.js similarity index 98% rename from public/shablons/emergency_and_navigate.txt rename to src/shablons/emergency_and_navigate.js index 1114350..1e8546c 100644 --- a/public/shablons/emergency_and_navigate.txt +++ b/src/shablons/emergency_and_navigate.js @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +export default `#!/usr/bin/env python3 import rospy import time @@ -102,4 +102,4 @@ def main(): land() #посадка if __name__ == "__main__": - main() + main()` diff --git a/public/shablons/qr.txt b/src/shablons/qr.js similarity index 82% rename from public/shablons/qr.txt rename to src/shablons/qr.js index c877557..46c5e82 100644 --- a/public/shablons/qr.txt +++ b/src/shablons/qr.js @@ -1,4 +1,4 @@ -def qr_detection(data): +export default `def qr_detection(data): cv_image = bridge.imgmsg_to_cv2(data, 'bgr8') barcodes = pyzbar.decode(cv_image) @@ -9,4 +9,4 @@ def qr_detection(data): <> qr_sub = rospy.Subscriber('main_camera/image_raw', Image, qr_detection, queue_size=1) rospy.sleep(2) - qr_sub.unregister() \ No newline at end of file + qr_sub.unregister()` \ No newline at end of file