fix: 基础信息高度分布数据显示调整

app/src/views/Basic/components/HeightDistribution.vue

@@ -40,12 +40,11 @@ export default {
 
   methods: {
     initChart(data) {
-      const x = [];
-      data.forEach((p) => {
-        if (x.indexOf(p.gd) < 0) {
-          x.push(p.gd);
-        }
-      });
+      const x = ["30m及以下",
+            "30~50m(含)",
+            "50~80m(含)",
+            "80~100m(含)",
+            "100m以上"];
       const sideData = [];
       x.forEach((p) => {
         const val = data.find((k) => k.gd === p);

app/src/views/FireCondition/components/FireHistory.vue

@@ -25,7 +25,7 @@
         </li>
       </ul>
       <div
-        style="margin-top: 70px; margin-left: 70px"
+        style="display: flex;margin-top: 60px;width: 100%;justify-content: center;"
         v-show="list&&list.length == 0"
       >
         <img src="../../../assets/images/null2.png" alt="" />

app/src/views/FireCondition/components/FireIndex/index.vue

@@ -87,7 +87,11 @@
         </ul>
       </div>
       <div>
-        <Chart :items="chartData" :label="chartLabel" />
+        <Chart v-show="chartData.length > 0" :items="chartData" :label="chartLabel" />
+        <div style="display: flex;justify-content: center;"
+        v-show="chartData&&chartData.length == 0">
+          <img style="width: 200px;height: 170px;" src="../../../../assets/images/null2.png" alt="" />
+        </div>
       </div>
     </div>
   </div>

app/src/views/Home/components/MapChartsCategory.vue

@@ -404,7 +404,7 @@ export default {
           backgroundColor: "rgba(0, 0, 0, 0.82)",
           formatter: this.formatter,
           textStyle: {
-            color: "#fff",
+            color: "#33F0FF",
           },
           extraCssText: `z-index: 1000;margin:0px;padding:0px;
   border: 1px solid rgba(61, 115, 255, 0.72);`,

app/src/views/Home/index.vue

@@ -171,14 +171,30 @@ export default {
         },
         () => {
           const item = params.data.meta
-          let res = `${item.区域} 第<span style="font-size: 24px;color:red;font-weight:bold;">${item.区域排名 || 0}</span>名 <br />`;
-          res += `直接财产损失 <span style="font-size: 24px;color:red;font-weight:bold;">${Math.ceil((item.直接财产损失 || 0) / 10000)}</span>万元<br/>`;
-          res += `火灾起数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.火灾起数 || 0}</span>起&nbsp;&nbsp;&nbsp;&nbsp;`;
-          res += `亡人数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.亡人数 || 0}</span>人<br />`;
-          res += `重大风险栋数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.重大风险 || 0}</span>栋&nbsp;&nbsp;&nbsp;&nbsp;`;
-          res += `较大风险栋数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.较大风险 || 0}</span>栋<br/>`;
-          res += `一般风险栋数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.一般风险 || 0}</span>栋&nbsp;&nbsp;&nbsp;&nbsp;`;
-          res += `低风险风数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.低风险 || 0}</span>栋<br/>`;
+          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;
         }
       );

app/src/views/Risk/index.vue

@@ -128,14 +128,30 @@ export default {
         { title: params.name },
         () => {
           const item = params.data.meta
-          let res = `${item.区域} 第<span style="font-size: 24px;color:red;font-weight:bold;">${item.区域排名 || 0}</span>名 <br />`;
-          res += `直接财产损失 <span style="font-size: 24px;color:red;font-weight:bold;">${Math.ceil((item.直接财产损失 || 0) / 10000)}</span>万元<br/>`;
-          res += `火灾起数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.火灾起数 || 0}</span>起&nbsp;&nbsp;&nbsp;&nbsp;`;
-          res += `亡人数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.亡人数 || 0}</span>人<br />`;
-          res += `重大风险栋数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.重大风险 || 0}</span>栋&nbsp;&nbsp;&nbsp;&nbsp;`;
-          res += `较大风险栋数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.较大风险 || 0}</span>栋<br/>`;
-          res += `一般风险栋数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.一般风险 || 0}</span>栋&nbsp;&nbsp;&nbsp;&nbsp;`;
-          res += `低风险风数 <span style="font-size: 24px;color:red;font-weight:bold;">${item.低风险 || 0}</span>栋<br/>`;
+          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;
         }
       );