From 6c29d130040ec20eeaa287e4df6a01684e602ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=8E=89=E9=9C=9E?= <liuyuxia@jsspisoft.com>
Date: Thu, 5 Dec 2024 17:42:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/equipment/airBlower/index.vue     | 95 +++++++++----------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
index 9cb2f788..458ab9a5 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
@@ -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">
@@ -692,7 +692,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,

From 6db2753f9153836bdfabdfaa1595b3581464d337 Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Thu, 5 Dec 2024 17:50:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/dashboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index 9862e03c..d2d58e44 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -592,7 +592,7 @@ $labelHeight: 30px;
         display: block;
     }
     .overview {
-        width: calc(100% - 10px);
+        width: calc(100% - 5px);
         height: 100%;
         .overviewItem{
             height: 100px;

From e75ee99285cd9c457019ee4d4a30db0d95885e42 Mon Sep 17 00:00:00 2001
From: zhouhuang <assouan@sohu.com>
Date: Thu, 5 Dec 2024 20:23:37 +0800
Subject: [PATCH 3/4] update

---
 das-dn/third_party/AdsLib/Sockets.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/das-dn/third_party/AdsLib/Sockets.cpp b/das-dn/third_party/AdsLib/Sockets.cpp
index 57cd12c0..981591f3 100644
--- a/das-dn/third_party/AdsLib/Sockets.cpp
+++ b/das-dn/third_party/AdsLib/Sockets.cpp
@@ -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());

From ea438fbb1c8b2df9bbe3bdff99fe6831fdd64853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Fri, 6 Dec 2024 09:32:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8F=E6=B5=8B=EF=BC=9Amodbus=E5=92=8Ca?=
 =?UTF-8?q?ds=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/node/utils.ts | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/ui/dasadmin/src/views/backend/node/utils.ts b/ui/dasadmin/src/views/backend/node/utils.ts
index 00b10f9f..9b43f74d 100644
--- a/ui/dasadmin/src/views/backend/node/utils.ts
+++ b/ui/dasadmin/src/views/backend/node/utils.ts
@@ -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位归一化值",