From ac19ae903dd740bdaf1499ae40ef4039fdb4e6ad Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Fri, 31 Mar 2023 22:00:21 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

---
 src/views/activity/components/polylinePlot.vue |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/views/activity/components/polylinePlot.vue b/src/views/activity/components/polylinePlot.vue
index 5de432e..191de4a 100644
--- a/src/views/activity/components/polylinePlot.vue
+++ b/src/views/activity/components/polylinePlot.vue
@@ -52,6 +52,22 @@
             chooseColor: '#1CA085',
             policeIconId: {},
             lineEditVisible: false,
+            predefineColors: [
+                '#ff4500',
+                '#ff8c00',
+                '#ffd700',
+                '#90ee90',
+                '#00ced1',
+                '#1e90ff',
+                '#c71585',
+                'rgba(255, 69, 0, )',
+                'rgb(255, 120, 0)',
+                'hsv(51, 100, 98)',
+                'hsva(120, 40, 94)',
+                'hsl(181, 100%, 37%)',
+                'hsla(209, 100%, 56%)',
+                '#c7158577'
+            ],
         }
     },
 
@@ -112,13 +128,20 @@
 
         // 删除巡逻路线
         deleteLine () {
-            this.deleteActivityCar(this.policeIconId)
-            this.lineEditVisible = false
+            this.$confirm('确定要删除吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+                customClass: 'draw-delete-confirm'
+            }).then(() => {
+                this.deleteActivityCar(this.policeIconId)
+            }).catch(() => { })
         },
 
         // 删除警车
         deleteActivityCar (id) {
             deleteActivityCar(id).then(res => {
+                this.lineEditVisible = false
                 if (res.data.success) {
                     this.$message({
                         message: '删除成功',

--
Gitblit v1.9.3