Skip to content

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

纠错

parent f61d340f
Hide whitespace changes
Inline Side-by-side
Showing with 464 additions and 21 deletions
config.xml
View file @ ec3fe9a8
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>智汇19号</name>
<widget id="io.ionic.smart19.starter.test" version="4.0.8" 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>
<content src="index.html" />
......
src/app/app.component.ts
View file @ ec3fe9a8
......@@ -75,12 +75,10 @@ export class MyApp {
this.storage.set('user', data.data);
this.user.userid = data.data.id;
this.storage.set('userLoginInfo', this.user);
// return this.navCtrl.setRoot(TabsPage, { "user": this.user });
this.rootPage = TabsPage;
} else {
this.appService.alert('手机号或密码错误！');
this.rootPage = LoginPage;
// return this.navCtrl.setRoot(LoginPage);
}
}, error => {
this.rootPage = LoginPage;
......
src/app/app.scss
View file @ ec3fe9a8
@import "../theme/icon.scss";
html{
font-size: 15px;
}
p {
margin: 0;
}
......@@ -257,4 +260,7 @@ ion-icon {
.toast-message{
word-break: break-all;
}
.fontSize-15{
font-size: 1.5 rem;
}
\ No newline at end of file
src/pages/home/learning/learn.service.ts
View file @ ec3fe9a8
......@@ -34,5 +34,8 @@ export class LearnService{
return this.http.post(AppGlobal.domain+'/wisdomgroup/modules/learnTest/viewAnswerDetail',this.commonSer.toFormData(data));
}
//
//top5
getTop5(data): Observable<any>{
return this.http.get(AppGlobal.domain+'/wisdomgroup/modules/learnPcTest/top/' + data);
}
}
\ No newline at end of file
src/pages/home/learning/learning-do/learning-do.html
View file @ ec3fe9a8
......@@ -85,6 +85,9 @@
</div>
</ion-slide>
</ion-slides>
<div class=" button-error">
<button (click)="error = true;" class="submit-error">我要纠错</button>
</div>
</div>
<div class="footer-subject">
<div (click)="prev()" class="prev">上一题</div>
......@@ -97,4 +100,23 @@
<span>交卷</span>
</div>
</div>
<div class="error-text" *ngIf="error">
<div class="error-flex">
<div class="error-title">纠错内容</div>
<div class="padding-10">
<textarea [(ngModel)]="errorContent" class="content-textarea"></textarea>
</div>
<div class="error-footer">
<ion-row>
<ion-col col-6>
<button (click)="sure()" class="sure">确定</button>
</ion-col>
<ion-col col-6>
<button (click)="cancel()" class="cancel">取消</button>
</ion-col>
</ion-row>
</div>
</div>
</div>
</ion-content>
src/pages/home/learning/learning-do/learning-do.scss
View file @ ec3fe9a8
......@@ -18,6 +18,9 @@ page-learning-do {
left: 0;
z-index: 2;
}
ion-slides{
height: calc(100% - 4rem);
}
.swiper-slide, .slide-zoom {
text-align: left;
}
......@@ -144,4 +147,49 @@ page-learning-do {
color: #ffffff;
border: 1px solid #ec1826;
}
.submit-error{
height: 3rem;
width: 40%;
background-color: #5579bb;
color: #fff;
line-height: 3rem;
}
.button-error{
line-height: 4rem;
height: 4rem;
text-align: center;
margin-top: .5rem;
}
.error-text{
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
background-color: rgba(0,0,0,.2);
z-index: 9;
display: flex;
align-items: center;
justify-content: center;
.error-flex{
text-align: center;
width: 80%;
background-color: #fff;
.error-title{
background-color: #5579bb;
color: #ffffff;
padding: 1rem 0;
}
.error-footer{
height: 4rem;
.sure,.cancel{
color: #ffffff;
background-color: #5579bb;
width: 69%;
margin-right: 10px;
height: 3rem;
}
}
}
}
}
src/pages/home/learning/learning-do/learning-do.ts
View file @ ec3fe9a8
......@@ -28,6 +28,10 @@ export class LearningDoPage {
totalTime;
index = 0; //当前题目的序号
useTime = 0; //用时
error = false;
errorContent; //纠错内容
constructor(public navCtrl: NavController, public navParams: NavParams, private learnSer: LearnService, public commonSer: CommonService,
public toastCtrl: ToastController, public appService: AppService, public datePipe: DatePipe,public eventEmitSer:EmitService,
private nav:Nav) {
......@@ -154,6 +158,19 @@ export class LearningDoPage {
})
}
//纠错
sure(){
this.error = false;
console.log(this.list[this.index]);
console.log(this.errorContent);
// this.errorContent = "";
}
cancel(){
this.error = false;
this.errorContent = "";
}
submit() {
const data = {
listMap: this.list.map(e => {
......
src/pages/home/learning/learning-list/learning-list.html
View file @ ec3fe9a8
......@@ -32,18 +32,22 @@
<span *ngIf="item.testResult == 3" float-right class="yellow">等待评分</span>
</div>
</div>
<div class="content-button padding-15-0">
<div class="content-button padding-15-0 fontSize-15">
<span>参与人员:</span>
<span *ngIf="item.testObject">{{item.testObject}}</span>
<span *ngIf="item.testResult != 0" (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>
<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">
<span>重复测试：</span>
<span>允许</span>
<span float-right>最高分：100</span>
<span float-right>排名：1</span>
<div class="content-button padding-15-0 fontSize-15">
<span>排名:</span>
<span class="color-red">1</span>
<span (click)="goToRank(item)" float-right class="look">排行榜</span>
</div>
<div class="content-button padding-15-0 fontSize-15">
<span>重复测试:</span>
<span *ngIf="item.isRepeat == 1">允许</span>
<span *ngIf="item.isRepeat == 0">不允许</span>
<span float-right >最高分:100</span>
</div>
</div>
</ion-item>
......@@ -64,16 +68,28 @@
<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 padding-15-0 ">
<div class="item-header-style">
<span class="item-title">{{item.title}}</span>
<span float-right class="gray">未作答</span>
</div>
</div>
<div class="content-button padding-15-0">
<div class="content-button padding-15-0 fontSize-15">
<span>参与人员:</span>
<span *ngIf="item.testObject">{{item.testObject}}</span>
<span float-right class="join">测试</span>
<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>排名:</span>
<span class="color-red">1</span>
<span (click)="goToRank(item)" float-right class="look">排行榜</span>
</div>
<div class="content-button padding-15-0 fontSize-15">
<span>重复测试:</span>
<span *ngIf="item.isRepeat == 1">允许</span>
<span *ngIf="item.isRepeat == 0">不允许</span>
<span float-right >最高分:100</span>
</div>
</div>
</ion-item>
......@@ -101,10 +117,22 @@
<span float-right class="green">已完成</span>
</div>
</div>
<div class="content-button padding-15-0">
<div class="content-button padding-15-0 fontSize-15">
<span>参与人员:</span>
<span *ngIf="item.testObject">{{item.testObject}}</span>
<span float-right class="look">查看</span>
<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>排名:</span>
<span class="color-red">1</span>
<span (click)="goToRank(item)" float-right class="look">排行榜</span>
</div>
<div class="content-button padding-15-0 fontSize-15">
<span>重复测试:</span>
<span *ngIf="item.isRepeat == 1">允许</span>
<span *ngIf="item.isRepeat == 0">不允许</span>
<span float-right >最高分:100</span>
</div>
</div>
</ion-item>
......
src/pages/home/learning/learning-list/learning-list.scss
View file @ ec3fe9a8
......@@ -11,19 +11,24 @@ page-learning-list {
}
.content-button{
border-top: 1px solid #c8c7cc;
span{
vertical-align: middle;
}
}
.look{
background-color: #fcb164;
color: #fff;
padding: 1px 10px;
padding: 3px 10px;
font-size: 1.5rem;
border-radius: 2px;
margin-right: 10px;
}
.join{
background-color: #34b4fc;
color: #fff;
padding: 1px 10px;
padding: 3px 10px;
font-size: 1.5rem;
border-radius: 2px;
margin-right: 10px;
}
}
src/pages/home/learning/learning-list/learning-list.ts
View file @ ec3fe9a8
......@@ -139,6 +139,8 @@ export class LearningListPage {
}
goToRank(item){
this.navCtrl.push('RankPage')
this.navCtrl.push('RankPage',{
testId:item.testId
})
}
}
src/pages/home/learning/rank/rank.html 0 → 100644
View file @ ec3fe9a8
<ion-header>
<ion-navbar>
<ion-title>TOP5排行榜</ion-title>
</ion-navbar>
</ion-header>
<ion-content>
<div class="main-container">
<img class="bgc" src="../assets/imgs/learn/learning_background.png">
<div class="learn-item">
<div class="learn-title" (click)="root()">TOP5排行榜</div>
<div class="top-container">
<ion-grid>
<ion-row class="top-row">
<ion-col col-2>排名</ion-col>
<ion-col col-5>姓名</ion-col>
<ion-col col-5>分数</ion-col>
</ion-row>
<ion-row class="top-col" *ngFor="let item of list;let i = index;">
<ion-col col-2>
<img *ngIf="i == 0" src="../assets/imgs/learn/one.png">
<img *ngIf="i == 1" src="../assets/imgs/learn/two.png">
<img *ngIf="i == 2" src="../assets/imgs/learn/three.png">
<img *ngIf="i == 3" src="../assets/imgs/learn/four.png">
<img *ngIf="i == 4" src="../assets/imgs/learn/five.png">
</ion-col>
<ion-col col-5>{{item.name}}</ion-col>
<ion-col col-5>{{item.score}}</ion-col>
</ion-row>
</ion-grid>
<p class="tips">备注：分数相同的情况下，先交卷者排名在前</p>
</div>
</div>
</div>
</ion-content>
src/pages/home/learning/rank/rank.module.ts 0 → 100644
View file @ ec3fe9a8
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { RankPage } from './rank';
@NgModule({
declarations: [
RankPage,
],
imports: [
IonicPageModule.forChild(RankPage),
],
})
export class RankPageModule {}
src/pages/home/learning/rank/rank.scss 0 → 100644
View file @ ec3fe9a8
page-rank {
p {
margin: .5rem;
}
.main-container {
height: 100%;
background-color: #e6e8ed ;
}
.bgc{
position: absolute;
top: 0;
left: 0;
z-index: 0;
}
.learn-item {
height: 100%;
width: 100%;
position: absolute;
top: 0;
left: 0;
z-index: 2;
}
.swiper-slide, .slide-zoom {
text-align: left;
}
.swiper-slide {
justify-content: normal;
align-items: normal;
}
.learn-title {
margin-top: 5rem;
font-size: 4.3rem;
color: #577ab9;
text-align: center;
font-family: "Noto Sans CJK SC", "Source Han Sans CN";
padding: 1rem;
font-style: italic;
font-weight: bold;
text-shadow: 2px 2px #ccc;
}
.item-container {
background-color: #fff;
height: calc(100% - 7rem);
border-bottom-left-radius: .8rem;
border-bottom-right-radius: .8rem;
font-size: 1.5rem;
}
.item-title {
padding: 1rem;
font-size: 2rem;
span {
font-size: 3rem;
}
}
.item-content1 {
padding: 1rem;
}
.item-content2 {
padding: 1rem;
background-color: #f8f8f8;
border-top: 1px solid #dddddd;
border-bottom: 1px solid #dddddd;
color: #333333;
}
.footer-subject {
padding: 0 1rem;
position: absolute;
left: 0;
bottom: 3rem;
height: 5rem;
width: 100%;
background-color: #e6e8ed;
display: flex;
div {
line-height: 5rem;
}
.prev {
flex: 3;
}
.next {
flex: 3;
text-align: right;
}
.index {
flex: 1;
text-align: center;
}
}
.footer-submit {
position: absolute;
left: 0;
bottom: 0;
height: 3rem;
width: 100%;
border-top: .1rem solid #34b4fc;
display: flex;
div {
line-height: 3rem;
}
.time {
text-align: center;
flex: 4;
}
.submit {
background-color: #34b4fc;
color: #ffffff;
text-align: center;
flex: 1;
}
}
.icon-star {
font-size: 4.8rem;
ion-icon {
margin-right: 1rem;
}
.star-yellow {
color: #faba54;
}
.star-gray {
color: grey;
}
}
.submit-btn {
width: 35%;
background-color: #34b4fc;
margin: 10% 5%;
}
.top-container{
text-align: center;
padding: 1.5rem;
}
.top-row{
color: #577ab9;
font-size: 1.8rem;
}
.top-col{
background-color: #fff;
margin: .5rem;
height: 3rem;
line-height: 2rem;
font-size: 1.5rem;
border-radius: 4px;
img{
width: 2.5rem;
}
}
.tips{
position: absolute;
bottom: 3rem;
text-align: center;
color: #577ab9;
}
}
src/pages/home/learning/rank/rank.ts 0 → 100644
View file @ ec3fe9a8
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import {LearningListPage} from "../learning-list/learning-list";
import {LearnService} from "../learn.service";
@IonicPage()
@Component({
selector: 'page-rank',
templateUrl: 'rank.html',
})
export class RankPage {
list = [];
constructor(public navCtrl: NavController, public navParams: NavParams,
private learnSer:LearnService) {
}
ionViewDidLoad() {
const testId = this.navParams.get('testId');
this.learnSer.getTop5(testId).subscribe(
(res)=>{
this.list = res.top5;
}
)
console.log('ionViewDidLoad RankPage');
}
root(){
this.navCtrl.setRoot(LearningListPage)
console.log(this.navCtrl.getViews())
}
}
src/pages/home/learning/review-learn/review-learn.html
View file @ ec3fe9a8
......@@ -103,5 +103,23 @@
<span>只看错题</span>
</div>
</div>
<div class="error-text" *ngIf="error">
<div class="error-flex">
<div class="error-title">纠错内容</div>
<div class="padding-10">
<textarea [(ngModel)]="errorContent" class="content-textarea"></textarea>
</div>
<div class="error-footer">
<ion-row>
<ion-col col-6>
<button (click)="sure()" class="sure">确定</button>
</ion-col>
<ion-col col-6>
<button (click)="cancel()" class="cancel">取消</button>
</ion-col>
</ion-row>
</div>
</div>
</div>
</ion-content>
src/pages/home/learning/review-learn/review-learn.scss
View file @ ec3fe9a8
......@@ -196,4 +196,49 @@ page-review-learn {
width: 100%;
border: 1px solid #ddd;
}
.submit-error{
height: 3rem;
width: 40%;
background-color: #5579bb;
color: #fff;
line-height: 3rem;
}
.button-error{
line-height: 4rem;
height: 4rem;
text-align: center;
margin-top: .5rem;
}
.error-text{
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
background-color: rgba(0,0,0,.2);
z-index: 9;
display: flex;
align-items: center;
justify-content: center;
.error-flex{
text-align: center;
width: 80%;
background-color: #fff;
.error-title{
background-color: #5579bb;
color: #ffffff;
padding: 1rem 0;
}
.error-footer{
height: 4rem;
.sure,.cancel{
color: #ffffff;
background-color: #5579bb;
width: 69%;
margin-right: 10px;
height: 3rem;
}
}
}
}
}
src/pages/home/learning/review-learn/review-learn.ts
View file @ ec3fe9a8
......@@ -17,6 +17,8 @@ export class ReviewLearnPage {
list = [];
index = 0; //当前题目的序号
score; //得分
error;
errorContent;
constructor(public navCtrl: NavController, public navParams: NavParams,public learnSer:LearnService,
public toastCtrl:ToastController,public appService:AppService) {
}
......@@ -98,4 +100,17 @@ export class ReviewLearnPage {
});
this.list = arr;
}
//纠错
sure(){
this.error = false;
console.log(this.list[this.index]);
console.log(this.errorContent);
// this.errorContent = "";
}
cancel(){
this.error = false;
this.errorContent = "";
}
}
src/pages/tabs/notice/notice.html
View file @ ec3fe9a8
......@@ -26,7 +26,6 @@
<div class="type-time" style="width:30%;">{{item.sendTime | date:'yyyy-MM-dd' }}</div>
</div>
<div class="notice-content">
<!--今天是 <span class="notice-key">张豆豆</span>同志的生日，祝他生日快乐!-->
{{item.content}}
</div>
</div>
......
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