diff --git a/.env.development b/.env.development
index d21bdf88..44539dd5 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,6 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
 # 接口地址
 #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
 #VUE_APP_WS_API = 'ws://localhost:8000'
-#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
 VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
 #VUE_APP_BASEURL = http://127.0.0.1:8000
 
diff --git a/src/config/route.js b/src/config/route.js
index 56d2f1ac..0755f941 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -146,103 +146,6 @@ const routes = [
       }
     ]
   },
-  {
-    "name": "wf",
-    "path": "/wf",
-    "meta": {
-      "title": "工单",
-      "icon": "el-icon-circle-check-filled",
-      "type": "menu",
-      "perms": ["wf"]
-    },
-    "children": [
-      {
-        "name": "workflow",
-        "path": "/wf/workflow",
-        "meta": {
-          "title": "工作流",
-          "icon": "el-icon-guide",
-          "perms": ["workflow"]
-        },
-        "component": "wf/workflow"
-      },
-      {
-        "name": "configuration",
-        "path": "/wf/configuration",
-        "meta": {
-          "title": "工作流配置",
-          "icon": "el-icon-menu",
-          "hidden": true,
-          "perms": ["workflow"]
-        },
-        "component": "wf/configuration"
-      }
-      ,
-      {
-        "name": "allwork",
-        "path": "/wf/allwork",
-        "meta": {
-          "title": "全部工单",
-          "icon": "el-icon-folder",
-          "perms": ["allwork"]
-         
-        },
-        "component": "wf/allwork"
-      } ,
-      {
-        "name": "ownerwork",
-        "path": "/wf/ownerwork",
-        "meta": {
-          "title": "我创建的",
-          "icon": "el-icon-folder-add",
-          "perms": ["ownerwork"]
-        },
-        "component": "wf/ownerwork"
-      }
-      ,
-      
-      {
-        "name": "duty",
-        "path": "/wf/dutywork",
-        "meta": {
-          "title": "待办工单",
-          "icon": "el-icon-folder-opened",
-          "perms": ["duty"]
-        },
-        "component": "wf/dutywork"
-      },
-      {
-        "name": "worked",
-        "path": "/wf/worked",
-        "meta": {
-          "title": "我处理的",
-          "icon": "el-icon-expand",
-          "perms": ["worked"]
-        },
-        "component": "wf/worked"
-      },
-      {
-        "name": "ccwork",
-        "path": "/wf/ccwork",
-        "meta": {
-          "title": "抄送我的",
-          "icon": "el-icon-edit-pen",
-          "perms": ["ccwork"]
-        },
-        "component": "wf/ccwork"
-      },
-      {
-        "name": "ticketdetail",
-        "path": "/wf/ticketdetail",
-        "meta": {
-          "title": "工单详情",
-          "icon": "el-icon-menu",
-          "hidden": true,
-        },
-        "component": "wf/ticketdetail"
-      },
-    ]
-  },
   {
     "name": "opm",
     "path": "/opm",
@@ -509,6 +412,103 @@ const routes = [
       
     ]
   },
+  {
+    "name": "wf",
+    "path": "/wf",
+    "meta": {
+      "title": "审批",
+      "icon": "el-icon-circle-check-filled",
+      "type": "menu",
+      "perms": ["wf"]
+    },
+    "children": [
+      {
+        "name": "workflow",
+        "path": "/wf/workflow",
+        "meta": {
+          "title": "工作流",
+          "icon": "el-icon-guide",
+          "perms": ["workflow"]
+        },
+        "component": "wf/workflow"
+      },
+      {
+        "name": "configuration",
+        "path": "/wf/configuration",
+        "meta": {
+          "title": "工作流配置",
+          "icon": "el-icon-menu",
+          "hidden": true,
+          "perms": ["workflow"]
+        },
+        "component": "wf/configuration"
+      }
+      ,
+      {
+        "name": "allwork",
+        "path": "/wf/allwork",
+        "meta": {
+          "title": "全部工单",
+          "icon": "el-icon-folder",
+          "perms": ["allwork"]
+         
+        },
+        "component": "wf/allwork"
+      } ,
+      {
+        "name": "ownerwork",
+        "path": "/wf/ownerwork",
+        "meta": {
+          "title": "我创建的",
+          "icon": "el-icon-folder-add",
+          "perms": ["ownerwork"]
+        },
+        "component": "wf/ownerwork"
+      }
+      ,
+      
+      {
+        "name": "duty",
+        "path": "/wf/dutywork",
+        "meta": {
+          "title": "待办工单",
+          "icon": "el-icon-folder-opened",
+          "perms": ["duty"]
+        },
+        "component": "wf/dutywork"
+      },
+      {
+        "name": "worked",
+        "path": "/wf/worked",
+        "meta": {
+          "title": "我处理的",
+          "icon": "el-icon-expand",
+          "perms": ["worked"]
+        },
+        "component": "wf/worked"
+      },
+      {
+        "name": "ccwork",
+        "path": "/wf/ccwork",
+        "meta": {
+          "title": "抄送我的",
+          "icon": "el-icon-edit-pen",
+          "perms": ["ccwork"]
+        },
+        "component": "wf/ccwork"
+      },
+      {
+        "name": "ticketdetail",
+        "path": "/wf/ticketdetail",
+        "meta": {
+          "title": "工单详情",
+          "icon": "el-icon-menu",
+          "hidden": true,
+        },
+        "component": "wf/ticketdetail"
+      },
+    ]
+  },
   {
     "name": "am",
     "path": "/am",
diff --git a/src/views/opm/fire.vue b/src/views/opm/fire.vue
index 0a319be2..772f921d 100644
--- a/src/views/opm/fire.vue
+++ b/src/views/opm/fire.vue
@@ -851,7 +851,7 @@
 				this.$router.push({
 					name: "opl",
 					query: {
-						operationid: this.operationId,//作业ID
+						id: this.operationId,//作业ID
 
 					},
 				});
diff --git a/src/views/vm/visit.vue b/src/views/vm/visit.vue
index 298a832f..56b621e5 100644
--- a/src/views/vm/visit.vue
+++ b/src/views/vm/visit.vue
@@ -150,7 +150,12 @@
 				</el-table-column>
 			</scTable>
 		</el-main>
-		
+		<save-dialog
+			v-if="dialog.save"
+			ref="saveDialog"
+			@success="handleSaveSuccess"
+			@closed="dialog.save = false"
+		></save-dialog>
 		<detial-dialog
 			v-if="dialog.save"
 			ref="detialDialog"
diff --git a/src/views/vm/visit_detial.vue b/src/views/vm/visit_detial.vue
index aa40c822..a4568e68 100644
--- a/src/views/vm/visit_detial.vue
+++ b/src/views/vm/visit_detial.vue
@@ -170,7 +170,13 @@
   mounted() {
   },
   methods: {
-<<<<<<< HEAD
+ //显示
+ open(mode = "add") {
+      this.mode = mode;
+      this.visible = true;
+      return this;
+    },
+
     //访客绑卡
     bindCard(row,type){
       debugger;
@@ -199,16 +205,8 @@
 				debugger;
 				this.showBindBlt = data
 			},
-=======
     //访客接待人
->>>>>>> 4aefa086e6f960a40ab46c09769049b2d56ef252
-    //显示
-    open(mode = "add") {
-      this.mode = mode;
-      this.visible = true;
-      return this;
-    },
-
+   
     //表单注入数据
     setData(data) {
       this.loading = true