Merge branch 'lukeyan' of http://8.136.197.230:3000/ZheJiangNingBo/pingAnQiYeWeb into lukeyan

src/utils/request.js

@@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
   baseURL: 'http://172.18.113.50:8080/zhapi',
-  // baseURL: `http://${window.location.host}/zhapi`,
+  //baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
   headers: { 'content-type': 'application/json' },
 })

src/views/safetyIndex/toubu.vue

@@ -23,32 +23,36 @@
                 <div class="topBottomItem">
                     <img src="../../assets/safetyIndex/涉危企业.png" alt="">
                     <div class="itemBox">
-                        <div class="qiye">{{ statisticsDangerData[0].companyTypeName }}</div>
-                        <div class="qiyeshu"><span class="qiyenum">{{ statisticsDangerData[0].companyTypeSum }}</span>
+                        <div class="qiye">{{ statisticsDangerData[0] ? statisticsDangerData[0].companyTypeName : '' }}</div>
+                        <div class="qiyeshu"><span class="qiyenum">{{
+                            statisticsDangerData[0] ? statisticsDangerData[0].companyTypeSum : 0 }}</span>
                             &nbsp;家</div>
                     </div>
                 </div>
                 <div class="topBottomItem">
                     <img src="../../assets/safetyIndex/易制爆企业2.png" alt="">
                     <div class="itemBox">
-                        <div class="qiye">{{ statisticsDangerData[1].companyTypeName }}</div>
-                        <div class="qiyeshu"><span class="qiyenum">{{ statisticsDangerData[1].companyTypeSum }}</span>
+                        <div class="qiye">{{ statisticsDangerData[1] ? statisticsDangerData[1].companyTypeName : '' }}</div>
+                        <div class="qiyeshu"><span class="qiyenum">{{
+                            statisticsDangerData[1] ? statisticsDangerData[1].companyTypeSum : 0 }}</span>
                             &nbsp;家</div>
                     </div>
                 </div>
                 <div class="topBottomItem">
                     <img src="../../assets/safetyIndex/易制毒2.png" alt="">
                     <div class="itemBox">
-                        <div class="qiye">{{ statisticsDangerData[2].companyTypeName }}</div>
-                        <div class="qiyeshu"><span class="qiyenum">{{ statisticsDangerData[2].companyTypeSum }}</span>
+                        <div class="qiye">{{ statisticsDangerData[2] ? statisticsDangerData[2].companyTypeName : '' }}</div>
+                        <div class="qiyeshu"><span class="qiyenum">{{
+                            statisticsDangerData[2] ? statisticsDangerData[2].companyTypeSum : 0 }}</span>
                             &nbsp;家</div>
                     </div>
                 </div>
                 <div class="topBottomItem">
                     <img src="../../assets/safetyIndex/放射源2.png" alt="">
                     <div class="itemBox">
-                        <div class="qiye">{{ statisticsDangerData[3].companyTypeName }}</div>
-                        <div class="qiyeshu"><span class="qiyenum">{{ statisticsDangerData[3].companyTypeSum }}</span>
+                        <div class="qiye">{{ statisticsDangerData[3] ? statisticsDangerData[3].companyTypeName : '' }}</div>
+                        <div class="qiyeshu"><span class="qiyenum">{{
+                            statisticsDangerData[3] ? statisticsDangerData[3].companyTypeSum : 0 }}</span>
                             &nbsp;家</div>
                     </div>
                 </div>
@@ -136,8 +140,6 @@ export default {
             statisticsDangerData: [],
             statisticsDetailData: {},
             topSortData: [],
-
-
         }
     },
     created() {
@@ -168,7 +170,6 @@ export default {
                 this.topSortData = res.data
             })
         },
-
     },
 }
 </script>
@@ -182,7 +183,6 @@ export default {
     box-sizing: border-box;
     position: relative;
 
-
     .topBox {
         width: 100%;
         height: 30%;
@@ -440,7 +440,6 @@ export default {
                         color: #D0DEEE;
                         letter-spacing: 0.75px;
                         font-weight: 500;
-
                     }
                 }
             }