Skip to content

W
wisdom-ces
Commit 3e6720ef authored by wangqinghua's avatar wangqinghua
Browse files
Options

批阅功能上线

parent a6ebcbfc
Show whitespace changes
Inline Side-by-side
Showing with 131 additions and 106 deletions
config.xml
View file @ 3e6720ef
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter.test" version="4.1.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.smart19.starter.test" version="4.1.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>党建云平台(测试)</name>
<description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
ionic.config.json
View file @ 3e6720ef
......@@ -7,7 +7,7 @@
"proxies": [
{
"path": "/wisdomgroup",
"proxyUrl": "http://101.89.112.92:80/wisdomgroup"
"proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
}
]
}
\ No newline at end of file
src/pages/home/learn-manage/learn-detail/learn-detail.html
View file @ 3e6720ef
......@@ -16,9 +16,13 @@
<p>测试完成情况</p>
<p><span class="fontSize-2">{{test?.completeNumber}}/</span>{{test?.totalNumber}}</p>
</div>
<div class="flex-1" (click)="gotoRead()">
<p>待批阅数量</p>
<p><span class="fontSize-2">{{test?.markNumber}}/</span>{{test?.totalNumber}}</p>
<!--<div class="flex-1" (click)="gotoRead()">-->
<!--<p>待批阅数量</p>-->
<!--<p><span class="fontSize-2">{{test?.markNumber}}/</span>{{test?.totalNumber}}</p>-->
<!--</div>-->
<div class="flex-1">
<p>平均分</p>
<p class="fontSize-2">{{text?.examineeAvg}}</p>
</div>
</div>
<div class="content-card">
......@@ -27,7 +31,7 @@
<p class="fontSize-2">{{test?.excellentRate}}</p>
</div>
<div class="flex-1">
<p>及格率</p>
<p>通过率</p>
<p class="fontSize-2">{{test?.passRate}}</p>
</div>
<div class="flex-1">
......
src/pages/home/learn-manage/learn-detail/learn-detail.ts
View file @ 3e6720ef
......@@ -19,7 +19,7 @@ export class LearnDetailPage {
public learnManageSer:LearnManageService,public commonSer:CommonService) {
}
ionViewDidLoad() {
ionViewDidEnter() {
this.testId = this.navParams.get('testId');
const data = {
testId:this.testId
......
src/pages/home/learn-manage/learn-manage/learn-manage.html
View file @ 3e6720ef
......@@ -34,7 +34,7 @@
</div>
<div class="content-button padding-15-0">
<span>参与人员:{{item.testObject}}</span>
<span *ngIf="item.testStatus == 1" float-right class="look">发布</span>
<!--<span *ngIf="item.testStatus == 1" float-right class="look">发布</span>-->
<span *ngIf="item.testStatus != 1" float-right class="join">查看</span>
</div>
</div>
......@@ -54,18 +54,21 @@
<ng-container *ngIf="index == 1">
<ion-list>
<ng-container *ngIf="noList.length > 0">
<ng-container *ngFor="let item of doList">
<ng-container *ngFor="let item of noList">
<ion-item class="item-list margin-bottom-10" >
<div class="item" (click)="goToResult(item)">
<div class="item-header padding-15-0">
<div class="item-header-style">
<span class="item-title">{{item.title}}</span>
<span float-right class="green">已完成</span>
<span *ngIf="item.testStatus == 1" float-right class="green">待发布</span>
<span *ngIf="item.testStatus == 2" float-right class="yellow">已发布</span>
<span *ngIf="item.testStatus == 3" float-right class="gray">已过期</span>
</div>
</div>
<div class="content-button padding-15-0">
<span>参与人员:{{item.testObject}}</span>
<span float-right class="look">查看</span>
<!--<span *ngIf="item.testStatus == 1" float-right class="look">发布</span>-->
<span *ngIf="item.testStatus != 1" float-right class="join">查看</span>
</div>
</div>
</ion-item>
......@@ -90,12 +93,15 @@
<div class="item-header padding-15-0">
<div class="item-header-style">
<span class="item-title">{{item.title}}</span>
<span float-right class="green">已完成</span>
<span *ngIf="item.testStatus == 1" float-right class="green">待发布</span>
<span *ngIf="item.testStatus == 2" float-right class="yellow">已发布</span>
<span *ngIf="item.testStatus == 3" float-right class="gray">已过期</span>
</div>
</div>
<div class="content-button padding-15-0">
<span>参与人员:{{item.testObject}}</span>
<span float-right class="look">查看</span>
<!--<span *ngIf="item.testStatus == 1" float-right class="look">发布</span>-->
<span *ngIf="item.testStatus != 1" float-right class="join">查看</span>
</div>
</div>
</ion-item>
......@@ -120,12 +126,14 @@
<div class="item-header padding-15-0">
<div class="item-header-style">
<span class="item-title">{{item.title}}</span>
<span float-right class="green">已完成</span>
<span *ngIf="item.testStatus == 1" float-right class="green">待发布</span>
<span *ngIf="item.testStatus == 2" float-right class="yellow">已发布</span>
<span *ngIf="item.testStatus == 3" float-right class="gray">已过期</span>
</div>
</div>
<div class="content-button padding-15-0">
<span>参与人员:{{item.testObject}}</span>
<span float-right class="look">查看</span>
<span float-right class="join">查看</span>
</div>
</div>
</ion-item>
......
src/pages/home/learn-manage/learn-manage/learn-manage.ts
View file @ 3e6720ef
......@@ -28,7 +28,7 @@ export class LearnManagePage {
list = [];
pageNumber = 1;
pageSize = 250;
pageSize = 1000;
constructor(public navCtrl: NavController, public navParams: NavParams,
public learnManageSer:LearnManageService,public datePipe:DatePipe) {
}
......@@ -50,9 +50,9 @@ export class LearnManagePage {
this.learnManageSer.getLearnTestList(data).subscribe(
(res)=>{
this.list = res.data.list;
this.noList = res.data.list.filter((e)=>e.testResult == 1);
this.doList = res.data.list.filter((e)=>e.testResult == 2);
this.edList = res.data.list.filter((e)=>e.testResult == 3);
this.noList = res.data.list.filter((e)=>e.testStatus == 1);
this.doList = res.data.list.filter((e)=>e.testStatus == 2);
this.edList = res.data.list.filter((e)=>e.testStatus == 3);
this.link = true;
}
)
......
src/pages/home/learn-manage/rank-list/rank-list.html
View file @ 3e6720ef
......@@ -43,10 +43,10 @@
<!--<p class="tips">备注：分数相同的情况下，先交卷者排名在前</p>-->
<!--上滑加载数据-->
<ion-infinite-scroll threshold="100px" (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles"
loadingText="加载更多...">
</ion-infinite-scroll-content>
</ion-infinite-scroll>
<!--<ion-infinite-scroll threshold="100px" (ionInfinite)="doInfinite($event)">-->
<!--<ion-infinite-scroll-content-->
<!--loadingSpinner="bubbles"-->
<!--loadingText="加载更多...">-->
<!--</ion-infinite-scroll-content>-->
<!--</ion-infinite-scroll>-->
</ion-content>
src/pages/home/learn-manage/rank-list/rank-list.ts
View file @ 3e6720ef
......@@ -14,7 +14,7 @@ export class RankListPage {
testId;
pageNumber = 1;
pageSize = 25;
pageSize = 1000;
list = [];
constructor(public navCtrl: NavController, public navParams: NavParams,public learnManSer:LearnManageService,
......@@ -39,14 +39,17 @@ export class RankListPage {
doRefresh(refresher) {
this.commonSer.log("下拉")
this.pageNumber = 1;
const nowDate = this.datePipe.transform(new Date(), 'yyyy/MM/dd HH:hh:ss')
const data = {
testId:this.testId,
pageNumber: this.pageNumber,
pageSize: this.pageSize,
queryTime: nowDate,
};
this.learnManSer.getRankList(data).subscribe(
(res)=>{
this.list = res.data.list;
refresher.complete()
}
)
}
......@@ -61,27 +64,11 @@ export class RankListPage {
selectType: '1', //全部状态
queryTime: nowDate,
};
setTimeout( ()=>{
this.list.push(
{username: '7', score: '100'},
{username: '7', score: '100'},
{username: '7', score: '100'},
{username: '7', score: '100'},
{username: '7', score: '100'},
{username: '7', score: '100'},
{username: '7', score: '100'},
{username: '7', score: '100'},
{username: '7', score: '100'},
{username: '7', score: '100'},
)
if(this.list.length > 100){
infiniteScroll.enable(false);
}else{
infiniteScroll.complete();
this.learnManSer.getRankList(data).subscribe(
(res)=>{
this.list = res.data.list;
}
},1000 )
)
}
}
src/pages/home/learn-manage/read-learn/read-learn.scss
View file @ 3e6720ef
......@@ -78,7 +78,7 @@ page-read-learn {
padding: 0 1rem;
position: absolute;
left: 0;
bottom: 3rem;
bottom: 5rem;
height: 5rem;
width: 100%;
background-color: #e6e8ed;
......@@ -102,12 +102,12 @@ page-read-learn {
position: absolute;
left: 0;
bottom: 0;
height: 3rem;
height: 5rem;
width: 100%;
border-top: .1rem solid #34b4fc;
display: flex;
div {
line-height: 3rem;
line-height: 5rem;
}
.time {
text-align: center;
......
src/pages/home/learn-manage/read-learn/read-learn.ts
View file @ 3e6720ef
......@@ -18,6 +18,7 @@ export class ReadLearnPage {
pageSize = 100;
index = 0;
list = [];
message;
constructor(public navCtrl: NavController, public navParams: NavParams, public appService: AppService,
public learnManSer: LearnManageService,public commonSer:CommonService) {
......@@ -79,6 +80,7 @@ export class ReadLearnPage {
}
let arr = [];
this.list.forEach(l=>{
if(l.unSubmit == 0){ //当前试卷均题目都批阅了
l.vos.forEach(v=>{
arr.push({
recordId:v.recordId,
......@@ -88,29 +90,38 @@ export class ReadLearnPage {
score:v.score,
})
})
})
}
});
this.commonSer.alert(this.message,()=>{
this.learnManSer.submitMarkResult(arr).subscribe(
(res)=>{
this.commonSer.toast("批阅完成！")
this.navCtrl.pop();
}
)
})
}
/**
* unSubmit 是对每个试卷的未批阅数目，当未批阅数目大于0时，将该试卷的批阅不提交
* @returns {boolean}
*/
check(){
let num = 0;
this.list.forEach(l=>{
l.unSubmit = 0;
l.vos.forEach(v=>{
if(v.result != 0 && v.result != 1){
l.unSubmit ++;
num ++;
}
})
})
});
if(num > 0){
this.commonSer.toast("有试卷的题目未批阅！")
return false;
this.message = "有试卷的题目未批阅(有题目未批阅的试卷不会被提交)";
}else{
return true;
this.message = "确定提交当前批阅？"
}
return true;
}
}
src/pages/home/learning/learning-list/learning-list.html
View file @ 3e6720ef
......@@ -44,17 +44,19 @@
<span *ngIf="item.testResult != 0" (click)="goToResult(item)" float-right class="look">查看结果</span>
<span *ngIf="item.testResult == 0" (click)="goToResult(item)" float-right class="join">开始测试</span>
</div>
<!--<div class="content-button padding-15-0 fontSize-15">-->
<!--<span class="margin-right-10">最高分:<span-->
<!--*ngIf="!item?.maxNum && item?.maxNum != 0">无</span>-->
<!--<span class="color-red">{{item.maxNum}}</span>-->
<!--</span>-->
<!--<span>排名:</span>-->
<!--<span *ngIf="!item?.ranking">无</span>-->
<!--<span class="color-red">{{item.ranking}}</span>-->
<ng-container *ngIf="item.isRank == 1">
<div class="content-button padding-15-0 fontSize-15">
<span class="margin-right-10">最高分:<span
*ngIf="!item?.maxNum && item?.maxNum != 0">无</span>
<span class="color-red">{{item.maxNum}}</span>
</span>
<span>排名:</span>
<span *ngIf="!item?.ranking">无</span>
<span class="color-red">{{item.ranking}}</span>
<!--<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>-->
<!--</div>-->
<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>
</div>
</ng-container>
</div>
</ion-item>
</ng-container>
......@@ -97,16 +99,19 @@
<span *ngIf="item.testResult == 0" (click)="goToResult(item)" float-right
class="join">开始测试</span>
</div>
<!--<div class="content-button padding-15-0 fontSize-15">-->
<!--<span class="margin-right-10">最高分:<span-->
<!--*ngIf="!item?.maxNum && item?.maxNum != 0">无</span>-->
<!--<span class="color-red">{{item.maxNum}}</span>-->
<!--</span>-->
<!--<span>排名:</span>-->
<!--<span *ngIf="!item?.ranking">无</span>-->
<!--<span class="color-red">{{item.ranking}}</span>-->
<!--<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>-->
<!--</div>-->
<ng-container *ngIf="item.isRank == 1">
<div class="content-button padding-15-0 fontSize-15">
<span class="margin-right-10">最高分:<span
*ngIf="!item?.maxNum && item?.maxNum != 0">无</span>
<span class="color-red">{{item.maxNum}}</span>
</span>
<span>排名:</span>
<span *ngIf="!item?.ranking">无</span>
<span class="color-red">{{item.ranking}}</span>
<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>
</div>
</ng-container>
</div>
</ion-item>
</ng-container>
......@@ -150,16 +155,19 @@
<span *ngIf="item.testResult == 0" (click)="goToResult(item)" float-right
class="join">开始测试</span>
</div>
<!--<div class="content-button padding-15-0 fontSize-15">-->
<!--<span class="margin-right-10">最高分:<span-->
<!--*ngIf="!item?.maxNum && item?.maxNum != 0">无</span>-->
<!--<span class="color-red">{{item.maxNum}}</span>-->
<!--</span>-->
<!--<span>排名:</span>-->
<!--<span *ngIf="!item?.ranking">无</span>-->
<!--<span class="color-red">{{item.ranking}}</span>-->
<!--<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>-->
<!--</div>-->
<ng-container *ngIf="item.isRank == 1">
<div class="content-button padding-15-0 fontSize-15">
<span class="margin-right-10">最高分:<span
*ngIf="!item?.maxNum && item?.maxNum != 0">无</span>
<span class="color-red">{{item.maxNum}}</span>
</span>
<span>排名:</span>
<span *ngIf="!item?.ranking">无</span>
<span class="color-red">{{item.ranking}}</span>
<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>
</div>
</ng-container>
</div>
</ion-item>
</ng-container>
......@@ -176,8 +184,8 @@
</ng-container>
</ng-container>
<!--上滑加载数据-->
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll>
<!--<ion-infinite-scroll (ionInfinite)="doInfinite($event)">-->
<!--<ion-infinite-scroll-content></ion-infinite-scroll-content>-->
<!--</ion-infinite-scroll>-->
</ion-content>
src/pages/home/learning/learning-list/learning-list.scss
View file @ 3e6720ef
......@@ -12,7 +12,7 @@ page-learning-list {
.content-button{
border-top: 1px solid #c8c7cc;
span{
vertical-align: middle;
vertical-align: baseline;
}
}
.look{
......
src/pages/home/learning/learning-list/learning-list.ts
View file @ 3e6720ef
......@@ -26,7 +26,7 @@ export class LearningListPage {
list = []; //全部测试
link = false; //是否请求完成
pageNumber = 1; //页码
pageSize = 250; //每页显示条数
pageSize = 1000; //每页显示条数
constructor(public navCtrl: NavController, public navParams: NavParams,public tabSer:TabsService,
public learnSer: LearnService, public datePipe: DatePipe,public commonSer:CommonService,
......@@ -67,7 +67,7 @@ export class LearningListPage {
if(res.data){
this.list = res.data.list;
this.noList = res.data.list.filter((e)=>e.testResult == 0);
this.doList = res.data.list.filter((e)=>e.testResult == 2);
this.doList = res.data.list.filter((e)=>e.testResult == 1 || e.testResult == 2);
}
this.link = true;
}
......@@ -130,13 +130,14 @@ export class LearningListPage {
//去测试or结果
goToResult(item) {
if(item.testResult == 0){
this.navCtrl.push("LearningExplainPage", {
this.navCtrl.push("LearningExplainPage", { //测试
item: item
})
}else{
this.navCtrl.push("LearningResultPage", {
this.navCtrl.push("LearningResultPage", { //结果
testId: item.testId,
title:item.title
title:item.title,
isRepeat:item.isRepeat
})
}
}
......
src/pages/home/learning/learning-result/learning-result.html
View file @ 3e6720ef
......@@ -34,7 +34,7 @@
</div>
<div>
<button class="submit-btn submit" (click)="reviewTest()">测试回顾</button>
<button class="submit-btn submit" (click)="resetTest()">重新测试</button>
<button *ngIf="isRepeat == 1" class="submit-btn submit" (click)="resetTest()">重新测试</button>
</div>
</div>
</ng-container>
......
src/pages/home/learning/learning-result/learning-result.ts
View file @ 3e6720ef
......@@ -11,9 +11,10 @@ import {EmitService} from "../../../../provide/emit.service";
})
export class LearningResultPage {
@ViewChild(Navbar) navbar: Navbar;
testId;
title;
result;
testId; //测试id
title; //测试标题
result; //测试结果
isRepeat; // 是否能够重复测试
starList = [
{class: 'star-yellow'},
......@@ -34,6 +35,7 @@ export class LearningResultPage {
ionViewDidLoad() {
this.testId = this.navParams.get('testId');
this.title = this.navParams.get('title');
this.isRepeat = this.navParams.get('isRepeat');
const data = {
testId: this.testId
};
......
src/pages/home/learning/review-learn/review-learn.html
View file @ 3e6720ef
......@@ -80,10 +80,7 @@
</ng-container>
<!--问答-->
<ng-container *ngIf="item.questionType == 5">
<textarea [(ngModel)]="item.answer" disabled class="content-textarea"></textarea>
<div class="border margin-top-20 padding-10">
正确答案：{{item.correctAnswer}}
</div>
<textarea [(ngModel)]="item.myAnswer" disabled class="content-textarea"></textarea>
</ng-container>
</div>
</div>
......
src/pages/home/learning/review-learn/review-learn.ts
View file @ 3e6720ef
......@@ -99,8 +99,12 @@ export class ReviewLearnPage {
arr.push(e);
}
});
if(arr.length == 0){
this.commonSer.toast("恭喜您获得满分，无错题！")
}else{
this.list = arr;
}
}
//纠错
sure(){
......
src/pages/tabs/home/home.html
View file @ 3e6720ef
......@@ -53,10 +53,12 @@
<label class="label2-2 more2-2 main-color">学习测试</label>
<img class="new-logo" *ngIf="hasNew.test==1" src="./assets/imgs/new.png">
</div>
<ng-container *ngIf="role == 3">
<div class="card" (click)="goTo('LearnManagePage')">
<img src="./assets/imgs/home/icon-ccgl.png" alt="">
<label class="label2-2 more2-2">测试管理</label>
</div>
</ng-container>
<div class="card" (click)="goTo('MoreAppPage')">
<img src="./assets/imgs/home/icon-more.png" alt="">
<label class="label2-2 more2-2">更多应用</label>
......
src/service/http.service.ts
View file @ 3e6720ef
......@@ -14,8 +14,8 @@ export class AppGlobal {
//接口基地址
// static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://180.168.156.212:2931"; //测试环境
static domain = ""; //本地环境
static domain = "http://180.168.156.212:2931"; //测试环境
// static domain = ""; //本地环境
//图片地址
......
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