From fa7ac01f6ce42dd6405cf91e2e2168ab3c085886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Fri, 26 Jan 2024 09:35:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=80=E8=87=B4=E6=80=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/alarm/Transient.vue          |  4 +--
 src/views/govern/manage/factory.vue           | 35 ++++---------------
 src/views/govern/manage/feedback.vue          |  2 +-
 .../setting/statisticalType/binding.vue       |  2 +-
 4 files changed, 11 insertions(+), 32 deletions(-)

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 @@
                         <el-tag v-if="scoped.row.status == 1" type="warning">待处理</el-tag>
                     </template>
                 </vxe-column>
-                <vxe-column title="操作" min-width="15px">
+                <vxe-column title="操作" width="180">
                     <template v-slot:default="scoped">
                         <el-button
                             size="small"
diff --git a/src/views/govern/setting/statisticalType/binding.vue b/src/views/govern/setting/statisticalType/binding.vue
index aee42fe..069dcb0 100644
--- a/src/views/govern/setting/statisticalType/binding.vue
+++ b/src/views/govern/setting/statisticalType/binding.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标">
+    <el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标" style="width: 1040px;">
         <el-scrollbar style="padding-right: 0">
             <div class="box">
                 <div class="box-left">