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 @Override
public User getInfo() { public User getInfo() {
return WebUtil.getLoginUser().getUser(); return getUserWithPower(WebUtil.getLoginUser().getUser().getUsername());
} }
@Override @Override

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

@@ -2,7 +2,7 @@
<el-card shadow="hover" class="homeCard"> <el-card shadow="hover" class="homeCard">
<template #header> <template #header>
<div class="card-header" style="height: 20px"> <div class="card-header" style="height: 20px">
<h2>公告</h2> <h2>个人事务</h2>
<el-button class="button" text @click="pushTodo">查看更多</el-button> <el-button class="button" text @click="pushTodo">查看更多</el-button>
</div> </div>
</template> </template>
@@ -47,7 +47,7 @@ export default {
return new Date(time).toLocaleString() return new Date(time).toLocaleString()
}, },
pushTodo() { 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>

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

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

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

@@ -19,7 +19,13 @@
<el-form-item label="用户名" prop="username"> <el-form-item label="用户名" prop="username">
<el-input v-model="form.username" disabled /> <el-input v-model="form.username" disabled />
</el-form-item> </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>
<el-col :span="12"> <el-col :span="12">
<el-row> <el-row>
@@ -67,11 +73,17 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-dialog v-model="visible" width="50%" title="修改密码">
<edit-passwd></edit-passwd>
</el-dialog>
</template> </template>
<script lang="ts"> <script lang="ts">
import _ from 'lodash' import _ from 'lodash'
import request from '@/services' 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 { export default {
data() { data() {
@@ -131,26 +143,50 @@ export default {
message: '请选择性别' message: '请选择性别'
} }
] ]
} },
visible: false
} }
}, },
methods: { methods: {
getFormData() { getFormData() {
request request.get('/user/info').then((res) => {
.get('/user/info') const response = res.data
.then((response) => { if (response.code === DATABASE_SELECT_OK) {
this.staff = response.data.data.staff this.staff = response.data.data.staff
this.staff.username = response.data.data.username this.staff.username = response.data.data.username
this.form = _.cloneDeep(this.staff) this.form = _.cloneDeep(this.staff)
}) } else {
.catch((reportError) => { ElMessage({
console.log(reportError) message: '数据查询出错',
}) type: 'error'
})
}
})
},
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) { onSubmit(form) {
// 表单校验 // 表单校验
this.$refs.form.validate((value) => { this.$refs.form.validate((value) => {
if (value) { if (value) {
this.putForm(form)
console.log('submit!') console.log('submit!')
} else { } else {
console.log('fault!') console.log('fault!')

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

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

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

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

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

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

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

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