From fa9f36bca9381d4e1c28f4434284ca26ee8da9bd Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 24 Apr 2023 11:25:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=B2=BE=E9=80=89=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/fengdu/app/AppDynamic/components/Detail.vue | 4 ++--
 project/fengdu/app/AppDynamic/components/List.vue   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/fengdu/app/AppDynamic/components/Detail.vue b/project/fengdu/app/AppDynamic/components/Detail.vue
index f87e214c..af946d99 100644
--- a/project/fengdu/app/AppDynamic/components/Detail.vue
+++ b/project/fengdu/app/AppDynamic/components/Detail.vue
@@ -9,8 +9,8 @@
         <template #content>
           <ai-wrapper
             label-width="120px">
-            <ai-info-item label="标题" isLine :value="info.title"></ai-info-item>
-            <ai-info-item label="发布地区" isLine :value="info.areaName"></ai-info-item>
+            <ai-info-item label="类型" isLine :value="info.title"></ai-info-item>
+            <ai-info-item label="所属社区" isLine :value="info.girdName"></ai-info-item>
             <ai-info-item label="文章类型" isLine :value="info.contentType === '0' ? '文章' : '视频'"></ai-info-item>
             <ai-info-item label="分类" v-if="info.categoryName" isLine :value="info.categoryName"></ai-info-item>
             <ai-info-item label="正文" v-if="info.contentType === '0'" isLine>
diff --git a/project/fengdu/app/AppDynamic/components/List.vue b/project/fengdu/app/AppDynamic/components/List.vue
index 4fb652b0..81191045 100644
--- a/project/fengdu/app/AppDynamic/components/List.vue
+++ b/project/fengdu/app/AppDynamic/components/List.vue
@@ -59,9 +59,9 @@
         },
         total: 0,
         colConfigs: [
-          { prop: 'title',  label: '标题', align: 'left', width: '200px' },
+          { prop: 'title',  label: '类型', align: 'left', width: '200px' },
           { prop: 'createUserName',  label: '姓名', align: 'center' },
-          { prop: 'areaName', label: '所属地区', align: 'center' },
+          { prop: 'girdName', label: '所属社区', align: 'center' },
           { prop: 'examineUserName', label: '推送人', align: 'center' },
           { prop: 'createTime', label: '推送时间', align: 'center' }
         ],

From a9959a8ed27453d3f6f921ba2d65c24bfb6b8638 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 24 Apr 2023 13:48:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fengdu/app/AppIntegratingOrder/components/ResidentList.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
index 7ed8c985..f275860e 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
@@ -76,7 +76,7 @@
               </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.goodsPicUrl" alt="" v-viewer>
-                <span class="type" :class="`type`+row.type">{{$dict.getLabel('integralSGType', row.type)}}</span>
+                <span class="type" :class="`type`+row.goodsType">{{$dict.getLabel('integralSGType', row.goodsType)}}</span>
               </div>
               <p>{{ row.goodsTitle }}</p>
             </div>

From 4f9c4c8d270232302f5164cd025bc4d2a37b3ad3 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 24 Apr 2023 14:45:46 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/fengdu/app/AppDynamic/components/Detail.vue | 2 +-
 project/fengdu/app/AppDynamic/components/List.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/fengdu/app/AppDynamic/components/Detail.vue b/project/fengdu/app/AppDynamic/components/Detail.vue
index af946d99..6fe1e8ef 100644
--- a/project/fengdu/app/AppDynamic/components/Detail.vue
+++ b/project/fengdu/app/AppDynamic/components/Detail.vue
@@ -10,7 +10,7 @@
           <ai-wrapper
             label-width="120px">
             <ai-info-item label="类型" isLine :value="info.title"></ai-info-item>
-            <ai-info-item label="所属社区" isLine :value="info.girdName"></ai-info-item>
+            <ai-info-item label="所属网格" isLine :value="info.girdName"></ai-info-item>
             <ai-info-item label="文章类型" isLine :value="info.contentType === '0' ? '文章' : '视频'"></ai-info-item>
             <ai-info-item label="分类" v-if="info.categoryName" isLine :value="info.categoryName"></ai-info-item>
             <ai-info-item label="正文" v-if="info.contentType === '0'" isLine>
diff --git a/project/fengdu/app/AppDynamic/components/List.vue b/project/fengdu/app/AppDynamic/components/List.vue
index 81191045..6b2917a8 100644
--- a/project/fengdu/app/AppDynamic/components/List.vue
+++ b/project/fengdu/app/AppDynamic/components/List.vue
@@ -61,7 +61,7 @@
         colConfigs: [
           { prop: 'title',  label: '类型', align: 'left', width: '200px' },
           { prop: 'createUserName',  label: '姓名', align: 'center' },
-          { prop: 'girdName', label: '所属社区', align: 'center' },
+          { prop: 'girdName', label: '所属网格', align: 'center' },
           { prop: 'examineUserName', label: '推送人', align: 'center' },
           { prop: 'createTime', label: '推送时间', align: 'center' }
         ],

From c3fa9b8d79b7cc697e07de01410df8b041d0a7b1 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 24 Apr 2023 16:24:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9B=BE=E5=9B=BE=E5=B1=82=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AiDvRender.vue                     |  3 +-
 .../components/form/componentConfig.vue       | 76 ++++++++++---------
 packages/bigscreen/designer/config.js         |  1 +
 ui/packages/tools/AiMap.vue                   | 15 ++--
 4 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/components/AiDvRender.vue b/components/AiDvRender.vue
index 3cc003ac..157487fd 100644
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -50,7 +50,8 @@
       </AiRanking>
       <AiDvMap v-else-if="data.type === 'AiDvMap'" style="width: 100%; height: 100%" :ref="'chart' + index" :key="`AiDvMap${index}`" :theme="theme"></AiDvMap>
       <ai-map v-else-if="data.type=='map'" :mask="data.mask === '1'" :areaId="data.areaId" :is3d="data.is3d==1" :is3dAround="data.is3dAround === '1'"
-              :map-style="`amap://styles/${data.mapStyle}`" :pulseLines="data.pulseLines==1" :map.sync="map" :lib.sync="lib" :onlyShowArea="data.limitArea==1"/>
+              :map-style="`amap://styles/${data.mapStyle}`" :pulseLines="data.pulseLines==1" :map.sync="map" :lib.sync="lib"
+              :onlyShowArea="data.limitArea==1" :satellite="data.layers=='satellite'"/>
       <ai-monitor :src="data.src" v-else-if="data.type === 'monitor'" :type="data.monitorType"/>
       <video style="width: 100%; height: 100%; object-fit: fill;" loop :src="data.src" autoplay v-else-if="data.type === 'video'"/>
       <AiDvPartyOrg style="width: 100%; height: 100%;" v-else-if="data.type === 'partyOrg'" :instance="instance"/>
diff --git a/packages/bigscreen/designer/components/form/componentConfig.vue b/packages/bigscreen/designer/components/form/componentConfig.vue
index 5d6dce27..b3dc876b 100644
--- a/packages/bigscreen/designer/components/form/componentConfig.vue
+++ b/packages/bigscreen/designer/components/form/componentConfig.vue
@@ -39,10 +39,10 @@
           <div class="layout-config__item--right">
             <el-select size="mini" v-model="config.border" placeholder="请选择边框" clearable>
               <el-option
-                v-for="(item, index) in borderList"
-                :key="index"
-                :label="item"
-                :value="item">
+                  v-for="(item, index) in borderList"
+                  :key="index"
+                  :label="item"
+                  :value="item">
               </el-option>
             </el-select>
           </div>
@@ -93,12 +93,12 @@
             <div class="layout-config__item--right">
               <el-select size="mini" v-model="config.stripe" placeholder="请选择" clearable>
                 <el-option
-                  label="是"
-                  value="1">
+                    label="是"
+                    value="1">
                 </el-option>
                 <el-option
-                  label="否"
-                  value="0">
+                    label="否"
+                    value="0">
                 </el-option>
               </el-select>
             </div>
@@ -132,6 +132,15 @@
               </el-select>
             </div>
           </div>
+          <div class="layout-config__item">
+            <label>地图图层</label>
+            <div class="layout-config__item--right">
+              <el-select size="mini" v-model="config.layers" placeholder="请选择" clearable>
+                <el-option label="地图" value="vector"/>
+                <el-option label="卫星" value="satellite"/>
+              </el-select>
+            </div>
+          </div>
           <div class="layout-config__item">
             <label>选择地区</label>
             <div class="layout-config__item--right">
@@ -139,7 +148,7 @@
             </div>
           </div>
           <div class="layout-config__item">
-            <label>限制显示地区</label>
+            <label>限制地区</label>
             <div class="layout-config__item--right">
               <ai-select v-model="config.limitArea" :selectList="dict.getDict('yesOrNo')"/>
             </div>
@@ -180,10 +189,10 @@
           <div class="layout-config__item--right">
             <el-select size="mini" v-model="config.display" placeholder="请选择类型" clearable>
               <el-option
-                v-for="(item, index) in summaryList"
-                :key="index"
-                :label="item"
-                :value="item">
+                  v-for="(item, index) in summaryList"
+                  :key="index"
+                  :label="item"
+                  :value="item">
               </el-option>
             </el-select>
           </div>
@@ -203,11 +212,11 @@ export default {
     dict: Object,
   },
 
-  data () {
+  data() {
     return {
       borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5', 'border6'],//边框待选项
       summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5',
-      'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13', 'summary14', 'summary15'],//汇总待选项
+        'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13', 'summary14', 'summary15'],//汇总待选项
       //是否显示排名
       tableStatus: [
         {label: '是', value: '1'},
@@ -219,33 +228,32 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .componentConfig {
-    .table-config {
-      & > div {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        width: 232px;
+.componentConfig {
+  .table-config {
+    & > div {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 232px;
 
-        :deep( .el-select ) {
-          width: 80px
-          input {
-            width: 80px;
-          }
+      :deep( .el-select ) {
+        width: 80px input {
+          width: 80px;
         }
+      }
 
-        .el-select {
+      .el-select {
+        width: 100%;
+
+        .el-input {
           width: 100%;
 
-          .el-input {
-            width: 100%;
-
-            :deep( input ) {
-              width: 80px
-            }
+          :deep( input ) {
+            width: 80px
           }
         }
       }
     }
   }
+}
 </style>
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index 99b52b32..193b5349 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -610,6 +610,7 @@ const components = [
             thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/map.png',
             is3dAround: '0',
             limitArea: '0',
+            layers:'vector'
           },
           {
             type: 'AiDvMap',
diff --git a/ui/packages/tools/AiMap.vue b/ui/packages/tools/AiMap.vue
index 426a27e8..818d4822 100644
--- a/ui/packages/tools/AiMap.vue
+++ b/ui/packages/tools/AiMap.vue
@@ -22,7 +22,8 @@ export default {
     mask: Boolean,
     searchBus: {default: "2"},
     pulseLines: Boolean,
-    onlyShowArea: Boolean
+    onlyShowArea: Boolean,
+    satellite: Boolean
   },
   computed: {
     viewMode() {
@@ -33,7 +34,7 @@ export default {
     return {
       amap: null,
       mapLib: null,
-      loca: null
+      loca: null,
     }
   },
   watch: {
@@ -44,7 +45,7 @@ export default {
     }
   },
   methods: {
-    initMap() {
+    initMap(c = 0) {
       let {plugins, viewMode, mapStyle} = this
       AMapLoader.load({
         key: '54a02a43d9828a8f9cd4f26fe281e74e',
@@ -67,12 +68,16 @@ export default {
           this.amap.on('complete', () => {
             this.amap.setFitView();//视口自适应
           })
-
+          /*增加卫星图层*/
+          if (this.satellite) {
+            this.amap.add([new AMap.TileLayer.RoadNet({zIndex: 11}), new AMap.TileLayer.Satellite({zIndex: 10})])
+          }
+          /* end */
           this.$emit('update:map', this.amap)
           this.$emit("loaded")
           this.mapLoaded()
         }
-      }).catch(this.initMap)
+      }).catch(() => c < 10 ? this.initMap(++c) : new Error("地图加载有问题"))
     },
     getMapArea() {
       const {mapLib: AMap} = this