From c5695e0dad25a64328862f8f0c61e2797bc9fa55 Mon Sep 17 00:00:00 2001
From: lll <you@example.com>
Date: Mon, 13 Nov 2023 15:54:39 +0800
Subject: [PATCH] 132

---
 src/App.vue                  | 5 ++++-
 src/components/AddPolicy.vue | 6 ------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d98fe56..7912b87 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -268,7 +268,7 @@ export default {
 .el-form-item label {
   color: white;
 }
-.el-dialog{
+.el-dialog {
   margin-top: 8vh !important;
 }
 .el-dialog,
@@ -313,4 +313,7 @@ export default {
 .el-dialog {
   pointer-events: auto;
 }
+.el-dialog {
+  margin-top: 8vh !important;
+}
 </style>
diff --git a/src/components/AddPolicy.vue b/src/components/AddPolicy.vue
index b1bfe5c..bea9307 100644
--- a/src/components/AddPolicy.vue
+++ b/src/components/AddPolicy.vue
@@ -593,13 +593,7 @@ export default {
         clgl_ckwg: "",
         clgl_ckwk: "",
         clgl_ckip: "",
-<<<<<<< HEAD
         clgl_wdyml: "拒绝",
-=======
-        clgl_wdyml: "",
-        dlport: "",
-        wdyml: "",
->>>>>>> 64c869237fcdd813721fc025060f87d2262701e7
         clgl_rkip1: "",
         clgl_rkip2: "",
         clgl_rkip3: "",