Merge remote-tracking branch 'origin/main'

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());

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;

ui/dasadmin/src/views/backend/equipment/airBlower/index.vue

@@ -157,7 +157,6 @@
                 </el-table>
             </el-main>
         </el-container>
-    </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">
@@ -205,6 +204,7 @@
                 </div>
             </template>
         </el-dialog>
+    </div>
 </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,

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位归一化值",