Merge branch 'test'

xiangpei

2024-10-30 a38e8dc8f74ebd4b5ce49efe5d3d9bce90834968

Merge branch 'test'

 src/api/user.js

@@ -14,4 +14,5 @@
  getClassesCurrentUserList: (param) => get('/api/admin/user/classes/students', param),
  updatePassword: (data) => post('/api/common/user/update/password', data),
  uploadImg: (data) => post('/api/admin/upload/img', data),
  resetUserPassword: (id) => post('/api/admin/user/reset/password/' + id),
}

 src/views/sys/SysSetting.vue

@@ -4,6 +4,9 @@
      <el-form-item label="密码过期时间(天)" prop="passwordExpireTime">
        <el-input v-model="form.passwordExpireTime" type="number" autocomplete="off" placeholder="比如：30天密码过期"></el-input>
      </el-form-item>
      <el-form-item label="默认密码" prop="passwordDefault">
        <el-input v-model="form.passwordDefault" autocomplete="off" placeholder="重置后使用默认密码" readonly></el-input>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="edit()">保存</el-button>
      </el-form-item>
@@ -20,7 +23,8 @@
    return {
      form: {
        id: null,
        passwordExpireTime: null
        passwordExpireTime: null,
        passwordDefault: null
      },
      rules: {
        passwordExpireTime: [

 src/views/user/admin/list.vue

@@ -42,6 +42,7 @@
            <el-button size="mini">编辑</el-button>
          </router-link>
          <el-button size="mini" type="danger"  @click="deleteUser(row)" class="link-left">删除</el-button>
          <el-button size="mini"  @click="resetPassword(row)" type="success" class="link-left">重置密码</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -121,7 +122,22 @@
    },
    statusBtnFormatter (status) {
      return this.enumFormat(this.statusBtn, status)
    }
    },
    resetPassword(row) {
      this.$confirm('此操作将重置该成员的密码, 是否继续?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        userApi.resetUserPassword(row.id).then(re => {
          if (re.code === 1) {
            this.$message.success(re.message)
          } else {
            this.$message.error(re.message)
          }
        })
      })
    },
  },
  computed: {
    ...mapGetters('enumItem', [

 src/views/user/student/list.vue

@@ -64,6 +64,7 @@
          >
            <el-button slot="reference" type="danger" size="mini">删除</el-button>
          </el-popconfirm>
          <el-button size="mini"  @click="resetPassword(row)" type="success" class="link-left">重置密码</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -170,7 +171,22 @@
    },
    statusBtnFormatter (status) {
      return this.enumFormat(this.statusBtn, status)
    }
    },
    resetPassword(row) {
      this.$confirm('此操作将重置该成员的密码, 是否继续?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        userApi.resetUserPassword(row.id).then(re => {
          if (re.code === 1) {
            this.$message.success(re.message)
          } else {
            this.$message.error(re.message)
          }
        })
      })
    },
  },
  computed: {
    ...mapGetters('enumItem', [

 src/views/user/teacher/list.vue

@@ -42,6 +42,7 @@
            <el-button size="mini">编辑</el-button>
          </router-link>
          <el-button size="mini" type="danger"  @click="deleteUser(row)" class="link-left">删除</el-button>
          <el-button size="mini"  @click="resetPassword(row)" type="success" class="link-left">重置密码</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -121,7 +122,22 @@
    },
    statusBtnFormatter (status) {
      return this.enumFormat(this.statusBtn, status)
    }
    },
    resetPassword(row) {
      this.$confirm('此操作将重置该成员的密码, 是否继续?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        userApi.resetUserPassword(row.id).then(re => {
          if (re.code === 1) {
            this.$message.success(re.message)
          } else {
            this.$message.error(re.message)
          }
        })
      })
    },
  },
  computed: {
    ...mapGetters('enumItem', [