diff --git a/src/api/cs-device-boot/frontManagement.ts b/src/api/cs-device-boot/frontManagement.ts
index 59a6016..ed9f76c 100644
--- a/src/api/cs-device-boot/frontManagement.ts
+++ b/src/api/cs-device-boot/frontManagement.ts
@@ -47,11 +47,13 @@ export function restartProcess(data: any) {
}
//更新进程号
-export function updateProcess(data: any) {
+export function updateProcess(data:any) {
return createAxios({
- url: '/cs-device-boot/node/updateDevProcessNo',
+ url: '/cs-device-boot/node/updateDevNode',
method: 'post',
- params: data
+ data: data
})
}
+
+
diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue
index 320c99a..7ba9730 100644
--- a/src/views/govern/alarm/Transient.vue
+++ b/src/views/govern/alarm/Transient.vue
@@ -75,7 +75,7 @@ import TableHeader from '@/components/table/header/index.vue'
import shushiboxi from '@/components/echarts/shushiboxi.vue'
import waveFormAnalysis from '@/views/govern/device/control/tabs/components/waveFormAnalysis.vue'
import rmsboxi from '@/components/echarts/rmsboxi.vue'
-import { analyseWave } from '@/api/common'
+import { analyseWave, getFileByEventId } from '@/api/common'
import { mainHeight } from '@/utils/layout'
import { ElMessage } from 'element-plus'
import { getFileZip } from '@/api/cs-harmonic-boot/datatrend'
@@ -153,7 +153,7 @@ const tableStore = new TableStore({
render: 'basicButton',
loading: 'loading1',
disabled: row => {
- return !row.wavePath && row.evtParamTm < 20
+ return !row.wavePath
},
click: async row => {
row.loading1 = true
@@ -212,7 +212,6 @@ const tableStore = new TableStore({
loading: 'loading2',
render: 'basicButton',
disabled: row => {
- // && row.evtParamTm < 20
return !row.wavePath
},
click: row => {
@@ -235,8 +234,24 @@ const tableStore = new TableStore({
icon: 'el-icon-DataLine',
render: 'basicButton',
disabled: row => {
- return !(!row.wavePath && row.evtParamTm < 20)
+ return row.showName != '未知';
}
+ },
+ {
+ name: 'edit',
+ title: '波形补召',
+ type: 'primary',
+ icon: 'el-icon-Check',
+ render: 'basicButton',
+ disabled: row => {
+ return row.wavePath || row.showName === '未知';
+ },
+ click: row => {
+ getFileByEventId(row.id).then(res => {
+ ElMessage.success(res.message)
+ tableStore.index()
+ })
+ }
}
]
}
diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue
index 7dc80b6..ef8621c 100644
--- a/src/views/govern/cloudDeviceEntry/index.vue
+++ b/src/views/govern/cloudDeviceEntry/index.vue
@@ -314,7 +314,7 @@
label="装置mac地址:"
:rules="{ required: true, message: '请输入装置mac地址', trigger: 'blur' }"
>
-