优化+调整

src/components/mixins/anbao1.js

@@ -0,0 +1,3 @@
+let data1='121.36194587932806,31.16013705465239;121.34727553811794,31.15828077299882;121.32700411033827,31.148247489434965;121.31514606604391,31.139440444833916;121.30048786370499,31.134903156770502;121.29284839062778,31.12773298212305;121.28484794201171,31.12306873887283;121.2434981967536,31.119911283997425;121.22295978253271,31.11453182095247;121.22093534994545,31.128184924119704;121.22476714240756,31.137743873822444;121.22284789103668,31.151848705517672;121.2192245740552,31.185051824029983;121.21634530262463,31.19305254070648;121.21666410880577,31.199965150511076;121.20802887999594,31.252419358825662;121.2510308379889,31.25199056924825;121.26975280768023,31.256161713215423;121.29758483246128,31.25239812402721;121.34774474510056,31.253635862387053;121.34278143296902,31.239737181776324;121.34412376809345,31.224709084528335;121.35105449522602,31.20248989001769;121.35374042236845,31.182090361752536;121.36194587932806,31.16013705465239'
+
+export default data1;

src/components/mixins/map-data1.js

@@ -1202,13 +1202,40 @@ export default {
                                         ["保卫区域：", val.attrbutes.facilityName, 24],
                                         ["负责人：", val.attrbutes.contact, 24],
                                         ["联系电话：", val.attrbutes.contactPhone, 24],
-                                        ["人数：", msgParse.test1, 24],
-                                        ["设立原因：", msgParse.test2, 24],
-                                        ["驻防时间：", msgParse.test3, 24],
-                                        ["定位设备编号：", msgParse.test4, 24],
-                                        ["对讲设备编号：", msgParse.test5, 24],
-                                        ["跟车人员姓名及岗位：",`${msgParse.test7} ${msgParse.test6}`, 24],
-                                        ["跟车人员姓名及岗位：",`${msgParse.test9} ${msgParse.test8}`, 24],
+                                        ["支队：", msgParse.test1, 24],
+                                        ["辖区中队：", msgParse.test2, 24],
+                                        ["驻防车辆：", msgParse.test3, 24],
+                                        ["车型/跟车人数：", `${msgParse.test4}/ ${msgParse.test5}`, 24],
+                                        ["设立原因：", msgParse.test6, 24],
+                                        ["驻防时间：", msgParse.test7, 24],
+                                        ["视频设备编号：", msgParse.test8, 24],
+                                        ["跟车人员姓名及岗位1：",`${msgParse.test10} ${msgParse.test9}`, 24],
+                                        ["跟车人员姓名及岗位2：",`${msgParse.test12} ${msgParse.test11}`, 24],
+                                        ["跟车人员姓名及岗位3：",`${msgParse.test14} ${msgParse.test14}`, 24],
+                                        ["跟车人员姓名及岗位4：",`${msgParse.test16} ${msgParse.test15}`, 24],
+                                        ["跟车人员姓名及岗位5：",`${msgParse.test18} ${msgParse.test17}`, 24],
+                                        ["跟车人员姓名及岗位6：",`${msgParse.test20} ${msgParse.test19}`, 24],
+                                        ["跟车人员姓名及岗位7：",`${msgParse.test22} ${msgParse.test21}`, 24],
+                                        ["户号：", msgParse.test23, 24],
+                                        ["车型：", msgParse.test24, 24],
+                                        ["车辆号牌：", msgParse.test25, 24],
+                                        ["所属单位：", msgParse.test26, 24],
+                                        ["电台呼号：", msgParse.test27, 24],
+                                        ["车辆类型：", `${msgParse.test28} ${msgParse.test29} ${msgParse.test30} ${msgParse.test31} ${msgParse.test32}`, 24],
+                                        ["总质量：", msgParse.test33, 24],
+                                        ["乘员数：", msgParse.test34, 24],
+
+                                        ["云梯高度(米)、油箱容量（升）：",`${msgParse.test35} 、${msgParse.test36}`, 24],
+                                        ["发动机功率（千瓦）：", msgParse.test37, 24],
+                                        ["水泵流量（升/分钟）：", msgParse.test38, 24],
+
+                                        ["泡沫流量（升/分钟）：", msgParse.test39, 24],
+                                        ["水箱容量（吨）：", msgParse.test40, 24],
+
+                                        ["名称修改为（载水量）：", msgParse.test41, 24],
+                                        ["泡沫容量（吨）：", msgParse.test42, 24],
+                                       
+                                  
                                     ],
                                 }, ];
                                 this.popup(val._attrbutes, arrayList, true)
@@ -1658,10 +1685,10 @@ export default {
                             val.type == "wgmc_hq" ? 98 : 
                             val.type == "国家会展中心" ? 83 : 19.5,
                             
-                            height: val.type == "wgmc_hc" ? 38 :  
-                            val.type == "wgmc_xh" ? 38 :  
-                            val.type == "wgmc_qb" ? 38 :  
-                            val.type == "wgmc_hq" ? 38 :  
+                            height: val.type == "wgmc_hc" ? 33 :  
+                            val.type == "wgmc_xh" ? 33 :  
+                            val.type == "wgmc_qb" ? 33 :  
+                            val.type == "wgmc_hq" ? 33 :  
                             val.type == "国家会展中心" ? 59 : 25,
                         },
                     };

src/views/head.vue

@@ -11,7 +11,12 @@
       >
     </el-row> -->
         <el-row class="title" v-if="title">闵行区消防管理与应急救援数字平台</el-row>
-        <el-row class="title4" 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>
+            第六届中国国际进口博览会消防安保指挥平台
+            <a > <img src="@a/img/securityPlan/hzfk.png" alt="" /></a>
+            
+        </el-row>
         <!-- <el-row class="title2" v-if="!title">进博会消防安保平台</el-row>
         <el-row class="title3" v-if="!title">
             <span >火灾防控</span>
@@ -307,6 +312,11 @@ watch(
         >p{
             font-size: 0.25rem;
         }
+        img{
+            height:.4rem;
+            margin:.0 .8rem 
+
+        }
         // 转变为行内块元素 文字
     }
     .title3 {

src/views/security-plan.vue

@@ -81,8 +81,8 @@
                             <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" />
@@ -111,9 +111,9 @@
 
                                     <el-select   v-model="value111" @change="getOneUnit" class="m-2" placeholder="请选择"  style="width:200px">
                                         <el-option
-                                            v-for="item in options"
+                                            v-for="item in line3Array"
                                             :key="item.value"
-                                            :label="item.label"
+                                            :label="item.name"
                                             :value="item.value"
                                             />
                                     </el-select>
@@ -367,86 +367,114 @@
         </transition>
         <transition name="el-fade-in-linear">
             <el-col class="rightBox" v-show="stroes.$state.rightBtn">
+                 <!-- 疏导区每日动态 start -->
+                 <div class="dailyNewSec">
+                    <h4 style="display: flex">疏导区每日动态</h4>
+                    <div class="dailyItem">
+                        <el-row>
+                            <el-col :span="10">今日支队领导视察指挥中心</el-col>
+                            <el-col :span="14">第七期 第六届中国国际进口博览会每日工作动态</el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="10">今日支队领导视察指挥中心</el-col>
+                            <el-col :span="14">第七期 第六届中国国际进口博览会每日工作动态</el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="10">今日支队领导视察指挥中心</el-col>
+                            <el-col :span="14">第七期 第六届中国国际进口博览会每日工作动态</el-col>
+                        </el-row>
+                    </div>
+                   
+                    
+          
+                </div>
+
                 <!-- 疏导区网格检查情况 start -->
-                <div class="rightTop1">
+                <div class="girdCheckSec">
                     <h4 style="display: flex">疏导区网格检查情况</h4>
                     <div class="girdCheckItem">
-                        <p>大网格<span>&nbsp;&nbsp;&nbsp;街镇分管领导：4&nbsp;&nbsp;城运中心主任：4&nbsp;&nbsp;安监所所长：4&nbsp;&nbsp;支队外勤参谋：8</span></p>
                         <div class="row_g">
-                            <div >累计:</div>
-                            <div >检查家数<br>176（家次）</div>
+                            <div style="font-size:.175rem">累计:</div>
+                            <div >检查家数<br>100（家次）</div>
                             <div >发现隐患数<br>51（处）</div>
                             <div >整改隐患<br>48（处）</div>
-                            <div >处罚金额<br>0.5（万元）</div>
-                            <div >三停<br>0（家次）</div>
-                            <div >查封<br>0（处）</div>
+                            <div style="font-size:.175rem;margin-left:.125rem" >  当日:</div>
+                            <div >100家次</div>
+                            <div >20（处）</div>
+                            <div >20（处）</div>
                         </div>
-                    
-                        <div class="row_g">
-                            <div >今日:</div>
-                            <div >15（家次）</div>
-                            <div >0（处）</div>
-                            <div >0（处）</div>
-                            <div >0（万元）</div>
-                            <div >0（家次）</div>
-                            <div >0（处）</div>
-                        </div>
-                        <div class="row_g2">
-                            <div >消防安全重点单位四色分级情况</div>
-                            <div style="color:red">高风险<br>0（家）</div>
-                            <div style="color:orange">较高风险<br>3（家）</div>
-                            <div style="color:yellow">一般风险<br>15（家）</div>
-                            <div style="color:green">低风险<br>158（家）</div>
+                    </div>
+                    <div style="display: flex">
+                        <h4 style="font-size: 0.2rem;border:none"></h4>
+                        <div
+                            style="
+                                display: flex;
+                                border-bottom: 0.0125rem solid
+                                    rgba(115, 251, 253, 0.5);
+                            "
+                        >
+                            <el-button
+                                size="mini"
+                                @click="btnC('1')"
+                                :class="{ btnClick: check === '1' }"
+                                >大网格</el-button
+                            >
+                            <el-button
+                                size="mini"
+                                @click="btnC('2')"
+                                :class="{ btnClick: check === '2' }"
+                                >中网格</el-button
+                            >
                         </div>
                     </div>
+                        <el-table :data="tableData111" 
+                            class="transparentTableRow"
+                            height="57%"
+                            :empty-text="dataNo2"
+                            ref="reportTable"
+                            @mouseenter="autoScroll(true)"
+                            @mouseleave="autoScroll()"
+                            >
+                            <el-table-column prop="id" label="网格编号"  min-width="20" show-overflow-tooltip/>
+                            <el-table-column prop="count1" label="检查家数"  min-width="20" show-overflow-tooltip/>
+                            <el-table-column prop="count2" label="发现隐患数"  min-width="20" show-overflow-tooltip/>
+                            <el-table-column prop="count3" label="整改隐患"  min-width="20" show-overflow-tooltip/>
+                        </el-table>
+
+                        
+                   
+
+                    
+          
+                </div>
+                <!-- 疏导区单位四色分级情况 start -->
+                <div class=" ssfjSec">
+                    <h4 style="display: flex">疏导区单位四色分级情况</h4>
+             
                     <div class="girdCheckItem">
-                        <p>中网格<span>&nbsp;&nbsp;&nbsp;安监所人员: 14&nbsp;&nbsp;城运中心人员：14&nbsp;&nbsp;消防助理员：24</span></p>
-                        <div class="row_g3">
-                            <div >累计:</div>
-                            <div >检查家数<br>4569（家次）</div>
-                            <div >发现隐患数<br>751（处）</div>
-                            <div >整改隐患<br>722（处）</div>
-                            <div >签约承诺书<br>4569（份）</div>
-                            <div >检查覆盖率<br>95%</div>
-                        </div>
-                        <div class="row_g3">
-                            <div >今日:</div>
-                            <div >127（家次）</div>
-                            <div >17（处）</div>
-                            <div >16（处）</div>
-                        </div>
                     
                         <div class="row_g2">
-                            <div >九小场所四色分级情况</div>
+                            <div >消防安全重点单位</div>
                             <div style="color:red">高风险<br>151（家）</div>
                             <div style="color:orange">较高风险<br>278（家）</div>
                             <div style="color:yellow">一般风险<br>114（家）</div>
                             <div style="color:green">低风险<br>4026（家）</div>
                         </div>
-
-                    </div>
-                    <div class="girdCheckItem">
-                        <p>小网格<span>&nbsp;&nbsp;&nbsp;小网格长: 103&nbsp;&nbsp;网格人员：161</span></p>
-                        <div class="row_g">
-                            <div >累计:</div>
-                            <div >主动发现<br>45（起）</div>
-                            <div >被动处置<br>67（起）</div>
-                            <div >隐患整改<br>112（起）</div>
-                            <div >派发<br>112（起）</div>
-                            <div >完成<br>112（起）</div>
-                            <div >处置率<br>100%</div>
-                        </div>
-                        <div class="row_g">
-                            <div >今日:</div>
-                            <div >0（起）</div>
-                            <div >0（起）</div>
-                            <div >0（起）</div>
+                        <div class="row_g2">
+                            <div >九小场所</div>
+                            <div style="color:red">高风险<br>151（家）</div>
+                            <div style="color:orange">较高风险<br>278（家）</div>
+                            <div style="color:yellow">一般风险<br>114（家）</div>
+                            <div style="color:green">低风险<br>4026（家）</div>
                         </div>
 
                     </div>
-                    <br>
+                    
+          
                 </div>
-                <!-- <div class="rightTop1">
+
+                
+                <!-- <div class="girdCheckSec">
                     <h4 style="display: flex">疏导区网格检查情况</h4>
                     <div class="girdCheckItem">
                         <p>大网格<span>&nbsp;&nbsp;&nbsp;街镇分营领导：10&nbsp;&nbsp;城运中心主任：10&nbsp;&nbsp;安监所所长：10&nbsp;&nbsp;支队外参谋：10</span></p>
@@ -902,6 +930,42 @@ export default {
     components: { category, gauge, CountTo,unitBox },
     data() {
         return {
+            check: 1,
+            tableData111:[{
+                    id: '闵S1(华漕网格）',
+                    count1: '1127',
+                    count2: '250',
+                    count3: '250',
+                },
+                {
+                    id: '闵S2(新虹网格)',
+                    count1: '1242',
+                    count2: '169',
+                    count3: '169',
+                },
+                {
+                    id: '闵S3(七宝网格）',
+                    count1: '1187',
+                    count2: '173',
+                    count3: '173',
+                },
+                {
+                    id: '闵S4(虹桥网格）',
+                    count1: '1002',
+                    count2: '155',
+                    count3: '155',
+                },{
+                    id: '闵S3(七宝网格）',
+                    count1: '1187',
+                    count2: '173',
+                    count3: '173',
+                },
+                {
+                    id: '闵S4(虹桥网格）',
+                    count1: '1002',
+                    count2: '155',
+                    count3: '155',
+                }],
             tableDataBasic:[
             {
                 date: '2016-05-03',
@@ -981,7 +1045,7 @@ export default {
                 
             ],//处置网格header
 
-        value111:'23',   
+        value111:23,   
         //24、厂房仓库?? 25、大型商业综合体??  27、批发市场?? 
         // 23、宾馆酒店  26、规模租赁公寓 28、三合一场所 29、养老机构 30、医疗机构
         options: [
@@ -1103,7 +1167,7 @@ export default {
                 {
                     "name": "沿街门面",
                     "count": 3080,
-                    "value":0  //?
+                    "value":1  //?
                 },
                 // {
                 //     "name": "办公楼宇",
@@ -1118,7 +1182,7 @@ export default {
                 {
                     "name": "居民小区",
                     "count": 188,
-                    "value":0  //?
+                    "value":2  //?
                 },
                 
                 // {
@@ -1139,7 +1203,7 @@ export default {
                 {
                     "name": "地铁站",
                     "count": 4,
-                    "value":0  //?
+                    "value":3 //?
                 }
                 
             ],
@@ -1181,7 +1245,7 @@ export default {
             diversionArea: [
                 { name: "疏导区总面积", value: 57.41, unit: "km²", color: "#7DD807" },
                 { name: "华漕镇", value: 28.2, unit: "km²", color: "#01C3B4" },
-                { name: "新虹街道", value: 19.26, unit: "km²", color: "#01C3B4" },
+                { name: "新虹街道", value: 2, unit: "km²", color: "#01C3B4" },
                 { name: "七宝镇", value: 7, unit: "k㎡", color: "#01C3B4" },
                 { name: "虹桥镇", value: 2.95, unit: "km²", color: "#01C3B4" },
                 
@@ -1547,6 +1611,10 @@ export default {
         
     },
     methods: {
+
+        btnC(val) {
+            this.check = val;
+        },
         /**
          * 视频关闭
          * @param {} id 
@@ -3247,8 +3315,22 @@ export default {
                 height: 100%;
             }
         }
-        .rightTop1{
-            height:75.5%;
+
+        .dailyNewSec{
+            height:18%;
+            .dailyItem{
+                margin-top:.2rem;   
+                line-height:.375rem;
+                font-size:.175rem;
+                .el-col-10::after {
+                    content: '|';
+                    margin-left: .25rem;
+
+                }
+            }
+        }
+        .girdCheckSec{
+            height:38%;
             .girdCheckItem{
                 p{
                     font-size:0.225rem;
@@ -3262,28 +3344,46 @@ export default {
                     }
                 }
                 .row_g{
+                    display:flex;
+                    align-items: center;
                     margin-top:10px;
                     width:100%;
                     div{
-                        width:14% !important;
+                        // min-width:18% !important;
                         display: inline-block;
                         font-size:.155rem;
-                        margin:.125rem 0;
+                        margin:.125rem .182rem 0 0;
                         text-align: left;
                         vertical-align: top;
                         
                     }
                 }
+                
+              
+                    
+                
+                    
+                
+                
+
+
+            }
+        }
+        .ssfjSec{
+            height:20%;
+            .girdCheckItem{
                 .row_g2{
-                    margin-top:-10px;
+                    margin-top:0px;
                     width:100%;
+                    div:first-child{
+                        width:1.5rem
+                    }
                     div{
-                        width:20% !important;
                         display: inline-block;
                         font-size:.155rem;
-                        margin:.125rem 0;
+                        margin:.125rem .3rem .125rem 0;
                         text-align: left;
-                        vertical-align: top;
+                        // vertical-align: top;
                     }
                 }
                 .row_g3{