From 570f21bbc43418ae12e0ad10c3ada8af5642da9e 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, 2 Feb 2024 09:58:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/fieldRender/index.vue    | 12 +--
 src/components/table/header/index.vue         |  2 +-
 src/views/govern/device/disposition/index.vue |  8 +-
 src/views/govern/manage/basic/dictionary.vue  |  3 +-
 src/views/govern/manage/factory.vue           |  2 +-
 src/views/govern/manage/feedback.vue          | 97 ++++++++++---------
 6 files changed, 67 insertions(+), 57 deletions(-)

diff --git a/src/components/table/fieldRender/index.vue b/src/components/table/fieldRender/index.vue
index 45a3148..d705be1 100644
--- a/src/components/table/fieldRender/index.vue
+++ b/src/components/table/fieldRender/index.vue
@@ -103,13 +103,11 @@
             >
                 <template #reference>
                     <div style="display: inline-block">
-                        <el-tooltip :disabled="btn.title ? false : true" :content="btn.title" placement="top">
-                            <el-button link :class="btn.class" class="table-operate" :type="btn.type" v-bind="btn.attr">
-                                <div v-if="btn.text || btn.title" class="table-operate-text">
-                                    {{ btn.text || btn.title }}
-                                </div>
-                            </el-button>
-                        </el-tooltip>
+                        <el-button link :class="btn.class" class="table-operate" :type="btn.type" v-bind="btn.attr">
+                            <div v-if="btn.text || btn.title" class="table-operate-text">
+                                {{ btn.text || btn.title }}
+                            </div>
+                        </el-button>
                     </div>
                 </template>
             </el-popconfirm>
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index 6177074..9aebdb0 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -199,7 +199,7 @@ defineExpose({ onComSearch, areaRef })
 #header-form {
     // display: flex;
     // flex-wrap: wrap;
-    // transition: all 0.3s;
+    transition: all 0.3s;
 }
 
 .mlr-12 {
diff --git a/src/views/govern/device/disposition/index.vue b/src/views/govern/device/disposition/index.vue
index 261f23c..5f71f1c 100644
--- a/src/views/govern/device/disposition/index.vue
+++ b/src/views/govern/device/disposition/index.vue
@@ -4,7 +4,9 @@
         <div class="device-manage-right" :style="{ height: pageHeight.height }">
             <el-descriptions title="用户基本信息" class="mb10" :column="2" border>
                 <template #extra>
-                    <el-button type="primary" size="small" icon="el-icon-Plus" @click="getMarketEnginner">添加工程</el-button>
+                    <el-button type="primary" size="small" icon="el-icon-Plus" @click="getMarketEnginner">
+                        添加工程
+                    </el-button>
                 </template>
                 <el-descriptions-item label="名称">
                     {{ user.name }}
@@ -20,9 +22,9 @@
                     <vxe-column title="操作" width="200px">
                         <template v-slot:default="scoped">
                             <el-button
+                                link
                                 size="small"
                                 type="danger"
-                                icon="el-icon-Delete"
                                 @click="deleteEngineering(scoped.row)"
                             >
                                 移除
@@ -32,7 +34,7 @@
                 </vxe-table>
             </div>
         </div>
-        <el-dialog v-model="dialogVisible" title="添加工程" width="30%" :close-on-click-modal="false">
+        <el-dialog v-model="dialogVisible" title="添加工程" class="cn-operate-dialog" :close-on-click-modal="false">
             <el-input
                 v-model="filterText"
                 icon="el-icon-Search"
diff --git a/src/views/govern/manage/basic/dictionary.vue b/src/views/govern/manage/basic/dictionary.vue
index 16fa68b..bfa4858 100644
--- a/src/views/govern/manage/basic/dictionary.vue
+++ b/src/views/govern/manage/basic/dictionary.vue
@@ -82,7 +82,7 @@ const tableStore = new TableStore({
         { title: '相别', field: 'phaseName', width: 80 },
         { title: '单位', field: 'unit', width: 80 },
         { title: '基础数据类型', field: 'type', width: 80 },
-        { title: '数据谐波次数', field: 'harmStart' },
+        { title: '数据谐波次数', field: 'harmStartEnd' },
         { title: '数据统计方法', field: 'statMethod' },
         { title: '数据存储', field: 'classIdName' },
         { title: '数据来源', field: 'resourcesIdName' },
@@ -129,6 +129,7 @@ const tableStore = new TableStore({
             item.classIdName = DataSelect.find((child: any) => child.id == item.classId)?.name || '/'
             item.resourcesIdName = ResourcesIdSelect.find((child: any) => child.id == item.resourcesId)?.name || '/'
             item.phaseName = item.phase === 'M' ? '/' : item.phase || '/'
+            item.harmStartEnd = item.harmEnd ? item.harmStart + '-' + item.harmEnd : '/'
             for (let key in item) {
                 if (typeof item[key] !== 'number') {
                     item[key] = item[key] || '/'
diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index f44e772..600d98e 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -66,7 +66,7 @@
             :title='dialogTitle'
             v-model='dialogFormVisible'
             :close-on-click-modal='false'
-            width='600px'
+            class='cn-operate-dialog'
             :before-close='resetForm'
         >
             <el-form :model='form' label-width='120px' :rules='rules' ref='ruleFormRef'>
diff --git a/src/views/govern/manage/feedback.vue b/src/views/govern/manage/feedback.vue
index 2ecb357..ef6df5e 100644
--- a/src/views/govern/manage/feedback.vue
+++ b/src/views/govern/manage/feedback.vue
@@ -7,31 +7,7 @@
                 </el-form-item>
             </template>
         </TableHeader>
-        <Table ref="tableRef" :isGroup="true">
-            <template v-slot:columns>
-                <vxe-column title="问题状态">
-                    <template v-slot:default="scoped">
-                        <el-tag v-if="scoped.row.status == 2">处理中</el-tag>
-                        <el-tag v-if="scoped.row.status == 0" type="success">已解决</el-tag>
-                        <el-tag v-if="scoped.row.status == 1" type="warning">待处理</el-tag>
-                    </template>
-                </vxe-column>
-                <vxe-column title="操作" width="180">
-                    <template v-slot:default="scoped">
-                        <el-button
-                            size="small"
-                            type="primary"
-                            icon="el-icon-Finished"
-                            @click="solve(scoped.row)"
-                            v-if="scoped.row.status != 0"
-                        >
-                            解决
-                        </el-button>
-                    </template>
-                </vxe-column>
-            </template>
-            >
-        </Table>
+        <Table ref="tableRef"></Table>
     </div>
 </template>
 <script setup lang="ts">
@@ -49,9 +25,58 @@ const tableStore = new TableStore({
     url: '/cs-system-boot/feedback/queryFeedBackPage',
     method: 'POST',
     column: [
-        { title: '问题标题', field: 'title', align: 'center' },
-        { title: '问题描述', field: 'description', align: 'center' },
-        { title: '发布时间', field: 'createTime', align: 'center' }
+        { title: '标题', field: 'title', align: 'center' },
+        { title: '描述', field: 'description', align: 'center' },
+        { title: '发布时间', field: 'createTime', align: 'center' },
+        {
+            title: '状态',
+            field: 'status',
+            width: '100',
+            render: 'tag',
+            custom: {
+                0: 'success',
+                1: 'warning',
+                2: 'primary'
+            },
+            replaceValue: {
+                0: '已解决',
+                1: '待处理',
+                2: '处理中'
+            }
+        },
+        {
+            title: '操作',
+            align: 'center',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'Finished',
+                    title: '解决',
+                    type: 'primary',
+                    icon: 'el-icon-Finished',
+                    render: 'confirmButton',
+                    disabled: row => {
+                        return row.status == 0
+                    },
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '该问题是否已解决？'
+                    },
+                    click: row => {
+                        auditFeedBack({
+                            id: row.id,
+                            status: 0
+                        }).then(res => {
+                            tableStore.onTableAction('search', {})
+                            ElMessage.success('操作成功!')
+                        })
+                    }
+                }
+            ]
+        }
     ],
 
     loadCallback: () => {}
@@ -63,22 +88,6 @@ tableStore.table.params.sortBy = ''
 tableStore.table.params.orderBy = ''
 tableStore.table.params.searchValue = ''
 
-const solve = (row: any) => {
-    ElMessageBox.confirm('该问题是否已解决？', '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-        auditFeedBack({
-            id: row.id,
-            status: 0
-        }).then(res => {
-            tableStore.onTableAction('search', {})
-            ElMessage.success('操作成功!')
-        })
-    })
-}
-
 onMounted(() => {
     tableStore.index()
 })