diff --git a/src/api/safetyIndex/index.js b/src/api/safetyIndex/index.js
index 779a529..3d028ab 100644
--- a/src/api/safetyIndex/index.js
+++ b/src/api/safetyIndex/index.js
@@ -49,21 +49,21 @@ export function flowDetail(params) {
     })
 }
 //企业今日进园区
-export function vehicleIn(params) {
+export function vehicleIn(data) {
     return request({
-        url: '/safety/index/vehicle/in',
+        url: '/safety/tbParkVehicleRecord/list',
         method: 'post',
-        params
-    })
-}
-//企业今日出园区
-export function vehicleOut(params) {
-    return request({
-        url: '/safety/index/vehicle/out',
-        method: 'post',
-        params
+        data
     })
 }
+// //企业今日出园区
+// export function vehicleOut(params) {
+//     return request({
+//         url: '/safety/index/vehicle/out',
+//         method: 'post',
+//         params
+//     })
+// }
 //企业车辆使用方式
 export function vehicleUserType(params) {
     return request({
diff --git a/src/assets/realtimeWarning/消息.png b/src/assets/realtimeWarning/消息.png
index 284a2a3..f7f76ef 100644
Binary files a/src/assets/realtimeWarning/消息.png and b/src/assets/realtimeWarning/消息.png differ
diff --git a/src/components/offLineMap/index.vue b/src/components/offLineMap/index.vue
index 97944d0..559da43 100644
--- a/src/components/offLineMap/index.vue
+++ b/src/components/offLineMap/index.vue
@@ -19,7 +19,8 @@ export default {
             villageList: [],
             villageSumList: [],
             flag: true,
-            companyList: []
+            companyList: [],
+            label1: {}
         }
     },
     mounted() {
@@ -180,9 +181,10 @@ export default {
                         label.setStyle({ backgroundColor: ' rgba(0, 0, 0, 0)', border: '0', color: '#0060ce', fontSize: '16px' })
                         map.addOverlay(label);
                         marker.addEventListener("click", function () {
+                            map.removeOverlay(that.label1);
                             topMapOne({ companyId: item.companyId, companyName: item.companyName }).then(res => {
-                                var label = new BMap.Label();
-                                label.setStyle({
+                                that.label1 = new BMap.Label();
+                                that.label1.setStyle({
                                     color: 'blue',
                                     borderRadius: '5px',
                                     borderColor: '#ccc',
@@ -192,10 +194,10 @@ export default {
                                     transform: 'translateX(-50%) translateY(calc(-100% - 10px))'
                                 });
 
-                                label.setPosition(new BMap.Point(item.longitude, item.latitude));
-                                label.setOffset(new BMap.Size(130, -10))
-                                label.setStyle({ width: '372px', height: '242px', background: 'url(pbImg/bz49.png) no-repeat', backgroundSize: '100% 100%', border: '0', color: '#fff', padding: '13px 20px' })
-                                label.setContent(`
+                                that.label1.setPosition(new BMap.Point(item.longitude, item.latitude));
+                                that.label1.setOffset(new BMap.Size(130, -10))
+                                that.label1.setStyle({ width: '372px', height: '242px', background: 'url(pbImg/bz49.png) no-repeat', backgroundSize: '100% 100%', border: '0', color: '#fff', padding: '13px 20px' })
+                                that.label1.setContent(`
                                 <div style='width:100%;display:flex;justify-content: space-between;align-items: center;border-bottom:1px solid #657E83;'> <h4 style='margin:12px;font-size: 14px;color: #EBFFF4;letter-spacing: 1px;line-height: 24px;text-shadow: 0 0 9px rgba(21,255,195,0.77);overflow: hidden;text-overflow: ellipsis;white-space: nowrap;'>${res.data.companyName}</h4><div class='closeBtn' style='font-size: 14px;color: #30C4FF;letter-spacing: 1px;font-weight: 400;'>企业看板<i style='display:inline-block; background: url(pbImg/跳转.png)  no-repeat;width:16px;height:14px;background-size: 100% 100%;"'></i></div><div class='closeBtn1' style='background: url(pbImg/关闭.png)  no-repeat;width:20px;height:20px;background-size: 100% 100%;position:relative;z-index:200000000;
                                 margin-top:-15px;"'></div></div>
                                 <div style='height:70px;width:100%;margin-top:15px;background: url(pbImg/编组.png);display:flex;justify-content: space-around;align-items: center;'>
@@ -243,17 +245,17 @@ export default {
                                     </div>
                                 </div>
                               `);
-                                map.addOverlay(label);
+                                map.addOverlay(that.label1);
                                 let closebtn = document.querySelector('.closeBtn')
                                 let closeBtn1 = document.querySelector('.closeBtn1')
                                 closeBtn1.addEventListener('click', () => {
 
-                                    map.removeOverlay(label);
+                                    map.removeOverlay(that.label1);
                                 })
                                 //console.log(btn, 'btn');
                                 closebtn.addEventListener('click', () => {
                                     that.$emit('toArchives', item)
-                                    map.removeOverlay(label);
+                                    map.removeOverlay(that.label1);
                                 })
                             })
                         });
diff --git a/src/views/companyCanban/fanggopngji.vue b/src/views/companyCanban/fanggopngji.vue
index e6f9616..b7593d1 100644
--- a/src/views/companyCanban/fanggopngji.vue
+++ b/src/views/companyCanban/fanggopngji.vue
@@ -32,7 +32,6 @@
                     </div>
                 </div>
             </div>
-
             <div class="topBox">
                 <div class="sjItem">
                     <div class="iconBox"><img src="../../assets/companyCanban/icon/企业技防达标.png" alt=""></div>
@@ -52,14 +51,7 @@
                     <div class="iconBox"><img src="../../assets/companyCanban/icon/企业整改.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[3].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[3].sumNumValue == '是'">
-                            <div class="green"></div>
-                            <div class="red"></div>
-                        </div>
-                        <div class="outlineStatus" v-else>
-                            <div class="green"></div>
-                            <div class="red"></div>
-                        </div>
+                        <div class="percent">{{ staffStatisticsList[3].sumNumValue }}</div>
                     </div>
                 </div>
             </div>
diff --git a/src/views/enterpriseRank/index.vue b/src/views/enterpriseRank/index.vue
index 40bb74d..2bc2d8d 100644
--- a/src/views/enterpriseRank/index.vue
+++ b/src/views/enterpriseRank/index.vue
@@ -28,21 +28,21 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="防疫安全">
-                        <el-table-column show-overflow-tooltip label="疫苗接种" width="35">
+                        <el-table-column show-overflow-tooltip label="疫苗接种数" width="35">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.ymjz || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip label="核酸检测" width="35">
+                        <el-table-column show-overflow-tooltip label="核酸检测率" width="35">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.hsjc || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip label="场所码" width="35">
+                        <el-table-column show-overflow-tooltip label="场所码数据" width="35">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.csm || 0 }}
@@ -58,7 +58,7 @@
                         </el-table-column>
                     </el-table-column>
                     <el-table-column label="人员安全">
-                        <el-table-column show-overflow-tooltip label="流动人口" width="35">
+                        <el-table-column show-overflow-tooltip label="流动人员" width="35">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.ldrr || 0 }}
@@ -72,14 +72,14 @@
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip label="重点岗位" width="35">
+                        <el-table-column show-overflow-tooltip label="重点岗位人员" width="35">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.zdgw || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip label="专家库" width="35">
+                        <el-table-column show-overflow-tooltip label="专家人员" width="35">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.zjrr || 0 }}
@@ -126,28 +126,28 @@
                         </el-table-column>
                     </el-table-column>
                     <el-table-column label="消防安全">
-                        <el-table-column show-overflow-tooltip width="35" label="设备维护">
+                        <el-table-column show-overflow-tooltip width="35" label="消防设施维护">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.xfss || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip width="35" label="制度执行">
+                        <el-table-column show-overflow-tooltip width="35" label="消防制度执行">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.xfzd || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip width="35" label="台账建设">
+                        <el-table-column show-overflow-tooltip width="35" label="企业台账建设">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.qytz || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip width="35" label="事件发生">
+                        <el-table-column show-overflow-tooltip width="35" label="消防事件发生">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.xfsj || 0 }}
@@ -156,21 +156,21 @@
                         </el-table-column>
                     </el-table-column>
                     <el-table-column label="列管物品">
-                        <el-table-column show-overflow-tooltip width="35" label="放射源">
+                        <el-table-column show-overflow-tooltip width="35" label="放射源物品">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.fsy || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip width="35" label="危化品">
+                        <el-table-column show-overflow-tooltip width="35" label="危险化学品">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.whp || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip width="35" label="民用枪支">
+                        <el-table-column show-overflow-tooltip width="35" label="民用枪支管理">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.myqz || 0 }}
@@ -186,7 +186,7 @@
                         </el-table-column>
                     </el-table-column>
                     <el-table-column label="内部治安">
-                        <el-table-column show-overflow-tooltip width="35" label="部门检查系统研判">
+                        <el-table-column show-overflow-tooltip width="35" label="部门检查与系统研判">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.bmjc || 0 }}
@@ -257,7 +257,7 @@
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip width="35" label="演习培训">
+                        <el-table-column show-overflow-tooltip width="35" label="企业演习培训">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.yxpx || 0 }}
@@ -266,28 +266,28 @@
                         </el-table-column>
                     </el-table-column>
                     <el-table-column label="防攻击">
-                        <el-table-column show-overflow-tooltip width="35" label="人防">
+                        <el-table-column show-overflow-tooltip width="35" label="人防达标情况">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.qyrf || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip width="35" label="技防">
+                        <el-table-column show-overflow-tooltip width="35" label="技防达标情况">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.qyjf || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip width="35" label="物防">
+                        <el-table-column show-overflow-tooltip width="35" label="物防达标情况">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.qywf || 0 }}
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column show-overflow-tooltip width="35" label="企业整改">
+                        <el-table-column show-overflow-tooltip width="35" label="企业整改情况">
                             <template slot-scope="scope">
                                 <div>
                                     {{ scope.row.qyzz || 0 }}
diff --git a/src/views/factorResources/index.vue b/src/views/factorResources/index.vue
index c2e9808..98f28ea 100644
--- a/src/views/factorResources/index.vue
+++ b/src/views/factorResources/index.vue
@@ -135,6 +135,7 @@ export default {
 
         },
         reset() {
+            this.formInline = {}
             this.getList()
         },
         showCompanyData(val) {
diff --git a/src/views/realtimeWarning/index.vue b/src/views/realtimeWarning/index.vue
index d7e0957..a4de4ae 100644
--- a/src/views/realtimeWarning/index.vue
+++ b/src/views/realtimeWarning/index.vue
@@ -3,12 +3,23 @@
         <div class="box">
             <div class="title">实时预警</div>
             <div class="leftBox">
+                <div class="shuoming"><img src="../../assets/realtimeWarning/消息.png"
+                        alt="">&nbsp;实时预警根据平安指数配置的预警规则，辖区内的企业达到预警分值后产生即时预警</div>
                 <zhmap class="map" :waringList="waringList" @zhuanchuzhi="chuzhi" v-if="waringList && waringList.length">
                 </zhmap>
             </div>
             <div class="rightBox">
                 <div class="totalTitle">
                     <div class="titleText">预警列表</div><span>&nbsp;（ <span class="redText">{{ total }}</span> ）</span>
+                    <div class="searchBox">
+                        <el-form :model="formInline" class="search">
+                            <el-form-item class="formItem">
+                                <el-input v-model.trim="formInline.searchParams" placeholder="企业名称/预警指标" clearable
+                                    class="formIpt"></el-input>
+                            </el-form-item>
+                            <el-button type="primary" @click="getList()">搜索</el-button>
+                        </el-form>
+                    </div>
                 </div>
                 <div class="bottomBody">
                     <div class="yujingItem" v-for="(item, index) in waringList" :key="index">
@@ -22,8 +33,15 @@
                         </div>
                         <div class="yujingBottom">
                             <div class="bottomTOP">
-                                一级指标：<span class="numValue">{{ item.levelIndexOne }}</span> &nbsp;&nbsp;预警指标：<span
-                                    class="numValue">“{{ item.levelIndexThree }}”异常</span>
+                                <div class="topItem"><span>一级指标：</span><span class="numValue">{{ item.levelIndexOne
+                                }}</span></div>
+
+                                <div class="topItem"><span>预警指标：</span>
+                                    <el-tooltip :content="item.levelIndexThree + '异常'" placement="top-start">
+                                        <span class="numValue">“{{ item.levelIndexThree
+                                        }}”异常</span>
+                                    </el-tooltip>
+                                </div>
                             </div>
                             <div class="bottomTOP">
                                 预警时间：<span class="numValue">{{ item.alarmTime }}</span>
@@ -66,7 +84,6 @@ export default {
     },
     data() {
         return {
-
             waringList: [],
             diaVisible: false,
             checkedDepts: [],
@@ -75,6 +92,7 @@ export default {
             pageSize: 10,
             pageNum: 1,
             total: 0,
+            formInline: {},
         }
     },
     created() {
@@ -82,7 +100,7 @@ export default {
     },
     methods: {
         getList() {
-            mapList({ pageSize: this.pageSize, pageNum: this.pageNum }).then(res => {
+            mapList({ pageSize: this.pageSize, pageNum: this.pageNum, ...this.formInline }).then(res => {
                 this.waringList = res.data
                 this.total = res.total
             })
@@ -162,6 +180,31 @@ export default {
             background: url('~@/assets/realtimeWarning/矩形备份 289981.png') no-repeat;
             background-size: 100% 100%;
             padding: 20px;
+            position: relative;
+
+            .shuoming {
+                position: absolute;
+                top: 20px;
+                left: 20px;
+                height: 40px;
+                width: calc(100% - 40px);
+                background: rgba(15, 17, 19, 0.40);
+                z-index: 999999999;
+                padding: 0 10px;
+                display: flex;
+                align-items: center;
+                font-size: 14px;
+                color: rgba(255, 255, 255, 0.7);
+                letter-spacing: 1px;
+                font-weight: 400;
+
+                img {
+
+                    width: 20px;
+                    height: 20px;
+                }
+
+            }
 
             .map {
                 height: 100%;
@@ -190,11 +233,90 @@ export default {
                     font-size: 16px;
                     color: #EBFFF4;
                     letter-spacing: 2px;
-
+                    width: 120px;
                     text-shadow: 0 0 9px rgba(21, 255, 195, 0.60);
                     font-weight: 400;
                 }
 
+                .searchBox {
+                    height: 40px;
+                    width: 320px;
+                    display: flex;
+                    box-sizing: border-box;
+                    align-items: center;
+
+                    .search {
+                        height: 35px;
+                        box-sizing: border-box;
+                        margin-top: -5px;
+                    }
+
+                    /deep/.el-input__inner {
+                        // background: url('~@/assets/companyFile/2121.png') no-repeat;
+                        background: #3B4450;
+                        border: 1px solid #5B748C;
+                        color: rgba(234, 246, 255, 0.7);
+                        height: 35px;
+
+                        .el-range-separator {
+                            color: #ccc;
+                        }
+
+                        .el-range-input {
+                            background: rgba(0, 0, 0, 0);
+                            color: #ccc;
+                        }
+                    }
+
+                    /deep/.el-form-item {
+
+                        margin: 0;
+
+                        .el-form-item__content {
+                            line-height: 35px;
+                        }
+
+                        .el-form-item__label {
+                            color: #EAF6FF;
+                            letter-spacing: 1px;
+                            text-align: center;
+                            font-weight: 400;
+                        }
+
+                    }
+
+                    /deep/.el-button--primary {
+                        width: 60px;
+                        height: 35px;
+                        line-height: 30px;
+                        padding: 0;
+                        text-align: center;
+                        background: rgba(0, 0, 0, 0);
+                        border: 0;
+                        background: url('~@/assets/companyFile/2121.png') no-repeat;
+                        background-size: 100% 100%;
+                        font-size: 14px;
+                        color: #F8FBFF;
+                        letter-spacing: 0.89px;
+                        font-weight: 500;
+                    }
+
+                    /deep/.el-button--default {
+                        width: 60px;
+                        height: 35px;
+                        line-height: 30px;
+                        padding: 0;
+                        text-align: center;
+                        background: #3B4450;
+                        border: 0;
+
+                        font-size: 14px;
+                        color: #F8FBFF;
+                        letter-spacing: 0.89px;
+                        font-weight: 500;
+                    }
+                }
+
                 .redText {
                     font-size: 16px;
                     color: #FF9191;
@@ -360,6 +482,32 @@ export default {
                             white-space: nowrap;
                             text-overflow: ellipsis;
 
+                            .topItem {
+                                display: flex;
+                                align-items: center;
+                                width: 50%;
+                                height: 100%;
+                                font-size: 14px;
+                                color: rgba(255, 255, 255, 0.8);
+                                letter-spacing: 0;
+                                font-weight: 400;
+                                overflow: hidden;
+                                white-space: nowrap;
+                                text-overflow: ellipsis;
+
+                                span {
+
+                                    width: 70px;
+                                }
+
+                                .numValue {
+                                    width: calc(100% - 70px);
+                                    overflow: hidden;
+                                    white-space: nowrap;
+                                    text-overflow: ellipsis;
+                                }
+                            }
+
                             .numValue {
                                 font-size: 14px;
                                 color: #FFFFFF;
diff --git a/src/views/safetyIndex/cheliang.vue b/src/views/safetyIndex/cheliang.vue
index 4dcb45b..65ee198 100644
--- a/src/views/safetyIndex/cheliang.vue
+++ b/src/views/safetyIndex/cheliang.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import { vehicleUserType, vehicleOut, vehicleIn, vehicleDetail } from '@/api/safetyIndex'
+import { vehicleUserType, vehicleIn, vehicleDetail } from '@/api/safetyIndex'
 export default {
     data() {
         return {
@@ -99,11 +99,11 @@ export default {
     },
     created() {
         this.getUserType()
-        vehicleIn().then(res => {
-            this.intotal = res.data
+        vehicleIn({ direction: 1, pageSize: 10, pageNum: 1 }).then(res => {
+            this.intotal = res.total
         })
-        vehicleOut().then(res => {
-            this.outtotal = res.data
+        vehicleIn({ direction: 2, pageSize: 10, pageNum: 1 }).then(res => {
+            this.outtotal = res.total
         })
     },
     methods: {
diff --git a/src/views/safetyIndex/paiming.vue b/src/views/safetyIndex/paiming.vue
index ea25eff..be72c83 100644
--- a/src/views/safetyIndex/paiming.vue
+++ b/src/views/safetyIndex/paiming.vue
@@ -383,7 +383,7 @@ export default {
     }
 
     .el-table__cell {
-        padding: 10px 0;
+        padding: 8px 0;
 
     }
 
diff --git a/src/views/safetyIndex/shuju.vue b/src/views/safetyIndex/shuju.vue
index 6735592..c101ffa 100644
--- a/src/views/safetyIndex/shuju.vue
+++ b/src/views/safetyIndex/shuju.vue
@@ -4,7 +4,7 @@
         <div class="qyclBody">
             <div class="zonglei">
                 <div class="zongleiTitle">接入总量</div>
-                <div class="zongleiNum"><span>1234124</span> 条</div>
+                <div class="zongleiNum"><span>170,820</span> 条</div>
             </div>
             <div class="leixingBox">
                 <div class="leixingItem">
@@ -13,17 +13,17 @@
                 </div>
                 <div class="leixingItem">
                     <div class="blue">智能防控平台</div>
-                    <div class="blueText">3559</div>
+                    <div class="blueText">2,3559</div>
                 </div>
                 <div class="leixingItem">
                     <el-tooltip content="危化品道路运输监管平台" placement="top-start">
                         <div class="yellow">危化品道路运...</div>
                     </el-tooltip>
-                    <div class="yellowText">6707</div>
+                    <div class="yellowText">1,6707</div>
                 </div>
                 <div class="leixingItem">
                     <div class="red">IRS</div>
-                    <div class="redText">8428</div>
+                    <div class="redText">1,8428</div>
                 </div>
                 <div class="leixingItem">
                     <div class="green">警务百度</div>
diff --git a/src/views/safetyIndex/yuangong.vue b/src/views/safetyIndex/yuangong.vue
index 3cadc14..89cc18f 100644
--- a/src/views/safetyIndex/yuangong.vue
+++ b/src/views/safetyIndex/yuangong.vue
@@ -64,11 +64,11 @@
                 </el-table-column>
                 <el-table-column show-overflow-tooltip prop="visitName" label="访客姓名" width="90">
                 </el-table-column>
-                <el-table-column show-overflow-tooltip prop="identityId" label="身份证号">
+                <el-table-column show-overflow-tooltip prop="identityId" label="身份证号" width="180">
                 </el-table-column>
                 <el-table-column show-overflow-tooltip prop="visitContactInfo" label="联系方式">
                 </el-table-column>
-                <el-table-column show-overflow-tooltip prop="visitCompany" label="所属企业" width="180">
+                <el-table-column show-overflow-tooltip prop="visitCompany" label="访客所属企业">
                 </el-table-column>
                 <el-table-column show-overflow-tooltip prop="visitTime" label="访问时间">
                 </el-table-column>
@@ -76,6 +76,8 @@
                 </el-table-column>
                 <el-table-column show-overflow-tooltip prop="contactInfo" label="对接人联系方式">
                 </el-table-column>
+                <el-table-column show-overflow-tooltip prop="companyName" label="访问企业">
+                </el-table-column>
             </el-table>
             <div class="block">
                 <el-pagination style="float:right;margin:5px;" class="msg-pagination-container" :background="true"