diff --git a/hb_client/src/api/workflow.js b/hb_client/src/api/workflow.js index 9e69564..137b132 100644 --- a/hb_client/src/api/workflow.js +++ b/hb_client/src/api/workflow.js @@ -162,6 +162,14 @@ export function ticketAccpet(id,data) { data }) } +//撤回工单，允许创建人在指定状态撤回工单至初始状态 +export function getTicketRetreat(id,data) { + return request({ + url: `/wf/ticket/${id}/retreat/`, + method: 'post', + data + }) +} //工单详情 export function getTicketDetail(id) { return request({ @@ -169,7 +177,8 @@ export function getTicketDetail(id) { method: 'get' }) } -//工单详情 + +//工单流转 export function getTicketTransitions(id) { return request({ url: `/wf/ticket/${id}/transitions/`, diff --git a/hb_client/src/components/faceLogin/faceLogin.vue b/hb_client/src/components/faceLogin/faceLogin.vue new file mode 100644 index 0000000..ec58b14 --- /dev/null +++ b/hb_client/src/components/faceLogin/faceLogin.vue @@ -0,0 +1,140 @@ + + + + + + diff --git a/hb_client/src/store/modules/user.js b/hb_client/src/store/modules/user.js index 2ad5d0f..0f1d024 100644 --- a/hb_client/src/store/modules/user.js +++ b/hb_client/src/store/modules/user.js @@ -53,7 +53,7 @@ const actions = { return new Promise((resolve, reject) => { getInfo(state.token).then(response => { const { data } = response - + sessionStorage.setItem('userId',data.id); if (!data) { reject('验证失败,重新登陆.') } diff --git a/hb_client/src/views/monitor/service.vue b/hb_client/src/views/monitor/service.vue index e81b97a..e2bfb1c 100644 --- a/hb_client/src/views/monitor/service.vue +++ b/hb_client/src/views/monitor/service.vue @@ -1,273 +1,273 @@ - - diff --git a/hb_client/src/views/testModel/markImage.vue b/hb_client/src/views/testModel/markImage.vue index 31fa253..1801150 100644 --- a/hb_client/src/views/testModel/markImage.vue +++ b/hb_client/src/views/testModel/markImage.vue @@ -17,13 +17,22 @@ 保存的图片
- + + +
+ +
+