From f2aad8473d2050caf878ce1f8e9344e6486af938 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Tue, 1 Aug 2023 17:28:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=B5=8B=E5=88=86bug?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BF=E5=AE=A2=E8=AF=A6=E6=83=85=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                        | 2 +-
 src/views/head.vue                                          | 2 +-
 src/views/safetyIndex/yuangong.vue                          | 6 +++++-
 .../companyScore/components/companyDetails.vue              | 4 ++--
 .../companyScore/components/companyTable.vue                | 6 ++++--
 .../companyScore/components/detailsTable.vue                | 2 +-
 src/views/systemManagement/companyScore/index.vue           | 4 +++-
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index edb908c..bbddc92 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,7 @@ 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.113.13:8080/zhapi', // 孙强
   //baseURL: 'http://192.168.0.188:8888/zhapi',
   //baseURL: 'http://121.41.91.94:12002/zhapi',
diff --git a/src/views/head.vue b/src/views/head.vue
index 2d91bde..478f733 100644
--- a/src/views/head.vue
+++ b/src/views/head.vue
@@ -136,7 +136,7 @@ export default {
     letter-spacing: 4px;
     text-shadow: 0 8px 8px rgba(0, 0, 0, 0.3);
     font-weight: 400;
-    margin-right: 80px;
+    margin-right: 30px;
   }
 
   .jingGuan {
diff --git a/src/views/safetyIndex/yuangong.vue b/src/views/safetyIndex/yuangong.vue
index bf69016..5dd7a6e 100644
--- a/src/views/safetyIndex/yuangong.vue
+++ b/src/views/safetyIndex/yuangong.vue
@@ -140,25 +140,28 @@
           show-overflow-tooltip
           prop="identityId"
           label="身份证号"
-          width="180"
+          width="160"
         >
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="visitContactInfo"
           label="联系方式"
+          width="120"
         >
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="visitCompany"
           label="访客所属企业"
+          width="120"
         >
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="visitTime"
           label="访问时间"
+          width="160"
         >
         </el-table-column>
         <el-table-column
@@ -172,6 +175,7 @@
           show-overflow-tooltip
           prop="contactInfo"
           label="对接人联系方式"
+          width="130"
         >
         </el-table-column>
         <el-table-column
diff --git a/src/views/systemManagement/companyScore/components/companyDetails.vue b/src/views/systemManagement/companyScore/components/companyDetails.vue
index ec981b2..0c93162 100644
--- a/src/views/systemManagement/companyScore/components/companyDetails.vue
+++ b/src/views/systemManagement/companyScore/components/companyDetails.vue
@@ -203,7 +203,7 @@ export default {
   },
   created() {
     console.log("params", this.$route.query);
-    this.deatail_data = this.$route.query;
+    this.deatail_data = JSON.parse(this.$route.query.params);
     this.company_id = this.deatail_data.companyId // 进入该页面的公司id, 传给右下表格的查询条件
     if (this.deatail_data.scoreType === "month") {
       this.search_select = "月度";
@@ -379,7 +379,7 @@ export default {
 /* card统一样式 */
 .el-card.box-card.is-always-shadow {
   border: 0px;
-  height: 88.5vh; /* 控制card布局高度,用于适配 */
+  height: 88vh; /* 控制card布局高度,用于适配 */
   position: relative;
   background: url("~@/assets/companyFile/22136.png") no-repeat !important;
   background-size: 100% 100% !important;
diff --git a/src/views/systemManagement/companyScore/components/companyTable.vue b/src/views/systemManagement/companyScore/components/companyTable.vue
index 3fea506..88a538b 100644
--- a/src/views/systemManagement/companyScore/components/companyTable.vue
+++ b/src/views/systemManagement/companyScore/components/companyTable.vue
@@ -3,7 +3,7 @@
     <el-table
       :data="table_data"
       class="company_table"
-      height="650"
+      height="620"
       :stripe="stripe"
       :header-cell-style="table_header"
       :cell-style="{ background: 'revert', 'text-align': 'center' }"
@@ -155,7 +155,9 @@ export default {
       console.log("jump_val", val);
       this.$router.push({
         path: "/home/systemManagement/companyDetails",
-        query: val,
+        query: {
+          params:JSON.stringify(val)
+        },
       });
     },
     // 表头样式
diff --git a/src/views/systemManagement/companyScore/components/detailsTable.vue b/src/views/systemManagement/companyScore/components/detailsTable.vue
index e83c513..2ce7e89 100644
--- a/src/views/systemManagement/companyScore/components/detailsTable.vue
+++ b/src/views/systemManagement/companyScore/components/detailsTable.vue
@@ -530,7 +530,7 @@ export default {
     }
   }
   /deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
-    border: 2px solid #76eae4;
+    border: 0.1px solid #76eae4;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/systemManagement/companyScore/index.vue b/src/views/systemManagement/companyScore/index.vue
index 7d932d8..dccea19 100644
--- a/src/views/systemManagement/companyScore/index.vue
+++ b/src/views/systemManagement/companyScore/index.vue
@@ -229,7 +229,7 @@ export default {
 /* card统一样式 */
 .el-card.box-card.is-always-shadow {
   border: 0px;
-  height: 88.5vh; /* 控制card布局高度,用于适配 */
+  height: 88vh; /* 控制card布局高度,用于适配 */
   position: relative;
   background: url("~@/assets/companyFile/22136.png") no-repeat !important;
   background-size: 100% 100% !important;
@@ -261,6 +261,8 @@ export default {
     .search_right {
       display: flex;
       .el-button {
+        display: flex;
+        align-items: center;
         font-size: 17px;
         height: 4vh;
         border-radius: 0px;
-- 
2.36.3