Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

ZengTao

2024-05-30 17fc2a65cc8630dcaa7eea4271c6a003935ccc41

 UI-Project/src/views/User/userlist.vue

@@ -5,7 +5,7 @@
const router = useRouter()
const add = ref(false)
const adda = ref(false)

const editingUser = ref({}); // 用于存储当前编辑的用户数据 
import request from "@/utils/request"
import { ref, onMounted } from "vue";
// import { ref } from 'vue'
@@ -94,6 +94,11 @@
    console.error('Error fetching options:', error);  
  }  
}; 
// 处理编辑按钮点击  
function handleEdit(row) {  
  editingUser.value = { ...row }; // 使用展开运算符复制当前行数据  
  adda.value = true; // 显示对话框  
} 
// 添加 
const getTableRow = async () => {
  try {
@@ -129,7 +134,8 @@
    if (response.code == 200) {
      // 绑定成功，处理逻辑
      ElMessage.success(response.message);
      add.value = false;
      editingUser.value = {};  
      adda.value = false;
     tableData.value = response.data;
    } else {
      // 请求失败，显示错误消息
@@ -230,7 +236,7 @@
          <el-table-column fixed="right" label="操作" align="center" width="200">
            <template #default="scope">
              <el-button size="mini" type="text" plain @click="open(scope.row)">重置密码</el-button>
              <el-button size="mini" type="text" plain @click="adda = true">编辑</el-button>
              <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">编辑</el-button>
              <el-button size="mini" type="text" plain @click="opena(scope.row)">删除</el-button>
            </template>
        </el-table-column>
@@ -300,14 +306,14 @@
  </el-dialog> 
  <el-dialog v-model="adda" top="23vh" width="37%" title="修改用户" >
    <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
            <el-form  size="mini" label-width="150px">
            <el-form :model="editingUser" ref="formRef" size="mini" label-width="150px">
      <el-form label-width="100px" label-position="right">
        <el-row style="margin-top: -15px;margin-bottom: -2px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item label="用户名：" :required="true" style="width: 25vw">
                <el-input v-model="userName" autocomplete="off" />
                <el-input v-model="editingUser.userName" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
        </el-row>
@@ -315,6 +321,13 @@
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <!-- <el-table-column align="center" label="角色" min-width="80">
            <template #default="scope">  
             <el-tag v-for="role in scope.row.roleList">  
            {{role.name}}  
           </el-tag>   
         </template> 
            </el-table-column> -->
              <el-form-item label="角色：" :required="true" style="width: 25vw;">
                <el-select
               v-model="selectedProjectNoa"
@@ -339,7 +352,7 @@
        <div>
              <el-form-item label="密码：" :required="true" style="width: 25vw;">
                <el-input style="width: 340px;"
                        v-model="password"
                        v-model="editingUser.password"
                        autocomplete="off"
                        :prefix-icon="Lock"
                        show-password/>