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

Reviewed-on: #96

src/api/companyCanban/index.js

@@ -88,6 +88,14 @@ export function personSafetyDetail(params) {
     })
 }
 //危化品运输
+export function chemicals(params) {
+    return request({
+        url: '/safety/signboard/hazardous/chemicals',
+        method: 'post',
+        params
+    })
+}
+//危化品运输
 export function chemicalsDetail(params) {
     return request({
         url: '/safety/signboard/hazardous/chemicals/detail',

src/api/enterpriseRank/index.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 //首页数据统计
 export function getSafeCompanyStatisticsScore(params) {
     return request({
-        url: '/safety/system/tbSafeCompanyStatisticsScore/getSafeCompanyStatisticsScore',
+        url: '/safety/index/company/statistics/detail',
         method: 'post',
         params
     })

src/utils/request.js

@@ -4,10 +4,10 @@ import vm from "../main";
 import { getToken } from '@/utils/auth'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
-  //baseURL: 'http://172.18.113.50:8080/zhapi',
+  baseURL: 'http://172.18.113.50:8080/zhapi',
   //baseURL: 'http://172.18.11//.13:8080/zhapi', // 孙强
   //baseURL: 'http://192.168.0.188:8888/zhapi',
-  baseURL: `http://${window.location.host}/zhapi`,
+  //baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
   headers: { 'content-type': 'application/json' },
 })

src/views/companyCanban/fanggopngji.vue

@@ -7,7 +7,7 @@
                     <div class="iconBox"><img src="../../assets/companyCanban/icon/企业人防达标.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[0].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[0].numValue == '是'">
+                        <div class="onlineStatus" v-if="staffStatisticsList[0].sumNumValue == '是'">
                             <div class="green"></div>
                             <div class="red"></div>
                         </div>
@@ -21,7 +21,7 @@
                     <div class="iconBox"><img src="../../assets/companyCanban/icon/企业物防达标.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[1].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[1].numValue == '是'">
+                        <div class="onlineStatus" v-if="staffStatisticsList[1].sumNumValue == '是'">
                             <div class="green"></div>
                             <div class="red"></div>
                         </div>
@@ -38,7 +38,7 @@
                     <div class="iconBox"><img src="../../assets/companyCanban/icon/企业技防达标.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[2].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[2].numValue == '是'">
+                        <div class="onlineStatus" v-if="staffStatisticsList[2].sumNumValue == '是'">
                             <div class="green"></div>
                             <div class="red"></div>
                         </div>
@@ -52,7 +52,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].numValue == '是'">
+                        <div class="onlineStatus" v-if="staffStatisticsList[3].sumNumValue == '是'">
                             <div class="green"></div>
                             <div class="red"></div>
                         </div>
@@ -68,7 +68,7 @@
                     <div class="iconBox"><img src="../../assets/companyCanban/icon/企业定期开展反恐实战演练、培训.png" alt=""></div>
                     <div class="sjText">
                         <div class="changText">{{ staffStatisticsList[4].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[4].numValue == '是'">
+                        <div class="onlineStatus" v-if="staffStatisticsList[4].sumNumValue == '是'">
                             <div class="green"></div>
                             <div class="red"></div>
                         </div>

src/views/companyCanban/lieguan.vue

@@ -395,7 +395,10 @@ export default {
                     color: '#66FFC4'
                 }
             }
-            const sum = this.fireData[0].sumNumValue + this.fireData[1].sumNumValue + this.fireData[2].sumNumValue + this.fireData[3].sumNumValue
+            const sum = [this.fireData[0].sumNumValue, this.fireData[1].sumNumValue, this.fireData[2].sumNumValue, this.fireData[3].sumNumValue].sort(function (a, b) {
+                return b - a;
+            })[0];
+            console.log(sum, '总数');
             let myChart = echarts.init(document.getElementById("lgwp"));
             let option = {
                 tooltip: {

src/views/companyCanban/wangluo.vue

@@ -4,89 +4,107 @@
         <div class="fangyiBox" v-if="staffStatisticsList && staffStatisticsList.length">
             <div class="topBox">
                 <div class="sjItem">
-                    <div class="iconBox"><img src="../../assets/companyCanban/icon/漏洞整改.png" alt=""></div>
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/漏洞整改（绿）.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[0].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[0].numValue == '是'">
-                            <div class="green"></div>
-                            <div class="red"></div>
+                        <div class="percent">{{ staffStatisticsList[0].sumNumValue }}</div>
                     </div>
-                        <div class="outlineStatus" v-else>
+                </div>
+                <div class="sjItem" v-if="staffStatisticsList[1].sumNumValue == '是'">
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/行政案件（绿）.png" alt=""></div>
+                    <div class="sjText">
+                        <div>{{ staffStatisticsList[1].levelIndexTwo }}</div>
+                        <div class="onlineStatus">
                             <div class="green"></div>
-                            <div class="red"></div>
+
                         </div>
                     </div>
                 </div>
-                <div class="sjItem">
-                    <div class="iconBox"><img src="../../assets/companyCanban/icon/行政案件.png" alt=""></div>
+                <div class="sjItem" v-else>
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/行政案件（红）.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[1].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[1].numValue == '是'">
-                            <div class="green"></div>
-                            <div class="red"></div>
-                        </div>
-                        <div class="outlineStatus" v-else>
-                            <div class="green"></div>
+                        <div class="outlineStatus">
                             <div class="red"></div>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="topBox">
-                <div class="sjItem">
-                    <div class="iconBox"><img src="../../assets/companyCanban/icon/重大网络安全….png" alt=""></div>
+                <div class="sjItem" v-if="staffStatisticsList[2].sumNumValue == '是'">
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/重大网络安全（绿）.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[2].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[2].numValue == '是'">
+                        <div class="onlineStatus">
                             <div class="green"></div>
-                            <div class="red"></div>
+
                         </div>
-                        <div class="outlineStatus" v-else>
-                            <div class="green"></div>
+                    </div>
+                </div>
+                <div class="sjItem_r" v-else>
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/重大网络安全（红）.png" alt=""></div>
+                    <div class="sjText">
+                        <div>{{ staffStatisticsList[2].levelIndexTwo }}</div>
+                        <div class="outlineStatus">
                             <div class="red"></div>
                         </div>
                     </div>
                 </div>
-                <div class="sjItem">
-                    <div class="iconBox"><img src="../../assets/companyCanban/icon/网站应急系统….png" alt=""></div>
+                <div class="sjItem" v-if="staffStatisticsList[3].sumNumValue == '是'">
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/网站应急系统（绿）.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[3].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[3].numValue == '是'">
+                        <div class="onlineStatus">
                             <div class="green"></div>
-                            <div class="red"></div>
+
                         </div>
-                        <div class="outlineStatus" v-else>
-                            <div class="green"></div>
+                    </div>
+                </div>
+                <div class="sjItem_r" v-else>
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/网站应急系统（红）.png" alt=""></div>
+                    <div class="sjText">
+                        <div>{{ staffStatisticsList[3].levelIndexTwo }}</div>
+                        <div class="outlineStatus">
                             <div class="red"></div>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="topBox">
-                <div class="sjItem">
-                    <div class="iconBox"><img src="../../assets/companyCanban/icon/等保顶级评审.png" alt=""></div>
+                <div class="sjItem" v-if="staffStatisticsList[4].sumNumValue == '是'">
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/等保定级评审（绿）.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[4].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[4].numValue == '是'">
+                        <div class="onlineStatus">
                             <div class="green"></div>
-                            <div class="red"></div>
+
                         </div>
-                        <div class="outlineStatus" v-else>
-                            <div class="green"></div>
+                    </div>
+                </div>
+                <div class="sjItem_r" v-else>
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/等保定级评审.png" alt=""></div>
+                    <div class="sjText">
+                        <div>{{ staffStatisticsList[4].levelIndexTwo }}</div>
+                        <div class="outlineStatus">
                             <div class="red"></div>
                         </div>
                     </div>
                 </div>
-                <div class="sjItem">
-                    <div class="iconBox"><img src="../../assets/companyCanban/icon/企业演习、培训.png" alt=""></div>
+                <div class="sjItem" v-if="staffStatisticsList[5].sumNumValue == '是'">
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/企业演习、培训（绿）.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ staffStatisticsList[5].levelIndexTwo }}</div>
-                        <div class="onlineStatus" v-if="staffStatisticsList[5].numValue == '是'">
+                        <div class="onlineStatus">
                             <div class="green"></div>
-                            <div class="red"></div>
+
                         </div>
-                        <div class="outlineStatus" v-else>
-                            <div class="green"></div>
+                    </div>
+                </div>
+                <div class="sjItem_r" v-else>
+                    <div class="iconImg"><img src="../../assets/companyCanban/icon/企业演习、培训（红）.png" alt=""></div>
+                    <div class="sjText">
+                        <div>{{ staffStatisticsList[5].levelIndexTwo }}</div>
+                        <div class="outlineStatus">
                             <div class="red"></div>
                         </div>
                     </div>
@@ -110,10 +128,10 @@
                 <div class="bottomFankui" v-if="fangyiList.networks && fangyiList.networks.length">
                     <div class="bottomFankuiItem">
                         <div class="sjItem">
-                            <div class="iconBox"><img src="../../assets/companyCanban/icon/漏洞整改.png" alt=""></div>
+                            <div class="iconBox"><img src="../../assets/companyCanban/icon/行政案件.png" alt=""></div>
                             <div class="sjText">
-                                <div>{{ fangyiList.networks[0].levelIndexTwo }}</div>
-                                <div class="onlineStatus" v-if="fangyiList.networks[0].sumNumValue == '是'">
+                                <div>{{ fangyiList.networks[1].levelIndexTwo }}</div>
+                                <div class="onlineStatus" v-if="fangyiList.networks[1].sumNumValue == '是'">
                                     <div class="green"></div>
                                     <div class="red"></div>
                                 </div>
@@ -124,10 +142,10 @@
                             </div>
                         </div>
                         <div class="sjItem">
-                            <div class="iconBox"><img src="../../assets/companyCanban/icon/行政案件.png" alt=""></div>
+                            <div class="iconBox"><img src="../../assets/companyCanban/icon/重大网络安全….png" alt=""></div>
                             <div class="sjText">
-                                <div>{{ fangyiList.networks[1].levelIndexTwo }}</div>
-                                <div class="onlineStatus" v-if="fangyiList.networks[1].sumNumValue == '是'">
+                                <div>{{ fangyiList.networks[2].levelIndexTwo }}</div>
+                                <div class="onlineStatus" v-if="fangyiList.networks[2].sumNumValue == '是'">
                                     <div class="green"></div>
                                     <div class="red"></div>
                                 </div>
@@ -140,10 +158,10 @@
                     </div>
                     <div class="bottomFankuiItem">
                         <div class="sjItem">
-                            <div class="iconBox"><img src="../../assets/companyCanban/icon/重大网络安全事件.png" alt=""></div>
+                            <div class="iconBox"><img src="../../assets/companyCanban/icon/网站应急系统….png" alt=""></div>
                             <div class="sjText">
-                                <div>{{ fangyiList.networks[2].levelIndexTwo }}</div>
-                                <div class="onlineStatus" v-if="fangyiList.networks[2].sumNumValue == '是'">
+                                <div>{{ fangyiList.networks[3].levelIndexTwo }}</div>
+                                <div class="onlineStatus" v-if="fangyiList.networks[3].sumNumValue == '是'">
                                     <div class="green"></div>
                                     <div class="red"></div>
                                 </div>
@@ -154,10 +172,10 @@
                             </div>
                         </div>
                         <div class="sjItem">
-                            <div class="iconBox"><img src="../../assets/companyCanban/icon/网站应急系统备案.png" alt=""></div>
+                            <div class="iconBox"><img src="../../assets/companyCanban/icon/等保顶级评审.png" alt=""></div>
                             <div class="sjText">
-                                <div>{{ fangyiList.networks[3].levelIndexTwo }}</div>
-                                <div class="onlineStatus" v-if="fangyiList.networks[3].sumNumValue == '是'">
+                                <div>{{ fangyiList.networks[4].levelIndexTwo }}</div>
+                                <div class="onlineStatus" v-if="fangyiList.networks[4].sumNumValue == '是'">
                                     <div class="green"></div>
                                     <div class="red"></div>
                                 </div>
@@ -168,10 +186,10 @@
                             </div>
                         </div>
                         <div class="sjItem">
-                            <div class="iconBox"><img src="../../assets/companyCanban/icon/等保顶级评审.png" alt=""></div>
+                            <div class="iconBox"><img src="../../assets/companyCanban/icon/企业演习、培训.png" alt=""></div>
                             <div class="sjText">
-                                <div>{{ fangyiList.networks[4].levelIndexTwo }}</div>
-                                <div class="onlineStatus" v-if="fangyiList.networks[4].sumNumValue == '是'">
+                                <div>{{ fangyiList.networks[5].levelIndexTwo }}</div>
+                                <div class="onlineStatus" v-if="fangyiList.networks[5].sumNumValue == '是'">
                                     <div class="green"></div>
                                     <div class="red"></div>
                                 </div>
@@ -262,9 +280,9 @@ export default {
             box-sizing: border-box;
 
             .sjItem {
-                width: 180px;
+                width: 185px;
                 height: 55px;
-                background: url('~@/assets/companyCanban/7691备份.png') no-repeat;
+                background: url('~@/assets/companyCanban/背景green.png') no-repeat;
                 background-size: 100% 100%;
 
                 display: flex;
@@ -272,6 +290,16 @@ export default {
                 padding: 8px;
                 box-sizing: border-box;
 
+                .iconImg {
+                    width: 55px;
+                    height: 44px;
+
+                    img {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+
                 .iconBox {
                     width: 42px;
                     height: 42px;
@@ -290,7 +318,7 @@ export default {
                 }
 
                 .sjText {
-                    width: 128px;
+                    width: 135px;
                     font-size: 14px;
                     color: rgba(255, 255, 255, 0.8);
                     letter-spacing: 0;
@@ -306,56 +334,121 @@ export default {
                         margin-top: 8px;
                     }
 
+                    // .onlineStatus {
+                    //     margin-top: 8px;
+                    //     width: 56px;
+                    //     height: 18px;
+                    //     display: flex;
+                    //     justify-content: space-between;
+
+                    //     .green {
+                    //         width: 18px;
+                    //         height: 18px;
+                    //         border-radius: 50%;
+                    //         background: #2CFED3;
+                    //         box-shadow: inset 0px 1px 2px 0px rgba(255, 255, 255, 1);
+                    //         box-shadow: 0px 0px 8px 1px rgba(44, 254, 211, 0.65);
+                    //         box-shadow: 0px 0px 4px 0px rgba(33, 121, 195, 0.56);
+                    //     }
+
+                    //     .red {
+                    //         width: 18px;
+                    //         height: 18px;
+                    //         border-radius: 50%;
+                    //         background: rgba(183, 33, 33, 0.50);
+                    //     }
+                    // }
                     .onlineStatus {
                         margin-top: 8px;
-                        width: 56px;
+                        width: 46px;
                         height: 18px;
-                        display: flex;
-                        justify-content: space-between;
+                        background: url('~@/assets/companyCanban/开关背景绿.png') no-repeat;
+                        background-size: 100% 100%;
+                        position: relative;
+
 
                         .green {
                             width: 18px;
                             height: 18px;
-                            border-radius: 50%;
-                            background: #2CFED3;
-                            box-shadow: inset 0px 1px 2px 0px rgba(255, 255, 255, 1);
-                            box-shadow: 0px 0px 8px 1px rgba(44, 254, 211, 0.65);
-                            box-shadow: 0px 0px 4px 0px rgba(33, 121, 195, 0.56);
+                            background: url('~@/assets/companyCanban/按钮绿.png') no-repeat;
+                            background-size: 100% 100%;
+                        }
                     }
 
+                    .outlineStatus {
+                        margin-top: 8px;
+                        width: 46px;
+                        height: 18px;
+                        background: url('~@/assets/companyCanban/开关背景.png') no-repeat;
+                        background-size: 100% 100%;
+                        position: relative;
+
+
                         .red {
+                            position: absolute;
+                            right: 3px;
+                            top: 0;
                             width: 18px;
                             height: 18px;
-                            border-radius: 50%;
-                            background: rgba(183, 33, 33, 0.50);
+                            background: url('~@/assets/companyCanban/按钮红.png') no-repeat;
+                            background-size: 100% 100%;
+                        }
+                    }
+
+                }
+
+            }
+
+            .sjItem_r {
+                width: 185px;
+                height: 55px;
+                background: url('~@/assets/companyCanban/背景red.png') no-repeat;
+                background-size: 100% 100%;
+
+                display: flex;
+                align-items: center;
+                padding: 8px;
+                box-sizing: border-box;
+
+                .iconImg {
+                    width: 55px;
+                    height: 44px;
+
+                    img {
+                        width: 100%;
+                        height: 100%;
                     }
                 }
 
+                .sjText {
+                    width: 135px;
+                    font-size: 14px;
+                    color: rgba(255, 255, 255, 0.8);
+                    letter-spacing: 0;
+                    line-height: 16px;
+                    font-weight: 400;
+                    margin-left: 10px;
+
                     .outlineStatus {
                         margin-top: 8px;
-                        width: 56px;
+                        width: 46px;
                         height: 18px;
-                        display: flex;
-                        justify-content: space-between;
+                        background: url('~@/assets/companyCanban/开关背景.png') no-repeat;
+                        background-size: 100% 100%;
+                        position: relative;
 
-                        .green {
-                            width: 18px;
-                            height: 18px;
-                            border-radius: 50%;
-                            opacity: 0.5;
-                            background: #1C9980;
-                        }
 
                         .red {
+                            position: absolute;
+                            right: 3px;
+                            top: 0;
                             width: 18px;
                             height: 18px;
-                            border-radius: 50%;
-                            background: #FF2D2D;
-                            box-shadow: inset 0px 1px 2px 0px rgba(255, 255, 255, 1);
-                            box-shadow: 0px 0px 8px 1px rgba(254, 67, 44, 0.65);
-                            box-shadow: 0px 0px 4px 0px rgba(195, 33, 33, 0.56);
+                            background: url('~@/assets/companyCanban/按钮红.png') no-repeat;
+                            background-size: 100% 100%;
                         }
                     }
+
                 }
 
             }

src/views/companyCanban/weihuapin.vue

@@ -57,7 +57,7 @@
 <script>
 import * as echarts from 'echarts';
 import "echarts-gl";
-import { chemicalsDetail } from '@/api/companyCanban'
+import { chemicalsDetail, chemicals } from '@/api/companyCanban'
 export default {
     props: ['companyId'],
     data() {
@@ -75,25 +75,30 @@ export default {
     },
     created() {
         console.log(this.companyID, 'this.companyID');
-        chemicalsDetail({ companyId: this.companyID }).then(res => {
-            this.fangyiList = res.data
+        chemicals({ companyId: this.companyID }).then(res => {
+            this.fangyiList.transportation = res.data
             this.initdrrTu()
         })
 
+
     },
     methods: {
         showDialog() {
+            chemicalsDetail({ companyId: this.companyID }).then(res => {
+                this.fangyiList = res.data
                 this.diaVisible = true
                 this.$nextTick(() => {
                     this.initfxfqs()
                 })
+            })
+
         },
         initdrrTu() {
             let myChart = echarts.init(document.getElementById("whpys"));
             //  const colors = ['#40E2CA', '#E2B171', '#EE6666'];
             let yczData = this.fangyiList.transportation.map((item) => {
                 return {
-                    value: item.numValue, itemStyle: {
+                    value: item.sumNumValue, itemStyle: {
                         color: {
                             type: 'linear',
                             x: 1,
@@ -111,7 +116,7 @@ export default {
                 }
             })
             let dateData = this.fangyiList.transportation.map((item) => {
-                return item.safeRuleName
+                return item.levelIndexTwo
             })
             console.log(yczData, 'yczData');
             console.log(dateData, 'dateData');
@@ -182,9 +187,10 @@ export default {
         initfxfqs() {
             let myChart = echarts.init(document.getElementById("fxfqs"));
             //  const colors = ['#40E2CA', '#E2B171', '#EE6666'];
-            let yczData = this.fangyiList.transportation.map((item) => {
+            console.log(this.fangyiList.transportationNew, 'this.fangyiList.transportationNew');
+            let yczData = this.fangyiList.transportationNew.map((item) => {
                 return {
-                    value: item.numValue, itemStyle: {
+                    value: item.sumNumValue, itemStyle: {
                         color: {
                             type: 'linear',
                             x: 0,
@@ -201,8 +207,8 @@ export default {
                     },
                 }
             })
-            let dateData = this.fangyiList.transportation.map((item) => {
-                return item.safeRuleName
+            let dateData = this.fangyiList.transportationNew.map((item) => {
+                return item.levelIndexTwo
             })
             let option = {
                 xAxis: [

src/views/companyCanban/zhian.vue

@@ -26,7 +26,7 @@
                     <div class="iconBox"><img src="../../assets/companyCanban/icon/员工案件.png" alt=""></div>
                     <div class="sjText">
                         <div>{{ fireDetailList.cases[1].safeRuleName }}</div>
-                        <div class="percent">{{ fireDetailList.cases[0].numValue }}</div>
+                        <div class="percent">{{ fireDetailList.cases[1].numValue }}</div>
                     </div>
                 </div>
                 <div class="sjItem">
@@ -53,7 +53,7 @@
                         <div class="iconBox"><img src="../../assets/companyCanban/icon/企业反馈整改未完成.png" alt=""></div>
                         <div class="sjText">
                             <div>{{ fireDetailList.rectifications[1].safeRuleName }}</div>
-                            <div class="percent">{{ fireDetailList.rectifications[0].numValue }}</div>
+                            <div class="percent">{{ fireDetailList.rectifications[1].numValue }}</div>
                         </div>
                     </div>
 

src/views/enterpriseRank/index.vue

@@ -380,13 +380,16 @@ export default {
         }
     },
     created() {
+        this.companyParamName = this.$route.query.companyParamName ? this.$route.query.companyParamName : ''
+        console.log(this.companyParamName, 'this.companyParamName ');
         this.getList()
     },
     methods: {
         getList() {
             getSafeCompanyStatisticsScore({
                 pageSize: this.pageSize, pageNum: this.pageNum, scoreType: this.topTabsName,
-                sortFlag: this.rightTabsName, companyName: this.companyName, levelIndex: 2
+                sortFlag: this.rightTabsName, companyName: this.companyName, levelIndex: 2,
+                companyParamName: this.companyParamName
             }).then(res => {
                 this.companyStatisticsList = res.rows
                 this.total = res.total

src/views/realtimeWarning/index.vue

@@ -32,8 +32,14 @@
                         <div class="chuzhi" @click="chuzhi(item)">转处置</div>
                     </div>
                 </div>
+                <div class="block">
+                    <el-pagination style="float:right;margin:5px;" class="msg-pagination-container" :background="true"
+                        @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageNum"
+                        :page-sizes="[10]" layout="total,  prev, pager, next, jumper" :total="total">
+                    </el-pagination>
                 </div>
-            <el-dialog title="选择处置部门" :visible.sync="diaVisible" class="picForm">
+            </div>
+            <el-dialog title="选择处置部门" :visible.sync="diaVisible" class="picForm" @closed="closeDia()">
                 <div class="czTitle">可选择多个部门联合处置：</div>
                 <div class="czBody" v-if="deptList && deptList.length">
                     <el-checkbox-group v-model="checkedDepts">
@@ -60,12 +66,15 @@ export default {
     },
     data() {
         return {
-            total: 0,
+
             waringList: [],
             diaVisible: false,
             checkedDepts: [],
             deptList: [],
             chuzhiData: {},
+            pageSize: 10,
+            pageNum: 1,
+            total: 0,
         }
     },
     created() {
@@ -73,11 +82,20 @@ export default {
     },
     methods: {
         getList() {
-            mapList({ pageSize: 10, pageNum: 1 }).then(res => {
+            mapList({ pageSize: this.pageSize, pageNum: this.pageNum }).then(res => {
                 this.waringList = res.data
                 this.total = res.total
             })
         },
+        handleSizeChange(val) {
+            this.pageNum = 1;
+            this.pageSize = val;
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.pageNum = val;
+            this.getList()
+        },
         chuzhi(val) {
             //console.log(val)
             this.chuzhiData = val
@@ -87,6 +105,9 @@ export default {
                 this.diaVisible = true
             })
         },
+        closeDia() {
+            this.checkedDepts = []
+        },
         addForm() {
             console.log(this.checkedDepts, 'this.checkedDepts');
             addCommonApprovalProcess({ approveDeptCodes: this.checkedDepts, safeCompanyAlarm: { id: this.chuzhiData.id } }).then(res => {
@@ -154,6 +175,7 @@ export default {
             box-sizing: border-box;
             background: url('~@/assets/realtimeWarning/矩形备份 289981.png') no-repeat;
             background-size: 100% 100%;
+            position: relative;
 
             .totalTitle {
                 height: 60px;
@@ -183,7 +205,7 @@ export default {
             }
 
             .bottomBody {
-                height: calc(100% - 60px);
+                height: calc(100% - 120px);
                 width: 100%;
                 padding: 14px;
                 box-sizing: border-box;
@@ -207,17 +229,18 @@ export default {
                 }
 
                 .yujingItem {
-                    height: 138px;
+                    height: 158px;
                     width: 100%;
                     background: rgba(108, 128, 151, 0.20);
                     border: 1px solid rgba(73, 84, 97, 1);
                     position: relative;
+                    margin-bottom: 1ch;
 
                     .yujingTop {
                         border-bottom: 1px solid #495461;
-                        height: 54px;
+                        height: 74px;
                         width: 100%;
-                        padding: 0 14px;
+                        padding: 0 14px 5px;
 
 
                         .companyName {
@@ -227,7 +250,8 @@ export default {
                             font-weight: 500;
                             margin-right: 20px;
                             width: 100%;
-
+                            height: 32px;
+                            line-height: 32px;
                             //white-space: nowrap; //禁止换行
                         }
 
@@ -240,6 +264,7 @@ export default {
                             white-space: nowrap; //禁止换行
 
                             text-overflow: ellipsis; //...
+                            //margin-bottom: 5px;
 
                             .shewei {
                                 height: 26px;
@@ -317,7 +342,9 @@ export default {
                     .yujingBottom {
                         width: 100%;
                         height: 84px;
-                        padding: 0 14px;
+                        padding: 0 14px 5px;
+                        overflow: hidden;
+
 
                         .bottomTOP {
                             width: 100%;
@@ -330,18 +357,40 @@ export default {
                             color: rgba(255, 255, 255, 0.8);
                             letter-spacing: 0;
                             font-weight: 400;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
 
                             .numValue {
                                 font-size: 14px;
                                 color: #FFFFFF;
                                 letter-spacing: 0;
                                 font-weight: 400;
+                                white-space: nowrap;
+                                text-overflow: ellipsis;
                             }
 
                         }
                     }
                 }
             }
+
+            .block {
+                bottom: 5px;
+                right: -10px;
+                width: 100%;
+
+                /deep/.el-pagination__jump {
+                    margin: 0;
+                }
+
+                /deep/.el-input__inner {
+                    background: rgba(0, 0, 0, 0);
+
+                    border: 1px solid #28847e;
+                    color: #ccc;
+                }
+            }
+
         }
 
         .picForm {

src/views/safetyIndex/paiming.vue

@@ -12,7 +12,12 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column show-overflow-tooltip prop="companyName" label="企业名称">
+            <el-table-column show-overflow-tooltip label="企业名称">
+                <template slot-scope="scope">
+                    <div @click="toCanban(scope.row)">
+                        {{ scope.row.companyName }}
+                    </div>
+                </template>
             </el-table-column>
             <el-table-column show-overflow-tooltip prop="companyAddress" label="企业地址">
             </el-table-column>
@@ -95,6 +100,12 @@ export default {
         },
         goMore() {
             this.$router.push({ path: '/home/enterpriseRank' })
+        },
+        toCanban(val) {
+            sessionStorage.setItem('companyID', val.companyId)
+            this.$router.push({
+                path: '/home/companyCanban',
+            })
         }
     },
 }

src/views/safetyIndex/toubu.vue

@@ -1,26 +1,26 @@
 <template>
     <div class="toubu">
-        <div class="topBox" @click="goMore()" v-if="Selectvalue == '排名'">
+        <div class="topBox" v-if="Selectvalue == '排名'">
             <div class="topleftIcon"></div>
             <div class="toprightIcon"></div>
             <div class="topHead">
-                <div class="topHeadItem">
+                <div class="topHeadItem" @click="goMore('平安')">
                     平安&nbsp;&nbsp;<span class="blue">{{ statisticsAlarmData.safeSum }}</span><span
                         class="jia">&nbsp;家</span>
                 </div>
                 <div class="shu"></div>
-                <div class="topHeadItem">
+                <div class="topHeadItem" @click="goMore('石化总数')">
                     石化企业总数&nbsp;&nbsp;<span class="yellow">{{ statisticsAlarmData.companySum }}</span><span
                         class="jia">&nbsp;家</span>
                 </div>
                 <div class="shu"></div>
-                <div class="topHeadItem">
+                <div class="topHeadItem" @click="goMore('预警')">
                     预警&nbsp;&nbsp;<span class="red">{{ statisticsAlarmData.alarmSum }}</span><span
                         class="jia">&nbsp;家</span>
                 </div>
             </div>
             <div class="topBottom">
-                <div class="topBottomItem">
+                <div class="topBottomItem" @click="goMore('剧毒')">
                     <img src="../../assets/safetyIndex/涉危企业.png" alt="">
                     <div class="itemBox">
                         <div class="qiye">{{ statisticsDangerData[0] ? statisticsDangerData[0].companyTypeName : '' }}</div>
@@ -29,25 +29,25 @@
                             &nbsp;家</div>
                     </div>
                 </div>
-                <div class="topBottomItem">
+                <div class="topBottomItem" @click="goMore('易制爆')">
                     <img src="../../assets/safetyIndex/易制爆企业2.png" alt="">
                     <div class="itemBox">
-                        <div class="qiye">{{ statisticsDangerData[1] ? statisticsDangerData[1].companyTypeName : '' }}</div>
+                        <div class="qiye">{{ statisticsDangerData[2] ? statisticsDangerData[2].companyTypeName : '' }}</div>
                         <div class="qiyeshu"><span class="qiyenum">{{
                             statisticsDangerData[1] ? statisticsDangerData[1].companyTypeSum : 0 }}</span>
                             &nbsp;家</div>
                     </div>
                 </div>
-                <div class="topBottomItem">
+                <div class="topBottomItem" @click="goMore('易制毒')">
                     <img src="../../assets/safetyIndex/易制毒2.png" alt="">
                     <div class="itemBox">
-                        <div class="qiye">{{ statisticsDangerData[2] ? statisticsDangerData[2].companyTypeName : '' }}</div>
+                        <div class="qiye">{{ statisticsDangerData[1] ? statisticsDangerData[1].companyTypeName : '' }}</div>
                         <div class="qiyeshu"><span class="qiyenum">{{
                             statisticsDangerData[2] ? statisticsDangerData[2].companyTypeSum : 0 }}</span>
                             &nbsp;家</div>
                     </div>
                 </div>
-                <div class="topBottomItem">
+                <div class="topBottomItem" @click="goMore('放射源')">
                     <img src="../../assets/safetyIndex/放射源2.png" alt="">
                     <div class="itemBox">
                         <div class="qiye">{{ statisticsDangerData[3] ? statisticsDangerData[3].companyTypeName : '' }}</div>
@@ -182,8 +182,9 @@ export default {
                 this.topSortData = res.data
             })
         },
-        goMore() {
-            this.$router.push({ path: '/home/enterpriseRank' })
+        goMore(val) {
+            console.log(val, 'val');
+            this.$router.push({ path: '/home/enterpriseRank', query: { companyParamName: val } })
         },
         toCanban(index) {
             sessionStorage.setItem('companyID', this.topSortData[index].companyId)