diff --git a/src/assets/companyFile/090991.png b/src/assets/companyFile/090991.png
new file mode 100644
index 0000000..12bf384
Binary files /dev/null and b/src/assets/companyFile/090991.png differ
diff --git a/src/assets/companyFile/21212.png b/src/assets/companyFile/21212.png
new file mode 100644
index 0000000..3186d3f
Binary files /dev/null and b/src/assets/companyFile/21212.png differ
diff --git a/src/assets/companyFile/2121备份 221.png b/src/assets/companyFile/2121备份 221.png
new file mode 100644
index 0000000..5fd35e2
Binary files /dev/null and b/src/assets/companyFile/2121备份 221.png differ
diff --git a/src/assets/companyFile/2121备份.png b/src/assets/companyFile/2121备份.png
new file mode 100644
index 0000000..6e680a4
Binary files /dev/null and b/src/assets/companyFile/2121备份.png differ
diff --git a/src/assets/companyFile/矩形备份 382112.png b/src/assets/companyFile/矩形备份 382112.png
new file mode 100644
index 0000000..84619be
Binary files /dev/null and b/src/assets/companyFile/矩形备份 382112.png differ
diff --git a/src/assets/companyFile/编组 11991备份 10.png b/src/assets/companyFile/编组 11991备份 10.png
new file mode 100644
index 0000000..2e0e73d
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 10.png differ
diff --git a/src/assets/companyFile/编组 11991备份 11.png b/src/assets/companyFile/编组 11991备份 11.png
new file mode 100644
index 0000000..2e0e73d
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 11.png differ
diff --git a/src/assets/companyFile/编组 11991备份 12.png b/src/assets/companyFile/编组 11991备份 12.png
new file mode 100644
index 0000000..07cc57e
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 12.png differ
diff --git a/src/assets/companyFile/编组 11991备份 13.png b/src/assets/companyFile/编组 11991备份 13.png
new file mode 100644
index 0000000..2e0e73d
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 13.png differ
diff --git a/src/assets/companyFile/编组 11991备份 14.png b/src/assets/companyFile/编组 11991备份 14.png
new file mode 100644
index 0000000..2e0e73d
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 14.png differ
diff --git a/src/assets/companyFile/编组 11991备份 15.png b/src/assets/companyFile/编组 11991备份 15.png
new file mode 100644
index 0000000..80f6348
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 15.png differ
diff --git a/src/assets/companyFile/编组 11991备份 16.png b/src/assets/companyFile/编组 11991备份 16.png
new file mode 100644
index 0000000..6ff5b24
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 16.png differ
diff --git a/src/assets/companyFile/编组 11991备份 17.png b/src/assets/companyFile/编组 11991备份 17.png
new file mode 100644
index 0000000..6ff5b24
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 17.png differ
diff --git a/src/assets/companyFile/编组 11991备份 19.png b/src/assets/companyFile/编组 11991备份 19.png
new file mode 100644
index 0000000..80f6348
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 19.png differ
diff --git a/src/assets/companyFile/编组 11991备份 20.png b/src/assets/companyFile/编组 11991备份 20.png
new file mode 100644
index 0000000..6ff5b24
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 20.png differ
diff --git a/src/assets/companyFile/编组 11991备份 21.png b/src/assets/companyFile/编组 11991备份 21.png
new file mode 100644
index 0000000..ba95902
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 21.png differ
diff --git a/src/assets/companyFile/编组 11991备份 22.png b/src/assets/companyFile/编组 11991备份 22.png
new file mode 100644
index 0000000..74f9a75
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 22.png differ
diff --git a/src/assets/companyFile/编组 11991备份 23.png b/src/assets/companyFile/编组 11991备份 23.png
new file mode 100644
index 0000000..74f9a75
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 23.png differ
diff --git a/src/assets/companyFile/编组 11991备份 29.png b/src/assets/companyFile/编组 11991备份 29.png
new file mode 100644
index 0000000..df339a6
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 29.png differ
diff --git a/src/assets/companyFile/编组 11991备份 3.png b/src/assets/companyFile/编组 11991备份 3.png
new file mode 100644
index 0000000..ed5c7a2
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 3.png differ
diff --git a/src/assets/companyFile/编组 11991备份 30.png b/src/assets/companyFile/编组 11991备份 30.png
new file mode 100644
index 0000000..142bec8
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 30.png differ
diff --git a/src/assets/companyFile/编组 11991备份 31.png b/src/assets/companyFile/编组 11991备份 31.png
new file mode 100644
index 0000000..6ff5b24
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 31.png differ
diff --git a/src/assets/companyFile/编组 11991备份 32.png b/src/assets/companyFile/编组 11991备份 32.png
new file mode 100644
index 0000000..ba95902
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 32.png differ
diff --git a/src/assets/companyFile/编组 11991备份 33.png b/src/assets/companyFile/编组 11991备份 33.png
new file mode 100644
index 0000000..07cc57e
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 33.png differ
diff --git a/src/assets/companyFile/编组 11991备份 34.png b/src/assets/companyFile/编组 11991备份 34.png
new file mode 100644
index 0000000..ba95902
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 34.png differ
diff --git a/src/assets/companyFile/编组 11991备份 35.png b/src/assets/companyFile/编组 11991备份 35.png
new file mode 100644
index 0000000..ba95902
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 35.png differ
diff --git a/src/assets/companyFile/编组 11991备份 4.png b/src/assets/companyFile/编组 11991备份 4.png
new file mode 100644
index 0000000..6545a50
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 4.png differ
diff --git a/src/assets/companyFile/编组 11991备份 5.png b/src/assets/companyFile/编组 11991备份 5.png
new file mode 100644
index 0000000..6545a50
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 5.png differ
diff --git a/src/assets/companyFile/编组 11991备份 6.png b/src/assets/companyFile/编组 11991备份 6.png
new file mode 100644
index 0000000..96d89be
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 6.png differ
diff --git a/src/assets/companyFile/编组 11991备份 7.png b/src/assets/companyFile/编组 11991备份 7.png
new file mode 100644
index 0000000..3e2c083
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 7.png differ
diff --git a/src/assets/companyFile/编组 11991备份 8.png b/src/assets/companyFile/编组 11991备份 8.png
new file mode 100644
index 0000000..3e2c083
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 8.png differ
diff --git a/src/assets/companyFile/编组 11991备份 9.png b/src/assets/companyFile/编组 11991备份 9.png
new file mode 100644
index 0000000..142bec8
Binary files /dev/null and b/src/assets/companyFile/编组 11991备份 9.png differ
diff --git a/src/views/archives/anjian.vue b/src/views/archives/anjian.vue
index 329f8d1..6ffc5e7 100644
--- a/src/views/archives/anjian.vue
+++ b/src/views/archives/anjian.vue
@@ -103,9 +103,7 @@
 <script>
 import { TbSafeCompanyCase } from '@/api/archives'
 export default {
-    props: {
-        companyID: String
-    },
+    props: ['companyID'],
     data() {
         return {
             formInline: {},
diff --git a/src/views/archives/car.vue b/src/views/archives/car.vue
index 70f4f19..45c5e95 100644
--- a/src/views/archives/car.vue
+++ b/src/views/archives/car.vue
@@ -52,9 +52,7 @@
 <script>
 import { tbSafeCompanyVehicle } from '@/api/archives'
 export default {
-    props: {
-        companyID: String
-    },
+    props: ['companyID'],
     data() {
         return {
             formInline: {},
diff --git a/src/views/archives/index.vue b/src/views/archives/index.vue
index 96cfaba..d751cda 100644
--- a/src/views/archives/index.vue
+++ b/src/views/archives/index.vue
@@ -115,8 +115,10 @@
                             </div>
                             <div class="jibenhangTitle">企业类型</div>
                             <div class="jibenhangrightText">
-                                <div :class="{ 'shewei': a != '消防重点', 'zhongdian': a == '消防重点' }"
-                                    v-for="a in companyData.companyTypes" :key="a">{{ a }}</div>
+                                <div :class="{ 'shewei': (a == '剧毒' || a == '易制毒'), 'zhongdian': a == ('消防重点' || a == '所管消防'), 'zhibao': (a == '放射源' || a == '易制爆'), 'zhian': a == ('治安重点' || a == '创安单位') }"
+                                    v-for="a in companyData.companyTypes" :key="a">{{ a }}
+                                </div>
+
                             </div>
                         </div>
                         <div class="jibenhang">
@@ -223,10 +225,10 @@ export default {
     },
     created() {
         this.companyData = this.$route.query
+        console.log(this.companyData, '路由传递参数');
         this.companyID = this.companyData.id
         this.getsafeIndex()
     },
-
     methods: {
         getsafeIndex() {
             safeIndex({ id: this.companyData.id }).then(res => {
@@ -631,6 +633,36 @@ export default {
                             margin-right: 10px;
                         }
 
+                        .zhibao {
+                            height: 26px;
+                            line-height: 26px;
+                            width: auto;
+                            background: url('~@/assets/companyFile/编组 11991备份 10.png') no-repeat;
+                            padding: 0 5px;
+                            font-size: 14px;
+                            color: #E3DEFF;
+                            display: inline-block;
+                            letter-spacing: 0.44px;
+                            font-weight: 400;
+                            background-size: 100% 100%;
+                            margin-right: 10px;
+                        }
+
+                        .zhian {
+                            height: 26px;
+                            line-height: 26px;
+                            width: auto;
+                            display: inline-block;
+                            background: url('~@/assets/companyFile/编组 11991备份 21.png') no-repeat;
+                            padding: 0 5px;
+                            font-size: 14px;
+                            color: #E3DEFF;
+                            letter-spacing: 0.44px;
+                            font-weight: 400;
+                            background-size: 100% 100%;
+                            margin-right: 10px;
+                        }
+
                     }
                 }
 
diff --git a/src/views/archives/kakou.vue b/src/views/archives/kakou.vue
index 5ece163..ef2491d 100644
--- a/src/views/archives/kakou.vue
+++ b/src/views/archives/kakou.vue
@@ -143,9 +143,7 @@
 <script>
 import { realTimePassageFlowFace, realTimePassageFlowVehicle } from '@/api/archives'
 export default {
-    props: {
-        companyID: String
-    },
+    props: ['companyID'],
     data() {
         return {
             formInline: {},
diff --git a/src/views/archives/monitor.vue b/src/views/archives/monitor.vue
index 86703a8..0c0d608 100644
--- a/src/views/archives/monitor.vue
+++ b/src/views/archives/monitor.vue
@@ -14,12 +14,21 @@
         <div class="monitorBox">
             <div class="monitorItem" v-for="(item, index) in monitorList" :key="index">
                 <div class="online" v-if="item.isOnline">
-                    <img src="../../assets/archives/摄像头0912.png" v-if="item.deviceVideoSubType == 3">
-                    <div class="left">{{ item.deviceVideoSubTypeCn }}</div>
+                    <div class="left">
+
+                        <img src="../../assets/archives/公共区域2.png" v-if="item.deviceVideoSubType == 1">
+                        <img src="../../assets/archives/摄像头0912.png" v-if="item.deviceVideoSubType == 3">
+                        <img src="../../assets/archives/高空抛物2.png" v-if="item.deviceVideoSubType == 2">
+                        <img src="../../assets/archives/人脸抓拍2.png" v-if="item.deviceVideoSubType == 5">
+                        <div>{{ item.deviceVideoSubTypeCn }}</div>
+                    </div>
                     <div class="right"><i class="dian"></i><span>在线</span></div>
                 </div>
                 <div class="outline" v-else>
+                    <img src="../../assets/archives/公共区域2.png" v-if="item.deviceVideoSubType == 1">
                     <img src="../../assets/archives/摄像头0912.png" v-if="item.deviceVideoSubType == 3">
+                    <img src="../../assets/archives/高空抛物2.png" v-if="item.deviceVideoSubType == 2">
+                    <img src="../../assets/archives/人脸抓拍2.png" v-if="item.deviceVideoSubType == 5">
                     <div class="left">{{ item.deviceVideoSubTypeCn }}</div>
                     <div class="right"><i class="dian"></i><span>离线</span></div>
                 </div>
@@ -52,9 +61,7 @@
 import playVideo from '@/components/videoPlayer'
 import { realTimeMonitoring } from '@/api/archives'
 export default {
-    props: {
-        companyID: String
-    },
+    props: ['companyID'],
     data() {
         return {
             formInline: {},
@@ -141,11 +148,19 @@ export default {
                 line-height: 20px;
                 display: flex;
                 align-items: center;
-                padding-left: 20px;
+                justify-content: space-around;
+
 
                 .left {
                     color: #EAF6FF;
                     margin-right: 10px;
+                    display: flex;
+
+                    img {
+                        width: 16px;
+                        height: 16px;
+                        margin-right: 5px;
+                    }
                 }
 
                 .dian {
@@ -174,6 +189,14 @@ export default {
 
                 .left {
                     color: #EAF6FF;
+                    margin-right: 10px;
+                    display: flex;
+
+                    img {
+                        width: 16px;
+                        height: 16px;
+                        margin-right: 5px;
+                    }
                 }
 
                 .dian {
diff --git a/src/views/archives/wupin.vue b/src/views/archives/wupin.vue
index c67ae57..7b7d366 100644
--- a/src/views/archives/wupin.vue
+++ b/src/views/archives/wupin.vue
@@ -89,9 +89,7 @@
 <script>
 import { TbSafeCompanyGoods, TbSafeCompanyGoodsCount, TbSafeCompanyGoodsDetail } from '@/api/archives'
 export default {
-    props: {
-        companyID: String
-    },
+    props: ['companyID'],
     data() {
         return {
             formInline: {},
diff --git a/src/views/archives/yujing.vue b/src/views/archives/yujing.vue
index ef00fc2..90303dc 100644
--- a/src/views/archives/yujing.vue
+++ b/src/views/archives/yujing.vue
@@ -51,9 +51,7 @@
 
 import { warningDisposal } from '@/api/archives'
 export default {
-    props: {
-        companyID: String
-    },
+    props: ['companyID'],
     data() {
         return {
             pageSize: 5,
diff --git a/src/views/enterpriseArchives/index.vue b/src/views/enterpriseArchives/index.vue
index 35daae1..9acd48f 100644
--- a/src/views/enterpriseArchives/index.vue
+++ b/src/views/enterpriseArchives/index.vue
@@ -62,19 +62,14 @@ export default {
                     this.resultList = res.data
                     this.total = res.total
                     this.isShow = true
-
                 } else {
                     this.$message.warning('未查询到相关数据')
                 }
-
             })
-
         },
         clearInput() {
-
             this.resultList = JSON.parse(JSON.stringify(this.resultList1))
             this.isShow = false
-
         },
         getlistTotal() {
             listTotal().then((res) => {
diff --git a/src/views/enterpriseArchives/result.vue b/src/views/enterpriseArchives/result.vue
index 17fdeb1..b84e5f3 100644
--- a/src/views/enterpriseArchives/result.vue
+++ b/src/views/enterpriseArchives/result.vue
@@ -5,7 +5,7 @@
                 <img src="../../assets/companyFile/档案981.png" alt="">
                 企业档案
             </div>
-            <div class="zhcxBox"><el-input type="text" class="zhcxBoxIPT" v-model="modifiedText" :suffix="suffixIcon">
+            <div class="zhcxBox"><el-input type="text" class="zhcxBoxIPT" v-model.trim="modifiedText" :suffix="suffixIcon">
                     <template v-slot:suffix>
                         <i class="el-icon-close custom-close-icon" v-show="modifiedText" @click="clearInput()"></i>
                     </template>
@@ -22,8 +22,8 @@
                 <div class="resultItem" v-for="(item, index) in resultList1" :key="index" @click="goArchives(item)">
                     <p v-html="item.companyName"></p>
                     <div class="impBtnList">
-                        <div :class="{ 'shewei': a != '消防重点', 'zhongdian': a == '消防重点' }" v-for="a in item.companyTypes"
-                            :key="a">{{ a }}
+                        <div :class="{ 'shewei': a == '剧毒' || a == '易制毒', 'zhongdian': a == '消防重点' || a == '所管消防', 'zhibao': a == '放射源' || a == '易制爆', 'zhian': a == '治安重点' || a == '创安单位' }"
+                            v-for="a in item.companyTypes" :key="a">{{ a }}
                         </div>
                     </div>
                     <div class="itemAddress">
@@ -436,6 +436,34 @@ export default {
                         margin-right: 10px;
                     }
 
+                    .zhibao {
+                        height: 26px;
+                        line-height: 26px;
+                        width: auto;
+                        background: url('~@/assets/companyFile/编组 11991备份 10.png') no-repeat;
+                        padding: 0 5px;
+                        font-size: 14px;
+                        color: #E3DEFF;
+                        letter-spacing: 0.44px;
+                        font-weight: 400;
+                        background-size: 100% 100%;
+                        margin-right: 10px;
+                    }
+
+                    .zhian {
+                        height: 26px;
+                        line-height: 26px;
+                        width: auto;
+                        background: url('~@/assets/companyFile/编组 11991备份 21.png') no-repeat;
+                        padding: 0 5px;
+                        font-size: 14px;
+                        color: #E3DEFF;
+                        letter-spacing: 0.44px;
+                        font-weight: 400;
+                        background-size: 100% 100%;
+                        margin-right: 10px;
+                    }
+
                 }
 
                 .itemAddress {