From 595da21046176010a7e512b94ffc88d5682ccd62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Sat, 12 Oct 2024 13:52:30 +0800
Subject: [PATCH] =?UTF-8?q?j=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/canvas.vue | 3 ++-
 src/pages/index.vue  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/canvas.vue b/src/pages/canvas.vue
index 5db11d1..82b4a8c 100644
--- a/src/pages/canvas.vue
+++ b/src/pages/canvas.vue
@@ -6,7 +6,8 @@
 
 <script>
 import Easing from '@config/Easing.js'
-import {queryDevice} from '@config/mork.js'
+// import {queryDevice} from '@config/mork.js'
+import {queryDevice} from '@config/getData.js'
 export default {
   data () {
     return {
diff --git a/src/pages/index.vue b/src/pages/index.vue
index ea30b83..0c39b53 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -114,7 +114,7 @@
                   v-for="item in options4"
                   :key="item.task_id"
                   :label="item.task_id"
-                  :value="item.task_id">
+                  :value="item.task_name">
                 </el-option>
               </el-select>
             </div>
@@ -134,8 +134,8 @@
 
 <script>
 import TCanvas from './canvas.vue'
-import {queryAllPoints, queryMaterials, queryAreas, queryTaskIds} from '@config/mork.js'
-import {callTask, putAction, areaControl, pdaCancel, forceFinish} from '@config/getData.js'
+// import {queryAllPoints, queryMaterials, queryAreas, queryTaskIds} from '@config/mork.js'
+import {queryAllPoints, queryMaterials, queryAreas, queryTaskIds, callTask, putAction, areaControl, pdaCancel, forceFinish} from '@config/getData.js'
 export default {
   components: {
     TCanvas