Merge branch 'dev-xiaole' into 'master'

更改了人员培训是否合格列表

See merge request !16

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

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: '',