ming 1 rok pred
rodič
commit
4dafbd5da2

+ 1 - 1
src/components/mixins/map-data1.js

@@ -351,7 +351,7 @@ export default {
                         //     ) and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件,也可不传该参数
                         // queryWhere: `name in (${queryName}) and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件,也可不传该参数
                         // queryWhere: `subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件,也可不传该参数
-                        queryWhere: `grid_type in ('居委网格','村委网格') and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件,也可不传该参数
+                        queryWhere: `grid_type in ('居委网格','村委网格','扩展网格') and subdistrict in ('华漕镇','新虹街道','虹桥镇','七宝镇')`, //  可自定义查询条件,也可不传该参数
                         outFields: ["*"], //  返回字段信息
                         callBack: testQueryCallBack3
                     });

+ 6 - 1
src/views/head.vue

@@ -12,7 +12,12 @@
     </el-row> -->
         <el-row class="title" v-if="title">闵行区消防管理与应急救援数字平台</el-row>
         <el-row class="title2" v-if="!title">进博会消防安保平台</el-row>
-        <el-row class="title3" v-if="!title">火灾防控</el-row>
+        <el-row class="title3" v-if="!title">
+            <span >火灾防控</span>
+            <span style="margin-left:.2rem;margin-top:.05rem;font-size:.2rem" >
+                <a href="http://32.1.7.96:8010/zhts%20mh%2020231011%20v1/#/cieSecurity" style="text-decoration:none;color:rgba(137, 128, 128, 0.1);" target="_blank">指挥调度</a>
+            </span>
+        </el-row>
         <div class="nowTime">
             <div class="day">{{ dateDay }}</div>
             <div class="time">{{ dataTime }}</div>

+ 5 - 3
src/views/security-plan.vue

@@ -20,10 +20,12 @@
                                 <div style="padding: 0.03rem 0; text-align: center">
                                     <span style="display: block">
                                         <Strong
-                                            style="color: #01E0FF;font-weight: 600;font-size: 0.3rem"
+                                            style="color: #01E0FF;font-weight: 600;font-size: 0.26rem"
                                         >
-                                            <CountTo :startVal="0" :endVal="item.value || 0" :duration="3000" v-if="!isNaN(item.value)">{{ item.value || 0 }}</CountTo>
-                                            <span v-if="isNaN(item.value)" style="fontSize: 0.2rem !important">{{ item.value || 0 }}</span>
+                                        
+                                            <!-- <CountTo :startVal="0" :endVal="item.value || 0" :duration="3000" v-if="!isNaN(item.value)">{{ item.value || 0 }}</CountTo>
+                                            <span v-if="isNaN(item.value)" style="fontSize: 0.2rem !important">{{ item.value || 0 }}</span> -->
+                                            <span>{{ item.value }}</span>
                                         </Strong>
                                         {{ item.unit }}
                                     </span>