diff --git a/src/views/couplet/fence/container.vue b/src/views/couplet/fence/container.vue
index 05e8a42..757a77d 100644
--- a/src/views/couplet/fence/container.vue
+++ b/src/views/couplet/fence/container.vue
@@ -112,7 +112,7 @@ export default {
         this.$message("覆盖物对象绘制完成");
         fenceUpdate(this.drawnPoints).then(res=>{
           this.$message.success("编辑成功")
-          this.$router.push({path: '/business/fence/fence'})
+          this.$router.push({path: '/couplet/fence/fence'})
         })
       }
     },
diff --git a/src/views/couplet/fence/index.html b/src/views/couplet/fence/index.html
deleted file mode 100644
index ec3472c..0000000
--- a/src/views/couplet/fence/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <meta
-    name="viewport"
-    content="initial-scale=1.0, user-scalable=no, width=device-width"
-  />
-  <title>HELLO, AMAP!</title>
-  <style>
-    html,
-    body,
-    #container {
-      width: 100%;
-      height: 100%;
-    }
-  </style>
-</head>
-<body>
-<div id="container"></div>
-</body>
-</html>
diff --git a/src/views/couplet/fence/index.vue b/src/views/couplet/fence/index.vue
index d2d4c13..1db494e 100644
--- a/src/views/couplet/fence/index.vue
+++ b/src/views/couplet/fence/index.vue
@@ -52,17 +52,17 @@
         </template>
       </el-table-column>
       <el-table-column label="维护人" prop="maintainerName" width="100"/>
+
+      <el-table-column
+        label="出行状态">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px" v-if="scope.row.fenceCondition == 0">驶入</span>
+          <span style="margin-left: 10px" v-if="scope.row.fenceCondition == 1">驶出</span>
+        </template>
+      </el-table-column>
       <el-table-column label="围栏标识" prop="logoName" width="100"/>
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['business:fence:fenceUpdate']"
-            icon="el-icon-edit"
-            size="mini"
-            type="text"
-            @click="handleQueryFence(scope.row)"
-          >查询围栏
-          </el-button>
           <el-button
             v-hasPermi="['business:fence:fenceUpdate']"
             icon="el-icon-edit"
@@ -97,6 +97,14 @@
             @click="handleFenceDelete(scope.row)"
           >删除
           </el-button>
+          <el-button
+            v-hasPermi="['business:fence:fenceDelete']"
+            icon="el-icon-edit"
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+          >修改电子围栏
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -111,6 +119,8 @@
         :total="400">
       </el-pagination>
     </div>
+
+
     <!-- Form -->
     <el-dialog title="新增电子围栏" :visible.sync="dialogFormVisible">
       <el-form :model="fenceInsertRequest">
@@ -127,7 +137,6 @@
         <template>
           <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
           <div style="margin: 15px 0;"></div>
-
           <el-checkbox-group v-model="fenceInsertRequest.logoIds" @change="handleChange">
             <el-checkbox v-for="item in logo" :key="item.logoId"  :label="item.logoId"  >{{item.logoName}}</el-checkbox>
           </el-checkbox-group>
@@ -138,30 +147,46 @@
         <el-button type="primary" @click="addFence">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="修改电子围栏" :visible.sync="dialogFormVisible">
-      <el-form :model="fenceInsertRequest">
-        <el-form-item label="围栏名称" :label-width="formLabelWidth">
-          <el-input v-model="fenceInsertRequest.fenceName" autocomplete="off"></el-input>
-        </el-form-item>
 
+
+
+    <el-dialog title="修改电子围栏" :visible.sync="dialogFormVisible2">
+      <el-form :model="fenceUpdateRequest">
+        <el-form-item label="围栏编号" :label-width="formLabelWidth">
+          <el-input v-model="fenceUpdateRequest.fenceId" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="围栏名称" :label-width="formLabelWidth">
+          <el-input v-model="fenceUpdateRequest.fenceName" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="经纬度" :label-width="formLabelWidth">
+          <el-input v-model="fenceUpdateRequest.fenceLongitudeLatitude" autocomplete="off"></el-input>
+        </el-form-item>
         <el-form-item label="电子围栏描述信息" :label-width="formLabelWidth">
-          <el-input v-model="fenceInsertRequest.fenceDescription" autocomplete="off"></el-input>
+          <el-input v-model="fenceUpdateRequest.fenceDescription" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="电子围栏创建时间" :label-width="formLabelWidth">
+          <el-input v-model="fenceUpdateRequest.createTime" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="电子围栏修改时间" :label-width="formLabelWidth">
+          <el-input v-model="fenceUpdateRequest.updateTime" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="维护负责人" :label-width="formLabelWidth">
-          <el-input v-model="fenceInsertRequest.maintainerName" autocomplete="off"></el-input>
+          <el-input v-model="fenceUpdateRequest.maintainerName" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" :label-width="formLabelWidth">
+          <el-input v-model="fenceUpdateRequest.fenceState" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="运行状态" :label-width="formLabelWidth">
+          <el-select v-model="fenceUpdateRequest.fenceCondition" placeholder="请选择运行状态">
+            <el-option  label="驶入" value="0"></el-option>
+            <el-option  label="驶出" value="1"></el-option>
+          </el-select>
         </el-form-item>
-        <template>
-          <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
-          <div style="margin: 15px 0;"></div>
 
-          <el-checkbox-group v-model="fenceInsertRequest.logoIds" @change="handleChange">
-            <el-checkbox v-for="item in logo" :key="item.logoId"  :label="item.logoId"  >{{item.logoName}}</el-checkbox>
-          </el-checkbox-group>
-        </template>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addFence">确 定</el-button>
+        <el-button type="primary" @click="updateFence">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -170,7 +195,7 @@
 </template>
 
 <script>
-import {fenceList, changeFenceStatus, queryByLogo, fenceDelete, fenceAdd} from "@/api/couplet/fence";
+import {fenceList, changeFenceStatus, queryByLogo, fenceDelete, fenceAdd, fenceUpdate} from "@/api/couplet/fence";
 import path from "path";
 export default {
   components: {},
@@ -184,6 +209,7 @@ export default {
         logoIds:[]
       },
       dialogFormVisible: false,
+      dialogFormVisible2: false,
       formLabelWidth: '120px',
       checkAll: false,
       logo: [
@@ -321,8 +347,21 @@ export default {
     handleFenceUpdate(row){
       this.$router.push({path: '/business/fence/container', query: {drawGraph: row}})
     },
-    handleQueryFence(){
+    handleUpdate(row){
+      this.dialogFormVisible2=true;
+      this.fenceUpdateRequest=row
 
+    },
+    /**
+     * 修改电子围栏
+     */
+    updateFence(){
+      fenceUpdate(this.fenceUpdateRequest).then(
+        res=>{
+          this.$message.success("修改成功")
+          this.dialogFormVisible2=false;
+        }
+      )
     }
   },
   created() {
