ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
caozehui
2025-12-11 10:29:26 +08:00
parent ef38816f30 29dfc193a6
commit e3cf570d39
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/.env.development
View File

@@ -21,7 +21,7 @@ VITE_API_URL=/api
#VITE_PROXY=[["/api","http://127.0.0.1:18092/"]] #VITE_PROXY=[["/api","http://127.0.0.1:18092/"]]
#VITE_PROXY=[["/api","http://192.168.1.124: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_PROXY=[["/api","http://192.168.1.138:8080/"]]张文
# 开启激活验证 # 开启激活验证
VITE_ACTIVATE_OPEN=false VITE_ACTIVATE_OPEN=false

6
frontend/src/components/echarts/line/index.vue
View File

@@ -8,9 +8,9 @@
import { onBeforeUnmount, onMounted, ref, watch } from 'vue' import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
// import echarts from './echarts' // import echarts from './echarts'
import * as 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 = [ const color = [
'var(--el-color-primary)', 'var(--el-color-primary)',

2
frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue
View File

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