Merge branch 'main' of https://git.jsspisoft.com/ry-das

ui/dasadmin/src/views/backend/home/windMatrix.vue

@@ -258,7 +258,7 @@ const sendManualCommand = (type: 1 | 0) => {
     border: 1px solid #e1edf6;
 }
 .wind-offline {
-    background-image: linear-gradient(180deg, #eeeeee 0%, #eeeeee 50%);
+    background-image: linear-gradient(180deg, #dddddd 0%, #ffffff 93%);
     border: 1px solid #eeeeee;
 }
 .wind-picture {

ui/dasadmin/src/views/backend/linkMonitor/index.vue

@@ -46,12 +46,7 @@
                             <el-table-column prop="status" :label="LinkMonitorFieldsEnums['status']" align="center" width="80">
                                 <template #default="scope">
                                     <div class="status-container">
-                                        <span
+                                        <span :class="scope.row.status == 0 ? 'status-dot-online' : 'status-dot-offline'"></span>
-                                            :class="{
-                                                'status-dot-online': !scope.row.status,
-                                                'status-dot-offline': scope.row.status,
-                                            }"
-                                        ></span>
                                     </div>
                                 </template>
                             </el-table-column>
@@ -102,13 +97,13 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, nextTick } from 'vue'
+import { reactive, ref, nextTick, onUnmounted } from 'vue'
 import { ElContainer, ElAside, ElHeader, ElMain, ElTree, ElInput, ElMessage, ElButton, ElTable, TreeInstance } from 'element-plus'
 import { Search } from '@element-plus/icons-vue'
 import { LinkMonitorFieldsEnums, LinkMonitorTreeType, LinkMonitorTableType } from './type'
 import { getNodeListReq, getLinkListReq } from '/@/api/backend/linkMonitor/request'
 import { debounce, cloneDeep } from 'lodash'
-
+import { protocolList } from '/@/views/backend/node/utils'
 const LinkTreePropReplace = {
     label: 'nodeName',
     children: 'children',
@@ -184,7 +179,8 @@ const getlinkTreeList = () => {
 getlinkTreeList().then((res) => {
     curContextMenuTreeData.value = cloneDeep(res as LinkMonitorTreeType)
     linkTreeRef.value?.setCurrentKey(curContextMenuTreeData.value!.id!)
-    getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+    createTimer()
+    // getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
 })
 
 const searchLinkTree = () => {
@@ -249,7 +245,8 @@ const linkTreeNodeCollapse = (node: any) => {
 }
 const linkTreeNodeClick = (target: LinkMonitorTreeType) => {
     curContextMenuTreeData.value = cloneDeep(target)
-    getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+    createTimer()
+    // getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
 }
 const renderContent = (h: any, { node, data }: any) => {
     const label = node.label || ''
@@ -266,10 +263,12 @@ const renderContent = (h: any, { node, data }: any) => {
 const linkMonitorInputValue = ref('')
 const searchLinkMonitor = () => {
     if (linkMonitorInputValue.value === '') {
-        getlinkMonitorList(curContextMenuTreeData.value!.id!)
+        // getlinkMonitorList(curContextMenuTreeData.value!.id!)
+        createTimer()
         return
     }
-    getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+    createTimer()
+    // getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
 }
 
 const linkMonitorTableData = ref<LinkMonitorTableType[]>([])
@@ -282,17 +281,23 @@ const paginationOptions = reactive({
     pageSizes: [20, 50, 100],
 })
 const getcurrentPage = () => {
-    getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+    // getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+    createTimer()
 }
-const protocolList = [
+
-    { label: 'IEC104主 *', value: 8 },
+// const protocolList = [
-    { label: 'IEC104从 *', value: 9 },
+//     // *  代表需要配置的协议
-    { label: 'MODBUSRTU主 *', value: 12 },
+//     { label: 'IEC104从 *', value: 9 },
-    { label: 'MODBUSTCP主 *', value: 16 },
+//     { label: 'MODBUSTCP从 *', value: 17 },
-]
+//     { label: 'MODBUS', value: 80 },
+//     { label: 'ADS', value: 81 },
+// ]
 const getlinkMonitorList = (nodeId: string, linkName?: string) => {
-    getLinkListReq({ nodeId, linkName, pageNum: paginationOptions.current, pageSize: paginationOptions.pageSize })
+    getLinkListReq({ nodeId, linkName, pageNum: paginationOptions.current, pageSize: paginationOptions.pageSize, withStatus: 1 })
         .then((res) => {
+            if (!res.rows.length) {
+                clearTimer()
+            }
             if (res.rows) {
                 linkMonitorTableData.value = res.rows.map((item) => {
                     return {
@@ -303,10 +308,12 @@ const getlinkMonitorList = (nodeId: string, linkName?: string) => {
                 paginationOptions.total = res.total
             } else {
                 ElMessage.error(res.msg ?? '查询失败')
+                clearTimer()
             }
         })
         .catch((err) => {
             ElMessage.error(err?.response?.data?.msg ?? '查询失败')
+            clearTimer()
         })
 }
 
@@ -323,6 +330,22 @@ const startLink = (val: LinkMonitorTableType) => {
 const stopLink = (val: LinkMonitorTableType) => {
     console.log('stopLink')
 }
+let timer: any = null
+const createTimer = () => {
+    getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+    timer && clearInterval(timer)
+    timer = null
+    timer = setInterval(() => {
+        getlinkMonitorList(curContextMenuTreeData.value!.id!, linkMonitorInputValue.value)
+    }, 5000)
+}
+const clearTimer = () => {
+    timer && clearInterval(timer)
+    timer = null
+}
+onUnmounted(() => {
+    clearTimer()
+})
 </script>
 
 <style lang="scss" scoped>

ui/dasadmin/src/views/backend/linkMonitor/type.ts

@@ -35,6 +35,7 @@ export type GetLinkMonitorTableParam = {
     linkName?: string
     pageNum: number
     pageSize: number
+    withStatus?: number
 }
 
 export enum LinkMonitorFieldsEnums {

ui/dasadmin/src/views/backend/node/index.vue

@@ -178,6 +178,7 @@ import {
     uploadNodeReq,
     submitNodeConfigReq,
 } from '/@/api/backend/node/request'
+import {protocolList} from '/@/views/backend/node/utils'
 import { getInstitutionalTreeListReq } from '/@/api/backend/org/request'
 import { debounce } from 'lodash-es'
 import ProtocolComponent from './protocol.vue'
@@ -530,14 +531,6 @@ const getLinkData = (nodeId: string, linkName?: string) => {
         })
 }
 
-const protocolList = [
-    // *  代表需要配置的协议
-    { label: 'IEC104从 *', value: 9 },
-    { label: 'MODBUSTCP从 *', value: 17 },
-    { label: 'MODBUS', value: 80 },
-    { label: 'ADS', value: 81 },
-    { label: '故障日志', value: 79 },
-]
 
 const protocolPartVisible = ref(false)
 const protocolDisabled = ref(false)

ui/dasadmin/src/views/backend/node/utils.ts

@@ -1,5 +1,14 @@
 import { LocaleType, BooleanNumber, SheetTypes } from '@univerjs/core'
 
+export const protocolList = [
+    // *  代表需要配置的协议
+    { label: 'IEC104从 *', value: 9 },
+    { label: 'MODBUSTCP从 *', value: 17 },
+    { label: 'MODBUS', value: 80 },
+    { label: 'ADS', value: 81 },
+    { label: '故障日志', value: 79 },
+]
+
 export const excelDefaultConfig: any = {
     // IEC104从
     9: {

ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue

@@ -414,7 +414,7 @@ const statAnalysisExport = () => {
 
 const calculateAverages = (data: any) => {
     let maxWindSpeed = Math.max(...data.map((item: any) => item[0]))
-    let interval = 5 // 每5m/s一个区间
+    let interval = 0.5
     let result = []
 
     for (let windSpeed = 0; windSpeed <= maxWindSpeed; windSpeed += interval) {