st-comp 0.0.271 → 0.0.273

package/packages/VarietySearch/index.vue

@@ -286,7 +286,7 @@ defineExpose({
           result.push({ column, start, end });
         }
         // 年报审计意见
-        if (key === "auditOpinionType") {
+        else if (key === "auditOpinionType") {
           result.push({ column: item.key, enumType: item.enumType });
         }
         // 排名模式
@@ -345,9 +345,6 @@ defineExpose({
         }
         return result;
       }, []);
-      if (query.length) {
-        params.query = query;
-      }
       // 是否ST
       const stIndicator = data.commonIndicator.find(({ key }) => key === "st");
       if (stIndicator) {
@@ -373,6 +370,54 @@ defineExpose({
       if (peTrendTtmLevelIndicator) {
         params.peTrendTtmLevels = peTrendTtmLevelIndicator.peTrendTtmLevels;
       }
+      // 成交量
+      const perVolumnIndicator = data.commonIndicator.find(({ key }) => key === "perVolumn");
+      if (perVolumnIndicator) {
+        const { radioType, radio, levels, range, unit } = perVolumnIndicator;
+
+        // 分位模式
+        if (radioType === "2") {
+          params.perVolumn = {
+            type: radio,
+            value: levels,
+          };
+        }
+        // 数值模式（放入 query）
+        if (radioType === "0") {
+          let [start, end] = range;
+          // 单位转换
+          if (!["", null].includes(start)) {
+            switch (unit?.[0]) {
+              case "亿":
+                start = start * 100000000;
+                break;
+              case "千万":
+                start = start * 10000000;
+                break;
+              default:
+                break;
+            }
+          }
+          if (!["", null].includes(end)) {
+            switch (unit?.[1]) {
+              case "亿":
+                end = end * 100000000;
+                break;
+              case "千万":
+                end = end * 10000000;
+                break;
+              default:
+                break;
+            }
+          }
+          query.push({
+            column: "volumn",
+            start,
+            end,
+          });
+        }
+      }
+
       // 期权相关参数
       const searchOptionDto = {};
       data.commonIndicator.forEach((item) => {
@@ -429,19 +474,12 @@ defineExpose({
             break;
         }
       });
-      // 成交量
-      const perVolumnIndicator = data.commonIndicator.find(({ key }) => key === "perVolumn");
-      if (perVolumnIndicator) {
-        params.perVolumn = {
-          type: perVolumnIndicator.radio,
-          value: perVolumnIndicator.levels,
-        };
+
+      if (query.length) {
+        params.query = query;
       }
       if (Object.keys(searchOptionDto).length) {
-        params.searchOptionDto = {
-          ...params.searchOptionDto,
-          ...searchOptionDto,
-        };
+        params.searchOptionDto = searchOptionDto;
       }
     }
     // 8.组合分析

package/src/App.vue

@@ -46,31 +46,31 @@ const route = useRoute();
 /**
  * @description: 组件库Demo本地
  */
-// const VITE_RUN_ENV = {
-//   VITE_PROJECT_NAME: "迈幻量化",
-//   VITE_PROJECT_CLIENTID: "7",
-//   VITE_BASE_URL: "http://127.0.0.1:7001",
-//   BASE_URL: "/",
-//   MODE: "localhost",
-//   DEV: true,
-//   PROD: false,
-//   SSR: false,
-// };
-
-/**
- * @description: 组件库Demo测试
- */
 const VITE_RUN_ENV = {
   VITE_PROJECT_NAME: "迈幻量化",
   VITE_PROJECT_CLIENTID: "7",
-  VITE_BASE_URL: "http://192.168.12.38:5173",
+  VITE_BASE_URL: "http://127.0.0.1:7001",
   BASE_URL: "/",
-  MODE: "test49",
+  MODE: "localhost",
   DEV: true,
   PROD: false,
   SSR: false,
 };
 
+/**
+ * @description: 组件库Demo测试
+ */
+// const VITE_RUN_ENV = {
+//   VITE_PROJECT_NAME: "迈幻量化",
+//   VITE_PROJECT_CLIENTID: "7",
+//   VITE_BASE_URL: "http://192.168.12.38:5173",
+//   BASE_URL: "/",
+//   MODE: "test49",
+//   DEV: true,
+//   PROD: false,
+//   SSR: false,
+// };
+
 /**
  * @description: 组件库Demo线上
  */