数据更新

src/components/mixins/map-data1.js

@@ -1855,6 +1855,7 @@ export default {
          * @param {*} data 
          */
         anbaoPopup(data) {
+            console.log(data, 1212)
             var children = []
             if (data.type == 19) {
                 children = [
@@ -1868,17 +1869,20 @@ export default {
             }
             if (data.type == 15) {
                 children = [
-                    ["街道：", data.content.streetTown, 12],
+                    ["街道：", data.content[0].streetTown, 12],
                     ["安监所人员：", data.content[0].type1, 12],
                     ["城运中心人员：", data.content[0].type2, 12],
                     ["消防助理员：", data.content[0].type3, 12],
                 ]
             }
             if (data.type == 16) {
+                // console.log(data,1212)
                 children = [
-                    ["街道：", data.content[0].streetTown, 12],
-                    ["小网格长：", data.content[0].type2, 12],
-                    ["小网格人员：", data.content[0].type1, 12],
+                    ["编号：", data.content.id, 12],
+                    ["街道：", data.content.streetTown, 12],
+                    ["街道：", data.content.streetTown, 12],
+                    ["小网格长：", data.content.type2, 12],
+                    ["小网格人员：", data.content.type1, 12],
 
                 ]
             }
@@ -2017,7 +2021,6 @@ export default {
          * @param {页面类型} type
          */
         addMarker(lnglats, pageType, type) {
-            console.log(lnglats, pageType, type,1111)
             window.jMap.Locate.clearLocate();
             let that = this
             let icon = "";
@@ -2087,6 +2090,7 @@ export default {
                                 type == "专职队" ? this.stores.sadianIcon.zzd : type == "微型消防站" ? this.stores.sadianIcon.jzwxxfz : type == "大型综合体" && val.facilityType == "lhtj" ? this.stores.sadianIcon.lhtj :
 
                                 type == "大型综合体" && (val.facilityType == 2 || val.facilityType == 3) ? this.stores.sadianIcon.dxzht : type == "重大火灾隐患" ? this.stores.sadianIcon.lsjq :
+                                 type == "重大火灾隐患2" ? this.stores.sadianIcon.lsjq :
 
                                 type == "企业消防" && val.facilityType == 13 ? this.stores.sadianIcon.zddw : type == "企业消防" && val.facilityType == 14 ? this.stores.sadianIcon.ybdw :
 
@@ -3073,18 +3077,80 @@ export default {
                                 let arrayList = []
                                 if(val.attrbutes.extendData){
                                     let msgParse = JSON.parse(val.attrbutes.extendData)
+                                    let day = dayjs().format('YYYY年M月D日')
+                                    let dayData = {}
+                                    dayData.dutyhours = day
+                                    if(day == "2024年11月4日"){
+                                        dayData.dutyphonnumber = msgParse?.dutyphonnumber2
+                                        dayData.dutyleader = msgParse?.dutyleader2
+                                        dayData.phonnumber = msgParse?.phonnumber2
+                                    }
+                                    if(day == "2024年11月5日"){
+                                        dayData.dutyphonnumber = msgParse?.dutyphonnumber3
+                                        dayData.dutyleader = msgParse?.dutyleader3
+                                        dayData.phonnumber = msgParse?.phonnumber3
+                                    }
+                                    if(day == "2024年11月6日"){
+                                        dayData.dutyphonnumber = msgParse?.dutyphonnumber4
+                                        dayData.dutyleader = msgParse?.dutyleader4
+                                        dayData.phonnumber = msgParse?.phonnumber4
+                                    }
+                                    if(day == "2024年11月7日"){
+                                        dayData.dutyphonnumber = msgParse?.dutyphonnumber5
+                                        dayData.dutyleader = msgParse?.dutyleader5
+                                        dayData.phonnumber = msgParse?.phonnumber5
+                                    }
+                                    if(day == "2024年11月8日"){
+                                        dayData.dutyphonnumber = msgParse?.dutyphonnumber6
+                                        dayData.dutyleader = msgParse?.dutyleader6
+                                        dayData.phonnumber = msgParse?.phonnumber6
+                                    }
+                                    if(day == "2024年11月9日"){
+                                        dayData.dutyphonnumber = msgParse?.dutyphonnumber7
+                                        dayData.dutyleader = msgParse?.dutyleader7
+                                        dayData.phonnumber = msgParse?.phonnumber7
+                                    }
+                                    if(day == "2024年11月10日"){
+                                        dayData.dutyphonnumber = msgParse?.dutyphonnumber8
+                                        dayData.dutyleader = msgParse?.dutyleader8
+                                        dayData.phonnumber = msgParse?.phonnumber8
+                                    }
+                                    if(day == "2024年11月11日"){
+                                        dayData.dutyphonnumber = msgParse?.dutyphonnumber9
+                                        dayData.dutyleader = msgParse?.dutyleader9
+                                        dayData.phonnumber = msgParse?.phonnumber9
+                                    }
+                                    if(day == "2024年11月12日"){
+                                        dayData.dutyphonnumber = msgParse?.dutyphonnumber10
+                                        dayData.dutyleader = msgParse?.dutyleader10
+                                        dayData.phonnumber = msgParse?.phonnumber10
+                                    }
+                                    // if(day == "2024年11月13日"){
+                                    //     dayData.dutyphonnumber = msgParse?.dutyphonnumber11
+                                    //     dayData.dutyleader = msgParse?.dutyleader11
+                                    //     dayData.phonnumber = msgParse?.phonnumber11
+                                    // }
+                                    // if(day == "2024年11月14日"){
+                                    //     dayData.dutyphonnumber = msgParse?.dutyphonnumber12
+                                    //     dayData.dutyleader = msgParse?.dutyleader12
+                                    //     dayData.phonnumber = msgParse?.phonnumber12
+                                    // }
+                                    // if(day == "2024年11月15日"){
+                                    //     dayData.dutyphonnumber = msgParse?.dutyphonnumber13
+                                    //     dayData.dutyleader = msgParse?.dutyleader13
+                                    //     dayData.phonnumber = msgParse?.phonnumber13
+                                    // }
+
                                     arrayList = [{
                                         title: [type, true],
                                         children: [
                                             ["单位名称：", val.attrbutes.facilityName, 24],
                                             ["街镇：", val.attrbutes.streetTown, 24],
                                             ["地址：", val.attrbutes.address, 24],
-                                            ["联系人：", val.attrbutes.contact, 24],
-                                            ["联系电话：", val.attrbutes.contactPhone, 24],
-                                            ["营业执照名称：", msgParse.test1, 24],
-                                            ["名称：", msgParse.test2, 24],
-                                            ["消防管理人（经理）：", msgParse.test3, 24],
-                                            ["联系电话：", msgParse.test4, 24],
+                                            ["值班时间：", dayData.dutyhours, 24],
+                                            ["值班固定电话：", dayData.dutyphonnumber, 24],
+                                            ["值班领导：", dayData.dutyleader, 24],
+                                            ["手机号：", dayData.phonnumber, 24],
                                         ],
                                     }, ];
                                 }else{
@@ -3115,6 +3181,22 @@ export default {
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
                             }
+                            if (type == "重大火灾隐患2") {
+                                let msgParse = JSON.parse(val.attrbutes.extendData)
+                                let arrayList = [{
+                                    title: [val.attrbutes.facilityName, true],
+                                    children: [
+                                        ["街镇：", val.attrbutes.streetTown, 24],
+                                        ["地址：", val.attrbutes.address, 24],
+                                        ["联系人：", val.attrbutes.contact, 24],
+                                        ["联系电话：", val.attrbutes.contactPhone, 24],
+                                        ["信息：", msgParse.test1, 24],
+                                    ],
+                                }, ];
+                                this.popup(val._attrbutes, arrayList, true)
+                            }
+
+                            
                             if (type == "居民小区") {
                                 // let msgParse = JSON.parse(val.attrbutes.extendData)
                                 let arrayList = [{

src/views/security-plan.vue

@@ -13,12 +13,6 @@
                         </el-button>
                     </div>
                     <div class="leftTopContent2">
-                        <!-- <el-row>
-                            <div v-for="(item,index) in diversionArea" :key="index">
-                                <p>{{ item.name }}</p>
-                                <p><strong><CountTo :startVal='0' :endVal='item.value' :duration='5000'> {{   item.value || 0 }}</CountTo></strong>{{ item.unit }}</p>
-                            </div>
-                        </el-row> -->
                         <el-row  class="sdqBasicInfo sdline1">
                             <div
                                 class="basicItem"
@@ -26,9 +20,9 @@
                                 v-for="(item, index) in diversionArea.slice(0,5)"
                                 :key="index"
                             >
-                                <div style="padding: 0.03rem 0; text-align: center" @click="openPdf(item.url)" class="pdfWrap">
+                                <div style="padding: 0.03rem 0; text-align: center" @click="openPdf2(item)" class="pdfWrap">
                                     <span style="display: block;position:relative">
-                                        <img src="@/assets/img/pdf.png" alt="" class="pdfImg" v-if="item.name != '疏导区总面积'" />
+                                        <img src="@/assets/img/pdf.png" alt="" class="pdfImg" v-if="item.url" />
                                         <Strong
                                             style="color: #01E0FF;font-weight: 600;font-size: 0.26rem"
                                         >
@@ -42,7 +36,7 @@
                             </div>
                         </el-row>
 
-                        <el-row  class="sdqBasicInfo sdline2" >
+                        <el-row  class="sdqBasicInfo sdline2" :style="{'marginTop':marginTop1}" >
                             <div
                                 class="basicItem"
                                 v-for="(item, index) in diversionArea.slice(7,10)"
@@ -64,9 +58,31 @@
                                 </div>
                             </div>
                         </el-row>
+                        <el-row  class="sdqBasicInfo sdline2" :style="{'marginTop':marginTop1}" v-if="diversionArea2State">
+                            <div
+                                class="basicItem"
+                                v-for="(item, index) in diversionArea2"
+                                :key="index"
+                            >
+                            
+                                <div style="padding: 0.03rem 0; text-align: center;">
+                                    <span style="display: block;">
+                                        
+                                        <Strong
+                                            style="color: #058DFE;font-weight: 600;font-size: 0.3rem"
+                                        >
+                                            {{ item.value || 0 }}
+                                            <span v-if="isNaN(item.value)" style="fontSize: 0.2rem !important">{{ item.value || 0 }}</span>
+                                        </Strong>
+                                        {{ item.unit }}
+                                    </span>
+                                    <span class="nameBox" style="">{{ item.name }}</span>
+                                </div>
+                            </div>
+                        </el-row>
                        
 
-                        <el-row v-if="basicStatisStatus" class="sdline3" >
+                        <el-row v-if="basicStatisStatus" class="sdline3" :style="{'marginTop':marginTop1}">
                             <div
                                 class="basicItem"
                                 v-for="(item, index) in line3Array"
@@ -87,12 +103,12 @@
                                 </div>
                             </div>
                         </el-row>
-                        <el-row  v-else class="sdqBasicInfo sdline3" style="position:relative">
+                        <!-- <el-row   class="sdqBasicInfo sdline3" style="position:relative">
                             <div @click="basicGoBack" class="return">
                                 <div class="returnText">返回</div>
                             </div>
                             
-                                                       表格展示区域
+                                                       表格展示区域 -->
 
                             <!-- <el-table :data="tableDataBasic" style="width: 100%;height:1.7rem;margin-top:20px;" class="transparentTableRow" @mouseenter="autoScroll1(true)"  @mouseleave="autoScroll1()">
                                 <el-table-column prop="date" label="Date" width="180" />
@@ -100,7 +116,7 @@
                                 <el-table-column prop="address" label="Address" />
                             </el-table> -->
 
-                        </el-row>
+                        <!-- </el-row> -->
                     </div>
                 </div>
                 
@@ -178,11 +194,11 @@
                     <h4 style="display: flex">疏导区监督执法</h4>
                     <div class="girdCheckItem">
                         <div class="row_g" style="color:#fff">
-                            <div @click="basicStaticsData('监督执法1')">检查家数<br>746次</div>
-                            <div @click="basicStaticsData('监督执法2')">发现隐患数<br>724次</div>
-                            <div @click="basicStaticsData('监督执法3')">督改隐患数<br>754次</div>
-                            <div @click="basicStaticsData('监督执法4')">处罚金额<br>445500元</div>
-                            <div @click="basicStaticsData('监督执法5')">查封<br>3个</div>
+                            <div @click="basicStaticsData('监督执法1')">检查家数<br>1091次</div>
+                            <div @click="basicStaticsData('监督执法2')">发现隐患数<br>778次</div>
+                            <div @click="basicStaticsData('监督执法3')">督改隐患数<br>600次</div>
+                            <div @click="basicStaticsData('监督执法4')">处罚金额<br>940500元</div>
+                            <div @click="basicStaticsData('监督执法5')">查封<br>11个</div>
                         </div>
                     </div>
                         <el-table :data="tableDataGrid2" 
@@ -404,14 +420,15 @@
                 <div class="girdCheckSec" style="position: relative">
                     <h4 style="display: flex">疏导区网格检查情况</h4>
                     <div style="position: absolute;right: 4px;top: 0px;font-size: 0.15rem;color: #666;cursor: pointer">
-                        <el-button
+                        <!-- <el-button
                             size="mini"
                             @click="tabTActive(1)"
                             :class="{ btnClick: tabsType == '1' }"
                             style="border:none"
                         >
                         检查率：100%
-                        </el-button>
+                        </el-button> -->
+                        
                     </div>
                     <div class="girdCheckItem">
                         <div class="row_g">
@@ -419,7 +436,20 @@
                             <div @click="basicStaticsData('新消监')">检查家数<br>4128家次</div>
                             <div @click="basicStaticsData('新消监')">发现隐患数<br>1047处</div>
                             <div @click="basicStaticsData('新消监')">整改隐患<br>786处</div>
-                            <div style="font-size:.175rem;margin-left:.125rem" >当日:</div>
+                            <!-- <div style="font-size:.175rem;margin-left:.125rem" >当日:</div>
+                            <div @click="basicStaticsData('新消监')">检查家数<br>296家次</div>
+                            <div @click="basicStaticsData('新消监')">发现隐患数<br>64处</div>
+                            <div @click="basicStaticsData('新消监')">整改隐患<br>62处</div> -->
+                        </div>
+                        <div class="checkRate">
+                                检查率：
+                                <img src="@/assets/img/j1.png" alt="" v-if="jEndS<=100">
+                                <img src="@/assets/img/j2.png" alt="" v-if="100<jEndS && jEndS<=200">
+                                <img src="@/assets/img/j3.png" alt="" v-if="200<jEndS">
+                                <span :style="{color:100<jEndS && jEndS<=200 ?'orange':  200<jEndS ? 'green' : 'red'}"><CountTo :startVal="jStart" :endVal="jEnd" :duration="10000"></CountTo>%</span>
+                            </div>
+                        <div class="row_g">
+                            <div style="font-size:.175rem;margin-left:0rem" >当日:</div>
                             <div @click="basicStaticsData('新消监')">检查家数<br>296家次</div>
                             <div @click="basicStaticsData('新消监')">发现隐患数<br>64处</div>
                             <div @click="basicStaticsData('新消监')">整改隐患<br>62处</div>
@@ -427,7 +457,7 @@
                     </div>
                     <div style="display: flex">
                         <h4 style="font-size: 0.2rem;border:none"></h4>
-                        <div
+                        <!-- <div
                             style="
                                 display: flex;
                                 border-bottom: 0.0125rem solid
@@ -446,7 +476,7 @@
                                 :class="{ btnClick: check === '2' }"
                                 >中网格</el-button
                             >
-                        </div>
+                        </div> -->
                     </div>
                         <el-table :data="tableDataGrid" 
                             class="transparentTableRow"
@@ -491,12 +521,12 @@
                                     法定代表人为戴金标。
                                     <br />
                                 </template>
-                                <el-button @click="basicStaticsData(39,'重大火灾隐患')">重大火灾隐患：2家（华漕镇）</el-button>
+                                <el-button @click="basicStaticsData(6,'重大火灾隐患2')">重大火灾隐患：2家（华漕镇）</el-button>
                             </el-tooltip>
                         </el-row>
                         <el-row class="row_g2">
                             <el-col :span="8">消防安全重点单位<br><span @click="openPdf('http://32.0.15.107:8080/mhvi/zddw.pdf')" style="border-bottom:1px solid #fff">评分标准</span></el-col>
-                            <el-col :span="4" style="color:red" @click="djActiveClick(0)">高风险<br>0（家）</el-col>
+                            <el-col :span="4" style="color:red" @click="djActiveClick(0)">高风险<br>2（家）</el-col>
                             <el-col :span="4" style="color:orange" @click="djActiveClick(1)">较高风险<br>9（家）</el-col>
                             <el-col :span="4" style="color:yellow" @click="djActiveClick(2)">一般风险<br>15（家）</el-col>
                             <el-col :span="4" style="color:rgb(1, 224, 255)" @click="djActiveClick(3)">低风险<br>152（家）</el-col>
@@ -1119,8 +1149,9 @@ import { Vue3SeamlessScroll } from "vue3-seamless-scroll";
 
 import category from "@c/category/index22";
 import unitBox from "@c/unitBox/index";
-import CountTo from "@/components/count-to/index.js";
+import CountTo from '@/components/count-to/index.js'
 import Hls from "hls.js";
+import { set } from "lodash";
 export default {
     mixins: [linstener, map],
     components: { category, gauge, CountTo,unitBox ,Vue3SeamlessScroll },
@@ -1128,24 +1159,23 @@ export default {
         return {
                 tk:false,
                 tkData: {},//消防安全重点单位弹框数据
+                jStart:0,//检出率开始
+                jEnd:300,//检出率结束
+                jEndS:0,//检出率样式数组
+                marginTop1:"-0.5vh",
             jxcstj:[0,0,0,0],//九小场所统计
             check: '1',
             dialogTableVisible:false,
             pdfUrl:'',
             dailyArray:[
-                
-                // {
-                //     title: '第十期：  第六届中国国际进口博览会每日工作动态',
-                //     url: 'http://32.0.15.107:8080/mhvi/20231103.pdf',
-                // },
-                // {
-                //     title: '第九期：  第六届中国国际进口博览会每日工作动态',
-                //     url: 'http://32.0.15.107:8080/mhvi/20231102.pdf',
-                // },
-                // {
-                //     title: '第八期：  第六届中国国际进口博览会每日工作动态',
-                //     url: 'http://32.0.15.107:8080/mhvi/20231101.pdf',
-                // },
+                {
+                    title: '第十一期： 第七届中国国际进口博览会每日工作动态',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/11.4闵行疏导区每日动态.pdf',
+                },
+                {
+                    title: '第十期： 第七届中国国际进口博览会每日工作动态',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/11.3闵行疏导区每日动态.pdf',
+                },
                 {
                     title: '第九期： 第七届中国国际进口博览会每日工作动态',
                     url: 'https://mhxfzd.shmh.gov.cn/data/11.2闵行疏导区每日动态.pdf',
@@ -1203,9 +1233,9 @@ export default {
                 }
             ],
             tableDataGrid2:[
-                {id:"检查家次",count1:"234",count2:"234",count3:"234",count4:"234"},
-                {id:"发现隐患数",count1:"234",count2:"234",count3:"234",count4:"234"},
-                {id:"督改隐患数",count1:"234",count2:"234",count3:"234",count4:"234"}
+                {id:"检查家次",count1:"20",count2:"36",count3:"19",count4:"41"},
+                {id:"发现隐患数",count1:"20",count2:"36",count3:"19",count4:"41"},
+                {id:"督改隐患数",count1:"20",count2:"36",count3:"19",count4:"41"}
             ],//疏导区监督执法
             // 大中网格数据渲染 start
             tableDataGrid:[],
@@ -1548,7 +1578,7 @@ export default {
                 {
                     "name": "重点单位",
                     "count": 258,
-                    "value":40
+                    "value":47
                 },
                 {
                     "name": "大型综合体",
@@ -1748,6 +1778,12 @@ export default {
         zfjly1:undefined,
         zfjly2:undefined,
         tabsType:1,
+        diversionArea2:[
+            { name: "虹桥镇（自选）", value: 2.21, unit: "km²", color: "#01C3B4" },
+            { name: "中网格（虹桥）", value: 2, unit: "个", color: "#01C3B4" },
+            { name: "小网格（虹桥）", value: 11, unit: "个", color: "#01C3B4" },
+        ],
+        diversionArea2State:true,
         selectVideoData: [],
             tabsArea: "fx", //切换
             diversionArea: [
@@ -2100,6 +2136,8 @@ export default {
         };
     },
     mounted() {
+        this.checkFullScreen(); //全屏
+        this.timeJ() //检查率颜色
         // this.gridStatisticsData()//处置网格数据
         this.grid(15);
         this.tableDataGrid=this.tableDataBigGrid;
@@ -2125,7 +2163,24 @@ export default {
         
     },
     methods: {
-
+        //检查率颜色
+        timeJ(){
+            // 设置间隔时间（例如3秒）
+            let duration = 2000;
+            // 设置定时器
+            let interval = setInterval(() => {
+                // 计算当前时间已过的百分比
+                let timeElapsed = this.jEnd / (duration / 100);
+                // 如果时间已过或接近目标值，清除定时器并设置为目标值
+                if (this.jEndS >= this.jEnd) {
+                    clearInterval(interval);
+                    this.jEndS = this.jEnd;
+                } else {
+                    this.jEndS = timeElapsed  + this.jEndS
+                    // 输出当前值
+                }
+            }, 100);
+        },
        //中网格对应左侧疏导区基本情况
         async staticsSd(name,grideGrade,mapGridName){
             let res = await this.$axios.get(
@@ -2199,6 +2254,13 @@ export default {
             this.pdfUrl=val;
             this.dialogTableVisible=true
         },
+        openPdf2(val){
+            if(val.url){
+                this.pdfUrl=val.url;
+                this.dialogTableVisible=true
+            }
+            
+        },
 
         btnC(val) {
             this.check = val;
@@ -2431,6 +2493,11 @@ export default {
                                 }
                             }
                         }else{
+                            if(type == 6){
+                                arr = [data]
+                                arr.push(res.data[8])
+                                arr.push(res.data[9])
+                            }
                             this.addMarker(arr, "security-plan", name)
                         }
                     }
@@ -2954,6 +3021,21 @@ export default {
                 this.anbao(1, 3);
                 this.dwgjcmcAndhzzx()
                 this.anbaoSDUWG2()//疏导区网格
+                this.diversionArea2State = true
+                this.diversionArea=[
+                    { name: "疏导区总面积", value: 54.46, unit: "km²", color: "#7DD807" },
+                    { name: "华漕镇", value: 28.2, unit: "km²", color: "#01C3B4" , url:"https://mhxfzd.shmh.gov.cn/data/%E5%8D%8E%E6%BC%95%E9%95%87%E6%B6%88%E9%98%B2%E5%AE%89%E5%85%A8%E5%BD%A2%E5%8A%BF%E7%94%BB%E5%83%8F.pdf"},
+                    { name: "新虹街道", value: 19.26, unit: "km²", color: "#01C3B4", url:"https://mhxfzd.shmh.gov.cn/data/%E6%96%B0%E8%99%B9%E8%A1%97%E9%81%93%E6%B6%88%E9%98%B2%E5%AE%89%E5%85%A8%E5%BD%A2%E5%8A%BF%E7%94%BB%E5%83%8F.pdf" },
+                    { name: "七宝镇", value: 7, unit: "k㎡", color: "#01C3B4" , url:"https://mhxfzd.shmh.gov.cn/data/%E4%B8%83%E5%AE%9D%E9%95%87%E6%B6%88%E9%98%B2%E5%AE%89%E5%85%A8%E5%BD%A2%E5%8A%BF%E7%94%BB%E5%83%8F.pdf"},
+                    { name: "虹桥镇", value: 2.21, unit: "km²", color: "#01C3B4", url:"https://mhxfzd.shmh.gov.cn/data/%E8%99%B9%E6%A1%A5%E9%95%87%E6%B6%88%E9%98%B2%E5%AE%89%E5%85%A8%E5%BD%A2%E5%8A%BF%E7%94%BB%E5%83%8F.pdf" },
+                    
+                    { name: "分管领导", value: 20, unit: "人", color: "#058DFE" },
+                    { name: "增援干部", value: 11, unit: "人", color: "#058DD1" },
+                    { name: "大网格", value: 3, unit: "个", color: "#FC0609 " },
+                    { name: "中网格", value: 12, unit: "个", color: "#FD843A" },
+                    { name: "小网格", value: 89, unit: "个", color: "#7DD807" },
+                ] //疏导区基本情况
+               
             } else if (id == 20) {
                 this.gridStatus = id;
                 this.selectVideo(1)
@@ -3346,7 +3428,9 @@ export default {
                                 type2: undefined,
                                 type3: undefined,
                                 type4: undefined,
+                                id:data[i].id
                             };
+                            
                             if (data[i].gridMemderViceList) {
                                 for (let ii = 0; ii < data[i].gridMemderViceList.length; ii++) {
                                     if (id == 19) {
@@ -3432,13 +3516,31 @@ export default {
                     // }
                     if (position) {
                         let arr = {};
-                        arr.type = id;
-                        arr.name = area;
-                        arr.position = position;
-                        arr.content = gridData;
-                        this.anbaoPopup(arr);
-                        if(id !=19){
-                            this.superiorGrid(gridData[0].seniorGrid, id == 15 ? 1 : id == 16 ? 2 : "");
+                        if(id == 19 || id == 15){
+                            arr.id = id;
+                            arr.type = id;
+                            arr.name = area;
+                            arr.position = position;
+                            arr.content = gridData;
+                            this.anbaoPopup(arr);
+                        }
+                        if(id == 16){
+                            for(let i = 0;i<gridData.length;i++){
+                                if(gridData[i].mapGridName == area){
+                                    arr.content = gridData[i]
+                                    arr.type = id
+                                    arr.position = position
+                                    arr.name = area
+                                    arr.seniorGrid = gridData[i].seniorGrid
+                                    this.anbaoPopup(arr);
+                                }
+                            }
+                        }
+
+                        
+                        if(id !=19 && id == 16){
+                            this.superiorGrid(arr.seniorGrid, id == 15 ? 1 : id == 16 ? 2 : "");
+                            this.diversionArea2State = false
                         }
                         
                     } else {
@@ -3478,7 +3580,6 @@ export default {
                         })
                 )
                 .then((res) => {
-                    
                     this.diversionArea = [];
                     if (res.data.length > 0) {
                         let data = res.data[0];
@@ -3641,18 +3742,26 @@ export default {
         },
         tabTActive(id){
             this.tabsType = id
+        },
+        checkFullScreen() {
+        if(document.documentElement.clientHeight == 1080){
+            this.marginTop1 = '1vh'
         }
+    }
     },
 
     watch: {
         "stores.$state.gridData": function (newValue, oldValue) {
-            console.log(newValue,this.gridStatus)
             if (this.gridStatus == 19) {
                 this.grid(19, newValue.name, newValue.position);
             }
             if (this.gridStatus == 15) {
+
                 this.grid(15, newValue.name, newValue.position);
                 this.staticsSd(newValue.name,2,'')
+                setTimeout(()=>{
+                    this.diversionArea2State = false
+                },1000)
             }
             if (this.gridStatus == 16) {
                 this.grid(16, newValue.name, newValue.position,null,3);
@@ -3674,6 +3783,8 @@ export default {
      
 
     },
+
+    
     // watch: {
     //     "stores.$state.jkspData": function (newValue, oldValue) {
     //         console.log(123,newValue,this.stores.$state.jkspData)
@@ -4553,6 +4664,30 @@ table tbody tr:nth-child(2n) td {
 td {
     border: 0.5px solid #fff;
 }
+.checkRate{
+    position: absolute;
+    color:#fff;
+    right:50px;
+    top:80px;
+    font-size: 0.25rem;
+    img{
+        position: absolute;
+        width:80px;
+        top:-24px;
+        right:-14px;
+        animation: rotoImg 4s linear infinite;
+        // transform:skew(70deg)
+    }
+}
+@keyframes rotoImg{
+    from{
+        transform: rotate(0deg);
+    }
+    to{
+        transform: rotate(360deg);
+    } 
+}
+
 </style>
 <style>
 .el-tooltip__popper {
@@ -4578,5 +4713,4 @@ td {
     -webkit-box-orient: vertical;
 }
 
-
 </style>