Merge branch 'master' of http://113.204.105.114:10011/TwoKe/zhgkpt-datav

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

@@ -16,7 +16,7 @@
         <span class="num" :class="{
           up: tbData.hzqstb > 0,
           down: tbData.hzqstb < 0,
-        }" >{{ tbData.hzqsp }}</span>
+        }" >{{ tbData.hzqstb === 0 ? '-' : tbData.hzqsp }}</span>
       </div>
     </div>
     <!--亡人  -->
@@ -34,7 +34,7 @@
         <span class="num" :class="{
            up: tbData.wrstb > 0,
           down: tbData.wrstb < 0,
-        }">{{ tbData.wrsp }}</span>
+        }">{{ tbData.wrstb === 0 ? '-' : tbData.wrsp }}</span>
       </div>
     </div>
     <!-- 伤人 -->
@@ -52,7 +52,7 @@
         <span class="num " :class="{
            up: tbData.srstb > 0,
           down: tbData.srstb < 0,
-        }"  >{{ tbData.srsp }}</span>
+        }"  >{{ tbData.srstb === 0 ? '-' : tbData.srsp }}</span>
       </div>
     </div>
     <!-- 直接经济损失 -->
@@ -64,9 +64,9 @@
           <img v-if="tbData.zzjjsstb > 0" src="../../../../assets/images/Vector (1).png" alt="" />
           <img v-if="tbData.zzjjsstb < 0"  src="../../../../assets/images/Vector (2).png" alt="" />
           <span class="num" :class="{
-           up: tbData.zzjjsstb > 0,
+          up: tbData.zzjjsstb > 0,
           down: tbData.zzjjsstb < 0,
-        }" >{{ tbData.zzjjssp }}</span>
+        }" >{{ tbData.zzjjsstb === 0 ? '-' : tbData.zzjjssp }}</span>
         </div>
         <div class="manoue">直接经济损失</div>
       </div>

app/src/views/Risk/components/fxyjCont.vue

@@ -611,7 +611,7 @@ export default {
     <br />
     <!-- 风险等级 -->
     <basic-pagination
-      v-if="showFlag === 1"
+    v-show="showFlag === 1"
       layout="->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params.pageSize"
@@ -622,7 +622,7 @@ export default {
     />
     <!-- 消防设施隐患 -->
     <basic-pagination
-      v-if="showFlag === 2"
+    v-show="showFlag === 2"
       layout="->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params1.pageSize"
@@ -633,7 +633,7 @@ export default {
     />
     <!--生命通道 -->
     <basic-pagination
-      v-if="showFlag === 3"
+    v-show="showFlag === 3"
       layout="->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params2.pageSize"
@@ -644,7 +644,7 @@ export default {
     />
     <!--用电用气 -->
     <basic-pagination
-      v-if="showFlag === 4"
+    v-show="showFlag === 4"
       layout="->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params3.pageSize"
@@ -655,7 +655,7 @@ export default {
     />
     <!--消防管理隐患 -->
     <basic-pagination
-      v-if="showFlag === 5"
+      v-show="showFlag === 5"
       layout="->,prev, pager, next, sizes,jumper"
       :page-sizes="[10, 20, 50, 100]"
       :page-size="params4.pageSize"