WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改UAT提出的优化点

Browse Source
This commit is contained in:
范强强
2023-07-05 14:45:36 +08:00
parent c0b33d0f6f
commit efb8bf9101
2 changed files with 81 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/phoneView/home.vue
+6 -1
View File
@@ -2,7 +2,7 @@
<div class="box">
<div class="box-header">
<div class="img-header">
<img src="~@/assets/logoOne.png" alt="">
<img src="~@/assets/Avatar.png" alt="">
</div>
</div>
<div class="name-header">
@@ -199,6 +199,10 @@
text-align: center;
}
.img-header img {
width: 100%;
}
.name-header {
font-size: 0.4rem;
font-family: PingFang SC-Medium, PingFang SC;
@@ -289,6 +293,7 @@
width: 1rem;
margin-right: 0.2rem;
}
::v-deep .van-tabbar {
height: 74px !important;
align-items: baseline;
jero-web/src/views/phoneView/toDoCenter.vue
+75 -15
View File
@@ -52,6 +52,11 @@
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('node')}}</span>
<span class="content-box-text">{{item.taskDefinitionKeyName || '--'}}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('cutoffTime')}}</span>
<span class="content-box-text-color" :class="isNew(item.endTime)">{{item.endTime || '--'}}</span>
</div>
<div v-if="item.flowType == '2' || item.flowType == '4' || item.flowType == '21'"></div>
<div class="content-box-right" v-else>
<img src="~@/assets/icon_single_screen.svg" alt="">
@@ -90,7 +95,11 @@
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('node')}}</span>
<span class="content-box-text">{{item.taskDefinitionKeyName || '--'}}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('cutoffTime')}}</span>
<span class="content-box-text-color" :class="isNew(item.endTime)">{{item.endTime || '--'}}</span>
</div>
<div v-if="item.flowType == '2' || item.flowType == '4' || item.flowType == '21'"></div>
<div class="content-box-right" v-else>
<img src="~@/assets/icon_single_screen.svg" alt="">
@@ -131,6 +140,11 @@
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('node')}}</span>
<span class="content-box-text">{{item.taskDefinitionKeyName || '--'}}</span>
</div>
<div class="content-box-type">
<span class="content-box-left"
:class="{'content-box-left-one':language == 'en-us' ? true : false}">{{$t('cutoffTime')}}</span>
<span class="content-box-text-color" :class="isNew(item.endTime)">{{item.endTime || '--'}}</span>
</div>
<div v-if="item.flowType == '2' || item.flowType == '4' || item.flowType == '21'"></div>
<div class="content-box-right" v-else>
<img src="~@/assets/icon_single_screen.svg" alt="">
@@ -171,9 +185,6 @@
@click="processClick('21')">
{{$t('preHomoFlow')}}
</div>
<!-- <van-checkbox name="2" shape="square">{{$t('designComplianceProcess')}}</van-checkbox>-->
<!-- <van-checkbox name="4" shape="square">{{$t('validationComplianceProcess')}}</van-checkbox>-->
<!-- <van-checkbox name="21" shape="square">{{$t('preHomoFlow')}}</van-checkbox>-->
</div>
</template>
</van-field>
@@ -183,9 +194,18 @@
:label="$t('cutoffTime')"
:placeholder="$t('clickAndSelect')">
<template #input>
<van-dropdown-menu class="cutoffTimeClass">
<van-dropdown-item v-model="form.selectModel" :options="columns"/>
</van-dropdown-menu>
<div class="checkboxGroup">
<div class="checkboxGroup-text"
v-for="(item,index) in columns"
:key="index"
:class="{'checkboxGroup-text-color':selectModelColor(item.value)}"
@click="selectModelClick(item.value)">
{{item.text}}
</div>
</div>
<!-- <van-dropdown-menu class="cutoffTimeClass">-->
<!-- <van-dropdown-item v-model="form.selectModel" :options="columns"/>-->
<!-- </van-dropdown-menu>-->
</template>
</van-field>
<!-- <van-popup v-model="showPicker" position="bottom">-->
@@ -228,10 +248,6 @@
show: false,
date: '',
columns: [
{
text: this.$t('pleaseSelect'),
value: '0'
},
{
text: this.$t('nearlyMonth'),
value: '1'
@@ -293,6 +309,7 @@
this.form.selectModel = this.$route.query.selectModel
}
this.form = { ...this.form }
// this.isNew('2023-06-01')
// this.toDoProcessPageNo = 1
// this.getToDoProcess()
},
@@ -459,7 +476,7 @@
toDoCenterClick(row, isTrue) {
let query = {}
let flowType = ''
if (this.form.flowType && this.form.flowType instanceof Array){
if (this.form.flowType && this.form.flowType instanceof Array) {
flowType = this.form.flowType.join(',')
}
row.taskId = row.taskId + ''
@@ -669,7 +686,9 @@
}
})
},
selectModelClick(value) {
this.form.selectModel = value
},
processClick(type) {
if (!this.form.flowType) {
this.form.flowType = []
@@ -701,6 +720,27 @@
}
}
return false
},
selectModelColor(value) {
if (this.form.selectModel == value) {
return true
}
return false
},
isNew(pubTime) {
if (pubTime != null && pubTime !== '' && pubTime !== undefined) {
pubTime = pubTime.replace(new RegExp(/-/gm), '/')
let currentTime = new Date().getTime()
let endTime = new Date(pubTime).getTime()
let numTime = endTime - currentTime
if (numTime < 30 * 24 * 3600 * 1000 && numTime > 0) {
return 'yellow'
} else if (numTime > 30 * 24 * 3600 * 1000) {
return 'green'
} else {
return 'red'
}
}
}
}
}
@@ -854,17 +894,24 @@
}
.content-box-left {
width: 1rem;
width: 1.46rem;
display: inline-block;
word-break: break-all;
}
.content-box-left-one {
width: 1.6rem;
width: 1.66rem;
}
.content-box-text {
margin-left: 0.3rem;
word-break: break-all;
}
.content-box-text-color {
margin-left: 0.3rem;
color: #00B3BE;
word-break: break-all;
}
.content-box-right {
@@ -1089,6 +1136,7 @@
background: #00B3BE;
color: #fff;
}
::v-deep .van-tabbar {
height: 74px !important;
align-items: baseline;
@@ -1097,4 +1145,16 @@
::v-deep .van-tabbar-item {
margin-top: 8px !important;
}
.yellow {
color: #fdd835;
}
.red {
color: red;
}
.green {
color: #00B3BE
}
</style>