Skip to content

C
confucius
Commit 8cfc1ede authored by 罗超's avatar 罗超
Browse files
Options

1

parent 9512ce6b
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 44 deletions
src/components/school/classroom/classroom-form.vue
View file @ 8cfc1ede
...@@ -46,12 +46,27 @@ ...@@ -46,12 +46,27 @@
</div> </div>
<div class="row wrap" style="padding-top:20px"> <div class="row wrap" style="padding-top:20px">
<q-uploader style="display: inline-block;min-height:320px; max-width: 100%;background-repeat:no-repeat" <!-- <q-uploader style="display: inline-block;min-height:320px; max-width: 100%;background-repeat:no-repeat"
max-files="10" hide-upload-btn max-files="10" hide-upload-btn
label="教室封面" :max-file-size="5*1024*1024" accept=".jpg, image/*" auto-upload multiple batch label="教室封面" :max-file-size="5*1024*1024" accept=".jpg, image/*" auto-upload multiple batch
:factory="uploadFile"> :factory="uploadFile">
</q-uploader> </q-uploader> -->
<div style="display:flex;flex-wrap: wrap;">
<div v-if="objOption.RoomPicList&&objOption.RoomPicList.length>0" v-for="(item,index) in objOption.RoomPicList">
<div class="ItemImgDiv">
<q-img :src="item" spinner-color="white" style="height: 100%;height:100%" />
<q-btn size="7px" @click="deleteItemImg(index)" style="position:absolute;right:-5px;top:-5px;" round color="red" icon="iconfont icon-guanbi1" />
</div>
</div>
<el-upload
class="avatar-uploader addDutyMain"
action=""
:before-upload="uploadFile"
:show-file-list="false"
>
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</div>
</div> </div>
</q-card-section> </q-card-section>
<q-separator /> <q-separator />
...@@ -206,36 +221,56 @@ ...@@ -206,36 +221,56 @@
}) })
}, },
uploadFile(files) { uploadFile(files) {
UploadSelfFile('studentIcon', files, res => {
UploadSelfFile('studentIcon', files[0], res => {
if (res.Code == 1) { if (res.Code == 1) {
console.log(211,res) console.log(211,res)
this.objOption.RoomPicList.push(res.FileUrl); this.objOption.RoomPicList.push(res.FileUrl);
} }
}) })
}, },
//删除图片
deleteItemImg(index){
this.objOption.RoomPicList.splice(index,1);
}
} }
} }
</script> </script>
<style> <style>
.avatar-uploader-icon { /* .avatar-uploader-icon {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
width: 143px; width: 143px;
height: 82px; height: 82px;
line-height: 82px; line-height: 82px;
text-align: center; text-align: center;
} } */
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9; .avatar-uploader .el-upload {
border-radius: 6px; border-radius: 6px;
cursor: pointer; cursor: pointer;
width:100%;
height:100%;
color:#8c939d;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.addDutyMain{
display:inline-block;
width:118px;
height:118px;
font-size:70px;
border: 1px dashed #d9d9d9;
line-height:120px;
}
.ItemImgDiv{
width:118px;
height:118px;
position: relative;
margin:0 10px 10px 0;
display:inline-block;
}
._delete_img{position: absolute;top: 0px;height:82px;width:143px;line-height: 34px;text-align: center;background-color: rgba(2, 2, 2, 0.6);display: inherit;opacity: 0;transition: all linear .5s} ._delete_img{position: absolute;top: 0px;height:82px;width:143px;line-height: 34px;text-align: center;background-color: rgba(2, 2, 2, 0.6);display: inherit;opacity: 0;transition: all linear .5s}
._delete_img i.iconfont{display: inline-block;width: 32px;height: 32px;border-radius: 50%;color: #E95252 !important;background-color:rgba(251, 251, 251, 0.9); margin-top: 26px;} ._delete_img i.iconfont{display: inline-block;width: 32px;height: 32px;border-radius: 50%;color: #E95252 !important;background-color:rgba(251, 251, 251, 0.9); margin-top: 26px;}
._upload_box ul li{float: left;height:82px;width:143px;padding:0px 20px 20px 0;text-align: center;position: relative;cursor: pointer;margin-right: 10px;} ._upload_box ul li{float: left;height:82px;width:143px;padding:0px 20px 20px 0;text-align: center;position: relative;cursor: pointer;margin-right: 10px;}
......
src/pages/classroom/components/css/comSummary.css
View file @ 8cfc1ede
...@@ -229,8 +229,8 @@ ...@@ -229,8 +229,8 @@
overflow: auto; overflow: auto;
} }
.comSummary .summaryTable { .comSummary .summaryTable {
width:100%; /* width:100%; */
/* min-width: 1400px; */ width: 1680px;
border-radius:4px; border-radius:4px;
/* background-color:#E6E6E6; */ /* background-color:#E6E6E6; */
background-color: #F1F6FB; background-color: #F1F6FB;
......
src/pages/classroom/components/js/lunarCalendar.js
View file @ 8cfc1ede
...@@ -203,14 +203,16 @@ var lunarCalendar = { ...@@ -203,14 +203,16 @@ var lunarCalendar = {
} }
var objDate = new Date(); var objDate = new Date();
var endDate = new Date(); var endDate = new Date();
// if (dateStr) { if (dateStr) {
// console.log(dateStr) console.log(dateStr)
// let d = Date.parse(dateStr) let d = Date.parse(dateStr)
// let res = new Date(d); let res = new Date(d);
// console.log(res, 'res');
// objDate = res objDate = res
// endDate = res let d2 = Date.parse(dateStr)
// } let res2 = new Date(d2);
endDate = res2
}
endDate.setDate(endDate.getDate() + dayNum); endDate.setDate(endDate.getDate() + dayNum);
......
src/pages/classroom/components/scenicSummary.vue
View file @ 8cfc1ede
...@@ -2,14 +2,15 @@ ...@@ -2,14 +2,15 @@
@import "./css/comSummary.css"; @import "./css/comSummary.css";
.td-item{ .td-item{
// min-width: 160px; // min-width: 160px;
width: 100%; width: 200px;
position: relative; position: relative;
margin: 0 10px; margin-left:9px;
border-radius: 4px; border-radius: 4px;
box-shadow: 0px 4px 40px 0px rgba(2, 44, 66, 0.1); box-shadow: 0px 4px 40px 0px rgba(2, 44, 66, 0.1);
// margin-bottom: 20px; // margin-bottom: 20px;
padding: 10px; padding: 10px;
background-color: #fff; background-color: #fff;
.ClassStatus{ .ClassStatus{
position: absolute; position: absolute;
top: 0; top: 0;
...@@ -57,7 +58,7 @@ ...@@ -57,7 +58,7 @@
<i class="iconfont icon-previewleft"></i> <i class="iconfont icon-previewleft"></i>
</div> </div>
</th> </th>
<th v-for="(k,index) in Calendar" :key="k.subCode" :class="{'redType':k.Week=='日'||k.Week=='六','ckedTd':index==columnLine&&dataList!=''}" @click="getDayInfo(k.CurrentYear,k.CurrentMonth,k.CurrentDay)" @mouseover="columnsMouseOver(index)"> <th v-for="(k,index) in Calendar" :key="k.subCode" :width="180" :class="{'redType':k.Week=='日'||k.Week=='六','ckedTd':index==columnLine&&dataList!=''}" @click="getDayInfo(k.CurrentYear,k.CurrentMonth,k.CurrentDay)" @mouseover="columnsMouseOver(index)">
<div slot="reference"> <div slot="reference">
<div class="_week">{{k.Week}}</div> <div class="_week">{{k.Week}}</div>
<div class="_monthDay" v-if="k.CurrentDay==1"> <div class="_monthDay" v-if="k.CurrentDay==1">
...@@ -154,20 +155,23 @@ export default { ...@@ -154,20 +155,23 @@ export default {
startT:{ startT:{
handler(val){ handler(val){
if(val){ if(val){
// this.msg.StartDate=val; // console.log(val)
// let startYear = this.msg.StartDate.split("-")[0]; // this.msg.StartDate=val
// let startMonth = this.msg.StartDate.split("-")[1]; // this.initData()
// var data = lunarCalendar.initLunar( this.msg.StartDate=val;
// startYear, let startYear = this.msg.StartDate.split("-")[0];
// startMonth, let startMonth = this.msg.StartDate.split("-")[1];
// this.dayNum, var data = lunarCalendar.initLunar(
// val startYear,
// ); startMonth,
// console.log(156,data) this.dayNum,
// this.CalendarDataArray = data; val
// this.QStartDate = data[0].CurrentDate; );
// this.QEndDate = data[data.length - 1].CurrentDate; console.log(156,data)
// this.Calendar = this.CalendarDataArray.slice(0,7); this.CalendarDataArray = data;
this.QStartDate = data[0].CurrentDate;
this.QEndDate = data[data.length - 1].CurrentDate;
this.Calendar = this.CalendarDataArray.slice(0,7);
} }
} }
...@@ -321,6 +325,7 @@ export default { ...@@ -321,6 +325,7 @@ export default {
}, },
//初始化日历数据 //初始化日历数据
initData() { initData() {
let startYear = this.msg.StartDate.split("-")[0]; let startYear = this.msg.StartDate.split("-")[0];
let startMonth = this.msg.StartDate.split("-")[1]; let startMonth = this.msg.StartDate.split("-")[1];
var data = lunarCalendar.initLunar( var data = lunarCalendar.initLunar(
...@@ -332,6 +337,7 @@ export default { ...@@ -332,6 +337,7 @@ export default {
this.QStartDate = data[0].CurrentDate; this.QStartDate = data[0].CurrentDate;
this.QEndDate = data[data.length - 1].CurrentDate; this.QEndDate = data[data.length - 1].CurrentDate;
this.Calendar = this.CalendarDataArray.slice(0,7); this.Calendar = this.CalendarDataArray.slice(0,7);
console.log("初始化",this.Calendar)
}, },
//左侧点击 //左侧点击
......
src/pages/classroom/useRecord.vue
View file @ 8cfc1ede
<template> <template>
<div class="page-body con"> <div class="page-body con">
<div class="left"> <div class="left">
<!-- <div class="dateModel col-5 q-mb-sm cursor-pointer shadow-1"> <div class="dateModel col-5 q-mb-sm cursor-pointer shadow-1">
<div class="q-mb-sm">开始日期:{{dateModel}}</div> <div class="q-mb-sm">开始日期:{{dateModel}}</div>
<q-btn label="重新选择" color="primary" size="sm" > <q-btn label="重新选择" color="primary" size="sm" >
<q-popup-proxy transition-show="scale" transition-hide="scale"> <q-popup-proxy transition-show="scale" transition-hide="scale">
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</q-date> </q-date>
</q-popup-proxy> </q-popup-proxy>
</q-btn> </q-btn>
</div> --> </div>
<ClassroomNav :NavData="navData" :activeNav="msg.RoomId" :activeFaNav="msg.SchoolId" @success="successNav"/> <ClassroomNav :NavData="navData" :activeNav="msg.RoomId" :activeFaNav="msg.SchoolId" @success="successNav"/>
</div> </div>
<div class="right"> <div class="right">
...@@ -178,8 +178,10 @@ ...@@ -178,8 +178,10 @@
.right{ .right{
width: calc(100% + 10px); width: calc(100% + 10px);
padding-right: 10px; padding-right: 10px;
height: 100%; // height: calc(100vh - 100px);
height: 950px;
overflow: scroll; overflow: scroll;
// overflow: hidden;
} }
} }
.right::-webkit-scrollbar{ .right::-webkit-scrollbar{
......
src/pages/course/baseSet.vue
View file @ 8cfc1ede
...@@ -52,6 +52,19 @@ ...@@ -52,6 +52,19 @@
每节课的分钟数，单位为分钟计算 每节课的分钟数，单位为分钟计算
</div> </div>
</div> </div>
<div class="col row wrap">
<div class="col-2 baseSet_Title">
管理员：
</div>
<div class="col-3">
<q-select v-model="msg.AdminiIds" :options="EmployeeListOption" color="primary" stack-label filled multiple clearable
label="" option-label="EmployeeName" option-value="Id" ref="AdminiIds" emit-value map-options
/>
</div>
<div class="col-3" style="padding:18px 0 0 10px;color:gray">
</div>
</div>
<div class="col row wrap"> <div class="col row wrap">
<div class="col-2 baseSet_Title"> <div class="col-2 baseSet_Title">
</div> </div>
...@@ -116,12 +129,14 @@ ...@@ -116,12 +129,14 @@
<q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.DefaultClassNum" label="默认班级人数" <q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.DefaultClassNum" label="默认班级人数"
ref="DefaultClassNum" class="q-pb-lg" @keyup.native="checkInteger(addMsg,'DefaultClassNum')" ref="DefaultClassNum" class="q-pb-lg" @keyup.native="checkInteger(addMsg,'DefaultClassNum')"
:rules="[val => !!val || '请填写默认班级人数']" /> :rules="[val => !!val || '请填写默认班级人数']" />
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="persistent=false" /> <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="persistent=false" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveClassType()" /> <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveClassType()" />
</q-card-actions> </q-card-actions>
</q-card> </q-card>
</q-dialog> </q-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -132,7 +147,9 @@ ...@@ -132,7 +147,9 @@
GetClassTypePageList, GetClassTypePageList,
RemoveClassType RemoveClassType
} from '../../api/system/index'; } from '../../api/system/index';
import {
queryEmployee
} from '../../api/users/user'; //获取业务员
export default { export default {
meta: { meta: {
title: "基础设置" title: "基础设置"
...@@ -149,6 +166,7 @@ ...@@ -149,6 +166,7 @@
BasicClassNum: '', //基础带班人数 BasicClassNum: '', //基础带班人数
BasicMinutes: '', //课时分钟数 BasicMinutes: '', //课时分钟数
BasicHours: 0, //基础课时 BasicHours: 0, //基础课时
AdminiIds:[],//管理员
}, },
columns: [{ columns: [{
name: 'CTypeName', name: 'CTypeName',
...@@ -202,17 +220,20 @@ ...@@ -202,17 +220,20 @@
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
commonTitle: '' commonTitle: '',
EmployeeListOption: [],
} }
}, },
created() {}, created() {},
mounted() { mounted() {
this.GetClassConfig(); this.GetClassConfig();
this.GetClassTypePageList(); this.GetClassTypePageList();
this.getEmployee(0);
}, },
methods: { methods: {
//保存基础数据 //保存基础数据
saveInfo() { saveInfo() {
this.msg.AdminiIds=this.msg.AdminiIds.join(',');
SetClassConfig(this.msg).then(res => { SetClassConfig(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
...@@ -236,6 +257,10 @@ ...@@ -236,6 +257,10 @@
this.msg.BasicClassNum = res.Data.BasicClassNum; this.msg.BasicClassNum = res.Data.BasicClassNum;
this.msg.BasicMinutes = res.Data.BasicMinutes; this.msg.BasicMinutes = res.Data.BasicMinutes;
this.msg.BasicHours = res.Data.BasicHours; this.msg.BasicHours = res.Data.BasicHours;
let arr=res.Data.AdminiIds.split(",");
this.msg.AdminiIds= arr.map(e=>{
return e=parseInt(e)
})
} }
} }
}) })
...@@ -350,7 +375,19 @@ ...@@ -350,7 +375,19 @@
}, },
closeSetForm() { closeSetForm() {
this.persistent = false; this.persistent = false;
} },
//获取业务员
getEmployee(id) {
var qMsg = {
Dept_Id: 0
}
qMsg.Dept_Id = id;
queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
this.EmployeeListOption = res.Data;
}
}).catch(() => {})
},
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment