diff --git a/src/components/TreeView.vue b/src/components/TreeView.vue
index 4dd0c30..8d6ca5d 100644
--- a/src/components/TreeView.vue
+++ b/src/components/TreeView.vue
@@ -55,18 +55,18 @@
       </div>
     </div>
     <div class="pas_params">
-<<<<<<< HEAD
-      <el-dialog title="通道参数设置" :visible.sync="add_passage" width="765px">
+      <el-dialog
+        title="通道参数设置"
+        :visible.sync="add_passage"
+        width="765px"
+        v-loading="Loading"
+      >
         <el-form
           :model="FormData"
           :label-position="labelPosition"
           :rules="rules"
           ref="ruleForm"
         >
-=======
-      <el-dialog title="通道参数设置" :visible.sync="add_passage" width="765px" v-loading="Loading">
-        <el-form :model="FormData" :label-position="labelPosition" :rules="rules" ref="ruleForm">
->>>>>>> e790eeaa2c36e409955946a9227f9ad451338369
           <el-row>
             <el-col :span="12">
               <el-form-item
@@ -395,12 +395,8 @@ export default {
 
   data() {
     return {
-<<<<<<< HEAD
       flag: false,
       gateway: JSON.parse(localStorage.getItem("tree"))[0].label,
-=======
-      Loading: false,
->>>>>>> e790eeaa2c36e409955946a9227f9ad451338369
       FormData: {
         tdpz_tdmc: "有线区Channel1",
         tdpz_td: "网口",
@@ -691,13 +687,11 @@ export default {
       this.FormData.tdpz_qdmc = data.label;
       this.diag_drive = false;
     },
-<<<<<<< HEAD
-=======
     async GetUserAnswer() {
       let answer = await GetUserAnswer({
         mark: "DB-IotLite_yx",
         user_id: "USER202307301109254198",
-      })
+      });
       console.log(answer);
       let obj = JSON.parse(answer.data.data.mark_value);
       console.log(obj);
@@ -725,14 +719,13 @@ export default {
       this.FormData.tdpz_jgsj = obj.tdpz_jgsj;
       this.FormData.tdpz_lxsj = obj.tdpz_lxsj;
       this.FormData.tdpz_cfcs = obj.tdpz_cfcs;
-    }
+    },
   },
   created() {
     this.Loading = true;
     this.GetUserAnswer();
     this.Loading = false;
     // let res2 = GetUserAnswer()
->>>>>>> e790eeaa2c36e409955946a9227f9ad451338369
   },
 
   watch: {