Merge branch 'ds' of http://39.101.133.168:8807/hongxilin/AIxiaocaishen into ds

src/views/AiEmotion.vue

@@ -1439,7 +1439,8 @@ defineExpose({
   display: block;
   color: #FFD700;
   font-weight: bold;
-  margin-bottom: 10px;
+  margin-top: 0px;
+  margin-bottom: 20px;
   font-size: 22px;
 }
 
@@ -1447,6 +1448,7 @@ defineExpose({
   display: block;
   color: white;
   font-size: 20px;
+  text-align: center;
 }
 
 
@@ -1604,7 +1606,7 @@ defineExpose({
   background-repeat: no-repeat;
   width: 70%;
   height: 400px;
-  min-height: 400px;
+  min-height: 35rem;
   text-align: center;
   margin: 0 auto;
   margin-top: 3%;
@@ -1621,7 +1623,7 @@ defineExpose({
   background-repeat: no-repeat;
   width: 95%;
   height: auto;
-  min-height: 40rem;
+  min-height: 50rem;
   margin: 0 auto;
 }
 

src/views/Selectmodel.vue

@@ -32,31 +32,21 @@
 import { onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { setHeight } from '@/utils/setHeight'
-import { useDataStore } from "@/store/dataList.js";
 
-const { getQueryVariable, setActiveTabIndex } = useDataStore();
 const router = useRouter()
 const pageRef = ref(null)
 
-// onMounted(() => {
-//   setHeight(pageRef.value)
-// })
-onMounted(async () => {
-  const isPhone =
-    /phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone/i.test(
-      navigator.userAgent
-    );
-  !isPhone &&
-    localStorage.setItem(
-      "localToken",
-      decodeURIComponent(String(getQueryVariable("token")))
-    );
+onMounted(() => {
+  setHeight(pageRef.value)
 })
+
 const goToDBQBmodel = () => {
   router.push('/DBQBmodel')
+  window.location.href = '/DBQBmodel'
 }
 const goToEmotionsmodel = () => {
   router.push('/Emotionsmodel')
+  window.location.href = '/Emotionsmodel'
 }
 </script>
 
@@ -116,13 +106,13 @@ const goToEmotionsmodel = () => {
 }
 
 .btn-dbqb {
-    height: 150px;
+  height: 150px;
   width: 100%;
   background-image: url('@/assets/img/Selectmodel/-s-夺宝奇兵logo.png');
 }
 
 .btn-ai {
-height: 150px;
+  height: 150px;
   width: 100%;
   background-image: url('@/assets/img/Selectmodel/金轮 拷贝.png');
 }
@@ -153,6 +143,7 @@ height: 150px;
 .btn-text-dbqb {
   background-image: url('@/assets/img/Selectmodel/-s-夺宝奇兵大模型.png');
 }
+
 .btn-text-ai {
   background-image: url('@/assets/img/Selectmodel/-s-AI情绪大模型.png');
 }
@@ -191,7 +182,8 @@ height: 150px;
 /* 手机适配 */
 @media screen and (max-width: 600px) {
   .homepage {
-    height: auto; /* 解决底部留白 */
+    height: auto;
+    /* 解决底部留白 */
     width: 100%;
     overflow-x: hidden;
   }
@@ -238,12 +230,13 @@ height: 150px;
     z-index: 2;
   }
 
-.footer-text1 {
-  width: 100vw;
-  height: 60px;
-  margin-top: 10px;
-  background-size: 100% 100%; /* 保证全宽显示 */
-}
+  .footer-text1 {
+    width: 100vw;
+    height: 60px;
+    margin-top: 10px;
+    background-size: 100% 100%;
+    /* 保证全宽显示 */
+  }
 
   .footer-text2 {
     width: 70vw;
@@ -252,11 +245,13 @@ height: 150px;
   }
 
 }
+
 /* 平板适配 */
-  @media screen and (min-width: 601px) and (max-width: 1024px) {
-    .homepage {
-      height: 120vh;
-    }   
+@media screen and (min-width: 601px) and (max-width: 1024px) {
+  .homepage {
+    height: 120vh;
+  }
+
   .main-icon {
     margin-top: 50%;
     width: 50vw;
@@ -276,7 +271,7 @@ height: 150px;
   }
 
   .btn-text {
-    
+
     height: 90px;
     width: 100%;
     top: 70%;
@@ -294,5 +289,5 @@ height: 150px;
     padding-top: 30px;
     height: 26px;
   }
-  }
+}
 </style>

src/views/components/emotionalBottomRadar.vue

@@ -38,9 +38,14 @@ function initEmotionalBottomRadar(KlineData, barAndLineData) {
     }
   })
   
-  // 找到最小值并向下取整到10的整数倍
-  let minValue = Math.min(...allKlineValues.filter(val => typeof val === 'number' && !isNaN(val)))
-  let yAxisMin = Math.floor(minValue / 10) * 10
+  // 找到最小值和最大值
+  let validValues = allKlineValues.filter(val => typeof val === 'number' && !isNaN(val))
+  let minValue = Math.min(...validValues)
+  let maxValue = Math.max(...validValues)
+  
+  // 最小值向下取整，最大值向上取整
+  let yAxisMin = Math.floor(minValue)
+  let yAxisMax = Math.ceil(maxValue)
   // 红线，取第二个值
   let redLineDataArray = barAndLineData.map(subArray => subArray[1])
   // 色块数据格式化
@@ -348,7 +353,8 @@ function initEmotionalBottomRadar(KlineData, barAndLineData) {
         type: 'value',
         gridIndex: 0,
         splitNumber: 4,
-        min: yAxisMin, // 设置y轴最小值为数据中最小值的10的整数倍
+        min: yAxisMin, // 设置y轴最小值为数据最小值向下取整
+        max: yAxisMax, // 设置y轴最大值为数据最大值向上取整
         axisLine: {
           lineStyle: {
             color: 'white' // y轴坐标轴颜色