From e6686e15d62b99ca6f89fb3d10f03be35ecf2c8c Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Thu, 22 Oct 2020 11:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=8C=E4=B8=8A?=
=?UTF-8?q?=E8=AF=84=E6=95=99=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../EvaluationTeach/EvaluationTeach.css | 0
.../EvaluationTeach/EvaluationTeach.html | 0
.../EvaluationTeach/EvaluationTeach.js | 6 +-
.../EvaluationTeahcers/EvaluationTeahcers.css | 0
.../EvaluationTeahcers.html | 0
.../EvaluationTeahcers/EvaluationTeahcers.js | 4 +-
.../Modules/EvalApi.cs | 2 +-
.../Eval_Main/Eval_MainService.cs | 2 +-
.../LearunApp-2.2.0/pages.json | 5 +-
.../EvaluationTeach/list.vue | 253 ++++++++++++++++++
.../EvaluationTeach/single.vue | 217 +++++++++++++++
11 files changed, 481 insertions(+), 8 deletions(-)
rename Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/{ => EducationalAdministration}/EvaluationTeach/EvaluationTeach.css (100%)
rename Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/{ => EducationalAdministration}/EvaluationTeach/EvaluationTeach.html (100%)
rename Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/{ => EducationalAdministration}/EvaluationTeach/EvaluationTeach.js (87%)
rename Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/{ => EducationalAdministration}/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css (100%)
rename Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/{ => EducationalAdministration}/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html (100%)
rename Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/{ => EducationalAdministration}/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js (98%)
create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue
create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.css
similarity index 100%
rename from Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css
rename to Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.css
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.html
similarity index 100%
rename from Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html
rename to Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.html
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.js
similarity index 87%
rename from Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js
rename to Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.js
index 347ad0d1b..fbcb6d3af 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.js
@@ -36,7 +36,7 @@
if (param.multipleData) {
_postParam.queryJson = JSON.stringify(multipleData);
}
- learun.httpget(config.webapi + '/learun/eval/studentlist', _postParam, (data) => {
+ learun.httpget(config.webapi + 'learun/adms/eval/studentlist', _postParam, (data) => {
$page.find('.lr-badge').text('0');
if (data) {
$page.find('.lr-badge').text(data.records);
@@ -61,14 +61,14 @@
learun.layer.warning("当前项目已评教!");
return;
}
- learun.nav.go({ path: 'EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, EmpNo: item.EmpNo, LessonNo: item.LessonNo } });
+ learun.nav.go({ path: 'EducationalAdministration/EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, EmpNo: item.EmpNo, LessonNo: item.LessonNo } });
},
btnClick: function (item, $item, $page) {// 左滑按钮点击事件
if (item.UID == undefined || item.UID === '') {
learun.layer.warning("当前项目未评教!");
return;
}
- learun.nav.go({ path: 'EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, StuNo: item.StuNo } });
+ learun.nav.go({ path: 'EducationalAdministration/EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, StuNo: item.StuNo } });
},
rowBtns: ['查看'] // 列表行左滑按钮
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css
similarity index 100%
rename from Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css
rename to Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html
similarity index 100%
rename from Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html
rename to Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js
similarity index 98%
rename from Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js
rename to Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js
index bdf5ddf64..29d852afc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js
@@ -4,7 +4,7 @@
init: function($page, param) {
var path = config.webapi;
learun.layer.loading(true, "加载数据中...");
- learun.httpget(path + "/learun/eval/paper", {
+ learun.httpget(path + "learun/adms/eval/paper", {
VID: param.VID
}, (res) => {
learun.layer.loading(false);
@@ -92,7 +92,7 @@
return
}
// return
- learun.httpget(path + "/learun/eval/savepaper",
+ learun.httpget(path + "learun/adms/eval/savepaper",
{
VID: param.VID,
LessonNo: param.LessonNo,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs
index 8c8f984d6..5fa59f7ae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs
@@ -17,7 +17,7 @@ namespace Learun.Application.WebApi.Modules
public class EvalApi : BaseApi
{
public EvalApi()
- : base("/learun/eval")
+ : base("/learun/adms/eval")
{
Get["/paper"] = GetPaper;// 获取组织机构数据映射表
Get["/studentlist"] = GetStudentList;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs
index 83cf6ee30..8ca668ae0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs
@@ -75,7 +75,7 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "') aa ");
strSql.Append("left join (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID ");
strSql.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo ");
- return this.BaseRepository().FindList(strSql.ToString());
+ return this.BaseRepository().FindList(strSql.ToString(),pagination);
}
catch (Exception ex)
{
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index b5db21c2d..4b65384fe 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
@@ -186,7 +186,10 @@
{ "path": "pages/PersonnelManagement/ContactsDetails/single", "style": { "navigationBarTitleText": "详情" } },
//听课记录
{ "path": "pages/LogisticsManagement/ListenClassRecord/list", "style": { "navigationBarTitleText": "听课记录" } },
- { "path": "pages/LogisticsManagement/ListenClassRecord/single", "style": { "navigationBarTitleText": "详情" } }
+ { "path": "pages/LogisticsManagement/ListenClassRecord/single", "style": { "navigationBarTitleText": "详情" } },
+ //掌上评教
+ { "path": "pages/EducationalAdministration/EvaluationTeach/list", "style": { "navigationBarTitleText": "课程列表" } },
+ { "path": "pages/EducationalAdministration/EvaluationTeach/single", "style": { "navigationBarTitleText": "评教" } }
],
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue
new file mode 100644
index 000000000..179d1aa3d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue
@@ -0,0 +1,253 @@
+
+
+
+
+
+ {{ tips }}
+
+
+
+
+
+
+
+
+ 学年:
+ {{ displayListItem(item, 'AcademicYearNo') }}
+
+
+
+ 学期:
+ {{ displayListItem(item, 'Semester') }}
+
+
+
+ 教师姓名:
+ {{ displayListItem(item, 'EmpName') }}
+
+
+
+ 课程名称:
+ {{ displayListItem(item, 'LessonName') }}
+
+
+ 评教状态:
+ {{ displayListItem(item, 'UID') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置查询条件
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue
new file mode 100644
index 000000000..d10005a84
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+
+
+
+
+
+ 提交保存
+
+
+ 编辑本页
+
+
+ 取消编辑
+
+
+ 删除
+
+
+
+
+
+
+
\ No newline at end of file