Merge pull request 'master' (#14) from master into lukeyan

Reviewed-on: #14

src/views/archives/anjian.vue

@@ -103,9 +103,7 @@
 <script>
 import { TbSafeCompanyCase } from '@/api/archives'
 export default {
-    props: {
+    props: ['companyID'],
-        companyID: String
-    },
     data() {
         return {
             formInline: {},

src/views/archives/car.vue

@@ -52,9 +52,7 @@
 <script>
 import { tbSafeCompanyVehicle } from '@/api/archives'
 export default {
-    props: {
+    props: ['companyID'],
-        companyID: String
-    },
     data() {
         return {
             formInline: {},

src/views/archives/index.vue

@@ -115,8 +115,10 @@
                             </div>
                             <div class="jibenhangTitle">企业类型</div>
                             <div class="jibenhangrightText">
-                                <div :class="{ 'shewei': a != '消防重点', 'zhongdian': a == '消防重点' }"
+                                <div :class="{ 'shewei': (a == '剧毒' || a == '易制毒'), 'zhongdian': a == ('消防重点' || a == '所管消防'), 'zhibao': (a == '放射源' || a == '易制爆'), 'zhian': a == ('治安重点' || a == '创安单位') }"
-                                    v-for="a in companyData.companyTypes" :key="a">{{ a }}</div>
+                                    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;
+                        }
+
                     }
                 }
 

src/views/archives/kakou.vue

@@ -143,9 +143,7 @@
 <script>
 import { realTimePassageFlowFace, realTimePassageFlowVehicle } from '@/api/archives'
 export default {
-    props: {
+    props: ['companyID'],
-        companyID: String
-    },
     data() {
         return {
             formInline: {},

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">
-                    <div class="left">{{ item.deviceVideoSubTypeCn }}</div>
+
+                        <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: {
+    props: ['companyID'],
-        companyID: String
-    },
     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 {

src/views/archives/wupin.vue

@@ -89,9 +89,7 @@
 <script>
 import { TbSafeCompanyGoods, TbSafeCompanyGoodsCount, TbSafeCompanyGoodsDetail } from '@/api/archives'
 export default {
-    props: {
+    props: ['companyID'],
-        companyID: String
-    },
     data() {
         return {
             formInline: {},

src/views/archives/yujing.vue

@@ -51,9 +51,7 @@
 
 import { warningDisposal } from '@/api/archives'
 export default {
-    props: {
+    props: ['companyID'],
-        companyID: String
-    },
     data() {
         return {
             pageSize: 5,

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) => {

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"
+                        <div :class="{ 'shewei': a == '剧毒' || a == '易制毒', 'zhongdian': a == '消防重点' || a == '所管消防', 'zhibao': a == '放射源' || a == '易制爆', 'zhian': a == '治安重点' || a == '创安单位' }"
-                            :key="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 {