提交代码

src/views/dataCenter/library/components/file.vue

@@ -230,7 +230,7 @@
         <el-form-item label="旧的名称" prop="oldName">
           <el-input v-model="renameForm.oldName"  :disabled="true" readonly />
         </el-form-item>
-        <el-form-item label="旧的名称" prop="newName">
+        <el-form-item label="新的名称" prop="newName">
           <el-input v-model="renameForm.newName" maxlength="20" placeholder="请输入名称" />
         </el-form-item>
       </el-form>
@@ -449,7 +449,7 @@ export default {
       const fileId = row.fileId || this.ids
       getFile(fileId).then(response => {
         this.renameForm = response.data;
-        this.renameForm.oldName= this.renameForm.fileName.split(".").slice(0, -1).join(".");
+        this.renameForm.oldName= this.renameForm.fileName.split('.')[0];
         this.renameOpen = true;
         this.title = "重命名";
       });
@@ -457,9 +457,13 @@ export default {
     submitName(){
       this.$refs["renameForm"].validate(valid => {
         if (valid) {
+          const { newName, fileName } = this.renameForm;
+          // 检查是否存在后缀名
+          const extension = fileName.includes('.') ? fileName.split('.').pop() : '';
+          const fullFileName = `${newName}${extension ? '.' + extension : ''}`;
           let data = {
             fileId: this.renameForm.fileId,
-            fileName : this.renameForm.newName+"."+this.renameForm.fileName.split(".").pop(),
+            fileName : fullFileName,
           }
           updateFile(data).then(response => {
             this.$modal.msgSuccess("修改成功");

src/views/dataCenter/library/components/recycleBinFile.vue

@@ -155,7 +155,7 @@ export default {
         return dataRecovery(fileIds);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("还原成功");
       }).catch(() => {});
     }
   }

src/views/dataCenter/library/components/sharedSpaceFile.vue

@@ -50,7 +50,7 @@
         </template>
       </el-table-column>
       <el-table-column label="标签类型" align="center"  min-width="120" />
-      <el-table-column label="共享人" align="center"  min-width="120" />
+      <el-table-column label="共享人" align="center" prop="createBy"  min-width="120" />
       <el-table-column label="上传时间" align="center" prop="createTime" min-width="120" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>

src/views/dataCenter/teamMember/index.vue

@@ -79,7 +79,10 @@
       </el-table-column>
       <el-table-column label="角色" align="center" prop="roleId" >
         <template slot-scope="scope">
-          <span>{{ options.find(opt => opt.value === scope.row.roleId).label }}</span>
+          <span>{{ options
+            .filter(opt => scope.row.roleId.split(",").includes(opt.value))
+            .map(opt => opt.label)
+            .join(", ") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -113,8 +116,8 @@
     <!-- 添加或修改标注人员和角色关联对话框 -->
     <el-dialog title="添加" :visible.sync="addOpen" width="800px"  append-to-body>
       <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="80px">
-      <el-form-item label="角色" prop="roleId">
-        <el-select v-model="addForm.roleId" style="width: 30%;" placeholder="请选择">
+      <el-form-item label="角色" prop="roleIds">
+        <el-select v-model="addForm.roleIds" multiple   style="width: 30%;" placeholder="请选择">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -150,8 +153,8 @@
         <el-form-item label="姓名" prop="userName">
           <el-input v-model="form.userName" maxlength="20" readonly placeholder="请输入姓名" />
         </el-form-item>
-        <el-form-item label="角色" prop="roleId">
-          <el-select v-model="form.roleId" style="width: 100%" placeholder="请选择角色">
+        <el-form-item label="角色" prop="roleIds">
+          <el-select v-model="form.roleIds" @change="$forceUpdate()" multiple style="width: 100%" placeholder="请选择角色">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -210,14 +213,17 @@ export default {
         sex:''
       },
       // 表单参数
-      form: {},
+      form: {
+        roleIds:[]
+      },
       addForm:{
-        roleId:null,
+        roleIds:[],
         selectedData:[]
       },
       addRules:{
-        roleId: [
+        roleIds: [
           { required: true, message: '请选择角色', trigger: 'blur' },
+          { type: 'array', min: 1, message: '请选择至少一个角色', trigger: 'blur' }
         ],
         selectedData: [
           { required: true, message: '请选择人员', trigger: 'blur' },
@@ -232,8 +238,9 @@ export default {
       }],
       // 表单校验
       rules: {
-        roleId: [
+        roleIds: [
           { required: true, message: '请选择角色', trigger: 'blur' },
+          { type: 'array', min: 1, message: '请选择至少一个角色', trigger: 'blur' }
         ],
       }
     };
@@ -288,6 +295,7 @@ export default {
     addTeamMember(){
       this.$refs["addForm"].validate(valid => {
         if (valid) {
+          this.addForm.roleId = this.addForm.roleIds.join(",")
           addTeamMember(this.addForm).then(response => {
             this.$modal.msgSuccess("新增成功");
             this.addOpen = false;
@@ -344,6 +352,8 @@ export default {
       const memberId = row.memberId || this.ids
       getTeamMember(memberId).then(response => {
         this.form = response.data;
+        this.form.roleIds = this.form.roleId.split(",").map(role => role.trim()); // 确保去除空格
+        console.log(this.form);
         this.open = true;
         this.title = "修改";
       });
@@ -352,6 +362,7 @@ export default {
     updateTeamMember() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.roleId = this.form.roleIds.join(",")
             updateTeamMember(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;