Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/components/MoreFilters/src/components/SelectValue.vue

@@ -120,7 +120,7 @@ const TransportSearch = (visible: any) => {
       </div>
       <template #dropdown>
         <div class="dropdownwidth">
-          <div class="title">{{ Title }} {{ checkAll }}</div>
+          <div class="title">{{ Title }}</div>
           <el-dropdown-menu>
             <el-dropdown-item>
               <el-checkbox v-model="checkAll" class="checkbox" @change="handleCheckAllChange">

src/components/ScoringGrade/src/ScoringGrade.vue

@@ -100,30 +100,35 @@ const showScore = (item: any) => {
     isLoaded.value = true
     dialogcontent.value = item.itemtext
     if (item.expression == 'angry') {
+      SubmitText.value = 'Apologize once again for your experience.'
       checkexpression.value = 'angry'
       setTimeout(() => {
         isShowAngry.value = true
         angryproposal.value = item.proposal
       }, 1000)
     } else if (item.expression == 'sad') {
+      SubmitText.value = 'Apologize once again for your experience.'
       checkexpression.value = 'sad'
       setTimeout(() => {
         isShowAngry.value = true
         angryproposal.value = item.proposal
       }, 1000)
     } else if (item.expression == 'smile') {
+      SubmitText.value = 'We greatly appreciate your valuable time and feedback.'
       checkexpression.value = 'smile'
       setTimeout(() => {
         isShowSmile.value = true
         smileproposal.value = item.proposal
       }, 1000)
     } else if (item.expression == 'hhh') {
+      SubmitText.value = 'Once again, thank you for your positive evaluation.'
       checkexpression.value = 'hhh'
       setTimeout(() => {
         isShowHappy.value = true
         angryproposal.value = item.proposal
       }, 1000)
     } else if (item.expression == 'happy') {
+      SubmitText.value = 'Once again, thank you for your positive evaluation.'
       checkexpression.value = 'happy'
       setTimeout(() => {
         isShowHappy.value = true
@@ -208,6 +213,10 @@ const submitDetails = (val: any) => {
         if (res.code == 200) {
           isshowDetails.value = false
           isshowDetails_submit.value = true
+          setTimeout(() => {
+            isshowDetails_submit.value = false
+            dialogVisible.value = false
+          }, 3000)
         }
       })
   } else if (happyCheckbox.value.length) {
@@ -221,6 +230,10 @@ const submitDetails = (val: any) => {
         if (res.code == 200) {
           isshowDetails.value = false
           isshowDetails_submit.value = true
+          setTimeout(() => {
+            isshowDetails_submit.value = false
+            dialogVisible.value = false
+          }, 3000)
         }
       })
   } else {
@@ -240,6 +253,10 @@ const submitDetails = (val: any) => {
         if (res.code == 200) {
           isshowDetails.value = false
           isshowDetails_submit.value = true
+          setTimeout(() => {
+            isshowDetails_submit.value = false
+            dialogVisible.value = false
+          }, 3000)
         }
       })
   }
@@ -250,6 +267,7 @@ const mouseenter = (item: any) => {
 const mouseout = (item: any) => {
   item.src = item.src1
 }
+const SubmitText = ref()
 </script>
 <template>
   <div class="scoring">
@@ -356,7 +374,7 @@ const mouseout = (item: any) => {
           <el-image :src="submitsucessful" />
         </template>
         <template #sub-title>
-          <div class="sub_title_text">Apologize once again for your experience.</div>
+          <div class="sub_title_text">{{ SubmitText }}</div>
           <div class="sub_title_text">
             We are committed to working hard to provide better services.
           </div>

src/styles/elementui.scss

@@ -602,12 +602,30 @@ div .scoreDialog header.el-dialog__header {
     rgba(255, 255, 255)
   );
   position: fixed;
-  width: 632px;
+  width: 640px;
   height: 48px;
+  border-radius: 6px 6px 0 0;
 }
 div .scoreDialog .el-dialog__body {
   margin-top: 40px;
 }
+div .scoreDialog2 header.el-dialog__header {
+  background: linear-gradient(
+    251deg,
+    rgba(255, 255, 255),
+    rgba(255, 244, 235) 22.66%,
+    rgba(240, 243, 255) 44.57%,
+    rgba(224, 247, 249) 80.46%,
+    rgba(255, 255, 255)
+  );
+  position: fixed;
+  width: 640px;
+  border-radius: 6px 6px 0 0;
+  height: 48px;
+}
+div .scoreDialog2 .el-dialog__body {
+  margin-top: 40px;
+}
 
 div .el-textarea__inner:hover {
   box-shadow: 0 0 0 1px var(--color-theme);

src/views/Booking/src/BookingView.vue

@@ -105,14 +105,14 @@ const DateRangeSearch = (val: any, value: any) => {
   }
   for (const key in value) {
     if (key == 'ETD') {
-      searchTableQeury.f_etd_start = value[key].data[0]
-      searchTableQeury.f_etd_end = value[key].data[1]
+      searchTableQeury.f_etd_start = value[key][0]
+      searchTableQeury.f_etd_end = value[key][1]
     } else if (key == 'ETA') {
-      searchTableQeury.m_eta_start = value[key].data[0]
-      searchTableQeury.m_eta_end = value[key].data[1]
+      searchTableQeury.m_eta_start = value[key][0]
+      searchTableQeury.m_eta_end = value[key][1]
     } else {
-      searchTableQeury.created_time_start = value[key].data[0]
-      searchTableQeury.created_time_end = value[key].data[1]
+      searchTableQeury.created_time_start = value[key][0]
+      searchTableQeury.created_time_end = value[key][1]
     }
   }
   BookingTable_ref.value.searchTableData(searchTableQeury)

src/views/Dashboard/src/DashboardView.vue

@@ -357,7 +357,7 @@ const SaveFilters = () => {
   $api
     .SaveLayout({
       management: Management.value,
-      ...dashboardObj
+      dashboardObj
     })
     .then((res: any) => {
       if (res.code == 200) {
@@ -660,7 +660,11 @@ const ClickParams = (val: any) => {
           :popper-style="{ display: 'flex', flexDirection: 'column', alignItems: 'center' }"
         >
           <template #reference>
-            <el-button class="el-button--default" @click="SaveVisible = !SaveVisible">
+            <el-button
+              class="el-button--default"
+              @blur="SaveVisible = false"
+              @click="SaveVisible = !SaveVisible"
+            >
               <span class="iconfont_icon">
                 <svg class="iconfont" aria-hidden="true">
                   <use xlink:href="#icon-icon_save_b"></use>

src/views/Dashboard/src/components/RecentStatus.vue

@@ -35,7 +35,7 @@ const RouteToDetail = (val: any) => {
 }
 const formatDate = (date: string) => {
   if (date != '') {
-    return dayjs(date).format('MMM/DD/YYYY')
+    return dayjs(date).format('MMM-DD-YYYY  HH:mm [(GMT]Z[)]')
   } else {
     return ''
   }
@@ -130,7 +130,7 @@ const formatDate = (date: string) => {
         <VTag :type="item.type" style="margin-bottom: 4px">{{ item.type }}</VTag>
         <div class="right_text">{{ item.Arrived }}</div>
         <div class="startStation_time">
-          {{ formatDate(item.Time) }}&nbsp;&nbsp;{{ item.act_time }}&nbsp;&nbsp;{{ item.timezone }}
+          {{ formatDate(item.Time) }}&nbsp;&nbsp;{{ item.timezone }}
         </div>
       </div>
     </div>

src/views/Dashboard/src/components/ScoringSystem.vue

@@ -10,6 +10,7 @@ import hhhPng from '../image/score_hhh.png'
 import hhhPng2 from '../image/hhh_2.png'
 import happyPng from '../image/score_happy.png'
 import happyPng2 from '../image/happy_2.png'
+import submitsucessful from '../image/submit_successful.png'
 const dialogVisible = ref(false)
 const innerVisible = ref(false)
 const isShowAngry = ref(false)
@@ -19,6 +20,7 @@ const isshowDetails_submit = ref(false)
 const buttonDisabled = ref(true)
 const isshowDetails = ref(true)
 const isShowScoring = ref(true)
+const SubmitText = ref()
 interface AvaterItem {
   src: string
   src1: string
@@ -166,18 +168,23 @@ const OpenScoring = (item: any) => {
   InnerTitle.value = item.itemtext
   InnerTileQues.value = item.proposal
   if (item.expression == 'angry') {
+    SubmitText.value = 'Apologize once again for your experience.'
     checkexpression.value = 'angry'
     isShowAngry.value = true
   } else if (item.expression == 'sad') {
+    SubmitText.value = 'Apologize once again for your experience.'
     checkexpression.value = 'sad'
     isShowAngry.value = true
   } else if (item.expression == 'smile') {
+    SubmitText.value = 'We greatly appreciate your valuable time and feedback.'
     checkexpression.value = 'smile'
     isShowSmile.value = true
   } else if (item.expression == 'hhh') {
+    SubmitText.value = 'Once again, thank you for your positive evaluation.'
     checkexpression.value = 'hhh'
     isShowHappy.value = true
   } else if (item.expression == 'happy') {
+    SubmitText.value = 'Once again, thank you for your positive evaluation.'
     checkexpression.value = 'happy'
     isShowHappy.value = true
   }
@@ -222,6 +229,11 @@ const submitDetails = (val: any) => {
         if (res.code == 200) {
           isshowDetails_submit.value = true
           isshowDetails.value = false
+          setTimeout(() => {
+            isshowDetails_submit.value = false
+            innerVisible.value = false
+            dialogVisible.value = false
+          }, 3000)
         }
       })
   } else if (checkboxGroup2.value.length) {
@@ -235,6 +247,11 @@ const submitDetails = (val: any) => {
         if (res.code == 200) {
           isshowDetails_submit.value = true
           isshowDetails.value = false
+          setTimeout(() => {
+            isshowDetails_submit.value = false
+            innerVisible.value = false
+            dialogVisible.value = false
+          }, 3000)
         }
       })
   } else {
@@ -248,6 +265,11 @@ const submitDetails = (val: any) => {
         if (res.code == 200) {
           isshowDetails_submit.value = true
           isshowDetails.value = false
+          setTimeout(() => {
+            isshowDetails_submit.value = false
+            innerVisible.value = false
+            dialogVisible.value = false
+          }, 3000)
         }
       })
   }
@@ -265,6 +287,7 @@ const submitDetails = (val: any) => {
         :destroy-on-close="true"
         width="640"
         :modal="false"
+        class="scoreDialog2"
         custom-class="my-dialog"
         :close-on-click-modal="false"
       >
@@ -289,6 +312,7 @@ const submitDetails = (val: any) => {
         v-model="innerVisible"
         width="640"
         :modal="false"
+        class="scoreDialog2"
         :destroy-on-close="true"
         @close="closeDialog"
       >
@@ -389,10 +413,10 @@ const submitDetails = (val: any) => {
           title="Submit Successful"
         >
           <template #icon>
-            <el-image src="../image/submit_successful.png" />
+            <el-image :src="submitsucessful" />
           </template>
           <template #sub-title>
-            <div class="sub_title_text">Apologize once again for your experience.</div>
+            <div class="sub_title_text">{{ SubmitText }}</div>
             <div class="sub_title_text">
               We are committed to working hard to provide better services.
             </div>

src/views/Tracking/src/TrackingView.vue

@@ -133,14 +133,14 @@ const DateRangeSearch = (val: any, value: any) => {
   }
   for (const key in value) {
     if (key == 'ETD') {
-      searchTableQeury.etd_start = value[key].data[0]
-      searchTableQeury.etd_end = value[key].data[1]
+      searchTableQeury.etd_start = value[key][0]
+      searchTableQeury.etd_end = value[key][1]
     } else if (key == 'ETA') {
-      searchTableQeury.eta_start = value[key].data[0]
-      searchTableQeury.eta_end = value[key].data[1]
+      searchTableQeury.eta_start = value[key][0]
+      searchTableQeury.eta_end = value[key][1]
     } else {
-      searchTableQeury.created_time_start = value[key].data[0]
-      searchTableQeury.created_time_end = value[key].data[1]
+      searchTableQeury.created_time_start = value[key][0]
+      searchTableQeury.created_time_end = value[key][1]
     }
   }
   TrackingTable_ref.value.searchTableData(searchTableQeury)