FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

Determine the request for modifying the work module and personal profile

Browse Source
This commit is contained in:
ggb
2023-06-04 18:55:53 +08:00
parent 83ccc0b651
commit cbb21dc193
10 changed files with 245 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
View File

@@ -73,7 +73,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
@Override
public User getInfo() {
return WebUtil.getLoginUser().getUser();
return getUserWithPower(WebUtil.getLoginUser().getUser().getUsername());
}
@Override

4
ui/src/components/home/AffairsCard.vue
View File

@@ -2,7 +2,7 @@
<el-card shadow="hover" class="homeCard">
<template #header>
<div class="card-header" style="height: 20px">
<h2>公告</h2>
<h2>个人事务</h2>
<el-button class="button" text @click="pushTodo">查看更多</el-button>
</div>
</template>
@@ -47,7 +47,7 @@ export default {
return new Date(time).toLocaleString()
},
pushTodo() {
this.$router.push('/notice/view/all')
this.$router.push('/affair/personal/person')
}
}
}

27
ui/src/components/personalProfile/editPasswd.vue Normal file
View File

@@ -0,0 +1,27 @@
<template>
<el-form :model="form" label-width="90px">
<el-form-item label="旧密码" prop="oldPasswd">
<el-input v-model="form.oldPasswd" placeholder="请输入旧密码" show-password />
</el-form-item>
<el-form-item label="新密码" prop="newPasswd">
<el-input v-model="form.newPasswd" placeholder="请输入新密码" show-password />
</el-form-item>
<el-form-item label="验证密码" prop="selectPasswd">
<el-input v-model="form.selectPasswd" placeholder="请重新输入新密码" show-password />
</el-form-item>
</el-form>
</template>
<script lang="ts">
export default {
data() {
return {
form: {
oldPasswd: '',
newPasswd: '',
selectPasswd: ''
}
}
}
}
</script>
<style scoped></style>

47
ui/src/pages/home/Home.vue
View File

@@ -22,6 +22,8 @@
<script lang="ts">
import request from '@/services'
import AffairsCard from '@/components/home/AffairsCard.vue'
import { DATABASE_SELECT_OK } from '@/constants/Common.constants'
import { ElMessage } from 'element-plus'
export default {
name: 'HomePage',
@@ -35,29 +37,38 @@ export default {
},
methods: {
getTableData() {
request
.get('/work/card')
.then((response) => {
this.works = response.data.data
request.get('/work/card').then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.works = response.data
} else {
ElMessage({
message: '工作事项数据查询出错',
type: 'error'
})
.catch((reportError) => {
console.log(reportError)
}
})
request
.get('/notice/limit')
.then((response) => {
this.notices = response.data.data
request.get('/notice/limit').then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.notices = response.data
} else {
ElMessage({
message: '公告数据查询出错',
type: 'error'
})
.catch((reportError) => {
console.log(reportError)
}
})
request
.get('/affair/personal_affairs_limit')
.then((response) => {
this.affairs = response.data.data
request.get('/affair/personal_affairs_limit').then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.affairs = response.data
} else {
ElMessage({
message: '个人事务数据查询出错',
type: 'error'
})
.catch((reportError) => {
console.log(reportError)
}
})
}
},

50
ui/src/pages/profile/PersonalProfile.vue
View File

@@ -19,7 +19,13 @@
<el-form-item label="用户名" prop="username">
<el-input v-model="form.username" disabled />
</el-form-item>
<el-link type="default" size="default" style="float: right">修改密码</el-link>
<el-link
type="default"
size="default"
style="float: right"
@click="visible = true"
>修改密码</el-link
>
</el-col>
<el-col :span="12">
<el-row>
@@ -67,11 +73,17 @@
</el-row>
</el-form>
</div>
<el-dialog v-model="visible" width="50%" title="修改密码">
<edit-passwd></edit-passwd>
</el-dialog>
</template>
<script lang="ts">
import _ from 'lodash'
import request from '@/services'
import { ElMessage } from 'element-plus'
import { requestUser } from '@/utils/auth'
import { DATABASE_SELECT_OK, DATABASE_UPDATE_OK } from '@/constants/Common.constants'
export default {
data() {
@@ -131,26 +143,50 @@ export default {
message: '请选择性别'
}
]
}
},
visible: false
}
},
methods: {
getFormData() {
request
.get('/user/info')
.then((response) => {
request.get('/user/info').then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.staff = response.data.data.staff
this.staff.username = response.data.data.username
this.form = _.cloneDeep(this.staff)
} else {
ElMessage({
message: '数据查询出错',
type: 'error'
})
.catch((reportError) => {
console.log(reportError)
}
})
},
putForm(form) {
request.put('/staff/self', form).then(async (res) => {
const response = res.data
if (response.code === DATABASE_UPDATE_OK) {
ElMessage({
message: '修改成功',
type: 'success'
})
this.getFormData()
await requestUser()
location.reload()
} else {
ElMessage({
message: '修改失败',
type: 'error'
})
}
})
},
onSubmit(form) {
// 表单校验
this.$refs.form.validate((value) => {
if (value) {
this.putForm(form)
console.log('submit!')
} else {
console.log('fault!')

48
ui/src/pages/work/Complete.vue
View File

@@ -54,8 +54,10 @@
</div>
</template>
<script lang='ts'>
<script lang="ts">
import request from '@/services'
import { DATABASE_SELECT_OK, DATABASE_UPDATE_OK } from '@/constants/Common.constants'
import { ElMessage } from 'element-plus'
export default {
name: 'CompletePage',
@@ -95,44 +97,46 @@ export default {
console.log('complete cancel!')
},
getTableData() {
request
.get('/work/complete')
.then((response) => {
this.tableData = response.data.data
request.get('/work/complete').then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.tableData = response.data
if (this.tableData) {
console.log(this.tableData)
this.loading = false
}
} else {
ElMessage({
message: '数据查询出错',
type: 'error'
})
.catch((reportError) => {
console.log(reportError)
}
})
},
getTaskData(workId) {
console.log(workId)
request
.get('/work/' + workId)
.then((response) => {
console.log(response.data.data)
this.taskData = response.data.data
console.log(this.tableData)
request.get('/work/' + workId).then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.taskData = response.data
return true
})
.catch((reportError) => {
console.log(reportError)
} else {
return false
}
})
},
setTaskStatus(userWork) {
console.log(userWork)
request
.put('/work/set_status', userWork)
.then((response) => {
console.log(response.data.data)
request.put('/work/set_status', userWork).then((res) => {
const response = res.data
if (response.code === DATABASE_UPDATE_OK) {
this.getTableData()
} else {
ElMessage({
message: '状态修改失败',
type: 'error'
})
.catch((reportError) => {
console.log(reportError)
}
})
},
viewClick(workId) {

78
ui/src/pages/work/Manage.vue
View File

@@ -94,6 +94,12 @@
import request from '@/services'
import EditWork from '@/components/work/EditWork.vue'
import { ElMessage } from 'element-plus'
import {
DATABASE_DELETE_OK,
DATABASE_SAVE_OK,
DATABASE_SELECT_OK,
DATABASE_UPDATE_OK
} from '@/constants/Common.constants'
export default {
name: 'AllTaskPage',
@@ -127,24 +133,34 @@ export default {
console.log('complete cancel!')
},
getTableData() {
request
.get('/work')
.then((response) => {
this.tableData = response.data.data
request.get('/work').then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.tableData = response.data
if (this.tableData) {
this.loading = false
}
} else {
ElMessage({
message: '数据查询出错',
type: 'error'
})
.catch((reportError) => {
console.log(reportError)
}
})
},
deleteTableData(row) {
request
.delete('/work/' + row.id)
.then((response) => {
.then((res) => {
const response = res.data
if (response.code === DATABASE_DELETE_OK) {
this.getTableData()
console.log(response.data.data)
} else {
ElMessage({
message: '删除失败',
type: 'error'
})
}
})
.catch((reportError) => {
console.log(reportError)
@@ -157,50 +173,58 @@ export default {
this.getTableData()
},
updateWork(form) {
request
.put('/work', form)
.then((response) => {
request.put('/work', form).then((res) => {
const response = res.data
if (response.code === DATABASE_UPDATE_OK) {
this.editVisible = false
this.getTableData()
ElMessage({
message: '修改成功',
type: 'success'
})
.catch((reportError) => {
console.log(reportError)
} else {
ElMessage({
message: '修改失败',
type: 'error'
})
}
})
},
addWork(form) {
request
.post('/work', form)
.then((response) => {
request.post('/work', form).then((res) => {
const response = res.data
if (response.code === DATABASE_SAVE_OK) {
this.addVisible = false
this.getTableData()
ElMessage({
message: '添加成功',
type: 'success'
})
console.log(response.data)
})
.catch((reportError) => {
console.log(reportError)
} else {
ElMessage({
message: '添加出错',
message: '添加失败',
type: 'error'
})
}
})
},
formatDate(time) {
return new Date(time).toLocaleString()
},
searchByContent() {
request
.get('/work', { content: this.searchContent })
.then((response) => {
this.tableData = response.data.data
request.get('/work', { content: this.searchContent }).then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.tableData = response.data
if (this.tableData) {
this.loading = false
}
} else {
ElMessage({
message: '查询出错',
type: 'error'
})
.catch((reportError) => {
console.log(reportError)
}
})
}
},

2
ui/src/pages/work/Task.vue
View File

@@ -6,7 +6,7 @@
<router-view></router-view>
</template>
<script lang='ts'>
<script lang="ts">
export default {
name: 'TaskPage',
data() {

37
ui/src/pages/work/Todo.vue
View File

@@ -42,8 +42,10 @@
</div>
</template>
<script lang='ts'>
<script lang="ts">
import request from '@/services'
import { DATABASE_SELECT_OK, DATABASE_UPDATE_OK } from '@/constants/Common.constants'
import { ElMessage } from 'element-plus'
export default {
name: 'TodoPage',
data() {
@@ -87,11 +89,19 @@ export default {
getTableData() {
request
.get('/work/todo')
.then((response) => {
this.tableData = response.data.data
.then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.tableData = response.data
if (this.taskData) {
this.loading = false
}
} else {
ElMessage({
message: '数据查询出错',
type: 'error'
})
}
})
.catch((reportError) => {
console.log(reportError)
@@ -101,11 +111,15 @@ export default {
console.log(workId)
request
.get('/work/' + workId)
.then((response) => {
console.log(response.data.data)
this.taskData = response.data.data
.then((res) => {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.taskData = response.data
console.log(this.tableData)
return true
} else {
return false
}
})
.catch((reportError) => {
console.log(reportError)
@@ -117,9 +131,16 @@ export default {
console.log(userWork)
request
.put('/work/set_status', userWork)
.then((response) => {
console.log(response.data.data)
.then((res) => {
const response = res.data
if (response.code === DATABASE_UPDATE_OK) {
this.getTableData()
} else {
ElMessage({
message: '状态修改失败',
type: 'error'
})
}
})
.catch((reportError) => {
console.log(reportError)

11
ui/src/utils/auth.ts
View File

@@ -56,4 +56,13 @@ function verifyCaptcha(value: string): boolean {
return captcha.value.toLowerCase() === value.replace(/\s*/g, '').toLowerCase()
}
export { login, logout, getLoginStatus, getUser, getUsername, getCaptchaSrc, verifyCaptcha }
export {
login,
logout,
getLoginStatus,
getUser,
requestUser,
getUsername,
getCaptchaSrc,
verifyCaptcha
}