Commit 2f3b5631 authored by zhengke's avatar zhengke

修改

parent 6cf8b5c5
...@@ -135,6 +135,9 @@ ...@@ -135,6 +135,9 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.educationIndex .FsettingUU .menu_item:last-child{
margin-bottom:60px;
}
.educationIndex .FsettingUU .menu_item i { .educationIndex .FsettingUU .menu_item i {
margin-right: 5px; margin-right: 5px;
width: 24px; width: 24px;
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<!-- <el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出 <!-- <el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
</el-button> --> </el-button> -->
<el-button @click="ExportFile" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">
导出</el-button>
<el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary"> <el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">
清空回收站</el-button> 清空回收站</el-button>
...@@ -80,20 +82,22 @@ ...@@ -80,20 +82,22 @@
<div class="goods"> <div class="goods">
<div> <div>
<div flex="dir:left"> <div flex="dir:left">
<div class="goods-info" style="width:45%;"> <div class="goods-info" style="width:45%;padding-right:20px;">
<div class="goods-name"> <div class="goods-name">
<div class="app-ellipsis"> <div class="app-ellipsis">
<div style="display:flex;align-items:center;font-size:14px;margin-bottom:5px;"> <div class="vue-line-clamp" style="font-size:14px;margin-bottom:5px;
课程名称:{{item.CourseName}}<el-tag size="small" v-if="item.CourseClassTypeName" style="margin-left:5px;">{{item.CourseClassTypeName}}</el-tag> word-break: break-all; -webkit-line-clamp: 2;font-size:14px;font-weight:bold;">
{{item.CourseName}}
</div> </div>
</div> </div>
</div> </div>
<div style="margin-bottom: 5px;align-items: center;display: flex;flex-direction: row"> <div style="margin-top: 10px;align-items: center;display: flex;flex-direction: row">
<img :src="item.TeacherLogo" alt="" style="width: 30px;height: 30px;border-radius: 50%"> <img :src="item.TeacherLogo" alt="" style="width: 30px;height: 30px;border-radius: 50%">
<span style="margin-left: 10px">{{item.TeacherName}}</span> <span style="margin:0 10px">{{item.TeacherName}}</span>
<el-tag size="small" v-if="item.CourseClassTypeName">{{item.CourseClassTypeName}}</el-tag>
</div> </div>
</div> </div>
<div flex="dir:left box:mean" style="width: 190px;"> <div flex="dir:left box:mean" style="width: 200px;">
<div flex="cross:center main:center" <div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;line-height:28px;"> style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;line-height:28px;">
<span>学习时间:{{item.StudyDate}}</span> <span>学习时间:{{item.StudyDate}}</span>
...@@ -102,12 +106,13 @@ ...@@ -102,12 +106,13 @@
<span>推送放假信息:{{item.IsSendRoom ==0 ? '否' :'是'}}</span> <span>推送放假信息:{{item.IsSendRoom ==0 ? '否' :'是'}}</span>
</div> </div>
</div> </div>
<div style="flex: 1;width: 1px;margin-top:3px;" <div style="min-width: 200px;width:30%;margin-top:3px;"
flex="dir:left box:mean"> flex="dir:left box:mean">
<div style="font-size: 14px;">房间信息:{{item.RoomInfo!=null ?item.RoomInfo:'无'}}</div> <div style="font-size: 14px;">
<div style="width:71px;float:left;">房间信息:</div>
<div style="float:left;width:64%;">{{item.RoomInfo!=null ?item.RoomInfo:'无'}}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -115,7 +120,7 @@ ...@@ -115,7 +120,7 @@
</div> </div>
<div flex="cross:center" class="app-order-info" style="width: 25%;"> <div flex="cross:center" class="app-order-info" style="width: 25%;">
<div flex="dir:top"> <div flex="dir:top">
<div style="width:200px;text-align:left;margin:auto;line-height:28px;"> <div style="width:200px;text-align:left;margin:auto;line-height:28px;margin-top:-30px;">
<div>总点数:{{item.TotalPointNum}}</div> <div>总点数:{{item.TotalPointNum}}</div>
<div>实际总点数:{{item.ActualPointNum}}</div> <div>实际总点数:{{item.ActualPointNum}}</div>
<div>基础点数:{{item.BasePointNum}}</div> <div>基础点数:{{item.BasePointNum}}</div>
...@@ -931,8 +936,14 @@ ...@@ -931,8 +936,14 @@
} }
}); });
}, },
//导出
ExportFile(){
this.GetLocalFile(
"/api/Point/GetPointOrderListToExcel",
{},
"约课订单.xls"
);
}
}, },
}; };
......
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