diff --git a/.env.development b/.env.development index 3c9afa97..0278de29 100644 --- a/.env.development +++ b/.env.development @@ -7,8 +7,8 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台' # 接口地址 #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api #VUE_APP_WS_API = 'ws://localhost:8000' -VUE_APP_API_BASEURL = http://222.222.144.147:6013/api -#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api +#VUE_APP_API_BASEURL = http://222.222.144.147:6013/api +VUE_APP_API_BASEURL = http://127.0.0.1:8000/api #VUE_APP_BASEURL = http://127.0.0.1:8000 diff --git a/src/views/am/area_form.vue b/src/views/am/area_form.vue index a22e64b3..5f366015 100644 --- a/src/views/am/area_form.vue +++ b/src/views/am/area_form.vue @@ -94,12 +94,30 @@ > + + + + + + + + + + @@ -148,6 +166,8 @@ count_people_min: 0, count_people_max: 1000, count_people: 0, + stay_minute_min: 0, + stay_minute_max: 0, cate: 10, }; export default { diff --git a/src/views/vm/visit.vue b/src/views/vm/visit.vue index 28ccd3f3..c19f04f5 100644 --- a/src/views/vm/visit.vue +++ b/src/views/vm/visit.vue @@ -6,7 +6,6 @@ type="primary" icon="el-icon-plus" @click="add" - v-auth="'visit.create'" > 继续编辑 删除 diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue index c1171e0d..ee17d8c6 100644 --- a/src/views/wf/allwork.vue +++ b/src/views/wf/allwork.vue @@ -14,6 +14,20 @@ :label="item.name" :value="item.id" > + + + @@ -124,6 +138,10 @@ export default { 1: "单人", 2: "多人", }, + rsOptions:[ + {value:true, label:'成功'}, + {value:false, label:'失败'}, + ], wfOptions: [], }; }, @@ -136,6 +154,11 @@ export default { this.wfOptions = res; }); }, + reStart(row) { + this.$API.wf.ticket.retryScript.req(row.id).then(res => { + this.$message.success("任务执行下发成功"); + }); + }, handleQuery() { if (this.timeRange) { this.query.start_create = this.timeRange[0]; diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue index 21cd3b39..a1a67f0c 100644 --- a/src/views/wf/ticketdetail.vue +++ b/src/views/wf/ticketdetail.vue @@ -432,10 +432,9 @@ }, reStart() { this.$API.wf.ticket.retryScript.req(this.ticketId).then(res => { - if (res.err_msg) { - } else { - this.$router.push("dutywork"); - } + // this.$router.push("dutywork"); + this.$router.back(-1) + this.$message.success("任务执行下发成功"); }); }, },