Bladeren bron

文字调整

wangtao 1 jaar geleden
bovenliggende
commit
b6c022ecfb

+ 1 - 1
src/views/enforcement-dynamic.vue

@@ -3,7 +3,7 @@
         <transition name="el-fade-in-linear">
             <div class="leftBox" v-show="stroes.$state.leftBtn">
                 <div class="left_top">
-                    <h4>当月执法情况</h4>
+                    <h4>执法情况</h4>
                     <el-row class="data leftTopContent">
                         <el-row>
                             <el-col

+ 22 - 4
src/views/fire-data-analysis.vue

@@ -446,6 +446,20 @@ import firePie from "@c/fire-pie";
 import scatter from "@c/scatter";
 import map from "@c/mixins/map-data1";
 import CountTo from '@/components/count-to/index.js'
+import {
+    getWeekStartDate,
+    getWeekEndDate,
+    getMonthStartDate,
+    getMonthEndDate,
+    getQuarterStartDate,
+    getQuarterEndDate,
+    getHalfYearStartDate,
+    getHalfYearEndDate,
+    getThisYearStartDate,
+    getThisYearEndDate,
+    getYearMonthDateSFN,
+    getLastHalfYear,
+} from "../assets/js/dataFormate";
 // import map from "@c/mixins/map-gaode-public";
 export default {
     components: { categoryLine, firePie, scatter, pie5, CountTo },
@@ -463,10 +477,10 @@ export default {
                 injuredNumberTotal:0,//伤人人数
             fireCaseData:[],//火灾案例
             pieData:[
-                {value:2,name:"亡人火灾数"},
-                {value:138,name:"本月全区火灾总数"},
-                {value:1047,name:"本年度火灾总数"},
-                {value:502,name:"平均过火面积"},
+                {value:2,name:"亡人数"},
+                {value:269,name:"财产损失"},
+                {value:491,name:"火灾总数"},
+                {value:954,name:"平均过火面积"},
             ],//饼图数据
             tabsArea:"qg",//国、市、区
             stores: this.$useStore(),
@@ -538,6 +552,10 @@ export default {
     },
     created() {
         this.getData();
+        this.stores.changTimeList([
+                    getLastHalfYear().split(",")[0] + " 00:00:00",
+                    getLastHalfYear().split(",")[1] + " 23:59:59",
+                ]);
     },
     watch: {
         isVsFirePie(val) {

+ 1 - 1
src/views/head.vue

@@ -10,7 +10,7 @@
         >{{ weatherObj.weather }} {{ weatherObj.temperature }}℃</span
       >
     </el-row> -->
-        <el-row class="title" v-if="title">闵行区消防管理与应急救援数字平台</el-row>
+        <el-row class="title" v-if="title">闵行区消防管理数字平台</el-row>
         <el-row class="title4" v-if="!title" style="    font-family: ZhenyanGB!important;">
             <a href="http://32.1.7.96:8010/zhts_mh_20231011_v1/#/ciieSecurity" target="_blank"> <img src="@a/img/securityPlan/zhdd.png" alt="" /></a>
             第六届中国国际进口博览会消防安保指挥平台

+ 15 - 6
src/views/security-plan.vue

@@ -389,13 +389,13 @@
                     <div class="girdCheckItem">
                         <div class="row_g">
                             <div style="font-size:.175rem">累计:</div>
-                            <div @click="basicStaticsData('新消监')">检查家数<br>7385家次</div>
-                            <div @click="basicStaticsData('新消监')">发现隐患数<br>2648处</div>
-                            <div @click="basicStaticsData('新消监')">整改隐患<br>2091处</div>
+                            <div @click="basicStaticsData('新消监')">检查家数<br>7681家次</div>
+                            <div @click="basicStaticsData('新消监')">发现隐患数<br>2712处</div>
+                            <div @click="basicStaticsData('新消监')">整改隐患<br>2153处</div>
                             <div style="font-size:.175rem;margin-left:.125rem" >当日:</div>
-                            <div @click="basicStaticsData('新消监')">检查家数<br>366家次</div>
-                            <div @click="basicStaticsData('新消监')">发现隐患数<br>86处</div>
-                            <div @click="basicStaticsData('新消监')">整改隐患<br>82处</div>
+                            <div @click="basicStaticsData('新消监')">检查家数<br>296家次</div>
+                            <div @click="basicStaticsData('新消监')">发现隐患数<br>64处</div>
+                            <div @click="basicStaticsData('新消监')">整改隐患<br>62处</div>
                         </div>
                     </div>
                     <div style="display: flex">
@@ -1084,6 +1084,15 @@ export default {
             dialogTableVisible:false,
             pdfUrl:'',
             dailyArray:[
+            
+                {
+                    title: '第六届中国国际进口博览会工作总结',
+                    url: 'http://32.0.15.107:8080/mhvi/20231110.pdf',
+                },
+                {
+                    title: '第十六期:  第六届中国国际进口博览会每日工作动态',
+                    url: 'http://32.0.15.107:8080/mhvi/20231109.pdf',
+                },
                 {
                     title: '第十五期:  第六届中国国际进口博览会每日工作动态',
                     url: 'http://32.0.15.107:8080/mhvi/20231108.pdf',

+ 8 - 0
src/views/time-select.vue

@@ -101,6 +101,14 @@ export default {
         };
     },
     created() {
+        if(window.location.href.split("#")[1] == "/fire-data-analysis" ){
+                setTimeout(()=>{
+                        this.timeArea = "jinbannian"
+                        timeTypeClick('jinbannian')
+                },500)
+               
+        }
+        
         // this.timeTypeClick("dangyue");
         if(window.location.href.split("#")[1] == "/security" ){
             this.security = true