教学管理调整
This commit is contained in:
fan
parent
caafa7578b
commit
1c85c5a502
@ -204,18 +204,10 @@ export function getClassListPage(params) {
|
||||
params
|
||||
});
|
||||
}
|
||||
/** 分页获取自己创建的班级 */
|
||||
export function getClassListPageSelf(params) {
|
||||
return request({
|
||||
url: `/api/company/paged/cls/self`,
|
||||
method: 'get',
|
||||
params
|
||||
});
|
||||
}
|
||||
/** 查询个人创建的班级列表 */
|
||||
export function getClassListUnPageSelf() {
|
||||
export function getClassListUnPage() {
|
||||
return request({
|
||||
url: `/api/company/list/cls/self`,
|
||||
url: `/api/company/list/cls`,
|
||||
method: 'get'
|
||||
});
|
||||
}
|
||||
|
||||
@ -60,8 +60,8 @@ export default {
|
||||
{ name: '车尾', value: 'psdRight' },
|
||||
{ name: '车厢', value: 'psdSystem' },
|
||||
{ name: '人防门', value: 'envPersonDoor'},
|
||||
{ name: '蓝色FIRE', value: 's'},
|
||||
{ name: '红色FIRE', value: 'a'},
|
||||
{ name: '报警按钮蓝', value: 's'},
|
||||
{ name: '报警按钮红', value: 'a'},
|
||||
{ name: 'APF', value: 'APF'},
|
||||
{ name: '手动阀', value: 'hand'},
|
||||
{ name: '蓝色-阀门', value: 'fmBlue'},
|
||||
@ -123,9 +123,9 @@ export default {
|
||||
{ name: '防火阀红', value: 'fireDamperRed' },
|
||||
{ name: '防火阀绿', value: 'fireDamperGreen' },
|
||||
{ name: '防火阀蓝', value: 'fireDamperBlue' },
|
||||
{ name: '报警灯红', value: 'alarmLampRed' },
|
||||
{ name: '报警灯绿', value: 'alarmLampGreen' },
|
||||
{ name: '报警灯蓝', value: 'alarmLampBlue' }
|
||||
{ name: '温感器红', value: 'alarmLampRed' },
|
||||
{ name: '温感器绿', value: 'alarmLampGreen' },
|
||||
{ name: '温感器蓝', value: 'alarmLampBlue' }
|
||||
],
|
||||
|
||||
rules: {
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getClassListPageSelf, deleteDeptInfo } from '@/api/company';
|
||||
import { getClassListPage, deleteDeptInfo } from '@/api/company';
|
||||
import CreateClass from './createClass';
|
||||
import BindLessons from './bindLessons';
|
||||
export default {
|
||||
@ -42,7 +42,7 @@ export default {
|
||||
}
|
||||
},
|
||||
classQueryList: {
|
||||
query: getClassListPageSelf,
|
||||
query: getClassListPage,
|
||||
selectCheckShow: false,
|
||||
indexShow: true,
|
||||
columns: [
|
||||
@ -59,6 +59,10 @@ export default {
|
||||
title: '创建日期',
|
||||
prop: 'createTime'
|
||||
},
|
||||
{
|
||||
title: '创建人',
|
||||
prop: 'creatorId'
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
title: this.$t('global.operate'),
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
<script>
|
||||
import { getClassGradeList } from '@/api/management/userexam';
|
||||
import { getClassListUnPageSelf } from '@/api/company';
|
||||
import { getClassListUnPage } from '@/api/company';
|
||||
import XLSX from 'xlsx';
|
||||
export default {
|
||||
name: 'GradeList',
|
||||
@ -86,7 +86,7 @@ export default {
|
||||
},
|
||||
created() {
|
||||
const list = this.$route.query.clsIds.split('-');
|
||||
getClassListUnPageSelf().then(response => {
|
||||
getClassListUnPage().then(response => {
|
||||
const classList = [];
|
||||
response.data && response.data.forEach(item => {
|
||||
if (list.includes(item.id + '')) {
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
<script>
|
||||
import { getLessonListsSelfNoPage } from '@/api/jmap/lesson';
|
||||
import { getClassListUnPageSelf } from '@/api/company';
|
||||
import { getClassListUnPage } from '@/api/company';
|
||||
import { getExamListSelf, deleteExam } from '@/api/management/exam';
|
||||
import localStore from 'storejs';
|
||||
|
||||
@ -65,7 +65,7 @@ export default {
|
||||
prop: 'lessonId',
|
||||
type: 'tag',
|
||||
columnValue: (row) => {
|
||||
return this.$convertField(row.lessonId, this.lessonList, ['id', 'name']);
|
||||
return this.$convertField(row.lessonId, this.lessonList || [], ['id', 'name']);
|
||||
},
|
||||
tagType: (row) => { }
|
||||
},
|
||||
@ -73,7 +73,7 @@ export default {
|
||||
title: '班级',
|
||||
prop: 'clsIds',
|
||||
type: 'tagMore',
|
||||
columnValue: (row) => { return this.$convertField(row.clsIds, this.classList, ['id', 'name'], true); },
|
||||
columnValue: (row) => { return this.$convertField(row.clsIds || [], this.classList || [], ['id', 'name'], true); },
|
||||
tagType: (row) => { return 'success'; }
|
||||
},
|
||||
{
|
||||
@ -93,6 +93,10 @@ export default {
|
||||
},
|
||||
tagType: (row) => { }
|
||||
},
|
||||
{
|
||||
title: '创建人',
|
||||
prop: 'creatorId'
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
title: this.$t('global.operate'),
|
||||
@ -121,18 +125,15 @@ export default {
|
||||
}
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
created() {
|
||||
getLessonListsSelfNoPage().then(response => {
|
||||
this.lessonList = response.data;
|
||||
this.lessonList.forEach(item => {
|
||||
this.examQueryForm.queryObject.lessonId.config.data.push({ value: item.id, label: item.name });
|
||||
});
|
||||
});
|
||||
getClassListUnPageSelf().then(response => {
|
||||
getClassListUnPage().then(response => {
|
||||
this.classList = response.data;
|
||||
// this.classList.forEach(item => {
|
||||
// this.examQueryForm.queryObject.clsId.config.data.push({ value: item.id, label: item.name });
|
||||
// });
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
|
||||
@ -65,6 +65,10 @@ export default {
|
||||
title: this.$t('lesson.courseDescription'),
|
||||
prop: 'remarks'
|
||||
},
|
||||
{
|
||||
title: '创建人',
|
||||
prop: 'creatorId'
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
title: this.$t('global.operate'),
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { getClassListUnPageSelf, getRuleListSelfPaged, deleteRuleSelf } from '@/api/company';
|
||||
import { getClassListUnPage, getRuleListSelfPaged, deleteRuleSelf } from '@/api/company';
|
||||
import ApplyClass from './applyClass';
|
||||
export default {
|
||||
name: 'RuleManage',
|
||||
@ -94,20 +94,17 @@ export default {
|
||||
title: this.$t('global.operate'),
|
||||
width: '300',
|
||||
buttons: [
|
||||
// {
|
||||
// name: '评价查询',
|
||||
// handleClick: this.handleQuery,
|
||||
// type: 'primary'
|
||||
// },
|
||||
{
|
||||
name: '应用',
|
||||
handleClick: this.handleApply,
|
||||
type: 'primary'
|
||||
type: 'primary',
|
||||
showControl: (row) => { return !(row.orgIds && row.orgIds.length); }
|
||||
},
|
||||
{
|
||||
name: '修改',
|
||||
handleClick: this.handleUpdate,
|
||||
type: 'primary'
|
||||
type: 'primary',
|
||||
showControl: (row) => { return !(row.orgIds && row.orgIds.length); }
|
||||
},
|
||||
{
|
||||
name: '详情',
|
||||
@ -128,8 +125,7 @@ export default {
|
||||
]
|
||||
},
|
||||
academicYearList: [],
|
||||
classList: [],
|
||||
ruleData: [{ content: '平时考勤30%，考试成绩70%', createDate: '2021.03.11', className: '测试班级' }]
|
||||
classList: []
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
@ -138,9 +134,8 @@ export default {
|
||||
for (let i = 2015; i < nowYear + 1; i++) {
|
||||
this.academicYearList.unshift({ label: `${i}-${i + 1}学年`, value: `${i}-${i + 1}` });
|
||||
this.ruleQueryForm.queryObject.schoolYear.config.data = this.academicYearList;
|
||||
|
||||
}
|
||||
getClassListUnPageSelf().then(resp => {
|
||||
getClassListUnPage().then(resp => {
|
||||
this.classList = resp.data;
|
||||
this.classList.forEach(item => {
|
||||
this.ruleQueryForm.queryObject.orgId.config.data.push({ label: item.name, value: item.id });
|
||||
@ -154,9 +149,6 @@ export default {
|
||||
handleApply(index, row) {
|
||||
this.$refs.applyClass.doShow(row);
|
||||
},
|
||||
// handleQuery(index, row) {
|
||||
// this.$router.push({ path: '/info/totalGrade', query: { orgId: row.orgId, schoolYear: row.schoolYear, term: row.term } });
|
||||
// },
|
||||
handleUpdate(index, row) {
|
||||
this.$router.push({ path: '/info/createRule', query: { type: 'update', ruleId: row.id } });
|
||||
},
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getClassListUnPageSelf, userRuleGetScore } from '@/api/company';
|
||||
import { getClassListUnPage, userRuleGetScore } from '@/api/company';
|
||||
import XLSX from 'xlsx';
|
||||
export default {
|
||||
name: 'GradeList',
|
||||
@ -119,7 +119,7 @@ export default {
|
||||
for (let i = 2015; i < nowYear + 1; i++) {
|
||||
this.academicYearList.unshift({ label: `${i}-${i + 1}学年`, value: `${i}-${i + 1}` });
|
||||
}
|
||||
getClassListUnPageSelf().then(resp => {
|
||||
getClassListUnPage().then(resp => {
|
||||
this.classList = resp.data;
|
||||
});
|
||||
this.form.orgId = (this.$route.query.orgId + '') || '';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user