sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
谷成伟 2024-12-06 09:43:51 +08:00
commit 3e7b5437a4
4 changed files with 75 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
das-dn/third_party/AdsLib/Sockets.cpp vendored
View File

@ -218,6 +218,9 @@ size_t Socket::write(const Frame& frame) const
LOG_ERROR("frame length: " << frame.size() << " exceeds maximum length for sockets");
return 0;
}
if (m_Socket == INVALID_SOCKET) return 0;
if (m_DestAddr == 0) return 0;
if (m_DestAddrLen <= 0) return 0;
const int bufferLength = static_cast<int>(frame.size());
const char* const buffer = reinterpret_cast<const char*>(frame.data());

2
ui/dasadmin/src/views/backend/dashboard.vue
View File

@ -592,7 +592,7 @@ $labelHeight: 30px;
display: block;
}
.overview {
width: calc(100% - 10px);
width: calc(100% - 5px);
height: 100%;
.overviewItem{
height: 100px;

95
ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
View File

@ -157,54 +157,54 @@
</el-table>
</el-main>
</el-container>
<el-dialog v-model="multiTaskVisible" :title="mutiTaskTitle" width="400" :close-on-click-modal="false">
<el-row v-for="item in mutiTaskList" :key="item.sendData.deviceId">
<el-col :span="18">
<div class="mutiTaskName">
{{ item.deviceName }}
</div>
</el-col>
<el-col :span="6">
<div class="mutiTaskStatus">
<el-icon style="color: #f56c6c" size="30" v-if="item.loading === 3">
<CircleClose />
</el-icon>
<el-icon style="color: #06b429" size="30" v-if="item.loading === 2">
<CircleCheck />
</el-icon>
<el-icon style="color: #4fa5ff" size="30" class="mutiTaskLoading" v-if="item.loading === 1">
<Loading />
</el-icon>
<div v-if="item.loading === 0">等待发送</div>
</div>
</el-col>
</el-row>
</el-dialog>
<el-dialog v-model="selectPointVisible" title="选择测点" width="1000">
<SelectPoint ref="selectPointDialogRef" :defaultAttr="defaultAttr" :visible="selectPointVisible"></SelectPoint>
<template #footer>
<div class="selectPointDialogFooter">
<el-button type="primary" @click="saveSelectPoint">保存</el-button>
<el-button @click="selectPointVisible = false">取消</el-button>
</div>
</template>
</el-dialog>
<el-dialog v-model="realDataLineChartVisible" title="实时曲线" @close="closeLineChart" width="1000">
<RealDataChart
ref="realDataChartRef"
:visible="realDataLineChartVisible"
:id="clickRow!.irn"
@clearChart="() => (linePause = false)"
></RealDataChart>
<template #header>
<div>
<span style="font-size: 18px">实时曲线</span>
<el-button class="saveBtn" @click="saveLineChart" type="primary" plain>保存</el-button>
<el-button v-if="linePause" class="continueBtn" @click="continueLineChart" type="primary" plain>继续</el-button>
</div>
</template>
</el-dialog>
</div>
<el-dialog v-model="multiTaskVisible" :title="mutiTaskTitle" width="400" :close-on-click-modal="false">
<el-row v-for="item in mutiTaskList" :key="item.sendData.deviceId">
<el-col :span="18">
<div class="mutiTaskName">
{{ item.deviceName }}
</div>
</el-col>
<el-col :span="6">
<div class="mutiTaskStatus">
<el-icon style="color: #f56c6c" size="30" v-if="item.loading === 3">
<CircleClose />
</el-icon>
<el-icon style="color: #06b429" size="30" v-if="item.loading === 2">
<CircleCheck />
</el-icon>
<el-icon style="color: #4fa5ff" size="30" class="mutiTaskLoading" v-if="item.loading === 1">
<Loading />
</el-icon>
<div v-if="item.loading === 0">等待发送</div>
</div>
</el-col>
</el-row>
</el-dialog>
<el-dialog v-model="selectPointVisible" title="选择测点" width="1000">
<SelectPoint ref="selectPointDialogRef" :defaultAttr="defaultAttr" :visible="selectPointVisible"></SelectPoint>
<template #footer>
<div class="selectPointDialogFooter">
<el-button type="primary" @click="saveSelectPoint">保存</el-button>
<el-button @click="selectPointVisible = false">取消</el-button>
</div>
</template>
</el-dialog>
<el-dialog v-model="realDataLineChartVisible" title="实时曲线" @close="closeLineChart" width="1000">
<RealDataChart
ref="realDataChartRef"
:visible="realDataLineChartVisible"
:id="clickRow!.irn"
@clearChart="() => (linePause = false)"
></RealDataChart>
<template #header>
<div>
<span style="font-size: 18px">实时曲线</span>
<el-button class="saveBtn" @click="saveLineChart" type="primary" plain>保存</el-button>
<el-button v-if="linePause" class="continueBtn" @click="continueLineChart" type="primary" plain>继续</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup lang="ts">
@ -694,7 +694,6 @@ const openMeasure = () => {
const saveSelectPoint = () => {
const list = selectPointDialogRef.value?.getSelectList()
if (list) {
const addCoulmn = list.map((item: any) => {
return {
label: item.unit ? item.attributeName + item.unit : item.attributeName,

24
ui/dasadmin/src/views/backend/node/utils.ts
View File

@ -119,6 +119,10 @@ export const excelDefaultConfig: any = {
{
label: '限值2下限',
code: 'limit2Low'
},
{
label:'强制归档',
code:'forceArchive',
}
],
R0C4: ['03', '04'],
@ -233,6 +237,10 @@ export const excelDefaultConfig: any = {
label: '寄存器地址',
code: 'col3',
},
{
label:'强制归档',
code:'forceArchive',
}
],
R0C4: ['03', '04'],
R0C5: [
@ -262,6 +270,10 @@ export const excelDefaultConfig: any = {
label: '寄存器',
code: 'col3',
},
{
label:'强制归档',
code:'forceArchive',
}
],
R0C4: ['01', '02', '03', '04'],
},
@ -335,6 +347,10 @@ export const excelDefaultConfig: any = {
{
label: '限值2下限',
code: 'limit2Low'
},
{
label:'强制归档',
code:'forceArchive',
}
],
R0C4: [
@ -394,6 +410,10 @@ export const excelDefaultConfig: any = {
139: {
name: '累计量',
head: [
{
label:'强制归档',
code:'forceArchive',
}
],
},
//遥信140 DISCRETE
@ -412,6 +432,10 @@ export const excelDefaultConfig: any = {
label: '寄存器地址',
code: 'registerAddr',
},
{
label:'强制归档',
code:'forceArchive',
}
],
R0C4: [
"8位归一化值",