执勤战备力量部署板块移除，新增疏导区督查执法板块

proxy-dev.js

@@ -16,7 +16,8 @@ module.exports = {
     table: {
         "/prod-api": {
             // target: 'http://32.0.15.107:8080/prod-api', //线上-107测试服务器
-            target: 'http://10.236.244.108:8083/prod-api', //线上-8083测试服务器
+            target: 'https://mhxfzd.shmh.gov.cn/prod-api', //线上-8083测试服务器
+            // target: 'http://10.236.244.108:80/prod-api', //线上-8083测试服务器
             // target: "http://park.usky.cn/prod-api", //线上-20正式服务器
             //     target: 'http://172.16.120.165:801/dev-api', //165
                 // target: 'http://32.0.15.107:8080/api/', //闵行线上发布时
@@ -31,8 +32,8 @@ module.exports = {
             // 原有api
             //     target: 'http://32.0.15.107:8080/api/', //杨强闵行
             // target: 'http://32.0.15.107:8080/api',
-            target: 'http://10.236.244.108:8083/api',
-            // target: 'https://mhxfzd.shmh.gov.cn/api',
+            // target: 'http://10.236.244.108:80/api',
+            target: 'https://mhxfzd.shmh.gov.cn/api',
             ws: true, // 代理websockets
             changeOrigin: true,
             pathRewrite: {

src/views/security-plan.vue

@@ -4,6 +4,14 @@
             <el-col class="leftBox" v-show="stroes.$state.leftBtn">
                 <div class="leftTop">
                     <h4>疏导区基本情况</h4>
+                    <div style="position: absolute;right: 18px;top: 20px;font-size: 0.15rem;color: #666;cursor: pointer">
+                        <el-button
+                            size="mini"
+                            style="border:none"
+                        >
+                        虹桥镇（自选）中网格：2，小网格：22
+                        </el-button>
+                    </div>
                     <div class="leftTopContent2">
                         <!-- <el-row>
                             <div v-for="(item,index) in diversionArea" :key="index">
@@ -18,8 +26,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)">
-                                    <span style="display: block">
+                                <div style="padding: 0.03rem 0; text-align: center" @click="openPdf(item.url)" class="pdfWrap">
+                                    <span style="display: block;position:relative">
+                                        <img src="@/assets/img/pdf.png" alt="" class="pdfImg" v-if="item.name != '疏导区总面积'" />
                                         <Strong
                                             style="color: #01E0FF;font-weight: 600;font-size: 0.26rem"
                                         >
@@ -39,8 +48,10 @@
                                 v-for="(item, index) in diversionArea.slice(7,10)"
                                 :key="index"
                             >
-                                <div style="padding: 0.03rem 0; text-align: center">
-                                    <span style="display: block">
+                            
+                                <div style="padding: 0.03rem 0; text-align: center;">
+                                    <span style="display: block;">
+                                        
                                         <Strong
                                             style="color: #F48354;font-weight: 600;font-size: 0.3rem"
                                         >
@@ -136,7 +147,7 @@
               
                 </div>
 
-                <div class="rightCenter">
+                <!-- <div class="rightCenter">
                     <h4>执勤战备力量部署</h4>
                     <div class="rightTopContent">
                         <div style="width:95%;margin:0 auto;border: 1px solid rgba(48, 207, 255, 0.6); box-shadow: inset 0 0 0.07rem 0.04rem rgb(115 251 253 / 40%); box-sizing: border-box;display: flex;
@@ -159,60 +170,40 @@
                             </el-col>
 
                         </el-row>
+                    </div>
+                </div> -->
 
-
-                        <!-- <el-table :data="tableData2" class="transparentTableRow" height="100%" :empty-text="dataNo">
-                            <el-table-column type="expand">
-                                <template #default="props">
-                                    <template v-if="props.row.children">
-                                        <template v-for="(item, ind) in props.row.children" :key="ind">
-                                            <el-row class="tableExpendTitle" style="margin-top: 10px">
-                                                状态：{{ item.carStatus }}（{{ item.equipTypeName ? item.equipTypeName + "，" : "" }}{{ item.renyuanNum }}人）
-                                            </el-row>
-                                            <el-row class="tableExpendcontent">
-                                                <el-col>
-                                                    <div>
-                                                        车牌号：<span style="color: #6ff3f6">{{ item.cphm }}</span>
-                                                    </div>
-                                                </el-col>
-                                                <el-col v-if="item.zhy" :span="12">
-                                                    <div>
-                                                        指挥员：<span style="color: #6ff3f6">{{ item.zhy }}</span>
-                                                    </div>
-                                                </el-col>
-                                                <el-col v-if="item.txy" :span="12">
-                                                    <div>
-                                                        通讯员：<span style="color: #6ff3f6">{{ item.txy }}</span>
-                                                    </div>
-                                                </el-col>
-                                                <el-col v-if="item.jsy" :span="12">
-                                                    <div>
-                                                        驾驶员：<span style="color: #6ff3f6">{{ item.jsy }}</span>
-                                                    </div>
-                                                </el-col>
-                                                <el-col v-if="item.zsry" :span="24">
-                                                    <div>
-                                                        战士人员：<span style="color: #6ff3f6">{{ item.zsry }}</span>
-                                                    </div>
-                                                </el-col>
-                                            </el-row>
-                                        </template>
-                                    </template>
-                                </template>
-                            </el-table-column>
-                            <el-table-column show-overflow-tooltip v-for="item in headerData2" :key="item.prop" :prop="item.prop" align="center" min-width="20" :label="item.name">
-                                <template v-if="item.prop === 'car'" #default="scope">
-                                    <span style="color: #6ff3f6">{{ scope.row.car }}</span>
-                                </template>
-                                <template v-if="item.prop === 'personnel'" #default="scope">
-                                    <span style="color: #6ff3f6">{{ scope.row.personnel }}</span>
-                                </template>
-                            </el-table-column>
-                        </el-table> -->
+                <!-- 疏导区监督执法 start -->
+                <div class="girdCheckSec" style="position: relative">
+                    <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>
                     </div>
-                </div>
+                        <el-table :data="tableDataGrid2" 
+                            class="transparentTableRow"
+                            height="57%"
+                            :empty-text="dataNo2"
+                            
+                            >
+                            <el-table-column prop="id" label="类型"  min-width="25" 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-column prop="count4" label="虹桥镇"  min-width="20" show-overflow-tooltip/>
+                        </el-table>
 
-                
+                        
+                   
+
+                    
+          
+                </div>
 
 
                 <!-- <div class="leftCenter">
@@ -415,7 +406,7 @@
                             :class="{ btnClick: tabsType == '1' }"
                             style="border:none"
                         >
-                        覆盖率：100%
+                        检查率：100%
                         </el-button>
                     </div>
                     <div class="girdCheckItem">
@@ -1175,31 +1166,51 @@ export default {
                 //     title: '第二期： 第六届中国国际进口博览会每日工作动态',
                 //     url: 'http://32.0.15.107:8080/mhvi/20231024.pdf',
                 // },
+                {
+                    title: '第五期： 第七届中国国际进口博览会每日工作动态',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/10.29闵行疏导区每日动态.pdf',
+                },
+                {
+                    title: '第四期： 第七届中国国际进口博览会每日工作动态',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/10.28闵行疏导区每日动态.pdf',
+                },
+                {
+                    title: '第三期： 第七届中国国际进口博览会每日工作动态',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/10.27闵行疏导区每日动态.pdf',
+                },
+                {
+                    title: '第二期： 第七届中国国际进口博览会每日工作动态',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/10.26闵行疏导区每日动态.pdf',
+                },
                 {
                     title: '第一期： 第七届中国国际进口博览会每日工作动态',
-                    url: 'http://10.236.244.108:8083/data/10.25闵行疏导区每日动态.pdf',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/10.25闵行疏导区每日动态.pdf',
                 },
             ],
             dailyArray2:[
                
                 {
                     title: '第七届进博会闵行区消防救援支队组织架构',
-                    url: 'http://10.236.244.108:8083/data/第七届进博会闵行区消防救援支队组织架构.pdf',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/第七届进博会闵行区消防救援支队组织架构.pdf',
                 },
                 {
                     title: '关于本区消防安全重点单位全面开展火灾防范“十个一”活动工作的通知',
-                    url: 'http://10.236.244.108:8083/data/关于本区消防安全重点单位全面开展火灾防范“十个一”活动工作的通知.pdf',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/关于本区消防安全重点单位全面开展火灾防范“十个一”活动工作的通知.pdf',
                 },
                 {
                     title: '关于印发《第七届中国国际进口博览会闵行区疏导区街镇消防安保工作重点任务清单》的通知',
-                    url: 'http://10.236.244.108:8083/data/关于印发《第七届中国国际进口博览会闵行区疏导区街镇消防安保工作重点任务清单》的通知.pdf',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/关于印发《第七届中国国际进口博览会闵行区疏导区街镇消防安保工作重点任务清单》的通知.pdf',
                 },
                 {
                     title: '关于印发《第七届中国国际进口博览会消防安保闵行区社会面火灾防控工作方案》的通知',
-                    url: 'http://10.236.244.108:8083/data/关于印发《第七届中国国际进口博览会消防安保闵行区社会面火灾防控工作方案》的通知.pdf',
+                    url: 'https://mhxfzd.shmh.gov.cn/data/关于印发《第七届中国国际进口博览会消防安保闵行区社会面火灾防控工作方案》的通知.pdf',
                 }
             ],
-
+            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"}
+            ],//疏导区监督执法
             // 大中网格数据渲染 start
             tableDataGrid:[],
             tableDataBigGrid:[
@@ -1745,16 +1756,16 @@ export default {
             tabsArea: "fx", //切换
             diversionArea: [
                 { name: "疏导区总面积", value: 54.46, unit: "km²", color: "#7DD807" },
-                { name: "华漕镇", value: 28.2, unit: "km²", color: "#01C3B4" , url:"http://10.236.244.108:8083/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:"http://10.236.244.108:8083/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:"http://10.236.244.108:8083/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:"http://10.236.244.108:8083/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: 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: 14, unit: "个", color: "#FD843A" },
-                { name: "小网格", value: 100, unit: "个", color: "#7DD807" },
+                { name: "中网格", value: 12, unit: "个", color: "#FD843A" },
+                { name: "小网格", value: 89, unit: "个", color: "#7DD807" },
                 // {name:"人员力量",value:41,unit:"人",color:"#058DD1"},
             ], //疏导区基本情况
             gridStatus: 19,
@@ -3626,6 +3637,15 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/scss/color.scss";
+.pdfWrap{
+    position: relative;
+    .pdfImg{
+        position: absolute;
+        top:34px;
+        right:0;
+        width:10px;
+    }
+}
 .contentBox {
     .return{
         position: absolute;
@@ -3774,7 +3794,47 @@ export default {
                 }
             }
         }
+        .girdCheckSec{
+            height:38%;
+            .girdCheckItem{
+                p{
+                    font-size:0.225rem;
+                    margin:.1875rem 0 .125rem;
+                    color:rgb(234, 183, 147);
+                    font-weight:700;
+                    span{
+                        font-size: 0.175rem;
+                        color:#fff;
+                        
+                    }
+                }
+                .row_g{
+                    display:flex;
+                    align-items: center;
+                    margin:2px 0 10px;
+                    width:100%;
+                    div{
+                        // min-width:18% !important;
+                        display: inline-block;
+                        font-size:.155rem;
+                        margin:.125rem .182rem 0 0;
+                        text-align: center;
+                        vertical-align: top;
+                        width:20%;
+                        // background: red;
+                    }
+                }
+                
+              
+                    
+                
+                    
+                
+                
+
 
+            }
+        }
         .leftCenter {
             height: 32%;
             max-height: 32%;
@@ -3826,6 +3886,7 @@ export default {
                     }
                 }
             }
+            
         }
 
         .rightCenter {
@@ -4191,6 +4252,7 @@ export default {
 
         
     }
+    
     .rightBox2 {
         .rightTop {
             height: 55%;
@@ -4346,7 +4408,6 @@ export default {
     }
 
 
-
     .dialogSec {
   ::v-deep .el-dialog {
     width:16rem!important;
@@ -4461,4 +4522,6 @@ td {
     -webkit-line-clamp: 15;
     -webkit-box-orient: vertical;
 }
+
+
 </style>