From 5a501077f68dc5edfff3ba17ac0c22748f65974e Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Tue, 19 Aug 2025 15:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=99=E7=82=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BA=A4=E4=BA=92=E3=80=81=E4=BF=AE=E6=94=B9=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E5=B1=95=E7=A4=BA=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GuipInput.vue  | 40 +++++++++++++++++++---------------------
 src/components/GuipRadio.vue  | 26 ++++++++++++++++++++++++++
 src/components/GuipSelect.vue | 40 ++++++++++++++++++++--------------------
 src/style/theme/index.css     |  3 ++-
 src/views/agent/siteList.vue  |  5 +++--
 5 files changed, 70 insertions(+), 44 deletions(-)

diff --git a/src/components/GuipInput.vue b/src/components/GuipInput.vue
index eed7f1a..04abb86 100644
--- a/src/components/GuipInput.vue
+++ b/src/components/GuipInput.vue
@@ -1,8 +1,7 @@
 <template>
-  <el-form-item :style="{ ...styleObject, display: 'flex', flexDirection: 'column' }" :required="required"
+  <el-form-item :style="{ ...styleObject}" :required="required"
     :class="[{ 'column': column }, { 'w510': addClass == 'w510' }, { 'w388': addClass == 'w388' }, 'form-item']" :label="label"
-    :prop="prop" :rules="rules" class="custom-form-item">
-    <div class="input-wrapper">  <!-- 添加包裹层 -->
+    :prop="prop" :rules="rules" >
     <p v-if="desc" class="desc_right">{{ desc }}</p>
     <el-input :type="type" v-bind="$attrs" :placeholder="placeholder1" :disabled="disabled" :maxlength="maxlength1"
       :style="{ width: width, height: height }" :value="inputValue" :minLength="minLength1" :show-word-limit="showWordLimit"
@@ -30,7 +29,6 @@
     </el-input>
     <!-- 单位 -->
     <span class="unit" v-if="unit">{{ unit }}</span>
-  </div>
   </el-form-item>
 
 </template>
@@ -149,23 +147,23 @@ export default {
   pointer-events: none;
   /* 防止单位文本影响输入框的点击事件 */
 }
-.custom-form-item {
-  ::v-deep .el-form-item__content {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-  }
+// .custom-form-item {
+//   ::v-deep .el-form-item__content {
+//     display: flex;
+//     flex-direction: column;
+//     align-items: flex-start;
+//   }
 
-  .input-wrapper {
-    position: relative;
-    width: 100%;
-  }
+//   .input-wrapper {
+//     position: relative;
+//     width: 100%;
+//   }
 
-  ::v-deep .el-form-item__error {
-    position: relative;
-    margin-top: 4px;
-    padding-top: 0;
-    line-height: 1;
-  }
-}
+//   ::v-deep .el-form-item__error {
+//     position: relative;
+//     margin-top: 4px;
+//     padding-top: 0;
+//     line-height: 1;
+//   }
+// }
 </style>
\ No newline at end of file
diff --git a/src/components/GuipRadio.vue b/src/components/GuipRadio.vue
index 1428f05..fcedc89 100644
--- a/src/components/GuipRadio.vue
+++ b/src/components/GuipRadio.vue
@@ -178,4 +178,30 @@ export default {
   gap: 20px 24px;
   flex-wrap: wrap;
 }
+.custom-form-item {
+  ::v-deep .el-form-item__content {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    min-height: auto;  /* 允许高度自由扩展 */
+  }
+
+  /* 错误提示样式调整 */
+  ::v-deep .el-form-item__error {
+    position: relative;  /* 改为相对定位 */
+    margin-top: 4px;    /* 与单选框组保持间距 */
+    padding-top: 0;
+    line-height: 1.5;
+    white-space: normal; /* 允许错误信息换行 */
+  }
+
+  /* 单选框组布局调整 */
+  .el-radio-group {
+    margin: 10px 0;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20px 24px;
+    width: 100%;  /* 确保宽度填满 */
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/components/GuipSelect.vue b/src/components/GuipSelect.vue
index c8387f6..bb02428 100644
--- a/src/components/GuipSelect.vue
+++ b/src/components/GuipSelect.vue
@@ -1,7 +1,7 @@
 <template>
   <el-form-item :style="{ ...style, height: height, ...styleObject }" :required="required"
     :class="[{ 'column': column }, { 'w510': addClass == 'w510' }, { 'w388': addClass == 'w388' }, 'form-item']"
-    :label="label" :prop="prop" :rules="rules" class="custom-form-item">
+    :label="label" :prop="prop" :rules="rules">
     <p v-if="desc" class="desc_right">{{ desc }}</p>
     <el-select :style="{ width: width }" :placeholder="placeholder1" @change="handleChange" v-model="selectedValue"
       v-bind="$attrs">
@@ -143,25 +143,25 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-.custom-form-item {
-  ::v-deep .el-form-item__content {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    min-height: auto;  /* 允许高度自由扩展 */
-  }
+// .custom-form-item {
+//   ::v-deep .el-form-item__content {
+//     display: flex;
+//     flex-direction: column;
+//     align-items: flex-start;
+//     min-height: auto;  /* 允许高度自由扩展 */
+//   }
 
-  ::v-deep .el-form-item__error {
-    position: relative;  /* 改为相对定位 */
-    margin-top: 4px;    /* 与输入框保持间距 */
-    padding-top: 0;
-    line-height: 1;
-    white-space: normal; /* 允许错误信息换行 */
-  }
+//   ::v-deep .el-form-item__error {
+//     position: relative;  /* 改为相对定位 */
+//     margin-top: 4px;    /* 与输入框保持间距 */
+//     padding-top: 0;
+//     line-height: 1;
+//     white-space: normal; /* 允许错误信息换行 */
+//   }
 
-  /* 确保 Select 组件宽度填满父容器 */
-  .el-select {
-    width: 100%;
-  }
-}
+//   /* 确保 Select 组件宽度填满父容器 */
+//   .el-select {
+//     width: 100%;
+//   }
+// }
 </style>
\ No newline at end of file
diff --git a/src/style/theme/index.css b/src/style/theme/index.css
index 2de108e..c57ce1f 100644
--- a/src/style/theme/index.css
+++ b/src/style/theme/index.css
@@ -12567,9 +12567,10 @@ border-color:#006AFF !important;
     font-size: 12px;
     line-height: 1;
     padding-top: 4px;
+    text-align: right;
     position: absolute;
     top: 100%;
-    left: 0
+    right: 0
 }
 
 .el-form-item__error--inline {
diff --git a/src/views/agent/siteList.vue b/src/views/agent/siteList.vue
index 0d48b73..bcf5eed 100644
--- a/src/views/agent/siteList.vue
+++ b/src/views/agent/siteList.vue
@@ -86,8 +86,9 @@
 
                         <el-table-column label="操作" fixed="right">
                             <template slot-scope="scope">
-                                <el-link type="primary" :href="serviceListUrl+'?uid='+scope.row.uid" target="_blank" class="mr-16">服务列表</el-link>
-                                <el-link type="primary" :href="siteSettingUrl+'?uid='+scope.row.uid" target="_blank">站点设置</el-link>
+                                <el-link type="primary" v-if="scope.row.config_progress_status == '3'" :href="addNewSiteUrl+'?uid='+scope.row.uid" target="_blank" class="mr-16">继续配置</el-link>
+                                <el-link type="primary" v-if="scope.row.config_progress_status != '3'" :href="serviceListUrl+'?uid='+scope.row.uid" target="_blank" class="mr-16">服务列表</el-link>
+                                <el-link type="primary" v-if="scope.row.config_progress_status != '3'" :href="siteSettingUrl+'?uid='+scope.row.uid" target="_blank">站点设置</el-link>
                             </template>
                         </el-table-column>