From 5747259c307d17a0c1212d960382921b27a3416a Mon Sep 17 00:00:00 2001
From: 86191 <2160251938@qq.com>
Date: Wed, 25 Sep 2024 20:25:30 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E5=9B=B4=E6=A0=8F=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/fence/fence.js    | 10 ++++--
 src/views/fence/group.vue | 28 +++++++--------
 src/views/fence/list.vue  | 71 ++++++++++++++++++++++++++++-----------
 3 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/src/api/fence/fence.js b/src/api/fence/fence.js
index 47eb96c..a3a4463 100644
--- a/src/api/fence/fence.js
+++ b/src/api/fence/fence.js
@@ -36,10 +36,14 @@ export function updfence(data) {
 
 //删除
 export function delElectronById(id) {
+  // return request({
+  //   url: '/fence/fence/delElectronById/'+id,
+  //   method: 'post',
+  //   data
+  // })
   return request({
-    url: '/fence/fence/delElectronById/'+id,
-    method: 'post',
-    data
+    url: '/fence/fence/' + id,
+    method: 'DELETE'
   })
 }
 
diff --git a/src/views/fence/group.vue b/src/views/fence/group.vue
index 67f8d52..85068fb 100644
--- a/src/views/fence/group.vue
+++ b/src/views/fence/group.vue
@@ -157,20 +157,20 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-form-item label="围栏类型" prop="noticeType">
-              <el-select v-model="form.groupType" placeholder="请选择围栏类型">
-                <el-option
-                  v-for="dict in dict.type.sys_fence_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="20">-->
+<!--            <el-form-item label="围栏类型" prop="noticeType">-->
+<!--              <el-select v-model="form.groupType" placeholder="请选择围栏类型">-->
+<!--                <el-option-->
+<!--                  v-for="dict in dict.type.sys_fence_type"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
           <el-col :span="20">
             <el-form-item label="围栏组状态">
diff --git a/src/views/fence/list.vue b/src/views/fence/list.vue
index 17701f1..e16d3a8 100644
--- a/src/views/fence/list.vue
+++ b/src/views/fence/list.vue
@@ -36,6 +36,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:notice:add']"
@@ -59,6 +60,17 @@
         >修改
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['fence:fence:remove']"
+        >删除</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -66,7 +78,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['vehicles:sysCorpuscleFence:export']"
+          v-hasPermi="['fence:fence:export']"
         >导出</el-button>
       </el-col>
 
@@ -80,6 +92,7 @@
       tooltip-effect="dark"
       style="width: 100%"
       @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="id"
         width="180">
@@ -109,32 +122,32 @@
           <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column
-        label="围栏地理位置"
-        width="180">
-        <template slot-scope="scope">
-          <span style="margin-left: 10px">{{ scope.row.longitudeLatitude}}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        label="围栏位置"-->
+<!--        width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span style="margin-left: 10px">{{ scope.row.longitudeLatitude}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column label="基操">
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button
             type="warning"
             class="el-icon-view"
-            @click="lookFence(scope.row)">回显围栏</el-button>
+            @click="lookFence(scope.row)"></el-button>
           <el-button
             type="success"
             class="el-icon-map-location"
-            @click="handleFence(scope.row)">绘制电子围栏</el-button>
+            @click="handleFence(scope.row)">绘制围栏</el-button>
           <el-button
             type="primary"
             size="mini"
-            @click="handleUpdate(scope.row)">修改围栏</el-button>
+            @click="handleUpdate(scope.row)">修改</el-button>
           <el-button
             size="mini"
             type="danger"
-            @click="handleDelete(scope.row)">删除围栏</el-button>
+            @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -192,9 +205,10 @@
 <script>
 
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {addfence, findElectronicByid, listFence, updfence} from "@/api/fence/fence";
+import { addfence, delElectronById, findElectronicByid, listFence, updfence } from '@/api/fence/fence'
 import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from "@/api/system/dept";
 
+
 export default {
   name: "list",
   dicts: ['sys_normal_disable','sys_fence_type','sys_notice_status'],
@@ -202,6 +216,8 @@ export default {
     return {
       // 非单个禁用
       single: true,
+      // 非多个禁用
+      multiple: true,
       showSearch: true,
       fenceList:[],
       queryParams:{},
@@ -248,18 +264,31 @@ export default {
         path:'map',
         query:{id:row.id,longitudeLatitude:row.longitudeLatitude,open:0}
       })
+      alert("位置："+row.longitudeLatitude)
     },
+    //删除电子围栏
     handleDelete(row){
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function () {
-        return delDept(row.deptId);
+      // this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function () {
+      //   return delDept(row.deptId);
+      // }).then(() => {
+      //   this.getList();
+      //   this.$modal.msgSuccess("删除成功");
+      // }).catch(() => {
+      // });
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除电子围栏编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delElectronById(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
+      }).catch(() => {});
     },
 
-// 取消按钮
+    // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
@@ -290,7 +319,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('vehicles/sysCorpuscleFence/export', {
+      this.download('fence/fence/export', {
         ...this.queryParams
       }, `vehicle_fence.xlsx`)
     },
@@ -334,4 +363,6 @@ export default {
     },
   }
 };
+
+
 </script>