From 188f3ab2e7e4cb602aadbf3ccce9296237df7108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Fri, 2 Sep 2022 17:14:55 +0800 Subject: [PATCH] =?UTF-8?q?fire=E9=A1=B5=E9=9D=A2=E9=87=87=E7=94=A8?= =?UTF-8?q?=E9=80=89=E4=BA=BA=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- src/components/ehsSelect/userselect.vue | 46 ++++++++++------ src/components/scOpl/scFire.vue | 7 --- src/views/am/area_form.vue | 7 --- src/views/ecm/event_cate_form.vue | 21 ++++---- src/views/ecm/notify_settings_form.vue | 1 - src/views/hrm/clock_record.vue | 5 ++ src/views/opm/fire.vue | 72 +++++++++++++------------ src/views/opm/operation.vue | 2 +- src/views/opm/operation_form.vue | 8 --- src/views/sys/user_form.vue | 26 +++------ src/views/vm/visit_detial.vue | 7 --- src/views/vm/vistoradd.vue | 6 --- 13 files changed, 94 insertions(+), 117 deletions(-) diff --git a/.env.development b/.env.development index 4f914a5e..d21bdf88 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +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://127.0.0.1:8000/api +#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api +VUE_APP_API_BASEURL = http://10.99.5.79:20309/api #VUE_APP_BASEURL = http://127.0.0.1:8000 # 本地端口 diff --git a/src/components/ehsSelect/userselect.vue b/src/components/ehsSelect/userselect.vue index 1d324a8a..542daec2 100644 --- a/src/components/ehsSelect/userselect.vue +++ b/src/components/ehsSelect/userselect.vue @@ -28,19 +28,19 @@ - - + + - + - +
{ that.getOplData(); - // that.getDept(); - // that.getUser(); that.getworkerList(); that.getgasList(); }) @@ -407,11 +405,6 @@ // }); // }, // //作业负责人、作业监护人 - // getUser() { - // this.$API.system.user.list.req({page: 0}).then((res) => { - // this.useroptions = res; - // }); - // }, //作业人员列表 getworkerList() { this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => { diff --git a/src/views/am/area_form.vue b/src/views/am/area_form.vue index 13992c2d..f613d3ac 100644 --- a/src/views/am/area_form.vue +++ b/src/views/am/area_form.vue @@ -191,7 +191,6 @@ }, mounted() { this.getGroup(); - // this.getUser(); }, methods: { //加载树数据 @@ -199,12 +198,6 @@ let res = await this.$API.system.dept.list.req({page: 0}); this.group = genTree(res); }, - //项目负责人 - // getUser() { - // this.$API.system.user.list.req({page: 0}).then((res) => { - // this.useroptions = res; - // }); - // }, getManager(data){ this.form.manager=data.id; this.form.manager_name=data.name diff --git a/src/views/ecm/event_cate_form.vue b/src/views/ecm/event_cate_form.vue index 2dcd00d5..af60c4a1 100644 --- a/src/views/ecm/event_cate_form.vue +++ b/src/views/ecm/event_cate_form.vue @@ -73,7 +73,16 @@ - + + + + + + - - - - - - - + - + - - - + + @@ -313,7 +309,7 @@ 取 消 确 定 - +
上一步 @@ -600,9 +596,22 @@ this.getoplData(); this.getInit(); this.getDept(); - this.getUser(); + // this.getUser(); }, methods: { + getCharger(data) { + this.form.charger=data.id; + this.form.charger_name=data.name + }, + getMonitor(data) { + this.form.monitor=data.id; + this.form.monitor_name=data.name + }, + getWorker(data) { + this.formworker.worker=data.id, + this.formworker.worker_name=data.name + this.selectWorker() + }, getoplData() { if (this.oplId == "") { this.getOperation(); @@ -641,11 +650,6 @@ }, //作业负责人、作业监护人 - getUser() { - this.$API.system.user.list.req({page: 0}).then((res) => { - this.useroptions = res; - }); - }, //作业 //根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情 diff --git a/src/views/opm/operation.vue b/src/views/opm/operation.vue index 8e2b8212..485c4244 100644 --- a/src/views/opm/operation.vue +++ b/src/views/opm/operation.vue @@ -101,7 +101,7 @@ export default { 20: "审批中", 30: "待作业", 40: "作业中", - 50: "已关闭", + 50: "已结束", }, userId: '', }; diff --git a/src/views/opm/operation_form.vue b/src/views/opm/operation_form.vue index 28a8f969..6d560e42 100644 --- a/src/views/opm/operation_form.vue +++ b/src/views/opm/operation_form.vue @@ -194,7 +194,6 @@ export default { mounted() { this.getDept(); this.getArea(); - // this.getUser(); }, methods: { //所属部门,属地部门，业务部门 @@ -224,13 +223,6 @@ export default { this.vchannelOptions = res; }); }, - //业务部门协调员 - // getUser() { - // this.$API.system.user.list.req({ page: 0 }).then((res) => { - - // this.coordinatoroptions = res; - // }); - // }, //显示 open(mode = "add") { diff --git a/src/views/sys/user_form.vue b/src/views/sys/user_form.vue index 528324aa..02087f2c 100644 --- a/src/views/sys/user_form.vue +++ b/src/views/sys/user_form.vue @@ -184,13 +184,9 @@ getUserPostList(){ debugger; console.log(this.form.id); - let obj = {user:this.form.id}; + let obj = {user:this.form.id, page:0}; this.$API.system.userPost.list.req(obj).then(res=>{ - if(res.err_msg){ - this.$message.error(res.err_msg) - }else{ - this.userPostForm.list=res.results; - } + this.userPostForm.list=res; }) }, //新增用户岗位关系 @@ -200,13 +196,8 @@ this.isSaveing = true; row.user = this.form.id; this.$API.system.userPost.create.req(row).then(res=>{ - if(res.err_msg){ - this.$message.error(res.err_msg) - }else{ - this.getUserPostList(); - this.$message.success("操作成功"); - // this.userPostForm.list=res.results; - } + this.getUserPostList(); + this.$message.success("操作成功"); }) }, //用户岗位关系删除 @@ -217,12 +208,9 @@ confirmButtonClass: 'el-button--danger' }).then(() => { this.$API.system.userPost.delete.req(id).then(res=>{ - if(res.err_msg){ - this.$message.error(res.err_msg) - }else{ - this.getUserPostList(); - this.$message.success("操作成功"); - } + this.getUserPostList(); + this.$message.success("操作成功"); + }) }) }, diff --git a/src/views/vm/visit_detial.vue b/src/views/vm/visit_detial.vue index fc5c7320..c6e40e05 100644 --- a/src/views/vm/visit_detial.vue +++ b/src/views/vm/visit_detial.vue @@ -144,16 +144,9 @@ export default { }; }, mounted() { - // this.getUser(); }, methods: { //访客接待人 - // getUser() { - // this.$API.system.user.list.req({ page: 0 }).then((res) => { - // this.receptionistoptions = res; - // }); - // }, - //显示 open(mode = "add") { this.mode = mode; diff --git a/src/views/vm/vistoradd.vue b/src/views/vm/vistoradd.vue index da1651bd..2a7ab054 100644 --- a/src/views/vm/vistoradd.vue +++ b/src/views/vm/vistoradd.vue @@ -291,7 +291,6 @@ export default { mounted() { this.visitid = this.$route.query.visitid; //作业ID this.getRpj(); - // this.getUser(); this.getpeoplelistlist(); this.getvisitorlist(); }, @@ -308,11 +307,6 @@ export default { this.form.receptionist_name=data.name }, //接待人 - // getUser() { - // this.$API.system.user.list.req({ page: 0 }).then((res) => { - // this.receptionistoptions = res; - // }); - // }, //渲染工单提交按钮 getInit(){ this.$API.wf.workflow.initkey.req('visit').then((res) => {