Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

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"/>

packages/bigscreen/designer/components/form/componentConfig.vue

@@ -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>
@@ -228,8 +237,7 @@ export default {
       width: 232px;
 
       :deep( .el-select ) {
-          width: 80px
-          input {
+        width: 80px input {
           width: 80px;
         }
       }

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',

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>

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' }
         ],

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>

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