From a936352962ac3d72b9ddd7c6ccfe640d21b7882c Mon Sep 17 00:00:00 2001
From: lijun <lijun.lj@foxmail.com>
Date: Sat, 18 Apr 2026 13:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/CIDList.vue     |  30 +-
 src/views/CIDLog.vue      |   2 -
 src/views/Chat.vue        | 172 +++++++----
 src/views/Group.vue       | 584 +++++++++++++++-----------------------
 src/views/ShellList.vue   |   1 +
 src/views/UserList.vue    |   2 +-
 src/views/VideoPlayer.vue |  90 +++---
 7 files changed, 407 insertions(+), 474 deletions(-)

diff --git a/src/views/CIDList.vue b/src/views/CIDList.vue
index 9c62848..428c142 100644
--- a/src/views/CIDList.vue
+++ b/src/views/CIDList.vue
@@ -349,11 +349,27 @@ export default {
           :row-class-name="tableRowClassName"
         >
           <el-table-column prop="ID" label="ID" width="80"></el-table-column>
-          <el-table-column prop="Name" label="名称" min-width="150"></el-table-column>
-          <el-table-column prop="Url" label="仓库地址" min-width="200" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="Script" label="脚本消息" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="Name" label="名称" min-width="120"></el-table-column>
+          <el-table-column prop="Url" label="仓库地址" min-width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="Script" label="脚本消息" min-width="150" show-overflow-tooltip></el-table-column>
           <el-table-column prop="Token" label="回调Token" width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="last_success" label="上次成功" width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="last_success" label="上次成功" width="150" show-overflow-tooltip>
+            <!-- 2026-04-08T20:43:02.166903+08:00 转为 2026-04-08 20:43:02  tag 绿色 -->
+             <template #default="scope">
+               <el-tag type="success">
+                {{ scope.row.last_success ? new Date(scope.row.last_success).toLocaleString() : "未执行" }}
+               </el-tag>
+             </template>
+          </el-table-column>
+          <!-- tag 红色 -->
+          <el-table-column prop="last_fail" label="上次失败" width="150" show-overflow-tooltip>
+            <!-- 2026-04-08T20:43:02.166903+08:00 转为 2026-04-08 20:43:02  tag 红色 -->
+             <template #default="scope">
+               <el-tag type="danger">
+                {{ scope.row.last_fail ? new Date(scope.row.last_fail).toLocaleString() : "未执行" }}
+               </el-tag>
+             </template>
+          </el-table-column>
           <el-table-column label="操作" width="280" fixed="right">
             <template #default="scope">
               <el-button 
@@ -412,6 +428,7 @@ export default {
         </el-form-item>
         <el-form-item label="定时执行时间">
           <el-select v-model="addForm.time" placeholder="选择时间" style="width: 200px; margin-right: 12px;">
+            <el-option label="不定时执行" :value="0"></el-option>
             <el-option label="30秒" :value="30"></el-option>
             <el-option label="1分钟" :value="60"></el-option>
             <el-option label="1小时" :value="3600"></el-option>
@@ -420,7 +437,7 @@ export default {
           <span>或自定义时间（秒）：</span>
           <el-input-number 
             v-model="addForm.time" 
-            :min="1" 
+            :min="0" 
             placeholder="秒"
           ></el-input-number>
         </el-form-item>
@@ -482,6 +499,7 @@ export default {
         </el-form-item>
         <el-form-item label="定时执行时间">
           <el-select v-model="updateForm.time" placeholder="选择时间" style="width: 200px; margin-right: 12px;">
+            <el-option label="不定时执行" :value="0"></el-option>
             <el-option label="30秒" :value="30"></el-option>
             <el-option label="1分钟" :value="60"></el-option>
             <el-option label="1小时" :value="3600"></el-option>
@@ -490,7 +508,7 @@ export default {
           <span>或自定义时间（秒）：</span>
           <el-input-number 
             v-model="updateForm.time" 
-            :min="1" 
+            :min="0" 
             placeholder="秒"
           ></el-input-number>
         </el-form-item>
diff --git a/src/views/CIDLog.vue b/src/views/CIDLog.vue
index dbc09c9..01376cb 100644
--- a/src/views/CIDLog.vue
+++ b/src/views/CIDLog.vue
@@ -4,9 +4,7 @@ import { ElMessage } from "element-plus";
 import { Refresh, Plus, Edit, Delete, View } from "@element-plus/icons-vue";
 import { getCIDLogListService } from "@/api/cid.js";
 import { runCIDService } from "@/api/cid.js";
-import { addCIDService } from "@/api/cid.js";
 import { deleteCIDService } from "@/api/cid.js";
-import { updateCIDService } from "@/api/cid.js";
 import router from "@/router/index.js";
 
 export default {
diff --git a/src/views/Chat.vue b/src/views/Chat.vue
index 3cbecea..3b74b0f 100644
--- a/src/views/Chat.vue
+++ b/src/views/Chat.vue
@@ -101,62 +101,54 @@
               <span class="loading-text">加载中...</span>
             </div>
             
-            <RecycleScroller
-              class="recycle-scroller"
-              :items="MsgList"
-              :item-size="80"
-              key-field="ID"
-              v-if="MsgList.length > 0 && !loading"
-            >
-              <template #default="{ item }">
-                <div class="message-item">
-                  <!-- 对方消息 -->
-                  <div
-                    v-if="
-                      (uid == item.ToUserID && item.FromUserID == cur_user_id && cur_group_id == 0) ||
-                      (cur_group_id != 0 && uid != item.FromUserID)
-                    "
-                    class="message-left animate-fade-in"
-                  >
-                    <el-avatar size="small" :src="item.FromUserID == cur_user_id ? cur_user_avatar : tokenData.avatar"></el-avatar>
-                    <div class="message-content-wrapper">
-                      <div class="message-header">
-                        <span class="message-sender">{{ item.FromUserID == cur_user_id ? cur_user_name : item.name || tokenData.username }}</span>
-                        <span class="message-time">{{ formatTime(item.CreatedAt) }}</span>
-                      </div>
-                      <div class="message-bubble message-bubble-left animate-slide-in-left">
-                        <div v-html="renderMarkdown(item.Msg)"></div>
-                      </div>
+            <div class="messages-list" v-if="MsgList.length > 0 && !loading">
+              <div class="message-item" v-for="item in MsgList" :key="item.ID">
+                <!-- 对方消息 -->
+                <div
+                  v-if="
+                    (uid == item.ToUserID && item.FromUserID == cur_user_id && cur_group_id == 0) ||
+                    (cur_group_id != 0 && uid != item.FromUserID)
+                  "
+                  class="message-left animate-fade-in"
+                >
+                  <el-avatar size="small" :src="item.FromUserID == cur_user_id ? cur_user_avatar : tokenData.avatar"></el-avatar>
+                  <div class="message-content-wrapper">
+                    <div class="message-header">
+                      <span class="message-sender">{{ item.FromUserID == cur_user_id ? cur_user_name : item.name || tokenData.username }}</span>
+                      <span class="message-time">{{ formatTime(item.CreatedAt) }}</span>
                     </div>
-                  </div>
-
-                  <!-- 自己的消息 -->
-                  <div
-                    v-if="uid == item.FromUserID && item.ToUserID == cur_user_id"
-                    class="message-right animate-fade-in"
-                  >
-                    <div class="message-content-wrapper">
-                      <div class="message-header message-header-right">
-                        <span class="message-time">{{ formatTime(item.CreatedAt) }}</span>
-                        <span class="message-sender">{{ tokenData.username }}</span>
-                      </div>
-                      <div class="message-bubble message-bubble-right animate-slide-in-right">
-                        <div v-html="renderMarkdown(item.Msg)"></div>
-                        <div class="message-status">
-                          <span v-if="item.status === 'sending'" class="status-sending">发送中...</span>
-                          <span v-else-if="item.status === 'failed'" class="status-failed" @click="retrySendMessage(item)">发送失败，点击重试</span>
-                          <span v-else-if="item.status === 'success'" class="status-success">
-                            已发送
-                            <span v-if="item.read" class="status-read">已读</span>
-                          </span>
-                        </div>
-                      </div>
+                    <div class="message-bubble message-bubble-left animate-slide-in-left">
+                      <div class="message-text" v-html="renderMarkdown(item.Msg)"></div>
                     </div>
-                    <el-avatar size="small" :src="tokenData.avatar"></el-avatar>
                   </div>
                 </div>
-              </template>
-            </RecycleScroller>
+
+                <!-- 自己的消息 -->
+                <div
+                  v-if="uid == item.FromUserID && item.ToUserID == cur_user_id"
+                  class="message-right animate-fade-in"
+                >
+                  <div class="message-content-wrapper">
+                    <div class="message-header message-header-right">
+                      <span class="message-time">{{ formatTime(item.CreatedAt) }}</span>
+                      <span class="message-sender">{{ tokenData.username }}</span>
+                    </div>
+                    <div class="message-bubble message-bubble-right animate-slide-in-right">
+                      <div class="message-text" v-html="renderMarkdown(item.Msg)"></div>
+                      <div class="message-status">
+                        <span v-if="item.status === 'sending'" class="status-sending">发送中...</span>
+                        <span v-else-if="item.status === 'failed'" class="status-failed" @click="retrySendMessage(item)">发送失败，点击重试</span>
+                        <span v-else-if="item.status === 'success'" class="status-success">
+                          已发送
+                          <span v-if="item.read" class="status-read">已读</span>
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                  <el-avatar size="small" :src="tokenData.avatar"></el-avatar>
+                </div>
+              </div>
+            </div>
             <div v-else-if="!loading" class="empty-messages">
               <p>暂无消息，开始聊天吧！</p>
             </div>
@@ -417,7 +409,13 @@ export default {
       return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
     },
     renderMarkdown(markdown) {
-      return this.md.render(markdown);
+      // 配置markdown-it，确保生成的HTML与样式兼容
+      const md = new MarkdownIt({
+        breaks: true,
+        linkify: true,
+        typographer: true
+      });
+      return md.render(markdown);
     },
     SendImage() {
       this.sendImgDialogVisible = true;
@@ -943,14 +941,15 @@ export default {
   position: relative;
 }
 
-.recycle-scroller {
+.messages-list {
   width: 100%;
   height: 100%;
+  overflow-y: auto;
+  padding: 8px 0;
 }
 
 .message-item {
-  margin-bottom: 20px;
-  min-height: 80px;
+  margin-bottom: 16px;
 }
 
 .empty-messages {
@@ -995,6 +994,7 @@ export default {
   display: flex;
   align-items: flex-start;
   gap: 12px;
+  padding: 0 8px;
 }
 
 .message-right {
@@ -1003,7 +1003,8 @@ export default {
 
 .message-content-wrapper {
   flex: 1;
-  max-width: 70%;
+  max-width: 75%;
+  position: relative;
 }
 
 .message-header {
@@ -1031,8 +1032,53 @@ export default {
 .message-bubble {
   padding: 12px 16px;
   border-radius: 18px;
-  word-wrap: break-word;
-  line-height: 1.5;
+  line-height: 1.6;
+  min-height: 40px;
+  max-width: 100%;
+  box-sizing: border-box;
+  word-break: break-word;
+  overflow-wrap: break-word;
+}
+
+.message-text {
+  word-break: break-word;
+  overflow-wrap: break-word;
+}
+
+.message-text p {
+  margin: 0 0 8px 0;
+}
+
+.message-text p:last-child {
+  margin-bottom: 0;
+}
+
+.message-text a {
+  color: inherit;
+  text-decoration: underline;
+  word-break: break-all;
+}
+
+.message-text code {
+  background: rgba(0, 0, 0, 0.1);
+  padding: 2px 6px;
+  border-radius: 4px;
+  font-size: 0.9em;
+}
+
+.message-text pre {
+  background: rgba(0, 0, 0, 0.1);
+  padding: 10px;
+  border-radius: 8px;
+  overflow-x: auto;
+  margin: 8px 0;
+}
+
+.message-text img {
+  max-width: 100%;
+  height: auto;
+  border-radius: 8px;
+  display: block;
 }
 
 .message-bubble-left {
@@ -1042,10 +1088,10 @@ export default {
 }
 
 .message-bubble-right {
-  background: #409eff;
-  color: #ffffff;
+  background: #ebecef;
+  color: #000000;
   border-bottom-right-radius: 4px;
-  box-shadow: 0 1px 2px rgba(64, 158, 255, 0.3);
+  box-shadow: 0 1px 2px rgba(158, 197, 254, 0.3);
   position: relative;
 }
 
@@ -1070,7 +1116,7 @@ export default {
 }
 
 .status-read {
-  color: #409eff;
+  color: #b7d9fb;
   margin-left: 4px;
   font-weight: 500;
 }
diff --git a/src/views/Group.vue b/src/views/Group.vue
index 6cb2e81..c1ac4f8 100644
--- a/src/views/Group.vue
+++ b/src/views/Group.vue
@@ -16,10 +16,17 @@ import {DelFGService} from "@/api/user.js";
 import { updateDeviceService } from "@/api/device.js";
 import router from "@/router/index.js";
 import { ElMessage } from 'element-plus';  
-
-
+import { Refresh, Plus, ChatDotRound, User, Edit, Delete } from "@element-plus/icons-vue";
 
 export default {
+  components: {
+    Refresh,
+    Plus,
+    ChatDotRound,
+    User,
+    Edit,
+    Delete
+  },
   data() {
     return {
       ip: "",
@@ -29,6 +36,7 @@ export default {
       is_del_group_user:false,
       GroupRequestIsDisplay : false,
       GroupRequestList:[],
+      FriendsGList: [],
       tokenData: {
         token: localStorage.getItem("token"),
         ip: localStorage.getItem("ip"),
@@ -62,8 +70,6 @@ export default {
     };
   },
 
-  // methods 是一些用来更改状态与触发更新的函数
-  // 它们可以在模板中作为事件处理器绑定
   methods: {
     async getGroupList() {
       let result = {};
@@ -87,15 +93,6 @@ export default {
         }
       }
       this.add_groups = temp;
-      
-
-      //   for(let d in data){
-      //     let res = JSON.parse(d);
-      //     console.log("res=",res);
-      //     this.tableData.push(res);
-      //   }
-      //   console.log(this.tableData);
-
       this.tableData = data;
     },
     onSubmit() {
@@ -107,7 +104,6 @@ export default {
     handleCurrentChange() {
       alert("页码发生变化" + val);
     },
-        //获取好友列表
     async displayFriends(index){
       this.group_id = this.tableData[index].ID;
       let result ={}
@@ -138,7 +134,6 @@ export default {
           this.FriendsGList = result.data;
           this.FriendsTableIsDisplay = true;
           this.is_del_group_user=true;
-          
         }else{
           ElMessage.error("获取群用户列表失败");
         }
@@ -146,8 +141,6 @@ export default {
         console.log(e);
       }
     },
-
-    //邀请好友加入群组
     async inviteUser(index) {
       var id = this.tableData[index].ID;
       var restart_data = {
@@ -169,24 +162,23 @@ export default {
         console.log(e);
       }
     },
-
     async deleteGroup(index) {
+      if (!confirm("确定删除吗？")) {
+        return;
+      }
       var id = this.tableData[index].ID;
       var delete_data = {
         group_id: id,
-        type:3,//删除群组
+        type:3,
         userId: this.tokenData.userId,
         token: this.tokenData.token,
       };
       try {
         var d_re = await DelFGService(delete_data);
         if (d_re.code == 0) {
-          //alert("删除成功");
           ElMessage.success('删除成功');
-          //刷新页面
           this.getGroupList();
         } else {
-          //alert("操作失败");
           ElMessage.fail("操作失败");
         }
       } catch (e) {
@@ -213,7 +205,6 @@ export default {
           ElMessage.success("添加成功");
           this.getGroupList();
         } else {
-          //alert("添加失败");
           ElMessage.error("添加失败")
         }
       } catch (e) {
@@ -226,7 +217,6 @@ export default {
       try {
         result = await updateGroupService(this.updateForm);
         if (result.code == 0) {
-          //alert("修改成功");
           ElMessage.success("修改成功");
           this.getGroupList();
         } else {
@@ -236,7 +226,6 @@ export default {
         console.log(e);
       }
     },
-
     async inviteFriendAddGroup(index){
       var id = this.FriendsGList[index].id;
       let req={
@@ -253,10 +242,8 @@ export default {
       try {
         var d_re = await sendMessageService(req);
         if (d_re.code == 0) {
-          //alert("邀请成功");
           ElMessage.success("邀请成功");
         } else {
-          //alert("操作失败");
           ElMessage.error("操作失败:"+d_re.error);
         }
       } catch (e) {
@@ -280,10 +267,8 @@ export default {
       try {
         var d_re = await DelFGService(req);
         if (d_re.code == 0) {
-          //alert("邀请成功");
           ElMessage.success("删除成功");
         } else {
-          //alert("操作失败");
           ElMessage.error("操作失败:"+d_re.error);
         }
       } catch (e) {
@@ -295,7 +280,6 @@ export default {
         const response = await axios.get("https://ipinfo.io/json");
         this.ip = response.data.ip;
         localStorage.setItem("ip", this.ip);
-        //console.log(response);
       } catch (error) {
         console.error(error);
       }
@@ -317,16 +301,12 @@ export default {
       }catch(e){
         console.log(e);
       }
-
     },
-    //退出群聊
     async DelFriendsOrGroup(index){
-      // 删除前确认
       if (!confirm("确定退出吗？")) {
         return;
       }
       var id = this.add_groups[index].ID;
-
       let result ={}
       try{
         result =await DelFGService({
@@ -383,15 +363,15 @@ export default {
           from_user_id: localStorage.getItem("userId"),
           to_user_id: id,
           group_id: this.GroupRequestList[index].group_id,
-          msg: "接受加入群组请求",
+          msg: "拒绝加入群组请求",
           index: 1,
           type: 2,
         });
         if(result.code ===0){
-          ElMessage.success("接受请求成功");
+          ElMessage.success("拒绝请求成功");
           this.displayGroupReq();
         }else{
-          ElMessage.error("接受请求失败");
+          ElMessage.error("拒绝请求失败");
         }
       }catch(e){
         console.log(e);
@@ -403,7 +383,6 @@ export default {
     toVideoList() {
       router.push("/videoList");
     },
-    // 修改条纹颜色
     tableRowClassName({ row, rowIndex }) {
       if (row.human === 1) {
         return {
@@ -415,14 +394,11 @@ export default {
     },
   },
 
-  // 生命周期钩子会在组件生命周期的各个不同阶段被调用
-  // 例如这个函数就会在组件挂载完成后被调用
   async mounted() {
     let now = new Date();
     if (localStorage.getItem("token") === null) {
       router.push("/login");
     }
-    // console.log("mounted");
     this.getIpClient();
     this.getGroupList();
   },
@@ -430,329 +406,231 @@ export default {
 </script>
 
 <template>
-  <div>
-    <el-container style="min-height: calc(100vh - 40px); background: #fff; border-radius: 4px;">
-      <el-header style="font-size: 40px; background-color: rgb(238, 241, 246)"
-        >群组</el-header
-      >
-      <el-container>
-        <el-main>
-          <!-- 表单 -->
-          <el-form :inline="true" :model="tokenData" class="demo-form-inline">
-          <el-form-item>
-              <el-button
-                class="el-button--danger"
-                type="primary"
-                @click="getGroupList()"
-                >查询</el-button
-              >
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="addDialogVisible = true"
-                >建群</el-button
-              >
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="displayGroupReq()"
-                >请求加入群聊请求</el-button
-              >
-            </el-form-item>
-            <el-form-item>
-              <el-dialog
-                v-model="addDialogVisible"
-                title="建群"
-                width="50%"
-                :before-close="handleClose"
-              >
-                <!-- 内容主体区域 -->
-                <el-form
-                  ref="addFormRef"
-                  :model="addForm"
-                  :rules="addFormRules"
-                  label-width="70px"
-                >
-                  <el-form-item label="名称" prop="device_name">
-                    <el-input
-                      v-model="addForm.group_name"
-                      autocomplete="on"
-                    ></el-input>
-                  </el-form-item>
-                  <el-form-item label="描述" prop="info">
-                    <el-input v-model="addForm.group_info"></el-input>
-                  </el-form-item>
-                  <el-form-item label="类型" prop="type">
-                    <el-input v-model="addForm.group_type"></el-input>
-                  </el-form-item>
-                  <el-form-item label="icon" prop="device_info">
-                    <el-input v-model="addForm.group_icon"></el-input>
-                  </el-form-item>
-                </el-form>
-                <!-- 底部区域 -->
-                <template #footer>
-                  <span class="dialog-footer">
-                    <el-button @click="addDialogVisible = false"
-                      >取消</el-button
-                    >
-                    <el-button type="primary" @click="addGroup()"
-                      >确定</el-button
-                    >
-                  </span>
-                </template>
-              </el-dialog>
-            </el-form-item>
+  <div class="page-container">
+    <el-card class="page-card" shadow="never">
+      <template #header>
+        <div class="card-header">
+          <div class="header-left">
+            <span class="page-title">群组管理</span>
+          </div>
+          <div class="header-actions">
+            <el-button type="primary" @click="getGroupList()" :icon="Refresh">
+              刷新
+            </el-button>
+            <el-button type="primary" @click="addDialogVisible = true" :icon="Plus">
+              建群
+            </el-button>
+            <el-button type="primary" @click="displayGroupReq()" :icon="ChatDotRound">
+              加入请求
+            </el-button>
+          </div>
+        </div>
+      </template>
 
-            <el-form-item>
-              <el-dialog
-                v-model="updateDialogVisible"
-                title="修改群信息"
-                width="50%"
-                :before-close="handleClose"
-              >
-                <!-- 内容主体区域 -->
-                <el-form
-                  ref="updateFormRef"
-                  :model="updateForm"
-                  :rules="updateFormRules"
-                  label-width="70px"
-                >
-                  <el-form-item label="名称" prop="group_name">
-                    <el-input
-                      v-model="updateForm.group_name"
-                      autocomplete="on"
-                    ></el-input>
-                  </el-form-item>
-                  <el-form-item label="群信息" prop="group_info">
-                    <el-input v-model="updateForm.group_info"></el-input>
-                  </el-form-item>
-                  <el-form-item label="群类型" prop="group_type">
-                    <el-input v-model="updateForm.group_type"></el-input>
-                  </el-form-item>
-                  <el-form-item label="群Icon" prop="group_icon">
-                    <el-input v-model="updateForm.group_icon"></el-input>
-                  </el-form-item>
-                </el-form>
-                <!-- 底部区域 -->
-                <template #footer>
-                  <span class="dialog-footer">
-                    <el-button @click="updateDialogVisible = false"
-                      >取消</el-button
-                    >
-                    <el-button type="primary" @click="updateGroup()"
-                      >确定</el-button
-                    >
-                  </span>
-                </template>
-              </el-dialog>
-            </el-form-item>
-          </el-form>
-
-          <el-dialog
-            title="成员列表"
-            width="40%"
-            v-model="FriendsTableIsDisplay"
-            center>
-
-            <el-table :data="FriendsGList" width="100%">
-              <el-table-column prop="id" label="id" width="80"></el-table-column>
-              <el-table-column
-                prop="name"
-                label="名称"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="email"
-                label="用户邮箱"
-                width="180"
-              ></el-table-column>
-              <el-table-column>
-                <template #default="scope">
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    @click.prevent="inviteFriendAddGroup(scope.$index)"
-                    v-if="is_del_group_user === false"
-                    >邀请</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    @click.prevent="delGroupUser(scope.$index)"
-                    v-if="is_del_group_user === true"
-                    >删除</el-button
-                  >
-                  </template>
-              </el-table-column>
-            </el-table>
-          </el-dialog>
-
-          <el-dialog
-            title="加入群组请求"
-            width="50%"
-            v-model="GroupRequestIsDisplay"
-            center>
-
-            <el-table :data="GroupRequestList" width="100%">
-              <el-table-column prop="id" label="id" width="80"></el-table-column>
-              <el-table-column
-                prop="name"
-                label="名称"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="email"
-                label="用户邮箱"
-                width="180"
-              ></el-table-column>
-              <el-table-column
-                prop="group_id"
-                label="群id"
-                width="180"
-              ></el-table-column>
-              <el-table-column>
-                <template #default="scope">
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    @click.prevent="AcceptFriendsOrGroup(scope.$index)"
-                    >同意请求</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    @click.prevent="RefuseFriendsOrGroup(scope.$index)"
-                    >拒绝请求</el-button>
-                  </template>
-              </el-table-column>
-            </el-table>
-          </el-dialog>
-
-          <h>
-            我建的群组
-          </h>
-          <!-- 表格  :row-style="this.tableRowClassName"-->
-          <el-table :data="tableData" width="100%" border>
-            :row-style="this.tableRowClassName"
-            <el-table-column prop="ID" label="id" width="80"></el-table-column>
-            <el-table-column
-              prop="GroupName"
-              label="名称"
-              width="100"
-            ></el-table-column>
-            <el-table-column
-              prop="GroupInfo"
-              label="描述"
-              width="180"
-            ></el-table-column>
-            <el-table-column
-              prop="GroupType"
-              label="类型"
-              width="120"
-            ></el-table-column>
-            <el-table-column
-              prop="CreatedAt"
-              label="创建时间"
-              width="120"
-            ></el-table-column>
-            <el-table-column
-              prop="UpdatedAt"
-              label="更新时间"
-              width="120"
-            ></el-table-column>
-            <el-table-column label="操作" width="350">
+      <div class="table-wrapper">
+        <div class="group-section">
+          <h3 class="group-title">我创建的群组</h3>
+          <el-table :data="tableData" style="width: 100%" stripe :row-class-name="tableRowClassName">
+            <el-table-column prop="ID" label="ID" width="80"></el-table-column>
+            <el-table-column prop="GroupName" label="名称" min-width="120"></el-table-column>
+            <el-table-column prop="GroupInfo" label="描述" min-width="180"></el-table-column>
+            <el-table-column prop="GroupType" label="类型" width="120"></el-table-column>
+            <el-table-column prop="CreatedAt" label="创建时间" width="180"></el-table-column>
+            <el-table-column prop="UpdatedAt" label="更新时间" width="180"></el-table-column>
+            <el-table-column label="操作" width="400" fixed="right">
               <template #default="scope">
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click.prevent="displayFriends(scope.$index)"
-                  >邀请</el-button
-                >
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click.prevent="displayGroupUsersInfo(scope.$index)"
-                  >成员管理</el-button
-                >
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click.prevent="updateButtonGroup(scope.$index)"
-                  >修改</el-button
-                >
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click.prevent="deleteGroup(scope.$index)"
-                  >删除</el-button
-                >
-                <!-- <el-button type="danger" size="mini">删除</el-button> -->
+                <el-button type="primary" size="small" @click.prevent="displayGroupUsersInfo(scope.$index)" :icon="User">
+                  群成员
+                </el-button>
+                <el-button type="primary" size="small" @click.prevent="updateButtonGroup(scope.$index)" :icon="Edit">
+                  修改
+                </el-button>
+                <el-button type="danger" size="small" @click.prevent="deleteGroup(scope.$index)" :icon="Delete">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
-          <br />
+        </div>
 
-           <h>
-            我加入的群组列表
-          </h>
-
-          <!-- 表格  :row-style="this.tableRowClassName"-->
-          <el-table :data="add_groups" width="100%" border>
-            :row-style="this.tableRowClassName"
-            <el-table-column prop="ID" label="id" width="80"></el-table-column>
-            <el-table-column
-              prop="GroupName"
-              label="名称"
-              width="100"
-            ></el-table-column>
-            <el-table-column
-              prop="GroupInfo"
-              label="描述"
-              width="180"
-            ></el-table-column>
-            <el-table-column
-              prop="GroupType"
-              label="类型"
-              width="120"
-            ></el-table-column>
-            <el-table-column
-              prop="CreatedAt"
-              label="创建时间"
-              width="120"
-            ></el-table-column>
-            <el-table-column
-              prop="UpdatedAt"
-              label="更新时间"
-              width="120"
-            ></el-table-column>
-            <el-table-column label="操作" width="350">
+        <div class="group-section" v-if="add_groups.length > 0">
+          <h3 class="group-title">已加入的群组</h3>
+          <el-table :data="add_groups" style="width: 100%" stripe>
+            <el-table-column prop="ID" label="ID" width="80"></el-table-column>
+            <el-table-column prop="GroupName" label="名称" min-width="120"></el-table-column>
+            <el-table-column prop="GroupInfo" label="描述" min-width="180"></el-table-column>
+            <el-table-column prop="GroupType" label="类型" width="120"></el-table-column>
+            <el-table-column prop="CreatedAt" label="创建时间" width="180"></el-table-column>
+            <el-table-column label="操作" width="140" fixed="right">
               <template #default="scope">
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click.prevent="DelFriendsOrGroup(scope.$index)"
-                  >退出群聊</el-button
-                >
-                <!-- <el-button type="danger" size="mini">删除</el-button> -->
+                <el-button type="primary" size="small" @click.prevent="DelFriendsOrGroup(scope.$index)">
+                  退出群聊
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
-          <br />
+        </div>
+      </div>
+    </el-card>
 
-          <!-- 分页条 -->
-          <!-- Pagination 分页 -->
-          <!-- <el-pagination
-            background
-            layout="total,sizes, prev, pager, next, jumper"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :total="1000"
-          ></el-pagination> -->
-        </el-main>
-      </el-container>
-    </el-container>
+    <el-dialog v-model="addDialogVisible" title="建群" width="50%" :close-on-click-modal="false">
+      <el-form ref="addFormRef" :model="addForm" label-width="100px" class="form-dialog">
+        <el-form-item label="名称">
+          <el-input v-model="addForm.group_name" autocomplete="on"></el-input>
+        </el-form-item>
+        <el-form-item label="描述">
+          <el-input v-model="addForm.group_info" type="textarea" :rows="3"></el-input>
+        </el-form-item>
+        <el-form-item label="类型">
+          <el-input v-model="addForm.group_type"></el-input>
+        </el-form-item>
+        <el-form-item label="Icon">
+          <el-input v-model="addForm.group_icon"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="addDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="addGroup()">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="updateDialogVisible" title="修改群信息" width="50%" :close-on-click-modal="false">
+      <el-form ref="updateFormRef" :model="updateForm" label-width="100px" class="form-dialog">
+        <el-form-item label="名称">
+          <el-input v-model="updateForm.group_name" autocomplete="on"></el-input>
+        </el-form-item>
+        <el-form-item label="群信息">
+          <el-input v-model="updateForm.group_info" type="textarea" :rows="3"></el-input>
+        </el-form-item>
+        <el-form-item label="群类型">
+          <el-input v-model="updateForm.group_type"></el-input>
+        </el-form-item>
+        <el-form-item label="群Icon">
+          <el-input v-model="updateForm.group_icon"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="updateDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="updateGroup()">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="成员列表" width="60%" v-model="FriendsTableIsDisplay" center>
+      <el-table :data="FriendsGList" width="100%" stripe>
+        <el-table-column prop="id" label="ID" width="80"></el-table-column>
+        <el-table-column prop="name" label="名称" min-width="120"></el-table-column>
+        <el-table-column prop="email" label="用户邮箱" min-width="180"></el-table-column>
+        <el-table-column label="操作" width="140" fixed="right">
+          <template #default="scope">
+            <el-button type="primary" size="small" @click.prevent="inviteFriendAddGroup(scope.$index)" v-if="is_del_group_user === false">
+              邀请
+            </el-button>
+            <el-button type="danger" size="small" @click.prevent="delGroupUser(scope.$index)" v-if="is_del_group_user === true">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <el-dialog title="加入群组请求" width="60%" v-model="GroupRequestIsDisplay" center>
+      <el-table :data="GroupRequestList" width="100%" stripe>
+        <el-table-column prop="id" label="ID" width="80"></el-table-column>
+        <el-table-column prop="name" label="名称" min-width="120"></el-table-column>
+        <el-table-column prop="email" label="用户邮箱" min-width="180"></el-table-column>
+        <el-table-column prop="group_id" label="群ID" width="100"></el-table-column>
+        <el-table-column label="操作" width="200" fixed="right">
+          <template #default="scope">
+            <el-button type="success" size="small" @click.prevent="AcceptFriendsOrGroup(scope.$index)">
+              同意
+            </el-button>
+            <el-button type="danger" size="small" @click.prevent="RefuseFriendsOrGroup(scope.$index)">
+              拒绝
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
-<style>
-.blueRowbg {
-  background: "#488aff";
+
+<style scoped>
+.page-container {
+  width: 100%;
+  height: 100%;
 }
-</style>
\ No newline at end of file
+
+.page-card {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  border: none;
+  border-radius: 8px;
+}
+
+.page-card :deep(.el-card__body) {
+  flex: 1;
+  overflow: hidden;
+  padding: 20px;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+}
+
+.page-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.header-actions {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.table-wrapper {
+  height: 100%;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
+}
+
+.table-wrapper :deep(.el-table) {
+  border-radius: 4px;
+}
+
+.group-section {
+  flex-shrink: 0;
+}
+
+.group-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 12px;
+}
+
+.form-dialog {
+  padding: 10px 0;
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 12px;
+}
+</style>
diff --git a/src/views/ShellList.vue b/src/views/ShellList.vue
index 2771b41..7ada5be 100644
--- a/src/views/ShellList.vue
+++ b/src/views/ShellList.vue
@@ -322,6 +322,7 @@ export default {
           stripe
           :row-class-name="tableRowClassName">
           <el-table-column prop="ID" label="ID" width="80"></el-table-column>
+          <el-table-column prop="Server" label="服务器" min-width="150" show-overflow-tooltip></el-table-column>
           <el-table-column prop="ShellName" label="命令名称" min-width="150" show-overflow-tooltip></el-table-column>
           <el-table-column prop="ShellContent" label="命令内容" min-width="200" show-overflow-tooltip></el-table-column>
           <el-table-column prop="Status" label="状态" width="100">
diff --git a/src/views/UserList.vue b/src/views/UserList.vue
index cd2689d..87d3622 100644
--- a/src/views/UserList.vue
+++ b/src/views/UserList.vue
@@ -434,7 +434,7 @@ export default {
               style="width: 250px"
             >
               <template #append>
-                <el-button @click="getUserList" :icon="Search"></el-button>
+                <el-button @click="getUserList" type="primary">搜索</el-button>
               </template>
             </el-input>
             <el-button type="primary" @click="displayFriends()" :icon="User">
diff --git a/src/views/VideoPlayer.vue b/src/views/VideoPlayer.vue
index ed59db8..633bc55 100644
--- a/src/views/VideoPlayer.vue
+++ b/src/views/VideoPlayer.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script setup>
-import { onUnmounted, ref, nextTick } from "vue";
+import { onMounted, onUnmounted, ref, nextTick } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import videojs from "video.js";
 import "video.js/dist/video-js.css";
@@ -19,55 +19,47 @@ import "video.js/dist/video-js.css";
 const videoPlayer = ref(null);
 const myPlayer = ref(null);
 
-export default {
-  name: "VideoPlayer",
-  props: {},
-  data() {
-  },
-  methods: {
-    playVideoA(){
-      nextTick(() => {
-          myPlayer.value = videojs(videoPlayer.value, {
-            // poster: "//vjs.zencdn.net/v/oceans.png",//视频封面照片
-            controls: true, //视频控件
-            autoplay: true, //自动播放
-            sources: [
-              {
-                src:
-                  "https://gep.ljsea.top/video/mp4?filename=" +
-                  localStorage.getItem("video_name") +
-                  "&id=" +
-                  localStorage.getItem("video_id") +
-                  "&ip=" +
-                  localStorage.getItem("ip")+
-                  "&userId=" +
-                  localStorage.getItem("userId") +
-                  "&token=" +
-                  localStorage.getItem("token"), //视频地址
-                type: localStorage.getItem("video_name").split('.')[1]==="m3u8" ?"application/vnd.apple.mpegurl":"video/mp4",
-              },
-            ],
-            controlBar: {
-              remainingTimeDisplay: {
-                displayNegative: false,
-              }
-            },
-            playbackRates: [0.5, 1, 1.5, 2], //设置播放速度
-          });
-        });
-    }
-  },
-  onMounted(){
-    this.playVideoA();
-  },
-  onUnmounted(){
-    if (myPlayer.value) {
-        myPlayer.value.dispose();
-      }
-  }
-}
+const playVideoA = () => {
+  nextTick(() => {
+    myPlayer.value = videojs(videoPlayer.value, {
+      // poster: "//vjs.zencdn.net/v/oceans.png",//视频封面照片
+      controls: true, //视频控件
+      autoplay: true, //自动播放
+      sources: [
+        {
+          src:
+            "https://gep.ljsea.top/video/mp4?filename=" +
+            localStorage.getItem("video_name") +
+            "&id=" +
+            localStorage.getItem("video_id") +
+            "&ip=" +
+            localStorage.getItem("ip")+
+            "&userId=" +
+            localStorage.getItem("userId") +
+            "&token=" +
+            localStorage.getItem("token"), //视频地址
+          type: localStorage.getItem("video_name").split('.')[1]==="m3u8" ?"application/vnd.apple.mpegurl":"video/mp4",
+        },
+      ],
+      controlBar: {
+        remainingTimeDisplay: {
+          displayNegative: false,
+        }
+      },
+      playbackRates: [0.5, 1, 1.5, 2], //设置播放速度
+    });
+  });
+};
 
-// export default VideoPlayer;
+onMounted(() => {
+  playVideoA();
+});
+
+onUnmounted(() => {
+  if (myPlayer.value) {
+    myPlayer.value.dispose();
+  }
+});
 </script>
 
 <style lang="scss" scoped>