Merge pull request #1238 from xinnan-tech/web-Supplier-Page

增加供应器管理页面，优化页面样式和数据校验

main/manager-web/src/components/HeaderBar.vue

@@ -35,12 +35,12 @@
           OTA管理
         </div>
         <el-dropdown v-if="isSuperAdmin" trigger="click" class="equipment-management more-dropdown"
-          :class="{ 'active-tab': $route.path === '/dict-management' || $route.path === '/params-management' }">
+          :class="{ 'active-tab': $route.path === '/dict-management' || $route.path === '/params-management' || $route.path === '/provider-management' }" @visible-change="handleParamDropdownVisibleChange">
           <span class="el-dropdown-link">
             <img loading="lazy" alt="" src="@/assets/header/param_management.png"
-              :style="{ filter: $route.path === '/dict-management' || $route.path === '/params-management' ? 'brightness(0) invert(1)' : 'None' }" />
+              :style="{ filter: $route.path === '/dict-management' || $route.path === '/params-management' || $route.path === '/provider-management' ? 'brightness(0) invert(1)' : 'None' }" />
             参数字典
-            <i class="el-icon-arrow-down el-icon--right"></i>
+            <i class="el-icon-arrow-down el-icon--right" :class="{ 'rotate-down': paramDropdownVisible }"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="goParamManagement">
@@ -49,6 +49,9 @@
             <el-dropdown-item @click.native="goDictManagement">
               字典管理
             </el-dropdown-item>
+            <el-dropdown-item @click.native="goProviderManagement">
+              供应器管理
+            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
@@ -62,9 +65,10 @@
           </el-input>
         </div>
         <img loading="lazy" alt="" src="@/assets/home/avatar.png" class="avatar-img" />
-        <el-dropdown trigger="click" class="user-dropdown">
+        <el-dropdown trigger="click" class="user-dropdown" @visible-change="handleUserDropdownVisibleChange">
           <span class="el-dropdown-link">
-            {{ userInfo.username || '加载中...' }}<i class="el-icon-arrow-down el-icon--right"></i>
+            {{ userInfo.username || '加载中...' }}
+            <i class="el-icon-arrow-down el-icon--right" :class="{ 'rotate-down': userDropdownVisible }"></i>
           </span>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="showChangePasswordDialog">修改密码</el-dropdown-item>
@@ -84,7 +88,6 @@ import userApi from '@/apis/module/user';
 import { mapActions, mapGetters } from 'vuex';
 import ChangePasswordDialog from './ChangePasswordDialog.vue'; // 引入修改密码弹窗组件
 
-
 export default {
   name: 'HeaderBar',
   components: {
@@ -98,7 +101,9 @@ export default {
         username: '',
         mobile: ''
       },
-      isChangePasswordDialogVisible: false // 控制修改密码弹窗的显示
+      isChangePasswordDialogVisible: false, // 控制修改密码弹窗的显示
+      userDropdownVisible: false,
+      paramDropdownVisible: false
     }
   },
   computed: {
@@ -130,6 +135,9 @@ export default {
     goDictManagement() {
       this.$router.push('/dict-management')
     },
+    goProviderManagement() {
+      this.$router.push('/provider-management')
+    },
     // 获取用户信息
     fetchUserInfo() {
       userApi.getUserInfo(({ data }) => {
@@ -184,6 +192,13 @@ export default {
         });
       }
     },
+    handleUserDropdownVisibleChange(visible) {
+      this.userDropdownVisible = visible;
+    },
+    // 监听第二个下拉菜单的可见状态变化
+    handleParamDropdownVisibleChange(visible) {
+      this.paramDropdownVisible = visible;
+    },
 
     // 使用 mapActions 引入 Vuex 的 logout action
     ...mapActions(['logout'])
@@ -191,7 +206,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .header {
   background: #f6fcfe66;
   border: 1px solid #fff;
@@ -243,8 +258,6 @@ export default {
 }
 
 .equipment-management {
-  padding: 0 9px;
-  width: px;
   height: 30px;
   border-radius: 15px;
   background: #deeafe;
@@ -260,7 +273,8 @@ export default {
   cursor: pointer;
   flex-shrink: 0;
   /* 防止导航按钮被压缩 */
-  padding: 0px 15px;
+  padding: 0 15px;
+  position: relative;
 }
 
 .equipment-management.active-tab {
@@ -309,6 +323,25 @@ export default {
   flex-shrink: 0;
 }
 
+.more-dropdown {
+  padding-right: 20px;
+}
+
+.more-dropdown .el-dropdown-link {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+}
+
+.rotate-down {
+  transform: rotate(180deg);
+  transition: transform 0.3s ease;
+}
+
+.el-icon-arrow-down {
+  transition: transform 0.3s ease;
+}
+
 /* 响应式调整 */
 @media (max-width: 1200px) {
   .header-center {
@@ -316,7 +349,7 @@ export default {
   }
 
   .equipment-management {
-    width: 70px;
+    width: 79px;
     font-size: 9px;
   }
 }

main/manager-web/src/components/ProviderDialog.vue

@@ -0,0 +1,418 @@
+<template>
+  <el-dialog :visible="visible" @update:visible="handleVisibleChange" width="57%" center custom-class="custom-dialog" :show-close="false" class="center-dialog">
+
+    <div style="margin: 0 18px; text-align: left; padding: 10px; border-radius: 10px;">
+      <div style="font-size: 30px; color: #3d4566; margin-top: -15px; margin-bottom: 20px; text-align: center;">
+        {{ title }}
+      </div>
+
+      <button class="custom-close-btn" @click="handleClose">×</button>
+
+      <el-form :model="form" label-width="100px" :rules="rules" ref="form" class="custom-form">
+        <div style="display: flex; gap: 20px; margin-bottom: 20px;">
+          <el-form-item label="类别" prop="model_type" style="flex: 1;">
+            <el-select v-model="form.model_type" placeholder="请选择类别" class="custom-input-bg" style="width: 100%;">
+              <el-option v-for="item in modelTypes" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="供应器编码" prop="provider_code" style="flex: 1;">
+            <el-input v-model="form.provider_code" placeholder="请输入供应器编码" class="custom-input-bg"></el-input>
+          </el-form-item>
+        </div>
+
+        <div style="display: flex; gap: 20px; margin-bottom: 20px;">
+          <el-form-item label="名称" prop="name" style="flex: 1;">
+            <el-input v-model="form.name" placeholder="请输入供应器名称" class="custom-input-bg"></el-input>
+          </el-form-item>
+          <el-form-item label="排序" prop="sort" style="flex: 1;">
+            <el-input-number v-model="form.sort" :min="0" controls-position="right" class="custom-input-bg" style="width: 100%;"></el-input-number>
+          </el-form-item>
+        </div>
+
+        <div style="font-size: 20px; font-weight: bold; color: #3d4566; margin-bottom: 15px;">
+          字段配置
+          <div style="display: inline-block; float: right;">
+            <el-button type="primary" @click="addField" size="small" style="background: #5bc98c; border: none;" :disabled="hasIncompleteFields">
+              添加
+            </el-button>
+            <el-button type="primary" @click="toggleSelectAllFields" size="small" style="background: #5f70f3; border: none; margin-left: 10px;">
+              {{ isAllFieldsSelected ? '取消全选' : '全选' }}
+            </el-button>
+            <el-button type="danger" @click="batchRemoveFields" size="small" style="background: red; border: none; margin-left: 10px;">
+              批量删除
+            </el-button>
+          </div>
+        </div>
+        <div style="height: 2px; background: #e9e9e9; margin-bottom: 22px;"></div>
+
+        <div class="fields-container">
+          <el-table :data="form.fields" style="width: 100%;" border size="medium" :key="tableKey">
+            <el-table-column label="选择" align="center" width="120">
+              <template slot-scope="scope">
+                <el-checkbox v-model="scope.row.selected" @change="handleFieldSelectChange"></el-checkbox>
+              </template>
+            </el-table-column>
+            <el-table-column label="字段key">
+              <template slot-scope="scope">
+                <template v-if="scope.row.editing">
+                  <el-input v-model="scope.row.key" placeholder="字段key"></el-input>
+                </template>
+                <template v-else>
+                  {{ scope.row.key || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="字段标签">
+              <template slot-scope="scope">
+                <template v-if="scope.row.editing">
+                  <el-input v-model="scope.row.label" placeholder="字段标签"></el-input>
+                </template>
+                <template v-else>
+                  {{ scope.row.label || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="字段类型">
+              <template slot-scope="scope">
+                <template v-if="scope.row.editing">
+                  <el-select v-model="scope.row.type" placeholder="类型">
+                    <el-option label="字符串" value="string"></el-option>
+                    <el-option label="数字" value="number"></el-option>
+                    <el-option label="布尔值" value="boolean"></el-option>
+                    <el-option label="字典" value="dict"></el-option>
+                  </el-select>
+                </template>
+                <template v-else>
+                  {{ getTypeLabel(scope.row.type) }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="150" align="center">
+              <template slot-scope="scope">
+                <el-button v-if="!scope.row.editing" type="primary" size="mini" @click="startEditing(scope.row)">
+                  编辑
+                </el-button>
+                <el-button v-else type="success" size="mini" @click="stopEditing(scope.row)">
+                  完成
+                </el-button>
+                <el-button type="danger" size="mini" @click="removeField(scope.$index)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-form>
+    </div>
+
+    <div style="display: flex; justify-content: center;">
+      <el-button type="primary" @click="submit" class="save-btn" :loading="saving">保存</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: {
+    title: String,
+    visible: Boolean,
+    form: Object,
+    modelTypes: Array
+  },
+  data() {
+    return {
+      saving: false,
+      rules: {
+        model_type: [{required: true, message: '请选择类别', trigger: 'change'}],
+        provider_code: [{required: true, message: '请输入供应器编码', trigger: 'blur'}],
+        name: [{required: true, message: '请输入供应器名称', trigger: 'blur'}]
+      },
+      isAllFieldsSelected: false,
+      tableKey: 0 // 用于强制表格重新渲染
+    };
+  },
+  computed: {
+    hasIncompleteFields() {
+      return this.form.fields && this.form.fields.some(field =>
+        !field.key || !field.label || !field.type
+      );
+    }
+  },
+  methods: {
+    getTypeLabel(type) {
+      const typeMap = {
+        'string': '字符串',
+        'number': '数字',
+        'boolean': '布尔值',
+        'dict': '字典'
+      };
+      return typeMap[type] || '-';
+    },
+
+    startEditing(row) {
+      this.$set(row, 'editing', true);
+    },
+
+    stopEditing(row) {
+      this.$set(row, 'editing', false);
+
+      const index = this.form.fields.indexOf(row);
+      if (index > -1) {
+        this.form.fields.splice(index, 1);
+        this.form.fields.push(row);
+        this.forceTableRerender();
+      }
+    },
+
+    handleFieldSelectChange() {
+      this.isAllFieldsSelected = this.form.fields.length > 0 &&
+        this.form.fields.every(field => field.selected);
+    },
+
+    toggleSelectAllFields() {
+      this.isAllFieldsSelected = !this.isAllFieldsSelected;
+      this.form.fields = this.form.fields.map(field => ({
+        ...field,
+        selected: this.isAllFieldsSelected
+      }));
+    },
+
+    handleVisibleChange(val) {
+      this.$emit('update:visible', val);
+      if (!val) {
+        this.resetForm();
+      }
+    },
+
+    handleClose() {
+      this.resetForm();
+      this.$emit('update:visible', false);
+      this.$emit('cancel');
+    },
+
+    addField() {
+      if (this.hasIncompleteFields) {
+        this.$message.warning({
+          message: '请先完成当前字段的编辑',
+          showClose: true
+        });
+        return;
+      }
+
+      this.form.fields.unshift({
+        key: '',
+        label: '',
+        type: 'string',
+        selected: false,
+        editing: true
+      });
+      this.forceTableRerender();
+    },
+
+    removeField(index) {
+      this.$confirm('确定要删除该字段吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.form.fields = this.form.fields.filter((_, i) => i !== index);
+        this.updateSelectAllStatus();
+        this.forceTableRerender();
+        this.$message.success({
+          message: '删除成功',
+          showClose: true
+        });
+      }).catch(() => {
+        this.$message.info({
+          message: '已取消删除',
+          showClose: true
+        });
+      });
+    },
+
+    batchRemoveFields() {
+      const selectedFields = this.form.fields.filter(field => field.selected);
+      if (selectedFields.length === 0) {
+        this.$message.warning({
+          message: '请先选择要删除的字段',
+          showClose: true
+        });
+        return;
+      }
+      this.$confirm(`确定要删除选中的 ${selectedFields.length} 个字段吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.form.fields = this.form.fields.filter(field => !field.selected);
+        this.isAllFieldsSelected = false;
+        this.forceTableRerender();
+        this.$message.success({
+          message: `成功删除 ${selectedFields.length} 个字段`,
+          showClose: true
+        });
+      }).catch(() => {
+        this.$message.info({
+          message: '已取消删除',
+          showClose: true
+        });
+      });
+    },
+
+    updateSelectAllStatus() {
+      this.isAllFieldsSelected = this.form.fields.length > 0 &&
+        this.form.fields.every(field => field.selected);
+    },
+
+    forceTableRerender() {
+      this.tableKey += 1; // 改变key值强制表格重新渲染
+    },
+
+    submit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          const editingField = this.form.fields.find(field => field.editing);
+          if (editingField) {
+            this.$message.warning({
+              message: '请先完成当前字段的编辑',
+              showClose: true
+            });
+            return;
+          }
+
+          this.form.fields = this.form.fields.map(field => ({
+            ...field,
+            selected: false
+          }));
+          this.isAllFieldsSelected = false;
+
+          this.saving = true;
+          this.$emit('submit', {
+            form: this.form,
+            done: () => {
+              this.saving = false;
+              this.resetForm();
+            }
+          });
+        }
+      });
+    },
+
+    resetForm() {
+      this.$refs.form.resetFields();
+      if (this.form.fields) {
+        this.form.fields.forEach(field => {
+          field.selected = false;
+          field.editing = false;
+        });
+      }
+      this.isAllFieldsSelected = false;
+      this.forceTableRerender();
+    },
+
+  },
+  watch: {
+    visible(val) {
+      if (!val) {
+        this.resetForm();
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .custom-dialog.el-dialog {
+  margin-top: 0 !important;
+  border-radius: 20px !important;
+}
+
+::v-deep .custom-dialog .el-dialog__header {
+  padding: 0;
+  border-bottom: none;
+}
+
+.custom-close-btn {
+  position: absolute;
+  top: 20px;
+  right: 20px;
+  width: 35px;
+  height: 35px;
+  border-radius: 50%;
+  border: 2px solid #cfcfcf;
+  background: none;
+  font-size: 30px;
+  font-weight: lighter;
+  color: #cfcfcf;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1;
+  padding: 0;
+  outline: none;
+}
+
+.custom-close-btn:hover {
+  color: #409EFF;
+  border-color: #409EFF;
+}
+
+.custom-form .el-form-item {
+  margin-bottom: 20px;
+}
+
+.custom-form .el-form-item__label {
+  color: #3d4566;
+  font-weight: normal;
+  text-align: right;
+  padding-right: 20px;
+}
+
+.custom-input-bg .el-input__inner {
+  background-color: #f6f8fc;
+  height: 32px;
+}
+
+.custom-input-bg .el-input__inner::-webkit-input-placeholder {
+  color: #9c9f9e;
+}
+
+.fields-container {
+  margin-bottom: 20px;
+}
+
+.save-btn {
+  background: #e6f0fd;
+  color: #237ff4;
+  border: 1px solid #b3d1ff;
+  width: 150px;
+  height: 40px;
+  font-size: 16px;
+  transition: all 0.3s ease;
+}
+
+.save-btn:hover {
+  background: linear-gradient(to right, #237ff4, #9c40d5);
+  color: white;
+  border: none;
+}
+
+.el-table {
+  border-radius: 4px;
+}
+
+.el-table::before {
+  display: none;
+}
+
+.el-table th, .el-table td {
+  padding: 8px 0;
+}
+
+.el-button.is-circle{
+  border-radius: 2px;
+}
+</style>

main/manager-web/src/components/TtsModel.vue

@@ -336,6 +336,14 @@ export default {
     },
 
     saveEdit(row) {
+      if (!row.voiceCode || !row.voiceName || !row.languageType) {
+        this.$message.error({
+          message: '音色编码、音色名称和语言类型不能为空',
+          showClose: true
+        });
+        return;
+      }
+
       try {
         const params = {
           id: row.id,
@@ -408,6 +416,12 @@ export default {
     },
 
     addNew() {
+      const hasEditing = this.ttsModels.some(row => row.editing);
+      if (hasEditing) {
+        this.$message.warning('请先完成当前编辑再新增');
+        return;
+      }
+
       const maxSort = this.ttsModels.length > 0
           ? Math.max(...this.ttsModels.map(item => Number(item.sort) || 0))
           : 0;