Commit 8400f96a authored by wangqinghua's avatar wangqinghua

version-4.1.0

parent a8879c24
<?xml version='1.0' encoding='utf-8'?>
<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">
<widget id="io.ionic.smart19.starter.test" version="4.1.0" 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>
......
......@@ -7,7 +7,7 @@
"proxies": [
{
"path": "/wisdomgroup",
"proxyUrl": "http://10.10.202.8:8080/wisdomgroup"
"proxyUrl": "http://180.168.156.212:2931/wisdomgroup"
}
]
}
\ No newline at end of file
......@@ -10,7 +10,7 @@
<ion-content>
<div class="main-container">
<img class="bgc" src="../assets/imgs/learn/learning_background.png">
<img class="bgc" src="./assets/imgs/learn/learning_background.png">
<ion-slides (ionSlideDidChange)="slideChanged()">
<ion-slide *ngFor="let item of list;let i = index;">
<div class="learn-item">
......
......@@ -31,24 +31,25 @@
<span *ngIf="item.testResult == 2" float-right class="green">测试通过</span>
<span *ngIf="item.testResult == 3" float-right class="yellow">等待评分</span>
</div>
<div class="item-header-style" style="font-size: 1.4rem;margin-top: 5px;color: #666666">
<span>重复测试:</span>
<span *ngIf="item.isRepeat == 1">允许</span>
<span *ngIf="item.isRepeat == 0">不允许</span>
</div>
</div>
<div class="content-button padding-15-0 fontSize-15">
<span>参与人员:</span>
<span *ngIf="item.testObject">{{item.testObject}}</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>
<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 *ngIf="!item?.ranking"></span>
<span class="color-red">{{item.ranking}}</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 *ngIf="item?.maxNum" >最高分:{{item.maxNum}}</span>
<span class="margin-left-10">最高分:<span *ngIf="!item?.maxNum"></span>{{item.maxNum}}
</span>
<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>
</div>
</div>
</ion-item>
......@@ -69,28 +70,33 @@
<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>
<span *ngIf="item.testResult == 0" float-right class="gray">未完成</span>
<span *ngIf="item.testResult == 1" float-right class="red">测试未通过</span>
<span *ngIf="item.testResult == 2" float-right class="green">测试通过</span>
<span *ngIf="item.testResult == 3" float-right class="yellow">等待评分</span>
</div>
<div class="item-header-style" style="font-size: 1.4rem;margin-top: 5px;color: #666666">
<span>重复测试:</span>
<span *ngIf="item.isRepeat == 1">允许</span>
<span *ngIf="item.isRepeat == 0">不允许</span>
</div>
</div>
<div class="content-button padding-15-0 fontSize-15">
<span>参与人员:</span>
<span *ngIf="item.testObject">{{item.testObject}}</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>
<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 *ngIf="!item?.ranking"></span>
<span class="color-red">{{item.ranking}}</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 >最高分:{{item.maxNum}}</span>
<span class="margin-left-10">最高分:<span *ngIf="!item?.maxNum"></span>{{item.maxNum}}
</span>
<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>
</div>
</div>
</ion-item>
......@@ -115,25 +121,30 @@
<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.testResult == 0" float-right class="gray">未完成</span>
<span *ngIf="item.testResult == 1" float-right class="red">测试未通过</span>
<span *ngIf="item.testResult == 2" float-right class="green">测试通过</span>
<span *ngIf="item.testResult == 3" float-right class="yellow">等待评分</span>
</div>
<div class="item-header-style" style="font-size: 1.4rem;margin-top: 5px;color: #666666">
<span>重复测试:</span>
<span *ngIf="item.isRepeat == 1">允许</span>
<span *ngIf="item.isRepeat == 0">不允许</span>
</div>
</div>
<div class="content-button padding-15-0 fontSize-15">
<span>参与人员:</span>
<span *ngIf="item.testObject">{{item.testObject}}</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>
<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 *ngIf="!item?.ranking"></span>
<span class="color-red">{{item.ranking}}</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 >最高分:{{item.maxNum}}</span>
<span class="margin-left-10">最高分:<span *ngIf="!item?.maxNum"></span>{{item.maxNum}}
</span>
<span (click)="goToRank(item)" float-right class="look">TOP5排行榜</span>
</div>
</div>
</ion-item>
......
......@@ -7,7 +7,7 @@
<ion-content>
<div class="main-container">
<img class="bgc" src="../assets/imgs/learn/learning_background.png">
<img class="bgc" src="./assets/imgs/learn/learning_background.png">
<div class="learn-item">
<div class="learn-title">{{title}}</div>
<ng-container *ngIf="result?.markStatus == 0">
......
......@@ -6,7 +6,7 @@
<ion-content>
<div class="main-container">
<img class="bgc" src="../assets/imgs/learn/learning_background.png">
<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">
......@@ -18,13 +18,13 @@
</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">
<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.username}}</ion-col>
<ion-col col-5>{{item.score}}</ion-col>
</ion-row>
</ion-grid>
......
......@@ -142,7 +142,7 @@ page-rank {
font-size: 1.5rem;
border-radius: 4px;
img{
width: 2.5rem;
width: 2rem;
}
}
.tips{
......
......@@ -7,7 +7,7 @@
<ion-content>
<div class="main-container">
<img class="bgc" src="../assets/imgs/learn/learning_background.png">
<img class="bgc" src="./assets/imgs/learn/learning_background.png">
<ion-slides (ionSlideDidChange)="slideChanged()">
<ion-slide *ngFor="let item of list;let i = index">
<div class="learn-item">
......
......@@ -15,12 +15,14 @@
<div class="notice-card">
<div class="notice-type">
<div class="type-img">
<img *ngIf="item.type == 1" src="./assets/imgs/notice/notice-zbpb.png" alt="">
<img *ngIf="item.type == 2" src="./assets/imgs/notice/notice-rzzf.png" alt="">
<img *ngIf="item.type == 3" src="./assets/imgs/notice/notice-srzf.png" alt="">
<img *ngIf="item.type == 4" src="./assets/imgs/notice/notice-hdtx.png" alt="">
<img *ngIf="item.type == 5" src="./assets/imgs/notice/notice-wcbb.png" alt="">
<img *ngIf="item.type == 6" src="./assets/imgs/notice/notice-wjtc.png" alt="">
<img *ngIf="item.type == 1" src="./assets/imgs/notice/notice-zbpb.png" >
<img *ngIf="item.type == 2" src="./assets/imgs/notice/notice-rzzf.png" >
<img *ngIf="item.type == 3" src="./assets/imgs/notice/notice-srzf.png" >
<img *ngIf="item.type == 4" src="./assets/imgs/notice/notice-hdtx.png" >
<img *ngIf="item.type == 5" src="./assets/imgs/notice/notice-wcbb.png" >
<img *ngIf="item.type == 6" src="./assets/imgs/notice/notice-wjtc.png" >
<img *ngIf="item.type == 7" src="./assets/imgs/notice/notice-hdtx.png" >
<img *ngIf="item.type == 8" src="./assets/imgs/notice/notice-hdtx.png" >
</div>
<div class="type-info" style="width:50%;">{{item.title}}</div>
<div class="type-time" style="width:30%;">{{item.sendTime | date:'yyyy-MM-dd' }}</div>
......@@ -39,12 +41,14 @@
<div class="notice-card" >
<div class="notice-type">
<div class="type-img">
<img *ngIf="item.type == 1" src="./assets/imgs/notice/notice-zbpb.png" alt="">
<img *ngIf="item.type == 2" src="./assets/imgs/notice/notice-rzzf.png" alt="">
<img *ngIf="item.type == 3" src="./assets/imgs/notice/notice-srzf.png" alt="">
<img *ngIf="item.type == 4" src="./assets/imgs/notice/notice-hdtx.png" alt="">
<img *ngIf="item.type == 5" src="./assets/imgs/notice/notice-wcbb.png" alt="">
<img *ngIf="item.type == 6" src="./assets/imgs/notice/notice-wjtc.png" alt="">
<img *ngIf="item.type == 1" src="./assets/imgs/notice/notice-zbpb.png" >
<img *ngIf="item.type == 2" src="./assets/imgs/notice/notice-rzzf.png" >
<img *ngIf="item.type == 3" src="./assets/imgs/notice/notice-srzf.png" >
<img *ngIf="item.type == 4" src="./assets/imgs/notice/notice-hdtx.png" >
<img *ngIf="item.type == 5" src="./assets/imgs/notice/notice-wcbb.png" >
<img *ngIf="item.type == 6" src="./assets/imgs/notice/notice-wjtc.png" >
<img *ngIf="item.type == 7" src="./assets/imgs/notice/notice-hdtx.png" >
<img *ngIf="item.type == 8" src="./assets/imgs/notice/notice-hdtx.png" >
</div>
<div class="type-info" style="width:50%;">{{item.title}}</div>
<div class="type-time" style="width:30%;">{{item.sendTime | date:'yyyy-MM-dd' }}</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