Merge branch 'dev' into feat_map

src/components/ScoringGrade/src/ScoringGrade.vue

@@ -202,12 +202,14 @@ const changeSmileRadio = (val: any) => {
 }
 // 提交details
 const submitDetails = (val: any) => {
+  const username = localStorage.getItem('account') ? localStorage.getItem('account') : ''
   if (angryCheckbox.value.length) {
     $api
       .scoringgrade({
         suggestion: angryCheckbox.value,
         proposal: val,
-        expression: checkexpression.value
+        expression: checkexpression.value,
+        username: username
       })
       .then((res: any) => {
         if (res.code == 200) {

src/views/Booking/src/BookingView.vue

@@ -370,13 +370,15 @@ const getbookingdata = () => {
       }
     })
 }
-const changeTag = (val: any) => {
+const changeTag = (val: any, boolean: any) => {
   filterData.filtersTagData = []
   searchTableQeury.filterTag = val
   let str = 'Shipment status: ' + val
   filterData.filtersTagData.push(str)
   sessionStorage.setItem('searchTableQeury', JSON.stringify(searchTableQeury))
-  getbookingdata()
+  if (boolean) {
+    getbookingdata()
+  }
   renderTagsData()
   filterTag.value = val
 }

src/views/Dashboard/src/DashboardView.vue

@@ -90,7 +90,7 @@ const GetDashboardData = () => {
         GetTop10ODEcharts(Top10DefaultData.value)
         GetCo2EmissionEcharts(Co2OriginDefaultData.value)
         GetCo2DestinationEcharts(Co2DestinationDefaultData.value)
-        GetRevenueEcharts(RevenueDefaultData.value)
+        // GetRevenueEcharts(RevenueDefaultData.value)
       })
     })
 }

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

@@ -21,6 +21,7 @@ const buttonDisabled = ref(true)
 const isshowDetails = ref(true)
 const isShowScoring = ref(true)
 const SubmitText = ref()
+const isPrevious = ref(false)
 interface AvaterItem {
   src: string
   src1: string
@@ -142,21 +143,25 @@ smileAspects.value = [
   }
 ]
 const closeDialog = () => {
-  isShowAngry.value = false
-  innerVisible.value = false
-  dialogVisible.value = false
-  isShowHappy.value = false
-  isShowSmile.value = false
-  isshowDetails_submit.value = false
-  isshowDetails.value = true
-  smilecheckbox.value = {}
-  checkboxGroup1.value = []
-  checkboxGroup2.value = []
-  smileAspects.value.forEach((item: any) => {
-    item.radio = ''
-  })
-  buttonDisabled.value = true
-  inputdetails.value = ''
+  if (!isPrevious.value) {
+    isShowAngry.value = false
+    innerVisible.value = false
+    dialogVisible.value = false
+    isShowHappy.value = false
+    isShowSmile.value = false
+    isshowDetails_submit.value = false
+    isshowDetails.value = true
+    smilecheckbox.value = {}
+    checkboxGroup1.value = []
+    checkboxGroup2.value = []
+    smileAspects.value.forEach((item: any) => {
+      item.radio = ''
+    })
+    buttonDisabled.value = true
+    inputdetails.value = ''
+  } else {
+    isPrevious.value = false
+  }
 }
 const mouseenter = (item: any) => {
   item.src = item.itemsrc
@@ -197,6 +202,7 @@ const OpenScoring = (item: any) => {
   }
 }
 const previous = () => {
+  isPrevious.value = true
   dialogVisible.value = true
   innerVisible.value = false
   isShowAngry.value = false
@@ -229,12 +235,14 @@ const changeSmileRadio = (title: any, value: any) => {
 }
 // 提交details
 const submitDetails = (val: any) => {
+  const username = localStorage.getItem('account') ? localStorage.getItem('account') : ''
   if (checkboxGroup1.value.length) {
     $api
       .scoringgrade({
         suggestion: checkboxGroup1.value,
         proposal: val,
-        expression: checkexpression.value
+        expression: checkexpression.value,
+        username: username
       })
       .then((res: any) => {
         if (res.code == 200) {