0017
/
calibration-pc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(网关调试): 初始化刷新table宽度，解决导出表格错误

This commit is contained in:
fhysy 2024-11-20 14:23:29 +08:00
parent ef11bd2b6b
commit 8e832298ec
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/src/views/gateway/collectdatamonitor.vue
View File

@ -229,7 +229,7 @@ onMounted(() => {
activeDeviceConfig.value = deviceConfigList.value[0].dataList; activeDeviceConfig.value = deviceConfigList.value[0].dataList;
ActiveRowIndex.value = 0; ActiveRowIndex.value = 0;
} }
handleResize()
}); });
onUnmounted(() => { onUnmounted(() => {
window.removeEventListener('resize', handleResize); window.removeEventListener('resize', handleResize);

1
src/renderer/src/views/gateway/northboundtask.vue
View File

@ -782,6 +782,7 @@ const handleResize = () => {
onMounted(() => { onMounted(() => {
window.addEventListener('resize', handleResize); window.addEventListener('resize', handleResize);
getDeviceConfig() getDeviceConfig()
handleResize()
// if(platConfigList.value[0]){ // if(platConfigList.value[0]){
// activeDeviceConfig.value = platConfigList.value[0]; // activeDeviceConfig.value = platConfigList.value[0];
// platConfigTableRef.value.toggleRowSelection(platConfigList.value[0]); // platConfigTableRef.value.toggleRowSelection(platConfigList.value[0]);

19
src/renderer/src/views/gateway/southdirection.vue
View File

@ -205,18 +205,18 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="driveFlag.isConclude_R" label="快读" width="50" align="center"> <el-table-column prop="driveFlag.isConclude_R" label="块读" width="50" align="center">
<template #default="scope"> <template #default="scope">
<!-- <el-select v-model="scope.row.driveFlag.isConclude_R" placeholder="请选择快读">--> <!-- <el-select v-model="scope.row.driveFlag.isConclude_R" placeholder="请选择块读">-->
<!-- <el-option value="true">Yes</el-option>--> <!-- <el-option value="true">Yes</el-option>-->
<!-- <el-option value="false">No</el-option>--> <!-- <el-option value="false">No</el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<el-switch v-model="scope.row.driveFlag.isConclude_R" /> <el-switch v-model="scope.row.driveFlag.isConclude_R" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="driveFlag.isConclude_W" label="快写" width="50" align="center"> <el-table-column prop="driveFlag.isConclude_W" label="块写" width="50" align="center">
<template #default="scope"> <template #default="scope">
<!-- <el-select v-model="scope.row.driveFlag.isConclude_W" placeholder="请选择快写">--> <!-- <el-select v-model="scope.row.driveFlag.isConclude_W" placeholder="请选择块写">-->
<!-- <el-option value="true">Yes</el-option>--> <!-- <el-option value="true">Yes</el-option>-->
<!-- <el-option value="false">No</el-option>--> <!-- <el-option value="false">No</el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
@ -1080,6 +1080,12 @@ const exportDeviceConfigXlsx = () => {
return { return {
equipId: item.equipId, equipId: item.equipId,
...val, ...val,
isConclude_R:val.driveFlag.isConclude_R,
isConclude_W:val.driveFlag.isConclude_W,
offset:val.northCalcParam.offset,
proportion:val.northCalcParam.proportion,
numBits:val.northCalcParam.decimal.numBits,
way:val.northCalcParam.decimal.way,
equipName: item.equipName, equipName: item.equipName,
protocol: item.protocol.libName, protocol: item.protocol.libName,
link: item.interfaceParams.link, link: item.interfaceParams.link,
@ -1190,7 +1196,7 @@ const handleFileChange = (file, fileList) => {
} }
}) })
item.equipName = dataArr[0].equipName; item.equipName = dataArr[0].equipName;
item.protocol.libName = dataArr[0].libName; item.protocol.libName = dataArr[0].protocol;
item.interfaceParams.link = dataArr[0].link; item.interfaceParams.link = dataArr[0].link;
item.protocol.params.linkPar = dataArr[0].linkPar; item.protocol.params.linkPar = dataArr[0].linkPar;
} }
@ -1219,7 +1225,7 @@ const handleFileChange = (file, fileList) => {
}, },
"interfaceParams": { "link": dataArr[0].link, "physicalInterface": "" }, // 接口参数 "interfaceParams": { "link": dataArr[0].link, "physicalInterface": "" }, // 接口参数
"properties": [], "properties": [],
"protocol": { "libName": dataArr[0].libName, "params": { "linkPar": dataArr[0].linkPar } } // 通信协议设置 "protocol": { "libName": dataArr[0].protocol, "params": { "linkPar": dataArr[0].linkPar } } // 通信协议设置
} }
obj.properties = dataArr.map(val=>{ obj.properties = dataArr.map(val=>{
return { return {
@ -1261,6 +1267,7 @@ onMounted(() => {
window.addEventListener('resize', handleResize); window.addEventListener('resize', handleResize);
getDeviceConfig() getDeviceConfig()
getSerialPortList(false) getSerialPortList(false)
handleResize()
// if(deviceConfigList.value[0]){ // if(deviceConfigList.value[0]){
// activeDeviceConfig.value = deviceConfigList.value[0]; // activeDeviceConfig.value = deviceConfigList.value[0];
// deviceConfigTableRef.value.toggleRowSelection(deviceConfigList.value[0]); // deviceConfigTableRef.value.toggleRowSelection(deviceConfigList.value[0]);