Merge branch 'dev_1.0.0' of http://192.168.10.28:3000/Yaxin/know_sub_web into dev_1.0.0

src/api/system.ts

@@ -92,8 +92,8 @@ export function downloadFile(id) {
  * @returns 重置用户密码
  */
 export const resetPW = (data?: object) => {
-  return http.request<Result>("get", "/know-sub/user/resetPW", {
+  return http.request<Result>("put", "/know-sub/user/resetPW", {
-    params: data
+    data
   });
 };
 

src/views/home/components/table/columns.tsx

@@ -31,7 +31,7 @@ export function useColumns() {
     },
     {
       label: "最新时间",
-      prop: "date"
+      prop: "updateTime"
     }
   ];
 

src/views/systemManagement/accountManagement/index.vue

@@ -226,7 +226,8 @@ const submitForm = (formEl: FormInstance | undefined) => {
     if (valid) {
       // console.log(valid);
       resetPW({
-        id: passwordForm.id
+        id: passwordForm.id,
+        password: passwordForm.password
       }).then(res => {
         if (res.code === 200) {
           message("重置成功", { type: "success" });
@@ -298,6 +299,7 @@ const deleteName = (type: any) => {
 };
 //角色权限
 const handleRolePermission = row => {
+  console.log(row);
   roleSetVisible.value = true;
 };
 //状态切换
@@ -344,7 +346,7 @@ onMounted(() => {
       <div class="account_seach" v-if="seachForm.status === '1'">
         <el-form :model="accountForm">
           <el-row>
-            <el-form-item label="用户名">
+            <el-form-item label="姓名">
               <el-input v-model="accountForm.userName" placeholder="请输入" />
             </el-form-item>
             <el-form-item class="ml-4" label="角色">