diff --git a/src/api/model/ecm.js b/src/api/model/ecm.js index ae32c8f4..d0ffb12c 100644 --- a/src/api/model/ecm.js +++ b/src/api/model/ecm.js @@ -82,6 +82,12 @@ export default { data); } }, + delete:{ + name: "删除", + req: async function(id){ + return await http.delete(`${config.API_URL}/ecm/event/${id}/`); + } + }, cateAgg: { name: "时间分类聚合", req: async function(data){ diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue index 4766432f..5c30f329 100644 --- a/src/components/scOpl/scFire.vue +++ b/src/components/scOpl/scFire.vue @@ -294,12 +294,12 @@ mounted() { let that = this; that.oplId = that.id; //许可证ID - that.operationId = that.wfId; //zuoyeID + this.$nextTick(()=>{ that.getOplData(); that.getworkerList(); that.getgasList(); - that.getOperation(); + }) }, methods: { @@ -325,6 +325,8 @@ that.form = res; that.oplcateCode = res.cate_code; that.ticketId = res.ticket; + that.operationId = res.operation; //zuoyeID + that.getOperation(); res.create_imgs_.forEach(item=>{ console.log(item) that.create_imgs_list.push({ diff --git a/src/directives/auth.js b/src/directives/auth.js index 805ad4ce..14d1d72e 100644 --- a/src/directives/auth.js +++ b/src/directives/auth.js @@ -13,9 +13,10 @@ export default { return } let permissions = tool.data.get("PERMISSIONS"); - if (permissions.indexOf('superuser') > -1){ - return - } + + // if (permissions.indexOf('superuser') > -1){ + // return + // } if (!permissions.some((v) => v === binding.value)) el.parentNode.removeChild(el); } } diff --git a/src/directives/auths.js b/src/directives/auths.js index 99b6bd27..a6fbeb00 100644 --- a/src/directives/auths.js +++ b/src/directives/auths.js @@ -13,9 +13,9 @@ export default { return } let permissions = tool.data.get("PERMISSIONS"); - if (permissions.indexOf('superuser') > -1){ - return - } + // if (permissions.indexOf('superuser') > -1){ + // return + // } let flag = false; permissions.map((val) => { binding.value.map((v) => { diff --git a/src/directives/authsAll.js b/src/directives/authsAll.js index 2ca84c0b..883abb3c 100644 --- a/src/directives/authsAll.js +++ b/src/directives/authsAll.js @@ -13,9 +13,9 @@ export default { return } let permissions = tool.data.get("PERMISSIONS"); - if (permissions.indexOf('superuser') > -1){ - return - } + // if (permissions.indexOf('superuser') > -1){ + // return + // } const flag = judementSameArr(binding.value, permissions); if (!flag) el.parentNode.removeChild(el); } diff --git a/src/views/ecm/event.vue b/src/views/ecm/event.vue index e1bfb061..57f076a0 100644 --- a/src/views/ecm/event.vue +++ b/src/views/ecm/event.vue @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ @@ -96,8 +96,6 @@ label="处理人" prop="handle_user_name" > - - @@ -142,9 +139,13 @@ v-if="dialog.handle" ref="handleDialog" :eventID="eventID" + @oplDetail="oplDetail" @success="handleSuccess" @closed="dialog.handle = false" > + + + diff --git a/src/views/opm/opl.vue b/src/views/opm/opl.vue index 80b7056a..b8b37e6d 100644 --- a/src/views/opm/opl.vue +++ b/src/views/opm/opl.vue @@ -87,7 +87,7 @@ - + diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue index 4b8bcdca..ffa72656 100644 --- a/src/views/wf/ticketdetail.vue +++ b/src/views/wf/ticketdetail.vue @@ -211,7 +211,7 @@ - +