flyzto пре 3 недеља
родитељ
комит
aeb7264c83
2 измењених фајлова са 33 додато и 5 уклоњено
  1. 2 2
      server/models/GamesPs.js
  2. 31 3
      web/apps/web-antd/src/views/match/components/match_card.vue

+ 2 - 2
server/models/GamesPs.js

@@ -407,11 +407,11 @@ const rouMaxAdjust = (events) => {
   if (innerRouSubsidyValue) {
   if (innerRouSubsidyValue) {
     if (events['ior_rac_05'] === undefined) {
     if (events['ior_rac_05'] === undefined) {
       events['ior_mh'].s = events['ior_mh'].v;
       events['ior_mh'].s = events['ior_mh'].v;
-      events['ior_mh'].v = events['ior_mh'].s + innerRouSubsidyValue;
+      events['ior_mh'].v = fixFloat(events['ior_mh'].s + innerRouSubsidyValue, 3);
     }
     }
     if (events['ior_rah_05'] === undefined) {
     if (events['ior_rah_05'] === undefined) {
       events['ior_mc'].s = events['ior_mc'].v;
       events['ior_mc'].s = events['ior_mc'].v;
-      events['ior_mc'].v = events['ior_mc'].s + innerRouSubsidyValue;
+      events['ior_mc'].v = fixFloat(events['ior_mc'].s + innerRouSubsidyValue, 3);
     }
     }
   }
   }
 
 

+ 31 - 3
web/apps/web-antd/src/views/match/components/match_card.vue

@@ -68,9 +68,15 @@ defineProps({
                 'selected': selected.includes(item[1]?.key),
                 'selected': selected.includes(item[1]?.key),
                 'highlight': iorGroups?.includes(item[1]?.key),
                 'highlight': iorGroups?.includes(item[1]?.key),
                 'strikethrough': item[1]?.qualified === 0,
                 'strikethrough': item[1]?.qualified === 0,
+                'subsidy': item[1]?.source && !item[1]?.returnRate,
                 'adjusted': item[1]?.returnRate
                 'adjusted': item[1]?.returnRate
               }">
               }">
-                <Tooltip :title="item[1]?.returnRate ? `${item[1].source} (${item[1].returnRate}%)` : ''">{{ item[1]?.value ? item[1].value : '-' }}</Tooltip>
+                <Tooltip>
+                  <template #title v-if="item[1]?.source">
+                    {{ item[1].source }} <span v-if="item[1]?.returnRate">({{ item[1].returnRate }}%)</span>
+                  </template>
+                  {{ item[1]?.value ? item[1].value : '-' }}
+                </Tooltip>
               </span>
               </span>
               <em class="origin-box" v-if="item[1]?.origin">{{ item[1].origin }}</em>
               <em class="origin-box" v-if="item[1]?.origin">{{ item[1].origin }}</em>
             </td>
             </td>
@@ -79,9 +85,15 @@ defineProps({
                 'selected': selected.includes(item[2]?.key),
                 'selected': selected.includes(item[2]?.key),
                 'highlight': iorGroups?.includes(item[2]?.key),
                 'highlight': iorGroups?.includes(item[2]?.key),
                 'strikethrough': item[2]?.qualified === 0,
                 'strikethrough': item[2]?.qualified === 0,
+                'subsidy': item[2]?.source && !item[2]?.returnRate,
                 'adjusted': item[2]?.returnRate
                 'adjusted': item[2]?.returnRate
               }">
               }">
-                <Tooltip :title="item[2]?.returnRate ? `${item[2].source} (${item[2].returnRate}%)` : ''">{{ item[2]?.value ? item[2].value : '-' }}</Tooltip>
+                <Tooltip>
+                  <template #title v-if="item[2]?.source">
+                    {{ item[2].source }} <span v-if="item[2]?.returnRate">({{ item[2].returnRate }}%)</span>
+                  </template>
+                  {{ item[2]?.value ? item[2].value : '-' }}
+                </Tooltip>
               </span>
               </span>
               <em class="origin-box" v-if="item[2]?.origin">{{ item[2].origin }}</em>
               <em class="origin-box" v-if="item[2]?.origin">{{ item[2].origin }}</em>
             </td>
             </td>
@@ -90,9 +102,15 @@ defineProps({
                 'selected': selected.includes(item[3]?.key),
                 'selected': selected.includes(item[3]?.key),
                 'highlight': iorGroups?.includes(item[3]?.key),
                 'highlight': iorGroups?.includes(item[3]?.key),
                 'strikethrough': item[3]?.qualified === 0,
                 'strikethrough': item[3]?.qualified === 0,
+                'subsidy': item[3]?.source && !item[3]?.returnRate,
                 'adjusted': item[3]?.returnRate
                 'adjusted': item[3]?.returnRate
               }">
               }">
-                <Tooltip :title="item[3]?.returnRate ? `${item[3].source} (${item[3].returnRate}%)` : ''">{{ item[3]?.value ? item[3].value : '-' }}</Tooltip>
+                <Tooltip>
+                  <template #title v-if="item[3]?.source">
+                    {{ item[3].source }} <span v-if="item[3]?.returnRate">({{ item[3].returnRate }}%)</span>
+                  </template>
+                  {{ item[3]?.value ? item[3].value : '-' }}
+                </Tooltip>
               </span>
               </span>
               <em class="origin-box" v-if="item[3]?.origin">{{ item[3].origin }}</em>
               <em class="origin-box" v-if="item[3]?.origin">{{ item[3].origin }}</em>
             </td>
             </td>
@@ -188,6 +206,16 @@ defineProps({
         text-decoration: line-through;
         text-decoration: line-through;
         color: hsl(var(--foreground) / 0.35);
         color: hsl(var(--foreground) / 0.35);
       }
       }
+      &.subsidy {
+        color: #c16d00;
+        &.highlight {
+          background-color: #ffe2bc;
+        }
+        &.selected {
+          color: #fff;
+          background-color: #c16d00;
+        }
+      }
       &.adjusted {
       &.adjusted {
         color: #039f00;
         color: #039f00;
         &.highlight {
         &.highlight {