admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-xiaole' into 'master'

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

See merge request !16
This commit is contained in:
杜海鹏 2022-06-17 11:13:57 +08:00
commit 349279f46f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/http.js
View File

@ -76,7 +76,7 @@ else if (process.env.NODE_ENV == 'debug') {
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/' // 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: 河南 // tag: 河南
if (COMPANY == 'henan') { if (COMPANY == 'henan') {

5
src/views/projectFront/laborManage/safeeducation/index.vue
View File

@ -29,13 +29,13 @@
label="培训类型" label="培训类型"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column align="center" <!-- <el-table-column align="center"
label="是否合格"> label="是否合格">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.isQualified == 1">合格</span> <span v-if="scope.row.isQualified == 1">合格</span>
<span v-else>不合格</span> <span v-else>不合格</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column align="center" <el-table-column align="center"
prop="teamName" prop="teamName"
label="班组名称" label="班组名称"
@ -87,6 +87,7 @@ import {
export default { export default {
components: {}, components: {},
data: () => ({ data: () => ({
total:10,
personTypeOptions:personTypeOptions, personTypeOptions:personTypeOptions,
// 项目SN // 项目SN
projectSn: '', projectSn: '',