diff --git a/App.vue b/App.vue
index b6c2016..3d76c26 100644
--- a/App.vue
+++ b/App.vue
@@ -70,6 +70,7 @@
// #endif
uni.getSystemInfo({
success(res) {
+ that.$u.vuex('vuex_version', res.appVersion)
if (res.platform == 'android') {
that.$u.api.apkCheck().then(res1 => {
if (res.appVersion < res1.version) {
diff --git a/common/http.api.js b/common/http.api.js
index d218e18..0e37775 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -41,6 +41,7 @@ const install = (Vue, vm) => {
let getTickets = (params = {}) => vm.$u.get('/wf/ticket/', params); //工单查询/wf/ticket/{id}/
let ticketCreate = (data = {}) => vm.$u.post('/wf/ticket/', data); //工单
let getTicketItem = (id) => vm.$u.get(`/wf/ticket/${id}/`); //工单详情
+ let getTicketLog = (id) => vm.$u.get(`/wf/ticket/${id}/flowlogs/`); //工单日志
let getTicketTransitions = (id) => vm.$u.get(`/wf/ticket/${id}/transitions/`); //工单按钮查询
let workflowInit = (key) => vm.$u.get(`/wf/workflow/${key}/init_key/`); //工单按钮查询
let ticketDutyAgg = (data = {}) => vm.$u.get(`/wf/ticket/duty_agg/`,data); //工单待办聚合
@@ -54,7 +55,7 @@ const install = (Vue, vm) => {
let operationList = (data = {}) => vm.$u.get('/opm/operation/', data); //作业列表
let operationItem = (id) => vm.$u.get(`/opm/operation/${id}/`); //作业详情
let operationCreat = (data = {}) => vm.$u.post('/opm/operation/', data); //作业新建
- let operationUpdate = (id, data = {}) => vm.$u.get(`/opm/operation/${id}/`, data); //作业编辑
+ let operationUpdate = (id, data = {}) => vm.$u.put(`/opm/operation/${id}/`, data); //作业编辑
let oplItem = (id) => vm.$u.get(`/opm/opl/${id}/`); //opl作业许可证查询
let oplLists = (data = {}) => vm.$u.get('/opm/opl/', data); //作业许可证
let oplCate = (data = {}) => vm.$u.get('/opm/opl_cate/', data); //作业许可证类型
@@ -62,19 +63,24 @@ const install = (Vue, vm) => {
let oplCreate = (data = {}) => vm.$u.post('/opm/opl/', data); //添加新许可证
let oplUpdate = (id,data = {}) => vm.$u.put(`/opm/opl/${id}/`, data); //编辑许可证
let oplWorker = (data = {}) => vm.$u.get('/opm/opl_worker/', data); //作业许可证工作人员
- let oplWorkerCreate = (data = {}) => vm.$u.post('/opm/opl_worker/', data); //作业许可证类型
+ let oplWorkerCreate = (data = {}) => vm.$u.post('/opm/opl_worker/', data); //作业许可证工作人员创建
+ let oplWorkerDelete = (id) => vm.$u.delete(`/opm/opl_worker/${id}/`); //作业许可证工作人员删除
let oplGasList = (data = {}) => vm.$u.get('/opm/gas_check/', data); //气体检测记录
let oplGasCreate = (data = {}) => vm.$u.post('/opm/gas_check/', data); //作业许可证类型
let oplMtartMtask = (id) => vm.$u.post(`/opm/opl/${id}/start_mtask/`); //作业开始监控
let oplStopMtask = (id) => vm.$u.post(`/opm/opl/${id}/stop_mtask/`); //作业结束监控
let rpartyList = (data = {}) => vm.$u.get(`/rpm/rparty/`, data); //相关方列表
+ let remployee = (data = {}) => vm.$u.get(`/rpm/remployee/`, data); //相关方人员表
+ let rcertificate = (data = {}) => vm.$u.get(`/rpm/rcertificate/`, data); //相关方证书
let rpjFileList = (data = {}) => vm.$u.get(`/rpm/rpj_file/`, data); //相关方wenjian
let rpjList = (data = {}) => vm.$u.get(`/rpm/rpj/`, data); //rpj查询
let rpjItem = (id) => vm.$u.get(`/rpm/rpj/${id}/`); //rpj查询
let rpjCreate = (data={}) => vm.$u.post(`/rpm/rpj/`,data); //rpj创建/rpm/rpj_member/
let rpjUpdate = (id,data={}) => vm.$u.put(`/rpm/rpj/${id}/`,data); //rpj更新
let rpjMembers = (data = {}) => vm.$u.get(`/rpm/rpj_member/`, data); //入厂项目工作人员
+ let rpjMemberCreate = (data) => vm.$u.post(`/rpm/rpj_member/`, data); //入厂项目工作人员创建
+ let rpjMemberDelete = (id) => vm.$u.post(`/rpm/rpj_member/${id}/`); //入厂项目工作人员删除
let areaLists = (data = {}) => vm.$u.get('/am/area/', data); //作业区域
@@ -82,6 +88,7 @@ const install = (Vue, vm) => {
let visitItem = (id) => vm.$u.get(`/vm/visit/${id}/`); //来访项目详情
let visitCreate = (data = {}) => vm.$u.post(`/vm/visit/`, data); //新增来访项目
let visitUpdate = (id, data = {}) => vm.$u.put(`/vm/visit/${id}/`, data); //编辑来访项目
+ let visitDelete = (id) => vm.$u.delete(`/vm/visit/${id}/`); //删除来访项目
let vmVisitor = (data = {}) => vm.$u.get(`/vm/visitor/`, data); //来访人员列表
let visitorRegister = (data = {}) => vm.$u.post(`/vm/visitor/register/`, data); //来访人员/司机注册
let visitSubmit = (data = {}) => vm.$u.post(`/vm/visit/${id}/submit/`, data); //司机直接提交不走工单
@@ -90,11 +97,12 @@ const install = (Vue, vm) => {
let vmVpeople = (data = {}) => vm.$u.get(`/vm/vpeople/`, data); //来访人员列表
let vpeopleCreate = (data = {}) => vm.$u.post(`/vm/vpeople/`, data); //来访人员添加
let vpeopleUpdate = (data = {}) => vm.$u.put(`/vm/vpeople/${id}/`, data); //来访人员编辑
+ let vpeopleDelete = (id) => vm.$u.delete(`/vm/vpeople/${id}/`); //来访人员删除
let eventCateAgg = (data = {}) => vm.$u.post(`/ecm/event/cate_agg/`, data); //事件聚合统计
let eventList = (data = {}) => vm.$u.get(`/ecm/event/`, data); //事件列表
let eventtItem = (id) => vm.$u.get(`/ecm/event/${id}/`); //事件详情
- let eventtHandle = (id,data={}) => vm.$u.get(`/ecm/event/${id}/handle/`, data); //事件处理
+ let eventtHandle = (id,data={}) => vm.$u.post(`/ecm/event/${id}/handle/`, data); //事件处理
let thirdBltBind = (data={}) => vm.$u.post(`/third/tdevice/blt_bind/`, data); //解绑卡
@@ -122,6 +130,7 @@ const install = (Vue, vm) => {
getTicketItem,
workflowInit,
getTicketTransitions,
+ getTicketLog,
visitList,
visitItem,
@@ -131,18 +140,24 @@ const install = (Vue, vm) => {
vmVisitor,
visitorCreate,
visitorUpdate,
+ visitDelete,
visitorRegister,
vmVpeople,
vpeopleCreate,
vpeopleUpdate,
+ vpeopleDelete,
rpartyList,
+ remployee,
+ rcertificate,
rpjItem,
rpjList,
rpjCreate,
rpjUpdate,
rpjFileList,
rpjMembers,
+ rpjMemberCreate,
+ rpjMemberDelete,
oplCateItem,
operationItem,
@@ -160,6 +175,7 @@ const install = (Vue, vm) => {
oplGasCreate,
oplMtartMtask,
oplStopMtask,
+ oplWorkerDelete,
hrmUserInfo,
hrmCertificate,
diff --git a/pages/home/detail/eventHandle.vue b/pages/home/detail/eventHandle.vue
index 872de89..58912aa 100644
--- a/pages/home/detail/eventHandle.vue
+++ b/pages/home/detail/eventHandle.vue
@@ -73,8 +73,8 @@
事件截图：
-
-
+
+
@@ -94,7 +94,7 @@