From 1e1f79b99cc095244a079babd1cdba29ade50c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 27 Sep 2022 12:43:58 +0800
Subject: [PATCH 1/6] =?UTF-8?q?rpj=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E9=80=89=E9=A1=B9/=E4=BA=BA=E5=91=98=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E4=B8=8D=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                 |  4 +-
 src/views/opm/operation_form.vue |  1 +
 src/views/rpm/remployee.vue      | 80 ++++++++++++++------------------
 src/views/rpm/rpj.vue            |  3 +-
 src/views/rpm/rpj_show.vue       |  1 -
 5 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/.env.development b/.env.development
index 0278de29..3c9afa97 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/opm/operation_form.vue b/src/views/opm/operation_form.vue
index 82d83124..3e3f5c91 100644
--- a/src/views/opm/operation_form.vue
+++ b/src/views/opm/operation_form.vue
@@ -129,6 +129,7 @@
                 <el-select
                   v-model="form.vchannels"
                   :multiple = "true"
+                  filterable
                 >
                   <el-option
                     v-for="item in vchannelOptions"
diff --git a/src/views/rpm/remployee.vue b/src/views/rpm/remployee.vue
index 87e73916..f406de11 100644
--- a/src/views/rpm/remployee.vue
+++ b/src/views/rpm/remployee.vue
@@ -23,54 +23,47 @@
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable
-        ref="table"
-        :apiObj="apiObj"
-        row-key="id"
-      
-        stripe
-       
-      >
+      <scTable ref="table" :apiObj="apiObj" row-key="id" stripe>
         <el-table-column label="#" type="index" width="50"></el-table-column>
-        <el-table-column label="单位" prop="rparty_name" ></el-table-column>
-        <el-table-column label="姓名" prop="name" ></el-table-column>
-        <el-table-column label="手机号" prop="phone" ></el-table-column>
-        <el-table-column label="身份证号" prop="id_number" ></el-table-column>
-        <el-table-column label="证件照" prop="photo" >
+        <el-table-column label="单位" prop="rparty_name"></el-table-column>
+        <el-table-column label="姓名" prop="name"></el-table-column>
+        <el-table-column label="手机号" prop="phone"></el-table-column>
+        <el-table-column label="身份证号" prop="id_number"></el-table-column>
+        <el-table-column label="证件照" prop="photo">
           <template #default="scope">
-            <el-avatar :size="50" :src="scope.row.photo" shape="square"/>
+            <el-avatar :size="50" :src="scope.row.photo" shape="square" />
           </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="left" width="170">
           <template #default="scope">
-              <el-button
-                link
-                type="primary"
-                size="small"
-                @click="table_show(scope.row, scope.$index)"
-                >查看</el-button
-              >
-             <el-button
-                link
-                type="warning"
-                size="small"
-                @click="table_edit(scope.row, scope.$index)"
-                >编辑</el-button
-              >
-              <el-popconfirm
-                title="确定删除吗？"
-                @confirm="table_del(scope.row, scope.$index)"
-              >
-                <template #reference>
-                  <el-button link type="danger" size="small">删除</el-button>
-                </template>
-              </el-popconfirm>
+            <el-button
+              link
+              type="primary"
+              size="small"
+              @click="table_show(scope.row, scope.$index)"
+              >查看</el-button
+            >
+            <el-button
+              link
+              type="warning"
+              size="small"
+              @click="table_edit(scope.row, scope.$index)"
+              >编辑</el-button
+            >
+            <el-popconfirm
+              title="确定删除吗？"
+              @confirm="table_del(scope.row, scope.$index)"
+            >
+              <template #reference>
+                <el-button link type="danger" size="small">删除</el-button>
+              </template>
+            </el-popconfirm>
           </template>
         </el-table-column>
       </scTable>
     </el-main>
   </el-container>
-  
+
   <save-dialog
     v-if="dialog.save"
     ref="saveDialog"
@@ -91,8 +84,8 @@ export default {
         save: false,
         permission: false,
       },
-      adminform:{
-        username:"",
+      adminform: {
+        username: "",
       },
       apiObj: this.$API.rpm.remployee.list,
       query: {},
@@ -100,8 +93,6 @@ export default {
       search: {
         keyword: null,
       },
-      
-				
     };
   },
   methods: {
@@ -126,7 +117,7 @@ export default {
         this.$refs.saveDialog.open("show").setData(row);
       });
     },
-    
+
     //权限设置
     permission() {
       this.dialog.permission = true;
@@ -136,12 +127,11 @@ export default {
     },
     //删除
     async table_del(row) {
-    
       this.$API.rpm.remployee.delete
         .req(row.id)
         .then((res) => {
           this.$message.success("删除成功");
-
+          this.$refs.table.refresh();
           return res;
         })
         .catch((err) => {
@@ -158,7 +148,7 @@ export default {
       }
     },
     handleQuery() {
-      this.$refs.table.queryData(this.query)
+      this.$refs.table.queryData(this.query);
     },
     resetQuery() {
       this.query = {};
diff --git a/src/views/rpm/rpj.vue b/src/views/rpm/rpj.vue
index f3b5a1e8..3aa4c4da 100644
--- a/src/views/rpm/rpj.vue
+++ b/src/views/rpm/rpj.vue
@@ -271,6 +271,7 @@ export default {
         30: "待入厂",
         40: "进行中",
         50: "已完成",
+        60: "已关闭"
       },
       act_states: {
         0: "草稿中",
@@ -334,7 +335,7 @@ export default {
         .req(row.id)
         .then((res) => {
           this.$message.success("删除成功");
-
+          this.$refs.table.refresh();
           return res;
         })
         .catch((err) => {
diff --git a/src/views/rpm/rpj_show.vue b/src/views/rpm/rpj_show.vue
index 8725f1f0..99a05d32 100644
--- a/src/views/rpm/rpj_show.vue
+++ b/src/views/rpm/rpj_show.vue
@@ -59,7 +59,6 @@
 						stripe
 						hideDo
 						hidePagination
-						style="height:200px"
 					>
 						<el-table-column label="#" fixed="left" type="index" width="50"></el-table-column>
 						<el-table-column label="姓名" prop="remployee_.name">

From e216c800f9ade4e710b44f8d00d5987559c74f00 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 10 Oct 2022 14:38:52 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=8D=8F=E8=B0=83=E5=91=98=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ehsSelect/userselect.vue |  8 +----
 src/views/opm/operation_form.vue        | 44 +++++++++++++------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/components/ehsSelect/userselect.vue b/src/components/ehsSelect/userselect.vue
index b4db3a80..73e26379 100644
--- a/src/components/ehsSelect/userselect.vue
+++ b/src/components/ehsSelect/userselect.vue
@@ -79,13 +79,7 @@
             <el-table-column label="姓名" prop="name"></el-table-column>
 
             <el-table-column label="手机号" prop="phone"></el-table-column>
-            <el-table-column label="部门" prop="belong_dept">
-              <template #default="scope">
-                <span v-if="scope.row.belong_dept_">{{
-                  scope.row.belong_dept_.name
-                }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column label="部门" prop="belong_dept_name"></el-table-column>
             <el-table-column label="账号类型" prop="type">
               <template #default="scope">
                 <span>{{userTypeOptions[scope.row.type]}}</span>
diff --git a/src/views/opm/operation_form.vue b/src/views/opm/operation_form.vue
index 3e3f5c91..a6958c8a 100644
--- a/src/views/opm/operation_form.vue
+++ b/src/views/opm/operation_form.vue
@@ -55,7 +55,7 @@
             </el-col>
             <el-col :md="12" :sm="24" :xs="24">
               <el-form-item label="作业区域" prop="area">
-                <el-select v-model="form.area" placeholder="选择作业区域">
+                <el-select v-model="form.area" placeholder="选择作业区域" @change="areaChange" clearable>
                   <el-option
                     v-for="item in areaoptions"
                     :key="item.id"
@@ -75,7 +75,6 @@
               <el-form-item label="业务部门" prop="dept_bus">
                 <el-cascader
                   placeholder="选择业务部门"
-                  @change="dept1Change"
                    getCheckedNodes="true"
                    :props="{
                     expandTrigger: 'hover', // 次级菜单的展开方式
@@ -93,17 +92,12 @@
 
             <el-col :md="12" :sm="24" :xs="24">
               <el-form-item label="部门协调员"  prop="coordinator">
-                <el-select
-                  v-model="form.coordinator"
-                  placeholder="选择业务部门协调员"
-                >
-                  <el-option
-                    v-for="item in coordinatoroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
+                <el-input
+              v-model="form.coordinator_name"
+              disabled
+              style="width:200px"
+            ></el-input>
+                <ehsUserSelect :multiple="false" @submit="getUser"/>
               </el-form-item>
             </el-col>
                <el-col :md="12" :sm="24" :xs="24">
@@ -213,19 +207,27 @@ export default {
         this.areaoptions = res;
       });
     },
-    dept1Change(val) {
-      // 业务部门变化
-      this.$API.system.user.list.req({ page: 0, belong_dept: val }).then((res) => {
-       
-        this.coordinatoroptions = res;
-      });
+    areaChange(val) {
+      this.form.area = val
+      this.getVchannels()
     },
+    // dept1Change(val) {
+    //   // 业务部门变化
+    //   this.$API.system.user.list.req({ page: 0, belong_dept: val }).then((res) => {
+       
+    //     this.coordinatoroptions = res;
+    //   });
+    // },
     getVchannels(){
-      this.$API.third.tdevice.list.req({ type: 60, page: 0 }).then((res) => {
+      this.$API.third.tdevice.list.req({ type: 60, page: 0, area: this.form.area }).then((res) => {
         this.vchannelOptions = res;
       });
     },
-    
+    getUser(data) {
+      // 子组件调用父组件的方法并传参
+      this.form.coordinator=data.id;
+      this.form.coordinator_name=data.name
+    },
     //显示
     open(mode = "add") {
       this.mode = mode;

From 8ffd379964344871231acb742de6d4a1ac986c97 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 10 Oct 2022 14:48:14 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=86=8C?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/userbar.vue | 115 +++++++++++++-----------------
 1 file changed, 50 insertions(+), 65 deletions(-)

diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index 371af74a..603cb254 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -1,28 +1,22 @@
 <template>
   <div class="user-bar">
-    <!-- <div class="panel-item hidden-sm-and-down" @click="search">
-      <el-icon><el-icon-search /></el-icon>
-    </div> -->
     <div class="screen panel-item hidden-sm-and-down" @click="screen">
-      <el-icon><el-icon-full-screen /></el-icon>
+      <el-icon>
+        <el-icon-full-screen />
+      </el-icon>
+    </div>
+    <div class="panel-item hidden-sm-and-down" @click="openBook">
+      <el-icon>
+        <el-icon-files />
+      </el-icon>
     </div>
     <div class="msg panel-item" @click="showMsg">
-      <el-badge
-        :hidden="msgList.length == 0"
-        :value="msgList.length"
-        class="badge"
-        type="danger"
-      >
-        <el-icon><el-icon-chat-dot-round /></el-icon>
+      <el-badge :hidden="msgList.length == 0" :value="msgList.length" class="badge" type="danger">
+        <el-icon>
+          <el-icon-chat-dot-round />
+        </el-icon>
       </el-badge>
-      <el-drawer
-        title="新消息"
-        v-model="msg"
-        style="width:400px !important"
-
-        append-to-body
-        destroy-on-close
-      >
+      <el-drawer title="新消息" v-model="msg" style="width:400px !important" append-to-body destroy-on-close>
         <el-container>
           <el-main class="nopadding">
             <el-scrollbar>
@@ -30,42 +24,23 @@
                 <li v-for="item in msgList" v-bind:key="item.id">
                   <div style="width: 100%; padding: 10px">
                     <div style="width: 35%; float: left">
-                      <el-span
-                        style="color:red:float:left"
-                        v-for="items in item.event_.cates_"
-                        :key="items.id"
-                        :label="items.name"
-                        :value="items.id"
-                        >{{ items.name }}</el-span
-                      >
+                      <el-span style="color:red:float:left" v-for="items in item.event_.cates_" :key="items.id"
+                        :label="items.name" :value="items.id">{{ items.name }}</el-span>
                     </div>
                     <div style="width: 32%; float: left">
                       <p>{{ item.event_.create_time }}</p>
                     </div>
                     <div style="width: 30%; float: right">
-                      <el-button
-                        style="float: right"
-                        v-if="item.event_.handle_user == ''"
-                        @click="createhandele(item.event_.id)"
-                        >待处理</el-button
-                      >
-                      <el-button
-                        style="float: right"
-                        v-else
-                        @click="handele(item.event_.id)"
-                        >已处理</el-button
-                      >
+                      <el-button style="float: right" v-if="item.event_.handle_user == ''"
+                        @click="createhandele(item.event_.id)">待处理</el-button>
+                      <el-button style="float: right" v-else @click="handele(item.event_.id)">已处理</el-button>
                     </div>
                   </div>
                   <div style="width: 100%; padding: 10px">
                     <p>警报信息{{ item.event_.voice_msg }}</p>
                   </div>
                 </li>
-                <el-empty
-                  v-if="msgList.length == 0"
-                  description="暂无新消息"
-                  :image-size="100"
-                ></el-empty>
+                <el-empty v-if="msgList.length == 0" description="暂无新消息" :image-size="100"></el-empty>
               </ul>
             </el-scrollbar>
           </el-main>
@@ -80,28 +55,21 @@
       <div class="user-avatar">
         <el-avatar :size="34" shape="square">{{ userNameF }}</el-avatar>
         <label>{{ userName }}</label>
-        <el-icon class="el-icon--right"><el-icon-arrow-down /></el-icon>
+        <el-icon class="el-icon--right">
+          <el-icon-arrow-down />
+        </el-icon>
       </div>
       <template #dropdown>
         <el-dropdown-menu>
           <el-dropdown-item command="uc">帐号信息</el-dropdown-item>
           <!-- <el-dropdown-item command="clearCache">清除缓存</el-dropdown-item> -->
-          <el-dropdown-item divided command="outLogin"
-            >退出登录</el-dropdown-item
-          >
+          <el-dropdown-item divided command="outLogin">退出登录</el-dropdown-item>
         </el-dropdown-menu>
       </template>
     </el-dropdown>
   </div>
 
-  <el-dialog
-    v-model="searchVisible"
-    :width="700"
-    title="搜索"
-    custom-class="drawerBG"
-    center
-    destroy-on-close
-  >
+  <el-dialog v-model="searchVisible" :width="700" title="搜索" custom-class="drawerBG" center destroy-on-close>
     <search @success="searchVisible = false"></search>
   </el-dialog>
 </template>
@@ -126,9 +94,12 @@ export default {
     var userInfo = this.$TOOL.data.get("USER_INFO");
     this.userName = userInfo.name;
     this.userNameF = this.userName.substring(0, 1);
-    
+
   },
   methods: {
+    openBook() {
+      window.open('/media/ehs_guide.pdf')
+    },
     getMyVents() {
       this.$API.ecm.myevent.list
         .req({ is_read: false, page: 0 })
@@ -137,26 +108,26 @@ export default {
         });
     },
     goEvent() {
-      this.$router.push({name:"event"})
+      this.$router.push({ name: "event" })
     },
     createhandele(id) {
-this.$router.push({
+      this.$router.push({
         name: "eventhandlefrom",
         query: {
           id: id,
         },
       });
-this.msg=false;
-	},
+      this.msg = false;
+    },
     handele(id) {
-		 this.$router.push({
+      this.$router.push({
         name: "eventhandlefrom",
         query: {
           id: id,
         },
       });
-	  this.msg=false;
-	},
+      this.msg = false;
+    },
     //个人信息
     handleUser(command) {
       if (command == "uc") {
@@ -208,7 +179,7 @@ this.msg=false;
     //显示短消息
     showMsg() {
       this.msg = true;
-	  this.getMyVents();
+      this.getMyVents();
     },
     //标记已读
     markRead() {
@@ -228,6 +199,7 @@ this.msg=false;
   align-items: center;
   height: 100%;
 }
+
 .user-bar .panel-item {
   padding: 0 10px;
   cursor: pointer;
@@ -235,17 +207,21 @@ this.msg=false;
   display: flex;
   align-items: center;
 }
+
 .user-bar .panel-item i {
   font-size: 16px;
 }
+
 .user-bar .panel-item:hover {
   background: rgba(0, 0, 0, 0.1);
 }
+
 .user-bar .user-avatar {
   height: 49px;
   display: flex;
   align-items: center;
 }
+
 .user-bar .user-avatar label {
   display: inline-block;
   margin-left: 5px;
@@ -256,31 +232,38 @@ this.msg=false;
 .msg-list li {
   border-top: 1px solid #eee;
 }
+
 .msg-list li a {
   display: flex;
   padding: 20px;
 }
+
 .msg-list li a:hover {
   background: #ecf5ff;
 }
+
 .msg-list__icon {
   width: 40px;
   margin-right: 15px;
 }
+
 .msg-list__main {
   flex: 1;
 }
+
 .msg-list__main h2 {
   font-size: 15px;
   font-weight: normal;
   color: #333;
 }
+
 .msg-list__main p {
   font-size: 12px;
   color: #999;
   line-height: 1.8;
   margin-top: 5px;
 }
+
 .msg-list__time {
   width: 100px;
   text-align: right;
@@ -290,9 +273,11 @@ this.msg=false;
 .dark .msg-list__main h2 {
   color: #d0d0d0;
 }
+
 .dark .msg-list li {
   border-top: 1px solid #363636;
 }
+
 .dark .msg-list li a:hover {
   background: #383838;
 }

From dc7b9e2f91e949b4de27b1dbbe0e2911277a95ce Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 10 Oct 2022 15:09:19 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/widgets/components/eventlist.vue     | 123 +++++++-----------
 1 file changed, 50 insertions(+), 73 deletions(-)

diff --git a/src/views/home/widgets/components/eventlist.vue b/src/views/home/widgets/components/eventlist.vue
index ee9b97a0..4b15dd27 100644
--- a/src/views/home/widgets/components/eventlist.vue
+++ b/src/views/home/widgets/components/eventlist.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row :gutter="6">
-    <el-col :md="4" :sm="24">
+    <el-col :md="3" :sm="24">
       <el-card shadow="hover">
         <template #header>
           <div class="card-header">
@@ -9,20 +9,15 @@
         </template>
         <div class="card-body">
           <div v-for="item in dutyAgg" :key="item.workflow">
-              <el-badge :value="item.count" class="item">
-                <el-button
-                  icon="el-icon-promotion"
-                  type="primary"
-                  size="small"
-                  @click="toTicket"
-                ></el-button>
-              </el-badge>
-              <div style="font-size:12px">{{ item.workflow__name }}</div>
-            </div>
+            <el-badge :value="item.count" class="item">
+              <el-button icon="el-icon-promotion" type="primary" size="small" @click="toTicket"></el-button>
+            </el-badge>
+            <div style="font-size:12px">{{ item.workflow__name }}</div>
           </div>
+        </div>
       </el-card>
     </el-col>
-    <el-col :md="12" :sm="24">
+    <el-col :md="13" :sm="24">
       <el-card shadow="hover">
         <template #header>
           <div class="card-header">
@@ -31,75 +26,47 @@
           </div>
         </template>
         <div style="height:340px">
-        <scTable
-          ref="table"
-          :apiObj="apiObj"
-          :params="params"
-          row-key="id"
-          fit
-          stripe
-          hideDo
-        >
-          <el-table-column label="#" type="index" width="50"></el-table-column>
-          <el-table-column label="事件种类">
-            <template #default="scope">
-              <el-span
-                v-for="item in scope.row.cates_"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-                >{{ item.name }}</el-span
-              >
-            </template>
-          </el-table-column>
-          <el-table-column label="发生区域" prop="area_.name"></el-table-column>
-          <el-table-column label="当事人" prop="employee_.name">
-            <template #default="scope">
-              <span
-                v-if="scope.row.employee && scope.row.obj_cate == 'people'"
-                >{{ scope.row.employee_.name }}</span
-              >
-              <span v-else>未知人员</span>
-            </template>
-          </el-table-column>
+          <scTable ref="table" :apiObj="apiObj" :params="params" row-key="id" fit stripe hideDo>
+            <!-- <el-table-column label="#" type="index" width="50"></el-table-column> -->
+            <el-table-column label="事件种类">
+              <template #default="scope">
+                <el-span v-for="item in scope.row.cates_" :key="item.id" :label="item.name" :value="item.id">{{
+                item.name }}/</el-span>
+              </template>
+            </el-table-column>
+            <el-table-column label="发生区域" prop="area_.name"></el-table-column>
+            <el-table-column label="当事人" prop="employee_.name">
+              <template #default="scope">
+                <span v-if="scope.row.employee && scope.row.obj_cate == 'people'">{{ scope.row.employee_.name }}</span>
+                <span v-else>未知人员</span>
+              </template>
+            </el-table-column>
 
-          <el-table-column label="人员类型" prop="employee_.type">
-            <template #default="scope">
-              <span v-if="scope.row.employee && scope.row.obj_cate == 'people'">
-                <span
-                  v-if="
+            <!-- <el-table-column label="人员类型" prop="employee_.type">
+              <template #default="scope">
+                <span v-if="scope.row.employee && scope.row.obj_cate == 'people'">
+                  <span v-if="
                     scope.row.employee_.type != '' &&
                     scope.row.employee_.type == 'employee'
-                  "
-                  >正式员工</span
-                >
-                <span
-                  v-if="
+                  ">正式员工</span>
+                  <span v-if="
                     scope.row.employee_.type != '' &&
                     scope.row.employee_.type == 'remployee'
-                  "
-                  >相关方</span
-                >
-                <span
-                  v-if="
+                  ">相关方</span>
+                  <span v-if="
                     scope.row.employee_.type != '' &&
                     scope.row.employee_.type == 'visitor'
-                  "
-                  >访客</span
-                >
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="发生时间"
-            prop="create_time"
-          ></el-table-column>
+                  ">访客</span>
+                </span>
+              </template>
+            </el-table-column> -->
+            <el-table-column label="发生时间" prop="create_time"></el-table-column>
 
-          <!-- <el-table-column
+            <!-- <el-table-column
               label="处理人"
               prop="handle_user_name"
             ></el-table-column> -->
-        </scTable>
+          </scTable>
         </div>
 
       </el-card>
@@ -162,13 +129,21 @@ export default {
       tooltip: {
         trigger: "item",
       },
+      legend: {
+        // orient: 'vertical',
+        left: 'center'
+      },
       series: [
         {
           name: "事件分类",
           type: "pie",
           radius: ["40%", "70%"],
           center: ["50%", "60%"],
-          label: false,
+          label: {
+            formatter: '{c}',
+            position: 'inside',
+            color: 'white'
+          },
           data: this.postOptions,
         },
       ],
@@ -255,16 +230,18 @@ export default {
   text-align: center;
   margin: 40px 0 20px 0;
 }
+
 .card-header {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  height:24px;
+  height: 24px;
 }
+
 .card-body {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-around;
-  height:340px;
+  height: 340px;
 }
 </style>

From 553e29de5c77c5cf6936289f0a724db35bd2c458 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 11 Oct 2022 18:02:33 +0800
Subject: [PATCH 5/6] =?UTF-8?q?opl=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scOpl/scFire.vue |    5 +-
 src/views/opm/clear.vue         | 1727 ++++++++++++++++---------------
 src/views/opm/cooler.vue        | 1423 +++++++++++++++----------
 src/views/opm/fire.vue          |  117 ++-
 src/views/opm/high.vue          | 1327 ++++++++++++------------
 src/views/opm/hoisting.vue      | 1327 ++++++++++++------------
 src/views/opm/opl.vue           |  284 +----
 src/views/opm/preheat.vue       | 1259 ++++++++++++----------
 src/views/opm/soil.vue          | 1265 +++++++++++-----------
 src/views/opm/space.vue         | 1724 +++++++++++++++---------------
 src/views/opm/usecl.vue         |  117 ++-
 11 files changed, 5550 insertions(+), 5025 deletions(-)

diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue
index 0ac17755..135864d2 100644
--- a/src/components/scOpl/scFire.vue
+++ b/src/components/scOpl/scFire.vue
@@ -229,7 +229,7 @@
 			</el-table-column> -->
 		</scTable>
 	</el-card>
-	<el-card header="气体检测记录" style="margin-top: 8px" shadow="hover">
+	<el-card header="气体检测记录" style="margin-top: 8px" shadow="hover" v-show="oplcateCode=='fire'||oplcateCode=='space'||oplcateCode=='cooler'">
 		<scTable
 			ref="gasTable"
 			:data="gasData"
@@ -316,7 +316,7 @@
 					risks_checked: [],
 				},
 				initForm: {},
-				oplcateCode: "",
+				oplcateCode: 'fire',
 				operationId: "",
 				oplId: "",
 				leveloptions: [
@@ -371,6 +371,7 @@
 				this.$API.opm.opl.read.req(this.oplId).then((res) => {
 					this.mainLoading = false
 					this.form = res;
+					this.oplcateCode = res.cate_code
 					// this.oplcateId = res.cate;
 					// this.operationId = res.operation;
 					// this.getOperation();
diff --git a/src/views/opm/clear.vue b/src/views/opm/clear.vue
index 95317006..1bd3a417 100644
--- a/src/views/opm/clear.vue
+++ b/src/views/opm/clear.vue
@@ -1,880 +1,901 @@
 <template>
-  <el-container>
-    <el-header>
-      <el-steps
-        :active="active"
-        style="width: 100%"
-        :align-center="true"
-        finish-status="success"
-      >
-        <el-step
-          v-for="(item, index) of stepTitle"
-          :key="index"
-          :title="item"
-          style="50%"
-          @click="handleStep(index)"
-        >
-        </el-step>
-      </el-steps>
-    </el-header>
-    <!--基本信息!-->
-    <el-main class="nopadding" v-show="active === 0">
-      <el-form
-        v-show="active === 0"
-        ref="dialogForm"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        style="margin: 40px 40px 40px 40px"
-      >
-        <el-row>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="关联作业">
-              <el-input
-                v-model="operationId"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业许可种类">
-              <el-input
-                v-model="pagtitle"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业开始时间">
-              <el-date-picker
-                v-model="form.start_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业结束时间">
-              <el-date-picker
-                v-model="form.end_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业级别">
-              <el-select v-model="form.level" placeholder="选择作业级别">
-                <el-option
-                  v-for="item in leveloptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-     -->
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业部门">
-              <el-cascader
-                placeholder="选择作业部门"
-                getCheckedNodes="true"
-                v-model="form.dept_do"
-                :options="deptoptions"
-                :props="{
+	<el-container>
+		<el-header>
+			<el-steps
+				:active="active"
+				style="width: 100%"
+				:align-center="true"
+				finish-status="success"
+			>
+				<el-step
+					v-for="(item, index) of stepTitle"
+					:key="index"
+					:title="item"
+					style="50%"
+					@click="handleStep(index)"
+				>
+				</el-step>
+			</el-steps>
+		</el-header>
+		<!--基本信息!-->
+		<el-main class="nopadding" v-show="active === 0">
+			<el-form
+				v-show="active === 0"
+				ref="dialogForm"
+				:model="form"
+				:rules="rules"
+				label-width="110px"
+				style="margin: 40px 40px 0px 40px"
+			>
+				<el-row>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="关联作业">
+							<el-input
+								v-model="form.name"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业许可种类">
+							<el-input
+								v-model="pagtitle"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业开始时间" prop="start_time">
+							<el-date-picker
+								v-model="form.start_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业结束时间" prop="end_time">
+							<el-date-picker
+								v-model="form.end_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业级别" prop="level">
+							<el-select v-model="form.level" placeholder="选择作业级别">
+								<el-option
+									v-for="item in leveloptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.name"
+								/>
+							</el-select>
+						</el-form-item>
+					</el-col>
+
+					<el-col :md="12" :sm="12" :xs="24" >
+						<el-form-item label="作业部门" prop="dept_do">
+							<el-cascader
+								placeholder="选择作业部门"
+								getCheckedNodes="true"
+								v-model="form.dept_do"
+								:options="deptoptions"
+								:props="{
                   expandTrigger: 'hover', // 次级菜单的展开方式
                   label: 'label', //
                   value: 'value', //
                   emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+				  checkStrictly: true
                 }"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业负责人">
-              <el-select v-model="form.charger" placeholder="选择作业负责人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业监护人">
-              <el-select v-model="form.monitor" placeholder="选择作业监护人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!--
-			临时用电
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业负责人" prop="charger">
+							<el-input
+								v-model="form.charger_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<!-- <el-select v-model="form.charger_name" placeholder="选择作业负责人">
+								<el-option
+									v-for="item in useroptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								/>
+							</el-select> -->
+							<ehsUserSelect :multiple="false" @submit="getCharger"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业监护人" prop="monitor">
+							<el-input
+								v-model="form.monitor_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getMonitor"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="风险选择" prop="risks_checked">
+							<el-checkbox-group v-model="form.risks_checked">
+								<el-checkbox
+									v-for="(item, index) in risklist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="其他风险">
+							<el-input
+								v-model="form.other_risk"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="措施选择" prop="measures_checked">
+							<el-checkbox-group v-model="form.measures_checked">
+								<el-checkbox
+									v-for="(item, index) in measurelist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-card header="应急处置">
+							<div class="content">
+								<p>1、施救人员必须穿戴防护用品（防毒面具、正压式空气呼吸器、长管式呼吸器）和安全绳方可进入库、
+仓内进行救援。</p>
+								<p>2、将受伤人员托起或使用三角架、绞盘和全身式安全带将伤者救出。</p>
+								<p>3、如伤者发生骨折，不应随意移动伤者，立即拨打120。</p>
+								<p>4、发生人员窒息、中毒，将其转移到空气新鲜流通的场所，插入氧气袋或进行心肺复苏术，情况严重拨打120。</p>
+								<p>4、逃生通道</p>
+							</div>
+						</el-card>
+						<el-form-item label="其他应急处置">
+							<el-input
+								v-model="form.other_emr"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
+							>下一步
+							</el-button>
+			</div>
+		</el-main>
 
-		       <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="安装/拆除">
-              <el-input v-model="work_type" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="安装/拆除时间">
-              <el-input v-model="work_time" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="验收时间">
-              <el-input v-model="accept_time" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电地点">
-              <el-input v-model="power_to" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="电源接入点">
-              <el-input v-model="power_from" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电开始">
-              <el-input
-                v-model="power_start_time"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电截至">
-              <el-input
-                v-model="power_end_time"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="计划用电天数">
-              <el-input v-model="power_days" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>  !-->
+		<!--作业人员!-->
+		<el-main class="nopadding" v-show="active === 1">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addworker"
+				></el-button>
+			</div>
+			<scTable
+				ref="workerTable"
+				:data="apiworkerObj"
+				row-key="id"
+				hidePagination
+				stripe
+				hideDo
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column label="姓名" prop="name" width="150">
+					<template #default="scope">
+						{{ scope.row.worker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="工作职责" prop="duty" width="150">
+				</el-table-column>
+				<el-table-column label="证书" prop="certificates" width="150">
+					<template #default="scope">
+						<el-tag v-for="item in scope.row.certificates_"
+								:key="item.number"
+								:label="item.name"
+								:value="item.number">{{item.name}}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="创建时间"
+					prop="create_time"
+					width="150"
+				></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="风险选择">
-              <el-checkbox-group v-model="form.risks_checked">
-                <el-checkbox
-                  v-for="(item, index) in risklist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="其他风险">
-              <el-input
-                v-model="form.other_risk"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+						<el-popconfirm
+							title="确定删除该作业人员吗？"
+							@confirm="delWorker(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="workerdialog" draggable title="选择作业人员">
+				<el-form
+					ref="workerForm"
+					:model="formworker"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="作业人员">
+								<el-input
+								v-model="formworker.worker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getWorker"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="工作职责">
+								<el-select
+									v-model="formworker.duty"
+									filterable
+									allow-create
+									default-first-option
+									:reserve-keyword="false"
+								>
+									<el-option
+										v-for="item in dutyOptions"
+										:key="item.value"
+										:label="item.label"
+										:value="item.label"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="证书">
+								<el-select
+									v-model="formworker.certificates"
+									multiple
+									placeholder="选择证书"
+								>
+									<el-option
+										v-for="item in certificatesOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialogcart = false">取 消</el-button>
+					<el-button type="primary" @click="submitWorker">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+			<el-button style="margin-right: 4px" @click="handleLastStep"
+			>上一步
+			</el-button>
+			<el-button type="primary" plain @click="handleNextStep"
+			>下一步
+			</el-button>
+			</div>
+		</el-main>
+		<!--气体检测记录!-->
+		<el-main class="nopadding" v-show="active === 2">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addgas"
+				></el-button>
+			</div>
+			<scTable
+				ref="gasTable"
+				:data="apigasObj"
+				row-key="id"
+				hidePagination
+				hideDo
+				stripe
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column
+					label="检测时间"
+					prop="check_time"
+					width="150"
+				></el-table-column>
+				<el-table-column
+					label="检测部位"
+					prop="check_place"
+					width="150"
+				></el-table-column>
+				<el-table-column label="O2(%)" prop="o2" width="150"></el-table-column>
+				<el-table-column label="CO" prop="co" width="150"></el-table-column>
+				<el-table-column
+					label="h2s"
+					prop="h2s"
+					width="150"
+				></el-table-column>
+				<el-table-column
+					label="检验结论"
+					prop="is_ok"
+					width="150"
+				>
+					<template #default="scope">
+						{{ is_ok_[scope.row.is_ok] }}
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="检测人"
+					prop="checker"
+					width="150"
+				>
+					<template #default="scope">
+						{{ scope.row.checker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="逃生路径">
-              <el-input v-model="escape_route" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>  !-->
+						<el-popconfirm
+							title="确定删除该条气体检测记录吗？"
+							@confirm="delgas(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="gasdialog" draggable title="气体检测记录">
+				<el-form
+					ref="gasForm"
+					:model="formgas"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检测时间">
+								<el-date-picker
+									v-model="formgas.check_time"
+									type="datetime"
+									placeholder="选择检测时间"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检测部位">
+								<el-input
+									v-model="formgas.check_place"
+									type="text"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="O2(%)">
+								<el-input v-model.number="formgas.o2" type="text" clearable></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="CO">
+								<el-input
+									v-model.number="formgas.co"
+									type="text"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="H2S">
+								<el-input
+									v-model.number="formgas.h2s"
+									type="text"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检验结论">
 
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="措施选择">
-              <el-checkbox-group v-model="form.measures_checked">
-                <el-checkbox
-                  v-for="(item, index) in measurelist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-card class="box-card">
-              <div class="clearfix">
-                <span>应急处置：</span>
-              </div>
-              <div class="content">
-                <p>1、施救人员必须穿戴防护用品（防毒面具、正压式空气呼吸器、长管式呼吸器）和安全绳方可进入库、仓内进行救援。</p>
-                <p>2、将受伤人员托起或使用三角架、绞盘和全身式安全带将伤者救出。</p>
-                <p>3、如伤者发生骨折，不应随意移动伤者，立即拨打120。</p>
-                 <p>4、发生人员窒息、中毒，将其转移到空气新鲜流通的场所，插入氧气袋或进行心肺复苏术，情况严重拨打120。</p>
-                  <p>5、逃生通道</p>
-              </div>
-            </el-card>
-            <el-form-item label="其他应急处置">
-              <el-input
-                v-model="form.other_emr"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业审批照片">
-              <el-input v-model="create_imgs" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		  !-->
-        </el-row>
-        <el-row>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item>
-              <el-button style="margin-top: 12px" @click="handleNextStep"
-                >下一步</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-main>
-
-    <!--作业人员!-->
-    <el-main class="nopadding" v-show="active === 1">
-      <div class="left-panel" style="margin: 10px">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addworker"
-        ></el-button>
-      </div>
-      <scTable
-        ref="workerTable"
-        :data="apiworkerObj"
-        row-key="id"
-        hidePagination
-        stripe
-      >
-        <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column label="姓名" prop="name" width="150">
-          <template #default="scope">
-            {{ scope.row.worker_.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工作职责" prop="duty" width="150">
-        </el-table-column>
-       <el-table-column label="证书" prop="certificates" width="150">
-         <template #default="scope" >
-            <el-tag v-for="item in scope.row.certificates_"
-                    :key="item.number"
-                    :label="item.name"
-                    :value="item.number">{{item.name}}</el-tag>
-          </template>
-        
-         
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template #default="scope">
-           
-            <el-popconfirm
-              title="确定删除该作业人员吗？"
-              @confirm="delWorker(scope.row)"
-            >
-              <template #reference>
-                <el-button text type="danger" size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
-      </scTable>
-      <sc-dialog v-model="workerdialog" draggable title="选择作业人员">
-        <el-form
-          ref="workerForm"
-          :model="formworker"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="80px"
-          width="70%"
-          style="margin: 40px 40px 40px 40px"
-        >
-          <el-row>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="作业人员">
-                <el-select
-                  v-model="formworker.worker"
-                  @change="selectWorker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="工作职责">
-                <el-select
-                  v-model="formworker.duty"
-                  filterable
-                  allow-create
-                  default-first-option
-                  :reserve-keyword="false"
-                >
-                  <el-option
-                    v-for="item in dutyOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="证书">
-                <el-select
-                  v-model="formworker.certificates"
-                  multiple
-                  placeholder="选择证书"
-                >
-                  <el-option
-                    v-for="item in certificatesOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-          <el-button @click="dialogcart = false">取 消</el-button>
-          <el-button type="primary" @click="submitWorker">确 定</el-button>
-        </template>
-      </sc-dialog>
-       <el-button style="margin-top: 12px" @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button style="margin-top: 12px" @click="handleNextStep"
-        >下一步</el-button
-      >
-     
-    </el-main>
-    <!--气体浓度检测记录!-->
-    <el-main class="nopadding" v-show="active === 2">
-      <div class="left-panel" style="margin: 10px">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addgas"
-        ></el-button>
-      </div>
-      <scTable
-        ref="gasTable"
-        :data="apigasObj"
-        row-key="id"
-        hidePagination
-        stripe
-      >
-      <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column
-          label="检测时间"
-          prop="check_time"
-          width="150"
-        ></el-table-column>
-        <el-table-column
-          label="检测部位"
-          prop="check_place"
-          width="150"
-        ></el-table-column>
-        <el-table-column label="O2(%)" prop="o2" width="150"></el-table-column>
-        <el-table-column label="CO" prop="co" width="150"></el-table-column>
-         <el-table-column
-          label="H2S"
-          prop="h2s"
-          width="150"
-        ></el-table-column>
-        <el-table-column
-          label="检验结论"
-          prop="is_ok"
-          width="150"
-        > <template #default="scope">
-            {{ is_ok_[scope.row.is_ok] }}
-          </template></el-table-column>
-        <el-table-column
-          label="检测人"
-          prop="checker"
-          width="150"
-        >  <template #default="scope">
-            {{ scope.row.checker_.name }}
-          </template></el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
-         <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template #default="scope">
-           
-            <el-popconfirm
-              title="确定删除该气体浓度检测记录吗？"
-              @confirm="delgas(scope.row)"
-            >
-              <template #reference>
-                <el-button text type="danger" size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
-
-      </scTable>
-      <sc-dialog v-model="gasdialog" draggable title="气体检测记录">
-        <el-form
-          ref="gasForm"
-          :model="formgas"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="80px"
-          width="70%"
-          style="margin: 40px 40px 40px 40px"
-        >
-          <el-row>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="检测时间">
-                <el-date-picker
-                  v-model="formgas.check_time"
-                  type="datetime"
-                  placeholder="选择检测时间"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="检测部位">
-                <el-input
-                  v-model="formgas.check_place"
-                  type="text"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="O2(%)">
-                <el-input v-model.number="formgas.o2" type="text" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="CO">
-                <el-input
-                  v-model.number="formgas.co"
-                  type="text"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="H2S(10ppm)">
-                <el-input
-                   v-model.number="formgas.h2s"
-                  type="text"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="检验结论">
-               
-                <el-radio-group v-model="formgas.is_ok">
-                  <el-radio :label="true"  >正常</el-radio>
-                  <el-radio :label="false" >不正常</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="检测人">
-                  <el-select
-                  v-model="formgas.checker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-          <el-button @click="dialoggase = false">取 消</el-button>
-          <el-button type="primary" @click="submitgas">确 定</el-button>
-        </template>
-      </sc-dialog>
-      <el-button style="margin-top: 12px" @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button style="margin-top: 12px" @click="submitOut">退出</el-button>
-    </el-main>
-  </el-container>
+								<el-radio-group v-model="formgas.is_ok">
+									<el-radio l :label="true">正常</el-radio>
+									<el-radio :label="false">不正常</el-radio>
+								</el-radio-group>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检测人">
+								<el-input
+								v-model="formgas.checker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+								<ehsUserSelect :multiple="false" @submit="getChecker"/>
+								<!-- <el-select
+									v-model="formgas.checker"
+									placeholder="选择作业人员"
+								>
+									<el-option
+										v-for="item in useroptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select> -->
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialoggase = false">取 消</el-button>
+					<el-button type="primary" @click="submitgas">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+			<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
+			<el-button
+				:loading="tLoading"
+				v-for=" item in initForm.transitions"
+				:key="item.id"
+				type="primary"
+				@click="submitTicketCreate(item.id)"
+				style="margin-right:4px"
+			>{{item.name}}
+			</el-button>
+			<el-button @click="submitOut" type="warning">退出</el-button>
+			</div>
+		</el-main>
+	</el-container>
 </template>
 <style scoped>
-.clearfix {
-  font-size: 20px;
-}
+	.clearfix {
+		font-size: 20px;
+	}
 
-.box-card p {
-  line-height: 20px;
-}
-.content {
-  margin-top: 10px;
-}
-.stepSuc:hover {
-  cursor: pointer;
-}
-.stepErr:hover {
-  cursor: not-allowed;
-}
+	.box-card p {
+		line-height: 20px;
+	}
+
+	.content {
+		margin-top: 10px;
+	}
+
+	.stepSuc:hover {
+		cursor: pointer;
+	}
+
+	.stepErr:hover {
+		cursor: not-allowed;
+	}
 </style>
-    <script>
-import { genTree } from "@/utils/verificate";
-const defaultformworker = {
-  id: "",
-  worker: null,
-  duty: null,
-  certificates: [],
-  opl: "",
-};
-const defaultformgas = {
-  id: "",
-  check_time: null,
-  opl:""
-};
-export default {
-  name: "clear",
-  components: {},
-  data() {
-    return {
-      active: 0,
-      stepSuc: [0],
-      stepTitle: ["基本信息", "作业人员", "气体浓度检测记录"],
-      query: {},
-      selection: [],
-      issave: false, //控制基本信息提交
-      search: {
-        keyword: null,
-      },
-      form: {
-        id: "",
-        start_time: null,
-        end_time: null,
-        operation: "",
-        cate: "",
-        risks_checked: [],
-      },
+<script>
+	import {genTree} from "@/utils/verificate";
 
-      operationId: "",
-      oplcateId: "",
-      oplId: "",
-      leveloptions: [
-        { id: 10, name: "特级" },
-        { id: 20, name: "一级" },
-        { id: 30, name: "二级" },
-      ],
-      deptoptions: [],
-      useroptions: [],
-      risklist: [],
-      measurelist: [],
-      pagtitle: "",
+	const defaultformworker = {
+		id: "",
+		worker: null,
+		duty: "作业人员",
+		certificates: [],
+		opl: "",
+	};
+	const defaultformgas = {
+		id: "",
+		is_ok: true,
+		check_time: null,
+		opl: "",
+	};
+	export default {
+		name: "fire",
+		components: {},
+		data() {
+			return {
+				active: 0,
+				stepSuc: [0],
+				stepTitle: ["基本信息", "作业人员", "气体检测记录"],
+				query: {},
+				selection: [],
+				issave: false, //控制基本信息提交
+				search: {
+					keyword: null,
+				},
+				form: {
+					id: "",
+					start_time: null,
+					end_time: null,
+					operation: "",
+					cate: "",
+					risks_checked: [],
+				},
+				initForm: {},
+				operationId: "",
+				oplcateId: "",
+				oplcateCode: "",
+				oplId: "",
+				leveloptions: [
+					{id: 10, name: "特殊动火"},
+					{id: 20, name: "一级动火"},
+					{id: 30, name: "二级动火"},
+				],
+				deptoptions: [],
+				useroptions: [],
+				risklist: [],
+				measurelist: [],
+				pagtitle: "",
+				dutyOptions: [
+					{value: 10, label: "作业人员"},
+					{value: 20, label: "起重司机"},
+					{value: 30, label: "司索人员"},
+					{value: 40, label: "起重指挥"},
+					{value: 40, label: "电工"},
+				],
+				certificatesOptions: [],
+				formworker: defaultformworker,
+				apiworkerObj: [],
+				workerdialog: false,
+				gasdialog: false,
+				formgas: defaultformgas,
+				apigasObj: [],
+				is_ok_: {
+					true: "正常",
+					false: "不正常",
+				},
+				tLoading: false,
+				rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					level: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
+			};
+		},
+		mounted() {
+			this.operationId = this.$route.query.operationid; //作业ID
+			this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
+			this.oplId = this.$route.query.oplId; //许可证ID
+			this.getoplData();
+			this.getInit();
+			this.getDept();
+			// this.getUser();
+		},
+		methods: {
+			getCharger(data) {
+				this.form.charger=data.id;
+      			this.form.charger_name=data.name
+			},
+			getChecker(data){
+				this.formgas.checker=data.id;
+      			this.formgas.checker_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();
+					this.getOplcates();
+				} else {
+					this.getData();
+				}
+			},
+			//根据oplId，查许可证
+			getData() {
+				this.$API.opm.opl.read.req(this.oplId).then((res) => {
+					this.form = res;
+					this.oplId = res.id;
+					this.oplcateId = res.cate;
+					this.operationId = res.operation;
+					this.getOperation();
+					this.getOplcates();
+				});
+			},
+			//根据operationId，查作业信息
 
-      dutyOptions: [
-        { value: 10, label: "作业人员" },
-        { value: 20, label: "起重司机" },
-        { value: 30, label: "司索人员" },
-        { value: 40, label: "起重指挥" },
-        { value: 40, label: "电工" },
-      ],
-      certificatesOptions: [],
-      formworker: defaultformworker,
-      apiworkerObj: [],
-      workerdialog: false,
-      gasdialog: false,
-      formgas: defaultformgas,
-      apigasObj: [],
-      is_ok_: {
-        true: "正常",
-        false: "不正常",
-      },
-    };
-  },
-  mounted() {
-    this.operationId = this.$route.query.operationid; //作业ID
-    this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
-    this.oplId = this.$route.query.oplId; //许可证ID
-    this.getoplData();
+			getOperation() {
+				this.$API.opm.operation.read.req(this.operationId).then((res) => {
+					this.form.start_time = res.start_time; //作业开始时间
+					this.form.end_time = res.end_time; //作业结束时间
+					this.form.name = res.name; //作业结束时间
 
-    this.getDept();
-    this.getUser();
-  },
-  methods: {
-    getoplData() {
-      if (this.oplId == "") {
-        this.getOperation();
-        this.getOplcates();
-      } else {
-        this.getData();
-      }
-    },
-    //根据oplId，查许可证
-    getData() {
-      this.$API.opm.opl.read.req(this.oplId).then((res) => {
-        this.form = res;
+					console.log(res);
+				});
+			},
+			//作业部门
+			getDept() {
+				this.$API.system.dept.list.req({page: 0}).then((res) => {
+					this.deptoptions = genTree(res);
+				});
+			},
 
-        this.oplcateId = res.cate;
-        this.operationId = res.operation;
-        this.getOperation();
-        this.getOplcates();
-      });
-    },
-    //根据operationId，查作业信息
+			//作业负责人、作业监护人
+			//作业
 
-    getOperation() {
-      this.$API.opm.operation.read.req(this.operationId).then((res) => {
-        this.form.start_time = res.start_time; //作业开始时间
-        this.form.end_time = res.end_time; //作业结束时间
+			//根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情
+			getOplcates() {
+				this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
+					console.log(res); //
+					this.pagtitle = res.name;
+					this.oplcateCode = res.code;
+					this.risklist = res.risk_options_; //风险缝隙
+					this.measurelist = res.measure_options_; //控制措施
+				});
+			},
+			handleStep(val) {
+				//点击步骤条
+				if (this.stepSuc.includes(val) === true) {
+					this.active = val;
+				}
+			},
+			//组件点击上一步
+			handleLastStep() {
+				if (--this.active === 0) {
+					this.active = 0;
+				}
+			},
+			//组件点击下一步
+			handleNextStep() {
 
-        console.log(res);
-      });
-    },
-    //作业部门
-    getDept() {
-      this.$API.system.dept.list.req({ page: 0 }).then((res) => {
-        this.deptoptions = genTree(res);
-      });
-    },
+				if (this.active == 0) {
+					this.$refs.dialogForm.validate((valid) => {
+					if (valid) {
+											//如果是创建许可证书
+					if (this.oplId == "") {
+						//基本信息提交
+						debugger;
+						this.form.cate = this.oplcateId;
+						this.form.operation = this.operationId;
+						console.log(this.form);
+						this.$API.opm.opl.create
+							.req(this.form)
+							.then((res) => {
+								this.$emit("success", this.form);
+								this.$message.success("创建成功");
+								this.issave = true;
+								this.active = 1;
 
-    //作业负责人、作业监护人
-    getUser() {
-      this.$API.system.user.list.req({ page: 0 }).then((res) => {
-        this.useroptions = res;
-      });
-    },
-    //作业
+								this.oplId = res.id;
+								this.getworkerList();
+								this.getgasList();
+								return res;
+							})
+							.catch((err) => {
+								return err;
+							});
+					} else if (this.oplId != "") {
 
-    //根据作业许可证ID获取，风险、措施
-    getOplcates() {
-      this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
-        console.log(res); //
-        this.pagtitle = res.name;
-        this.risklist = res.risk_options_; //风险缝隙
-        this.measurelist = res.measure_options_; //控制措施
-      });
-    },
-    handleStep(val) {
-      //点击步骤条
-      if (this.stepSuc.includes(val) === true) {
-        this.active = val;
-      }
-    },
-    //组件点击上一步
-    handleLastStep() {
-      if (--this.active === 0) {
-        this.active = 0;
-      }
-    },
-    //组件点击下一步
-    handleNextStep() {
-      if (this.active == 0) {
-        console.log(this.oplId);
-        //如果是创建许可证书
-        if (this.oplId == "" && this.issave == false) {
-          //基本信息提交
-          debugger;
-          this.form.cate = this.oplcateId;
-          this.form.operation = this.operationId;
-          console.log(this.form);
-          this.$API.opm.opl.create
-            .req(this.form)
-            .then((res) => {
-              this.$emit("success", this.form, this.mode);
-              this.$message.success("创建成功");
-              this.issave = true;
-              this.active = 1;
-              this.oplId = res.id;
-              this.getworkerList(res.id);
-              this.getgasList(res.id);
-              return res;
-            })
-            .catch((err) => {
-              return err;
-            });
-        } else if (this.oplId != "") {
-          this.$API.opm.opl.update.req(this.form.id, this.form).then(() => {
-            this.$message.success("基本修改成功！");
-            this.issave = true;
-            this.active = 1;
-            this.getworkerList(this.form.id);
-           this.getgasList(this.form.id);
-          });
-        } else {
-          this.active = 1;
-        }
-      } else {
-        this.active = 2;
-       
-      }
-      // this.stepSuc.push(++this.active)
-    },
+						this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
+							this.$message.success("基本修改成功！");
+							this.issave = true;
+							this.active = 1;
+							this.getgasList();
+							this.getworkerList();
 
-   //选择人员后，调出该人员的所有证书
-    selectWorker() {
-      this.$API.hrm.certificate.list
-        .req({ employee__user: this.formworker.worker, page: 0 })
-        .then((res) => {
-          this.certificatesOptions = res;
-          console.log(res);
-        });
-    },
-    //作业人员列表
+						});
+					} else {
+						this.active = 1;
+					}
+					}
+				})
+				} else {
+					if (this.active==1){
+						if(this.apiworkerObj.length==0){
+							this.$message.warning("请添加作业人员");
+							return
+						}
+					}
+					this.active = 2;
 
-    getworkerList(id) {
-      this.$API.opm.worker.list.req({ opl: id, page: 0 }).then((res) => {
-        this.apiworkerObj = res;
-        console.log(res);
-      });
-    },
-    //创建作业人员，显示Form
-    addworker() {
-      this.workerdialog = true;
+				}
+				// this.stepSuc.push(++this.active)
+			},
 
-      this.formworker = Object.assign({}, defaultformworker);
-    },
-   
-    //删除作业人员
-    delWorker(row) {
-      this.$API.opm.worker.delete
-        .req(row.id)
-        .then((res) => {
-          this.$message.success("作业人员删除成功");
-          
-           	this.$refs.workerTable.refresh();
-          return res;
-        })
-        .catch((err) => {
-          return err;
-        });
-    },
-    //提交作业人员信息
-    submitWorker() {
-      this.formworker.opl = this.oplId;
-      this.$refs.workerForm.validate(async (valid) => {
-      
-          this.$API.opm.worker.create
-            .req(this.formworker)
-            .then((res) => {
-              this.$message.success("创建作业人员成功");
-              	this.$refs.workerTable.refresh();
-              this.workerdialog = false;
-             
-            })
-            .catch((err) => {
-              return err;
-            });
-      
-      });
-    },
-    //气体检测记录列表
+			//选择人员后，调出该人员的所有证书
+			selectWorker() {
+				this.$API.hrm.certificate.list
+					.req({employee__user: this.formworker.worker, page: 0})
+					.then((res) => {
+						this.certificatesOptions = res;
+						console.log(res);
+					});
+			},
+			//作业人员列表
 
-    getgasList(id) {
-      this.$API.opm.gas.list.req({ opl: id, page: 0 }).then((res) => {
-        this.apigasObj = res;
-        console.log(res);
-      });
-    },
-    //创建气体检测记录，显示Form
-    addgas() {
-      this.gasdialog = true;
-      this.formgas = Object.assign({}, defaultformgas);
-    },
+			getworkerList() {
+				this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apiworkerObj = res;
+					console.log(res);
+				});
+			},
+			//创建作业人员，显示Form
+			addworker() {
+				this.workerdialog = true;
 
-    //提交气体检测记录
-    submitgas() {
-      this.formgas.opl = this.oplId;
-      this.$refs.gasForm.validate(async (valid) => {
-       
-          this.$API.opm.gas.create
-            .req(this.formgas)
-            .then((res) => {
-              this.$message.success("创建气体浓度检测记录成功");
-              	this.$refs.gasTable.refresh();
-              
-              this.gasdialog = false;
-             
-            })
-            .catch((err) => {
-              return err;
-            });
-       
-      });
-    },
-     //删除气体检测记录
-    delgas(row) {
-      this.$API.opm.gas.delete
-        .req(row.id)
-        .then((res) => {
-          this.$message.success("气体浓度检测记录删除成功");
-         	this.$refs.gasTable.refresh();
-          return res;
-        })
-        .catch((err) => {
-          return err;
-        });
-    },
-    //退出界面
-    submitOut(){
-      this.$router.push({
-        name: "opl",
-        query: {
-          operationid: this.$route.query.id,//作业ID
-         
-        },
-      });
-    }
-  },
-};
-</script>
\ No newline at end of file
+				this.formworker = Object.assign({}, defaultformworker);
+			},
+
+			//删除作业人员
+			delWorker(row) {
+				this.$API.opm.worker.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("作业人员删除成功");
+						this.getworkerList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+			//提交作业人员信息
+			submitWorker() {
+				this.formworker.opl = this.oplId;
+				this.$refs.workerForm.validate(async (valid) => {
+
+					this.$API.opm.worker.create
+						.req(this.formworker)
+						.then((res) => {
+							this.$message.success("创建作业人员成功");
+							this.getworkerList();
+							this.workerdialog = false;
+						})
+						.catch((err) => {
+							return err;
+						});
+				});
+			},
+
+			//气体检测记录列表
+			getgasList() {
+				this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apigasObj = res;
+					console.log(res);
+				});
+			},
+
+			//创建气体检测记录，显示Form
+			addgas() {
+				this.gasdialog = true;
+				this.formgas = Object.assign({}, defaultformgas);
+			},
+
+			//提交气体检测记录
+			submitgas() {
+				this.formgas.opl = this.oplId;
+				this.$refs.gasForm.validate(async (valid) => {
+
+					this.$API.opm.gas.create
+						.req(this.formgas)
+						.then((res) => {
+							this.$message.success("创建气体检测记录成功");
+							this.getgasList();
+							this.gasdialog = false;
+
+						})
+						.catch((err) => {
+							return err;
+						});
+
+				});
+			},
+
+			//删除气体检测记录
+			delgas(row) {
+				this.$API.opm.gas.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("气体检测记录删除成功");
+						this.getgasList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+
+			//渲染工单提交按钮
+			getInit() {
+				this.$API.wf.workflow.initkey.req('opl_clear').then((res) => {
+					this.initForm = res;
+				});
+			},
+
+			//提交,创建工单
+			submitTicketCreate(id) {
+				let ticket = {};
+				ticket.workflow = this.initForm.workflow;
+				ticket.ticket_data = {opl: this.oplId};
+				ticket.transition = id;
+				ticket.title = this.form.name + '-申请';
+				this.tLoading = true
+				this.$API.wf.ticket.create.req(ticket).then((res) => {
+					this.tLoading = false
+					this.$message.success("提交成功");
+					this.submitOut()
+				}).catch(e=>{this.tLoading=false});
+			},
+
+			//退出界面
+			submitOut() {
+				this.$router.push({
+					name: "opl",
+					query: {
+						id: this.operationId,//作业ID
+
+					},
+				});
+			}
+		},
+	};
+</script>
diff --git a/src/views/opm/cooler.vue b/src/views/opm/cooler.vue
index 2c12ba2b..58ac26f3 100644
--- a/src/views/opm/cooler.vue
+++ b/src/views/opm/cooler.vue
@@ -1,580 +1,887 @@
 <template>
-  <el-container>
-    <el-header>
-      <el-steps
-        :active="active"
-        style="width: 100%"
-        :align-center="true"
-        finish-status="success"
-      >
-        <el-step
-          v-for="(item, index) of stepTitle"
-          :key="index"
-          :title="item"
-          style="50%"
-          @click="handleStep(index)"
-        >
-        </el-step>
-      </el-steps>
-    </el-header>
-    <!--基本信息!-->
-    <el-main class="nopadding" v-show="active === 0">
-      <el-form
-        v-show="active === 0"
-        ref="dialogForm"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        style="margin: 40px 40px 40px 40px"
-      >
-        <el-row>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="关联作业">
-              <el-input
-                v-model="operationId"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业许可种类">
-              <el-input
-                v-model="pagtitle"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业开始时间">
-              <el-date-picker
-                v-model="form.start_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业结束时间">
-              <el-date-picker
-                v-model="form.end_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-         
-         
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业负责人">
-              <el-select v-model="form.charger" placeholder="选择作业负责人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业监护人">
-              <el-select v-model="form.monitor" placeholder="选择作业监护人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-       
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="风险选择">
-              <el-checkbox-group v-model="form.risks_checked">
-                <el-checkbox
-                  v-for="(item, index) in risklist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="其他风险">
-              <el-input
-                v-model="form.other_risk"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+	<el-container>
+		<el-header>
+			<el-steps
+				:active="active"
+				style="width: 100%"
+				:align-center="true"
+				finish-status="success"
+			>
+				<el-step
+					v-for="(item, index) of stepTitle"
+					:key="index"
+					:title="item"
+					style="50%"
+					@click="handleStep(index)"
+				>
+				</el-step>
+			</el-steps>
+		</el-header>
+		<!--基本信息!-->
+		<el-main class="nopadding" v-show="active === 0">
+			<el-form
+				v-show="active === 0"
+				ref="dialogForm"
+				:model="form"
+				:rules="rules"
+				label-width="110px"
+				style="margin: 40px 40px 0px 40px"
+			>
+				<el-row>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="关联作业">
+							<el-input
+								v-model="form.name"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业许可种类">
+							<el-input
+								v-model="pagtitle"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业开始时间" prop="start_time">
+							<el-date-picker
+								v-model="form.start_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业结束时间" prop="end_time">
+							<el-date-picker
+								v-model="form.end_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24" >
+						<el-form-item label="作业部门" prop="dept_do">
+							<el-cascader
+								placeholder="选择作业部门"
+								getCheckedNodes="true"
+								v-model="form.dept_do"
+								:options="deptoptions"
+								:props="{
+                  expandTrigger: 'hover', // 次级菜单的展开方式
+                  label: 'label', //
+                  value: 'value', //
+                  emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+				  checkStrictly: true
+                }"
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业负责人" prop="charger">
+							<el-input
+								v-model="form.charger_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<!-- <el-select v-model="form.charger_name" placeholder="选择作业负责人">
+								<el-option
+									v-for="item in useroptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								/>
+							</el-select> -->
+							<ehsUserSelect :multiple="false" @submit="getCharger"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业监护人" prop="monitor">
+							<el-input
+								v-model="form.monitor_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getMonitor"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="风险选择" prop="risks_checked">
+							<el-checkbox-group v-model="form.risks_checked">
+								<el-checkbox
+									v-for="(item, index) in risklist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="其他风险">
+							<el-input
+								v-model="form.other_risk"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="措施选择" prop="measures_checked">
+							<el-checkbox-group v-model="form.measures_checked">
+								<el-checkbox
+									v-for="(item, index) in measurelist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-card header="应急处置">
+							<div class="content">
+								<p>1、施救人员必须穿戴好耐高温防护用品方可进入篦冷机内进行救援。</p>
+								<p>2、将受伤人员托起或使用担架将伤者抬出篦冷机。</p>
+								<p>3、发生人员窒息、中毒，将其转移到空气新鲜流通的场所，插入氧气袋或进行心肺复苏术，情况严重拨打120。
+								</p>
+								<p>4、发生人员烫伤时用冷清水对烫伤部位进行冲洗或用浸泡，用干净的纱布或衣物盖住被烫伤部位，伤势严重时立即拨打120送医。若贴身衣服与伤口粘在一起时，可用剪刀剪开，然后缓慢剥离衣物。</p>
+							</div>
+						</el-card>
+						<el-form-item label="其他应急处置">
+							<el-input
+								v-model="form.other_emr"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
+							>下一步
+							</el-button>
+			</div>
+		</el-main>
 
-    
+		<!--作业人员!-->
+		<el-main class="nopadding" v-show="active === 1">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addworker"
+				></el-button>
+			</div>
+			<scTable
+				ref="workerTable"
+				:data="apiworkerObj"
+				row-key="id"
+				hidePagination
+				stripe
+				hideDo
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column label="姓名" prop="name" width="150">
+					<template #default="scope">
+						{{ scope.row.worker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="工作职责" prop="duty" width="150">
+				</el-table-column>
+				<el-table-column label="证书" prop="certificates" width="150">
+					<template #default="scope">
+						<el-tag v-for="item in scope.row.certificates_"
+								:key="item.number"
+								:label="item.name"
+								:value="item.number">{{item.name}}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="创建时间"
+					prop="create_time"
+					width="150"
+				></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="措施选择">
-              <el-checkbox-group v-model="form.measures_checked">
-                <el-checkbox
-                  v-for="(item, index) in measurelist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+						<el-popconfirm
+							title="确定删除该作业人员吗？"
+							@confirm="delWorker(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="workerdialog" draggable title="选择作业人员">
+				<el-form
+					ref="workerForm"
+					:model="formworker"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="作业人员">
+								<el-input
+								v-model="formworker.worker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getWorker"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="工作职责">
+								<el-select
+									v-model="formworker.duty"
+									filterable
+									allow-create
+									default-first-option
+									:reserve-keyword="false"
+								>
+									<el-option
+										v-for="item in dutyOptions"
+										:key="item.value"
+										:label="item.label"
+										:value="item.label"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="证书">
+								<el-select
+									v-model="formworker.certificates"
+									multiple
+									placeholder="选择证书"
+								>
+									<el-option
+										v-for="item in certificatesOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialogcart = false">取 消</el-button>
+					<el-button type="primary" @click="submitWorker">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+			<el-button style="margin-right: 4px" @click="handleLastStep"
+			>上一步
+			</el-button>
+			<el-button type="primary" plain @click="handleNextStep"
+			>下一步
+			</el-button>
+			</div>
+		</el-main>
+		<!--气体检测记录!-->
+		<el-main class="nopadding" v-show="active === 2">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addgas"
+				></el-button>
+			</div>
+			<scTable
+				ref="gasTable"
+				:data="apigasObj"
+				row-key="id"
+				hidePagination
+				hideDo
+				stripe
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column
+					label="检测时间"
+					prop="check_time"
+					width="150"
+				></el-table-column>
+				<el-table-column
+					label="检测部位"
+					prop="check_place"
+					width="150"
+				></el-table-column>
+				<el-table-column label="O2(%)" prop="o2" width="150"></el-table-column>
+				<el-table-column label="CO" prop="co" width="150"></el-table-column>
+				<el-table-column
+					label="45℃"
+					prop="f5"
+					width="150"
+				></el-table-column>
+				<el-table-column
+					label="检验结论"
+					prop="is_ok"
+					width="150"
+				>
+					<template #default="scope">
+						{{ is_ok_[scope.row.is_ok] }}
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="检测人"
+					prop="checker"
+					width="150"
+				>
+					<template #default="scope">
+						{{ scope.row.checker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-card class="box-card">
-              <div class="clearfix">
-                <span>应急处置：</span>
-              </div>
-              <div class="content">
-                <p>1、施救人员必须穿戴好耐高温防护用品方可进入篦冷机内进行救援。</p>
-                <p>2、将受伤人员托起或使用担架将伤者抬出篦冷机。</p>
-                <p>3、发生人员窒息、中毒，将其转移到空气新鲜流通的场所，插入氧气袋或进行心肺复苏术，情况严重拨打120。 </p>
-                  <p>4、发生人员烫伤时用冷清水对烫伤部位进行冲洗或用浸泡，用干净的纱布或衣物盖住被烫伤部位，伤势严重时立即拨打120送医。若贴身衣服与伤口粘在一起时，可用剪刀剪开，然后缓慢剥离衣物。 </p>
-                <p>5、逃生通道。 </p>
-              </div>
-            </el-card>
-            <el-form-item label="其他应急处置">
-              <el-input
-                v-model="form.other_emr"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+						<el-popconfirm
+							title="确定删除该条气体检测记录吗？"
+							@confirm="delgas(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="gasdialog" draggable title="气体检测记录">
+				<el-form
+					ref="gasForm"
+					:model="formgas"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检测时间">
+								<el-date-picker
+									v-model="formgas.check_time"
+									type="datetime"
+									placeholder="选择检测时间"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检测部位">
+								<el-input
+									v-model="formgas.check_place"
+									type="text"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="O2(%)">
+								<el-input v-model.number="formgas.o2" type="text" clearable></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="CO">
+								<el-input
+									v-model.number="formgas.co"
+									type="text"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="45℃">
+								<el-input
+									v-model.number="formgas.f5"
+									type="text"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检验结论">
 
-       
-        </el-row>
-        <el-row>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item>
-              <el-button style="margin-top: 12px" @click="handleNextStep"
-                >下一步</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-main>
-
-    <!--作业人员!-->
-    <el-main class="nopadding" v-show="active === 1">
-      <div class="left-panel" style="margin: 10px">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addworker"
-        ></el-button>
-      </div>
-      <scTable
-        ref="workerTable"
-        :data="apiworkerObj"
-        row-key="id"
-        hidePagination
-        stripe
-      >
-        <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column label="姓名" prop="name" width="150">
-          <template #default="scope">
-            {{ scope.row.worker_.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工作职责" prop="duty" width="150">
-        </el-table-column>
-        <el-table-column label="证书" prop="certificates" width="150">
-          <template #default="scope" >
-            <el-tag v-for="item in scope.row.certificates_"
-                    :key="item.number"
-                    :label="item.name"
-                    :value="item.number">{{item.name}}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template #default="scope">
-           
-            <el-popconfirm
-              title="确定删除该作业人员吗？"
-              @confirm="delWorker(scope.row)"
-            >
-              <template #reference>
-                <el-button text type="danger" size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
-      </scTable>
-      <sc-dialog v-model="workerdialog" draggable title="选择作业人员">
-        <el-form
-          ref="workerForm"
-          :model="formworker"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="80px"
-          width="70%"
-          style="margin: 40px 40px 40px 40px"
-        >
-          <el-row>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="作业人员">
-                <el-select
-                  v-model="formworker.worker"
-                  @change="selectWorker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="工作职责">
-                <el-select
-                  v-model="formworker.duty"
-                  filterable
-                  allow-create
-                  default-first-option
-                  :reserve-keyword="false"
-                >
-                  <el-option
-                    v-for="item in dutyOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="证书">
-                <el-select
-                  v-model="formworker.certificates"
-                  multiple
-                  placeholder="选择证书"
-                >
-                  <el-option
-                    v-for="item in certificatesOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-          <el-button @click="dialogcart = false">取 消</el-button>
-          <el-button type="primary" @click="submitWorker">确 定</el-button>
-        </template>
-      </sc-dialog>
-          <el-button style="margin-top: 12px" @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button style="margin-top: 12px" @click="submitOut">退出</el-button>
-     
-    </el-main>
- 
-  </el-container>
+								<el-radio-group v-model="formgas.is_ok">
+									<el-radio l :label="true">正常</el-radio>
+									<el-radio :label="false">不正常</el-radio>
+								</el-radio-group>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检测人">
+								<el-input
+								v-model="formgas.checker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+								<ehsUserSelect :multiple="false" @submit="getChecker"/>
+								<!-- <el-select
+									v-model="formgas.checker"
+									placeholder="选择作业人员"
+								>
+									<el-option
+										v-for="item in useroptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select> -->
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialoggase = false">取 消</el-button>
+					<el-button type="primary" @click="submitgas">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+			<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
+			<el-button
+				:loading="tLoading"
+				v-for=" item in initForm.transitions"
+				:key="item.id"
+				type="primary"
+				@click="submitTicketCreate(item.id)"
+				style="margin-right:4px"
+			>{{item.name}}
+			</el-button>
+			<el-button @click="submitOut" type="warning">退出</el-button>
+			</div>
+		</el-main>
+	</el-container>
 </template>
 <style scoped>
-.clearfix {
-  font-size: 20px;
-}
+	.clearfix {
+		font-size: 20px;
+	}
 
-.box-card p {
-  line-height: 20px;
-}
-.content {
-  margin-top: 10px;
-}
-.stepSuc:hover {
-  cursor: pointer;
-}
-.stepErr:hover {
-  cursor: not-allowed;
-}
+	.box-card p {
+		line-height: 20px;
+	}
+
+	.content {
+		margin-top: 10px;
+	}
+
+	.stepSuc:hover {
+		cursor: pointer;
+	}
+
+	.stepErr:hover {
+		cursor: not-allowed;
+	}
 </style>
-    <script>
-import { genTree } from "@/utils/verificate";
-const defaultformworker = {
-  id: "",
-  worker: null,
-  duty: null,
-  certificates: [],
-  opl: "",
-};
-const defaultformgas = {
-  id: "",
-  check_time: null,
-  opl:""
-};
-export default {
-  name: "cooler",
-  components: {},
-  data() {
-    return {
-     
-      active: 0,
-      stepSuc: [0],
-      stepTitle: ["基本信息", "作业人员"],
-      query: {},
-      selection: [],
-      issave: false, //控制基本信息提交
-      search: {
-        keyword: null,
-      },
-      form: {
-        id: "",
-        start_time: null,
-        end_time: null,
-        operation: "",
-        cate: "",
-        risks_checked: [],
-      },
+<script>
+	import {genTree} from "@/utils/verificate";
 
-      operationId: "",
-      oplcateId: "",
-      oplId: "",
-      leveloptions: [
-        { id: 10, name: "特殊动火" },
-        { id: 20, name: "一级动火" },
-        { id: 30, name: "二级动火" },
-      ],
-      deptoptions: [],
-      useroptions: [],
-      risklist: [],
-      measurelist: [],
-      pagtitle: "",
+	const defaultformworker = {
+		id: "",
+		worker: null,
+		duty: "作业人员",
+		certificates: [],
+		opl: "",
+	};
+	const defaultformgas = {
+		id: "",
+		is_ok: true,
+		check_time: null,
+		opl: "",
+	};
+	export default {
+		name: "fire",
+		components: {},
+		data() {
+			return {
+				active: 0,
+				stepSuc: [0],
+				stepTitle: ["基本信息", "作业人员", "气体检测记录"],
+				query: {},
+				selection: [],
+				issave: false, //控制基本信息提交
+				search: {
+					keyword: null,
+				},
+				form: {
+					id: "",
+					start_time: null,
+					end_time: null,
+					operation: "",
+					cate: "",
+					risks_checked: [],
+				},
+				initForm: {},
+				operationId: "",
+				oplcateId: "",
+				oplcateCode: "",
+				oplId: "",
+				leveloptions: [
+					{id: 10, name: "特殊动火"},
+					{id: 20, name: "一级动火"},
+					{id: 30, name: "二级动火"},
+				],
+				deptoptions: [],
+				useroptions: [],
+				risklist: [],
+				measurelist: [],
+				pagtitle: "",
+				dutyOptions: [
+					{value: 10, label: "作业人员"},
+					{value: 20, label: "起重司机"},
+					{value: 30, label: "司索人员"},
+					{value: 40, label: "起重指挥"},
+					{value: 40, label: "电工"},
+				],
+				certificatesOptions: [],
+				formworker: defaultformworker,
+				apiworkerObj: [],
+				workerdialog: false,
+				gasdialog: false,
+				formgas: defaultformgas,
+				apigasObj: [],
+				is_ok_: {
+					true: "正常",
+					false: "不正常",
+				},
+				tLoading: false,
+				rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					level: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
+			};
+		},
+		mounted() {
+			this.operationId = this.$route.query.operationid; //作业ID
+			this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
+			this.oplId = this.$route.query.oplId; //许可证ID
+			this.getoplData();
+			this.getInit();
+			this.getDept();
+			// this.getUser();
+		},
+		methods: {
+			getCharger(data) {
+				this.form.charger=data.id;
+      			this.form.charger_name=data.name
+			},
+			getChecker(data){
+				this.formgas.checker=data.id;
+      			this.formgas.checker_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();
+					this.getOplcates();
+				} else {
+					this.getData();
+				}
+			},
+			//根据oplId，查许可证
+			getData() {
+				this.$API.opm.opl.read.req(this.oplId).then((res) => {
+					this.form = res;
+					this.oplId = res.id;
+					this.oplcateId = res.cate;
+					this.operationId = res.operation;
+					this.getOperation();
+					this.getOplcates();
+				});
+			},
+			//根据operationId，查作业信息
 
-      dutyOptions: [
-        { value: 10, label: "作业人员" },
-        { value: 20, label: "起重司机" },
-        { value: 30, label: "司索人员" },
-        { value: 40, label: "起重指挥" },
-        { value: 40, label: "电工" },
-      ],
-      certificatesOptions: [],
-      formworker: defaultformworker,
-      apiworkerObj: [],
-      workerdialog: false,
-      gasdialog: false,
-      formgas: defaultformgas,
-      apigasObj: [],
-      is_ok_: {
-        true: "正常",
-        false: "不正常",
-      },
-    };
-  },
-  mounted() {
-    this.operationId = this.$route.query.operationid; //作业ID
-    this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
-    this.oplId = this.$route.query.oplId; //许可证ID
-    this.getoplData();
+			getOperation() {
+				this.$API.opm.operation.read.req(this.operationId).then((res) => {
+					this.form.start_time = res.start_time; //作业开始时间
+					this.form.end_time = res.end_time; //作业结束时间
+					this.form.name = res.name; //作业结束时间
 
-    this.getDept();
-    this.getUser();
-  },
-  methods: {
-    
+					console.log(res);
+				});
+			},
+			//作业部门
+			getDept() {
+				this.$API.system.dept.list.req({page: 0}).then((res) => {
+					this.deptoptions = genTree(res);
+				});
+			},
 
-    getoplData() {
-      if (this.oplId == "") {
-        this.getOperation();
-        this.getOplcates();
-      } else {
-        this.getData();
-      }
-    },
-    //根据oplId，查许可证
-    getData() {
-      this.$API.opm.opl.read.req(this.oplId).then((res) => {
-        this.form = res;
+			//作业负责人、作业监护人
+			//作业
 
-        this.oplcateId = res.cate;
-        this.operationId = res.operation;
-        this.getOperation();
-        this.getOplcates();
-      });
-    },
-    //根据operationId，查作业信息
+			//根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情
+			getOplcates() {
+				this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
+					console.log(res); //
+					this.pagtitle = res.name;
+					this.oplcateCode = res.code;
+					this.risklist = res.risk_options_; //风险缝隙
+					this.measurelist = res.measure_options_; //控制措施
+				});
+			},
+			handleStep(val) {
+				//点击步骤条
+				if (this.stepSuc.includes(val) === true) {
+					this.active = val;
+				}
+			},
+			//组件点击上一步
+			handleLastStep() {
+				if (--this.active === 0) {
+					this.active = 0;
+				}
+			},
+			//组件点击下一步
+			handleNextStep() {
 
-    getOperation() {
-      this.$API.opm.operation.read.req(this.operationId).then((res) => {
-        this.form.start_time = res.start_time; //作业开始时间
-        this.form.end_time = res.end_time; //作业结束时间
+				if (this.active == 0) {
+					this.$refs.dialogForm.validate((valid) => {
+					if (valid) {
+											//如果是创建许可证书
+					if (this.oplId == "") {
+						//基本信息提交
+						debugger;
+						this.form.cate = this.oplcateId;
+						this.form.operation = this.operationId;
+						console.log(this.form);
+						this.$API.opm.opl.create
+							.req(this.form)
+							.then((res) => {
+								this.$emit("success", this.form);
+								this.$message.success("创建成功");
+								this.issave = true;
+								this.active = 1;
 
-        console.log(res);
-      });
-    },
-    //作业部门
-    getDept() {
-      this.$API.system.dept.list.req({ page: 0 }).then((res) => {
-        this.deptoptions = genTree(res);
-      });
-    },
+								this.oplId = res.id;
+								this.getworkerList();
+								this.getgasList();
+								return res;
+							})
+							.catch((err) => {
+								return err;
+							});
+					} else if (this.oplId != "") {
 
-    //作业负责人、作业监护人
-    getUser() {
-      this.$API.system.user.list.req({ page: 0 }).then((res) => {
-        this.useroptions = res;
-      });
-    },
-    //作业
+						this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
+							this.$message.success("基本修改成功！");
+							this.issave = true;
+							this.active = 1;
+							this.getgasList();
+							this.getworkerList();
 
-    //根据作业许可证ID获取，风险、措施
-    getOplcates() {
-      this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
-        console.log(res); //
-        this.pagtitle = res.name;
-        this.risklist = res.risk_options_; //风险缝隙
-        this.measurelist = res.measure_options_; //控制措施
-      });
-    },
-    handleStep(val) {
-      //点击步骤条
-      if (this.stepSuc.includes(val) === true) {
-        this.active = val;
-      }
-    },
-    //组件点击上一步
-    handleLastStep() {
-      if (--this.active === 0) {
-        this.active = 0;
-      }
-    },
-    //组件点击下一步
-    handleNextStep() {
-      if (this.active == 0) {
-      //  console.log(this.oplId);
-        //如果是创建许可证书
-        if (this.oplId == "") {
-          //基本信息提交
-          debugger;
-          this.form.cate = this.oplcateId;
-          this.form.operation = this.operationId;
-          console.log(this.form);
-          this.$API.opm.opl.create
-            .req(this.form)
-            .then((res) => {
-              this.$emit("success", this.form);
-              this.$message.success("创建成功");
-              this.issave = true;
-              this.active = 1;
+						});
+					} else {
+						this.active = 1;
+					}
+					}
+				})
+				} else {
+					if (this.active==1){
+						if(this.apiworkerObj.length==0){
+							this.$message.warning("请添加作业人员");
+							return
+						}
+					}
+					this.active = 2;
 
-              this.oplId = res.id;
-              this.getworkerList(res.id);
-            
-              return res;
-            })
-            .catch((err) => {
-              return err;
-            });
-        } else if (this.oplId != "") {
-         
-          this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
-            this.$message.success("基本修改成功！");
-            this.issave = true;
-            this.active = 1;
-           
-            this.getworkerList(this.oplId);
-            
-          });
-        } else {
-          this.active = 1;
-        }
-      } 
-      // this.stepSuc.push(++this.active)
-    },
+				}
+				// this.stepSuc.push(++this.active)
+			},
 
-    //选择人员后，调出该人员的所有证书
-    selectWorker() {
-      this.$API.hrm.certificate.list
-        .req({ employee__user: this.formworker.worker, page: 0 })
-        .then((res) => {
-          this.certificatesOptions = res;
-          console.log(res);
-        });
-    },
-    //作业人员列表
+			//选择人员后，调出该人员的所有证书
+			selectWorker() {
+				this.$API.hrm.certificate.list
+					.req({employee__user: this.formworker.worker, page: 0})
+					.then((res) => {
+						this.certificatesOptions = res;
+						console.log(res);
+					});
+			},
+			//作业人员列表
 
-    getworkerList(id) {
-      this.$API.opm.worker.list.req({ opl: id, page: 0 }).then((res) => {
-        this.apiworkerObj = res;
-        console.log(res);
-      });
-    },
-    //创建作业人员，显示Form
-    addworker() {
-      this.workerdialog = true;
+			getworkerList() {
+				this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apiworkerObj = res;
+					console.log(res);
+				});
+			},
+			//创建作业人员，显示Form
+			addworker() {
+				this.workerdialog = true;
 
-      this.formworker = Object.assign({}, defaultformworker);
-    },
-   
-    //删除作业人员
-    delWorker(row) {
-      this.$API.opm.worker.delete
-        .req(row.id)
-        .then((res) => {
-          this.$message.success("作业人员删除成功");
-         	this.$refs.workerTable.refresh();
-          return res;
-        })
-        .catch((err) => {
-          return err;
-        });
-    },
-    //提交作业人员信息
-    submitWorker() {
-      this.formworker.opl = this.oplId;
-      this.$refs.workerForm.validate(async (valid) => {
-      
-          this.$API.opm.worker.create
-            .req(this.formworker)
-            .then((res) => {
-              this.$message.success("创建作业人员成功");
-              	this.$refs.workerTable.refresh();
-              this.workerdialog = false;
-             
-            })
-            .catch((err) => {
-              return err;
-            });
-      
-      });
-    },
-  
-    //退出界面
-    submitOut(){
-      this.$router.push({
-        name: "opl",
-        query: {
-          operationid: this.$route.query.id,//作业ID
-         
-        },
-      });
-    }
-  },
-};
-</script>
\ No newline at end of file
+				this.formworker = Object.assign({}, defaultformworker);
+			},
+
+			//删除作业人员
+			delWorker(row) {
+				this.$API.opm.worker.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("作业人员删除成功");
+						this.getworkerList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+			//提交作业人员信息
+			submitWorker() {
+				this.formworker.opl = this.oplId;
+				this.$refs.workerForm.validate(async (valid) => {
+
+					this.$API.opm.worker.create
+						.req(this.formworker)
+						.then((res) => {
+							this.$message.success("创建作业人员成功");
+							this.getworkerList();
+							this.workerdialog = false;
+						})
+						.catch((err) => {
+							return err;
+						});
+				});
+			},
+
+			//气体检测记录列表
+			getgasList() {
+				this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apigasObj = res;
+					console.log(res);
+				});
+			},
+
+			//创建气体检测记录，显示Form
+			addgas() {
+				this.gasdialog = true;
+				this.formgas = Object.assign({}, defaultformgas);
+			},
+
+			//提交气体检测记录
+			submitgas() {
+				this.formgas.opl = this.oplId;
+				this.$refs.gasForm.validate(async (valid) => {
+
+					this.$API.opm.gas.create
+						.req(this.formgas)
+						.then((res) => {
+							this.$message.success("创建气体检测记录成功");
+							this.getgasList();
+							this.gasdialog = false;
+
+						})
+						.catch((err) => {
+							return err;
+						});
+
+				});
+			},
+
+			//删除气体检测记录
+			delgas(row) {
+				this.$API.opm.gas.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("气体检测记录删除成功");
+						this.getgasList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+
+			//渲染工单提交按钮
+			getInit() {
+				this.$API.wf.workflow.initkey.req('opl_cooler').then((res) => {
+					this.initForm = res;
+				});
+			},
+
+			//提交,创建工单
+			submitTicketCreate(id) {
+				let ticket = {};
+				ticket.workflow = this.initForm.workflow;
+				ticket.ticket_data = {opl: this.oplId};
+				ticket.transition = id;
+				ticket.title = this.form.name + '-申请';
+				this.tLoading = true
+				this.$API.wf.ticket.create.req(ticket).then((res) => {
+					this.tLoading = false
+					this.$message.success("提交成功");
+					this.submitOut()
+				}).catch(e=>{this.tLoading=false});
+			},
+
+			//退出界面
+			submitOut() {
+				this.$router.push({
+					name: "opl",
+					query: {
+						id: this.operationId,//作业ID
+
+					},
+				});
+			}
+		},
+	};
+</script>
diff --git a/src/views/opm/fire.vue b/src/views/opm/fire.vue
index 73239169..a2970eb3 100644
--- a/src/views/opm/fire.vue
+++ b/src/views/opm/fire.vue
@@ -25,7 +25,7 @@
 				:model="form"
 				:rules="rules"
 				label-width="110px"
-				style="margin: 40px 40px 40px 40px"
+				style="margin: 40px 40px 0px 40px"
 			>
 				<el-row>
 					<el-col :md="12" :sm="12" :xs="24">
@@ -47,7 +47,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="12" :xs="24">
-						<el-form-item label="作业开始时间">
+						<el-form-item label="作业开始时间" prop="start_time">
 							<el-date-picker
 								v-model="form.start_time"
 								type="datetime"
@@ -56,7 +56,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="12" :xs="24">
-						<el-form-item label="作业结束时间">
+						<el-form-item label="作业结束时间" prop="end_time">
 							<el-date-picker
 								v-model="form.end_time"
 								type="datetime"
@@ -65,7 +65,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="12" :xs="24">
-						<el-form-item label="作业级别">
+						<el-form-item label="作业级别" prop="level">
 							<el-select v-model="form.level" placeholder="选择作业级别">
 								<el-option
 									v-for="item in leveloptions"
@@ -77,8 +77,8 @@
 						</el-form-item>
 					</el-col>
 
-					<el-col :md="12" :sm="12" :xs="24">
-						<el-form-item label="作业部门">
+					<el-col :md="12" :sm="12" :xs="24" >
+						<el-form-item label="作业部门" prop="dept_do">
 							<el-cascader
 								placeholder="选择作业部门"
 								getCheckedNodes="true"
@@ -96,7 +96,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="12" :xs="24">
-						<el-form-item label="作业负责人">
+						<el-form-item label="作业负责人" prop="charger">
 							<el-input
 								v-model="form.charger_name"
 								style="width:200px"
@@ -114,7 +114,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :md="12" :sm="12" :xs="24">
-						<el-form-item label="作业监护人">
+						<el-form-item label="作业监护人" prop="monitor">
 							<el-input
 								v-model="form.monitor_name"
 								style="width:200px"
@@ -124,7 +124,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :md="24" :sm="12" :xs="24">
-						<el-form-item label="风险选择">
+						<el-form-item label="风险选择" prop="risks_checked">
 							<el-checkbox-group v-model="form.risks_checked">
 								<el-checkbox
 									v-for="(item, index) in risklist"
@@ -146,7 +146,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :md="24" :sm="12" :xs="24">
-						<el-form-item label="措施选择">
+						<el-form-item label="措施选择" prop="measures_checked">
 							<el-checkbox-group v-model="form.measures_checked">
 								<el-checkbox
 									v-for="(item, index) in measurelist"
@@ -177,16 +177,12 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-				<el-row>
-					<el-col :md="24" :sm="12" :xs="24">
-						<el-form-item>
-							<el-button style="margin-top: 12px" type="primary" plain @click="handleNextStep"
+			</el-form>
+			<div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
 							>下一步
 							</el-button>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
+			</div>
 		</el-main>
 
 		<!--作业人员!-->
@@ -205,7 +201,7 @@
 				hidePagination
 				stripe
 				hideDo
-				style="height: 200px;"
+				style="height: 300px;"
 			>
 				<el-table-column
 					label="#"
@@ -333,8 +329,9 @@
 				:data="apigasObj"
 				row-key="id"
 				hidePagination
+				hideDo
 				stripe
-				style="height: 200px;"
+				style="height: 300px;"
 			>
 				<el-table-column
 					label="#"
@@ -377,11 +374,6 @@
 						{{ scope.row.checker_.name }}
 					</template>
 				</el-table-column>
-				<el-table-column
-					label="创建时间"
-					prop="create_time"
-					width="150"
-				></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="200">
 					<template #default="scope">
 
@@ -396,7 +388,7 @@
 					</template>
 				</el-table-column>
 			</scTable>
-			<sc-dialog v-model="gasdialog" draggable title="气体检测记录">
+			<el-dialog v-model="gasdialog" draggable title="气体检测记录">
 				<el-form
 					ref="gasForm"
 					:model="formgas"
@@ -484,7 +476,7 @@
 					<el-button @click="dialoggase = false">取 消</el-button>
 					<el-button type="primary" @click="submitgas">确 定</el-button>
 				</template>
-			</sc-dialog>
+			</el-dialog>
 			<div style="margin-top:20px;text-align:center">
 			<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
 			<el-button
@@ -528,12 +520,13 @@
 	const defaultformworker = {
 		id: "",
 		worker: null,
-		duty: null,
+		duty: "作业人员",
 		certificates: [],
 		opl: "",
 	};
 	const defaultformgas = {
 		id: "",
+		is_ok: true,
 		check_time: null,
 		opl: "",
 	};
@@ -592,7 +585,33 @@
 					true: "正常",
 					false: "不正常",
 				},
-				tLoading: false
+				tLoading: false,
+				rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					level: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
 			};
 		},
 		mounted() {
@@ -634,7 +653,7 @@
 			getData() {
 				this.$API.opm.opl.read.req(this.oplId).then((res) => {
 					this.form = res;
-
+					this.oplId = res.id;
 					this.oplcateId = res.cate;
 					this.operationId = res.operation;
 					this.getOperation();
@@ -686,9 +705,11 @@
 			},
 			//组件点击下一步
 			handleNextStep() {
+
 				if (this.active == 0) {
-					//  console.log(this.oplId);
-					//如果是创建许可证书
+					this.$refs.dialogForm.validate((valid) => {
+					if (valid) {
+											//如果是创建许可证书
 					if (this.oplId == "") {
 						//基本信息提交
 						debugger;
@@ -704,8 +725,8 @@
 								this.active = 1;
 
 								this.oplId = res.id;
-								this.getworkerList(res.id);
-								this.getgasList(res.id);
+								this.getworkerList();
+								this.getgasList();
 								return res;
 							})
 							.catch((err) => {
@@ -717,14 +738,22 @@
 							this.$message.success("基本修改成功！");
 							this.issave = true;
 							this.active = 1;
-							this.getgasList(this.oplId);
-							this.getworkerList(this.oplId);
+							this.getgasList();
+							this.getworkerList();
 
 						});
 					} else {
 						this.active = 1;
 					}
+					}
+				})
 				} else {
+					if (this.active==1){
+						if(this.apiworkerObj.length==0){
+							this.$message.warning("请添加作业人员");
+							return
+						}
+					}
 					this.active = 2;
 
 				}
@@ -742,8 +771,8 @@
 			},
 			//作业人员列表
 
-			getworkerList(id) {
-				this.$API.opm.worker.list.req({opl: id, page: 0}).then((res) => {
+			getworkerList() {
+				this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {
 					this.apiworkerObj = res;
 					console.log(res);
 				});
@@ -761,7 +790,7 @@
 					.req(row.id)
 					.then((res) => {
 						this.$message.success("作业人员删除成功");
-						this.$refs.workerTable.refresh();
+						this.getworkerList()
 						return res;
 					})
 					.catch((err) => {
@@ -777,7 +806,7 @@
 						.req(this.formworker)
 						.then((res) => {
 							this.$message.success("创建作业人员成功");
-							this.getworkerList(this.oplId);
+							this.getworkerList();
 							this.workerdialog = false;
 						})
 						.catch((err) => {
@@ -787,8 +816,8 @@
 			},
 
 			//气体检测记录列表
-			getgasList(id) {
-				this.$API.opm.gas.list.req({opl: id, page: 0}).then((res) => {
+			getgasList() {
+				this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => {
 					this.apigasObj = res;
 					console.log(res);
 				});
@@ -809,7 +838,7 @@
 						.req(this.formgas)
 						.then((res) => {
 							this.$message.success("创建气体检测记录成功");
-							this.getgasList(this.oplId);
+							this.getgasList();
 							this.gasdialog = false;
 
 						})
@@ -826,7 +855,7 @@
 					.req(row.id)
 					.then((res) => {
 						this.$message.success("气体检测记录删除成功");
-						this.$refs.gasTable.refresh();
+						this.getgasList()
 						return res;
 					})
 					.catch((err) => {
diff --git a/src/views/opm/high.vue b/src/views/opm/high.vue
index dfc60659..96fd0f69 100644
--- a/src/views/opm/high.vue
+++ b/src/views/opm/high.vue
@@ -1,670 +1,721 @@
 <template>
-  <el-container>
-    <el-header>
-      <el-steps
-        :active="active"
-        style="width: 100%"
-        :align-center="true"
-        finish-status="success"
-      >
-        <el-step
-          v-for="(item, index) of stepTitle"
-          :key="index"
-          :title="item"
-          style="50%"
-          @click="handleStep(index)"
-        >
-        </el-step>
-      </el-steps>
-    </el-header>
-    <!--基本信息!-->
-    <el-main class="nopadding" v-show="active === 0">
-      <el-form
-        v-show="active === 0"
-        ref="dialogForm"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        style="margin: 40px 40px 40px 40px"
-      >
-        <el-row>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="关联作业">
-              <el-input
-                v-model="operationId"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业许可种类">
-              <el-input
-                v-model="pagtitle"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业开始时间">
-              <el-date-picker
-                v-model="form.start_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业结束时间">
-              <el-date-picker
-                v-model="form.end_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业级别">
-              <el-select v-model="form.level" placeholder="选择作业级别">
-                <el-option
-                  v-for="item in leveloptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+	<el-container>
+		<el-header>
+			<el-steps
+				:active="active"
+				style="width: 100%"
+				:align-center="true"
+				finish-status="success"
+			>
+				<el-step
+					v-for="(item, index) of stepTitle"
+					:key="index"
+					:title="item"
+					style="50%"
+					@click="handleStep(index)"
+				>
+				</el-step>
+			</el-steps>
+		</el-header>
+		<!--基本信息!-->
+		<el-main class="nopadding" v-show="active === 0">
+			<el-form
+				v-show="active === 0"
+				ref="dialogForm"
+				:model="form"
+				:rules="rules"
+				label-width="110px"
+				style="margin: 40px 40px 0px 40px"
+			>
+				<el-row>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="关联作业">
+							<el-input
+								v-model="form.name"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业许可种类">
+							<el-input
+								v-model="pagtitle"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业开始时间" prop="start_time">
+							<el-date-picker
+								v-model="form.start_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业结束时间" prop="end_time">
+							<el-date-picker
+								v-model="form.end_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业级别" prop="level">
+							<el-select v-model="form.level" placeholder="选择作业级别">
+								<el-option
+									v-for="item in leveloptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.name"
+								/>
+							</el-select>
+						</el-form-item>
+					</el-col>
 
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业部门">
-              <el-cascader
-                placeholder="选择作业部门"
-                getCheckedNodes="true"
-                v-model="form.dept_do"
-                :options="deptoptions"
-                :props="{
+					<el-col :md="12" :sm="12" :xs="24" >
+						<el-form-item label="作业部门" prop="dept_do">
+							<el-cascader
+								placeholder="选择作业部门"
+								getCheckedNodes="true"
+								v-model="form.dept_do"
+								:options="deptoptions"
+								:props="{
                   expandTrigger: 'hover', // 次级菜单的展开方式
                   label: 'label', //
                   value: 'value', //
-                  emitPath: false, 
-                  checkStrictly: true 
+                  emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+				  checkStrictly: true
                 }"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业负责人">
-              <el-select v-model="form.charger" placeholder="选择作业负责人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业监护人">
-              <el-select v-model="form.monitor" placeholder="选择作业监护人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!--
-			临时用电
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业负责人" prop="charger">
+							<el-input
+								v-model="form.charger_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<!-- <el-select v-model="form.charger_name" placeholder="选择作业负责人">
+								<el-option
+									v-for="item in useroptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								/>
+							</el-select> -->
+							<ehsUserSelect :multiple="false" @submit="getCharger"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业监护人" prop="monitor">
+							<el-input
+								v-model="form.monitor_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getMonitor"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="风险选择" prop="risks_checked">
+							<el-checkbox-group v-model="form.risks_checked">
+								<el-checkbox
+									v-for="(item, index) in risklist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="其他风险">
+							<el-input
+								v-model="form.other_risk"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="措施选择" prop="measures_checked">
+							<el-checkbox-group v-model="form.measures_checked">
+								<el-checkbox
+									v-for="(item, index) in measurelist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-card header="应急处置">
+							<div class="content">
+								<p>1、如伤者发生骨折，采用夹板、木棍等将骨折部位上下关节固定后送医，当伤者昏迷、意识不清时则不应随意移动伤者，立即拨打120求救。2、如果伤者出血，采用止血带或包扎伤口的方法止血，然后送医或拨打120。</p>
+							</div>
+						</el-card>
+						<el-form-item label="其他应急处置">
+							<el-input
+								v-model="form.other_emr"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
+							>下一步
+							</el-button>
+			</div>
+		</el-main>
 
-		       <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="安装/拆除">
-              <el-input v-model="work_type" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="安装/拆除时间">
-              <el-input v-model="work_time" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="验收时间">
-              <el-input v-model="accept_time" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电地点">
-              <el-input v-model="power_to" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="电源接入点">
-              <el-input v-model="power_from" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电开始">
-              <el-input
-                v-model="power_start_time"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电截至">
-              <el-input
-                v-model="power_end_time"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="计划用电天数">
-              <el-input v-model="power_days" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>  !-->
+		<!--作业人员!-->
+		<el-main class="nopadding" v-show="active === 1">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addworker"
+				></el-button>
+			</div>
+			<scTable
+				ref="workerTable"
+				:data="apiworkerObj"
+				row-key="id"
+				hidePagination
+				stripe
+				hideDo
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column label="姓名" prop="name" width="150">
+					<template #default="scope">
+						{{ scope.row.worker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="工作职责" prop="duty" width="150">
+				</el-table-column>
+				<el-table-column label="证书" prop="certificates" width="150">
+					<template #default="scope">
+						<el-tag v-for="item in scope.row.certificates_"
+								:key="item.number"
+								:label="item.name"
+								:value="item.number">{{item.name}}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="创建时间"
+					prop="create_time"
+					width="150"
+				></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="风险选择">
-              <el-checkbox-group v-model="form.risks_checked">
-                <el-checkbox
-                  v-for="(item, index) in risklist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="其他风险">
-              <el-input
-                v-model="form.other_risk"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+						<el-popconfirm
+							title="确定删除该作业人员吗？"
+							@confirm="delWorker(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="workerdialog" draggable title="选择作业人员">
+				<el-form
+					ref="workerForm"
+					:model="formworker"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="作业人员">
+								<el-input
+								v-model="formworker.worker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getWorker"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="工作职责">
+								<el-select
+									v-model="formworker.duty"
+									filterable
+									allow-create
+									default-first-option
+									:reserve-keyword="false"
+								>
+									<el-option
+										v-for="item in dutyOptions"
+										:key="item.value"
+										:label="item.label"
+										:value="item.label"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="证书">
+								<el-select
+									v-model="formworker.certificates"
+									multiple
+									placeholder="选择证书"
+								>
+									<el-option
+										v-for="item in certificatesOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialogcart = false">取 消</el-button>
+					<el-button type="primary" @click="submitWorker">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+				<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
+			<el-button
+				:loading="tLoading"
+				v-for=" item in initForm.transitions"
+				:key="item.id"
+				type="primary"
+				@click="submitTicketCreate(item.id)"
+				style="margin-right:4px"
+			>{{item.name}}
+			</el-button>
+			<el-button @click="submitOut" type="warning">退出</el-button>
 
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="逃生路径">
-              <el-input v-model="escape_route" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>  !-->
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="措施选择">
-              <el-checkbox-group v-model="form.measures_checked">
-                <el-checkbox
-                  v-for="(item, index) in measurelist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-card class="box-card">
-              <div class="clearfix">
-                <span>应急处置：</span>
-              </div>
-              <div class="content">
-                <p>1、如伤者发生骨折，采用夹板、木棍等将骨折部位上下关节固定后送医，当伤者昏迷、意识不清时则不应随意移动伤者，立即拨打120求救。</p>
-                <p>2、如果伤者出血，采用止血带或包扎伤口的方法止血，然后送医或拨打120。</p>
-               
-              </div>
-            </el-card>
-            <el-form-item label="其他应急处置">
-              <el-input
-                v-model="form.other_emr"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业审批照片">
-              <el-input v-model="create_imgs" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		  !-->
-        </el-row>
-        <el-row>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item>
-              <el-button style="margin-top: 12px" @click="handleNextStep"
-                >下一步</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-main>
-
-    <!--作业人员!-->
-    <el-main class="nopadding" v-show="active === 1">
-      <div class="left-panel" style="margin: 10px">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addworker"
-        ></el-button>
-      </div>
-      <scTable
-        ref="workerTable"
-        :data="apiworkerObj"
-        row-key="id"
-        hidePagination
-        stripe
-      >
-        <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column label="姓名" prop="name" width="150">
-          <template #default="scope">
-            {{ scope.row.worker_.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工作职责" prop="duty" width="150">
-        </el-table-column>
-        <el-table-column label="证书" prop="certificates" width="150">
-          <template #default="scope" >
-            <el-tag v-for="item in scope.row.certificates_"
-                    :key="item.number"
-                    :label="item.name"
-                    :value="item.number">{{item.name}}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template #default="scope">
-           
-            <el-popconfirm
-              title="确定删除该作业人员吗？"
-              @confirm="delWorker(scope.row)"
-            >
-              <template #reference>
-                <el-button text type="danger" size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
-      </scTable>
-      <sc-dialog v-model="workerdialog" draggable title="选择作业人员">
-        <el-form
-          ref="workerForm"
-          :model="formworker"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="80px"
-          width="70%"
-          style="margin: 40px 40px 40px 40px"
-        >
-          <el-row>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="作业人员">
-                <el-select
-                  v-model="formworker.worker"
-                  @change="selectWorker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="工作职责">
-                <el-select
-                  v-model="formworker.duty"
-                  filterable
-                  allow-create
-                  default-first-option
-                  :reserve-keyword="false"
-                >
-                  <el-option
-                    v-for="item in dutyOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="证书">
-                <el-select
-                  v-model="formworker.certificates"
-                  multiple
-                  placeholder="选择证书"
-                >
-                  <el-option
-                    v-for="item in certificatesOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-          <el-button @click="dialogcart = false">取 消</el-button>
-          <el-button type="primary" @click="submitWorker">确 定</el-button>
-        </template>
-      </sc-dialog>
-       <el-button style="margin-top: 12px" @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button style="margin-top: 12px" @click="submitOut">退出</el-button>
-     
-    </el-main>
-  
-  </el-container>
+			</div>
+		</el-main>
+	</el-container>
 </template>
 <style scoped>
-.clearfix {
-  font-size: 20px;
-}
+	.clearfix {
+		font-size: 20px;
+	}
 
-.box-card p {
-  line-height: 20px;
-}
-.content {
-  margin-top: 10px;
-}
-.stepSuc:hover {
-  cursor: pointer;
-}
-.stepErr:hover {
-  cursor: not-allowed;
-}
+	.box-card p {
+		line-height: 20px;
+	}
+
+	.content {
+		margin-top: 10px;
+	}
+
+	.stepSuc:hover {
+		cursor: pointer;
+	}
+
+	.stepErr:hover {
+		cursor: not-allowed;
+	}
 </style>
-    <script>
-import { genTree } from "@/utils/verificate";
-const defaultformworker = {
-  id: "",
-  worker: null,
-  duty: null,
-  certificates: [],
-  opl: "",
-};
-const defaultformgas = {
+<script>
+	import {genTree} from "@/utils/verificate";
+
+	const defaultformworker = {
+		id: "",
+		worker: null,
+		duty: "作业人员",
+		certificates: [],
+		opl: "",
+	};
+	const defaultformgas = {
   id: "",
   check_time: null,
   opl:""
 };
-export default {
-  name: "high",
-  components: {},
-  data() {
-    return {
-     
-      active: 0,
-      stepSuc: [0],
-      stepTitle: ["基本信息", "作业人员"],
-      query: {},
-      selection: [],
-      issave: false, //控制基本信息提交
-      search: {
-        keyword: null,
-      },
-      form: {
-        id: "",
-        start_time: null,
-        end_time: null,
-        operation: "",
-        cate: "",
-        risks_checked: [],
-      },
-
-      operationId: "",
-      oplcateId: "",
-      oplId: "",
-      leveloptions: [
-        { id: "特级", name: "特级：>30米" },
+	export default {
+		name: "fire",
+		components: {},
+		data() {
+			return {
+				active: 0,
+				stepSuc: [0],
+				stepTitle: ["基本信息", "作业人员"],
+				query: {},
+				selection: [],
+				issave: false, //控制基本信息提交
+				search: {
+					keyword: null,
+				},
+				form: {
+					id: "",
+					start_time: null,
+					end_time: null,
+					operation: "",
+					cate: "",
+					risks_checked: [],
+				},
+				initForm: {},
+				operationId: "",
+				oplcateId: "",
+				oplcateCode: "",
+				oplId: "",
+				leveloptions: [
+				{ id: "特级", name: "特级：>30米" },
          { id: "三级", name: "三级:15-30米" },
         { id: "二级", name: "二级：>5-15米" },
         { id: "一级", name: "一级:1.8-5米" },
-      ],
-      deptoptions: [],
-      useroptions: [],
-      risklist: [],
-      measurelist: [],
-      pagtitle: "",
+				],
+				deptoptions: [],
+				useroptions: [],
+				risklist: [],
+				measurelist: [],
+				pagtitle: "",
+				dutyOptions: [
+					{value: 10, label: "作业人员"},
+					{value: 20, label: "起重司机"},
+					{value: 30, label: "司索人员"},
+					{value: 40, label: "起重指挥"},
+					{value: 40, label: "电工"},
+				],
+				certificatesOptions: [],
+				formworker: defaultformworker,
+				apiworkerObj: [],
+				workerdialog: false,
+				gasdialog: false,
+				formgas: defaultformgas,
+				apigasObj: [],
+				is_ok_: {
+					true: "正常",
+					false: "不正常",
+				},
+				tLoading: false,
+				rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					level: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
+			};
+		},
+		mounted() {
+			this.operationId = this.$route.query.operationid; //作业ID
+			this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
+			this.oplId = this.$route.query.oplId; //许可证ID
+			this.getoplData();
+			this.getInit();
+			this.getDept();
+			// this.getUser();
+		},
+		methods: {
+			getCharger(data) {
+				this.form.charger=data.id;
+      			this.form.charger_name=data.name
+			},
+			getChecker(data){
+				this.formgas.checker=data.id;
+      			this.formgas.checker_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();
+					this.getOplcates();
+				} else {
+					this.getData();
+				}
+			},
+			//根据oplId，查许可证
+			getData() {
+				this.$API.opm.opl.read.req(this.oplId).then((res) => {
+					this.form = res;
+					this.oplId = res.id;
+					this.oplcateId = res.cate;
+					this.operationId = res.operation;
+					this.getOperation();
+					this.getOplcates();
+				});
+			},
+			//根据operationId，查作业信息
 
-      dutyOptions: [
-        { value: 10, label: "作业人员" },
-        { value: 20, label: "起重司机" },
-        { value: 30, label: "司索人员" },
-        { value: 40, label: "起重指挥" },
-        { value: 40, label: "电工" },
-      ],
-      certificatesOptions: [],
-      formworker: defaultformworker,
-      apiworkerObj: [],
-      workerdialog: false,
-      gasdialog: false,
-      formgas: defaultformgas,
-      apigasObj: [],
-      is_ok_: {
-        true: "正常",
-        false: "不正常",
-      },
-    };
-  },
-  mounted() {
-    this.operationId = this.$route.query.operationid; //作业ID
-    this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
-    this.oplId = this.$route.query.oplId; //许可证ID
-    this.getoplData();
+			getOperation() {
+				this.$API.opm.operation.read.req(this.operationId).then((res) => {
+					this.form.start_time = res.start_time; //作业开始时间
+					this.form.end_time = res.end_time; //作业结束时间
+					this.form.name = res.name; //作业结束时间
 
-    this.getDept();
-    this.getUser();
-  },
-  methods: {
-    
+					console.log(res);
+				});
+			},
+			//作业部门
+			getDept() {
+				this.$API.system.dept.list.req({page: 0}).then((res) => {
+					this.deptoptions = genTree(res);
+				});
+			},
 
-    getoplData() {
-      if (this.oplId == "") {
-        this.getOperation();
-        this.getOplcates();
-      } else {
-        this.getData();
-      }
-    },
-    //根据oplId，查许可证
-    getData() {
-      this.$API.opm.opl.read.req(this.oplId).then((res) => {
-        this.form = res;
+			//作业负责人、作业监护人
+			//作业
 
-        this.oplcateId = res.cate;
-        this.operationId = res.operation;
-        this.getOperation();
-        this.getOplcates();
-      });
-    },
-    //根据operationId，查作业信息
+			//根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情
+			getOplcates() {
+				this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
+					console.log(res); //
+					this.pagtitle = res.name;
+					this.oplcateCode = res.code;
+					this.risklist = res.risk_options_; //风险缝隙
+					this.measurelist = res.measure_options_; //控制措施
+				});
+			},
+			handleStep(val) {
+				//点击步骤条
+				if (this.stepSuc.includes(val) === true) {
+					this.active = val;
+				}
+			},
+			//组件点击上一步
+			handleLastStep() {
+				if (--this.active === 0) {
+					this.active = 0;
+				}
+			},
+			//组件点击下一步
+			handleNextStep() {
 
-    getOperation() {
-      this.$API.opm.operation.read.req(this.operationId).then((res) => {
-        this.form.start_time = res.start_time; //作业开始时间
-        this.form.end_time = res.end_time; //作业结束时间
+				if (this.active == 0) {
+					this.$refs.dialogForm.validate((valid) => {
+					if (valid) {
+											//如果是创建许可证书
+					if (this.oplId == "") {
+						//基本信息提交
+						debugger;
+						this.form.cate = this.oplcateId;
+						this.form.operation = this.operationId;
+						console.log(this.form);
+						this.$API.opm.opl.create
+							.req(this.form)
+							.then((res) => {
+								this.$emit("success", this.form);
+								this.$message.success("创建成功");
+								this.issave = true;
+								this.active = 1;
 
-        console.log(res);
-      });
-    },
-    //作业部门
-    getDept() {
-      this.$API.system.dept.list.req({ page: 0 }).then((res) => {
-        this.deptoptions = genTree(res);
-      });
-    },
+								this.oplId = res.id;
+								this.getworkerList();
+								this.getgasList();
+								return res;
+							})
+							.catch((err) => {
+								return err;
+							});
+					} else if (this.oplId != "") {
 
-    //作业负责人、作业监护人
-    getUser() {
-      this.$API.system.user.list.req({ page: 0 }).then((res) => {
-        this.useroptions = res;
-      });
-    },
-    //作业
+						this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
+							this.$message.success("基本修改成功！");
+							this.issave = true;
+							this.active = 1;
+							this.getgasList();
+							this.getworkerList();
 
-    //根据作业许可证ID获取，风险、措施
-    getOplcates() {
-      this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
-        console.log(res); //
-        this.pagtitle = res.name;
-        this.risklist = res.risk_options_; //风险缝隙
-        this.measurelist = res.measure_options_; //控制措施
-      });
-    },
-    handleStep(val) {
-      //点击步骤条
-      if (this.stepSuc.includes(val) === true) {
-        this.active = val;
-      }
-    },
-    //组件点击上一步
-    handleLastStep() {
-      if (--this.active === 0) {
-        this.active = 0;
-      }
-    },
-    //组件点击下一步
-    handleNextStep() {
-      if (this.active == 0) {
-      //  console.log(this.oplId);
-        //如果是创建许可证书
-        if (this.oplId == "") {
-          //基本信息提交
-          debugger;
-          this.form.cate = this.oplcateId;
-          this.form.operation = this.operationId;
-          console.log(this.form);
-          this.$API.opm.opl.create
-            .req(this.form)
-            .then((res) => {
-              this.$emit("success", this.form);
-              this.$message.success("创建成功");
-              this.issave = true;
-              this.active = 1;
+						});
+					} else {
+						this.active = 1;
+					}
+					}
+				})
+				} 
+				// this.stepSuc.push(++this.active)
+			},
 
-              this.oplId = res.id;
-              this.getworkerList(res.id);
-            
-              return res;
-            })
-            .catch((err) => {
-              return err;
-            });
-        } else if (this.oplId != "") {
-         
-          this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
-            this.$message.success("基本修改成功！");
-            this.issave = true;
-            this.active = 1;
-           
-            this.getworkerList(this.oplId);
-            
-          });
-        } else {
-          this.active = 1;
-        }
-      } 
-      // this.stepSuc.push(++this.active)
-    },
+			//选择人员后，调出该人员的所有证书
+			selectWorker() {
+				this.$API.hrm.certificate.list
+					.req({employee__user: this.formworker.worker, page: 0})
+					.then((res) => {
+						this.certificatesOptions = res;
+						console.log(res);
+					});
+			},
+			//作业人员列表
 
-    //选择人员后，调出该人员的所有证书
-    selectWorker() {
-      this.$API.hrm.certificate.list
-        .req({ employee__user: this.formworker.worker, page: 0 })
-        .then((res) => {
-          this.certificatesOptions = res;
-          console.log(res);
-        });
-    },
-    //作业人员列表
+			getworkerList() {
+				this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apiworkerObj = res;
+					console.log(res);
+				});
+			},
+			//创建作业人员，显示Form
+			addworker() {
+				this.workerdialog = true;
 
-    getworkerList(id) {
-      this.$API.opm.worker.list.req({ opl: id, page: 0 }).then((res) => {
-        this.apiworkerObj = res;
-        console.log(res);
-      });
-    },
-    //创建作业人员，显示Form
-    addworker() {
-      this.workerdialog = true;
+				this.formworker = Object.assign({}, defaultformworker);
+			},
 
-      this.formworker = Object.assign({}, defaultformworker);
-    },
-   
-    //删除作业人员
-    delWorker(row) {
-      this.$API.opm.worker.delete
-        .req(row.id)
-        .then((res) => {
-          this.$message.success("作业人员删除成功");
-         	this.$refs.workerTable.refresh();
-          return res;
-        })
-        .catch((err) => {
-          return err;
-        });
-    },
-    //提交作业人员信息
-    submitWorker() {
-      this.formworker.opl = this.oplId;
-      this.$refs.workerForm.validate(async (valid) => {
-      
-          this.$API.opm.worker.create
-            .req(this.formworker)
-            .then((res) => {
-              this.$message.success("创建作业人员成功");
-              this.workerdialog = false;
-             	this.$refs.workerTable.refresh();
-            })
-            .catch((err) => {
-              return err;
-            });
-      
-      });
-    },
-   
-    //退出界面
-    submitOut(){
-      this.$router.push({
-        name: "opl",
-        query: {
-          operationid: this.$route.query.id,//作业ID
-         
-        },
-      });
-    }
-  },
-};
-</script>
\ No newline at end of file
+			//删除作业人员
+			delWorker(row) {
+				this.$API.opm.worker.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("作业人员删除成功");
+						this.getworkerList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+			//提交作业人员信息
+			submitWorker() {
+				this.formworker.opl = this.oplId;
+				this.$refs.workerForm.validate(async (valid) => {
+
+					this.$API.opm.worker.create
+						.req(this.formworker)
+						.then((res) => {
+							this.$message.success("创建作业人员成功");
+							this.getworkerList();
+							this.workerdialog = false;
+						})
+						.catch((err) => {
+							return err;
+						});
+				});
+			},
+
+			//气体检测记录列表
+			getgasList() {
+				this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apigasObj = res;
+					console.log(res);
+				});
+			},
+
+			//创建气体检测记录，显示Form
+			addgas() {
+				this.gasdialog = true;
+				this.formgas = Object.assign({}, defaultformgas);
+			},
+
+			//提交气体检测记录
+			submitgas() {
+				this.formgas.opl = this.oplId;
+				this.$refs.gasForm.validate(async (valid) => {
+
+					this.$API.opm.gas.create
+						.req(this.formgas)
+						.then((res) => {
+							this.$message.success("创建气体检测记录成功");
+							this.getgasList();
+							this.gasdialog = false;
+
+						})
+						.catch((err) => {
+							return err;
+						});
+
+				});
+			},
+
+			//删除气体检测记录
+			delgas(row) {
+				this.$API.opm.gas.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("气体检测记录删除成功");
+						this.getgasList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+
+			//渲染工单提交按钮
+			getInit() {
+				this.$API.wf.workflow.initkey.req('opl_high').then((res) => {
+					this.initForm = res;
+				});
+			},
+
+			//提交,创建工单
+			submitTicketCreate(id) {
+				if(this.apiworkerObj.length==0){
+							this.$message.warning("请添加作业人员");
+							return
+						}
+				let ticket = {};
+				ticket.workflow = this.initForm.workflow;
+				ticket.ticket_data = {opl: this.oplId};
+				ticket.transition = id;
+				ticket.title = this.form.name + '-申请';
+				this.tLoading = true
+				this.$API.wf.ticket.create.req(ticket).then((res) => {
+					this.tLoading = false
+					this.$message.success("提交成功");
+					this.submitOut()
+				}).catch(e=>{this.tLoading=false});
+			},
+
+			//退出界面
+			submitOut() {
+				this.$router.push({
+					name: "opl",
+					query: {
+						id: this.operationId,//作业ID
+
+					},
+				});
+			}
+		},
+	};
+</script>
diff --git a/src/views/opm/hoisting.vue b/src/views/opm/hoisting.vue
index 8feed46d..567fa6d4 100644
--- a/src/views/opm/hoisting.vue
+++ b/src/views/opm/hoisting.vue
@@ -1,669 +1,720 @@
 <template>
-  <el-container>
-    <el-header>
-      <el-steps
-        :active="active"
-        style="width: 100%"
-        :align-center="true"
-        finish-status="success"
-      >
-        <el-step
-          v-for="(item, index) of stepTitle"
-          :key="index"
-          :title="item"
-          style="50%"
-          @click="handleStep(index)"
-        >
-        </el-step>
-      </el-steps>
-    </el-header>
-    <!--基本信息!-->
-    <el-main class="nopadding" v-show="active === 0">
-      <el-form
-        v-show="active === 0"
-        ref="dialogForm"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        style="margin: 40px 40px 40px 40px"
-      >
-        <el-row>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="关联作业">
-              <el-input
-                v-model="operationId"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业许可种类">
-              <el-input
-                v-model="pagtitle"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业开始时间">
-              <el-date-picker
-                v-model="form.start_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业结束时间">
-              <el-date-picker
-                v-model="form.end_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业级别">
-              <el-select v-model="form.level" placeholder="选择作业级别">
-                <el-option
-                  v-for="item in leveloptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+	<el-container>
+		<el-header>
+			<el-steps
+				:active="active"
+				style="width: 100%"
+				:align-center="true"
+				finish-status="success"
+			>
+				<el-step
+					v-for="(item, index) of stepTitle"
+					:key="index"
+					:title="item"
+					style="50%"
+					@click="handleStep(index)"
+				>
+				</el-step>
+			</el-steps>
+		</el-header>
+		<!--基本信息!-->
+		<el-main class="nopadding" v-show="active === 0">
+			<el-form
+				v-show="active === 0"
+				ref="dialogForm"
+				:model="form"
+				:rules="rules"
+				label-width="110px"
+				style="margin: 40px 40px 0px 40px"
+			>
+				<el-row>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="关联作业">
+							<el-input
+								v-model="form.name"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业许可种类">
+							<el-input
+								v-model="pagtitle"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业开始时间" prop="start_time">
+							<el-date-picker
+								v-model="form.start_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业结束时间" prop="end_time">
+							<el-date-picker
+								v-model="form.end_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业级别" prop="level">
+							<el-select v-model="form.level" placeholder="选择作业级别">
+								<el-option
+									v-for="item in leveloptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.name"
+								/>
+							</el-select>
+						</el-form-item>
+					</el-col>
 
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业部门">
-              <el-cascader
-                placeholder="选择作业部门"
-                getCheckedNodes="true"
-                v-model="form.dept_do"
-                :options="deptoptions"
-                :props="{
+					<el-col :md="12" :sm="12" :xs="24" >
+						<el-form-item label="作业部门" prop="dept_do">
+							<el-cascader
+								placeholder="选择作业部门"
+								getCheckedNodes="true"
+								v-model="form.dept_do"
+								:options="deptoptions"
+								:props="{
                   expandTrigger: 'hover', // 次级菜单的展开方式
                   label: 'label', //
                   value: 'value', //
                   emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+				  checkStrictly: true
                 }"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业负责人">
-              <el-select v-model="form.charger" placeholder="选择作业负责人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业监护人">
-              <el-select v-model="form.monitor" placeholder="选择作业监护人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!--
-			临时用电
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业负责人" prop="charger">
+							<el-input
+								v-model="form.charger_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<!-- <el-select v-model="form.charger_name" placeholder="选择作业负责人">
+								<el-option
+									v-for="item in useroptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								/>
+							</el-select> -->
+							<ehsUserSelect :multiple="false" @submit="getCharger"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业监护人" prop="monitor">
+							<el-input
+								v-model="form.monitor_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getMonitor"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="风险选择" prop="risks_checked">
+							<el-checkbox-group v-model="form.risks_checked">
+								<el-checkbox
+									v-for="(item, index) in risklist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="其他风险">
+							<el-input
+								v-model="form.other_risk"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="措施选择" prop="measures_checked">
+							<el-checkbox-group v-model="form.measures_checked">
+								<el-checkbox
+									v-for="(item, index) in measurelist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-card header="应急处置">
+							<div class="content">
+								<p>1、如伤者发生骨折，采用夹板、木棍等将骨折部位上下关节固定后送医，当伤者昏迷、意识不清时则不应随意移动伤者，立即拨打120求救。2、如发现伤者出血，用止血带或包扎伤的方法止血，然后送医或拨打120。</p>
+							</div>
+						</el-card>
+						<el-form-item label="其他应急处置">
+							<el-input
+								v-model="form.other_emr"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
+							>下一步
+							</el-button>
+			</div>
+		</el-main>
 
-		       <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="安装/拆除">
-              <el-input v-model="work_type" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="安装/拆除时间">
-              <el-input v-model="work_time" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="验收时间">
-              <el-input v-model="accept_time" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电地点">
-              <el-input v-model="power_to" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="电源接入点">
-              <el-input v-model="power_from" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电开始">
-              <el-input
-                v-model="power_start_time"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电截至">
-              <el-input
-                v-model="power_end_time"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="计划用电天数">
-              <el-input v-model="power_days" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>  !-->
+		<!--作业人员!-->
+		<el-main class="nopadding" v-show="active === 1">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addworker"
+				></el-button>
+			</div>
+			<scTable
+				ref="workerTable"
+				:data="apiworkerObj"
+				row-key="id"
+				hidePagination
+				stripe
+				hideDo
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column label="姓名" prop="name" width="150">
+					<template #default="scope">
+						{{ scope.row.worker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="工作职责" prop="duty" width="150">
+				</el-table-column>
+				<el-table-column label="证书" prop="certificates" width="150">
+					<template #default="scope">
+						<el-tag v-for="item in scope.row.certificates_"
+								:key="item.number"
+								:label="item.name"
+								:value="item.number">{{item.name}}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="创建时间"
+					prop="create_time"
+					width="150"
+				></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="风险选择">
-              <el-checkbox-group v-model="form.risks_checked">
-                <el-checkbox
-                  v-for="(item, index) in risklist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="其他风险">
-              <el-input
-                v-model="form.other_risk"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+						<el-popconfirm
+							title="确定删除该作业人员吗？"
+							@confirm="delWorker(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="workerdialog" draggable title="选择作业人员">
+				<el-form
+					ref="workerForm"
+					:model="formworker"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="作业人员">
+								<el-input
+								v-model="formworker.worker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getWorker"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="工作职责">
+								<el-select
+									v-model="formworker.duty"
+									filterable
+									allow-create
+									default-first-option
+									:reserve-keyword="false"
+								>
+									<el-option
+										v-for="item in dutyOptions"
+										:key="item.value"
+										:label="item.label"
+										:value="item.label"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="证书">
+								<el-select
+									v-model="formworker.certificates"
+									multiple
+									placeholder="选择证书"
+								>
+									<el-option
+										v-for="item in certificatesOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialogcart = false">取 消</el-button>
+					<el-button type="primary" @click="submitWorker">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+				<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
+			<el-button
+				:loading="tLoading"
+				v-for=" item in initForm.transitions"
+				:key="item.id"
+				type="primary"
+				@click="submitTicketCreate(item.id)"
+				style="margin-right:4px"
+			>{{item.name}}
+			</el-button>
+			<el-button @click="submitOut" type="warning">退出</el-button>
 
-          
-       
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="措施选择">
-              <el-checkbox-group v-model="form.measures_checked">
-                <el-checkbox
-                  v-for="(item, index) in measurelist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-card class="box-card">
-              <div class="clearfix">
-                <span>应急处置：</span>
-              </div>
-              <div class="content">
-                <p>1、如伤者发生骨折，采用夹板、木棍等将骨折部位上下关节固定后送医，当伤者昏迷、意识不清时则不应随意移动伤者，立即拨打120求救。</p>
-                <p>2、如发现伤者出血，用止血带或包扎伤的方法止血，然后送医或拨打120。</p>
-                
-              </div>
-            </el-card>
-              
-            <el-form-item label="逃生路径">
-              <el-input v-model="escape_route" type="text" clearable></el-input>
-            </el-form-item>
-          
-            <el-form-item label="其他应急处置">
-              <el-input
-                v-model="form.other_emr"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业审批照片">
-              <el-input v-model="create_imgs" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		  !-->
-        </el-row>
-        <el-row>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item>
-              <el-button style="margin-top: 12px" @click="handleNextStep"
-                >下一步</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-main>
-
-    <!--作业人员!-->
-    <el-main class="nopadding" v-show="active === 1">
-      <div class="left-panel" style="margin: 10px">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addworker"
-        ></el-button>
-      </div>
-      <scTable
-        ref="workerTable"
-        :data="apiworkerObj"
-        row-key="id"
-        hidePagination
-        stripe
-      >
-        <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column label="姓名" prop="name" width="150">
-          <template #default="scope">
-            {{ scope.row.worker_.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工作职责" prop="duty" width="150">
-        </el-table-column>
-        <el-table-column label="证书" prop="certificates" width="150">
-          <template #default="scope" >
-            <el-tag v-for="item in scope.row.certificates_"
-                    :key="item.number"
-                    :label="item.name"
-                    :value="item.number">{{item.name}}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template #default="scope">
-           
-            <el-popconfirm
-              title="确定删除该作业人员吗？"
-              @confirm="delWorker(scope.row)"
-            >
-              <template #reference>
-                <el-button text type="danger" size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
-      </scTable>
-      <sc-dialog v-model="workerdialog" draggable title="选择作业人员">
-        <el-form
-          ref="workerForm"
-          :model="formworker"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="80px"
-          width="70%"
-          style="margin: 40px 40px 40px 40px"
-        >
-          <el-row>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="作业人员">
-                <el-select
-                  v-model="formworker.worker"
-                  @change="selectWorker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="工作职责">
-                <el-select
-                  v-model="formworker.duty"
-                  filterable
-                  allow-create
-                  default-first-option
-                  :reserve-keyword="false"
-                >
-                  <el-option
-                    v-for="item in dutyOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="证书">
-                <el-select
-                  v-model="formworker.certificates"
-                  multiple
-                  placeholder="选择证书"
-                >
-                  <el-option
-                    v-for="item in certificatesOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-          <el-button @click="dialogcart = false">取 消</el-button>
-          <el-button type="primary" @click="submitWorker">确 定</el-button>
-        </template>
-      </sc-dialog>
-       <el-button style="margin-top: 12px" @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button style="margin-top: 12px" @click="submitOut">退出</el-button>
-     
-    </el-main>
-  
-  </el-container>
+			</div>
+		</el-main>
+	</el-container>
 </template>
 <style scoped>
-.clearfix {
-  font-size: 20px;
-}
+	.clearfix {
+		font-size: 20px;
+	}
 
-.box-card p {
-  line-height: 20px;
-}
-.content {
-  margin-top: 10px;
-}
-.stepSuc:hover {
-  cursor: pointer;
-}
-.stepErr:hover {
-  cursor: not-allowed;
-}
+	.box-card p {
+		line-height: 20px;
+	}
+
+	.content {
+		margin-top: 10px;
+	}
+
+	.stepSuc:hover {
+		cursor: pointer;
+	}
+
+	.stepErr:hover {
+		cursor: not-allowed;
+	}
 </style>
-    <script>
-import { genTree } from "@/utils/verificate";
-const defaultformworker = {
-  id: "",
-  worker: null,
-  duty: null,
-  certificates: [],
-  opl: "",
-};
-const defaultformgas = {
+<script>
+	import {genTree} from "@/utils/verificate";
+
+	const defaultformworker = {
+		id: "",
+		worker: null,
+		duty: "作业人员",
+		certificates: [],
+		opl: "",
+	};
+	const defaultformgas = {
   id: "",
   check_time: null,
   opl:""
 };
-export default {
-  name: "hoisting",
-  components: {},
-  data() {
-    return {
-     
-      active: 0,
-      stepSuc: [0],
-      stepTitle: ["基本信息", "作业人员"],
-      query: {},
-      selection: [],
-      issave: false, //控制基本信息提交
-      search: {
-        keyword: null,
-      },
-      form: {
-        id: "",
-        start_time: null,
-        end_time: null,
-        operation: "",
-        cate: "",
-        risks_checked: [],
-      },
-
-      operationId: "",
-      oplcateId: "",
-      oplId: "",
-      leveloptions: [
-        { id: "一级吊装", name: "特级：>30米" },
+	export default {
+		name: "fire",
+		components: {},
+		data() {
+			return {
+				active: 0,
+				stepSuc: [0],
+				stepTitle: ["基本信息", "作业人员"],
+				query: {},
+				selection: [],
+				issave: false, //控制基本信息提交
+				search: {
+					keyword: null,
+				},
+				form: {
+					id: "",
+					start_time: null,
+					end_time: null,
+					operation: "",
+					cate: "",
+					risks_checked: [],
+				},
+				initForm: {},
+				operationId: "",
+				oplcateId: "",
+				oplcateCode: "",
+				oplId: "",
+				leveloptions: [
+				{ id: "一级吊装", name: "一级吊装" },
          { id: "二级吊装", name: "二级吊装" },
-        { id: "三级吊装", name: "三级吊装" },
-      ],
-      deptoptions: [],
-      useroptions: [],
-      risklist: [],
-      measurelist: [],
-      pagtitle: "",
+        { id: "三级吊装", name: "三级吊装" }
+				],
+				deptoptions: [],
+				useroptions: [],
+				risklist: [],
+				measurelist: [],
+				pagtitle: "",
+				dutyOptions: [
+					{value: 10, label: "作业人员"},
+					{value: 20, label: "起重司机"},
+					{value: 30, label: "司索人员"},
+					{value: 40, label: "起重指挥"},
+					{value: 40, label: "电工"},
+				],
+				certificatesOptions: [],
+				formworker: defaultformworker,
+				apiworkerObj: [],
+				workerdialog: false,
+				gasdialog: false,
+				formgas: defaultformgas,
+				apigasObj: [],
+				is_ok_: {
+					true: "正常",
+					false: "不正常",
+				},
+				tLoading: false,
+				rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					level: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
+			};
+		},
+		mounted() {
+			this.operationId = this.$route.query.operationid; //作业ID
+			this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
+			this.oplId = this.$route.query.oplId; //许可证ID
+			this.getoplData();
+			this.getInit();
+			this.getDept();
+			// this.getUser();
+		},
+		methods: {
+			getCharger(data) {
+				this.form.charger=data.id;
+      			this.form.charger_name=data.name
+			},
+			getChecker(data){
+				this.formgas.checker=data.id;
+      			this.formgas.checker_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();
+					this.getOplcates();
+				} else {
+					this.getData();
+				}
+			},
+			//根据oplId，查许可证
+			getData() {
+				this.$API.opm.opl.read.req(this.oplId).then((res) => {
+					this.form = res;
+					this.oplId = res.id;
+					this.oplcateId = res.cate;
+					this.operationId = res.operation;
+					this.getOperation();
+					this.getOplcates();
+				});
+			},
+			//根据operationId，查作业信息
 
-      dutyOptions: [
-        { value: 10, label: "作业人员" },
-        { value: 20, label: "起重司机" },
-        { value: 30, label: "司索人员" },
-        { value: 40, label: "起重指挥" },
-        { value: 40, label: "电工" },
-      ],
-      certificatesOptions: [],
-      formworker: defaultformworker,
-      apiworkerObj: [],
-      workerdialog: false,
-      gasdialog: false,
-      formgas: defaultformgas,
-      apigasObj: [],
-      is_ok_: {
-        true: "正常",
-        false: "不正常",
-      },
-    };
-  },
-  mounted() {
-    this.operationId = this.$route.query.operationid; //作业ID
-    this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
-    this.oplId = this.$route.query.oplId; //许可证ID
-    this.getoplData();
+			getOperation() {
+				this.$API.opm.operation.read.req(this.operationId).then((res) => {
+					this.form.start_time = res.start_time; //作业开始时间
+					this.form.end_time = res.end_time; //作业结束时间
+					this.form.name = res.name; //作业结束时间
 
-    this.getDept();
-    this.getUser();
-  },
-  methods: {
-    
+					console.log(res);
+				});
+			},
+			//作业部门
+			getDept() {
+				this.$API.system.dept.list.req({page: 0}).then((res) => {
+					this.deptoptions = genTree(res);
+				});
+			},
 
-    getoplData() {
-      if (this.oplId == "") {
-        this.getOperation();
-        this.getOplcates();
-      } else {
-        this.getData();
-      }
-    },
-    //根据oplId，查许可证
-    getData() {
-      this.$API.opm.opl.read.req(this.oplId).then((res) => {
-        this.form = res;
+			//作业负责人、作业监护人
+			//作业
 
-        this.oplcateId = res.cate;
-        this.operationId = res.operation;
-        this.getOperation();
-        this.getOplcates();
-      });
-    },
-    //根据operationId，查作业信息
+			//根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情
+			getOplcates() {
+				this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
+					console.log(res); //
+					this.pagtitle = res.name;
+					this.oplcateCode = res.code;
+					this.risklist = res.risk_options_; //风险缝隙
+					this.measurelist = res.measure_options_; //控制措施
+				});
+			},
+			handleStep(val) {
+				//点击步骤条
+				if (this.stepSuc.includes(val) === true) {
+					this.active = val;
+				}
+			},
+			//组件点击上一步
+			handleLastStep() {
+				if (--this.active === 0) {
+					this.active = 0;
+				}
+			},
+			//组件点击下一步
+			handleNextStep() {
 
-    getOperation() {
-      this.$API.opm.operation.read.req(this.operationId).then((res) => {
-        this.form.start_time = res.start_time; //作业开始时间
-        this.form.end_time = res.end_time; //作业结束时间
+				if (this.active == 0) {
+					this.$refs.dialogForm.validate((valid) => {
+					if (valid) {
+											//如果是创建许可证书
+					if (this.oplId == "") {
+						//基本信息提交
+						debugger;
+						this.form.cate = this.oplcateId;
+						this.form.operation = this.operationId;
+						console.log(this.form);
+						this.$API.opm.opl.create
+							.req(this.form)
+							.then((res) => {
+								this.$emit("success", this.form);
+								this.$message.success("创建成功");
+								this.issave = true;
+								this.active = 1;
 
-        console.log(res);
-      });
-    },
-    //作业部门
-    getDept() {
-      this.$API.system.dept.list.req({ page: 0 }).then((res) => {
-        this.deptoptions = genTree(res);
-      });
-    },
+								this.oplId = res.id;
+								this.getworkerList();
+								this.getgasList();
+								return res;
+							})
+							.catch((err) => {
+								return err;
+							});
+					} else if (this.oplId != "") {
 
-    //作业负责人、作业监护人
-    getUser() {
-      this.$API.system.user.list.req({ page: 0 }).then((res) => {
-        this.useroptions = res;
-      });
-    },
-    //作业
+						this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
+							this.$message.success("基本修改成功！");
+							this.issave = true;
+							this.active = 1;
+							this.getgasList();
+							this.getworkerList();
 
-    //根据作业许可证ID获取，风险、措施
-    getOplcates() {
-      this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
-        console.log(res); //
-        this.pagtitle = res.name;
-        this.risklist = res.risk_options_; //风险缝隙
-        this.measurelist = res.measure_options_; //控制措施
-      });
-    },
-    handleStep(val) {
-      //点击步骤条
-      if (this.stepSuc.includes(val) === true) {
-        this.active = val;
-      }
-    },
-    //组件点击上一步
-    handleLastStep() {
-      if (--this.active === 0) {
-        this.active = 0;
-      }
-    },
-    //组件点击下一步
-    handleNextStep() {
-      if (this.active == 0) {
-      //  console.log(this.oplId);
-        //如果是创建许可证书
-        if (this.oplId == "") {
-          //基本信息提交
-          debugger;
-          this.form.cate = this.oplcateId;
-          this.form.operation = this.operationId;
-          console.log(this.form);
-          this.$API.opm.opl.create
-            .req(this.form)
-            .then((res) => {
-              this.$emit("success", this.form);
-              this.$message.success("创建成功");
-              this.issave = true;
-              this.active = 1;
+						});
+					} else {
+						this.active = 1;
+					}
+					}
+				})
+				} 
+				// this.stepSuc.push(++this.active)
+			},
 
-              this.oplId = res.id;
-              this.getworkerList(res.id);
-            
-              return res;
-            })
-            .catch((err) => {
-              return err;
-            });
-        } else if (this.oplId != "") {
-         
-          this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
-            this.$message.success("基本修改成功！");
-            this.issave = true;
-            this.active = 1;
-           
-            this.getworkerList(this.oplId);
-            
-          });
-        } else {
-          this.active = 1;
-        }
-      } 
-      // this.stepSuc.push(++this.active)
-    },
+			//选择人员后，调出该人员的所有证书
+			selectWorker() {
+				this.$API.hrm.certificate.list
+					.req({employee__user: this.formworker.worker, page: 0})
+					.then((res) => {
+						this.certificatesOptions = res;
+						console.log(res);
+					});
+			},
+			//作业人员列表
 
-    //选择人员后，调出该人员的所有证书
-    selectWorker() {
-      this.$API.hrm.certificate.list
-        .req({ employee__user: this.formworker.worker, page: 0 })
-        .then((res) => {
-          this.certificatesOptions = res;
-          console.log(res);
-        });
-    },
-    //作业人员列表
+			getworkerList() {
+				this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apiworkerObj = res;
+					console.log(res);
+				});
+			},
+			//创建作业人员，显示Form
+			addworker() {
+				this.workerdialog = true;
 
-    getworkerList(id) {
-      this.$API.opm.worker.list.req({ opl: id, page: 0 }).then((res) => {
-        this.apiworkerObj = res;
-        console.log(res);
-      });
-    },
-    //创建作业人员，显示Form
-    addworker() {
-      this.workerdialog = true;
+				this.formworker = Object.assign({}, defaultformworker);
+			},
 
-      this.formworker = Object.assign({}, defaultformworker);
-    },
-   
-    //删除作业人员
-    delWorker(row) {
-      this.$API.opm.worker.delete
-        .req(row.id)
-        .then((res) => {
-          this.$message.success("作业人员删除成功");
-         	this.$refs.workerTable.refresh();
-          return res;
-        })
-        .catch((err) => {
-          return err;
-        });
-    },
-    //提交作业人员信息
-    submitWorker() {
-      this.formworker.opl = this.oplId;
-      this.$refs.workerForm.validate(async (valid) => {
-      
-          this.$API.opm.worker.create
-            .req(this.formworker)
-            .then((res) => {
-              this.$message.success("创建作业人员成功");
-              this.workerdialog = false;
-             	this.$refs.workerTable.refresh();
-            })
-            .catch((err) => {
-              return err;
-            });
-      
-      });
-    },
-   
-    //退出界面
-    submitOut(){
-      this.$router.push({
-        name: "opl",
-        query: {
-          operationid: this.$route.query.id,//作业ID
-         
-        },
-      });
-    }
-  },
-};
-</script>
\ No newline at end of file
+			//删除作业人员
+			delWorker(row) {
+				this.$API.opm.worker.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("作业人员删除成功");
+						this.getworkerList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+			//提交作业人员信息
+			submitWorker() {
+				this.formworker.opl = this.oplId;
+				this.$refs.workerForm.validate(async (valid) => {
+
+					this.$API.opm.worker.create
+						.req(this.formworker)
+						.then((res) => {
+							this.$message.success("创建作业人员成功");
+							this.getworkerList();
+							this.workerdialog = false;
+						})
+						.catch((err) => {
+							return err;
+						});
+				});
+			},
+
+			//气体检测记录列表
+			getgasList() {
+				this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apigasObj = res;
+					console.log(res);
+				});
+			},
+
+			//创建气体检测记录，显示Form
+			addgas() {
+				this.gasdialog = true;
+				this.formgas = Object.assign({}, defaultformgas);
+			},
+
+			//提交气体检测记录
+			submitgas() {
+				this.formgas.opl = this.oplId;
+				this.$refs.gasForm.validate(async (valid) => {
+
+					this.$API.opm.gas.create
+						.req(this.formgas)
+						.then((res) => {
+							this.$message.success("创建气体检测记录成功");
+							this.getgasList();
+							this.gasdialog = false;
+
+						})
+						.catch((err) => {
+							return err;
+						});
+
+				});
+			},
+
+			//删除气体检测记录
+			delgas(row) {
+				this.$API.opm.gas.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("气体检测记录删除成功");
+						this.getgasList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+
+			//渲染工单提交按钮
+			getInit() {
+				this.$API.wf.workflow.initkey.req('opl_hoisting').then((res) => {
+					this.initForm = res;
+				});
+			},
+
+			//提交,创建工单
+			submitTicketCreate(id) {
+				if(this.apiworkerObj.length==0){
+							this.$message.warning("请添加作业人员");
+							return
+						}
+				let ticket = {};
+				ticket.workflow = this.initForm.workflow;
+				ticket.ticket_data = {opl: this.oplId};
+				ticket.transition = id;
+				ticket.title = this.form.name + '-申请';
+				this.tLoading = true
+				this.$API.wf.ticket.create.req(ticket).then((res) => {
+					this.tLoading = false
+					this.$message.success("提交成功");
+					this.submitOut()
+				}).catch(e=>{this.tLoading=false});
+			},
+
+			//退出界面
+			submitOut() {
+				this.$router.push({
+					name: "opl",
+					query: {
+						id: this.operationId,//作业ID
+
+					},
+				});
+			}
+		},
+	};
+</script>
diff --git a/src/views/opm/opl.vue b/src/views/opm/opl.vue
index 4d7c3d4b..f3bd315e 100644
--- a/src/views/opm/opl.vue
+++ b/src/views/opm/opl.vue
@@ -22,17 +22,17 @@
         </el-descriptions-item>
         <el-descriptions-item label="属地部门:">
           <span v-if="operationObj.dept_ter_">{{
-            operationObj.dept_ter_.name
+          operationObj.dept_ter_.name
           }}</span>
         </el-descriptions-item>
         <el-descriptions-item label="业务部门:">
           <span v-if="operationObj.dept_bus_">{{
-            operationObj.dept_bus_.name
+          operationObj.dept_bus_.name
           }}</span>
         </el-descriptions-item>
         <el-descriptions-item label="协调员:">
           <span v-if="operationObj.coordinator_">{{
-            operationObj.coordinator_.name
+          operationObj.coordinator_.name
           }}</span>
         </el-descriptions-item>
       </el-descriptions>
@@ -40,91 +40,50 @@
 
     <el-card header="许可证" style="margin-top: 8px">
       <div class="left-panel">
-        <el-button
-          icon="el-icon-plus"
-          style="margin: 3px 0px 0px 10px"
-          v-for="(item, index) in oplcateList"
-          :key="index"
-          :title="item.name"
-          type="primary"
-          v-auth="'opl.create'"
-          @click="addFire(item.id, item.name)"
-        >
+        <el-button icon="el-icon-plus" style="margin: 3px 0px 0px 10px" v-for="(item, index) in oplcateList"
+          :key="index" :title="item.name" type="primary" v-auth="'opl.create'" @click="addOpl(item.id, item.code)">
           {{ item.name }}
         </el-button>
       </div>
       <el-divider />
-      <scTable
-        ref="table"
-        :data="apiObj"
-        row-key="id"
-        @selection-change="selectionChange"
-        stripe
-        hidePagination
-        hideRefresh
-        @resetQuery="resetQuery"
-      >
+      <scTable ref="table" :data="apiObj" row-key="id" @selection-change="selectionChange" stripe hidePagination
+        hideRefresh @resetQuery="resetQuery">
         <el-table-column label="#" type="index" width="50"></el-table-column>
-        <el-table-column
-          label="作业许可编号"
-          prop="number"
-          width="150"
-        ></el-table-column>
+        <el-table-column label="作业许可编号" prop="number" width="150"></el-table-column>
         <el-table-column label="作业级别" prop="level"></el-table-column>
         <el-table-column label="许可证种类" prop="cate_name"></el-table-column>
         <el-table-column label="流程状态" width="160">
           <template #default="scope">
             <span v-if="scope.row.ticket">{{ scope.row.ticket_.state_.name }}
-				-{{act_states[scope.row.ticket_.act_state]}}
-			</span>
+              -{{act_states[scope.row.ticket_.act_state]}}
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="预计开始" prop="start_time" width="150"></el-table-column>
-        <el-table-column label="作业部门" prop="dept_do"
-          ><template #default="scope">
+        <el-table-column label="作业部门" prop="dept_do"><template #default="scope">
             {{ scope.row.dept_do_.name }}
-          </template></el-table-column
-        >
-        <el-table-column label="作业负责人" prop="charger"
-          ><template #default="scope">
+          </template></el-table-column>
+        <el-table-column label="作业负责人" prop="charger"><template #default="scope">
             {{ scope.row.charger_.name }}
-          </template></el-table-column
-        >
-        <el-table-column label="作业监护人" prop="monitor"
-          ><template #default="scope">
+          </template></el-table-column>
+        <el-table-column label="作业监护人" prop="monitor"><template #default="scope">
             {{ scope.row.monitor_.name }}
-          </template></el-table-column
-        >
+          </template></el-table-column>
 
         <el-table-column label="操作" fixed="right" width="80">
           <template #default="scope">
             <el-button-group>
-              <el-button
-                text
-                type="primary"
-                size="small"
-                @click="table_show(scope.row, scope.$index)"
-                >查看
+              <el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
               </el-button>
-              <el-button
-                v-if="operationObj.state === 10"
-                text
-                type="warning"
-                size="small"
-                v-auth="'opl.update'"
-                @click="table_edit(scope.row, scope.$index)"
-                >编辑
+              <el-button v-if="operationObj.state === 10" text type="warning" size="small" v-auth="'opl.update'"
+                @click="table_edit(scope.row, scope.$index)">编辑
               </el-button>
             </el-button-group>
           </template>
         </el-table-column>
       </scTable>
     </el-card>
-    <el-drawer
-      :size="'50%'"
-      v-model="showLimited"
-      :title="oplName + '作业许可证详情'"
-    >
+    <el-drawer :size="'50%'" v-model="showLimited" :title="oplName + '作业许可证详情'">
       <sc-fire :id="oplId"></sc-fire>
     </el-drawer>
   </el-main>
@@ -159,14 +118,14 @@ export default {
         40: "进行中",
         50: "已完成",
       },
-	  act_states: {
-					0: "草稿中",
-					1: "进行中",
-					2: "被退回",
-					3: "被撤回",
-					4: "已完成",
-					5: "已关闭",
-				},
+      act_states: {
+        0: "草稿中",
+        1: "进行中",
+        2: "被退回",
+        3: "被撤回",
+        4: "已完成",
+        5: "已关闭",
+      },
     };
   },
 
@@ -206,181 +165,30 @@ export default {
     },
 
     //点击作业类型，创建作业许可证添加
-    addFire(id, name) {
-      switch (name) {
-        case "动火":
-          this.$router.push({
-            name: "fire",
-            query: {
-              operationid: this.$route.query.id, //作业ID
-              oplcateId: id, //许可证类型ID
-              oplId: "", //许可证ID
-            },
-          });
-          break;
-        case "有限空间":
-          this.$router.push({
-            name: "space",
-            query: {
-              operationid: this.$route.query.id, //作业ID
-              oplcateId: id, //许可证类型ID
-              oplId: "", //许可证ID
-            },
-          });
-          break;
-        case "清库":
-          this.$router.push({
-            name: "clear",
-            query: {
-              operationid: this.$route.query.id, //作业ID
-              oplcateId: id, //许可证类型ID
-              oplId: "", //许可证ID
-            },
-          });
-          break;
-        case "高处":
-          this.$router.push({
-            name: "high",
-            query: {
-              operationid: this.$route.query.id, //作业ID
-              oplcateId: id, //许可证类型ID
-              oplId: "", //许可证ID
-            },
-          });
-          break;
-        case "吊装":
-          this.$router.push({
-            name: "hoisting",
-            query: {
-              operationid: this.$route.query.id, //作业ID
-              oplcateId: id, //许可证类型ID
-              oplId: "", //许可证ID
-            },
-          });
-          break;
-        case "预热器清堵":
-          this.$router.push({
-            name: "preheat",
-            query: {
-              operationid: this.$route.query.id, //作业ID
-              oplcateId: id, //许可证类型ID
-              oplId: "", //许可证ID
-            },
-          });
-          break;
-        case "篦冷机清大块":
-          this.$router.push({
-            name: "cooler",
-            query: {
-              operationid: this.$route.query.id, //作业ID
-              oplcateId: id, //许可证类型ID
-              oplId: "", //许可证ID
-            },
-          });
-          break;
-        case "动土":
-          this.$router.push({
-            name: "soil",
-            query: {
-              operationid: this.$route.query.id, //作业ID
-              oplcateId: id, //许可证类型ID
-              oplId: "", //许可证ID
-            },
-          });
-          break;
-        case "临时用电":
-          this.$router.push({
-            name: "usecl",
-            query: {
-              operationid: this.$route.query.id, //作业ID
-              oplcateId: id, //许可证类型ID
-              oplId: "", //许可证ID
-            },
-          });
-          break;
-      }
+    addOpl(id, code) {
+      this.$router.push({
+        name: code,
+        query: {
+          operationid: this.$route.query.id, //作业ID
+          oplcateId: id, //许可证类型ID
+          oplId: "", //许可证ID
+        },
+      });
     },
     //编辑
     table_edit(row) {
-      switch (row.cate_name) {
-        case "动火":
-          this.$router.push({
-            name: "fire",
-            query: {
-              oplId: row.id, //许可证ID
-            },
-          });
-          break;
-        case "有限空间":
-          this.$router.push({
-            name: "space",
-            query: {
-              oplId: row.id, //许可证ID
-            },
-          });
-          break;
-        case "清库":
-          this.$router.push({
-            name: "clear",
-            query: {
-              oplId: row.id, //许可证ID
-            },
-          });
-          break;
-        case "高处":
-          this.$router.push({
-            name: "high",
-            query: {
-              oplId: row.id, //许可证ID
-            },
-          });
-          break;
-        case "吊装":
-          this.$router.push({
-            name: "hoisting",
-            query: {
-              oplId: row.id, //许可证ID
-            },
-          });
-          break;
-        case "预热器清堵":
-          this.$router.push({
-            name: "preheat",
-            query: {
-              oplId: row.id, //许可证ID
-            },
-          });
-          break;
-        case "篦冷机清大块":
-          this.$router.push({
-            name: "cooler",
-            query: {
-              oplId: row.id, //许可证ID
-            },
-          });
-          break;
-        case "动土":
-          this.$router.push({
-            name: "soil",
-            query: {
-              oplId: row.id, //许可证ID
-            },
-          });
-          break;
-        case "临时用电":
-          this.$router.push({
-            name: "usecl",
-            query: {
-              oplId: row.id, //许可证ID
-            },
-          });
-          break;
-      }
+      this.$router.push({
+        name: row.cate_code,
+        query: {
+          oplId: row.id, //许可证ID
+        },
+      });
     },
     //查看
     table_show(row) {
       this.showLimited = true;
       this.oplId = row.id;
+      this.oplCode = row.cate_code;
       this.oplName = row.cate_name;
       this.workId = row.workers[0];
     },
@@ -417,7 +225,7 @@ export default {
           loading.close();
           this.$message.success("操作成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     //表格选择后回调事件
     selectionChange(selection) {
@@ -434,7 +242,7 @@ export default {
       }, 500);
     },
     //搜索
-    handleQuery() {},
+    handleQuery() { },
     //根据ID获取树结构
     filterTree(id) {
       var target = null;
diff --git a/src/views/opm/preheat.vue b/src/views/opm/preheat.vue
index 460b59fd..bdcd26eb 100644
--- a/src/views/opm/preheat.vue
+++ b/src/views/opm/preheat.vue
@@ -1,604 +1,723 @@
 <template>
-  <el-container>
-    <el-header>
-      <el-steps
-        :active="active"
-        style="width: 100%"
-        :align-center="true"
-        finish-status="success"
-      >
-        <el-step
-          v-for="(item, index) of stepTitle"
-          :key="index"
-          :title="item"
-          style="50%"
-          @click="handleStep(index)"
-        >
-        </el-step>
-      </el-steps>
-    </el-header>
-    <!--基本信息!-->
-    <el-main class="nopadding" v-show="active === 0">
-      <el-form
-        v-show="active === 0"
-        ref="dialogForm"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        style="margin: 40px 40px 40px 40px"
-      >
-        <el-row>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="关联作业">
-              <el-input
-                v-model="operationId"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业许可种类">
-              <el-input
-                v-model="pagtitle"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业开始时间">
-              <el-date-picker
-                v-model="form.start_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业结束时间">
-              <el-date-picker
-                v-model="form.end_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
+	<el-container>
+		<el-header>
+			<el-steps
+				:active="active"
+				style="width: 100%"
+				:align-center="true"
+				finish-status="success"
+			>
+				<el-step
+					v-for="(item, index) of stepTitle"
+					:key="index"
+					:title="item"
+					style="50%"
+					@click="handleStep(index)"
+				>
+				</el-step>
+			</el-steps>
+		</el-header>
+		<!--基本信息!-->
+		<el-main class="nopadding" v-show="active === 0">
+			<el-form
+				v-show="active === 0"
+				ref="dialogForm"
+				:model="form"
+				:rules="rules"
+				label-width="110px"
+				style="margin: 40px 40px 0px 40px"
+			>
+				<el-row>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="关联作业">
+							<el-input
+								v-model="form.name"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业许可种类">
+							<el-input
+								v-model="pagtitle"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业开始时间" prop="start_time">
+							<el-date-picker
+								v-model="form.start_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业结束时间" prop="end_time">
+							<el-date-picker
+								v-model="form.end_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业级别" prop="level">
+							<el-select v-model="form.level" placeholder="选择作业级别">
+								<el-option
+									v-for="item in leveloptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.name"
+								/>
+							</el-select>
+						</el-form-item>
+					</el-col>
 
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业部门">
-              <el-cascader
-                placeholder="选择作业部门"
-                getCheckedNodes="true"
-                v-model="form.dept_do"
-                :options="deptoptions"
-                :props="{
+					<el-col :md="12" :sm="12" :xs="24" >
+						<el-form-item label="作业部门" prop="dept_do">
+							<el-cascader
+								placeholder="选择作业部门"
+								getCheckedNodes="true"
+								v-model="form.dept_do"
+								:options="deptoptions"
+								:props="{
                   expandTrigger: 'hover', // 次级菜单的展开方式
                   label: 'label', //
                   value: 'value', //
                   emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+				  checkStrictly: true
                 }"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业负责人" prop="charger">
+							<el-input
+								v-model="form.charger_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<!-- <el-select v-model="form.charger_name" placeholder="选择作业负责人">
+								<el-option
+									v-for="item in useroptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								/>
+							</el-select> -->
+							<ehsUserSelect :multiple="false" @submit="getCharger"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业监护人" prop="monitor">
+							<el-input
+								v-model="form.monitor_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getMonitor"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="风险选择" prop="risks_checked">
+							<el-checkbox-group v-model="form.risks_checked">
+								<el-checkbox
+									v-for="(item, index) in risklist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="其他风险">
+							<el-input
+								v-model="form.other_risk"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="措施选择" prop="measures_checked">
+							<el-checkbox-group v-model="form.measures_checked">
+								<el-checkbox
+									v-for="(item, index) in measurelist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-card header="应急处置">
+							<div class="content">
+								<p>1、发生火灾时立即使用消防器材进行灭火</p>
+								<p>2、高温物料冲入眼睛时用洗眼器进行持续冲洗，严重时拨打120送医</p>
+								<p>3、发生人员烫伤时用喷淋装置对烫伤部位进行冲洗或用清水浸泡，用干净的纱布或衣物盖住被烫伤部位，伤势严重时立即拨打120送医。若贴身衣服与伤口粘在一起时，可用剪刀剪开，然后缓慢剥离衣物。</p>
+							</div>
+						</el-card>
+						<el-form-item label="其他应急处置">
+							<el-input
+								v-model="form.other_emr"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
+							>下一步
+							</el-button>
+			</div>
+		</el-main>
 
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业负责人">
-              <el-select v-model="form.charger" placeholder="选择作业负责人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业监护人">
-              <el-select v-model="form.monitor" placeholder="选择作业监护人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+		<!--作业人员!-->
+		<el-main class="nopadding" v-show="active === 1">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addworker"
+				></el-button>
+			</div>
+			<scTable
+				ref="workerTable"
+				:data="apiworkerObj"
+				row-key="id"
+				hidePagination
+				stripe
+				hideDo
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column label="姓名" prop="name" width="150">
+					<template #default="scope">
+						{{ scope.row.worker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="工作职责" prop="duty" width="150">
+				</el-table-column>
+				<el-table-column label="证书" prop="certificates" width="150">
+					<template #default="scope">
+						<el-tag v-for="item in scope.row.certificates_"
+								:key="item.number"
+								:label="item.name"
+								:value="item.number">{{item.name}}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="创建时间"
+					prop="create_time"
+					width="150"
+				></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="风险选择">
-              <el-checkbox-group v-model="form.risks_checked">
-                <el-checkbox
-                  v-for="(item, index) in risklist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="其他风险">
-              <el-input
-                v-model="form.other_risk"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+						<el-popconfirm
+							title="确定删除该作业人员吗？"
+							@confirm="delWorker(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="workerdialog" draggable title="选择作业人员">
+				<el-form
+					ref="workerForm"
+					:model="formworker"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="作业人员">
+								<el-input
+								v-model="formworker.worker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getWorker"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="工作职责">
+								<el-select
+									v-model="formworker.duty"
+									filterable
+									allow-create
+									default-first-option
+									:reserve-keyword="false"
+								>
+									<el-option
+										v-for="item in dutyOptions"
+										:key="item.value"
+										:label="item.label"
+										:value="item.label"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="证书">
+								<el-select
+									v-model="formworker.certificates"
+									multiple
+									placeholder="选择证书"
+								>
+									<el-option
+										v-for="item in certificatesOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialogcart = false">取 消</el-button>
+					<el-button type="primary" @click="submitWorker">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+				<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
+			<el-button
+				:loading="tLoading"
+				v-for=" item in initForm.transitions"
+				:key="item.id"
+				type="primary"
+				@click="submitTicketCreate(item.id)"
+				style="margin-right:4px"
+			>{{item.name}}
+			</el-button>
+			<el-button @click="submitOut" type="warning">退出</el-button>
 
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="逃生路径">
-              <el-input v-model="escape_route" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>  !-->
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="措施选择">
-              <el-checkbox-group v-model="form.measures_checked">
-                <el-checkbox
-                  v-for="(item, index) in measurelist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-card class="box-card">
-              <div class="clearfix">
-                <span>应急处置：</span>
-              </div>
-              <div class="content">
-                <p>1、发生火灾时立即使用消防器材进行灭火</p>
-                <p>
-                  2、高温物料冲入眼睛时用洗眼器进行持续冲洗，严重时拨打120送医。
-                </p>
-                <p>
-                  3、发生人员烫伤时用喷淋装置对烫伤部位进行冲洗或用清水浸泡，用干净的纱布或衣物盖住被烫伤部位，伤势严重时立即拨打120送医。若贴身衣服与伤口粘在一起时，可用剪刀剪开，然后缓慢剥离衣物。
-                </p>
-              </div>
-            </el-card>
-            <el-form-item label="其他应急处置">
-              <el-input
-                v-model="form.other_emr"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业审批照片">
-              <el-input v-model="create_imgs" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		  !-->
-        </el-row>
-        <el-row>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item>
-              <el-button style="margin-top: 12px" @click="handleNextStep"
-                >下一步</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-main>
-
-    <!--作业人员!-->
-    <el-main class="nopadding" v-show="active === 1">
-      <div class="left-panel" style="margin: 10px">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addworker"
-        ></el-button>
-      </div>
-      <scTable
-        ref="workerTable"
-        :data="apiworkerObj"
-        row-key="id"
-        hidePagination
-        stripe
-      
-      >
-        <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column label="姓名" prop="name" width="150">
-          <template #default="scope">
-            {{ scope.row.worker_.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工作职责" prop="duty" width="150">
-        </el-table-column>
-        <el-table-column label="证书" prop="certificates" width="150">
-          <template #default="scope">
-            <el-tag
-              v-for="item in scope.row.certificates_"
-              :key="item.number"
-              :label="item.name"
-              :value="item.number"
-              >{{ item.name }}</el-tag
-            >
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template #default="scope">
-            <el-popconfirm
-              title="确定删除该作业人员吗？"
-              @confirm="delWorker(scope.row)"
-            >
-              <template #reference>
-                <el-button text type="danger" size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
-      </scTable>
-      <sc-dialog v-model="workerdialog" draggable title="选择作业人员">
-        <el-form
-          ref="workerForm"
-          :model="formworker"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="80px"
-          width="70%"
-          style="margin: 40px 40px 40px 40px"
-        >
-          <el-row>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="作业人员">
-                <el-select
-                  v-model="formworker.worker"
-                  @change="selectWorker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="工作职责">
-                <el-select
-                  v-model="formworker.duty"
-                  filterable
-                  allow-create
-                  default-first-option
-                  :reserve-keyword="false"
-                >
-                  <el-option
-                    v-for="item in dutyOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="证书">
-                <el-select
-                  v-model="formworker.certificates"
-                  multiple
-                  placeholder="选择证书"
-                >
-                  <el-option
-                    v-for="item in certificatesOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-          <el-button @click="dialogcart = false">取 消</el-button>
-          <el-button type="primary" @click="submitWorker">确 定</el-button>
-        </template>
-      </sc-dialog>
-      <el-button style="margin-top: 12px" @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button style="margin-top: 12px" @click="submitOut">退出</el-button>
-    </el-main>
-  </el-container>
+			</div>
+		</el-main>
+	</el-container>
 </template>
 <style scoped>
-.clearfix {
-  font-size: 20px;
-}
+	.clearfix {
+		font-size: 20px;
+	}
 
-.box-card p {
-  line-height: 20px;
-}
-.content {
-  margin-top: 10px;
-}
-.stepSuc:hover {
-  cursor: pointer;
-}
-.stepErr:hover {
-  cursor: not-allowed;
-}
+	.box-card p {
+		line-height: 20px;
+	}
+
+	.content {
+		margin-top: 10px;
+	}
+
+	.stepSuc:hover {
+		cursor: pointer;
+	}
+
+	.stepErr:hover {
+		cursor: not-allowed;
+	}
 </style>
-    <script>
-import { genTree } from "@/utils/verificate";
-const defaultformworker = {
-  id: "",
-  worker: null,
-  duty: null,
-  certificates: [],
-  opl: "",
-};
-const defaultformgas = {
+<script>
+	import {genTree} from "@/utils/verificate";
+
+	const defaultformworker = {
+		id: "",
+		worker: null,
+		duty: "作业人员",
+		certificates: [],
+		opl: "",
+	};
+	const defaultformgas = {
   id: "",
   check_time: null,
-  opl: "",
+  opl:""
 };
-export default {
-  name: "preheat",
-  components: {},
-  data() {
-    return {
-      active: 0,
-      stepSuc: [0],
-      stepTitle: ["基本信息", "作业人员"],
-      query: {},
-      selection: [],
-      issave: false, //控制基本信息提交
-      search: {
-        keyword: null,
-      },
-      form: {
-        id: "",
-        start_time: null,
-        end_time: null,
-        operation: "",
-        cate: "",
-        risks_checked: [],
-      },
+	export default {
+		name: "fire",
+		components: {},
+		data() {
+			return {
+				active: 0,
+				stepSuc: [0],
+				stepTitle: ["基本信息", "作业人员"],
+				query: {},
+				selection: [],
+				issave: false, //控制基本信息提交
+				search: {
+					keyword: null,
+				},
+				form: {
+					id: "",
+					start_time: null,
+					end_time: null,
+					operation: "",
+					cate: "",
+					risks_checked: [],
+				},
+				initForm: {},
+				operationId: "",
+				oplcateId: "",
+				oplcateCode: "",
+				oplId: "",
+				leveloptions: [
+				{ id: "特级", name: "特级：>30米" },
+         { id: "三级", name: "三级:15-30米" },
+        { id: "二级", name: "二级：>5-15米" },
+        { id: "一级", name: "一级:1.8-5米" },
+				],
+				deptoptions: [],
+				useroptions: [],
+				risklist: [],
+				measurelist: [],
+				pagtitle: "",
+				dutyOptions: [
+					{value: 10, label: "作业人员"},
+					{value: 20, label: "起重司机"},
+					{value: 30, label: "司索人员"},
+					{value: 40, label: "起重指挥"},
+					{value: 40, label: "电工"},
+				],
+				certificatesOptions: [],
+				formworker: defaultformworker,
+				apiworkerObj: [],
+				workerdialog: false,
+				gasdialog: false,
+				formgas: defaultformgas,
+				apigasObj: [],
+				is_ok_: {
+					true: "正常",
+					false: "不正常",
+				},
+				tLoading: false,
+				rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					level: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
+			};
+		},
+		mounted() {
+			this.operationId = this.$route.query.operationid; //作业ID
+			this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
+			this.oplId = this.$route.query.oplId; //许可证ID
+			this.getoplData();
+			this.getInit();
+			this.getDept();
+			// this.getUser();
+		},
+		methods: {
+			getCharger(data) {
+				this.form.charger=data.id;
+      			this.form.charger_name=data.name
+			},
+			getChecker(data){
+				this.formgas.checker=data.id;
+      			this.formgas.checker_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();
+					this.getOplcates();
+				} else {
+					this.getData();
+				}
+			},
+			//根据oplId，查许可证
+			getData() {
+				this.$API.opm.opl.read.req(this.oplId).then((res) => {
+					this.form = res;
+					this.oplId = res.id;
+					this.oplcateId = res.cate;
+					this.operationId = res.operation;
+					this.getOperation();
+					this.getOplcates();
+				});
+			},
+			//根据operationId，查作业信息
 
-      operationId: "",
-      oplcateId: "",
-      oplId: "",
-      leveloptions: [
-        { id: "一级吊装", name: "特级：>30米" },
-        { id: "二级吊装", name: "二级吊装" },
-        { id: "三级吊装", name: "三级吊装" },
-      ],
-      deptoptions: [],
-      useroptions: [],
-      risklist: [],
-      measurelist: [],
-      pagtitle: "",
+			getOperation() {
+				this.$API.opm.operation.read.req(this.operationId).then((res) => {
+					this.form.start_time = res.start_time; //作业开始时间
+					this.form.end_time = res.end_time; //作业结束时间
+					this.form.name = res.name; //作业结束时间
 
-      dutyOptions: [
-        { value: 10, label: "作业人员" },
-        { value: 20, label: "起重司机" },
-        { value: 30, label: "司索人员" },
-        { value: 40, label: "起重指挥" },
-        { value: 40, label: "电工" },
-      ],
-      certificatesOptions: [],
-      formworker: defaultformworker,
-      apiworkerObj: [],
-      workerdialog: false,
-      gasdialog: false,
-      formgas: defaultformgas,
-      apigasObj: [],
-      is_ok_: {
-        true: "正常",
-        false: "不正常",
-      },
-    };
-  },
-  mounted() {
-    this.operationId = this.$route.query.operationid; //作业ID
-    this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
-    this.oplId = this.$route.query.oplId; //许可证ID
-    this.getoplData();
+					console.log(res);
+				});
+			},
+			//作业部门
+			getDept() {
+				this.$API.system.dept.list.req({page: 0}).then((res) => {
+					this.deptoptions = genTree(res);
+				});
+			},
 
-    this.getDept();
-    this.getUser();
-  },
-  methods: {
-    getoplData() {
-      if (this.oplId == "") {
-        this.getOperation();
-        this.getOplcates();
-      } else {
-        this.getData();
-      }
-    },
-    //根据oplId，查许可证
-    getData() {
-      this.$API.opm.opl.read.req(this.oplId).then((res) => {
-        this.form = res;
+			//作业负责人、作业监护人
+			//作业
 
-        this.oplcateId = res.cate;
-        this.operationId = res.operation;
-        this.getOperation();
-        this.getOplcates();
-      });
-    },
-    //根据operationId，查作业信息
+			//根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情
+			getOplcates() {
+				this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
+					console.log(res); //
+					this.pagtitle = res.name;
+					this.oplcateCode = res.code;
+					this.risklist = res.risk_options_; //风险缝隙
+					this.measurelist = res.measure_options_; //控制措施
+				});
+			},
+			handleStep(val) {
+				//点击步骤条
+				if (this.stepSuc.includes(val) === true) {
+					this.active = val;
+				}
+			},
+			//组件点击上一步
+			handleLastStep() {
+				if (--this.active === 0) {
+					this.active = 0;
+				}
+			},
+			//组件点击下一步
+			handleNextStep() {
 
-    getOperation() {
-      this.$API.opm.operation.read.req(this.operationId).then((res) => {
-        this.form.start_time = res.start_time; //作业开始时间
-        this.form.end_time = res.end_time; //作业结束时间
+				if (this.active == 0) {
+					this.$refs.dialogForm.validate((valid) => {
+					if (valid) {
+											//如果是创建许可证书
+					if (this.oplId == "") {
+						//基本信息提交
+						debugger;
+						this.form.cate = this.oplcateId;
+						this.form.operation = this.operationId;
+						console.log(this.form);
+						this.$API.opm.opl.create
+							.req(this.form)
+							.then((res) => {
+								this.$emit("success", this.form);
+								this.$message.success("创建成功");
+								this.issave = true;
+								this.active = 1;
 
-        console.log(res);
-      });
-    },
-    //作业部门
-    getDept() {
-      this.$API.system.dept.list.req({ page: 0 }).then((res) => {
-        this.deptoptions = genTree(res);
-      });
-    },
+								this.oplId = res.id;
+								this.getworkerList();
+								this.getgasList();
+								return res;
+							})
+							.catch((err) => {
+								return err;
+							});
+					} else if (this.oplId != "") {
 
-    //作业负责人、作业监护人
-    getUser() {
-      this.$API.system.user.list.req({ page: 0 }).then((res) => {
-        this.useroptions = res;
-      });
-    },
-    //作业
+						this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
+							this.$message.success("基本修改成功！");
+							this.issave = true;
+							this.active = 1;
+							this.getgasList();
+							this.getworkerList();
 
-    //根据作业许可证ID获取，风险、措施
-    getOplcates() {
-      this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
-        console.log(res); //
-        this.pagtitle = res.name;
-        this.risklist = res.risk_options_; //风险缝隙
-        this.measurelist = res.measure_options_; //控制措施
-      });
-    },
-    handleStep(val) {
-      //点击步骤条
-      if (this.stepSuc.includes(val) === true) {
-        this.active = val;
-      }
-    },
-    //组件点击上一步
-    handleLastStep() {
-      if (--this.active === 0) {
-        this.active = 0;
-      }
-    },
-    //组件点击下一步
-    handleNextStep() {
-      if (this.active == 0) {
-        //  console.log(this.oplId);
-        //如果是创建许可证书
-        if (this.oplId == "") {
-          //基本信息提交
-          debugger;
-          this.form.cate = this.oplcateId;
-          this.form.operation = this.operationId;
-          console.log(this.form);
-          this.$API.opm.opl.create
-            .req(this.form)
-            .then((res) => {
-              this.$emit("success", this.form);
-              this.$message.success("创建成功");
-              this.issave = true;
-              this.active = 1;
+						});
+					} else {
+						this.active = 1;
+					}
+					}
+				})
+				} 
+				// this.stepSuc.push(++this.active)
+			},
 
-              this.oplId = res.id;
-              this.getworkerList(res.id);
+			//选择人员后，调出该人员的所有证书
+			selectWorker() {
+				this.$API.hrm.certificate.list
+					.req({employee__user: this.formworker.worker, page: 0})
+					.then((res) => {
+						this.certificatesOptions = res;
+						console.log(res);
+					});
+			},
+			//作业人员列表
 
-              return res;
-            })
-            .catch((err) => {
-              return err;
-            });
-        } else if (this.oplId != "") {
-          this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
-            this.$message.success("基本修改成功！");
-            this.issave = true;
-            this.active = 1;
+			getworkerList() {
+				this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apiworkerObj = res;
+					console.log(res);
+				});
+			},
+			//创建作业人员，显示Form
+			addworker() {
+				this.workerdialog = true;
 
-            this.getworkerList(this.oplId);
-          });
-        } else {
-          this.active = 1;
-        }
-      }
-      // this.stepSuc.push(++this.active)
-    },
+				this.formworker = Object.assign({}, defaultformworker);
+			},
 
-    //选择人员后，调出该人员的所有证书
-    selectWorker() {
-      this.$API.hrm.certificate.list
-        .req({ employee__user: this.formworker.worker, page: 0 })
-        .then((res) => {
-          this.certificatesOptions = res;
-          console.log(res);
-        });
-    },
-    //作业人员列表
+			//删除作业人员
+			delWorker(row) {
+				this.$API.opm.worker.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("作业人员删除成功");
+						this.getworkerList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+			//提交作业人员信息
+			submitWorker() {
+				this.formworker.opl = this.oplId;
+				this.$refs.workerForm.validate(async (valid) => {
 
-    getworkerList(id) {
-      this.$API.opm.worker.list.req({ opl: id, page: 0 }).then((res) => {
-        this.apiworkerObj = res;
-        console.log(res);
-      });
-    },
-    //创建作业人员，显示Form
-    addworker() {
-      this.workerdialog = true;
+					this.$API.opm.worker.create
+						.req(this.formworker)
+						.then((res) => {
+							this.$message.success("创建作业人员成功");
+							this.getworkerList();
+							this.workerdialog = false;
+						})
+						.catch((err) => {
+							return err;
+						});
+				});
+			},
 
-      this.formworker = Object.assign({}, defaultformworker);
-    },
+			//气体检测记录列表
+			getgasList() {
+				this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apigasObj = res;
+					console.log(res);
+				});
+			},
 
-    //删除作业人员
-    delWorker(row) {
-      this.$API.opm.worker.delete
-        .req(row.id)
-        .then((res) => {
-          this.$message.success("作业人员删除成功");
-          this.$refs.workerTable.refresh();
-          return res;
-        })
-        .catch((err) => {
-          return err;
-        });
-    },
-    //提交作业人员信息
-    submitWorker() {
-      this.formworker.opl = this.oplId;
-      this.$refs.workerForm.validate(async (valid) => {
-        this.$API.opm.worker.create
-          .req(this.formworker)
-          .then((res) => {
-            this.$refs.workerTable.refresh();
-            this.$message.success("创建作业人员成功");
+			//创建气体检测记录，显示Form
+			addgas() {
+				this.gasdialog = true;
+				this.formgas = Object.assign({}, defaultformgas);
+			},
 
-            this.workerdialog = false;
-          })
-          .catch((err) => {
-            return err;
-          });
-      });
-    },
+			//提交气体检测记录
+			submitgas() {
+				this.formgas.opl = this.oplId;
+				this.$refs.gasForm.validate(async (valid) => {
 
-    //退出界面
-    submitOut() {
-      this.$router.push({
-        name: "opl",
-        query: {
-          operationid: this.$route.query.id, //作业ID
-        },
-      });
-    },
-    
-  },
-};
-</script>
\ No newline at end of file
+					this.$API.opm.gas.create
+						.req(this.formgas)
+						.then((res) => {
+							this.$message.success("创建气体检测记录成功");
+							this.getgasList();
+							this.gasdialog = false;
+
+						})
+						.catch((err) => {
+							return err;
+						});
+
+				});
+			},
+
+			//删除气体检测记录
+			delgas(row) {
+				this.$API.opm.gas.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("气体检测记录删除成功");
+						this.getgasList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+
+			//渲染工单提交按钮
+			getInit() {
+				this.$API.wf.workflow.initkey.req('opl_preheat').then((res) => {
+					this.initForm = res;
+				});
+			},
+
+			//提交,创建工单
+			submitTicketCreate(id) {
+				if(this.apiworkerObj.length==0){
+							this.$message.warning("请添加作业人员");
+							return
+						}
+				let ticket = {};
+				ticket.workflow = this.initForm.workflow;
+				ticket.ticket_data = {opl: this.oplId};
+				ticket.transition = id;
+				ticket.title = this.form.name + '-申请';
+				this.tLoading = true
+				this.$API.wf.ticket.create.req(ticket).then((res) => {
+					this.tLoading = false
+					this.$message.success("提交成功");
+					this.submitOut()
+				}).catch(e=>{this.tLoading=false});
+			},
+
+			//退出界面
+			submitOut() {
+				this.$router.push({
+					name: "opl",
+					query: {
+						id: this.operationId,//作业ID
+
+					},
+				});
+			}
+		},
+	};
+</script>
diff --git a/src/views/opm/soil.vue b/src/views/opm/soil.vue
index c3e721fc..8e27bad2 100644
--- a/src/views/opm/soil.vue
+++ b/src/views/opm/soil.vue
@@ -1,616 +1,721 @@
 <template>
-  <el-container>
-    <el-header>
-      <el-steps
-        :active="active"
-        style="width: 100%"
-        :align-center="true"
-        finish-status="success"
-      >
-        <el-step
-          v-for="(item, index) of stepTitle"
-          :key="index"
-          :title="item"
-          style="50%"
-          @click="handleStep(index)"
-        >
-        </el-step>
-      </el-steps>
-    </el-header>
-    <!--基本信息!-->
-    <el-main class="nopadding" v-show="active === 0">
-      <el-form
-        v-show="active === 0"
-        ref="dialogForm"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        style="margin: 40px 40px 40px 40px"
-      >
-        <el-row>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="关联作业">
-              <el-input
-                v-model="operationId"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业许可种类">
-              <el-input
-                v-model="pagtitle"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业开始时间">
-              <el-date-picker
-                v-model="form.start_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业结束时间">
-              <el-date-picker
-                v-model="form.end_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业级别">
-              <el-select v-model="form.level" placeholder="选择作业级别">
-                <el-option
-                  v-for="item in leveloptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+	<el-container>
+		<el-header>
+			<el-steps
+				:active="active"
+				style="width: 100%"
+				:align-center="true"
+				finish-status="success"
+			>
+				<el-step
+					v-for="(item, index) of stepTitle"
+					:key="index"
+					:title="item"
+					style="50%"
+					@click="handleStep(index)"
+				>
+				</el-step>
+			</el-steps>
+		</el-header>
+		<!--基本信息!-->
+		<el-main class="nopadding" v-show="active === 0">
+			<el-form
+				v-show="active === 0"
+				ref="dialogForm"
+				:model="form"
+				:rules="rules"
+				label-width="110px"
+				style="margin: 40px 40px 0px 40px"
+			>
+				<el-row>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="关联作业">
+							<el-input
+								v-model="form.name"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业许可种类">
+							<el-input
+								v-model="pagtitle"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业开始时间" prop="start_time">
+							<el-date-picker
+								v-model="form.start_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业结束时间" prop="end_time">
+							<el-date-picker
+								v-model="form.end_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业级别" prop="level">
+							<el-select v-model="form.level" placeholder="选择作业级别">
+								<el-option
+									v-for="item in leveloptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.name"
+								/>
+							</el-select>
+						</el-form-item>
+					</el-col>
 
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业部门">
-              <el-cascader
-                placeholder="选择作业部门"
-                getCheckedNodes="true"
-                v-model="form.dept_do"
-                :options="deptoptions"
-                :props="{
+					<el-col :md="12" :sm="12" :xs="24" >
+						<el-form-item label="作业部门" prop="dept_do">
+							<el-cascader
+								placeholder="选择作业部门"
+								getCheckedNodes="true"
+								v-model="form.dept_do"
+								:options="deptoptions"
+								:props="{
                   expandTrigger: 'hover', // 次级菜单的展开方式
                   label: 'label', //
                   value: 'value', //
                   emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+				  checkStrictly: true
                 }"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业负责人">
-              <el-select v-model="form.charger" placeholder="选择作业负责人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业监护人">
-              <el-select v-model="form.monitor" placeholder="选择作业监护人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-         
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="风险选择">
-              <el-checkbox-group v-model="form.risks_checked">
-                <el-checkbox
-                  v-for="(item, index) in risklist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="其他风险">
-              <el-input
-                v-model="form.other_risk"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="逃生路径">
-              <el-input v-model="escape_route" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>  !-->
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="措施选择">
-              <el-checkbox-group v-model="form.measures_checked">
-                <el-checkbox
-                  v-for="(item, index) in measurelist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-card class="box-card">
-              <div class="clearfix">
-                <span>应急处置：</span>
-              </div>
-              <div class="content">
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业负责人" prop="charger">
+							<el-input
+								v-model="form.charger_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<!-- <el-select v-model="form.charger_name" placeholder="选择作业负责人">
+								<el-option
+									v-for="item in useroptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								/>
+							</el-select> -->
+							<ehsUserSelect :multiple="false" @submit="getCharger"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业监护人" prop="monitor">
+							<el-input
+								v-model="form.monitor_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getMonitor"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="风险选择" prop="risks_checked">
+							<el-checkbox-group v-model="form.risks_checked">
+								<el-checkbox
+									v-for="(item, index) in risklist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="其他风险">
+							<el-input
+								v-model="form.other_risk"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="措施选择" prop="measures_checked">
+							<el-checkbox-group v-model="form.measures_checked">
+								<el-checkbox
+									v-for="(item, index) in measurelist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-card header="应急处置">
+							<div class="content">
                 <p>1、管线被破坏时,应立即停止作业并报告相关部门，现场设置紧急隔离线，保护现场等待抢修。</p>
                 <p>2、发生人员受伤时应立即组织救援，救援过程中应避免二次伤害，根据伤情送医或拨打120。</p>
                
               </div>
-            </el-card>
-            <el-form-item label="其他应急处置">
-              <el-input
-                v-model="form.other_emr"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+						</el-card>
+						<el-form-item label="其他应急处置">
+							<el-input
+								v-model="form.other_emr"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
+							>下一步
+							</el-button>
+			</div>
+		</el-main>
 
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业审批照片">
-              <el-input v-model="create_imgs" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		  !-->
-        </el-row>
-        <el-row>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item>
-              <el-button style="margin-top: 12px" @click="handleNextStep"
-                >下一步</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-main>
+		<!--作业人员!-->
+		<el-main class="nopadding" v-show="active === 1">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addworker"
+				></el-button>
+			</div>
+			<scTable
+				ref="workerTable"
+				:data="apiworkerObj"
+				row-key="id"
+				hidePagination
+				stripe
+				hideDo
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column label="姓名" prop="name" width="150">
+					<template #default="scope">
+						{{ scope.row.worker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="工作职责" prop="duty" width="150">
+				</el-table-column>
+				<el-table-column label="证书" prop="certificates" width="150">
+					<template #default="scope">
+						<el-tag v-for="item in scope.row.certificates_"
+								:key="item.number"
+								:label="item.name"
+								:value="item.number">{{item.name}}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="创建时间"
+					prop="create_time"
+					width="150"
+				></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-    <!--作业人员!-->
-    <el-main class="nopadding" v-show="active === 1">
-      <div class="left-panel" style="margin: 10px">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addworker"
-        ></el-button>
-      </div>
-      <scTable
-        ref="workerTable"
-        :data="apiworkerObj"
-        row-key="id"
-        hidePagination
-        stripe
-      >
-        <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column label="姓名" prop="name" width="150">
-          <template #default="scope">
-            {{ scope.row.worker_.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工作职责" prop="duty" width="150">
-        </el-table-column>
-        <el-table-column label="证书" prop="certificates" width="150">
-          <template #default="scope" >
-            <el-tag v-for="item in scope.row.certificates_"
-                    :key="item.number"
-                    :label="item.name"
-                    :value="item.number">{{item.name}}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template #default="scope">
-           
-            <el-popconfirm
-              title="确定删除该作业人员吗？"
-              @confirm="delWorker(scope.row)"
-            >
-              <template #reference>
-                <el-button text type="danger" size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
-      </scTable>
-      <sc-dialog v-model="workerdialog" draggable title="选择作业人员">
-        <el-form
-          ref="workerForm"
-          :model="formworker"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="80px"
-          width="70%"
-          style="margin: 40px 40px 40px 40px"
-        >
-          <el-row>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="作业人员">
-                <el-select
-                  v-model="formworker.worker"
-                  @change="selectWorker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="工作职责">
-                <el-select
-                  v-model="formworker.duty"
-                  filterable
-                  allow-create
-                  default-first-option
-                  :reserve-keyword="false"
-                >
-                  <el-option
-                    v-for="item in dutyOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="证书">
-                <el-select
-                  v-model="formworker.certificates"
-                  multiple
-                  placeholder="选择证书"
-                >
-                  <el-option
-                    v-for="item in certificatesOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-          <el-button @click="dialogcart = false">取 消</el-button>
-          <el-button type="primary" @click="submitWorker">确 定</el-button>
-        </template>
-      </sc-dialog>
-       <el-button style="margin-top: 12px" @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button style="margin-top: 12px" @click="submitOut">退出</el-button>
-     
-    </el-main>
-  
-  </el-container>
+						<el-popconfirm
+							title="确定删除该作业人员吗？"
+							@confirm="delWorker(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="workerdialog" draggable title="选择作业人员">
+				<el-form
+					ref="workerForm"
+					:model="formworker"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="作业人员">
+								<el-input
+								v-model="formworker.worker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getWorker"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="工作职责">
+								<el-select
+									v-model="formworker.duty"
+									filterable
+									allow-create
+									default-first-option
+									:reserve-keyword="false"
+								>
+									<el-option
+										v-for="item in dutyOptions"
+										:key="item.value"
+										:label="item.label"
+										:value="item.label"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="证书">
+								<el-select
+									v-model="formworker.certificates"
+									multiple
+									placeholder="选择证书"
+								>
+									<el-option
+										v-for="item in certificatesOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialogcart = false">取 消</el-button>
+					<el-button type="primary" @click="submitWorker">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+				<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
+			<el-button
+				:loading="tLoading"
+				v-for=" item in initForm.transitions"
+				:key="item.id"
+				type="primary"
+				@click="submitTicketCreate(item.id)"
+				style="margin-right:4px"
+			>{{item.name}}
+			</el-button>
+			<el-button @click="submitOut" type="warning">退出</el-button>
+
+			</div>
+		</el-main>
+	</el-container>
 </template>
 <style scoped>
-.clearfix {
-  font-size: 20px;
-}
+	.clearfix {
+		font-size: 20px;
+	}
 
-.box-card p {
-  line-height: 20px;
-}
-.content {
-  margin-top: 10px;
-}
-.stepSuc:hover {
-  cursor: pointer;
-}
-.stepErr:hover {
-  cursor: not-allowed;
-}
+	.box-card p {
+		line-height: 20px;
+	}
+
+	.content {
+		margin-top: 10px;
+	}
+
+	.stepSuc:hover {
+		cursor: pointer;
+	}
+
+	.stepErr:hover {
+		cursor: not-allowed;
+	}
 </style>
-    <script>
-import { genTree } from "@/utils/verificate";
-const defaultformworker = {
-  id: "",
-  worker: null,
-  duty: null,
-  certificates: [],
-  opl: "",
-};
-const defaultformgas = {
+<script>
+	import {genTree} from "@/utils/verificate";
+
+	const defaultformworker = {
+		id: "",
+		worker: null,
+		duty: "作业人员",
+		certificates: [],
+		opl: "",
+	};
+	const defaultformgas = {
   id: "",
   check_time: null,
   opl:""
 };
-export default {
-  name: "soil",
-  components: {},
-  data() {
-    return {
-     
-      active: 0,
-      stepSuc: [0],
-      stepTitle: ["基本信息", "作业人员"],
-      query: {},
-      selection: [],
-      issave: false, //控制基本信息提交
-      search: {
-        keyword: null,
-      },
-      form: {
-        id: "",
-        start_time: null,
-        end_time: null,
-        operation: "",
-        cate: "",
-        risks_checked: [],
-      },
-
-      operationId: "",
-      oplcateId: "",
-      oplId: "",
-      leveloptions: [
+	export default {
+		name: "fire",
+		components: {},
+		data() {
+			return {
+				active: 0,
+				stepSuc: [0],
+				stepTitle: ["基本信息", "作业人员"],
+				query: {},
+				selection: [],
+				issave: false, //控制基本信息提交
+				search: {
+					keyword: null,
+				},
+				form: {
+					id: "",
+					start_time: null,
+					end_time: null,
+					operation: "",
+					cate: "",
+					risks_checked: [],
+				},
+				initForm: {},
+				operationId: "",
+				oplcateId: "",
+				oplcateCode: "",
+				oplId: "",
+				leveloptions: [
         { id: "主干道", name: "主干道" },
          { id: "次干渠", name: "次干渠" }
       ],
-      deptoptions: [],
-      useroptions: [],
-      risklist: [],
-      measurelist: [],
-      pagtitle: "",
+				deptoptions: [],
+				useroptions: [],
+				risklist: [],
+				measurelist: [],
+				pagtitle: "",
+				dutyOptions: [
+					{value: 10, label: "作业人员"},
+					{value: 20, label: "起重司机"},
+					{value: 30, label: "司索人员"},
+					{value: 40, label: "起重指挥"},
+					{value: 40, label: "电工"},
+				],
+				certificatesOptions: [],
+				formworker: defaultformworker,
+				apiworkerObj: [],
+				workerdialog: false,
+				gasdialog: false,
+				formgas: defaultformgas,
+				apigasObj: [],
+				is_ok_: {
+					true: "正常",
+					false: "不正常",
+				},
+				tLoading: false,
+				rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					level: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
+			};
+		},
+		mounted() {
+			this.operationId = this.$route.query.operationid; //作业ID
+			this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
+			this.oplId = this.$route.query.oplId; //许可证ID
+			this.getoplData();
+			this.getInit();
+			this.getDept();
+			// this.getUser();
+		},
+		methods: {
+			getCharger(data) {
+				this.form.charger=data.id;
+      			this.form.charger_name=data.name
+			},
+			getChecker(data){
+				this.formgas.checker=data.id;
+      			this.formgas.checker_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();
+					this.getOplcates();
+				} else {
+					this.getData();
+				}
+			},
+			//根据oplId，查许可证
+			getData() {
+				this.$API.opm.opl.read.req(this.oplId).then((res) => {
+					this.form = res;
+					this.oplId = res.id;
+					this.oplcateId = res.cate;
+					this.operationId = res.operation;
+					this.getOperation();
+					this.getOplcates();
+				});
+			},
+			//根据operationId，查作业信息
 
-      dutyOptions: [
-        { value: 10, label: "作业人员" },
-        { value: 20, label: "起重司机" },
-        { value: 30, label: "司索人员" },
-        { value: 40, label: "起重指挥" },
-        { value: 40, label: "电工" },
-      ],
-      certificatesOptions: [],
-      formworker: defaultformworker,
-      apiworkerObj: [],
-      workerdialog: false,
-      gasdialog: false,
-      formgas: defaultformgas,
-      apigasObj: [],
-      is_ok_: {
-        true: "正常",
-        false: "不正常",
-      },
-    };
-  },
-  mounted() {
-    this.operationId = this.$route.query.operationid; //作业ID
-    this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
-    this.oplId = this.$route.query.oplId; //许可证ID
-    this.getoplData();
+			getOperation() {
+				this.$API.opm.operation.read.req(this.operationId).then((res) => {
+					this.form.start_time = res.start_time; //作业开始时间
+					this.form.end_time = res.end_time; //作业结束时间
+					this.form.name = res.name; //作业结束时间
 
-    this.getDept();
-    this.getUser();
-  },
-  methods: {
-    
+					console.log(res);
+				});
+			},
+			//作业部门
+			getDept() {
+				this.$API.system.dept.list.req({page: 0}).then((res) => {
+					this.deptoptions = genTree(res);
+				});
+			},
 
-    getoplData() {
-      if (this.oplId == "") {
-        this.getOperation();
-        this.getOplcates();
-      } else {
-        this.getData();
-      }
-    },
-    //根据oplId，查许可证
-    getData() {
-      this.$API.opm.opl.read.req(this.oplId).then((res) => {
-        this.form = res;
+			//作业负责人、作业监护人
+			//作业
 
-        this.oplcateId = res.cate;
-        this.operationId = res.operation;
-        this.getOperation();
-        this.getOplcates();
-      });
-    },
-    //根据operationId，查作业信息
+			//根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情
+			getOplcates() {
+				this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
+					console.log(res); //
+					this.pagtitle = res.name;
+					this.oplcateCode = res.code;
+					this.risklist = res.risk_options_; //风险缝隙
+					this.measurelist = res.measure_options_; //控制措施
+				});
+			},
+			handleStep(val) {
+				//点击步骤条
+				if (this.stepSuc.includes(val) === true) {
+					this.active = val;
+				}
+			},
+			//组件点击上一步
+			handleLastStep() {
+				if (--this.active === 0) {
+					this.active = 0;
+				}
+			},
+			//组件点击下一步
+			handleNextStep() {
 
-    getOperation() {
-      this.$API.opm.operation.read.req(this.operationId).then((res) => {
-        this.form.start_time = res.start_time; //作业开始时间
-        this.form.end_time = res.end_time; //作业结束时间
+				if (this.active == 0) {
+					this.$refs.dialogForm.validate((valid) => {
+					if (valid) {
+											//如果是创建许可证书
+					if (this.oplId == "") {
+						//基本信息提交
+						debugger;
+						this.form.cate = this.oplcateId;
+						this.form.operation = this.operationId;
+						console.log(this.form);
+						this.$API.opm.opl.create
+							.req(this.form)
+							.then((res) => {
+								this.$emit("success", this.form);
+								this.$message.success("创建成功");
+								this.issave = true;
+								this.active = 1;
 
-        console.log(res);
-      });
-    },
-    //作业部门
-    getDept() {
-      this.$API.system.dept.list.req({ page: 0 }).then((res) => {
-        this.deptoptions = genTree(res);
-      });
-    },
+								this.oplId = res.id;
+								this.getworkerList();
+								this.getgasList();
+								return res;
+							})
+							.catch((err) => {
+								return err;
+							});
+					} else if (this.oplId != "") {
 
-    //作业负责人、作业监护人
-    getUser() {
-      this.$API.system.user.list.req({ page: 0 }).then((res) => {
-        this.useroptions = res;
-      });
-    },
-    //作业
+						this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
+							this.$message.success("基本修改成功！");
+							this.issave = true;
+							this.active = 1;
+							this.getgasList();
+							this.getworkerList();
 
-    //根据作业许可证ID获取，风险、措施
-    getOplcates() {
-      this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
-        console.log(res); //
-        this.pagtitle = res.name;
-        this.risklist = res.risk_options_; //风险缝隙
-        this.measurelist = res.measure_options_; //控制措施
-      });
-    },
-    handleStep(val) {
-      //点击步骤条
-      if (this.stepSuc.includes(val) === true) {
-        this.active = val;
-      }
-    },
-    //组件点击上一步
-    handleLastStep() {
-      if (--this.active === 0) {
-        this.active = 0;
-      }
-    },
-    //组件点击下一步
-    handleNextStep() {
-      if (this.active == 0) {
-      //  console.log(this.oplId);
-        //如果是创建许可证书
-        if (this.oplId == "") {
-          //基本信息提交
-          debugger;
-          this.form.cate = this.oplcateId;
-          this.form.operation = this.operationId;
-          console.log(this.form);
-          this.$API.opm.opl.create
-            .req(this.form)
-            .then((res) => {
-              this.$emit("success", this.form);
-              this.$message.success("创建成功");
-              this.issave = true;
-              this.active = 1;
+						});
+					} else {
+						this.active = 1;
+					}
+					}
+				})
+				} 
+				// this.stepSuc.push(++this.active)
+			},
 
-              this.oplId = res.id;
-              this.getworkerList(res.id);
-           
-              return res;
-            })
-            .catch((err) => {
-              return err;
-            });
-        } else if (this.oplId != "") {
-         
-          this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
-            this.$message.success("基本修改成功！");
-            this.issave = true;
-            this.active = 1;
-           
-            this.getworkerList(this.oplId);
-            
-          });
-        } else {
-          this.active = 1;
-        }
-      } 
-      // this.stepSuc.push(++this.active)
-    },
+			//选择人员后，调出该人员的所有证书
+			selectWorker() {
+				this.$API.hrm.certificate.list
+					.req({employee__user: this.formworker.worker, page: 0})
+					.then((res) => {
+						this.certificatesOptions = res;
+						console.log(res);
+					});
+			},
+			//作业人员列表
 
-    //选择人员后，调出该人员的所有证书
-    selectWorker() {
-      this.$API.hrm.certificate.list
-        .req({ employee__user: this.formworker.worker, page: 0 })
-        .then((res) => {
-          this.certificatesOptions = res;
-          console.log(res);
-        });
-    },
-    //作业人员列表
+			getworkerList() {
+				this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apiworkerObj = res;
+					console.log(res);
+				});
+			},
+			//创建作业人员，显示Form
+			addworker() {
+				this.workerdialog = true;
 
-    getworkerList(id) {
-      this.$API.opm.worker.list.req({ opl: id, page: 0 }).then((res) => {
-        this.apiworkerObj = res;
-        console.log(res);
-      });
-    },
-    //创建作业人员，显示Form
-    addworker() {
-      this.workerdialog = true;
+				this.formworker = Object.assign({}, defaultformworker);
+			},
 
-      this.formworker = Object.assign({}, defaultformworker);
-    },
-   
-    //删除作业人员
-    delWorker(row) {
-      this.$API.opm.worker.delete
-        .req(row.id)
-        .then((res) => {
-          this.$message.success("作业人员删除成功");
-         	this.$refs.workerTable.refresh();
-          return res;
-        })
-        .catch((err) => {
-          return err;
-        });
-    },
-    //提交作业人员信息
-    submitWorker() {
-      this.formworker.opl = this.oplId;
-      this.$refs.workerForm.validate(async (valid) => {
-      
-          this.$API.opm.worker.create
-            .req(this.formworker)
-            .then((res) => {
-              this.$message.success("创建作业人员成功");
-              this.workerdialog = false;
-             	this.$refs.workerTable.refresh();
-            })
-            .catch((err) => {
-              return err;
-            });
-      
-      });
-    },
-   
-    //退出界面
-    submitOut(){
-      this.$router.push({
-        name: "opl",
-        query: {
-          operationid: this.$route.query.id,//作业ID
-         
-        },
-      });
-    }
-  },
-};
-</script>
\ No newline at end of file
+			//删除作业人员
+			delWorker(row) {
+				this.$API.opm.worker.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("作业人员删除成功");
+						this.getworkerList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+			//提交作业人员信息
+			submitWorker() {
+				this.formworker.opl = this.oplId;
+				this.$refs.workerForm.validate(async (valid) => {
+
+					this.$API.opm.worker.create
+						.req(this.formworker)
+						.then((res) => {
+							this.$message.success("创建作业人员成功");
+							this.getworkerList();
+							this.workerdialog = false;
+						})
+						.catch((err) => {
+							return err;
+						});
+				});
+			},
+
+			//气体检测记录列表
+			getgasList() {
+				this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apigasObj = res;
+					console.log(res);
+				});
+			},
+
+			//创建气体检测记录，显示Form
+			addgas() {
+				this.gasdialog = true;
+				this.formgas = Object.assign({}, defaultformgas);
+			},
+
+			//提交气体检测记录
+			submitgas() {
+				this.formgas.opl = this.oplId;
+				this.$refs.gasForm.validate(async (valid) => {
+
+					this.$API.opm.gas.create
+						.req(this.formgas)
+						.then((res) => {
+							this.$message.success("创建气体检测记录成功");
+							this.getgasList();
+							this.gasdialog = false;
+
+						})
+						.catch((err) => {
+							return err;
+						});
+
+				});
+			},
+
+			//删除气体检测记录
+			delgas(row) {
+				this.$API.opm.gas.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("气体检测记录删除成功");
+						this.getgasList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+
+			//渲染工单提交按钮
+			getInit() {
+				this.$API.wf.workflow.initkey.req('opl_soil').then((res) => {
+					this.initForm = res;
+				});
+			},
+
+			//提交,创建工单
+			submitTicketCreate(id) {
+				if(this.apiworkerObj.length==0){
+							this.$message.warning("请添加作业人员");
+							return
+						}
+				let ticket = {};
+				ticket.workflow = this.initForm.workflow;
+				ticket.ticket_data = {opl: this.oplId};
+				ticket.transition = id;
+				ticket.title = this.form.name + '-申请';
+				this.tLoading = true
+				this.$API.wf.ticket.create.req(ticket).then((res) => {
+					this.tLoading = false
+					this.$message.success("提交成功");
+					this.submitOut()
+				}).catch(e=>{this.tLoading=false});
+			},
+
+			//退出界面
+			submitOut() {
+				this.$router.push({
+					name: "opl",
+					query: {
+						id: this.operationId,//作业ID
+
+					},
+				});
+			}
+		},
+	};
+</script>
diff --git a/src/views/opm/space.vue b/src/views/opm/space.vue
index f40115c7..270b4f5b 100644
--- a/src/views/opm/space.vue
+++ b/src/views/opm/space.vue
@@ -1,555 +1,488 @@
 <template>
-  <el-container>
-    <el-header>
-      <el-steps
-        :active="active"
-        style="width: 100%"
-        :align-center="true"
-        finish-status="success"
-      >
-        <el-step
-          v-for="(item, index) of stepTitle"
-          :key="index"
-          :title="item"
-          style="50%"
-          @click="handleStep(index)"
-        >
-        </el-step>
-      </el-steps>
-    </el-header>
-    <!--基本信息!-->
-    <el-main class="nopadding" v-show="active === 0">
-      <el-form
-        v-show="active === 0"
-        ref="dialogForm"
-        :model="form"
-        :rules="rules"
-        label-width="110px"
-        style="margin: 40px 40px 40px 40px"
-      >
-        <el-row>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="关联作业">
-              <el-input
-                v-model="operationId"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业许可种类">
-              <el-input
-                v-model="pagtitle"
-                type="text"
-                :disabled="true"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业开始时间">
-              <el-date-picker
-                v-model="form.start_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业结束时间">
-              <el-date-picker
-                v-model="form.end_time"
-                type="datetime"
-                placeholder="选择开始时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业级别">
-              <el-select v-model="form.level" placeholder="选择作业级别">
-                <el-option
-                  v-for="item in leveloptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+	<el-container>
+		<el-header>
+			<el-steps
+				:active="active"
+				style="width: 100%"
+				:align-center="true"
+				finish-status="success"
+			>
+				<el-step
+					v-for="(item, index) of stepTitle"
+					:key="index"
+					:title="item"
+					style="50%"
+					@click="handleStep(index)"
+				>
+				</el-step>
+			</el-steps>
+		</el-header>
+		<!--基本信息!-->
+		<el-main class="nopadding" v-show="active === 0">
+			<el-form
+				v-show="active === 0"
+				ref="dialogForm"
+				:model="form"
+				:rules="rules"
+				label-width="110px"
+				style="margin: 40px 40px 0px 40px"
+			>
+				<el-row>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="关联作业">
+							<el-input
+								v-model="form.name"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业许可种类">
+							<el-input
+								v-model="pagtitle"
+								type="text"
+								:disabled="true"
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业开始时间" prop="start_time">
+							<el-date-picker
+								v-model="form.start_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业结束时间" prop="end_time">
+							<el-date-picker
+								v-model="form.end_time"
+								type="datetime"
+								placeholder="选择开始时间"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业级别" prop="level">
+							<el-select v-model="form.level" placeholder="选择作业级别">
+								<el-option
+									v-for="item in leveloptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.name"
+								/>
+							</el-select>
+						</el-form-item>
+					</el-col>
 
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业部门">
-              <el-cascader
-                placeholder="选择作业部门"
-                getCheckedNodes="true"
-                v-model="form.dept_do"
-                :options="deptoptions"
-                :props="{
+					<el-col :md="12" :sm="12" :xs="24" >
+						<el-form-item label="作业部门" prop="dept_do">
+							<el-cascader
+								placeholder="选择作业部门"
+								getCheckedNodes="true"
+								v-model="form.dept_do"
+								:options="deptoptions"
+								:props="{
                   expandTrigger: 'hover', // 次级菜单的展开方式
                   label: 'label', //
                   value: 'value', //
                   emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
-                  checkStrictly: true 
+				  checkStrictly: true
                 }"
-                clearable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业负责人">
-              <el-select v-model="form.charger" placeholder="选择作业负责人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业监护人">
-              <el-select v-model="form.monitor" placeholder="选择作业监护人">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!--
-			临时用电
+								clearable
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业负责人" prop="charger">
+							<el-input
+								v-model="form.charger_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<!-- <el-select v-model="form.charger_name" placeholder="选择作业负责人">
+								<el-option
+									v-for="item in useroptions"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								/>
+							</el-select> -->
+							<ehsUserSelect :multiple="false" @submit="getCharger"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="12" :sm="12" :xs="24">
+						<el-form-item label="作业监护人" prop="monitor">
+							<el-input
+								v-model="form.monitor_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getMonitor"/>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="风险选择" prop="risks_checked">
+							<el-checkbox-group v-model="form.risks_checked">
+								<el-checkbox
+									v-for="(item, index) in risklist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="其他风险">
+							<el-input
+								v-model="form.other_risk"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-form-item label="措施选择" prop="measures_checked">
+							<el-checkbox-group v-model="form.measures_checked">
+								<el-checkbox
+									v-for="(item, index) in measurelist"
+									:key="index"
+									:label="item.id"
+								>{{ item.name }}
+								</el-checkbox
+								>
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+					<el-col :md="24" :sm="12" :xs="24">
+						<el-card header="应急处置">
+							<div class="content">
+								<p>1、施救人员必须穿戴防护用品（防毒面具、正压式空气呼吸器、长管式呼吸器）和安全绳方可进入有限
+空间进行救援。</p>
+								<p>2、将受伤人员托起或使用三角架、绞盘和全身式安全带将伤者拉出有限空间。</p>
+								<p>
+									3、如伤者发生骨折，采用夹板、木棍等对骨折部位上下关节进行固定，当伤者昏迷或意识不清楚则不应随意移动伤者，立即拨打120。
+								</p>
+								<p>4、发生人员窒息、中毒，将其转移到空气新鲜流通的场所，插入氧气袋或进行心肺复苏术，边抢救边拨打120求救。</p>
+								<p>5、逃生出口</p>
+							</div>
+						</el-card>
+						<el-form-item label="其他应急处置">
+							<el-input
+								v-model="form.other_emr"
+								type="text"
+								clearable
+							></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
+							>下一步
+							</el-button>
+			</div>
+		</el-main>
 
-		       <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="安装/拆除">
-              <el-input v-model="work_type" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="安装/拆除时间">
-              <el-input v-model="work_time" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="验收时间">
-              <el-input v-model="accept_time" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电地点">
-              <el-input v-model="power_to" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="电源接入点">
-              <el-input v-model="power_from" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电开始">
-              <el-input
-                v-model="power_start_time"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="用电截至">
-              <el-input
-                v-model="power_end_time"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="计划用电天数">
-              <el-input v-model="power_days" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>  !-->
+		<!--作业人员!-->
+		<el-main class="nopadding" v-show="active === 1">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addworker"
+				></el-button>
+			</div>
+			<scTable
+				ref="workerTable"
+				:data="apiworkerObj"
+				row-key="id"
+				hidePagination
+				stripe
+				hideDo
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column label="姓名" prop="name" width="150">
+					<template #default="scope">
+						{{ scope.row.worker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="工作职责" prop="duty" width="150">
+				</el-table-column>
+				<el-table-column label="证书" prop="certificates" width="150">
+					<template #default="scope">
+						<el-tag v-for="item in scope.row.certificates_"
+								:key="item.number"
+								:label="item.name"
+								:value="item.number">{{item.name}}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="创建时间"
+					prop="create_time"
+					width="150"
+				></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="风险选择">
-              <el-checkbox-group v-model="form.risks_checked">
-                <el-checkbox
-                  v-for="(item, index) in risklist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="其他风险">
-              <el-input
-                v-model="form.other_risk"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+						<el-popconfirm
+							title="确定删除该作业人员吗？"
+							@confirm="delWorker(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="workerdialog" draggable title="选择作业人员">
+				<el-form
+					ref="workerForm"
+					:model="formworker"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="作业人员">
+								<el-input
+								v-model="formworker.worker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getWorker"/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="工作职责">
+								<el-select
+									v-model="formworker.duty"
+									filterable
+									allow-create
+									default-first-option
+									:reserve-keyword="false"
+								>
+									<el-option
+										v-for="item in dutyOptions"
+										:key="item.value"
+										:label="item.label"
+										:value="item.label"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="证书">
+								<el-select
+									v-model="formworker.certificates"
+									multiple
+									placeholder="选择证书"
+								>
+									<el-option
+										v-for="item in certificatesOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialogcart = false">取 消</el-button>
+					<el-button type="primary" @click="submitWorker">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+			<el-button style="margin-right: 4px" @click="handleLastStep"
+			>上一步
+			</el-button>
+			<el-button type="primary" plain @click="handleNextStep"
+			>下一步
+			</el-button>
+			</div>
+		</el-main>
+		<!--气体检测记录!-->
+		<el-main class="nopadding" v-show="active === 2">
+			<div class="left-panel" style="margin: 10px">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="addgas"
+				></el-button>
+			</div>
+			<scTable
+				ref="gasTable"
+				:data="apigasObj"
+				row-key="id"
+				hidePagination
+				hideDo
+				stripe
+				style="height: 300px;"
+			>
+				<el-table-column
+					label="#"
+					fixed="left"
+					type="index"
+					width="50"
+				></el-table-column>
+				<el-table-column
+					label="检测时间"
+					prop="check_time"
+					width="150"
+				></el-table-column>
+				<el-table-column
+					label="检测部位"
+					prop="check_place"
+					width="150"
+				></el-table-column>
+				<el-table-column label="O2(%)" prop="o2" width="150"></el-table-column>
+				<el-table-column label="CO" prop="co" width="150"></el-table-column>
+				<el-table-column
+					label="h2s"
+					prop="h2s"
+					width="150"
+				></el-table-column>
+				<el-table-column
+					label="检验结论"
+					prop="is_ok"
+					width="150"
+				>
+					<template #default="scope">
+						{{ is_ok_[scope.row.is_ok] }}
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="检测人"
+					prop="checker"
+					width="150"
+				>
+					<template #default="scope">
+						{{ scope.row.checker_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="200">
+					<template #default="scope">
 
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="逃生路径">
-              <el-input v-model="escape_route" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>  !-->
+						<el-popconfirm
+							title="确定删除该条气体检测记录吗？"
+							@confirm="delgas(scope.row)"
+						>
+							<template #reference>
+								<el-button text type="danger" size="small">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+			<el-dialog v-model="gasdialog" draggable title="气体检测记录">
+				<el-form
+					ref="gasForm"
+					:model="formgas"
+					:rules="rules"
+					:disabled="mode == 'show'"
+					label-width="80px"
+					width="70%"
+					style="margin: 40px 40px 40px 40px"
+				>
+					<el-row>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检测时间">
+								<el-date-picker
+									v-model="formgas.check_time"
+									type="datetime"
+									placeholder="选择检测时间"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检测部位">
+								<el-input
+									v-model="formgas.check_place"
+									type="text"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="O2(%)">
+								<el-input v-model.number="formgas.o2" type="text" clearable></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="CO">
+								<el-input
+									v-model.number="formgas.co"
+									type="text"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="H2S">
+								<el-input
+									v-model.number="formgas.h2s"
+									type="text"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检验结论">
 
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item label="措施选择">
-              <el-checkbox-group v-model="form.measures_checked">
-                <el-checkbox
-                  v-for="(item, index) in measurelist"
-                  :key="index"
-                  :label="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-card class="box-card">
-              <div class="clearfix">
-                <span>应急处置：</span>
-              </div>
-              <div class="content">
-                <p>1、施救人员必须穿戴防护用品（防毒面具、正压式空气呼吸器、长管式呼吸器）和安全绳方可进入有限空间进行救援。</p>
-                <p>2、将受伤人员托起或使用三角架、绞盘和全身式安全带将伤者拉出有限空间。</p>
-                <p>3、如伤者发生骨折，采用夹板、木棍等对骨折部位上下关节进行固定，当伤者昏迷或意识不清楚则不应随意移动伤者，立即拨打120。</p>
-                 <p>4、发生人员窒息、中毒，将其转移到空气新鲜流通的场所，插入氧气袋或进行心肺复苏术，边抢救边拨打120求救。</p>
-                  <p>5、逃生出口</p>
-              </div>
-            </el-card>
-            <el-form-item label="其他应急处置">
-              <el-input
-                v-model="form.other_emr"
-                type="text"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!--
-          <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业审批照片">
-              <el-input v-model="create_imgs" type="text" clearable></el-input>
-            </el-form-item>
-          </el-col>
-		  !-->
-        </el-row>
-        <el-row>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item>
-              <el-button style="margin-top: 12px" @click="handleNextStep"
-                >下一步</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-main>
-
-    <!--作业人员!-->
-    <el-main class="nopadding" v-show="active === 1">
-      <div class="left-panel" style="margin: 10px">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addworker"
-        ></el-button>
-      </div>
-      <scTable
-        ref="workerTable"
-        :data="apiworkerObj"
-        row-key="id"
-        hidePagination
-        stripe
-      >
-        <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column label="姓名" prop="name" width="150">
-          <template #default="scope">
-            {{ scope.row.worker_.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工作职责" prop="duty" width="150">
-        </el-table-column>
-       <el-table-column label="证书" prop="certificates" width="150">
-         <template #default="scope" >
-            <el-tag v-for="item in scope.row.certificates_"
-                    :key="item.number"
-                    :label="item.name"
-                    :value="item.number">{{item.name}}</el-tag>
-          </template>
-        
-         
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template #default="scope">
-           
-            <el-popconfirm
-              title="确定删除该作业人员吗？"
-              @confirm="delWorker(scope.row)"
-            >
-              <template #reference>
-                <el-button text type="danger" size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
-      </scTable>
-      <sc-dialog v-model="workerdialog" draggable title="选择作业人员">
-        <el-form
-          ref="workerForm"
-          :model="formworker"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="80px"
-          width="70%"
-          style="margin: 40px 40px 40px 40px"
-        >
-          <el-row>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="作业人员">
-                <el-select
-                  v-model="formworker.worker"
-                  @change="selectWorker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="工作职责">
-                <el-select
-                  v-model="formworker.duty"
-                  filterable
-                  allow-create
-                  default-first-option
-                  :reserve-keyword="false"
-                >
-                  <el-option
-                    v-for="item in dutyOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="证书">
-                <el-select
-                  v-model="formworker.certificates"
-                  multiple
-                  placeholder="选择证书"
-                >
-                  <el-option
-                    v-for="item in certificatesOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-          <el-button @click="dialogcart = false">取 消</el-button>
-          <el-button type="primary" @click="submitWorker">确 定</el-button>
-        </template>
-      </sc-dialog>
-       <el-button style="margin-top: 12px" @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button style="margin-top: 12px" @click="handleNextStep"
-        >下一步</el-button
-      >
-     
-    </el-main>
-    <!--气体浓度检测记录!-->
-    <el-main class="nopadding" v-show="active === 2">
-      <div class="left-panel" style="margin: 10px">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addgas"
-        ></el-button>
-      </div>
-      <scTable
-        ref="gasTable"
-        :data="apigasObj"
-        row-key="id"
-        hidePagination
-        stripe
-      >
-      <el-table-column
-          label="#"
-          fixed="left"
-          type="index"
-          width="50"
-        ></el-table-column>
-        <el-table-column
-          label="检测时间"
-          prop="check_time"
-          width="150"
-        ></el-table-column>
-        <el-table-column
-          label="检测部位"
-          prop="check_place"
-          width="150"
-        ></el-table-column>
-        <el-table-column label="O2(%)" prop="o2" width="150"></el-table-column>
-        <el-table-column label="CO" prop="co" width="150"></el-table-column>
-        <el-table-column
-          label="H2S"
-          prop="h2s"
-          width="150"
-        ></el-table-column>
-        <el-table-column
-          label="检验结论"
-          prop="is_ok"
-          width="150"
-        > <template #default="scope">
-            {{ is_ok_[scope.row.is_ok] }}
-          </template></el-table-column>
-        <el-table-column
-          label="检测人"
-          prop="checker"
-          width="150"
-        >  <template #default="scope">
-            {{ scope.row.checker_.name }}
-          </template></el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="create_time"
-          width="150"
-        ></el-table-column>
-         <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template #default="scope">
-           
-            <el-popconfirm
-              title="确定删除该气体浓度检测记录吗？"
-              @confirm="delgas(scope.row)"
-            >
-              <template #reference>
-                <el-button text type="danger" size="small">删除</el-button>
-              </template>
-            </el-popconfirm>
-          </template>
-        </el-table-column>
-
-      </scTable>
-      <sc-dialog v-model="gasdialog" draggable title="气体检测记录">
-        <el-form
-          ref="gasForm"
-          :model="formgas"
-          :rules="rules"
-          :disabled="mode == 'show'"
-          label-width="120px"
-          width="70%"
-          style="margin: 40px 40px 40px 40px"
-        >
-          <el-row>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="检测时间">
-                <el-date-picker
-                  v-model="formgas.check_time"
-                  type="datetime"
-                  placeholder="选择检测时间"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="检测部位">
-                <el-input
-                  v-model="formgas.check_place"
-                  type="text"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="O2(%)">
-                <el-input v-model.number="formgas.o2" type="text" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="CO(ppm)">
-                <el-input
-                  v-model.number="formgas.co"
-                  type="text"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="H2S(10ppm)">
-                <el-input
-                   v-model.number="formgas.h2s"
-                  type="text"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="检验结论">
-               
-                <el-radio-group v-model="formgas.is_ok">
-                  <el-radio l :label="true"  >正常</el-radio>
-                  <el-radio :label="false" >不正常</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="12" :xs="24">
-              <el-form-item label="检测人">
-                  <el-select
-                  v-model="formgas.checker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <template #footer>
-          <el-button @click="dialoggase = false">取 消</el-button>
-          <el-button type="primary" @click="submitgas">确 定</el-button>
-        </template>
-      </sc-dialog>
-      <el-button @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button
+								<el-radio-group v-model="formgas.is_ok">
+									<el-radio l :label="true">正常</el-radio>
+									<el-radio :label="false">不正常</el-radio>
+								</el-radio-group>
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="12" :xs="24">
+							<el-form-item label="检测人">
+								<el-input
+								v-model="formgas.checker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+								<ehsUserSelect :multiple="false" @submit="getChecker"/>
+								<!-- <el-select
+									v-model="formgas.checker"
+									placeholder="选择作业人员"
+								>
+									<el-option
+										v-for="item in useroptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select> -->
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+				<template #footer>
+					<el-button @click="dialoggase = false">取 消</el-button>
+					<el-button type="primary" @click="submitgas">确 定</el-button>
+				</template>
+			</el-dialog>
+			<div style="margin-top:20px;text-align:center">
+			<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
+			<el-button
 				:loading="tLoading"
 				v-for=" item in initForm.transitions"
 				:key="item.id"
@@ -558,328 +491,389 @@
 				style="margin-right:4px"
 			>{{item.name}}
 			</el-button>
-      <el-button @click="submitOut">退出</el-button>
-    </el-main>
-  </el-container>
+			<el-button @click="submitOut" type="warning">退出</el-button>
+			</div>
+		</el-main>
+	</el-container>
 </template>
 <style scoped>
-.clearfix {
-  font-size: 20px;
-}
+	.clearfix {
+		font-size: 20px;
+	}
 
-.box-card p {
-  line-height: 20px;
-}
-.content {
-  margin-top: 10px;
-}
-.stepSuc:hover {
-  cursor: pointer;
-}
-.stepErr:hover {
-  cursor: not-allowed;
-}
+	.box-card p {
+		line-height: 20px;
+	}
+
+	.content {
+		margin-top: 10px;
+	}
+
+	.stepSuc:hover {
+		cursor: pointer;
+	}
+
+	.stepErr:hover {
+		cursor: not-allowed;
+	}
 </style>
-    <script>
-import { genTree } from "@/utils/verificate";
-const defaultformworker = {
-  id: "",
-  worker: null,
-  duty: null,
-  certificates: [],
-  opl: "",
-};
-const defaultformgas = {
-  id: "",
-  check_time: null,
-  opl:""
-};
-export default {
-  name: "space",
-  components: {},
-  data() {
-    return {
-      active: 0,
-      stepSuc: [0],
-      stepTitle: ["基本信息", "作业人员", "气体浓度检测记录"],
-      query: {},
-      selection: [],
-      issave: false, //控制基本信息提交
-      search: {
-        keyword: null,
-      },
-      form: {
-        id: "",
-        start_time: null,
-        end_time: null,
-        operation: "",
-        cate: "",
-        risks_checked: [],
-      },
-      initForm: {},
-      operationId: "",
-      oplcateId: "",
-      oplId: "",
-      leveloptions: [
-        { id: 10, name: "特级" },
-        { id: 20, name: "一级" },
-        { id: 30, name: "二级" },
-      ],
-      deptoptions: [],
-      useroptions: [],
-      risklist: [],
-      measurelist: [],
-      pagtitle: "",
+<script>
+	import {genTree} from "@/utils/verificate";
 
-      dutyOptions: [
-        { value: 10, label: "作业人员" },
-        { value: 20, label: "起重司机" },
-        { value: 30, label: "司索人员" },
-        { value: 40, label: "起重指挥" },
-        { value: 40, label: "电工" },
-      ],
-      certificatesOptions: [],
-      formworker: defaultformworker,
-      apiworkerObj: [],
-      workerdialog: false,
-      gasdialog: false,
-      formgas: defaultformgas,
-      apigasObj: [],
-      is_ok_: {
-        true: "正常",
-        false: "不正常",
-      },
-    };
-  },
-  mounted() {
-    this.operationId = this.$route.query.operationid; //作业ID
-    this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
-    this.oplId = this.$route.query.oplId; //许可证ID
-    this.getoplData();
-    this.getInit();
-    this.getDept();
-    this.getUser();
-  },
-  methods: {
-    getoplData() {
-      if (this.oplId == "") {
-        this.getOperation();
-        this.getOplcates();
-      } else {
-        this.getData();
-      }
-    },
-    //渲染工单提交按钮
+	const defaultformworker = {
+		id: "",
+		worker: null,
+		duty: "作业人员",
+		certificates: [],
+		opl: "",
+	};
+	const defaultformgas = {
+		id: "",
+		is_ok: true,
+		check_time: null,
+		opl: "",
+	};
+	export default {
+		name: "fire",
+		components: {},
+		data() {
+			return {
+				active: 0,
+				stepSuc: [0],
+				stepTitle: ["基本信息", "作业人员", "气体检测记录"],
+				query: {},
+				selection: [],
+				issave: false, //控制基本信息提交
+				search: {
+					keyword: null,
+				},
+				form: {
+					id: "",
+					start_time: null,
+					end_time: null,
+					operation: "",
+					cate: "",
+					risks_checked: [],
+				},
+				initForm: {},
+				operationId: "",
+				oplcateId: "",
+				oplcateCode: "",
+				oplId: "",
+				leveloptions: [
+					{id: 10, name: "特殊动火"},
+					{id: 20, name: "一级动火"},
+					{id: 30, name: "二级动火"},
+				],
+				deptoptions: [],
+				useroptions: [],
+				risklist: [],
+				measurelist: [],
+				pagtitle: "",
+				dutyOptions: [
+					{value: 10, label: "作业人员"},
+					{value: 20, label: "起重司机"},
+					{value: 30, label: "司索人员"},
+					{value: 40, label: "起重指挥"},
+					{value: 40, label: "电工"},
+				],
+				certificatesOptions: [],
+				formworker: defaultformworker,
+				apiworkerObj: [],
+				workerdialog: false,
+				gasdialog: false,
+				formgas: defaultformgas,
+				apigasObj: [],
+				is_ok_: {
+					true: "正常",
+					false: "不正常",
+				},
+				tLoading: false,
+				rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					level: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
+			};
+		},
+		mounted() {
+			this.operationId = this.$route.query.operationid; //作业ID
+			this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
+			this.oplId = this.$route.query.oplId; //许可证ID
+			this.getoplData();
+			this.getInit();
+			this.getDept();
+			// this.getUser();
+		},
+		methods: {
+			getCharger(data) {
+				this.form.charger=data.id;
+      			this.form.charger_name=data.name
+			},
+			getChecker(data){
+				this.formgas.checker=data.id;
+      			this.formgas.checker_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();
+					this.getOplcates();
+				} else {
+					this.getData();
+				}
+			},
+			//根据oplId，查许可证
+			getData() {
+				this.$API.opm.opl.read.req(this.oplId).then((res) => {
+					this.form = res;
+					this.oplId = res.id;
+					this.oplcateId = res.cate;
+					this.operationId = res.operation;
+					this.getOperation();
+					this.getOplcates();
+				});
+			},
+			//根据operationId，查作业信息
+
+			getOperation() {
+				this.$API.opm.operation.read.req(this.operationId).then((res) => {
+					this.form.start_time = res.start_time; //作业开始时间
+					this.form.end_time = res.end_time; //作业结束时间
+					this.form.name = res.name; //作业结束时间
+
+					console.log(res);
+				});
+			},
+			//作业部门
+			getDept() {
+				this.$API.system.dept.list.req({page: 0}).then((res) => {
+					this.deptoptions = genTree(res);
+				});
+			},
+
+			//作业负责人、作业监护人
+			//作业
+
+			//根据作业许可证类别ID获取，风险、措施===>作业许可证类别详情
+			getOplcates() {
+				this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
+					console.log(res); //
+					this.pagtitle = res.name;
+					this.oplcateCode = res.code;
+					this.risklist = res.risk_options_; //风险缝隙
+					this.measurelist = res.measure_options_; //控制措施
+				});
+			},
+			handleStep(val) {
+				//点击步骤条
+				if (this.stepSuc.includes(val) === true) {
+					this.active = val;
+				}
+			},
+			//组件点击上一步
+			handleLastStep() {
+				if (--this.active === 0) {
+					this.active = 0;
+				}
+			},
+			//组件点击下一步
+			handleNextStep() {
+
+				if (this.active == 0) {
+					this.$refs.dialogForm.validate((valid) => {
+					if (valid) {
+											//如果是创建许可证书
+					if (this.oplId == "") {
+						//基本信息提交
+						debugger;
+						this.form.cate = this.oplcateId;
+						this.form.operation = this.operationId;
+						console.log(this.form);
+						this.$API.opm.opl.create
+							.req(this.form)
+							.then((res) => {
+								this.$emit("success", this.form);
+								this.$message.success("创建成功");
+								this.issave = true;
+								this.active = 1;
+
+								this.oplId = res.id;
+								this.getworkerList();
+								this.getgasList();
+								return res;
+							})
+							.catch((err) => {
+								return err;
+							});
+					} else if (this.oplId != "") {
+
+						this.$API.opm.opl.update.req(this.oplId, this.form).then(() => {
+							this.$message.success("基本修改成功！");
+							this.issave = true;
+							this.active = 1;
+							this.getgasList();
+							this.getworkerList();
+
+						});
+					} else {
+						this.active = 1;
+					}
+					}
+				})
+				} else {
+					if (this.active==1){
+						if(this.apiworkerObj.length==0){
+							this.$message.warning("请添加作业人员");
+							return
+						}
+					}
+					this.active = 2;
+
+				}
+				// this.stepSuc.push(++this.active)
+			},
+
+			//选择人员后，调出该人员的所有证书
+			selectWorker() {
+				this.$API.hrm.certificate.list
+					.req({employee__user: this.formworker.worker, page: 0})
+					.then((res) => {
+						this.certificatesOptions = res;
+						console.log(res);
+					});
+			},
+			//作业人员列表
+
+			getworkerList() {
+				this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apiworkerObj = res;
+					console.log(res);
+				});
+			},
+			//创建作业人员，显示Form
+			addworker() {
+				this.workerdialog = true;
+
+				this.formworker = Object.assign({}, defaultformworker);
+			},
+
+			//删除作业人员
+			delWorker(row) {
+				this.$API.opm.worker.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("作业人员删除成功");
+						this.getworkerList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+			//提交作业人员信息
+			submitWorker() {
+				this.formworker.opl = this.oplId;
+				this.$refs.workerForm.validate(async (valid) => {
+
+					this.$API.opm.worker.create
+						.req(this.formworker)
+						.then((res) => {
+							this.$message.success("创建作业人员成功");
+							this.getworkerList();
+							this.workerdialog = false;
+						})
+						.catch((err) => {
+							return err;
+						});
+				});
+			},
+
+			//气体检测记录列表
+			getgasList() {
+				this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => {
+					this.apigasObj = res;
+					console.log(res);
+				});
+			},
+
+			//创建气体检测记录，显示Form
+			addgas() {
+				this.gasdialog = true;
+				this.formgas = Object.assign({}, defaultformgas);
+			},
+
+			//提交气体检测记录
+			submitgas() {
+				this.formgas.opl = this.oplId;
+				this.$refs.gasForm.validate(async (valid) => {
+
+					this.$API.opm.gas.create
+						.req(this.formgas)
+						.then((res) => {
+							this.$message.success("创建气体检测记录成功");
+							this.getgasList();
+							this.gasdialog = false;
+
+						})
+						.catch((err) => {
+							return err;
+						});
+
+				});
+			},
+
+			//删除气体检测记录
+			delgas(row) {
+				this.$API.opm.gas.delete
+					.req(row.id)
+					.then((res) => {
+						this.$message.success("气体检测记录删除成功");
+						this.getgasList()
+						return res;
+					})
+					.catch((err) => {
+						return err;
+					});
+			},
+
+			//渲染工单提交按钮
 			getInit() {
 				this.$API.wf.workflow.initkey.req('opl_space').then((res) => {
 					this.initForm = res;
 				});
 			},
 
-    //根据oplId，查许可证
-    getData() {
-      this.$API.opm.opl.read.req(this.oplId).then((res) => {
-        this.form = res;
-
-        this.oplcateId = res.cate;
-        this.operationId = res.operation;
-        this.getOperation();
-        this.getOplcates();
-      });
-    },
-    //根据operationId，查作业信息
-
-    getOperation() {
-      this.$API.opm.operation.read.req(this.operationId).then((res) => {
-        this.form.start_time = res.start_time; //作业开始时间
-        this.form.end_time = res.end_time; //作业结束时间
-
-        console.log(res);
-      });
-    },
-    //作业部门
-    getDept() {
-      this.$API.system.dept.list.req({ page: 0 }).then((res) => {
-        this.deptoptions = genTree(res);
-      });
-    },
-
-    //作业负责人、作业监护人
-    getUser() {
-      this.$API.system.user.list.req({ page: 0 }).then((res) => {
-        this.useroptions = res;
-      });
-    },
-    //作业
-
-    //根据作业许可证ID获取，风险、措施
-    getOplcates() {
-      this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
-        console.log(res); //
-        this.pagtitle = res.name;
-        this.risklist = res.risk_options_; //风险缝隙
-        this.measurelist = res.measure_options_; //控制措施
-      });
-    },
-    handleStep(val) {
-      //点击步骤条
-      if (this.stepSuc.includes(val) === true) {
-        this.active = val;
-      }
-    },
-    //组件点击上一步
-    handleLastStep() {
-      if (--this.active === 0) {
-        this.active = 0;
-      }
-    },
-    //组件点击下一步
-    handleNextStep() {
-      if (this.active == 0) {
-        console.log(this.oplId);
-        //如果是创建许可证书
-        if (this.oplId == "" && this.issave == false) {
-          //基本信息提交
-          debugger;
-          this.form.cate = this.oplcateId;
-          this.form.operation = this.operationId;
-          console.log(this.form);
-          this.$API.opm.opl.create
-            .req(this.form)
-            .then((res) => {
-              this.$emit("success", this.form, this.mode);
-              this.$message.success("创建成功");
-              this.issave = true;
-              this.active = 1;
-              this.oplId = res.id;
-              this.getworkerList(res.id);
-              this.getgasList(res.id);
-              return res;
-            })
-            .catch((err) => {
-              return err;
-            });
-        } else if (this.oplId != "") {
-          this.$API.opm.opl.update.req(this.form.id, this.form).then(() => {
-            this.$message.success("基本修改成功！");
-            this.issave = true;
-            this.active = 1;
-            this.getworkerList(this.form.id);
-           this.getgasList(this.form.id);
-          });
-        } else {
-          this.active = 1;
-        }
-      } else {
-        this.active = 2;
-       
-      }
-      // this.stepSuc.push(++this.active)
-    },
-
-   //选择人员后，调出该人员的所有证书
-    selectWorker() {
-      this.$API.hrm.certificate.list
-        .req({ employee__user: this.formworker.worker, page: 0 })
-        .then((res) => {
-          this.certificatesOptions = res;
-          console.log(res);
-        });
-    },
-    //作业人员列表
-
-    getworkerList(id) {
-      this.$API.opm.worker.list.req({ opl: id, page: 0 }).then((res) => {
-        this.apiworkerObj = res;
-        console.log(res);
-      });
-    },
-    //创建作业人员，显示Form
-    addworker() {
-      this.workerdialog = true;
-
-      this.formworker = Object.assign({}, defaultformworker);
-    },
-   
-    //删除作业人员
-    delWorker(row) {
-      this.$API.opm.worker.delete
-        .req(row.id)
-        .then((res) => {
-          this.$message.success("作业人员删除成功");
-         	this.$refs.workerTable.refresh();
-          return res;
-        })
-        .catch((err) => {
-          return err;
-        });
-    },
-    //提交作业人员信息
-    submitWorker() {
-      this.formworker.opl = this.oplId;
-      this.$refs.workerForm.validate(async (valid) => {
-      
-          this.$API.opm.worker.create
-            .req(this.formworker)
-            .then((res) => {
-              this.$message.success("创建作业人员成功");
-              this.workerdialog = false;
-             	this.$refs.workerTable.refresh();
-            })
-            .catch((err) => {
-              return err;
-            });
-      
-      });
-    },
-    //气体检测记录列表
-
-    getgasList(id) {
-      this.$API.opm.gas.list.req({ opl: id, page: 0 }).then((res) => {
-        this.apigasObj = res;
-        console.log(res);
-      });
-    },
-    //创建气体检测记录，显示Form
-    addgas() {
-      this.gasdialog = true;
-      this.formgas = Object.assign({}, defaultformgas);
-    },
-
-    //提交气体检测记录
-    submitgas() {
-      this.formgas.opl = this.oplId;
-      this.$refs.gasForm.validate(async (valid) => {
-       
-          this.$API.opm.gas.create
-            .req(this.formgas)
-            .then((res) => {
-              this.$message.success("创建气体浓度检测记录成功");
-              this.gasdialog = false;
-              	this.$refs.gasTable.refresh();
-             
-            })
-            .catch((err) => {
-              return err;
-            });
-       
-      });
-    },
-     //删除气体检测记录
-    delgas(row) {
-      this.$API.opm.gas.delete
-        .req(row.id)
-        .then((res) => {
-          this.$message.success("气体浓度检测记录删除成功");
-         	this.$refs.gasTable.refresh();
-          return res;
-        })
-        .catch((err) => {
-          return err;
-        });
-    },
-    
-    //提交,创建工单
+			//提交,创建工单
 			submitTicketCreate(id) {
 				let ticket = {};
 				ticket.workflow = this.initForm.workflow;
@@ -894,16 +888,16 @@ export default {
 				}).catch(e=>{this.tLoading=false});
 			},
 
-    //退出界面
-    submitOut(){
-      this.$router.push({
-        name: "opl",
-        query: {
-          operationid: this.$route.query.id,//作业ID
-         
-        },
-      });
-    }
-  },
-};
-</script>
\ No newline at end of file
+			//退出界面
+			submitOut() {
+				this.$router.push({
+					name: "opl",
+					query: {
+						id: this.operationId,//作业ID
+
+					},
+				});
+			}
+		},
+	};
+</script>
diff --git a/src/views/opm/usecl.vue b/src/views/opm/usecl.vue
index 9b91253e..fc7fded6 100644
--- a/src/views/opm/usecl.vue
+++ b/src/views/opm/usecl.vue
@@ -25,13 +25,13 @@
         :model="form"
         :rules="rules"
         label-width="110px"
-        style="margin: 40px 40px 40px 40px"
+        style="margin: 40px 40px 0px 40px"
       >
         <el-row>
           <el-col :md="12" :sm="12" :xs="24">
             <el-form-item label="关联作业">
               <el-input
-                v-model="operationId"
+                v-model="form.name"
                 type="text"
                 :disabled="true"
               ></el-input>
@@ -47,7 +47,7 @@
             </el-form-item>
           </el-col>
           <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业开始时间">
+            <el-form-item label="作业开始时间" prop="start_time">
               <el-date-picker
                 v-model="form.start_time"
                 type="datetime"
@@ -56,7 +56,7 @@
             </el-form-item>
           </el-col>
           <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业结束时间">
+            <el-form-item label="作业结束时间" prop="end_time">
               <el-date-picker
                 v-model="form.end_time"
                 type="datetime"
@@ -67,7 +67,7 @@
        
 
           <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业部门">
+            <el-form-item label="作业部门" prop="dept_do">
               <el-cascader
                 placeholder="选择作业部门"
                 getCheckedNodes="true"
@@ -86,7 +86,7 @@
           
          
           <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="作业监护人">
+            <el-form-item label="作业监护人" prop="monitor">
               <el-select v-model="form.monitor" placeholder="选择作业监护人">
                 <el-option
                   v-for="item in useroptions"
@@ -98,7 +98,7 @@
             </el-form-item>
           </el-col>
              <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="供电制式">
+            <el-form-item label="供电制式" >
               <el-select v-model="form.level" placeholder="选择供电制式">
                 <el-option
                   v-for="item in leveloptions"
@@ -152,18 +152,6 @@
                 placeholder="选择开始时间"
               />
             </el-form-item>
-          </el-col>
-           <el-col :md="12" :sm="12" :xs="24">
-            <el-form-item label="验收人签名">
-              <el-select v-model="form.charger" placeholder="选择验收人签名">
-                <el-option
-                  v-for="item in useroptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
           </el-col>
            <el-col :md="12" :sm="12" :xs="24">
             <el-form-item label="用电功率">
@@ -272,16 +260,12 @@
           </el-col>
 		  !-->
         </el-row>
-        <el-row>
-          <el-col :md="24" :sm="12" :xs="24">
-            <el-form-item>
-              <el-button style="margin-top: 12px" @click="handleNextStep"
-                >下一步</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
+      <div style="margin-bottom: 20px; text-align:center">
+				<el-button type="primary" plain @click="handleNextStep"
+							>下一步
+							</el-button>
+			</div>
     </el-main>
 
     <!--作业人员!-->
@@ -340,7 +324,7 @@
           </template>
         </el-table-column>
       </scTable>
-      <sc-dialog v-model="workerdialog" draggable title="选择作业人员">
+      <el-dialog v-model="workerdialog" draggable title="选择作业人员">
         <el-form
           ref="workerForm"
           :model="formworker"
@@ -407,11 +391,21 @@
           <el-button @click="dialogcart = false">取 消</el-button>
           <el-button type="primary" @click="submitWorker">确 定</el-button>
         </template>
-      </sc-dialog>
-      <el-button style="margin-top: 12px" @click="handleLastStep"
-        >上一步</el-button
-      >
-      <el-button style="margin-top: 12px" @click="submitOut">退出</el-button>
+      </el-dialog>
+			<div style="margin-top:20px;text-align:center">
+				<el-button @click="handleLastStep" style="margin-right:4px">上一步</el-button>
+			<el-button
+				:loading="tLoading"
+				v-for=" item in initForm.transitions"
+				:key="item.id"
+				type="primary"
+				@click="submitTicketCreate(item.id)"
+				style="margin-right:4px"
+			>{{item.name}}
+			</el-button>
+			<el-button @click="submitOut" type="warning">退出</el-button>
+
+			</div>
      
      
     </el-main>
@@ -441,7 +435,7 @@ import { genTree } from "@/utils/verificate";
 const defaultformworker = {
   id: "",
   worker: null,
-  duty: null,
+  duty: "作业人员",
   certificates: [],
   opl: "",
 };
@@ -473,7 +467,7 @@ export default {
         cate: "",
         risks_checked: [],
       },
-
+      initForm: {},
       operationId: "",
       oplcateId: "",
       oplId: "",
@@ -507,6 +501,32 @@ export default {
         true: "正常",
         false: "不正常",
       },
+      rules: {
+					start_time: [
+						{required: true, message: '请选择'}
+					],
+					end_time: [
+						{required: true, message: '请选择'}
+					],
+					level: [
+						{required: true, message: '请选择'}
+					],
+					dept_do: [
+						{required: true, message: '请选择'}
+					],
+					charger: [
+						{required: true, message: '请选择'}
+					],
+					monitor: [
+						{required: true, message: '请选择'}
+					],
+					risks_checked: [
+						{required: true, message: '请选择'}
+					],
+					measures_checked: [
+						{required: true, message: '请选择'}
+					],
+				}
     };
   },
   mounted() {
@@ -514,9 +534,8 @@ export default {
     this.oplcateId = this.$route.query.oplcateId; //作业许可证种类ID
     this.oplId = this.$route.query.oplId; //许可证ID
     this.getoplData();
-
+    this.getInit();
     this.getDept();
-    this.getUser();
   },
   methods: {
     
@@ -685,7 +704,27 @@ export default {
       
       });
     },
-    
+    //渲染工单提交按钮
+			getInit() {
+				this.$API.wf.workflow.initkey.req('opl_usecl').then((res) => {
+					this.initForm = res;
+				});
+			},
+
+    //提交,创建工单
+			submitTicketCreate(id) {
+				let ticket = {};
+				ticket.workflow = this.initForm.workflow;
+				ticket.ticket_data = {opl: this.oplId};
+				ticket.transition = id;
+				ticket.title = this.form.name + '-申请';
+				this.tLoading = true
+				this.$API.wf.ticket.create.req(ticket).then((res) => {
+					this.tLoading = false
+					this.$message.success("提交成功");
+					this.submitOut()
+				}).catch(e=>{this.tLoading=false});
+			},
     //退出界面
     submitOut(){
       this.$router.push({

From 9dba0cde273dc5a140249ec440229bdf1dfde95e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 13 Oct 2022 16:29:34 +0800
Subject: [PATCH 6/6] =?UTF-8?q?pc=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/opm/clear.vue       | 14 +-------------
 src/views/opm/space.vue       |  6 +++---
 src/views/opm/usecl.vue       |  2 +-
 src/views/ops/log_request.vue | 11 +++++++++--
 src/views/ops/thirdLogs.vue   |  2 +-
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/views/opm/clear.vue b/src/views/opm/clear.vue
index 1bd3a417..7750da4f 100644
--- a/src/views/opm/clear.vue
+++ b/src/views/opm/clear.vue
@@ -64,19 +64,6 @@
 							/>
 						</el-form-item>
 					</el-col>
-					<el-col :md="12" :sm="12" :xs="24">
-						<el-form-item label="作业级别" prop="level">
-							<el-select v-model="form.level" placeholder="选择作业级别">
-								<el-option
-									v-for="item in leveloptions"
-									:key="item.id"
-									:label="item.name"
-									:value="item.name"
-								/>
-							</el-select>
-						</el-form-item>
-					</el-col>
-
 					<el-col :md="12" :sm="12" :xs="24" >
 						<el-form-item label="作业部门" prop="dept_do">
 							<el-cascader
@@ -552,6 +539,7 @@
 					operation: "",
 					cate: "",
 					risks_checked: [],
+					measures_checked: []
 				},
 				initForm: {},
 				operationId: "",
diff --git a/src/views/opm/space.vue b/src/views/opm/space.vue
index 270b4f5b..17671cc1 100644
--- a/src/views/opm/space.vue
+++ b/src/views/opm/space.vue
@@ -561,9 +561,9 @@
 				oplcateCode: "",
 				oplId: "",
 				leveloptions: [
-					{id: 10, name: "特殊动火"},
-					{id: 20, name: "一级动火"},
-					{id: 30, name: "二级动火"},
+					{id: "特级", name: "特级"},
+					{id: "一级", name: "一级"},
+					{id: "二级", name: "二级"},
 				],
 				deptoptions: [],
 				useroptions: [],
diff --git a/src/views/opm/usecl.vue b/src/views/opm/usecl.vue
index fc7fded6..46739b45 100644
--- a/src/views/opm/usecl.vue
+++ b/src/views/opm/usecl.vue
@@ -565,7 +565,7 @@ export default {
       this.$API.opm.operation.read.req(this.operationId).then((res) => {
         this.form.start_time = res.start_time; //作业开始时间
         this.form.end_time = res.end_time; //作业结束时间
-
+        this.form.name = res.name;
         console.log(res);
       });
     },
diff --git a/src/views/ops/log_request.vue b/src/views/ops/log_request.vue
index abfbfe68..17c50b7b 100644
--- a/src/views/ops/log_request.vue
+++ b/src/views/ops/log_request.vue
@@ -16,8 +16,15 @@
       <div class="right-panel">
         <div class="right-panel-search">
           <el-input
-            v-model="query.id"
-            placeholder="logId"
+            v-model="query.status_code"
+            placeholder="200"
+            clearable
+            @keyup.enter="handleQuery"
+          ></el-input>
+          <el-input
+            v-model="query.search"
+            placeholder="地址/View"
+            clearable
             @keyup.enter="handleQuery"
           ></el-input>
           <el-button
diff --git a/src/views/ops/thirdLogs.vue b/src/views/ops/thirdLogs.vue
index 8cd248c9..54fecffe 100644
--- a/src/views/ops/thirdLogs.vue
+++ b/src/views/ops/thirdLogs.vue
@@ -13,7 +13,7 @@
       </div>
       <div class="left-panel">
         <div class="right-panel-search">
-          <el-input v-model="query.id" placeholder="logId" clearable></el-input>
+          <el-input v-model="query.search" placeholder="logId" clearable></el-input>
           <el-button
             type="primary"
             icon="el-icon-search"