flyzto 2 months ago
parent
commit
83e28c3c32

+ 1 - 1
server/models/GamesPs.js

@@ -894,7 +894,7 @@ const getGamesSolutions = async ({ win_min, with_events, mk=-1, tp=0, sk }) => {
     const { info: { id }, ...solution } = item;
     const { info: { id }, ...solution } = item;
     const { rule, sol: { win_average } } = solution;
     const { rule, sol: { win_average } } = solution;
     const ruleType = getRuleType(rule);
     const ruleType = getRuleType(rule);
-    if ((filterDataType == 0 || filterDataType == ruleType) && (win_average >= (win_min ?? minShowAmount))) {
+    if ((filterDataType == 0 || filterDataType == ruleType) && (!!sk || win_average >= (win_min ?? minShowAmount))) {
       const gameRelation = relationsMap.get(id);
       const gameRelation = relationsMap.get(id);
       if (!solutionsMap[id]) {
       if (!solutionsMap[id]) {
         solutionsMap[id] = { ...gameRelation, solutions: [] };
         solutionsMap[id] = { ...gameRelation, solutions: [] };

+ 8 - 2
web/apps/web-antd/src/views/match/solutions/index.vue

@@ -50,10 +50,10 @@ const solutionsList = computed(() => {
 
 
 const getSolutions = async () => {
 const getSolutions = async () => {
   try {
   try {
-    const win_min = minProfitRate.value * 100;
     const mk = marketType.value;
     const mk = marketType.value;
     const tp = dataType.value;
     const tp = dataType.value;
     const sk = searchValue.value.trim();
     const sk = searchValue.value.trim();
+    const win_min = !!sk ? -99999 : minProfitRate.value * 100;
     const with_events = true;
     const with_events = true;
     const data = await requestClient.get('/pstery/get_games_solutions', { params: { win_min, mk, tp, sk, with_events } });
     const data = await requestClient.get('/pstery/get_games_solutions', { params: { win_min, mk, tp, sk, with_events } });
     return data;
     return data;
@@ -230,7 +230,7 @@ onUnmounted(() => {
               <Radio :value="2">大小</Radio>
               <Radio :value="2">大小</Radio>
             </RadioGroup>
             </RadioGroup>
           </Form.Item>
           </Form.Item>
-          <Form.Item label="最小利润率(%)" class="sol-opt-item input-item">
+          <Form.Item label="最小利润率(%)" class="sol-opt-item input-item" :class="{ 'disabled': !!searchValue.trim() }">
             <InputNumber class="number-input" size="small" max="100" min="-100" step="0.1" placeholder="最小利润率(%)" v-model:value="minProfitRate"/>
             <InputNumber class="number-input" size="small" max="100" min="-100" step="0.1" placeholder="最小利润率(%)" v-model:value="minProfitRate"/>
           </Form.Item>
           </Form.Item>
           <Form.Item class="sol-opt-item input-item">
           <Form.Item class="sol-opt-item input-item">
@@ -299,6 +299,12 @@ onUnmounted(() => {
   &.input-item:not(:last-child) {
   &.input-item:not(:last-child) {
     padding-inline-end: 15px;
     padding-inline-end: 15px;
   }
   }
+  &.disabled {
+    opacity: 0.5;
+    * {
+      text-decoration: line-through;
+    }
+  }
   .search-input, .number-input {
   .search-input, .number-input {
     height: 28px;
     height: 28px;
   }
   }