Skip to content

C
confucius
Commit 40c0bc3e authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 76c544f0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1461 additions and 1480 deletions
src/components/activity/active-from.vue
View file @ 40c0bc3e
This diff is collapsed.
src/components/course/record-form.vue
View file @ 40c0bc3e
......@@ -276,7 +276,6 @@
this.msg.ClassId = this.setingObj.ClassId;
this.msg.TeacherId = this.setingObj.Teacher_Id;
GetClassPlanLogPageList(this.msg).then(res => {
console.log("res,", res.Data)
if (res.Code == 1) {
this.dataList = res.Data.PageData;
this.pageCount = res.Data.PageCount;
......
src/components/duty/addDutyItem.vue
View file @ 40c0bc3e
......@@ -246,7 +246,6 @@
getSchoolDropdown({}).then(res => {
if (res.Code == 1) {
this.schoolOptions = res.Data;
console.log(this.schoolOptions,'schoolOptions');
}
})
},
......
src/components/sale/editOrder-form.vue
View file @ 40c0bc3e
......@@ -456,7 +456,6 @@
GetSelectClassOrderList(qMsg).then(res => {
if (res.Code == 1) {
this.beforeOrderList = res.Data;
console.log(res, '前置数据');
}
})
},
......
src/components/schedul/appoint-form.vue
View file @ 40c0bc3e
......@@ -192,11 +192,9 @@
},
//子组件选中传值
getchildInfo(obj){
console.log(obj,'来了');
this.addMsg.TeacherId = obj.TeacherId;
this.addMsg.ClassRoomId = obj.ClassRoomId;
this.addMsg.ReserveClassId = obj.ReserveClassId;
}
}
}
......
src/components/schedul/audition-form.vue
View file @ 40c0bc3e
......@@ -113,7 +113,6 @@
//获取课程系列分页列表
getList() {
GetReserveClassPage(this.msg).then(res => {
console.log(res,'数据');
if(res.Code==1){
this.dataList = res.Data.PageData;
this.PageCount = res.Data.PageCount;
......
src/components/school/classroom/classroom-form.vue
View file @ 40c0bc3e
......@@ -223,8 +223,7 @@
uploadFile(files) {
UploadSelfFile('studentIcon', files, res => {
if (res.Code == 1) {
console.log(211,res)
this.objOption.RoomPicList.push(res.FileUrl);
this.objOption.RoomPicList.push(res.FileUrl);
}
})
},
......@@ -236,17 +235,7 @@
}
</script>
<style>
/* .avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 143px;
height: 82px;
line-height: 82px;
text-align: center;
} */
.avatar-uploader .el-upload {
border-radius: 6px;
cursor: pointer;
......
src/pages/activity/activeType.vue
View file @ 40c0bc3e
......@@ -239,8 +239,6 @@ import ActiveTypeForm from '../../components/activity/activeType-from'
this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}
console.log(257,res)
})
},
delType(item){
......
src/pages/activity/activityList.vue
View file @ 40c0bc3e
......@@ -422,8 +422,6 @@ import ActiveForm from '../../components/activity/active-from'
this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}
console.log(257,res)
})
},
delActive(item){
......
src/pages/classroom/components/classroomNav.vue
View file @ 40c0bc3e
......@@ -77,7 +77,6 @@
methods:{
showNav(val,id){
this.schoolId=id
console.log(id)
},
chooseNav(i){
this.currentNav=i.RoomId
......
src/pages/classroom/components/js/lunarCalendar.js
View file @ 40c0bc3e
......@@ -204,7 +204,6 @@ var lunarCalendar = {
var objDate = new Date();
var endDate = new Date();
if (dateStr) {
console.log(dateStr)
let d = Date.parse(dateStr)
let res = new Date(d);
......@@ -216,15 +215,6 @@ var lunarCalendar = {
endDate.setDate(endDate.getDate() + dayNum);
// let x1 = objDate.getTime();
// console.log(211, x1, objDate)
// let x2 = endDate.getTime();
// console.log(222, x2, endDate)
// let x = x2 - x1
// console.log(x1 == x2, x, 'time');
//修正ymd参数
var m = objDate.getMonth() + 1, d = objDate.getDate();
var totalMonthDay = lunarCalendar.solarDays(yearStr, m);
......
src/pages/classroom/components/scenicSummary.vue
View file @ 40c0bc3e
......@@ -398,7 +398,6 @@ export default {
this.QStartDate = data[0].CurrentDate;
this.QEndDate = data[data.length - 1].CurrentDate;
this.Calendar = this.CalendarDataArray.slice(0,7);
console.log("初始化",this.Calendar)
},
//左侧点击
......@@ -445,45 +444,18 @@ export default {
this.msg.EndDate = d.Format("yyyy-MM-dd");
},
getDayInfo(Y, M, D) {
console.log(148,Y, M, D)
// let StartDate = Y + "-" + M + "-" + D;
// let msg = {
// StartDate: StartDate
// };
// this.apipost(
// "ticketcoupons_get_GetTicketCouponsSummaryDay",
// msg,
// res => {
// if (res.data.resultCode == 1) {
// this.dayList = res.data.data;
// }
// },
// null
// );
},
getOffSet(index){
let el=document.getElementsByClassName('el-timeline-item')[index]
let top=el.getBoundingClientRect().top
return top
},
// timeDifference(startTime,endTime){
// var start1=startTime.split(":");
// var startAll=parseInt(start1[0]*60)+parseInt(start1[1]);
// var end1=endTime.split(":");
// var endAll=parseInt(end1[0]*60)+parseInt(end1[1]);
// let res=Math.ceil((endAll-startAll)/15)
// console.log("时间差===",res);
// return res
// }
},
mounted() {
this.initData();
this.getEndDay();
// this.getList();
let nowDate = new Date().Format("yyyy-MM-dd");
this.nowYear = nowDate.split("-")[0];
this.nowMonth = parseInt(nowDate.split("-")[1]);
......
src/pages/classroom/components/userHistory.vue
View file @ 40c0bc3e
<template>
<q-dialog v-model="persistent" maximized full-height position="right" ref="historyDialog" @hide="" class="flex ">
<div class="con">
<div class="header">
<div class="header">
<img class="img-head" src="../../../assets/images/logo.png" mode="" />
<div class="head-title">
{{details.ErrorTitle}}
</div>
<img class="img-head-close" src="../../../assets/images/classroom/close.png" mode="" @click="hideDialog"/>
<img class="img-head" src="../../../assets/images/logo.png" mode="" />
<div class="head-title">
{{details.ErrorTitle}}
</div>
<div class="info-box">
<div class="user-info">
<div class="user-item">
<div class="user-label">姓名:</div><span class="user-con">{{details.ManageName}}</span>
</div>
<div class="user-item">
<div class="user-label">值班时间:</div><span class="user-con">{{details.StartTime}}-{{details.EndTime}}</span>
</div>
</div>
<div class="use">
<!-- <div class="use-title">用途</div> -->
<div class="use-con">{{details.ErrorContent}}</div>
</div>
<div class="use">
<div class="use-title">现场照片</div>
<div class="img-con">
<div v-for="(item,index) in details.LogPicList" :key="index" class="classroom-img-item">
<el-image :src="item" fit="contain" />
</div>
</div>
<img class="img-head-close" src="../../../assets/images/classroom/close.png" mode="" @click="hideDialog" />
</div>
<div class="info-box">
<div class="user-info">
<div class="user-item">
<div class="user-label">姓名:</div><span class="user-con">{{details.ManageName}}</span>
</div>
<div class="user-item">
<div class="user-label">值班时间:</div><span class="user-con">{{details.StartTime}}-{{details.EndTime}}</span>
</div>
</div>
<div class="use">
<!-- <div class="use-title">用途</div> -->
<div class="use-con">{{details.ErrorContent}}</div>
</div>
<div class="use">
<div class="use-title">现场照片</div>
<div class="img-con">
<div v-for="(item,index) in details.LogPicList" :key="index" class="classroom-img-item">
<el-image :src="item" fit="contain" />
</div>
<div class="use">
<div class="use-title">参与人员</div>
<div class="img-con">
<div v-for="(item,index) in details.ParticipantsList" :key="index" class="classroom-img-item">
<el-image :src="item" fit="contain" />
</div>
</div>
</div>
</div>
<div class="use">
<div class="use-title">参与人员</div>
<div class="img-con">
<div v-for="(item,index) in details.ParticipantsList" :key="index" class="classroom-img-item">
<el-image :src="item" fit="contain" />
</div>
</div>
</div>
</div>
</div>
</q-dialog>
</template>
<script>
import {getClassRoomLogDetail} from '../../../api/classroom/index';
import {
getClassRoomLogDetail
} from '../../../api/classroom/index';
export default {
props: {
classroomId:{
type:[Number,String]
classroomId: {
type: [Number, String]
},
},
watch:{
classroomId(val,oldVal){
if(val!==oldVal){
watch: {
classroomId(val, oldVal) {
if (val !== oldVal) {
this.getClassRoomDetail(val)
}
},
},
components: {
},
data() {
return {
persistent: false,
details:{}
persistent: false,
details: {}
}
},
methods: {
getClassRoomDetail(id){
getClassRoomLogDetail({ID:id}).then((res)=>{
console.log(51,res)
if(res.Code===1){
this.details=res.Data
getClassRoomDetail(id) {
getClassRoomLogDetail({
ID: id
}).then((res) => {
if (res.Code === 1) {
this.details = res.Data
}
})
},
changeShow(){
this.persistent=true
changeShow() {
this.persistent = true
},
hideDialog(){
hideDialog() {
this.$refs.historyDialog.hide()
}
},
}
......@@ -138,101 +133,118 @@
font-size: 12px;
color: #2961FE;
}
.con{
box-sizing: border-box;
width: 500px;
height: 1080px;
background: #FFFFFF;
box-shadow: 0px 0px 76px 0px rgba(2, 44, 66, 0.2);
.header{
width: 500px;
height: 56px;
background-color: #F0F5FB;
padding: 0 20px;
display: flex;
align-items: center;
position: relative;
.img-head{
width: 35px;
height: 35px;
// border-radius: 50%;
background-color: #B0C9FC;
margin-right: 10px;
object-fit: fill;
}
.head-title{
white-space: nowrap;
overflow: hidden;
text-overflow:ellipsis;
}
.img-head-close{
width: 15px;
height: 15px;
margin-right: 10px;
position: absolute;
top: 50%;
transform: translateY(-50%);
right: 15px;
}
}
.info-box{
box-sizing: border-box;
padding: 20px;
.user-info{
height: 100px;
border-bottom: 1px solid #E2E2E2;
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
.user-item{
display: flex;
margin-top: 20px;
.user-label{
width: 100px;
color: #999999;
}
.user-con{
color: #111111;
}
}
.con {
box-sizing: border-box;
width: 500px;
height: 1080px;
background: #FFFFFF;
box-shadow: 0px 0px 76px 0px rgba(2, 44, 66, 0.2);
.header {
width: 500px;
height: 56px;
background-color: #F0F5FB;
padding: 0 20px;
display: flex;
align-items: center;
position: relative;
.img-head {
width: 35px;
height: 35px;
// border-radius: 50%;
background-color: #B0C9FC;
margin-right: 10px;
object-fit: fill;
}
.head-title {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.img-head-close {
width: 15px;
height: 15px;
margin-right: 10px;
position: absolute;
top: 50%;
transform: translateY(-50%);
right: 15px;
}
}
.info-box {
box-sizing: border-box;
padding: 20px;
.user-info {
height: 100px;
border-bottom: 1px solid #E2E2E2;
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
.user-item {
display: flex;
margin-top: 20px;
.user-label {
width: 100px;
color: #999999;
}
.use{
padding: 30px 0;
border-bottom: 1px solid #E2E2E2;
.use-title{
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: bold;
.user-con {
color: #111111;
margin-bottom: 20px;
}
.use-con{
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #999999;
}
.img-con{
}
}
.use {
padding: 30px 0;
border-bottom: 1px solid #E2E2E2;
.use-title {
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #111111;
margin-bottom: 20px;
}
.use-con {
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #999999;
}
.img-con {
display: flex;
.classroom-img-item {
display: flex;
.classroom-img-item{
display: flex;
width: 145px;
height: 80px;
border-radius: 4px;
margin-right: 10px;
margin-bottom: 10px;
.classroom-img{
width: 145px;
height: 80px;
border-radius: 4px;
margin-right: 10px;
margin-bottom: 10px;
.classroom-img {
width: 100%;
height: 100%;
}
}
}
}
}
}
}
}
</style>
src/pages/classroom/courseInfo.vue
View file @ 40c0bc3e
......@@ -336,8 +336,7 @@
"cover":cover,
"playauth":auth,
}, function (player) {
console.log(321,player)
console.log("The player is created");
}
);
},
......
src/pages/classroom/useRecord.vue
View file @ 40c0bc3e
......@@ -128,14 +128,14 @@
},
//选择校区教室导航
successNav(val){
console.log(114,val)
this.msg.RoomId=val.RoomId
this.msg.SchoolId=val.schoolId
this.getClassRoomTimeList();
this.$forceUpdate()
},
dateChoose(value, reason, details){
// console.log(112,this.dateModel)
},
//获取结束日期
getEndTime(date){
......
src/pages/course/teacherLesson.vue
View file @ 40c0bc3e
......@@ -419,7 +419,6 @@
}
}
})
console.log()
return Str;
},
//跳转至备课
......
src/pages/financial/CommissionDetail.vue
View file @ 40c0bc3e
This diff is collapsed.
src/pages/financial/cycleOrderList.vue
View file @ 40c0bc3e
This diff is collapsed.
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ 40c0bc3e
......@@ -2532,7 +2532,6 @@
})
},
getAccountListtype(AccountId){
console.log(AccountId)
this.accountList2.map(x=>{
if(x.ID == AccountId){
this.FinanceTrabeMsg.Type = x.BankType
......
src/pages/financial/salesRules.vue
View file @ 40c0bc3e
This diff is collapsed.
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