地图逻辑调整

@CONTROL/地图/CONTROL-BASE.vue.ftl

@@ -5,6 +5,7 @@
 <#assign import_block>
 import echarts from 'echarts';
 import 'echarts/map/js/china.js'
+import { Http } from "@/ibiz-core/utils";
 </#assign>
 
 <#ibizinclude>
@@ -190,11 +191,10 @@ import 'echarts/map/js/china.js'
      * @type {}
      * @memberof ${srfclassname('${ctrl.name}')}Base
      */   
-    public mapItems = [
+    public mapItems = {
     <#if ctrl.getPSSysMapItems?? && ctrl.getPSSysMapItems()??>
     <#list ctrl.getPSSysMapItems() as mapitem>
-                        {
-                            type:'${mapitem.getItemType()}',
+                            '${mapitem.getItemType()}'{
                             bkcolor:'<#if mapitem.getBKColorPSAppDEField?? && mapitem.getBKColorPSAppDEField()??>${mapitem.getBKColorPSAppDEField().getCodeName()?lower_case}</#if>',
                             color:'<#if mapitem.getColorPSAppDEField?? && mapitem.getColorPSAppDEField()??>${mapitem.getColorPSAppDEField().getCodeName()?lower_case}</#if>',
                             content:'<#if mapitem.getContentPSDEField?? && mapitem.getContentPSDEField()??>${mapitem.getContentPSDEField().getCodeName()?lower_case}</#if>',
@@ -205,7 +205,7 @@ import 'echarts/map/js/china.js'
                         },
     </#list>
     </#if>
-                    ]
+                    }
 
     //点击弹出
     public tooltip = {

@CONTROL/地图/SERVICE.ts.ftl

@@ -12,9 +12,8 @@
         </#if>
         </#list>
         </#if>
-        Object.assign(response.data,<#if ctrl.getPSSysMapItems?? && ctrl.getPSSysMapItems()??><#list ctrl.getPSSysMapItems() as mapitem><#if mapitem.getPSAppDEDataSet?? && mapitem.getPSAppDEDataSet()??>{${mapitem.getName()}:${mapitem.getName()}Data}<#if mapitem_has_next>,</#if></#if></#list></#if>)
         let responseData = {
-            <#if ctrl.getPSSysMapItems?? && ctrl.getPSSysMapItems()??><#list ctrl.getPSSysMapItems() as mapitem><#if mapitem.getPSAppDEDataSet?? && mapitem.getPSAppDEDataSet()??>${mapitem.getName()}:${mapitem.getName()}Data<#if mapitem_has_next>,</#if></#if></#list></#if>)
+            <#if ctrl.getPSSysMapItems?? && ctrl.getPSSysMapItems()??><#list ctrl.getPSSysMapItems() as mapitem><#if mapitem.getPSAppDEDataSet?? && mapitem.getPSAppDEDataSet()??>${mapitem.getName()}:${mapitem.getName()}Data.data<#if mapitem_has_next>,</#if></#if></#list></#if>
         }
         let response = new HttpResponse(200,responseData);
         return response;
@@ -27,7 +26,7 @@
     public async ${mapitem.getName()}_${mapitem.getPSAppDEDataSet().getCodeName()}(data:any){
         const service: any = await this.getService('<#if mapitem.getPSDataEntity?? && mapitem.getPSDataEntity()??>${mapitem.getPSDataEntity().getName()?lower_case}</#if>');
         if(service){
-            const response: any await service.${mapitem.getPSAppDEDataSet().getCodeName()}(data);
+            const response: any = await service.${mapitem.getPSAppDEDataSet().getCodeName()}(data);
             if(!response.isError()){
                 return response
             }