harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev

Browse Source
This commit is contained in:
lvyuankang 2024-09-18 17:05:20 +08:00
commit f46c7ecd8b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
entry/src/main/ets/pages/Judge.ets
View File

@ -613,7 +613,7 @@ struct Index {
Column() { Column() {
Row() { Row() {
Text(this.carztStr).fontColor('#FFA500').fontSize(this.FONTSIZE) Text(this.carztStr).fontColor('#FFA500').fontSize(this.FONTSIZE)
if (this.judgeConfigObj['342'] == 0) { if (this.judgeConfigObj['342'] == '0') {
Text(`${this.dw}挡`).fontColor('#FFA500').fontSize(this.FONTSIZE).padding({ left: 15, right: 15 }) Text(`${this.dw}挡`).fontColor('#FFA500').fontSize(this.FONTSIZE).padding({ left: 15, right: 15 })
Text(`${this.sd}km/h`).fontColor('#FFA500').fontSize(this.FONTSIZE) Text(`${this.sd}km/h`).fontColor('#FFA500').fontSize(this.FONTSIZE)
} }
@ -803,7 +803,7 @@ struct Index {
} }
Column() { Column() {
if (this.examSubject == 3 && this.judgeConfigObj['342'] == 0) { if (this.examSubject == 3 && this.judgeConfigObj['342'] == '0') {
Row() { Row() {
Row() { Row() {
} }
@ -872,7 +872,7 @@ struct Index {
//科目三人工扣分弹窗 //科目三人工扣分弹窗
if (this.isDeductedPopShow && this.examSubject == 3 && this.judgeConfigObj['342'] == 0) { if (this.isDeductedPopShow && this.examSubject == 3 && this.judgeConfigObj['342'] == '0') {
DeductedPopup({ DeductedPopup({
defaultTabIndex: this.defaultTabIndex, defaultTabIndex: this.defaultTabIndex,
currentItems: Reflect.ownKeys(this.projectsObj).map(projectKey => { currentItems: Reflect.ownKeys(this.projectsObj).map(projectKey => {
@ -1032,12 +1032,13 @@ struct Index {
} }
// 靠边停车时候可以触发 // 靠边停车时候可以触发
if (judgeConfigObj['343'] == 0) { if (judgeConfigObj['343'] === '0') {
const xmmcStr = this.xmmcStr; const xmmcStr = this.xmmcStr;
if (xmmcStr == '无' || xmmcStr == '') { if (xmmcStr == '无' || xmmcStr == '') {
//512[6] 人工项目按钮放大确认 //512[6] 人工项目按钮放大确认
const param512 = (judgeConfigObj['512'] || '').split(','); const param512 = (judgeConfigObj['512'] || '').split(',');
if(param512[6] != 0){ console.info('surenjun',param512)
if(param512[6] !== '0'){
this.amplifiedImgIndex = index; this.amplifiedImgIndex = index;
this.isAmplifyPopShow = true this.isAmplifyPopShow = true
}else{ }else{

1
entry/src/main/ets/pages/judgeSDK/judge.ts
View File

@ -152,7 +152,6 @@ export default class Judge {
const performInfo = JSON.parse(info) const performInfo = JSON.parse(info)
this.performInfo = performInfo this.performInfo = performInfo
this.judgeUI.jl = Math.floor((performInfo.qjjl + performInfo.dcjl) / 100) this.judgeUI.jl = Math.floor((performInfo.qjjl + performInfo.dcjl) / 100)
//TODO 待优化 跨组件传值不生效
globalThis.laneData = performInfo.lane; globalThis.laneData = performInfo.lane;
}) })