From dbbd384221475f1c5b4c9a4e2c40121c76890ac8 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 22 Aug 2022 11:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E4=BD=BF=E5=85=B6=E8=83=BD=E5=A4=9F=E8=A2=AB=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {packages/grid/components => components}/AiUserPicker.vue | 0
 packages/device/AppEquipmentManage/components/List.vue    | 4 ++--
 .../AppMonitorDevice => AppMonitor}/AppMonitorDevice.vue  | 4 ++--
 .../AppMonitorManage => AppMonitor}/AppMonitorManage.vue  | 4 ++--
 .../AppMonitorMap => AppMonitor}/AppMonitorMap.vue        | 2 +-
 .../{monitor => AppMonitor}/components/deviceSlider.vue   | 0
 .../{monitor => AppMonitor}/components/locateDialog.vue   | 0
 .../{monitor => AppMonitor}/components/settingDialog.vue  | 0
 .../IntelligentSecurity/{AppISDevice => }/AppISDevice.vue | 4 ++--
 .../IntelligentSecurity/{AppISManage => }/AppISManage.vue | 8 ++++----
 .../IntelligentSecurity/{AppISMap => }/AppISMap.vue       | 2 +-
 packages/grid/AppGridBlock/components/add.vue             | 3 +--
 12 files changed, 15 insertions(+), 16 deletions(-)
 rename {packages/grid/components => components}/AiUserPicker.vue (100%)
 rename packages/device/{monitor/AppMonitorDevice => AppMonitor}/AppMonitorDevice.vue (97%)
 rename packages/device/{monitor/AppMonitorManage => AppMonitor}/AppMonitorManage.vue (98%)
 rename packages/device/{monitor/AppMonitorMap => AppMonitor}/AppMonitorMap.vue (98%)
 rename packages/device/{monitor => AppMonitor}/components/deviceSlider.vue (100%)
 rename packages/device/{monitor => AppMonitor}/components/locateDialog.vue (100%)
 rename packages/device/{monitor => AppMonitor}/components/settingDialog.vue (100%)
 rename packages/device/IntelligentSecurity/{AppISDevice => }/AppISDevice.vue (97%)
 rename packages/device/IntelligentSecurity/{AppISManage => }/AppISManage.vue (98%)
 rename packages/device/IntelligentSecurity/{AppISMap => }/AppISMap.vue (98%)

diff --git a/packages/grid/components/AiUserPicker.vue b/components/AiUserPicker.vue
similarity index 100%
rename from packages/grid/components/AiUserPicker.vue
rename to components/AiUserPicker.vue
diff --git a/packages/device/AppEquipmentManage/components/List.vue b/packages/device/AppEquipmentManage/components/List.vue
index 790beaf5..f7ee7bc8 100644
--- a/packages/device/AppEquipmentManage/components/List.vue
+++ b/packages/device/AppEquipmentManage/components/List.vue
@@ -43,7 +43,7 @@
 
 <script>
 import {mapState} from 'vuex'
-import LocateDialog from "../../monitor/components/locateDialog";
+import LocateDialog from "../../AppMonitor/components/locateDialog";
 
 export default {
   name: 'List',
@@ -208,7 +208,7 @@ export default {
 
         this.btnLoading = false
       }).catch(() => {
-        
+
         this.btnLoading = false
       })
     },
diff --git a/packages/device/monitor/AppMonitorDevice/AppMonitorDevice.vue b/packages/device/AppMonitor/AppMonitorDevice.vue
similarity index 97%
rename from packages/device/monitor/AppMonitorDevice/AppMonitorDevice.vue
rename to packages/device/AppMonitor/AppMonitorDevice.vue
index 0634ad7c..aa0718eb 100644
--- a/packages/device/monitor/AppMonitorDevice/AppMonitorDevice.vue
+++ b/packages/device/AppMonitor/AppMonitorDevice.vue
@@ -32,8 +32,8 @@
 </template>
 
 <script>
-import LocateDialog from "../components/locateDialog";
-import SettingDialog from "../components/settingDialog";
+import LocateDialog from "./components/locateDialog";
+import SettingDialog from "./components/settingDialog";
 
 export default {
   name: "AppMonitorDevice",
diff --git a/packages/device/monitor/AppMonitorManage/AppMonitorManage.vue b/packages/device/AppMonitor/AppMonitorManage.vue
similarity index 98%
rename from packages/device/monitor/AppMonitorManage/AppMonitorManage.vue
rename to packages/device/AppMonitor/AppMonitorManage.vue
index 4dbfe6ec..d346c15b 100644
--- a/packages/device/monitor/AppMonitorManage/AppMonitorManage.vue
+++ b/packages/device/AppMonitor/AppMonitorManage.vue
@@ -33,8 +33,8 @@
 
 <script>
   import { mapState } from 'vuex'
-  import DeviceSlider from "../components/deviceSlider";
-  import LocateDialog from "../components/locateDialog";
+  import DeviceSlider from "./components/deviceSlider";
+  import LocateDialog from "./components/locateDialog";
 
   export default {
     name: "AppMonitorManage",
diff --git a/packages/device/monitor/AppMonitorMap/AppMonitorMap.vue b/packages/device/AppMonitor/AppMonitorMap.vue
similarity index 98%
rename from packages/device/monitor/AppMonitorMap/AppMonitorMap.vue
rename to packages/device/AppMonitor/AppMonitorMap.vue
index 4574adaf..5ed203ef 100644
--- a/packages/device/monitor/AppMonitorMap/AppMonitorMap.vue
+++ b/packages/device/AppMonitor/AppMonitorMap.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import DeviceSlider from "../components/deviceSlider";
+import DeviceSlider from "./components/deviceSlider";
 import AMapLoader from "@amap/amap-jsapi-loader";
 
 export default {
diff --git a/packages/device/monitor/components/deviceSlider.vue b/packages/device/AppMonitor/components/deviceSlider.vue
similarity index 100%
rename from packages/device/monitor/components/deviceSlider.vue
rename to packages/device/AppMonitor/components/deviceSlider.vue
diff --git a/packages/device/monitor/components/locateDialog.vue b/packages/device/AppMonitor/components/locateDialog.vue
similarity index 100%
rename from packages/device/monitor/components/locateDialog.vue
rename to packages/device/AppMonitor/components/locateDialog.vue
diff --git a/packages/device/monitor/components/settingDialog.vue b/packages/device/AppMonitor/components/settingDialog.vue
similarity index 100%
rename from packages/device/monitor/components/settingDialog.vue
rename to packages/device/AppMonitor/components/settingDialog.vue
diff --git a/packages/device/IntelligentSecurity/AppISDevice/AppISDevice.vue b/packages/device/IntelligentSecurity/AppISDevice.vue
similarity index 97%
rename from packages/device/IntelligentSecurity/AppISDevice/AppISDevice.vue
rename to packages/device/IntelligentSecurity/AppISDevice.vue
index c0a40421..3d7368d4 100644
--- a/packages/device/IntelligentSecurity/AppISDevice/AppISDevice.vue
+++ b/packages/device/IntelligentSecurity/AppISDevice.vue
@@ -34,8 +34,8 @@
 </template>
 
 <script>
-import LocateDialog from "../components/locateDialog";
-import SettingDialog from "../components/settingDialog";
+import LocateDialog from "./components/locateDialog";
+import SettingDialog from "./components/settingDialog";
 
 export default {
   name: "AppISDevice",
diff --git a/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue b/packages/device/IntelligentSecurity/AppISManage.vue
similarity index 98%
rename from packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
rename to packages/device/IntelligentSecurity/AppISManage.vue
index cb534700..af20d2f4 100644
--- a/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
+++ b/packages/device/IntelligentSecurity/AppISManage.vue
@@ -36,10 +36,10 @@
 
 <script>
   import { mapState } from 'vuex'
-  import DeviceSlider from '../components/deviceSlider'
-  import LocateDialog from '../components/locateDialog'
-  import AiMonitor from '../components/AiSlwVideo'
-  import Synergy from '../components/Synergy'
+  import DeviceSlider from './components/deviceSlider'
+  import LocateDialog from './components/locateDialog'
+  import AiMonitor from './components/AiSlwVideo'
+  import Synergy from './components/Synergy'
 
   export default {
     name: 'AppISManage',
diff --git a/packages/device/IntelligentSecurity/AppISMap/AppISMap.vue b/packages/device/IntelligentSecurity/AppISMap.vue
similarity index 98%
rename from packages/device/IntelligentSecurity/AppISMap/AppISMap.vue
rename to packages/device/IntelligentSecurity/AppISMap.vue
index 7d2fe7a0..7bda837e 100644
--- a/packages/device/IntelligentSecurity/AppISMap/AppISMap.vue
+++ b/packages/device/IntelligentSecurity/AppISMap.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import DeviceSlider from "../components/deviceSlider";
+import DeviceSlider from "./components/deviceSlider";
 import AMapLoader from "@amap/amap-jsapi-loader";
 
 export default {
diff --git a/packages/grid/AppGridBlock/components/add.vue b/packages/grid/AppGridBlock/components/add.vue
index 6bd7ea5d..290ea61f 100644
--- a/packages/grid/AppGridBlock/components/add.vue
+++ b/packages/grid/AppGridBlock/components/add.vue
@@ -73,11 +73,10 @@
 <script>
 import {mapState} from "vuex";
 import MapPlotting from "./mapPlotting";
-import AiUserPicker from "../../components/AiUserPicker";
 
 export default {
   name: "addBlock",
-  components: {AiUserPicker, MapPlotting},
+  components: {MapPlotting},
   props: {
     instance: Function,
     dict: Object,