Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client

# Conflicts:
#	frontend/.env.development

frontend/.env.development

@@ -21,7 +21,7 @@ VITE_API_URL=/api
 
 #VITE_PROXY=[["/api","http://127.0.0.1:18092/"]]
 #VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
-VITE_PROXY=[["/api","http://192.168.2.125:18092/"]]
+VITE_PROXY=[["/api","http://192.168.2.124:18092/"]]
 # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文
 # 开启激活验证
 VITE_ACTIVATE_OPEN=false

frontend/src/components/echarts/line/index.vue

@@ -8,9 +8,9 @@
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
 // import echarts from './echarts'
 import * as echarts from 'echarts' // 全引入
-import 'echarts-gl'
+// import 'echarts-gl'
-import 'echarts-liquidfill'
+// import 'echarts-liquidfill'
-import 'echarts/lib/component/dataZoom'
+// import 'echarts/lib/component/dataZoom'
 
 const color = [
     'var(--el-color-primary)',

frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue

@@ -173,7 +173,7 @@
                                     :currentScriptTypeName="currentScriptTypeName"
                                 />
                             </el-tab-pane>
-                            <el-tab-pane label="历史趋势" name="chartTab">
+                            <el-tab-pane label="历史趋势" name="chartTab"  v-if="!isWaveData">
                                 <CompareDataCheckChart
                                     v-if="activeTab === 'chartTab'"
                                     :tableData="rawTableData.length == 0 ? [] : currentRawTableData"