Merge pull request 'master' (#6) from master into deploy

Reviewed-on: lin/ApiServer-Web-admin_dashboard_pc#6

src/utils/acs/mirror.js

@@ -1,7 +1,7 @@
 import {http2} from "@/utils/request.js";
 /**获取镜像列表 */
 export const getMirrorList = data => {
-  return http2.get(`/v1/image/list?server_id=${data}`);
+  return http2.get(`/v1/image/list?server_id=${data.server_id}&page=${data.page}&count=${data.count}&key=${data.key}&class_id=${data.class_id}`);
 };
 /*用户获取镜像列表 */
 export const getUserMirrorList = data => {

src/views/acs/nodes/Nodes.vue

@@ -500,14 +500,7 @@ const handleGuacamoleChange = (selectedId) => {
   }
   
   // 找到选中的 Guacamole 配置
-  const selectedGuacamole = guacamoleList.value.find(item => item.id === selectedId)
-  if (selectedGuacamole) {
-    // 自动填充相关字段
-    serverForm.username = selectedGuacamole.username
-    serverForm.password = selectedGuacamole.password
   
-    ElMessage.success(`已自动填充 ${selectedGuacamole.url} 的配置信息`)
-  }
 }
 
 // 添加服务器

src/views/acs/nodes/server.vue

@@ -1102,7 +1102,6 @@
                 <el-select
                   v-model="addContainerForm.image_id"
                   placeholder="请选择镜像"
-                  style="width: 100%"
                   clearable
                   :loading="containerMirrorLoading"
                   @focus="fetchContainerMirrorList"
@@ -2332,8 +2331,7 @@ const addContainerRules = computed(() => {
   if (addContainerForm.value.networkType === 'port_forward' || addContainerForm.value.networkType === 'nginx') {
     rules.containerPort = [
       { required: true, message: '请输入容器端口', trigger: 'blur' },
-      { type: 'number', min: 1, max: 65535, message: '请输入有效的端口(1-65535)', trigger: 'blur' }
+      { pattern: /^[1-9]\d*$/, message: '请输入有效的正整数端口', trigger: 'blur' }, ];
-    ];
   }
 
   if (addContainerForm.value.networkType === 'nginx') {
@@ -2377,7 +2375,7 @@ const fetchContainerMirrorList = async () => {
   
   containerMirrorLoading.value = true;
   try {
-    const response = await getMirrorList(route.query.server_id);
+    const response = await getMirrorList({server_id: route.query.server_id, page: 1, count: 999,key: '',class_id: ''});
     console.log("获取镜像列表1111：",response);
     
     if (response && response.data && response.data.code === 200) {
@@ -2968,6 +2966,7 @@ import { ElMessageBox } from 'element-plus';
   border-bottom: 1px dashed #ebeef5;
 }
 
+
 .dialog-footer {
   display: flex;
   justify-content: space-between;