From 689887419f078cac4e0cbf033ebd357f306febf7 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 7 Nov 2024 14:53:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20PC=E4=B8=AD?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=BF=87=E6=BB=A4=E7=BB=84=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E5=90=8E=E9=9A=90=E8=97=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=86=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E8=87=B3=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=85=8D=E7=BD=AE=E4=B8=AD=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/Component.vue    | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index ea82f4316f..88480820b2 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -2,6 +2,7 @@
 import icon_edit_outlined from '@/assets/svg/icon_edit_outlined.svg'
 import icon_deleteTrash_outlined from '@/assets/svg/icon_delete-trash_outlined.svg'
 import eventBus from '@/utils/eventBus'
+import { isMobile } from '@/utils/utils'
 import { ElMessage } from 'element-plus-secondary'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 import QueryConditionConfiguration from './QueryConditionConfiguration.vue'
@@ -256,6 +257,7 @@ const releaseSelect = id => {
 
 const queryDataForId = id => {
   let requiredName = ''
+  let numName = ''
   const emitterList = (element.value.propValue || [])
     .filter(ele => ele.id === id)
     .reduce((pre, next) => {
@@ -288,6 +290,22 @@ const queryDataForId = id => {
           requiredName = next.name
         }
       }
+
+      if (next.displayType === '22') {
+        if (
+          !isNaN(next.numValueEnd) &&
+          !isNaN(next.numValueStart) &&
+          next.numValueEnd < next.numValueStart
+        ) {
+          numName = next.name
+        }
+        if (
+          [next.numValueEnd, next.numValueStart].filter(itx => ![null, undefined, ''].includes(itx))
+            .length === 1
+        ) {
+          requiredName = next.name
+        }
+      }
       const keyList = Object.entries(next.checkedFieldsMap)
         .filter(ele => next.checkedFields.includes(ele[0]))
         .filter(ele => !!ele[1])
@@ -299,6 +317,10 @@ const queryDataForId = id => {
     ElMessage.error(`【${requiredName}】${t('v_query.before_querying')}`)
     return
   }
+  if (!!numName) {
+    ElMessage.error(`【${numName}】数值区间最大值必须大于最小值`)
+    return
+  }
   if (!emitterList.length) return
   emitterList.forEach(ele => {
     emitter.emit(`query-data-${ele}`)
@@ -339,6 +361,7 @@ onBeforeUnmount(() => {
 })
 
 const updateQueryCriteria = () => {
+  if (dvMainStore.mobileInPc && !isMobile()) return
   Array.isArray(element.value.propValue) &&
     element.value.propValue.forEach(ele => {
       if (ele.auto) {
@@ -380,6 +403,10 @@ onMounted(() => {
   emitter.on(`editQueryCriteria${element.value.id}`, editQueryCriteria)
   emitter.on(`updateQueryCriteria${element.value.id}`, updateQueryCriteria)
   updateQueryCriteria()
+
+  if (dvMainStore.mobileInPc && !isMobile()) {
+    queryData()
+  }
 })
 
 const dragover = () => {
@@ -601,7 +628,9 @@ const queryData = () => {
     return
   }
   if (!emitterList.length) return
-  dvMainStore.setFirstLoadMap([...new Set([...emitterList, ...firstLoadMap.value])])
+  if (!(dvMainStore.mobileInPc && !isMobile())) {
+    dvMainStore.setFirstLoadMap([...new Set([...emitterList, ...firstLoadMap.value])])
+  }
   emitterList.forEach(ele => {
     emitter.emit(`query-data-${ele}`)
   })