feat：评判更新
This commit is contained in:
parent
68821fa208
commit
65b80bb0fb
@ -294,13 +294,17 @@ struct Index {
|
||||
this.projectsObj[no2*1] = currentProject
|
||||
this.projectsCenterObj[txt2] = currentProject
|
||||
this.projects.push(currentProject);
|
||||
console.info('surenjun txt2=>',txt2)
|
||||
//真实监管下发考试项目
|
||||
if(isInExam && !kStringArr.includes(txt2)){
|
||||
this.projectsObj[no2*1].type = '3'
|
||||
|
||||
// this.ddxkKsxmArr.push(txt2)
|
||||
this.projectsObj[no2*1].isUpload = true
|
||||
this.projectsObj[no2*1].isEnd = true
|
||||
this.isDdxk = true
|
||||
this.ddxkKsxmArr.push(txt2)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
this.systemparmArr.push({
|
||||
'NO1': no1 * 1,
|
||||
'NO2': no2 * 1,
|
||||
@ -311,6 +315,8 @@ struct Index {
|
||||
})
|
||||
})
|
||||
const projects = this.projects;
|
||||
console.info('surenjun',JSON.stringify(this.ddxkKsxmArr))
|
||||
|
||||
if (!projects.length) {
|
||||
Prompt.showToast({
|
||||
message: '读取数据库信息失败，请重新联网更新！',
|
||||
@ -1163,8 +1169,8 @@ struct Index {
|
||||
//科目类型
|
||||
@State examSubject: 2 | 3 = 3;
|
||||
@State ddxkTime: number = 0;
|
||||
@State ddxkKsxmArr: string[] = ['']
|
||||
@State ddxkKfArr: string[] = ['']
|
||||
@State ddxkKsxmArr: string[] = []
|
||||
@State ddxkKfArr: string[] = []
|
||||
@State xmmcStr: string = ''
|
||||
@State carztStr: string = ''
|
||||
@State kfArr: {
|
||||
|
||||
@ -98,8 +98,6 @@ export default struct Index {
|
||||
sczb,
|
||||
kfdm,
|
||||
wayno,
|
||||
//TODO 真实监管项目
|
||||
// kString:'40200,40300,40400,40500,40700,41000,41100,41200,41300,41400,40600,41500,41700,40400,40800,40900'
|
||||
}
|
||||
}, router.RouterMode.Single);
|
||||
|
||||
|
||||
@ -609,8 +609,9 @@ struct UserInfo {
|
||||
const avPlayer = this.avPlayer;
|
||||
this.isLoadingPopupVisible = true
|
||||
avPlayer.playAudio([`voice/监管通信中.mp3`], false, async () => {
|
||||
//TODO 模拟
|
||||
console.info('surenjun','播放结束开始考试接口调用')
|
||||
const {code,keystr,message} = await this.beginExam();
|
||||
console.info('surenjun','开始考试接口调用结束')
|
||||
//@ts-ignore TODO code转换
|
||||
if (code == '' && code == undefined) {
|
||||
promptAction.showToast({
|
||||
|
||||
@ -10,6 +10,8 @@ export interface Project {
|
||||
//项目状态：未做 正在做 及格 不及格
|
||||
type?: '1' | '2' | '3' | '4'
|
||||
//
|
||||
isEnd:boolean,
|
||||
isUpload:boolean
|
||||
}
|
||||
|
||||
export interface MarkRule {
|
||||
@ -207,5 +209,3 @@ export interface LANE {
|
||||
export interface ProjectObj {
|
||||
[k: string]: Project
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -266,7 +266,8 @@ export default class Judge {
|
||||
//断点续考
|
||||
ddxk: isDdxk ? 1 : 0,
|
||||
ddkssj: ddxkTime || 0,
|
||||
ykxm: isDdxk ? (ddxkKsxmArr?.map(projectCenterCode => (projectsCenterObj[projectCenterCode]?.projectCode) * 1)) : [],
|
||||
ykxm: isDdxk
|
||||
? (ddxkKsxmArr?.map(projectCenterCode => (projectsCenterObj[projectCenterCode]?.projectCode) * 1)) : [],
|
||||
kfxm: isDdxk ? (ddxkKfArr?.map(kf => {
|
||||
const [xmdm, kfdm] = kf.split(',')
|
||||
return {
|
||||
|
||||
@ -153,7 +153,7 @@ export function getKmProjectCancelVoice(projectCode){
|
||||
}
|
||||
// 上传监管数据code转换
|
||||
export function promptWxCode(
|
||||
jkid:'17C52' | '17C54' |'17C55' | '17C53' | '17C56',
|
||||
jkid:'17C51'|'17C52' | '17C54' |'17C55' | '17C53' | '17C56',
|
||||
code:number
|
||||
){
|
||||
let toast = '';
|
||||
@ -163,6 +163,21 @@ export function promptWxCode(
|
||||
return
|
||||
}
|
||||
switch (jkid){
|
||||
//考试开始
|
||||
case '17C51':
|
||||
switch (code){
|
||||
case -1:toast = '无预约信息';break;
|
||||
case -2:toast = '约考不是今天';break;
|
||||
case -2:toast = '已满当天允许考试次数';break;
|
||||
case -2:toast = '考生身份不合法';break;
|
||||
case -2:toast = '科目考试系统不合法';break;
|
||||
case -2:toast = '无考生分组信息';break;
|
||||
case -2:toast = '分组考官和考生不四配';break;
|
||||
case -8:toast = '考场信息合法';break;
|
||||
case -9:toast = '考试员信息不合法';break;
|
||||
case -10:toast = '科目考试系统时间不合法';break;
|
||||
case -90:toast = '已进行了考试身份验证，无需重复验证!';break;
|
||||
}
|
||||
|
||||
//项目开始
|
||||
case '17C52':
|
||||
@ -419,25 +434,25 @@ export function sendRed(){
|
||||
}
|
||||
|
||||
export const defaultJudgeConfigObj = {
|
||||
//结束考试方式 0-不合格继续 1-考试不合格报靠边停车 2-不合格不报靠边 3-训练不合格报靠边 4-自动退出 5-不合格自动退出
|
||||
//结束考试方式 0-不合格继续 1-考试不合格报靠边停车 2-不合格不报靠边 3-训练不合格报靠边 4-自动退出 5-不合格自动退出
|
||||
302:'5',
|
||||
332:'',
|
||||
//是否能进行人工操作 0-不能人工评判 1-不能人工进项目 3-都不能
|
||||
//是否能进行人工操作 0-不能人工评判 1-不能人工进项目 3-都不能
|
||||
342:'',
|
||||
//有项目未结束时可以靠边停车 0-否 1-是
|
||||
//有项目未结束时可以靠边停车 0-否 1-是
|
||||
343:'1',
|
||||
//考试未结束且有扣分，是否可以退出
|
||||
//考试未结束且有扣分，是否可以退出
|
||||
344:'0',
|
||||
//直线行驶中是否可以进其它项目 0-否 1-是
|
||||
//直线行驶中是否可以进其它项目 0-否 1-是
|
||||
348:'0',
|
||||
//车上是否能点结束考试 0:否 1:是
|
||||
//车上是否能点结束考试 0:否 1:是
|
||||
353:'0',
|
||||
//是否启动断电续考 0:否 1:是
|
||||
//是否启动断电续考 0:否 1:是
|
||||
369:'1',
|
||||
//是否显示应考里程
|
||||
//是否显示应考里程
|
||||
375:'0',
|
||||
//里程不够允许手工点靠边停车
|
||||
//里程不够允许手工点靠边停车
|
||||
387:'0',
|
||||
//监管模式有扣分续考（0-否++1-是+把上次未考完的扣分带下来重新考试）
|
||||
//监管模式有扣分续考（0-否++1-是+把上次未考完的扣分带下来重新考试）
|
||||
432:'1'
|
||||
}
|
||||
@ -101,6 +101,7 @@ class AVPlayer {
|
||||
})
|
||||
return new Promise(async (resolve)=>{
|
||||
audioPlayer.on('finish', () => {
|
||||
console.info(TAG,'audioPlayer => 播放资源播放')
|
||||
//@ts-ignore
|
||||
this.voiceStatus = 'completed'
|
||||
if(callback){
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user