From 855a683b30e01fcf0966b65497540a58910fa50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Fri, 17 Jun 2022 11:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E6=98=AF=E5=90=A6=E5=90=88=E6=A0=BC=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                                      | 2 +-
 src/views/projectFront/laborManage/safeeducation/index.vue | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 65377c16..4b02581e 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -76,7 +76,7 @@ else if (process.env.NODE_ENV == 'debug') {
     // axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
 }
 
-axios.defaults.baseURL = 'http://139.9.66.234:8/'
+// axios.defaults.baseURL = 'http://139.9.66.234:8/'
 
 // tag: 河南
 if (COMPANY == 'henan') {
diff --git a/src/views/projectFront/laborManage/safeeducation/index.vue b/src/views/projectFront/laborManage/safeeducation/index.vue
index daf93284..b30d52c1 100644
--- a/src/views/projectFront/laborManage/safeeducation/index.vue
+++ b/src/views/projectFront/laborManage/safeeducation/index.vue
@@ -29,13 +29,13 @@
                   label="培训类型"
                   width="180">
                 </el-table-column>
-                   <el-table-column  align="center"
+                   <!-- <el-table-column  align="center"
                   label="是否合格">
                    <template slot-scope="scope">
                     <span v-if="scope.row.isQualified == 1">合格</span> 
                     <span v-else>不合格</span>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column  align="center"
                   prop="teamName"
                   label="班组名称"
@@ -87,6 +87,7 @@ import {
 export default {
   components: {},
   data: () => ({
+    total:10,
     personTypeOptions:personTypeOptions,
     // 项目SN
     projectSn: '',