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

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

Browse Source 
# Conflicts:
#	frontend/.env.development
This commit is contained in:
sjl
2025-12-11 09:51:34 +08:00
parent 2c72045d3a 647afd9fc9
commit 29dfc193a6
63 changed files with 264 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/.env.production
View File

@@ -23,6 +23,6 @@ VITE_PWA=true
# 线上环境接口地址
#VITE_API_URL="/api" # 打包时用
VITE_API_URL="http://127.0.0.1:18092/"
VITE_API_URL="http://127.0.0.1:18093/"
# 开启激活验证
VITE_ACTIVATE_OPEN=true

2
frontend/src/utils/webSocketClient.ts
View File

@@ -190,7 +190,7 @@ export default class SocketService {
* WebSocket连接配置
*/
private config: SocketConfig = {
url: 'ws://127.0.0.1:7777/hello',
url: 'ws://127.0.0.1:7778/hello',
//url: 'ws://192.168.1.124:7777/hello',
heartbeatInterval: 9000, // 9秒心跳间隔
reconnectDelay: 5000, // 5秒重连延迟

4
frontend/src/views/home/components/compareDataCheckRawDataTable.vue
View File

@@ -12,14 +12,14 @@
<el-table-column type="index" label="序号" width="70" fixed="left"/>
<el-table-column prop="dataA" :label="'标准设备'">
<el-table-column :label="'标准设备'">
<el-table-column prop="timeStdDev" label="数据时间" width="200"/>
<el-table-column prop="uaStdDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaStdDev != null"/>
<el-table-column prop="ubStdDev" :label="setB+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ubStdDev != null"/>
<el-table-column prop="ucStdDev" :label="'C相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ucStdDev != null"/>
<el-table-column prop="utStdDev" :label="setT+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData[0]?.utStdDev != null"/>
</el-table-column>
<el-table-column prop="dataA" :label="'被检设备'">
<el-table-column :label="'被检设备'">
<el-table-column prop="timeDev" label="数据时间" width="200"/>
<el-table-column prop="uaDev" :label="'A相'+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.uaDev != null"/>
<el-table-column prop="ubDev" :label="setB+(outerUnit==''?'':'（'+outerUnit+'）')" v-if="prop.tableData.length==0||prop.tableData[0]?.ubDev != null"/>

6
frontend/src/views/home/components/compareDataCheckResultTable.vue
View File

@@ -2,11 +2,13 @@
<div class="table-main">
<el-table
:data="prop.tableData"
height="368px"
stripe
border
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
height="368px"
style="width: 100%"
>
<!-- <el-table-column type="index" label="序号" width="70" fixed="left" />-->
<el-table-column label="A相" v-if="prop.tableData.length==0|| prop.tableData[0]?.dataA">
<el-table-column prop="dataA" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')">

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

@@ -159,10 +159,10 @@
<el-tabs type="border-card" v-model="activeTab">
<el-tab-pane label="检测结果" name="resultTab">
<CompareDataCheckResultTable
v-if="activeTab === 'resultTab'"
:tableData="checkResultData.length == 0 ? [] : currentCheckResultData"
:currentCheckItem="currentCheckItem"
:currentScriptTypeName="currentScriptTypeName"
v-if="activeTab === 'resultTab'"
/>
</el-tab-pane>
<el-tab-pane label="原始数据" name="rawDataTab">

2
frontend/src/views/plan/planList/components/planPopup.vue
View File

@@ -1131,7 +1131,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan:
formContent.name = ''
// 新建子计划允许选择数据源
const datasourceDicts = dictStore.getDictData('Datasource')
formContent.datasourceIds = [datasourceDicts[0]?.code] ?? []
formContent.datasourceIds = datasourceDicts[0]?.code ? [datasourceDicts[0].code] : []
formContent.memberIds = []
}
generateData()