'完善课程管理页面'

master
aiyadc 5 years ago
parent 8a9e7e2eb0
commit 94c8d64a38

@ -38,7 +38,6 @@
population:'', population:'',
schedule:[], schedule:[],
remind:'' remind:''
} }
} }
} }

@ -1,8 +1,6 @@
<template> <template>
<div> <div>
<el-table :data="tableData" :span-method="objectSpanMethod" @cell-click="cClick" :cell-style="cStyle">
<el-table :data="tableData" :span-method="objectSpanMethod" @cell-click="test" :cell-style="cStyle">
<el-table-column :label="tableLabel" align="center "> <el-table-column :label="tableLabel" align="center ">
<el-table-column prop="daytime" label="" fixed align="center" width="60"></el-table-column> <el-table-column prop="daytime" label="" fixed align="center" width="60"></el-table-column>
<el-table-column prop="time" label="" fixed align="center" width="100"></el-table-column> <el-table-column prop="time" label="" fixed align="center" width="100"></el-table-column>
@ -67,7 +65,7 @@
export default { export default {
name: "tb_course", name: "tb_course",
components: {navBar}, components: {navBar},
props: ['tableLabel', 'courseMessage', 'cClick', 'cStyle',], props: ['tableLabel','cClick', 'cStyle',],
data() { data() {
return { return {
item: '', item: '',
@ -111,451 +109,99 @@
}; };
} }
} }
},
test(col, row, cell, event) {
console.log('第' + row.index + '行')
console.log('第' + col.index + '列')
} }
}, },
mounted() { mounted() {
// cellStyle:function({row, column, rowIndex, columnIndex}){ console.log('aaaaaaaaaaaaaaa')
// if (column.label!=''){ // this.data = [
// return 'cursor:pointer' // [
// } // {
// }, // "ucId": 1,
// cellClick:function (row, column, cell, event) { // "name": "",
// event.target.style.backgroundColor="" // "software": "IDEA",
// if (column.label!='') // "year": "2019",
// {console.log(cell,event); // "semester": 2,
// // event.target.textContent='' // // "population": 50,
// } // "classes": "176",
// if(confirm('')){ // "remind": "",
// event.target.style.backgroundColor="lightyellow" // "ishavedocuments": 1,
// } // "uid": 1
// // },
// } // {
this.data = [ // "ucId": 1,
[ // "name": "",
{ // "software": "IDEA",
"ucId": 1, // "year": "2019",
"name": "课程设计", // "semester": 2,
"software": "IDEA", // "population": 50,
"year": "2019", // "classes": "176",
"semester": 2, // "remind": "",
"population": 50, // "ishavedocuments": 1,
"classes": "17软件工程6班", // "uid": 1
"remind": "", // },
"ishavedocuments": 1, // {
"uid": 1 // "ucId": 1,
}, // "name": "",
{ // "software": "IDEA",
"ucId": 1, // "year": "2019",
"name": "课程设计", // "semester": 2,
"software": "IDEA", // "population": 50,
"year": "2019", // "classes": "176",
"semester": 2, // "remind": "",
"population": 50, // "ishavedocuments": 1,
"classes": "17软件工程6班", // "uid": 1
"remind": "", // },
"ishavedocuments": 1, // {
"uid": 1 // "ucId": 1,
}, // "name": "",
{ // "software": "IDEA",
"ucId": 1, // "year": "2019",
"name": "课程设计", // "semester": 2,
"software": "IDEA", // "population": 50,
"year": "2019", // "classes": "176",
"semester": 2, // "remind": "",
"population": 50, // "ishavedocuments": 1,
"classes": "17软件工程6班", // "uid": 1
"remind": "", // },
"ishavedocuments": 1, // {
"uid": 1 // "ucId": 1,
}, // "name": "Web",
{ // "software": "IDEA",
"ucId": 1, // "year": "2019",
"name": "课程设计", // "semester": 2,
"software": "IDEA", // "population": 50,
"year": "2019", // "classes": "176",
"semester": 2, // "remind": "",
"population": 50, // "ishavedocuments": 1,
"classes": "17软件工程6班", // "uid": 1
"remind": "", // },
"ishavedocuments": 1, // {
"uid": 1 // "ucId": 1,
}, // "name": "",
{ // "software": "IDEA",
"ucId": 1, // "year": "2019",
"name": "Web开发", // "semester": 2,
"software": "IDEA", // "population": 50,
"year": "2019", // "classes": "176",
"semester": 2, // "remind": "",
"population": 50, // "ishavedocuments": 1,
"classes": "17软件工程6班", // "uid": 1
"remind": "", // },
"ishavedocuments": 1, // {
"uid": 1 // "ucId": 1,
}, // "name": "",
{ // "software": "IDEA",
"ucId": 1, // "year": "2019",
"name": "课程设计", // "semester": 2,
"software": "IDEA", // "population": 50,
"year": "2019", // "classes": "176",
"semester": 2, // "remind": "",
"population": 50, // "ishavedocuments": 1,
"classes": "17软件工程6班", // "uid": 1
"remind": "", // }
"ishavedocuments": 1, // ]
"uid": 1 // ]
}, for (let i = 0; i < this.data.length; i++) {
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
}
],
[
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "微机",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
}
],
[
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{},
{
"ucId": 1,
"name": "就业指导",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
}
],
[
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
}
],
[
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
},
{
"ucId": 1,
"name": "课程设计",
"software": "IDEA",
"year": "2019",
"semester": 2,
"population": 50,
"classes": "17软件工程6班",
"remind": "",
"ishavedocuments": 1,
"uid": 1
}
]
]
for (let i = 0; i < 5; i++) {
this.tableData[i].Monday = this.data[i][0] this.tableData[i].Monday = this.data[i][0]
this.tableData[i].Tuesday = this.data[i][1] this.tableData[i].Tuesday = this.data[i][1]
this.tableData[i].Wednesday = this.data[i][2] this.tableData[i].Wednesday = this.data[i][2]
@ -564,7 +210,6 @@
this.tableData[i].Saturday = this.data[i][5] this.tableData[i].Saturday = this.data[i][5]
this.tableData[i].Sunday = this.data[i][6] this.tableData[i].Sunday = this.data[i][6]
} }
console.log(this.tableData)
} }
} }
</script> </script>

@ -12,7 +12,7 @@
<el-submenu index="2"> <el-submenu index="2">
<template slot="title">实验室申请</template> <template slot="title">实验室申请</template>
<el-menu-item index="2-1" route="book" @click="$router.push('/teacher/applyLab')"></el-menu-item> <el-menu-item index="2-1" route="book" @click="$router.push('/teacher/applyLab')"></el-menu-item>
<el-menu-item index="2-2" route="myBooking" @click="$router.push('/teacher/myApplyRecord')"> <el-menu-item index="2-2" route="myBooking" @click="toMyApplyRecord">
</el-menu-item> </el-menu-item>
</el-submenu> </el-submenu>
<el-menu-item index="3" route="course" @click="$router.push('/teacher/courseManagement')" >课程管理</el-menu-item> <el-menu-item index="3" route="course" @click="$router.push('/teacher/courseManagement')" >课程管理</el-menu-item>
@ -47,6 +47,10 @@
}, },
goPersonal: function () { goPersonal: function () {
this.$router.push('/teacher/personal') this.$router.push('/teacher/personal')
},
toMyApplyRecord(){
var u_id=get('').u_id
this.$router.push('/teacher/myApplyRecord',u_id)
} }
}, },
components: { components: {

@ -10,7 +10,7 @@
</el-radio-group> </el-radio-group>
</div> </div>
<el-checkbox-group v-model="checkedValue" @change="handleCheckedValueChange"> <el-checkbox-group v-model="checkedValue" @change="handleCheckedValueChange">
<el-checkbox-button v-for="item in checkOption" :label="item" :key="item" style="width: 52px"></el-checkbox-button> <el-checkbox-button v-for="item in checkOption" :label="item.value" :key="item.value" style="width: 52px" :disabled="item.isDisable"></el-checkbox-button>
</el-checkbox-group> </el-checkbox-group>
<el-divider></el-divider> <el-divider></el-divider>
<el-button @click="$emit('add')"></el-button> <el-button @click="$emit('add')"></el-button>
@ -25,6 +25,7 @@
const doubleVal=['2','4','6','8','10','12','14','16','18']; const doubleVal=['2','4','6','8','10','12','14','16','18'];
export default { export default {
name: "weekSelection", name: "weekSelection",
props:['checkOption'],
data(){ data(){
return{ return{
checkedValue:[], checkedValue:[],
@ -32,7 +33,7 @@
isIndeterminate1:true, isIndeterminate1:true,
isIndeterminate2:true, isIndeterminate2:true,
isIndeterminate3:true, isIndeterminate3:true,
checkOption:['1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18'] checkOption:[]
} }
}, },
methods:{ methods:{
@ -49,7 +50,7 @@
let checkedCount = value.length let checkedCount = value.length
this.radioValue=value.length===allVal.length?'all':'' this.radioValue=value.length===allVal.length?'all':''
} }
} },
} }
</script> </script>

@ -2,23 +2,25 @@
<div> <div>
<el-row> <el-row>
<el-col :span="6" :offset="6"> <el-col :span="6" :offset="6">
学年<el-select v-model="year" size="small"> 学年<el-select v-model="year" size="small" >
<el-option <el-option
v-for="item in selectOptions1" v-for="item in selectOptions1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
@click.native="selectYear"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
学期<el-select v-model="semester" size="small"> 学期<el-select v-model="semester" size="small" >
<el-option <el-option
v-for="item in selectOptions2" v-for="item in selectOptions2"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
@click.native="selectSemester"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -60,6 +62,17 @@
} }
], ],
} }
},
methods:{
selectYear(){
console.log(this.year)
},
selectSemester(){
console.log(this.semester)
}
},
mounted() {
console.log(this.year)
} }
} }
</script> </script>

@ -2,7 +2,7 @@
<div> <div>
<nav-bar></nav-bar><br> <nav-bar></nav-bar><br>
<time-select></time-select> <time-select></time-select>
<tb_course :c-click="{}" :c-style="{}" table-label=""></tb_course> <tb_course :c-click="cClick" :c-style="cellStyle" table-label="" ref="tbCourse"></tb_course>
</div> </div>
</template> </template>
@ -11,12 +11,42 @@
import tb_course from "~/components/tb_course"; import tb_course from "~/components/tb_course";
import timeSelect from "~/components/timeSelect"; import timeSelect from "~/components/timeSelect";
import navBar from "~/components/teacher/navBar"; import navBar from "~/components/teacher/navBar";
import {get} from "~/utils";
export default { export default {
name: "labApplyDetail", name: "labApplyDetail",
props:['id'],
components:{ components:{
tb_course, tb_course,
navBar, navBar,
timeSelect timeSelect
},
data(){
return{
tableData:[]
}
},
methods: {
cClick(){
console.log('you click a cell')
},
cellStyle: function ({row, column, rowIndex, columnIndex}) {
if (column.label != '') {
return 'cursor:pointer'
}
},
},
mounted() {
this.tableData=get('',this.id) //
for (let i = 0; i < this.tableData.length; i++) {
this.tableData[i].Monday = this.data[i][0]
this.tableData[i].Tuesday = this.data[i][1]
this.tableData[i].Wednesday = this.data[i][2]
this.tableData[i].Thursday = this.data[i][3]
this.tableData[i].Friday = this.data[i][4]
this.tableData[i].Saturday = this.data[i][5]
this.tableData[i].Sunday = this.data[i][6]
}
} }
} }
</script> </script>

@ -11,7 +11,7 @@
<el-header> <el-header>
<div> <div>
<el-input type="text" style="max-width: 400px;float: left" placeholder="请输入查询关键字" ><el-button slot="append" icon="el-icon-search"></el-button></el-input> <el-input type="text" style="max-width: 400px;float: left" placeholder="请输入查询关键字" ><el-button slot="append" icon="el-icon-search"></el-button></el-input>
<el-button style="float: right" class="el-button--danger" @click="$router.push('/teacher/myApplyRecord')"></el-button> <el-button style="float: right" class="el-button--danger" @click="toMyRecord"></el-button>
</div> </div>
</el-header> </el-header>
<el-table :data="tableData" border ref="detailtb" height="500px"> <el-table :data="tableData" border ref="detailtb" height="500px">
@ -29,8 +29,8 @@
label="操作" label="操作"
width="212"> width="212">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="" type="text" size="medium" @click="$router.push('/labApplyDetail')"></el-button> <el-button @click="" type="text" size="medium" @click="checkDetail(scope.row)"></el-button>
<el-button @click="formDialog=true" type="text" size="medium">申请</el-button> <el-button @click="clickLabApply(scope.row)" type="text" size="medium">申请</el-button>
</template>> </template>>
</el-table-column> </el-table-column>
@ -38,37 +38,40 @@
</el-main> </el-main>
<!-- 填写申请课室表单信息--> <!-- 填写申请课室表单信息-->
<el-dialog title="请填写以下申请信息" :visible.sync="formDialog" :close-on-click-modal="false"> <el-dialog title="请填写以下申请信息" :visible.sync="formDialog" :close-on-click-modal="false">
<el-form :model="form" :inline="true" label-width="100px"> <el-form :model="form" :inline="true" label-width="100px">
<el-form-item label="地址" > <el-form-item label="课程名称" prop="course_name" :rules="[{ required: true, message: '请输入课程名称', trigger: 'blur' }]">
<el-input v-model="form.position" ></el-input> <el-select v-model="form.course_name" @change="">
<el-option v-for="item in courseOption" :key="item.uc_id" :label="item.course_name"></el-option>
</el-select>
</el-form-item>
<el-form-item label="申请时间段" prop="schedule" :rules="[{ required: true, message: '请选择申请时间段', trigger: 'blur' }]">
<el-input v-model="form.schedule" placeholder="请点击右侧图标进行设置" >
<i slot="suffix" class="el-input__icon el-icon-date" @click="courseDialog=true" style="cursor: pointer"></i>
</el-input></el-form-item>
<el-form-item label="地址" >
<el-input v-model="form.position" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="申请时间" prop="date" > <el-form-item label="申请时间" prop="date" >
<el-input v-model="form.date"></el-input> <el-input v-model="form.date" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="实验室名称"> <el-form-item label="实验室名称">
<el-input v-model="form.name"></el-input> <el-input v-model="form.name" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="姓名" prop="nickname" :rules="[{ required: true, message: '请输入您的姓名', trigger: 'blur' }]"> <el-form-item label="姓名" prop="nickname" :rules="[{ required: true, message: '请输入您的姓名', trigger: 'blur' }]">
<el-input v-model="form.nickname"></el-input> <el-input v-model="form.nickname" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="tel" :rules="[ <el-form-item label="手机号" prop="tel" :rules="[
{ required: true, message: '请输入您的手机号', trigger: 'blur' }, { required: true, message: '请输入您的手机号', trigger: 'blur' },
{type:'number',message: '请输入11位有效数字',trigger: 'blur'}]"> {type:'number',message: '请输入11位有效数字',trigger: 'blur'}]">
<el-input v-model="form.tel"></el-input> <el-input v-model="form.tel" disabled></el-input>
</el-form-item>
<el-form-item label="课程名称" prop="course_name" :rules="[{ required: true, message: '请输入课程名称', trigger: 'blur' }]">
<el-input v-model="form.course_name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="使用班级" prop="class" :rules="[{ required: true, message: '请填写使用的班级', trigger: 'blur' }]"> <el-form-item label="使用班级" prop="class" :rules="[{ required: true, message: '请填写使用的班级', trigger: 'blur' }]">
<el-input v-model="form.class"></el-input> <el-input v-model="form.class" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="班级人数" prop="population" :rules="[{ required: true, message: '填写班级人数', trigger: 'blur' }]"> <el-form-item label="班级人数" prop="population" :rules="[{ required: true, message: '填写班级人数', trigger: 'blur' }]">
<el-input v-model="form.population"></el-input> <el-input v-model="form.population" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="申请时间段" prop="schedule" :rules="[{ required: true, message: '请选择申请时间段', trigger: 'blur' }]">
<el-input v-model="form.schedule" placeholder="请点击右侧图标进行设置" >
<i slot="suffix" class="el-input__icon el-icon-date" @click="courseDialog=true" style="cursor: pointer"></i>
</el-input></el-form-item>
<el-form-item label="备注" prop="remind"><el-input v-model="form.remind" ></el-input></el-form-item> <el-form-item label="备注" prop="remind"><el-input v-model="form.remind" ></el-input></el-form-item>
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
@ -85,8 +88,8 @@
</span> </span>
</el-dialog> </el-dialog>
<!-- 周次选择--> <!-- 周次选择-->
<el-dialog :visible.sync="weekDialog" title="请选择周数" width="400px" :close-on-click-modal="false"> <el-dialog :visible.sync="weekDialog" title="请选择周数" width="400px" :close-on-click-modal="false" >
<week-selection @add="addWeek" @cancel="cancelSelection" ref="weekSelection"></week-selection> <week-selection @add="addWeek" @cancel="cancelSelection" ref="weekSelection" :check-option="checkOptioin"></week-selection>
</el-dialog> </el-dialog>
</el-container> </el-container>
@ -110,13 +113,19 @@
}, },
data(){ data(){
return{ return{
tableData:[{} user:{},
], lab:{},
tableData:[{}],
checkOptioin :[],
formDialog:false, formDialog:false,
courseDialog:false, courseDialog:false,
weekDialog:false, weekDialog:false,
perTargetValue:'', perTargetValue:'',
allWeeksValue:[], allWeeksValue:[],
form:{ form:{
position:'', position:'',
name:'', name:'',
@ -128,19 +137,97 @@
population:'', population:'',
schedule:'', schedule:'',
remind:'' remind:''
}, },
courseOption:[]
} }
}, },
methods:{ methods:{
//
cellStyle:function({row, column, rowIndex, columnIndex}){ cellStyle:function({row, column, rowIndex, columnIndex}){
if (column.label!=''){ if (column.label!=''){
return 'cursor:pointer' return 'cursor:pointer'
} }
//绿
//isFull,forisFull绿
}, },
//
cellClick:function (row, column, cell, event) { cellClick:function (row, column, cell, event) {
//()使disable
let position = this.lab.position
let rowIndex = row.index
let columIndex = column.index
var weeks=get('',{position,rowIndex,columIndex}) //:
this.checkOption=weeks
//
// this.checkOption=[
// {
// value:'1',
// isDisable:false
// },
// {
// value:'2',
// isDisable:false
// },
// {
// value:'3',
// isDisable:false
// },
// {
// value:'4',
// isDisable:false
// },
// {
// value:'5',
// isDisable:false
// },
// {
// value:'6',
// isDisable:false
// },
// {
// value:'7',
// isDisable:false
// },
// {
// value:'8',
// isDisable:false
// },
// {
// value:'9',
// isDisable:false
// },
// {
// value:'10',
// isDisable:false
// },{
// value:'11',
// isDisable:false
// },{
// value:'12',
// isDisable:false
// },{
// value:'13',
// isDisable:false
// },{
// value:'14',
// isDisable:false
// },{
// value:'15',
// isDisable:false
// },{
// value:'16',
// isDisable:false
// },{
// value:'17',
// isDisable:false
// },{
// value:'18',
// isDisable:false
// },
// ]
console.log(row.index)
console.log(column.index)
if (this.weekDialog=false){this.weekDialog=true} if (this.weekDialog=false){this.weekDialog=true}
else {this.weekDialog=false} else {this.weekDialog=false}
if (column.label!='') { if (column.label!='') {
@ -148,12 +235,35 @@
// event.target.textContent='' // // event.target.textContent='' //
this.weekDialog=true this.weekDialog=true
this.perTargetValue=event.target //targettarget this.perTargetValue=event.target //targettarget
} }
}, },
//
toMyRecord(){
this.$router.push('/teacher/myApplyRecord/'+this.user.u_id) //user.u_id
},
//
clickLabApply(row){
this.lab=row
this.formDialog=true
},
//
checkDetail(row){
this.$router.push('/labApplyDetail/'+row.position) //使
},
//
selectChange(){
this.courseOption = get('',this.u_id) //id
this.form.position= this.lab.position //
this.form.name= this.lab.name //
this.form.date=d.getFullYear()+'/'+(d.getMonth()+1)+'/'+d.getDate() //
this.form.nickname= this.user.nickname //
this.form.tel= this.user.tel //
this.form.class= this.courseOption.class //
this.form.population= this.courseOption.population //
},
//
addWeek:function () { addWeek:function () {
console.log(this.perTargetValue)
this.weekDialog=false this.weekDialog=false
var targetValue = this.$refs.weekSelection.checkedValue var targetValue = this.$refs.weekSelection.checkedValue
if(targetValue.length!==0){ if(targetValue.length!==0){
@ -163,6 +273,7 @@
} }
}, },
//
cancelSelection:function () { cancelSelection:function () {
console.log('已取消') console.log('已取消')
this.perTargetValue.style.backgroundColor='' this.perTargetValue.style.backgroundColor=''
@ -173,12 +284,14 @@
// } // }
this.weekDialog=false this.weekDialog=false
}, },
//
setWeeks:function () { setWeeks:function () {
this.form.schedule=this.allWeeksValue.toString() this.form.schedule=this.allWeeksValue.toString()
this.courseDialog=false this.courseDialog=false
console.log(this.$refs.times) console.log(this.$refs.times)
}, },
//
cancelSetWeeks:function () { cancelSetWeeks:function () {
this.courseDialog=false this.courseDialog=false
}, },
@ -193,10 +306,12 @@
this.formDialog=false this.formDialog=false
} }
}, },
//mouted
mounted() { mounted() {
console.log(this.$refs.detailtb) console.log(this.$refs.detailtb)
this.user=get('') //
var d = new Date() var d = new Date()
this.form.date=d.getFullYear()+'/'+(d.getMonth()+1)+'/'+d.getDate()
} }
} }
</script> </script>

@ -1,10 +1,10 @@
<template> <template>
<div> <div>
<nav-bar ></nav-bar> <nav-bar ></nav-bar>
<time-select style="margin-top: 20px"></time-select> <time-select style="margin-top: 20px" ref="timeSelect"></time-select>
<div style="margin-bottom: 10px"> <div style="margin-bottom: 10px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="2"><el-button type="success" class="el-icon-circle-plus-outline" style="float: right" @click="addCourse"></el-button></el-col> <el-col :span="2"><el-button type="success" @click="addCourse"></el-button></el-col>
<el-col :span="8" > <el-col :span="8" >
<el-input type="text" v-model="search" style="max-width: 400px;float: left" placeholder="请输入查询关键字" ><el-button slot="append" icon="el-icon-search"></el-button></el-input> <el-input type="text" v-model="search" style="max-width: 400px;float: left" placeholder="请输入查询关键字" ><el-button slot="append" icon="el-icon-search"></el-button></el-input>
</el-col> </el-col>
@ -19,7 +19,7 @@
<el-table-column label="软件名称" prop="software"></el-table-column> <el-table-column label="软件名称" prop="software"></el-table-column>
<el-table-column label="授课班级" prop="classes"></el-table-column> <el-table-column label="授课班级" prop="classes"></el-table-column>
<el-table-column label="授课人数" prop="population"></el-table-column> <el-table-column label="授课人数" prop="population"></el-table-column>
<el-table-column label="是否有课件" prop="isHaveDocument"></el-table-column> <el-table-column label="是否有课件" prop="isHaveDocuments"></el-table-column>
<el-table-column label="备注" prop="remind"></el-table-column> <el-table-column label="备注" prop="remind"></el-table-column>
<el-table-column label="操作" > <el-table-column label="操作" >
<template slot-scope="scope" > <template slot-scope="scope" >
@ -41,21 +41,50 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog :title="edit?'编辑课程信息':'添加课程'" :visible.sync="dialogForm"> <el-dialog :title="edit===1?'编辑课程信息':'添加课程'" :visible.sync="dialogForm" :close-on-click-modal="false">
<el-form :model="courseForm" :inline="true" label-width="100px" ref="courseForm"> <el-form :model="courseForm" :inline="true" label-width="100px" ref="courseForm" >
<el-form-item label="课程编号" prop="uc_id" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }" ><el-input v-model="courseForm.uc_id"></el-input></el-form-item> <div v-if="edit===1">
<el-form-item label="老师编号" prop="u_id" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.u_id"></el-input></el-form-item> <el-form-item label="学年:" >
<el-select v-model="courseForm.year" size="small" >
<el-option
v-for="item in selectOptions1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="学期:">
<el-select v-model="courseForm.semester" size="small" >
<el-option
v-for="item in selectOptions2"
:key="item.value"
:label="item.label"
:value="item.value"
@click.native="selectSemester"
>
</el-option>
</el-select>
</el-form-item>
</div>
<el-form-item label="课程名称" prop="name" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.name"></el-input></el-form-item> <el-form-item label="课程名称" prop="name" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.name"></el-input></el-form-item>
<el-form-item label="软件名称" prop="software" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.software"></el-input></el-form-item> <el-form-item label="软件名称" prop="software" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.software"></el-input></el-form-item>
<el-form-item label="授课班级" prop="classes" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.classes"></el-input></el-form-item> <el-form-item label="授课班级" prop="classes" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.classes"></el-input></el-form-item>
<el-form-item label="授课人数" prop="population" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.population"></el-input> </el-form-item> <el-form-item label="授课人数" prop="population" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.population"></el-input> </el-form-item>
<el-form-item label="是否有课件" prop="isHaveDocuments" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"><el-input v-model="courseForm.isHaveDocuments"></el-input></el-form-item> <el-form-item label="是否有课件" prop="isHaveDocuments" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }">
<el-form-item label="备注" prop="remind" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"> <el-input v-model="courseForm.remind"></el-input></el-form-item> <el-select v-model="courseForm.isHaveDocuments">
<el-form-item> <el-option label="是" value='1'></el-option>
<el-button type="primary" @click="add"></el-button> <el-option label="否" value='0'></el-option>
<el-button @click="cancel"></el-button> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remind" :rules="{ required: true, message: '此处不可为空', trigger: 'blur' }"> <el-input v-model="courseForm.remind"></el-input></el-form-item>
</el-form> </el-form>
<span slot="footer">
<el-button type="primary" @click="add"></el-button>
<el-button @click="cancel"></el-button>
</span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -73,35 +102,68 @@
search:'', search:'',
dialogForm:false, dialogForm:false,
edit:'', edit:'',
tableData:[], user:{},
tableData:[{year:'1819',semester:'1',uc_id:111,u_id:111,name:'林大池',software:'westorm,微信开发者平台',classes:'软件工程6班',population:'41',isHaveDocuments:'1',remind:'高级课室'}],
courseForm:{ courseForm:{
year:'',
semester:'',
uc_id:'', uc_id:'',
u_id:'', u_id:'',
name:'', name:'',
software:'', software:'',
classes:'', classes:'',
population:'', population:'',
isHaveDocuments:'',
remind:'', remind:'',
isHaveDocuments:'' },
} selectOptions1:[
{
value:'1718',
label:'2017-2018年'
},
{
value:'1819',
label:'2018-2019年'
},
{
value:'1920',
label:'2019-2020年'
}
],
selectOptions2:[
{
value:'1',
label:'第一学期'
},
{
value:'2',
label:'第二学期'
}
],
} }
}, },
methods:{ methods:{
//
async load(){ async load(){
this.tableData=await get('lb/course/courseManagement') this.tableData=await get('lb/course/courseManagement')
}, },
//
addCourse(){ addCourse(){
this.edit=0 this.edit=0
console.log(this.edit)
this.dialogForm=true this.dialogForm=true
this.$refs.courseForm.resetFields()
}, },
//
editCourse(rowData){ editCourse(rowData){
this.edit=1 this.edit=1
this.dialogForm=true this.dialogForm=true
this.courseForm=rowData this.courseForm=rowData
}, },
//
deleteCourse(rowData){ deleteCourse(rowData){
showDialog("确认要删除吗?", this) showDialog("确认要删除吗?", this)
post('lb/user/deleteUser', { post('lb/user/deleteCourse', {
uid: rowData.uc_id uid: rowData.uc_id
}).then(() => { }).then(() => {
showSuccess("删除成功", this) showSuccess("删除成功", this)
@ -110,6 +172,7 @@
showFail("删除失败 " + e.msg, this) showFail("删除失败 " + e.msg, this)
}) })
}, },
//
add:function () { add:function () {
// //
this.$refs['courseForm'].validate(async (valid) => { this.$refs['courseForm'].validate(async (valid) => {
@ -119,6 +182,8 @@
// //
if (this.edit) { if (this.edit) {
await post('lb/user/updateUser', { await post('lb/user/updateUser', {
year:this.$refs.timeSelect.year,
semester:this.$refs.timeSelect.semester,
uc_id:this.courseForm.uc_id, uc_id:this.courseForm.uc_id,
u_id:this.courseForm.u_id, u_id:this.courseForm.u_id,
name:this.courseForm.name, name:this.courseForm.name,
@ -137,13 +202,14 @@
} else { } else {
// //
await post('lb/user/addUser', { await post('lb/user/addUser', {
nickname: this.userForm.nickname, year:this.$refs.timeSelect.year,
tel: this.userForm.tel, semester:this.$refs.timeSelect.semester,
email: this.userForm.email, name:this.courseForm.name,
username: this.userForm.username, software:this.courseForm.software,
office: this.userForm.office, classes:this.courseForm.classes,
position: parseInt(this.userForm.position), population:this.courseForm.population,
password: this.userForm.password remind:this.courseForm.remind,
isHaveDocuments:this.courseForm.isHaveDocuments
}).catch(async e => { }).catch(async e => {
await showFail(e.msg, this) await showFail(e.msg, this)
await stop() await stop()
@ -156,11 +222,13 @@
} }
}) })
}, },
//
cancel:function () { cancel:function () {
this.$refs.courseForm.resetFields() this.$refs.courseForm.resetFields()
this.dialogForm=false this.dialogForm=false
} }
}, },
//
computed:{ computed:{
tableDataComputed(){ tableDataComputed(){
return this.tableData.filter(data => !this.search return this.tableData.filter(data => !this.search
@ -176,6 +244,7 @@
} }
}, },
mounted() { mounted() {
console.log(this.$refs.timeSelect.year)
this.load() this.load()
} }
} }

@ -41,6 +41,7 @@
import {get} from "~/utils"; import {get} from "~/utils";
export default { export default {
name: "myApplyRecord", name: "myApplyRecord",
props:['u_id'],
components: { components: {
tb_course, tb_course,
navBar navBar
@ -55,7 +56,7 @@
}, },
mounted() { mounted() {
get('/lb_teacher_myApplyRecord').then((res)=>{ get('/lb_teacher_myApplyRecord',this.u_id).then((res)=>{
this.tableData=res.data this.tableData=res.data
}) })
} }

@ -54,8 +54,9 @@ const routes = [
component: applyLab component: applyLab
}, },
{ {
path:'myApplyRecord', path:'myApplyRecord/:u_id',
component:myApplyRecord component:myApplyRecord,
props:true
}, },
{ {
path:'courseManagement', path:'courseManagement',
@ -109,8 +110,9 @@ const routes = [
component: tb_course component: tb_course
}, },
{ {
path: '/labApplyDetail', path: '/labApplyDetail/:id',
component: labApplyDetail component: labApplyDetail,
props:true
} }
] ]

Loading…
Cancel
Save