From efb8bf91017021c1caf7a48d2d21bb4ca146e220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 5 Jul 2023 14:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/phoneView/home.vue       |  7 +-
 jero-web/src/views/phoneView/toDoCenter.vue | 90 +++++++++++++++++----
 2 files changed, 81 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/views/phoneView/home.vue b/jero-web/src/views/phoneView/home.vue
index a7faa4e30..59f0f49b4 100644
--- a/jero-web/src/views/phoneView/home.vue
+++ b/jero-web/src/views/phoneView/home.vue
@@ -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;
diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue
index fa9161981..13f2dcc6f 100644
--- a/jero-web/src/views/phoneView/toDoCenter.vue
+++ b/jero-web/src/views/phoneView/toDoCenter.vue
@@ -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>
\ No newline at end of file