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 @@
+ :map-style="`amap://styles/${data.mapStyle}`" :pulseLines="data.pulseLines==1" :map.sync="map" :lib.sync="lib"
+ :onlyShowArea="data.limitArea==1" :satellite="data.layers=='satellite'"/>
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 @@
-
+
@@ -180,10 +189,10 @@
+ v-for="(item, index) in summaryList"
+ :key="index"
+ :label="item"
+ :value="item">
@@ -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 {
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/project/fengdu/app/AppDynamic/components/Detail.vue b/project/fengdu/app/AppDynamic/components/Detail.vue
index f87e214c..6fe1e8ef 100644
--- a/project/fengdu/app/AppDynamic/components/Detail.vue
+++ b/project/fengdu/app/AppDynamic/components/Detail.vue
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/project/fengdu/app/AppDynamic/components/List.vue b/project/fengdu/app/AppDynamic/components/List.vue
index 4fb652b0..6b2917a8 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' }
],
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 @@
-->
![]()
-
{{$dict.getLabel('integralSGType', row.type)}}
+
{{$dict.getLabel('integralSGType', row.goodsType)}}
{{ row.goodsTitle }}
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