Skip to content

C
confucius
Commit 2caa0679 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 1b19f414 4fc17238
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 91 deletions
src/pages/activity/resultPageList.vue
View file @ 2caa0679
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
<div flex="dir:left cross:center"> {{scope.row.AliasName}}</div> <div flex="dir:left cross:center"> {{scope.row.AliasName}}</div>
</template></el-table-column> </template></el-table-column>
<el-table-column label="创建时间" prop="CreateDateStr"></el-table-column> <el-table-column label="创建时间" prop="CreateDateStr"></el-table-column>
<el-table-column fixed="right" label="操作" width="180"><template slot-scope="scope"> <el-table-column fixed="right" label="操作" width="180">
<!-- <el-tooltip class="item" effect="dark" content="详情" placement="top"><img <template slot-scope="scope">
src="../../assets/img/userman/detail.png" alt="" class="imgstyle" @click="grant(scope.row)"> <a @click="grant(scope.row)">详情</a>
</el-tooltip> -->
</template></el-table-column> </template></el-table-column>
</el-table> </el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize" <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
...@@ -51,15 +50,15 @@ ...@@ -51,15 +50,15 @@
:disabled="true"></el-input> :disabled="true"></el-input>
</div> </div>
<!-- 单选 --> <!-- 单选 -->
<div v-if="item.SurveyType==2|| item.SurveyType==3" style="margin: 10px 0;"> <div v-if="item.SurveyType==2|| item.SurveyType==3" style="margin: 10px 0;">
<el-checkbox v-model="x.IsCheck==1?true:false" disabled v-for="(x,y) in item.SurveyOptionsList" :key="y"> <el-checkbox v-model="x.IsCheck==1?true:false" disabled v-for="(x,y) in item.SurveyOptionsList" :key="y">
{{x.OptionsName}} {{x.OptionsName}}
</el-checkbox> </el-checkbox>
</div> </div>
<div v-if="item.SurveyType==1" style="margin: 10px 0;"> <div v-if="item.SurveyType==1" style="margin: 10px 0;">
<el-rate v-model="item.ScoreNum" disabled show-score text-color="#ff9900" score-template="{value}分"> <el-rate v-model="item.ScoreNum" disabled show-score text-color="#ff9900" score-template="{value}分">
</el-rate> </el-rate>
</div> </div>
</div> </div>
<div style="font-size: 16px;margin: 10px 0 ;font-weight: bold">问卷调查表信息</div> <div style="font-size: 16px;margin: 10px 0 ;font-weight: bold">问卷调查表信息</div>
<div v-for="(item,index) in xqdata.surverList" :key="index"> <div v-for="(item,index) in xqdata.surverList" :key="index">
...@@ -72,15 +71,15 @@ ...@@ -72,15 +71,15 @@
:disabled="true"></el-input> :disabled="true"></el-input>
</div> </div>
<!-- 单选 --> <!-- 单选 -->
<div v-if="item.SurveyType==2|| item.SurveyType==3" style="margin: 10px 0;"> <div v-if="item.SurveyType==2|| item.SurveyType==3" style="margin: 10px 0;">
<el-checkbox v-model="x.IsCheck==1?true:false" disabled v-for="(x,y) in item.SurveyOptionsList" :key="y"> <el-checkbox v-model="x.IsCheck==1?true:false" disabled v-for="(x,y) in item.SurveyOptionsList" :key="y">
{{x.OptionsName}} {{x.OptionsName}}
</el-checkbox> </el-checkbox>
</div> </div>
<div v-if="item.SurveyType==1" style="margin: 10px 0;"> <div v-if="item.SurveyType==1" style="margin: 10px 0;">
<el-rate v-model="item.ScoreNum" disabled show-score text-color="#ff9900" score-template="{value}分"> <el-rate v-model="item.ScoreNum" disabled show-score text-color="#ff9900" score-template="{value}分">
</el-rate> </el-rate>
</div> </div>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
...@@ -108,14 +107,10 @@ ...@@ -108,14 +107,10 @@
dialogVisible: false, dialogVisible: false,
xqdata: null, xqdata: null,
} }
} },
,
created() { created() {
this.getDateList(); this.getDateList();
} },
,
methods: { methods: {
getDateList() { getDateList() {
this.loading = true; this.loading = true;
...@@ -126,19 +121,18 @@ ...@@ -126,19 +121,18 @@
this.msg.StartDate = ''; this.msg.StartDate = '';
this.msg.EndDate = ''; this.msg.EndDate = '';
} }
this.apipost("/api/Survey/GetResultPageList", this.msg, res => { this.apipostDS("/api/Survey/GetResultPageList", this.msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData; this.tableData = res.data.data.pageData;
this.count = res.data.data.count; this.count = res.data.data.count;
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
}
} }
) })
}, },
getList() { getList() {
this.msg.pageIndex = 1 this.msg.pageIndex = 1
this.getDateList(); this.getDateList();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
...@@ -146,7 +140,7 @@ ...@@ -146,7 +140,7 @@
this.getDateList(); this.getDateList();
}, },
grant(row) { grant(row) {
this.apipost("/api/Survey/GetGuestSurveyDetails", { this.apipostDS("/api/Survey/GetGuestSurveyDetails", {
SurveyID: row.ID SurveyID: row.ID
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -162,7 +156,6 @@ ...@@ -162,7 +156,6 @@
} }
} }
} }
</script> </script>
<style> <style>
.resultPageList .el-card__header { .resultPageList .el-card__header {
...@@ -220,5 +213,4 @@ ...@@ -220,5 +213,4 @@
; ;
} }
</style>
</style> \ No newline at end of file
src/pages/teacher/dayStatic.vue
View file @ 2caa0679
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
.Sysuser_Date .el-input__inner { .Sysuser_Date .el-input__inner {
background: transparent !important; background: transparent !important;
border: 0 !important; border: 0 !important;
height:28px!important;
} }
.myTable_Zk tbody tr:first-child td { .myTable_Zk tbody tr:first-child td {
......
src/pages/teacher/teacherMonth.vue
View file @ 2caa0679
...@@ -2,16 +2,9 @@ ...@@ -2,16 +2,9 @@
.Sysuser_Date .el-input__inner { .Sysuser_Date .el-input__inner {
background: transparent !important; background: transparent !important;
border: 0 !important; border: 0 !important;
height:28px !important ;
} }
.myTable_Zk tbody tr:first-child td {
background: yellow !important;
}
.myTable_Zk tbody tr:first-child {
background: yellow !important;
z-index: 1 !important;
}
</style> </style>
<template> <template>
<div class="page-body"> <div class="page-body">
...@@ -26,7 +19,6 @@ ...@@ -26,7 +19,6 @@
</template> </template>
</q-field> </q-field>
</div> </div>
</div> </div>
<div style="float:right;"> <div style="float:right;">
<q-btn color="accent" class="q-mr-md" size="sm" icon="download" style="margin-top:15px;" <q-btn color="accent" class="q-mr-md" size="sm" icon="download" style="margin-top:15px;"
...@@ -35,17 +27,37 @@ ...@@ -35,17 +27,37 @@
</div> </div>
<div class="page-content"> <div class="page-content">
<q-table :pagination="msg" ref="table" :loading="loading" :style="{'height':tableHeight+'px'}" <q-table :pagination="msg" ref="table" :loading="loading" :style="{'height':tableHeight+'px'}"
no-data-label="暂无相关数据" flat class="sticky-column-table sticky-header-column-table no-bottom-table myTable_Zk" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-header-column-table no-bottom-table"
separator="none" :data="dataList" :columns="columns" row-key=""> separator="none" :data="dataList" :columns="columns" row-key="">
<q-tr slot="header" slot-scope="props" :props="props"> <q-tr slot="header" slot-scope="props" :props="props">
<template v-for="col in props.cols" :props="props"> <template v-for="col in props.cols" :props="props">
<template v-if="col.label=='线上与学生互动数'"> <template v-if="col.label=='线上与学生互动数'">
<q-th :key="col.name" :props="props" style="max-width:75px;text-align:center;"> <q-th :key="col.name" :props="props" style="max-width:90px;text-align:center;">
线上与学生<br />互动数 线上与学生<br />互动数
</q-th> </q-th>
</template> </template>
<template v-else-if="col.label=='学生人数'">
<q-th :key="col.name" :props="props" style="max-width:85px;text-align:center;">
学生人数
</q-th>
</template>
<template v-else-if="col.label=='学生升级'">
<q-th :key="col.name" :props="props" style="max-width:85px;text-align:center;">
学生升级
</q-th>
</template>
<template v-else-if="col.label=='学生旷课'">
<q-th :key="col.name" :props="props" style="max-width:85px;text-align:center;">
学生旷课
</q-th>
</template>
<template v-else-if="col.label=='上课时数'">
<q-th :key="col.name" :props="props" style="max-width:85px;text-align:center;">
上课时数
</q-th>
</template>
<template v-else-if="col.label=='续约(含留学)'"> <template v-else-if="col.label=='续约(含留学)'">
<q-th :key="col.name" :props="props" style="max-width:60px;text-align:center;"> <q-th :key="col.name" :props="props" style="max-width:80px;text-align:center;">
续约<br />(含留学) 续约<br />(含留学)
</q-th> </q-th>
</template> </template>
...@@ -61,49 +73,49 @@ ...@@ -61,49 +73,49 @@
</template> </template>
<template v-else-if="col.label=='老师迟到早退'"> <template v-else-if="col.label=='老师迟到早退'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#FF66CC;color:#000;"> style="max-width:90px;text-align:center;background-color:#FF66CC;color:#000;">
老师<br />迟到早退 老师<br />迟到早退
</q-th> </q-th>
</template> </template>
<template v-else-if="col.label=='N5课程时数'"> <template v-else-if="col.label=='N5课程时数'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#E2EFDA;color:#000;"> style="max-width:85px;text-align:center;background-color:#E2EFDA;color:#000;">
N5<br />课程时数 N5<br />课程时数
</q-th> </q-th>
</template> </template>
<template v-else-if="col.label=='N4课程时数'"> <template v-else-if="col.label=='N4课程时数'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#E2EFDA;color:#000;"> style="max-width:85px;text-align:center;background-color:#E2EFDA;color:#000;">
N4<br />课程时数 N4<br />课程时数
</q-th> </q-th>
</template> </template>
<template v-else-if="col.label=='N3课程时数'"> <template v-else-if="col.label=='N3课程时数'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#E2EFDA;color:#000;"> style="max-width:85px;text-align:center;background-color:#E2EFDA;color:#000;">
N3<br />课程时数 N3<br />课程时数
</q-th> </q-th>
</template> </template>
<template v-else-if="col.label=='N2课程时数'"> <template v-else-if="col.label=='N2课程时数'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#B4C6E7;color:#000;"> style="max-width:85px;text-align:center;background-color:#B4C6E7;color:#000;">
N2<br />课程时数 N2<br />课程时数
</q-th> </q-th>
</template> </template>
<template v-else-if="col.label=='N1课程时数'"> <template v-else-if="col.label=='N1课程时数'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:60px;text-align:center;background-color:#B4C6E7;color:#000;"> style="max-width:85px;text-align:center;background-color:#B4C6E7;color:#000;">
N1<br />课程时数 N1<br />课程时数
</q-th> </q-th>
</template> </template>
<template v-else-if="col.label=='学生小程序刷题次数'"> <template v-else-if="col.label=='学生小程序刷题次数'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:75px;text-align:center;background-color:#B4C6E7;color:#000;"> style="max-width:90px;text-align:center;background-color:#B4C6E7;color:#000;">
学生小程序<br />刷题次数 学生小程序<br />刷题次数
</q-th> </q-th>
</template> </template>
<template v-else-if="col.label=='学生小程序刷题时间'"> <template v-else-if="col.label=='学生小程序刷题时间'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:75px;text-align:center;background-color:#B4C6E7;color:#000;"> style="max-width:90px;text-align:center;background-color:#B4C6E7;color:#000;">
学生小程序<br />刷题时间 学生小程序<br />刷题时间
</q-th> </q-th>
</template> </template>
...@@ -114,7 +126,7 @@ ...@@ -114,7 +126,7 @@
</template> </template>
<template v-else-if="col.label=='所有老师平均分数'"> <template v-else-if="col.label=='所有老师平均分数'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:70px;text-align:center;background-color:#FFC000;color:#000;"> style="max-width:90px;text-align:center;background-color:#FFC000;color:#000;">
所有老师<br />平均分数 所有老师<br />平均分数
</q-th> </q-th>
</template> </template>
...@@ -126,7 +138,7 @@ ...@@ -126,7 +138,7 @@
</template> </template>
<template v-else-if="col.label=='分数差距'"> <template v-else-if="col.label=='分数差距'">
<q-th :key="col.name" :props="props" <q-th :key="col.name" :props="props"
style="max-width:70px;text-align:center;background-color:#FFC000;color:#000;"> style="max-width:90px;text-align:center;background-color:#FFC000;color:#000;">
分数差距 分数差距
</q-th> </q-th>
</template> </template>
...@@ -162,7 +174,7 @@ ...@@ -162,7 +174,7 @@
return { return {
columns: [{ columns: [{
name: 'DateStr', name: 'DateStr',
label: '日期', label: '老师',
field: 'DateStr', field: 'DateStr',
align: 'left' align: 'left'
}, },
...@@ -170,13 +182,15 @@ ...@@ -170,13 +182,15 @@
name: 'StudentCount', name: 'StudentCount',
label: '学生人数', label: '学生人数',
field: 'StudentCount', field: 'StudentCount',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'AttendClassHourScore', name: 'AttendClassHourScore',
label: '上课时数', label: '上课时数',
field: 'AttendClassHourScore', field: 'AttendClassHourScore',
align: 'left', align: 'left',
sortable: true
}, },
{ {
name: 'OnLineInteractiveScore', name: 'OnLineInteractiveScore',
...@@ -184,120 +198,140 @@ ...@@ -184,120 +198,140 @@
field: 'OnLineInteractiveScore', field: 'OnLineInteractiveScore',
align: 'left', align: 'left',
style: 'max-width: 50px', style: 'max-width: 50px',
sortable: true
}, },
{ {
name: 'RenewScore', name: 'RenewScore',
label: '续约(含留学)', label: '续约(含留学)',
field: 'RenewScore', field: 'RenewScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'UpgradeScore', name: 'UpgradeScore',
label: '学生升级', label: '学生升级',
field: 'UpgradeScore', field: 'UpgradeScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'TransScore', name: 'TransScore',
label: '转介绍', label: '转介绍',
field: 'TransScore', field: 'TransScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'TrialSpeakScore', name: 'TrialSpeakScore',
label: '试讲', label: '试讲',
field: 'TrialSpeakScore', field: 'TrialSpeakScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'TruancyScore', name: 'TruancyScore',
label: '学生旷课', label: '学生旷课',
field: 'TruancyScore', field: 'TruancyScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'WithdrawsScore', name: 'WithdrawsScore',
label: '学生退课', label: '学生退课',
field: 'WithdrawsScore', field: 'WithdrawsScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'ComplaintScore', name: 'ComplaintScore',
label: '学生投诉', label: '学生投诉',
field: 'ComplaintScore', field: 'ComplaintScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'TeacherBeLateScore', name: 'TeacherBeLateScore',
label: '老师迟到早退', label: '老师迟到早退',
field: 'TeacherBeLateScore', field: 'TeacherBeLateScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'N5ClassHoursScore', name: 'N5ClassHoursScore',
label: 'N5课程时数', label: 'N5课程时数',
field: 'N5ClassHoursScore', field: 'N5ClassHoursScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'N4ClassHoursScore', name: 'N4ClassHoursScore',
label: 'N4课程时数', label: 'N4课程时数',
field: 'N4ClassHoursScore', field: 'N4ClassHoursScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'N3ClassHoursScore', name: 'N3ClassHoursScore',
label: 'N3课程时数', label: 'N3课程时数',
field: 'N3ClassHoursScore', field: 'N3ClassHoursScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'N2ClassHoursScore', name: 'N2ClassHoursScore',
label: 'N2课程时数', label: 'N2课程时数',
field: 'N2ClassHoursScore', field: 'N2ClassHoursScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'N1ClassHoursScore', name: 'N1ClassHoursScore',
label: 'N1课程时数', label: 'N1课程时数',
field: 'N1ClassHoursScore', field: 'N1ClassHoursScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'MiniAppPractiseScore', name: 'MiniAppPractiseScore',
label: '学生小程序刷题次数', label: '学生小程序刷题次数',
field: 'MiniAppPractiseScore', field: 'MiniAppPractiseScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'MiniAppTimeScore', name: 'MiniAppTimeScore',
label: '学生小程序刷题时间', label: '学生小程序刷题时间',
field: 'MiniAppTimeScore', field: 'MiniAppTimeScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'ActivityNum', name: 'ActivityNum',
label: '活动次数', label: '活动次数',
field: 'ActivityNum', field: 'ActivityNum',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'TotalScore', name: 'TotalScore',
label: '总分数', label: '总分数',
field: 'TotalScore', field: 'TotalScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'AvgScore', name: 'AvgScore',
label: '所有老师平均分数', label: '所有老师平均分数',
field: 'AvgScore', field: 'AvgScore',
align: 'left' align: 'left',
sortable: true
}, },
{ {
name: 'ScoreGap', name: 'ScoreGap',
label: '分数差距', label: '分数差距',
field: 'ScoreGap', field: 'ScoreGap',
align: 'left' align: 'left',
sortable: true
} }
], ],
dataList: [], dataList: [],
...@@ -307,11 +341,8 @@ ...@@ -307,11 +341,8 @@
msg: { msg: {
YearStr: '', YearStr: '',
MonthStr: '', MonthStr: '',
rowsPerPage: 0, rowsPerPage: 0,
}, },
} }
}, },
created() { created() {
...@@ -324,7 +355,6 @@ ...@@ -324,7 +355,6 @@
this.msg.YearStr = d.getFullYear().toString(); this.msg.YearStr = d.getFullYear().toString();
this.msg.MonthStr = (d.getMonth() + 1).toString(); this.msg.MonthStr = (d.getMonth() + 1).toString();
this.myDate = this.msg.YearStr + '-' + this.msg.MonthStr this.myDate = this.msg.YearStr + '-' + this.msg.MonthStr
this.GetTeacherList();
this.getList(); this.getList();
}, },
methods: { methods: {
...@@ -334,7 +364,7 @@ ...@@ -334,7 +364,7 @@
this.loading = true; this.loading = true;
var msg = JSON.parse(JSON.stringify(this.msg)); var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad( EduDownLoad(
"/TeacherStatic/DownLoadTeacherDay", "/TeacherStatic/DownLoadTeacherMonthStatic",
msg, msg,
"教师每日数据统计.xls", res => { "教师每日数据统计.xls", res => {
this.loading = false; this.loading = false;
......
src/utils/erpindex.js
View file @ 2caa0679
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
let domainUrl = 'http://192.168.10.65:8083'; let domainUrl = 'http://192.168.10.65:8083';
let viewFileUrl = 'http://192.168.10.214:8120'; let viewFileUrl = 'http://192.168.10.214:8120';
let mallUrl = "http://192.168.10.65:8088"; let mallUrl = "http://192.168.10.46:8200";
let vtUploadUrl = "http://upload.oytour.com"; let vtUploadUrl = "http://upload.oytour.com";
let vtViewUrl = "http://192.168.10.214:8130"; let vtViewUrl = "http://192.168.10.214:8130";
......
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