This commit is contained in:
parent
2eab206ee2
commit
47ffb6d9d8
|
@ -85,6 +85,10 @@
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-form>
|
</a-form>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="table-operator">
|
||||||
|
<a-button @click="changeSort(1)" ref="toFocus">按累计学时排序</a-button>
|
||||||
|
<a-button @click="changeSort(2)">按年度学时排序</a-button>
|
||||||
|
</div>
|
||||||
|
|
||||||
<s-table
|
<s-table
|
||||||
ref="table2"
|
ref="table2"
|
||||||
|
@ -100,7 +104,7 @@
|
||||||
|
|
||||||
<a-divider>前十统计排名</a-divider>
|
<a-divider>前十统计排名</a-divider>
|
||||||
<div class="table-operator">
|
<div class="table-operator">
|
||||||
<a-button @click="changeTopType(1)" ref="toFocus">公司排名年度学时前十统计</a-button>
|
<a-button @click="changeTopType(1)">公司排名年度学时前十统计</a-button>
|
||||||
<a-button @click="changeTopType(2)">公司累计学时学时前十统计</a-button>
|
<a-button @click="changeTopType(2)">公司累计学时学时前十统计</a-button>
|
||||||
</div>
|
</div>
|
||||||
<s-table
|
<s-table
|
||||||
|
@ -141,7 +145,7 @@
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
// 查询参数
|
// 查询参数
|
||||||
queryParam: { orgId: undefined, orgName: '' },
|
queryParam: { orgId: undefined, orgName: '', asc: 1, type: 1 },
|
||||||
// 表头1
|
// 表头1
|
||||||
columns1: [
|
columns1: [
|
||||||
{
|
{
|
||||||
|
@ -150,7 +154,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '学员数量',
|
title: '学员数量',
|
||||||
dataIndex: 'studentCount'
|
dataIndex: 'personCount'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '培训人数',
|
title: '培训人数',
|
||||||
|
@ -200,10 +204,6 @@
|
||||||
title: '累计学时',
|
title: '累计学时',
|
||||||
dataIndex: 'sumClassHour'
|
dataIndex: 'sumClassHour'
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: '人均学时',
|
|
||||||
dataIndex: 'avgClassHour'
|
|
||||||
}
|
|
||||||
],
|
],
|
||||||
loadData2: parameter => {
|
loadData2: parameter => {
|
||||||
return dataPersonalStatistics(Object.assign(parameter, this.queryParam)).then((res) => {
|
return dataPersonalStatistics(Object.assign(parameter, this.queryParam)).then((res) => {
|
||||||
|
@ -241,7 +241,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
loadDataTop1: parameter => {
|
loadDataTop1: parameter => {
|
||||||
return dataClassHourTop(Object.assign(parameter, {type : 1})).then((res) => {
|
return dataClassHourTop(Object.assign(parameter, this.queryParam)).then((res) => {
|
||||||
return res.data
|
return res.data
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -276,7 +276,7 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
loadDataTop2: parameter => {
|
loadDataTop2: parameter => {
|
||||||
return dataClassHourTop(Object.assign(parameter, {type : 2})).then((res) => {
|
return dataClassHourTop(Object.assign(parameter, this.queryParam)).then((res) => {
|
||||||
return res.data
|
return res.data
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -347,10 +347,27 @@
|
||||||
}
|
}
|
||||||
if (this.keyType === '2') {
|
if (this.keyType === '2') {
|
||||||
this.$refs.table2.refresh(true)
|
this.$refs.table2.refresh(true)
|
||||||
|
if (this.topType === 1) {
|
||||||
|
this.$refs.tableTop1.refresh(true)
|
||||||
|
}
|
||||||
|
if (this.topType === 2) {
|
||||||
|
this.$refs.tableTop2.refresh(true)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
changeTopType (type) {
|
changeTopType (type) {
|
||||||
this.topType = type
|
this.topType = type
|
||||||
|
this.queryParam.type = type
|
||||||
|
if (this.topType === 1) {
|
||||||
|
this.$refs.tableTop1.refresh(true)
|
||||||
|
}
|
||||||
|
if (this.topType === 2) {
|
||||||
|
this.$refs.tableTop2.refresh(true)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
changeSort (type) {
|
||||||
|
this.queryParam.asc = type
|
||||||
|
this.$refs.table2.refresh(true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,14 +32,23 @@
|
||||||
</a-radio-group>
|
</a-radio-group>
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
</a-row>
|
||||||
|
<a-row :gutter="16">
|
||||||
<a-col :span="12">
|
<a-col :span="12">
|
||||||
<a-form-model-item ref="isCalculate" label="是否计算学时" prop="isCalculate">
|
<a-form-model-item ref="isCalculate" label="是否计算学时" prop="isCalculate">
|
||||||
<a-radio-group v-model="form.isCalculate">
|
<a-radio-group v-model="form.isCalculate">
|
||||||
<a-radio :value="1">是</a-radio>
|
<a-radio :value="1" @click="isCalculateFunc(1)">是</a-radio>
|
||||||
<a-radio :value="0">否</a-radio>
|
<a-radio :value="0" @click="isCalculateFunc(0)">否</a-radio>
|
||||||
</a-radio-group>
|
</a-radio-group>
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
<div v-if="classHourShow">
|
||||||
|
<a-col :span="12" >
|
||||||
|
<a-form-model-item ref="classHour" label="学时" prop="classHour" >
|
||||||
|
<a-input v-model="form.classHour" />
|
||||||
|
</a-form-model-item>
|
||||||
|
</a-col>
|
||||||
|
</div>
|
||||||
</a-row>
|
</a-row>
|
||||||
<a-row :gutter="16">
|
<a-row :gutter="16">
|
||||||
<a-col :span="12">
|
<a-col :span="12">
|
||||||
|
@ -136,7 +145,8 @@ export default {
|
||||||
rangeId: 0,
|
rangeId: 0,
|
||||||
rangeName: '',
|
rangeName: '',
|
||||||
isTop: 0,
|
isTop: 0,
|
||||||
isCalculate: 0,
|
isCalculate: 1,
|
||||||
|
classHour: 0,
|
||||||
isNowPublish: false,
|
isNowPublish: false,
|
||||||
publishTime: '',
|
publishTime: '',
|
||||||
type: 1,
|
type: 1,
|
||||||
|
@ -144,11 +154,13 @@ export default {
|
||||||
},
|
},
|
||||||
fileList: [],
|
fileList: [],
|
||||||
timeShow: true,
|
timeShow: true,
|
||||||
|
classHourShow: true,
|
||||||
rules: {
|
rules: {
|
||||||
title: [{ required: true, message: '请输入公告标题', trigger: 'blur' }],
|
title: [{ required: true, message: '请输入公告标题', trigger: 'blur' }],
|
||||||
rangeName: [{ required: true, message: '请选择发布范围', trigger: 'blur' }],
|
rangeName: [{ required: true, message: '请选择发布范围', trigger: 'blur' }],
|
||||||
isTop: [{ required: true, message: '请选择是否置顶', trigger: 'change' }],
|
isTop: [{ required: true, message: '请选择是否置顶', trigger: 'change' }],
|
||||||
isCalculate: [{ required: true, message: '请选择是否计算学时', trigger: 'change' }],
|
isCalculate: [{ required: true, message: '请选择是否计算学时', trigger: 'change' }],
|
||||||
|
classHour: [{ required: true, message: '请填写学时', trigger: 'change' }],
|
||||||
isNowPublish: [{ required: true, message: '请选择即时发布', trigger: 'change' }],
|
isNowPublish: [{ required: true, message: '请选择即时发布', trigger: 'change' }],
|
||||||
publishTime: [{ required: true, message: '请选择发布时间', trigger: 'change' }],
|
publishTime: [{ required: true, message: '请选择发布时间', trigger: 'change' }],
|
||||||
type: [{ required: true, message: '请选择发布类型', trigger: 'change' }],
|
type: [{ required: true, message: '请选择发布类型', trigger: 'change' }],
|
||||||
|
@ -209,6 +221,9 @@ export default {
|
||||||
},
|
},
|
||||||
onChangeNow(checked) {
|
onChangeNow(checked) {
|
||||||
this.timeShow = !checked
|
this.timeShow = !checked
|
||||||
|
},
|
||||||
|
isCalculateFunc(type) {
|
||||||
|
this.classHourShow = type === 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -177,6 +177,20 @@
|
||||||
</a-form>
|
</a-form>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
|
<a-row :gutter="24">
|
||||||
|
<a-col :md="12" :sm="24">
|
||||||
|
<a-form :form="form">
|
||||||
|
<a-form-item
|
||||||
|
label="年度计划学时"
|
||||||
|
:labelCol="labelCol"
|
||||||
|
:wrapperCol="wrapperCol"
|
||||||
|
has-feedback
|
||||||
|
>
|
||||||
|
<a-input placeholder="请输入年度计划学时" v-decorator="['planClassHour']" />
|
||||||
|
</a-form-item>
|
||||||
|
</a-form>
|
||||||
|
</a-col>
|
||||||
|
</a-row>
|
||||||
|
|
||||||
<a-divider orientation="left">上传身份证</a-divider>
|
<a-divider orientation="left">上传身份证</a-divider>
|
||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
|
@ -330,7 +344,8 @@
|
||||||
workType: data.workType ? parseInt(data.workType) : undefined,
|
workType: data.workType ? parseInt(data.workType) : undefined,
|
||||||
degreeId: data.degreeId,
|
degreeId: data.degreeId,
|
||||||
orgId: data.orgId,
|
orgId: data.orgId,
|
||||||
orgName: data.orgName
|
orgName: data.orgName,
|
||||||
|
planClassHour: data.planClassHour
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
// 动态赋值年龄和性别
|
// 动态赋值年龄和性别
|
||||||
|
|
Loading…
Reference in New Issue