From f4f7963fff79bff15ea13d1c36ae4fdadd0d6036 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 12 Apr 2022 16:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E4=B8=9C=E7=A7=BB=E5=8A=A8=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E5=BA=94=E7=94=A8=3D>=E6=A0=87=E5=87=86=E7=89=88?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=AE=89=E9=98=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IntelligentSecurity/AppISDevice/AppISDevice.vue    | 10 +++++-----
 .../IntelligentSecurity/AppISManage/AppISManage.vue    |  8 ++++----
 .../IntelligentSecurity/AppISMap/AppISMap.vue          |  6 +++---
 .../IntelligentSecurity}/components/deviceSlider.vue   |  0
 .../IntelligentSecurity}/components/locateDialog.vue   |  0
 .../IntelligentSecurity}/components/settingDialog.vue  |  0
 project/shandong10086/apps.import.json                 |  5 ++++-
 7 files changed, 16 insertions(+), 13 deletions(-)
 rename project/shandong10086/apps/shandong/monitor/AppMonitorDevice/AppMonitorDevice.vue => packages/IntelligentSecurity/AppISDevice/AppISDevice.vue (95%)
 rename project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue => packages/IntelligentSecurity/AppISManage/AppISManage.vue (98%)
 rename project/shandong10086/apps/shandong/monitor/AppMonitorMap/AppMonitorMap.vue => packages/IntelligentSecurity/AppISMap/AppISMap.vue (98%)
 rename {project/shandong10086/apps/shandong/monitor => packages/IntelligentSecurity}/components/deviceSlider.vue (100%)
 rename {project/shandong10086/apps/shandong/monitor => packages/IntelligentSecurity}/components/locateDialog.vue (100%)
 rename {project/shandong10086/apps/shandong/monitor => packages/IntelligentSecurity}/components/settingDialog.vue (100%)

diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorDevice/AppMonitorDevice.vue b/packages/IntelligentSecurity/AppISDevice/AppISDevice.vue
similarity index 95%
rename from project/shandong10086/apps/shandong/monitor/AppMonitorDevice/AppMonitorDevice.vue
rename to packages/IntelligentSecurity/AppISDevice/AppISDevice.vue
index fd9b7e78..c0a40421 100644
--- a/project/shandong10086/apps/shandong/monitor/AppMonitorDevice/AppMonitorDevice.vue
+++ b/packages/IntelligentSecurity/AppISDevice/AppISDevice.vue
@@ -1,7 +1,7 @@
 <template>
-  <section class="AppMonitorDevice">
+  <section class="AppISDevice">
     <ai-list>
-      <ai-title slot="title" title="监控设备管理" isShowBottomBorder/>
+      <ai-title slot="title" title="安防设备管理" isShowBottomBorder/>
       <template #content>
         <ai-search-bar>
           <template #right>
@@ -38,9 +38,9 @@ import LocateDialog from "../components/locateDialog";
 import SettingDialog from "../components/settingDialog";
 
 export default {
-  name: "AppMonitorDevice",
+  name: "AppISDevice",
   components: {SettingDialog, LocateDialog},
-  label: "监控设备管理",
+  label: "安防设备管理",
   props: {
     instance: Function,
     dict: Object,
@@ -125,7 +125,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.AppMonitorDevice {
+.AppISDevice {
   ::v-deep .AiSearchBar {
     margin-bottom: 10px;
   }
diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue b/packages/IntelligentSecurity/AppISManage/AppISManage.vue
similarity index 98%
rename from project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
rename to packages/IntelligentSecurity/AppISManage/AppISManage.vue
index ffb1d3ee..fa6e3f77 100644
--- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
+++ b/packages/IntelligentSecurity/AppISManage/AppISManage.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="AppMonitorManage">
+  <section class="AppISManage">
     <device-slider :permissions="permissions" :show.sync="slider" :ins="instance" :dict="dict"
                    @treeCommand="handleSliderOption" @select="handleSelectMonitor"
                    :render-item="renderTreeItem" ref="DeviceSlider"/>
@@ -47,10 +47,10 @@
 import {mapState} from 'vuex'
 import DeviceSlider from "../components/deviceSlider";
 import LocateDialog from "../components/locateDialog";
-import AiMonitor from "../../../../../dvui/components/AiMonitor/AiMonitor";
+import AiMonitor from "dvcp-dv-ui/components/AiMonitor/AiMonitor";
 
 export default {
-  name: "AppMonitorManage",
+  name: "AppISManage",
   components: {LocateDialog, DeviceSlider, AiMonitor},
   label: "监控实况",
   props: {
@@ -216,7 +216,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.AppMonitorManage {
+.AppISManage {
   display: flex;
   background: #202330;
   height: 100%;
diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorMap/AppMonitorMap.vue b/packages/IntelligentSecurity/AppISMap/AppISMap.vue
similarity index 98%
rename from project/shandong10086/apps/shandong/monitor/AppMonitorMap/AppMonitorMap.vue
rename to packages/IntelligentSecurity/AppISMap/AppISMap.vue
index 4574adaf..e96f587b 100644
--- a/project/shandong10086/apps/shandong/monitor/AppMonitorMap/AppMonitorMap.vue
+++ b/packages/IntelligentSecurity/AppISMap/AppISMap.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="AppMonitorMap">
+  <section class="AppISMap">
     <device-slider :show.sync="slider" :ins="instance" :dict="dict" @list="v=>list=v" @select="markerClickEvent"/>
     <div id="amap"/>
     <div ref="selectedInfoWin" class="selected">
@@ -21,7 +21,7 @@ import DeviceSlider from "../components/deviceSlider";
 import AMapLoader from "@amap/amap-jsapi-loader";
 
 export default {
-  name: "AppMonitorMap",
+  name: "AppISMap",
   components: {DeviceSlider},
   label: "监控地图",
   props: {
@@ -119,7 +119,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.AppMonitorMap {
+.AppISMap {
   background: #202330;
   position: relative;
 
diff --git a/project/shandong10086/apps/shandong/monitor/components/deviceSlider.vue b/packages/IntelligentSecurity/components/deviceSlider.vue
similarity index 100%
rename from project/shandong10086/apps/shandong/monitor/components/deviceSlider.vue
rename to packages/IntelligentSecurity/components/deviceSlider.vue
diff --git a/project/shandong10086/apps/shandong/monitor/components/locateDialog.vue b/packages/IntelligentSecurity/components/locateDialog.vue
similarity index 100%
rename from project/shandong10086/apps/shandong/monitor/components/locateDialog.vue
rename to packages/IntelligentSecurity/components/locateDialog.vue
diff --git a/project/shandong10086/apps/shandong/monitor/components/settingDialog.vue b/packages/IntelligentSecurity/components/settingDialog.vue
similarity index 100%
rename from project/shandong10086/apps/shandong/monitor/components/settingDialog.vue
rename to packages/IntelligentSecurity/components/settingDialog.vue
diff --git a/project/shandong10086/apps.import.json b/project/shandong10086/apps.import.json
index 2663100d..e978aa21 100644
--- a/project/shandong10086/apps.import.json
+++ b/project/shandong10086/apps.import.json
@@ -31,5 +31,8 @@
   "AppPartyMember": "党员管理",
   "AppLicence": "产品许可",
   "AppContentManage": "内容中心",
-  "AppResident": "居民档案"
+  "AppResident": "居民档案",
+  "AppISMap": "监控地图",
+  "AppISManage": "智能安防",
+  "AppISDevice": "安防设备"
 }