From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop

---
 src/store/index.ts |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/store/index.ts b/src/store/index.ts
index 6dbf7ba..56d32af 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -5,12 +5,15 @@
 import { getLayers } from '/@/api/layer'
 import { LayerType } from '/@/types/mapLayer'
 import { WaylineFile } from '/@/types/wayline'
+import getter from './getters'
 import { DevicesCmdExecuteInfo } from '/@/types/device-cmd'
+import map from './map'
+import common from '/@/store/common'
 
 const initStateFunc = () => ({
   Layers: [
     {
-      name: 'default',
+      name: '默认',
       id: '',
       is_distributed: true,
       elements: [],
@@ -19,7 +22,7 @@
       type: 1
     },
     {
-      name: 'share',
+      name: '共享',
       id: '',
       is_distributed: true,
       elements: [],
@@ -130,7 +133,6 @@
     }
     if (info.host.job_number !== undefined) {
       dock.work_osd = info.host
-      return
     }
   },
   SET_DRAW_VISIBLE_INFO (state, bool) {
@@ -241,7 +243,12 @@
   state: initStateFunc,
   getters,
   mutations,
-  actions
+  actions,
+  modules: {
+    getter,
+    map,
+    common
+  },
 }
 
 const rootStore = createStore(storeOptions)

--
Gitblit v1.9.3