diff --git a/src/api/storeManage/taskManage/index.js b/src/api/storeManage/taskManage/index.js index 4a8b166..776cba6 100644 --- a/src/api/storeManage/taskManage/index.js +++ b/src/api/storeManage/taskManage/index.js @@ -10,8 +10,8 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/roles', - method: 'delete', + url: 'api/device/deleteTimedTasks', + method: 'post', data: ids }) } @@ -33,4 +33,13 @@ export function FetchStatus(data) { }) } -export default { add, edit, del, FetchStatus } +// 计划任务日志 +export function FetchInitTimedTasksLog(parameter) { + return request({ + url: 'api/device/initTimedTasksLog', + method: 'get', + params: parameter + }) +} + +export default { add, edit, del, FetchStatus, FetchInitTimedTasksLog } diff --git a/src/api/system/user.js b/src/api/system/user.js index d45e07c..944383b 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -1,73 +1,91 @@ -import request from '@/utils/request' -import { encrypt } from '@/utils/rsaEncrypt' -import { getToken } from '@/utils/auth' - -export function add(data) { - return request({ - url: 'api/users', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/users', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/users', - method: 'put', - data - }) -} - -export function editUser(data) { - return request({ - url: 'api/users/center', - method: 'put', - data - }) -} - -export function updatePass(user) { - const data = { - oldPass: encrypt(user.oldPass), - newPass: encrypt(user.newPass) - } - return request({ - url: 'api/users/updatePass/', - method: 'post', - data - }) -} - -export function updateEmail(form) { - const data = { - password: encrypt(form.pass), - email: form.email - } - return request({ - url: 'api/users/updateEmail/' + form.code, - method: 'post', - data - }) -} - -export function resetpassword(data) { - return request({ - url: 'api/users/resetpassword', - method: 'post', - headers: { - Authorization: getToken() - }, - data - }) -} - -export default { add, edit, del, resetpassword } - +import request from '@/utils/request' +import { encrypt } from '@/utils/rsaEncrypt' +import { getToken } from '@/utils/auth' + +export function add(data) { + return request({ + url: 'api/users', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/users', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/users', + method: 'put', + data + }) +} + +export function editUser(data) { + return request({ + url: 'api/users/center', + method: 'put', + data + }) +} + +export function updatePass(user) { + const data = { + oldPass: encrypt(user.oldPass), + newPass: encrypt(user.newPass) + } + return request({ + url: 'api/users/updatePass/', + method: 'post', + data + }) +} + +export function updateEmail(form) { + const data = { + password: encrypt(form.pass), + email: form.email + } + return request({ + url: 'api/users/updateEmail/' + form.code, + method: 'post', + data + }) +} + +export function resetpassword(data) { + return request({ + url: 'api/users/resetpassword', + method: 'post', + headers: { + Authorization: getToken() + }, + data + }) +} + +// 我得消息 +export function FetchMyNotice(params) { + return request({ + url: 'api/users/myNotice', + method: 'get', + params + }) +} + +// 我得消息全部标记已读 +export function FetchMyReadAll(data) { + return request({ + url: 'api/users/myReadAll', + method: 'put', + data + }) +} + +export default { add, edit, del, resetpassword, FetchMyNotice, FetchMyReadAll } + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 6034ec3..8a5d077 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,341 +1,342 @@ - - - - + + + + diff --git a/src/views/storeManage/taskManage/index.vue b/src/views/storeManage/taskManage/index.vue index b354da9..7777f45 100644 --- a/src/views/storeManage/taskManage/index.vue +++ b/src/views/storeManage/taskManage/index.vue @@ -33,12 +33,13 @@
整点
半点
-
整点/半点
+
整点/半点
@@ -209,9 +210,9 @@ import pagination from '@crud/Pagination' import Detail from './module/detail' import { parseTime, timeToTimestamp } from '@/utils/index.js' import { getAllDev } from '@/api/system/logs' -import qs from 'qs' -import { exportFile } from '@/utils/index' -import { mapGetters } from 'vuex' +// import qs from 'qs' +// import { exportFile } from '@/utils/index' +// import { mapGetters } from 'vuex' const defaultForm = { id: null, taskType: null, deviceId: null, taskName: null, timerType: 2, timeInterval: 1, status: 1, startTime2: parseTime(new Date().getTime()), endTime2: null, nowTime: null, longTime: true, remark: null, halfOrPart: [] } @@ -364,10 +365,10 @@ export default { computed: { isRequired() { return this.form.longTime === false - }, - ...mapGetters([ - 'baseApi' - ]) + } + // ...mapGetters([ + // 'baseApi' + // ]) }, created() { }, @@ -387,17 +388,18 @@ export default { }, // 初始化编辑时候的角色与岗位 [CRUD.HOOK.beforeToEdit](crud, form) { - if (form.endTime === null) { - form.longTime = true - } if (form.timerType === 4 && form.timeInterval) { - form.halfOrPart = form.timeInterval.split(',') + form.halfOrPart = form.timeInterval.split(',').map(Number) } if (form.startTime) { this.form.startTime2 = parseTime(form.startTime) } if (form.endTime) { this.form.endTime2 = parseTime(form.endTime) + form.longTime = false + } else { + this.form.endTime2 = null + form.longTime = true } }, [CRUD.HOOK.beforeValidateCU](crud, form) { @@ -426,7 +428,6 @@ export default { delete crud.form.endTime2 delete crud.form.nowTime delete crud.form.halfOrPart - console.log(crud.form) return true }, changeFormTab(index) { @@ -467,6 +468,8 @@ export default { if (val === 4) { this.form.timeInterval = null this.form.halfOrPart = [1] + } else { + this.form.timeInterval = 1 } }, // 获取设备 @@ -499,6 +502,10 @@ export default { // 双击详情 handleDbClick(row) { this.$refs.detailRefs.detailVisible = true + this.$refs.detailRefs.detailTitle = row.taskName + '-日志' + this.$refs.detailRefs.currentTaskId = row.id + this.$refs.detailRefs.page.page = 1 + this.$refs.detailRefs.getInitTimedTasksLog(row.id) }, // 改变状态 changeStatus(data, val) { @@ -511,26 +518,25 @@ export default { 'id': data.id, 'status': val } - console.log('params', params) - // crudTask.FetchStatus(params).then(res => { - // this.crud.notify('状态修改成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - // }).catch(() => { - // data.status = !data.status - // }) + crudTask.FetchStatus(params).then(res => { + this.crud.notify('状态修改成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + }).catch(() => { + data.status = !data.status + }) }).catch(() => { - // data.status = !data.status + data.status = !data.status }) - }, - // 导出接口调用 - downloadApi(data) { - const ids = data.map(item => { return item.id }) - const params = { - 'logIds': ids - } - console.log(params) - // /case/exportCaseLogList - exportFile(this.baseApi + '/api?' + qs.stringify(params, { indices: false })) } + // 导出接口调用 + // downloadApi(data) { + // const ids = data.map(item => { return item.id }) + // const params = { + // 'logIds': ids + // } + // console.log(params) + // // /case/exportCaseLogList + // exportFile(this.baseApi + '/api?' + qs.stringify(params, { indices: false })) + // } } } diff --git a/src/views/storeManage/taskManage/module/detail.vue b/src/views/storeManage/taskManage/module/detail.vue index 9c461b9..1d216cc 100644 --- a/src/views/storeManage/taskManage/module/detail.vue +++ b/src/views/storeManage/taskManage/module/detail.vue @@ -1,20 +1,27 @@