diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue
index 7c0e3a3..ff92ea8 100644
--- a/src/views/govern/alarm/Transient.vue
+++ b/src/views/govern/alarm/Transient.vue
@@ -151,10 +151,10 @@ const tableStore = new TableStore({
buttons: [
{
name: 'edit',
- text: '波形分析',
+ title: '波形分析',
type: 'primary',
icon: 'el-icon-DataLine',
- render: 'basicButton',
+ render: 'tipButton',
disabled: row => {
return !row.wavePath && row.evtParamTm < 20
},
diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index 6d6867f..2788e92 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -256,15 +256,15 @@ const tableStore = new TableStore({
{
title: '操作',
align: 'center',
- width: '340',
+ width: '180',
render: 'buttons',
buttons: [
{
name: 'edit',
- text: '编辑',
+ title:'编辑',
type: 'primary',
icon: 'el-icon-Edit',
- render: 'basicButton',
+ render: 'tipButton',
click: async row => {
dialogFormVisible.value = true
@@ -276,11 +276,10 @@ const tableStore = new TableStore({
}
},
{
- name: 'edit',
- text: '二维码',
+ title: '二维码',
type: 'primary',
icon: 'el-icon-Grid',
- render: 'basicButton',
+ render: 'tipButton',
click: row => {
deivce.value = row
@@ -300,32 +299,12 @@ const tableStore = new TableStore({
}, 0)
}
},
- {
- name: 'edit',
- text: '出厂恢复',
- type: 'primary',
- icon: 'el-icon-Setting',
- render: 'basicButton',
-
- click: row => {
- ElMessageBox.confirm('确定该设备恢复出厂吗?', '提示', {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- resetEquipmentDelivery(row.ndid).then(res => {
- ElMessage.success('恢复成功!')
- tableStore.onTableAction('search', {})
- })
- })
- }
- },
{
name: 'del',
- text: '删除',
+ title: '删除',
type: 'danger',
icon: 'el-icon-Delete',
- render: 'basicButton',
+ render: 'tipButton',
click: row => {
ElMessageBox.confirm('确定删除该设备吗?', '提示', {
diff --git a/src/views/govern/manage/feedback.vue b/src/views/govern/manage/feedback.vue
index 3350810..2ecb357 100644
--- a/src/views/govern/manage/feedback.vue
+++ b/src/views/govern/manage/feedback.vue
@@ -16,7 +16,7 @@
待处理
-
+
-
+