Explorar el Código

style:页面表格显示样式微调

lihao16 hace 3 meses
padre
commit
8b9c4205c0

+ 3 - 3
smsb-plus-ui/src/views/smsb/deviceTask/index.vue

@@ -55,15 +55,15 @@
           </el-table-column>
           <el-table-column label="任务参数" align="left" prop="taskParam" :show-overflow-tooltip="true"/>
           <el-table-column label="创建时间" align="left" prop="createTime" width="160"/>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="145">
             <template #default="scope">
               <el-tooltip content="详情" placement="top">
                 <el-button link type="primary" icon="InfoFilled" @click="handleTaskDetail(scope.row)"
-                           v-hasPermi="['device:task:edit']"></el-button>
+                           v-hasPermi="['device:task:edit']">详情</el-button>
               </el-tooltip>
               <el-tooltip content="删除" placement="top">
                 <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                           v-hasPermi="['device:task:remove']"></el-button>
+                           v-hasPermi="['device:task:remove']">删除</el-button>
               </el-tooltip>
             </template>
           </el-table-column>

+ 1 - 1
smsb-plus-ui/src/views/smsb/httpHeart/index.vue

@@ -54,7 +54,7 @@
           <el-table-column label="设备名称" align="left" prop="deviceName" width="300" :show-overflow-tooltip="true" />
           <el-table-column label="设备SN" align="left" prop="serialNumber" :show-overflow-tooltip="true" />
           <el-table-column label="设备MAC" align="left" prop="mac" :show-overflow-tooltip="true" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="80">
             <template #default="scope">
               <!--            <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:deviceHeartRecord:edit']"></el-button>

+ 13 - 11
smsb-plus-ui/src/views/smsb/item/index.vue

@@ -54,7 +54,7 @@
               </el-button>
 <!--              <el-button type="primary" plain icon="Plus" @click="handleAddJ" v-hasPermi="['source:item:add']"> 新增分屏组
               </el-button>-->
-              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+<!--              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
                 v-hasPermi="['source:item:edit']">修改
               </el-button>
               <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
@@ -62,7 +62,7 @@
               </el-button>
               <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['source:item:export']">
                 导出
-              </el-button>
+              </el-button>-->
             </el-form-item>
           </el-form>
         </el-card>
@@ -72,9 +72,10 @@
     <el-card shadow="never">
       <div class="table-content">
         <el-table v-loading="mainLoading" :data="itemList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
+<!--          <el-table-column type="selection" width="55" align="center" />-->
+          <el-table-column label="" width="10" align="center" />
           <el-table-column label="ID" align="left" prop="id" v-if="true" width="180" :show-overflow-tooltip="true" />
-          <el-table-column label="名称" align="left" prop="itemName" />
+          <el-table-column label="名称" align="left" prop="itemName" :show-overflow-tooltip="true"/>
           <el-table-column label="类型" align="center" prop="itemType" width="120">
             <template #default="scope">
               <dict-tag :options="smsb_item_type" :value="scope.row.itemType" />
@@ -90,18 +91,18 @@
           <el-table-column label="创建人" align="left" prop="createUser" width="120" :show-overflow-tooltip="true" />
           <el-table-column label="创建时间" align="left" prop="createTime" width="160" />
           <el-table-column label="更新时间" align="left" prop="updateTime" width="160" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="240">
             <template #default="scope">
               <el-tooltip content="修改" placement="top">
                 <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                  v-hasPermi="['source:item:edit']"></el-button>
+                  v-hasPermi="['source:item:edit']">修改</el-button>
               </el-tooltip>
               <el-tooltip content="删除" placement="top">
                 <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                  v-hasPermi="['source:item:remove']"></el-button>
+                  v-hasPermi="['source:item:remove']">删除</el-button>
               </el-tooltip>
               <el-tooltip content="编辑历史" placement="top">
-                <el-button link type="primary" icon="Clock" @click="onShowEditHistory(scope.row)"></el-button>
+                <el-button link type="primary" icon="Clock" @click="onShowEditHistory(scope.row)">编辑历史</el-button>
               </el-tooltip>
             </template>
           </el-table-column>
@@ -131,7 +132,7 @@
       <VideoPlayer :url="videoUrl" />
     </el-dialog>
     <!-- 添加或修改轮播组对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1400px" append-to-body @close="onDialogClose">
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1600px" append-to-body @close="onDialogClose">
       <div class="dialog-container">
         <!-- 左侧文件列表 -->
         <div class="table-container">
@@ -184,7 +185,7 @@
                 <el-tooltip effect="dark" :content="element.name" placement="top">
                   <span style="
                       flex: 1;
-                      max-width: 340px;
+                      max-width: 520px;
                       overflow: hidden;
                       text-overflow: ellipsis;
                       white-space: nowrap;
@@ -193,7 +194,7 @@
                     ">{{ element.name }}</span>
                 </el-tooltip>
                 <el-input-number :disabled="element.type !== 1" v-model="element.duration" :min="1" :max="86400"
-                  style="width: 120px; margin-left: 8px" />
+                  style="width: 120px; margin-left: 10px" />
               </div>
             </template>
           </draggable>
@@ -835,6 +836,7 @@ onActivated(() => {
 }
 
 .table-container {
+  width: 40%;
   flex: 1;
 }
 

+ 11 - 11
smsb-plus-ui/src/views/smsb/itemProgram/index.vue

@@ -4,11 +4,11 @@
       :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="60">
             <!-- <el-form-item label="节目ID" prop="programId">
               <el-input v-model="queryParams.programId" placeholder="请输入节目ID" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
-            <el-form-item label="节目名称" prop="name">
+            <el-form-item label="名称" prop="name">
               <el-input v-model="queryParams.name" placeholder="请输入节目名称" clearable @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item label="分辨率" prop="resolutionRatio">
@@ -28,14 +28,14 @@
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
               <el-button type="primary" plain icon="Plus" @click="handleAdd"
-                         v-hasPermi="['smsb:itemProgram:add']">新增
+                         v-hasPermi="['smsb:itemProgram:add']">新增分屏组
               </el-button>
-              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+<!--              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
                          v-hasPermi="['smsb:itemProgram:edit']">修改
               </el-button>
               <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
                          v-hasPermi="['smsb:itemProgram:remove']">删除
-              </el-button>
+              </el-button>-->
             </el-form-item>
           </el-form>
         </el-card>
@@ -66,32 +66,32 @@
             </template>-->
       <div class="table-content">
         <el-table v-loading="loading" :data="itemProgramList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="" width="10" align="center"/>
           <el-table-column label="ID" align="left" prop="id" width="180"/>
           <el-table-column label="节目名称" align="left" prop="name" :show-overflow-tooltip="true"/>
           <el-table-column label="分辨率" align="center" prop="resolutionRatio" width="150"/>
           <!-- <el-table-column label="图片地址" align="center" prop="imgUrl" /> -->
           <!-- <el-table-column label="状态" align="center" prop="status" /> -->
           <!-- <el-table-column label="节目时长" align="center" prop="duration" /> -->
-          <el-table-column label="创建用户" align="center" width="150">
+          <el-table-column label="创建用户" align="left" width="150">
             <template #default="scope">
               <span>{{ userNickNameMap[scope.row.user] || scope.row.user || '-' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="left" prop="createTime" width="180"/>
           <el-table-column label="更新时间" align="left" prop="updateTime" width="180"/>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="210">
             <template #default="scope">
               <el-tooltip content="修改" placement="top">
                 <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                           v-hasPermi="['smsb:itemProgram:edit']"></el-button>
+                           v-hasPermi="['smsb:itemProgram:edit']">修改</el-button>
               </el-tooltip>
               <el-tooltip content="删除" placement="top">
                 <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                           v-hasPermi="['smsb:itemProgram:remove']"></el-button>
+                           v-hasPermi="['smsb:itemProgram:remove']">删除</el-button>
               </el-tooltip>
               <el-tooltip content="预览" placement="top">
-                <el-button link type="primary" icon="View" @click="handlePreview(scope.row)"></el-button>
+                <el-button link type="primary" icon="View" @click="handlePreview(scope.row)">预览</el-button>
               </el-tooltip>
             </template>
           </el-table-column>

+ 10 - 10
smsb-plus-ui/src/views/smsb/itemPush/index.vue

@@ -81,7 +81,7 @@
 <!--          <el-table-column type="selection" width="55" align="center" />-->
           <el-table-column label="" align="left" prop="" width="10" />
           <el-table-column label="ID" align="left" prop="id" width="180" v-if="true" />
-          <el-table-column label="名称" align="left" prop="name" />
+          <el-table-column label="名称" align="left" prop="name" width="500"/>
           <el-table-column label="优先级" align="center" width="100" prop="level">
             <template #default="scope">
               <dict-tag :options="smsb_push_level" :value="scope.row.level" />
@@ -102,19 +102,19 @@
               <dict-tag :options="smsb_push_isuse" :value="scope.row.isUse" />
             </template>
           </el-table-column>
-          <el-table-column label="生效日期" align="left" prop="startDate" width="140">
+          <el-table-column label="生效日期" align="left" prop="startDate" width="100">
             <template #default="scope">
               <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="失效日期" align="left" prop="endDate" width="140">
+          <el-table-column label="失效日期" align="left" prop="endDate" width="100">
             <template #default="scope">
               <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="发布时间" align="left" prop="createTime" width="160" />
-          <el-table-column label="创建人" align="left" prop="createUser" width="120" :show-overflow-tooltip="true" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+          <el-table-column label="创建人" align="left" prop="createUser" width="100" :show-overflow-tooltip="true" />
+          <el-table-column label="发布时间" align="left" prop="createTime" :show-overflow-tooltip="true" />
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
             <template #default="scope">
               <!-- <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -126,15 +126,15 @@
               </el-tooltip>-->
               <el-tooltip content="下发详情" placement="top">
                 <el-button link type="primary" icon="List" @click="handleDevice(scope.row)"
-                           v-hasPermi="['source:itemPush:edit']"></el-button>
+                           v-hasPermi="['source:itemPush:edit']">详情</el-button>
               </el-tooltip>
               <el-tooltip content="下架" placement="top">
                 <el-button link type="primary" icon="Bottom" v-if="scope.row.status == 'finish' && scope.row.isUse == '1'"
-                           @click="handleRemoveItem(scope.row)" v-hasPermi="['source:itemPush:edit']"></el-button>
+                           @click="handleRemoveItem(scope.row)" v-hasPermi="['source:itemPush:edit']">下架</el-button>
               </el-tooltip>
               <el-tooltip content="删除" placement="top">
                 <el-button link type="primary" icon="Delete" v-if="scope.row.isUse == '0'" @click="handleDelete(scope.row)"
-                           v-hasPermi="['source:itemPush:remove']"></el-button>
+                           v-hasPermi="['source:itemPush:remove']">删除</el-button>
               </el-tooltip>
             </template>
           </el-table-column>
@@ -227,7 +227,7 @@
           </div>
           <!-- 素材 -->
           <div v-if="form.itemType === 4 ">
-            <el-table v-loading="loading" :data="minioDataList" style="height: 520px" @selection-change="handleSelectionMinioChange">
+            <el-table v-loading="loading" :data="minioDataList" style="height: 570px" @selection-change="handleSelectionMinioChange">
               <el-table-column type="selection" width="40" align="center" />
               <el-table-column label="ID" prop="id" width="170" align="left" :show-overflow-tooltip="true" />
               <el-table-column label="文件" align="left" prop="originalName"  :show-overflow-tooltip="true" />

+ 62 - 55
smsb-plus-ui/src/views/smsb/itemReview/index.vue

@@ -27,87 +27,94 @@
         </el-card>
       </div>
     </transition>
-    <el-tabs type="border-card" v-model="activeName" @tab-click="handleClickTab">
-      <el-tab-pane label="内容审核" name="need">
-        <div class="table-content">
+    <div class="table-content">
+      <el-tabs type="border-card" v-model="activeName" @tab-click="handleClickTab">
+        <el-tab-pane label="内容审核" name="need">
+
           <el-table v-loading="loading" :data="itemPushList">
-            <el-table-column label="ID" align="left" prop="id" width="200" />
-            <el-table-column label="名称" align="left" prop="name" />
+            <el-table-column label="ID" align="left" prop="id" width="200"/>
+            <el-table-column label="名称" align="left" prop="name" width="700"/>
             <el-table-column label="优先级" align="center" width="100" prop="level">
               <template #default="scope">
-                <dict-tag :options="smsb_push_level" :value="scope.row.level" />
+                <dict-tag :options="smsb_push_level" :value="scope.row.level"/>
               </template>
             </el-table-column>
             <el-table-column label="类型" align="center" width="100" prop="itemType">
               <template #default="scope">
-                <dict-tag :options="smsb_push_type" :value="scope.row.itemType" />
+                <dict-tag :options="smsb_push_type" :value="scope.row.itemType"/>
               </template>
             </el-table-column>
             <el-table-column label="发布状态" align="center" width="100" prop="status">
               <template #default="scope">
-                <dict-tag :options="smsb_push_state" :value="scope.row.status" />
+                <dict-tag :options="smsb_push_state" :value="scope.row.status"/>
               </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="left" prop="createTime" width="180" />
-            <el-table-column label="创建人" align="left" prop="createUser" width="180" :show-overflow-tooltip="true" />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+            <el-table-column label="创建人" align="left" prop="createUser" width="140" :show-overflow-tooltip="true"/>
+            <el-table-column label="创建时间" align="left" prop="createTime" :show-overflow-tooltip="true"/>
+            <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
               <template #default="scope">
                 <el-tooltip content="内容审核" placement="top">
                   <el-button link type="primary" icon="Notification" @click="handleApproval(scope.row)"
-                    v-hasPermi="['source:itemPush:edit']"></el-button>
+                             v-hasPermi="['source:itemPush:edit']">内容审核
+                  </el-button>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                      v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-tab-pane>
+        <el-tab-pane label="我的已办" name="finish">
+          <el-table v-loading="loading" :data="itemPushList">
+            <el-table-column label="ID" align="left" prop="id" width="200"/>
+            <el-table-column label="名称" align="left" prop="name" width="700"/>
+            <el-table-column label="优先级" align="center" width="100" prop="level">
+              <template #default="scope">
+                <dict-tag :options="smsb_push_level" :value="scope.row.level"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="类型" align="center" width="100" prop="itemType">
+              <template #default="scope">
+                <dict-tag :options="smsb_push_type" :value="scope.row.itemType"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="发布状态" align="center" width="100" prop="status">
+              <template #default="scope">
+                <dict-tag :options="smsb_push_state" :value="scope.row.status"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建人" align="left" prop="createUser" width="140" :show-overflow-tooltip="true"/>
+            <el-table-column label="创建时间" align="left" prop="createTime" :show-overflow-tooltip="true"/>
+            <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
+              <template #default="scope">
+                <el-tooltip content="审核详情" placement="top">
+                  <el-button link type="primary" icon="View" @click="handleReview(scope.row)"
+                             v-hasPermi="['source:itemPush:edit']">审核详情
+                  </el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
           </el-table>
-        </div>
-        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize" @pagination="getList" />
-      </el-tab-pane>
-      <el-tab-pane label="我的已办" name="finish">
-        <el-table v-loading="loading" :data="itemPushList">
-          <el-table-column label="ID" align="left" prop="id" width="200" />
-          <el-table-column label="名称" align="left" prop="name" />
-          <el-table-column label="优先级" align="center" width="100" prop="level">
-            <template #default="scope">
-              <dict-tag :options="smsb_push_level" :value="scope.row.level" />
-            </template>
-          </el-table-column>
-          <el-table-column label="类型" align="center" width="100" prop="itemType">
-            <template #default="scope">
-              <dict-tag :options="smsb_push_type" :value="scope.row.itemType" />
-            </template>
-          </el-table-column>
-          <el-table-column label="发布状态" align="center" width="100" prop="status">
-            <template #default="scope">
-              <dict-tag :options="smsb_push_state" :value="scope.row.status" />
-            </template>
-          </el-table-column>
-          <el-table-column label="创建时间" align="left" prop="createTime" width="180" />
-          <el-table-column label="创建人" align="left" prop="createUser" width="180" :show-overflow-tooltip="true" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
-            <template #default="scope">
-              <el-tooltip content="审核详情" placement="top">
-                <el-button link type="primary" icon="View" @click="handleReview(scope.row)"
-                  v-hasPermi="['source:itemPush:edit']"></el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
 
-        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize" @pagination="getFinishList" />
-      </el-tab-pane>
-    </el-tabs>
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                      v-model:limit="queryParams.pageSize" @pagination="getFinishList"/>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
   </div>
 </template>
 <script setup lang="ts">
-import { ItemPushForm, ItemPushQuery, ItemPushVO } from '@/api/smsb/source/item_push_type';
-import { listNeedReview } from '@/api/smsb/source/item_push';
-import type { TabsPaneContext } from 'element-plus';
+import {ItemPushForm, ItemPushQuery, ItemPushVO} from '@/api/smsb/source/item_push_type';
+import {listNeedReview} from '@/api/smsb/source/item_push';
+import type {TabsPaneContext} from 'element-plus';
 
 const queryFormRef = ref<ElFormInstance>();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { smsb_push_state, smsb_push_type, smsb_push_level } = toRefs<any>(proxy?.useDict('smsb_push_state', 'smsb_push_type', 'smsb_push_level'));
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
+const {
+  smsb_push_state,
+  smsb_push_type,
+  smsb_push_level
+} = toRefs<any>(proxy?.useDict('smsb_push_state', 'smsb_push_type', 'smsb_push_level'));
 const showSearch = ref(true);
 const itemPushList = ref<ItemPushVO[]>([]);
 const buttonLoading = ref(false);

+ 9 - 9
smsb-plus-ui/src/views/smsb/minioData/index.vue

@@ -94,18 +94,18 @@
       <div class="table-content">
         <el-table v-loading="loading" :data="minioDataList" @selection-change="handleSelectionChange">
           <el-table-column label="" align="left"  width="5" />
-          <el-table-column label="资源" align="left" prop="keyName" width="200" :show-overflow-tooltip="true" />
+          <el-table-column label="资源" align="left" prop="keyName" width="250" :show-overflow-tooltip="true" />
           <el-table-column label="类型" align="center" prop="type" width="80">
             <template #default="scope">
               <dict-tag :options="smsb_source_type" :value="scope.row.type" />
             </template>
           </el-table-column>
-          <el-table-column label="文件名" align="left" prop="originalName" :show-overflow-tooltip="true" />
+          <el-table-column label="文件名" align="left" prop="originalName" width="300" :show-overflow-tooltip="true" />
           <el-table-column label="大小" align="center" prop="size" width="100" :show-overflow-tooltip="true" />
           <el-table-column label="分辨率" align="center" prop="resolution" width="100" :show-overflow-tooltip="true" />
           <el-table-column label="码率(kbps)" align="center" prop="codeRate" width="100" :show-overflow-tooltip="true" />
           <el-table-column label="时长" align="center" prop="durationStr" width="100" :show-overflow-tooltip="true" />
-          <el-table-column label="预览" align="center" prop="screenshot" width="100">
+          <el-table-column label="预览" align="center" prop="screenshot" width="80">
             <template #default="scope">
               <div v-if="scope.row.type === 1">
                 <!-- 图片类型 -->
@@ -121,7 +121,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="转码" align="center" prop="transState" width="100" :show-overflow-tooltip="true">
+          <el-table-column label="转码" align="center" prop="transState" width="80" :show-overflow-tooltip="true">
             <template #default="scope">
               <dict-tag :options="smsb_trans_result" :value="scope.row.transState" />
             </template>
@@ -131,24 +131,24 @@
               <dict-tag :options="smsb_source_classify" :value="scope.row.tag" />
             </template>
           </el-table-column>
-          <el-table-column label="创建人" align="left" prop="createUser" width="120" :show-overflow-tooltip="true"/>
-          <el-table-column label="创建时间" align="left" prop="createTime" width="160" :show-overflow-tooltip="true">
+          <el-table-column label="创建人" align="left" prop="createUser" width="100" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建时间" align="left" prop="createTime" :show-overflow-tooltip="true">
             <template #default="scope">
               <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="145">
             <template #default="scope">
               <!--            <el-tooltip content="修改" placement="top">
                           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['source:minioData:edit']"></el-button>
                         </el-tooltip>-->
               <el-tooltip content="删除" placement="top">
                 <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                  v-hasPermi="['source:minioData:remove']"></el-button>
+                  v-hasPermi="['source:minioData:remove']">删除</el-button>
               </el-tooltip>
               <el-tooltip content="引用情况" placement="top">
                 <el-button link type="primary" icon="List" @click="handleUse(scope.row)"
-                  v-hasPermi="['source:minioData:edit']"></el-button>
+                  v-hasPermi="['source:minioData:edit']">引用</el-button>
               </el-tooltip>
             </template>
           </el-table-column>

+ 1 - 1
smsb-plus-ui/src/views/smsb/nettyHeart/index.vue

@@ -56,7 +56,7 @@
           <el-table-column label="设备名称" align="left" prop="deviceName" width="350" :show-overflow-tooltip="true" />
           <el-table-column label="设备SN" align="left" prop="serialNumber"   :show-overflow-tooltip="true" />
           <el-table-column label="设备MAC" align="left" prop="mac" :show-overflow-tooltip="true" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="80">
             <template #default="scope">
               <!--            <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:deviceHeartRecord:edit']"></el-button>