fix: 720广告

app/src/shared/mapData.js

@@ -39,7 +39,7 @@ export function loadMapData(selectMapType) {
         const heatMap = formatCityData(
           tempData.map((item) => ({
             name: item.qx,
-            value: MAP_TYPE[item.fs],
+            value: MAP_TYPE[item.fs || '绿色'],
             meta: item,
           }))
         );
@@ -84,7 +84,7 @@ export function loadMapData(selectMapType) {
           })
         const heatMap = formatCityData(res.data.qxList.map(item => ({
           name: item.qx,
-          value: MAP_TYPE[item.color],
+          value: MAP_TYPE[item.color || '绿色'],
           meta: item
         })))
         resolve({

app/src/views/Detail/index.vue

@@ -14,8 +14,8 @@
       </border-panel>
     </div>
     <div style="width: 1000px; position: relative">
-      <div style="height: calc(100vh - 290px);overflow: hidden;">
-        <div style="height: calc(100vh - 290px); overflow: hidden;">
+      <div style="height: 630px;overflow: hidden;">
+        <div style="height: 630px; overflow: hidden;"  v-if="dtData && dtData.txdz && middleType === '720'">
           <iframe
           ref="box"
           :src="dtData.txdz"
@@ -160,18 +160,6 @@ export default {
       dtData: null,
     };
   },
-  watch: {
-    dtData: {
-      deep: true,
-      handler(val) {
-        if (val && val.txdz) {
-          this.$nextTick(() => {
-            console.log("csncdis",document.querySelector("iframe").contentDocument.querySelector('.Ads_ads_2vcYaB'))
-          })
-        }
-      }
-    }
-  },
   methods: {
     openModal(data) {
       console.log(data);

app/src/views/Risk/index.vue

@@ -83,7 +83,7 @@ import YhModalContent from "../Detail/components/YhModalContent.vue";
 import BasicInfoModalContent from "../Home/components/BasicInfoModalContent.vue";
 import { formatCityData, createMapChartWindowInfo } from "../../utils";
 import { getDtskgzList } from '@/api/index'
-import { loadMapData } from '@/shared'
+import { createInfoWindow, TEMPLATE_TYPE, loadMapData, TITLE_MAP } from '@/shared'
 export default {
   name: "RiskPage",
   components: {
@@ -128,37 +128,7 @@ export default {
       this.showModal(page);
     },
     showLabel(params) {
-      return createMapChartWindowInfo(
-        { title: params.name },
-        () => {
-          const item = params.data.meta
-          let res =`
-          <table>
-            <tr>
-              <td style="padding-bottom:8px;">${item.区域} 第<span style="font-size: 24px;color:red;font-weight:bold;">${item.区域排名 || 0}</span>名</td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>直接财产损失 <span style="font-size: 24px;color:#ffb800;font-weight:400;">${Math.ceil((item.直接财产损失 || 0) / 10000)}</span>万元</td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>火灾起数 <span style="font-size: 24px;color:#ffb800;font-weight:400;">${item.火灾起数 || 0}</span>起</td>
-              <td>亡人数 <span style="font-size: 24px;color:#ffb800;font-weight:400;">${item.亡人数 || 0}</span>人</td>
-            </tr>
-            <tr>
-              <td>重大风险 <span style="font-size: 24px;color:#ffb800;font-weight:400;">${item.重大风险 || 0}</span>栋</td>
-              <td>较大风险 <span style="font-size: 24px;color:#ffb800;font-weight:400;">${item.较大风险 || 0}</span>栋</td>
-            </tr>
-            <tr>
-              <td>一般风险 <span style="font-size: 24px;color:#ffb800;font-weight:400;">${item.一般风险 || 0}</span>栋</td>
-              <td>低风险 <span style="font-size: 24px;color:#ffb800;font-weight:400;">${item.低风险 || 0}</span>栋</td>
-            </tr>
-          </table>
-          `;
-          return res;
-        }
-      );
+      return createInfoWindow(TEMPLATE_TYPE.DEFAULT, params);
     },
     openBasicModal(val) {
       this.fxyjIdex = val;