测试管理

src/app/app.scss

-@import "../theme/icon.scss";
+@import "../theme/icon";
+@import "../theme/style";
 p {
   margin: 0;
 }

src/pages/home/learn-manage/learn-detail/learn-detail.html

@@ -14,41 +14,46 @@
             <div class="content-card">
                 <div class="flex-1">
                     <p>测试完成情况</p>
-            <p><span class="fontSize-2">3/</span>33</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">1/</span>33</p>
+                    <p><span class="fontSize-2">{{test.markNumber}}/</span>{{test.totalNumber}}</p>
                 </div>
             </div>
             <div class="content-card">
                 <div class="flex-1">
                     <p>优秀率</p>
-            <p class="fontSize-2">50%</p>
+                    <p class="fontSize-2">{{test.excellentRate}}</p>
                 </div>
                 <div class="flex-1">
                     <p>及格率</p>
-            <p class="fontSize-2">50%</p>
+                    <p class="fontSize-2">{{test.passRate}}</p>
                 </div>
                 <div class="flex-1">
                     <p>平均用时</p>
-            <p class="fontSize-2">40分钟</p>
+                    <p class="fontSize-2">{{test.avgUseTime | formatTime}}</p>
                 </div>
             </div>
             <div class="basic-info">
                 <div class="basic-title">基本信息</div>
                 <div class="basic-container">
-            <p>发布日期：<span class="color-666">2019-04-01</span></p>
-            <p>参与人员：<span class="color-666">人事处</span></p>
-            <p>时间限制：<span class="color-666">60分钟</span></p>
+                    <p>发布日期：<span class="color-666">{{test.publishTime | date:'yyyy-MM-dd HH:mm:ss'}}</span></p>
+                    <p>参与人员：<span class="color-666">{{test.testObject}}</span></p>
+                    <p>时间限制：<span class="color-666">{{test.timeLimit | formatTime}}</span></p>
                     <div class="basic-question">
                         <div class="question-left">题数与分值：</div>
                         <div class="question-right color-666">
+                            <ng-container *ngFor="let item of test.configs">
                                 <p>判断题 4 每题10分</p>
-                <p>单选题 4 每题10分</p>
-                <p>多选题 4 每题10分</p>
-                <p>填空题 4 每题10分</p>
-                <p>问答题 4 每题10分</p>
+                                <p>
+                                    <span *ngIf="item.questionType == 1">单选题 </span>
+                                    <span *ngIf="item.questionType == 2">多选题 </span>
+                                    <span *ngIf="item.questionType == 3">填空题 </span>
+                                    <span *ngIf="item.questionType == 4">判断题 </span>
+                                    <span *ngIf="item.questionType == 5">问答题 </span>
+                                    {{item.questionCount}} 每题 {{item.singleQuestionScore}} 分</p>
+                            </ng-container>
                         </div>
                     </div>
                 </div>

src/pages/home/learn-manage/learn-detail/learn-detail.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {ReadLearnPage} from "../read-learn/read-learn";
+import {LearnManageService} from "../learnManage.service";
 
 
 @IonicPage()
@@ -10,11 +11,22 @@ import {ReadLearnPage} from "../read-learn/read-learn";
 })
 export class LearnDetailPage {
 
-    constructor(public navCtrl: NavController, public navParams: NavParams) {
+    testId;
+    test;
+    constructor(public navCtrl: NavController, public navParams: NavParams,
+                public learnManageSer:LearnManageService) {
     }
 
     ionViewDidLoad() {
-        console.log('ionViewDidLoad LearnDetailPage');
+        this.testId = this.navParams.get('testId');
+        const data = {
+            testId:this.testId
+        }
+        this.learnManageSer.getDetail(data).subscribe(
+            (res)=>{
+                this.test = res.data;
+            }
+        )
     }
 
     //批阅试卷

src/pages/home/learn-manage/learn-manage/learn-manage.html

@@ -12,10 +12,10 @@
 
 <ion-content class="bgc-e7e8ed">
   <ion-refresher (ionRefresh)="doRefresh($event)">
-    <ion-refresher-content pullingText="下拉刷新"
-                           pullingIcon="arrow-dropdown"
-                           refreshingSpinner="bubbles">
-    </ion-refresher-content>
+    <!--<ion-refresher-content pullingText="下拉刷新"-->
+                           <!--pullingIcon="arrow-dropdown"-->
+                           <!--refreshingSpinner="bubbles">-->
+    <!--</ion-refresher-content>-->
   </ion-refresher>
   <ng-container *ngIf="link">
     <ng-container *ngIf="index == 0">
@@ -27,18 +27,15 @@
                 <div class="item-header padding-15-0">
                   <div class="item-header-style">
                     <span class="item-title">{{item.title}}</span>
-                    <span *ngIf="item.status == 1" float-right class="gray">未完成</span>
-                    <span *ngIf="item.status == 2" float-right class="green">测试通过</span>
-                    <span *ngIf="item.status == 3" float-right class="yellow">等待评分</span>
-                    <span *ngIf="item.status == 4" float-right class="red">测试未通过</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>参与人员:</span>
-                  <span *ngIf="item.groupName">{{item.groupName}}</span>
-                  <span *ngIf="!item.groupName">全体人员</span>
-                  <span *ngIf="item.status != 1" float-right class="look">查看</span>
-                  <span *ngIf="item.status == 1"  float-right class="join">测试</span>
+                  <span>参与人员:{{item.testStatus}}</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>

src/pages/home/learn-manage/learn-manage/learn-manage.ts

 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {IonicPage, NavController, NavParams, Slides} from 'ionic-angular';
 import {LearnDetailPage} from "../learn-detail/learn-detail";
+import {LearnManageService} from "../learnManage.service";
+import {DatePipe} from "@angular/common";
 
 @IonicPage()
 @Component({
@@ -13,7 +15,7 @@ export class LearnManagePage {
     @ViewChild('tips') tips:ElementRef;
 
     index = 0;
-    link = true;
+    link = false;
     tabsList = [
         {name:"全部",},
         {name:"待发布",},
@@ -23,18 +25,12 @@ export class LearnManagePage {
     noList = [];    //待发布
     doList = [];    //已发布
     edList = [];   //已过期
-    list = [
-        {title:'党组织文章测试1',groupName:'全体人员',status:'1'},
-        {title:'党组织文章测试2',groupName:'全体人员',status:'1'},
-        {title:'党组织文章测试3',groupName:'全体人员',status:'2'},
-        {title:'党组织文章测试4',groupName:'全体人员',status:'2'},
-        {title:'党组织文章测试5',groupName:'全体人员',status:'3'},
-        {title:'党组织文章测试6',groupName:'全体人员',status:'3'},
-        {title:'党组织文章测试7',groupName:'全体人员',status:'4'},
-        {title:'党组织文章测试8',groupName:'全体人员',status:'4'},
-    ];
+    list = [];
 
-    constructor(public navCtrl: NavController, public navParams: NavParams) {
+    pageNumber = 1;
+    pageSize = 250;
+    constructor(public navCtrl: NavController, public navParams: NavParams,
+                public learnManageSer:LearnManageService,public datePipe:DatePipe) {
     }
 
     ionViewDidLoad() {
@@ -44,11 +40,22 @@ export class LearnManagePage {
     }
 
     getList(){
-        this.list.forEach(e=>{
-            if(e.status === '1') this.noList.push(e);
-            if(e.status === '2') this.doList.push(e);
-            if(e.status === '3') this.edList.push(e);
-        })
+        const nowDate = this.datePipe.transform(new Date(), 'yyyy/MM/dd HH:mm:ss')
+        const data = {
+            pageNumber:this.pageNumber,
+            pageSize:this.pageSize,
+            selectType:'0',   //全部状态
+            queryTime:nowDate,
+        };
+        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.link = true;
+            }
+        )
     }
 
     change(index) {
@@ -70,7 +77,9 @@ export class LearnManagePage {
     }
 
     goToResult(item){
-        this.navCtrl.push("LearnDetailPage")
+        this.navCtrl.push("LearnDetailPage",{
+            testId:item.testId
+        })
     }
 
 

src/pages/home/learn-manage/learnManage.service.ts

@@ -2,17 +2,19 @@ import {HttpClient} from "@angular/common/http";
 import {Injectable} from "@angular/core";
 import {Observable} from "rxjs/Observable";
 import {AppGlobal} from "../../../service/http.service";
+import {CommonService} from "../../../provide/common.service";
 
 @Injectable()
 export class LearnManageService{
 
-    constructor(private http:HttpClient){}
+    constructor(private http:HttpClient,private commonSer:CommonService){}
 
+    //批阅列表
     getLearnTestList(data): Observable<any>{
-        return this.http.post(AppGlobal.domain+'//wisdomgroup/modules/learnTest/getLearnTestList',data)
+        return this.http.post(AppGlobal.domain+'/wisdomgroup//modules/testManage/getLearnTestList',this.commonSer.toFormData(data))
     }
 
-    startTest(data): Observable<any>{
-        return this.http.post(AppGlobal.domain+'//wisdomgroup/modules/learnTest/startTest',data)
+    getDetail(data): Observable<any>{
+        return this.http.post(AppGlobal.domain+'/wisdomgroup//modules/testManage/getDetail',this.commonSer.toFormData(data))
     }
 }
\ No newline at end of file

src/pages/home/learning/learning-list/learning-list.ts

@@ -26,7 +26,7 @@ export class LearningListPage {
     list = [];  //全部测试
     link = false;   //是否请求完成
     pageNumber = 1;   //页码
-    pageSize = 25;   //每页显示条数
+    pageSize = 250;   //每页显示条数
 
     constructor(public navCtrl: NavController, public navParams: NavParams,public tabSer:TabsService,
                 public learnSer: LearnService, public datePipe: DatePipe,public commonSer:CommonService,

src/pages/tabs/home/home.html

@@ -50,21 +50,21 @@
             </div>
             <div class="card" (click)="goTo('LearningListPage')">
                 <img src="./assets/imgs/home/icon-xxcs.png" alt="">
-                <label class="label2-2 more2-2">学习测试</label>
+                <label class="label2-2 more2-2 main-color">学习测试</label>
                 <img class="new-logo" *ngIf="hasNew.test==1" src="./assets/imgs/new.png">
             </div>
-            <!--<div class="card" (click)="goTo('LearnManagePage')">-->
-                <!--<img src="./assets/imgs/home/icon-ccgl.png" alt="">-->
-                <!--<label class="label2-2 more2-2">测试管理</label>-->
-            <!--</div>-->
+            <div class="card" (click)="goTo('LearnManagePage')">
+                <img src="./assets/imgs/home/icon-ccgl.png" alt="">
+                <label class="label2-2 more2-2">测试管理</label>
+            </div>
             <div class="card" (click)="goTo('MoreAppPage')">
                 <img src="./assets/imgs/home/icon-more.png" alt="">
                 <label class="label2-2 more2-2">更多应用</label>
             </div>
-            <div class="card" (click)="readBook()">
-                <img src="./assets/imgs/home/icon-more.png" alt="">
-                <label class="label2-2 more2-2">阅读</label>
-            </div>
+            <!--<div class="card" (click)="readBook()">-->
+                <!--<img src="./assets/imgs/home/icon-more.png" alt="">-->
+                <!--<label class="label2-2 more2-2">阅读</label>-->
+            <!--</div>-->
         </div>
     </div>
     <div class="item3" style="padding-top: 0px;">

src/pipes/format-time/format-time.ts

@@ -6,6 +6,7 @@ import {Pipe, PipeTransform} from '@angular/core';
 export class FormatTimePipe implements PipeTransform {
     /**
      * 将秒转化为时分秒
+     * value   秒
      */
     transform(value, ...args) {
         let hourse = (Math.floor(value / 3600)).toString();

src/service/http.service.ts

@@ -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 = "";   //本地环境
 
 
     //图片地址

src/theme/icon.scss

@@ -24,7 +24,6 @@
 .tab-button-text{
     margin-top: 0 !important;
 }
-$main-colo:#e12724;
 
 .color-333{color: #333;}
 .color-666{color: #666;}

src/theme/style.scss

+.main-color{
+  color: color($colors,danger);
+}
\ No newline at end of file