diff --git a/src/components/ChiClone.vue b/src/components/ChiClone.vue
index 43e9266..6e7a492 100644
--- a/src/components/ChiClone.vue
+++ b/src/components/ChiClone.vue
@@ -5,8 +5,15 @@
     <!-- <div v-click-outside="closeMenu"> -->
     <!-- <el-button type="info" plain @click="dialogVisible = true">斥侯MQTT云</el-button> -->
     <div v-show="dialogVisible" class="tree_menu">
-      <el-tree :data="trees" node-key="id" :props="defaultProps" default-expand-all @node-contextmenu="rightClick"
-        @node-click="treeNodeClick" ref="tree">
+      <el-tree
+        :data="trees"
+        node-key="id"
+        :props="defaultProps"
+        default-expand-all
+        @node-contextmenu="rightClick"
+        @node-click="treeNodeClick"
+        ref="tree"
+      >
         <!-- <span class="custom-tree-node" slot-scope="{ node, data }">
           <template v-if="data.editing == 1 && flag">
             <el-input style="width: 260px;" v-model="gateway" @change="changeInput"></el-input>
@@ -22,32 +29,57 @@
         <div class="con_left">
           <h3 class="mqtt" style="margin-top: 20px; color: white">标准 MQTT</h3>
           <el-divider></el-divider>
-          <el-form :model="formData" :label-position="labelPosition" :rules="rules" ref="formData">
+          <el-form
+            :model="formData"
+            :label-position="labelPosition"
+            :rules="rules"
+            ref="formData"
+          >
             <el-row>
               <el-col :span="24">
                 <el-form-item>
-                  <el-checkbox v-model="formData.mqtt_qiyong">启用</el-checkbox>
+                  <el-checkbox v-model="mqtt_qiyong">启用</el-checkbox>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="serveIp">
               <el-col :span="24">
-                <el-form-item label="服务器IP:" :label-width="formLabelWidth" prop="mqtt_ip">
+                <el-form-item
+                  label="服务器IP:"
+                  :label-width="formLabelWidth"
+                  prop="mqtt_ip"
+                >
                   <el-row>
                     <el-col :span="5">
-                      <el-input v-model="mqtt_ip1" style="width: 43px; height: 30px" maxlength="3"></el-input>
+                      <el-input
+                        v-model="mqtt_ip1"
+                        style="width: 43px; height: 30px"
+                        maxlength="3"
+                      ></el-input>
                     </el-col>
                     <el-col :span="1">. </el-col>
                     <el-col :span="5">
-                      <el-input v-model="mqtt_ip2" style="width: 43px; height: 30px" maxlength="3"></el-input>
+                      <el-input
+                        v-model="mqtt_ip2"
+                        style="width: 43px; height: 30px"
+                        maxlength="3"
+                      ></el-input>
                     </el-col>
                     <el-col :span="1">.</el-col>
                     <el-col :span="5">
-                      <el-input v-model="mqtt_ip3" style="width: 43px; height: 30px" maxlength="3"></el-input>
+                      <el-input
+                        v-model="mqtt_ip3"
+                        style="width: 43px; height: 30px"
+                        maxlength="3"
+                      ></el-input>
                     </el-col>
                     <el-col :span="1">.</el-col>
                     <el-col :span="5">
-                      <el-input v-model="mqtt_ip4" style="width: 43px; height: 30px" maxlength="3"></el-input>
+                      <el-input
+                        v-model="mqtt_ip4"
+                        style="width: 43px; height: 30px"
+                        maxlength="3"
+                      ></el-input>
                     </el-col>
                   </el-row>
                 </el-form-item>
@@ -55,31 +87,62 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="网关SN:" :label-width="formLabelWidth" prop="mqtt_wgsn">
-                  <el-input v-model="formData.mqtt_wgsn" placeholder="" style="width: 200px; height: 30px"></el-input>
+                <el-form-item
+                  label="网关SN:"
+                  :label-width="formLabelWidth"
+                  prop="mqtt_wgsn"
+                >
+                  <el-input
+                    v-model="formData.mqtt_wgsn"
+                    placeholder=""
+                    style="width: 200px; height: 30px"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="端口:" :label-width="formLabelWidth" prop="mqtt_port">
-                  <el-input v-model="formData.mqtt_port" placeholder="" style="width: 200px; height: 30px"></el-input>
+                <el-form-item
+                  label="端口:"
+                  :label-width="formLabelWidth"
+                  prop="mqtt_port"
+                >
+                  <el-input
+                    v-model="formData.mqtt_port"
+                    placeholder=""
+                    style="width: 200px; height: 30px"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="Keep Alive(s):" :label-width="formLabelWidth" prop="mqtt_keepalive">
-                  <el-input v-model="formData.mqtt_keepalive" placeholder=""
-                    style="width: 200px; height: 30px"></el-input>
+                <el-form-item
+                  label="Keep Alive(s):"
+                  :label-width="formLabelWidth"
+                  prop="mqtt_keepalive"
+                >
+                  <el-input
+                    v-model="formData.mqtt_keepalive"
+                    placeholder=""
+                    style="width: 200px; height: 30px"
+                  ></el-input>
                   <div class="infos">2-60000</div>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="实施数据发布主题:" :label-width="formLabelWidth" prop="mqtt_keepalive">
-                  <el-input v-model="formData.mqtt_sssjfbzt" placeholder="" style="width: 200px; height: 30px"></el-input>
+                <el-form-item
+                  label="实施数据发布主题:"
+                  :label-width="formLabelWidth"
+                  prop="mqtt_keepalive"
+                >
+                  <el-input
+                    v-model="formData.mqtt_sssjfbzt"
+                    placeholder=""
+                    style="width: 200px; height: 30px"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -105,9 +168,22 @@
                 <el-form-item>
                   <el-row>
                     <el-col :span="12">
-                      <el-form-item label="Qos(MQTT):" :label-width="formLabelWidth" prop="upload_week">
-                        <el-select v-model="formData.mqtt_qos" placeholder="请选择" style="width: 200px">
-                          <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
+                      <el-form-item
+                        label="Qos(MQTT):"
+                        :label-width="formLabelWidth"
+                        prop="upload_week"
+                      >
+                        <el-select
+                          v-model="formData.mqtt_qos"
+                          placeholder="请选择"
+                          style="width: 200px"
+                        >
+                          <el-option
+                            v-for="item in options1"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                          >
                           </el-option>
                         </el-select>
                       </el-form-item>
@@ -144,7 +220,9 @@
         </div>
         <div>
           <div class="con_right">
-            <h3 class="mqtt" style="margin-top: 20px; color: white">标准MQTT采集点</h3>
+            <h3 class="mqtt" style="margin-top: 20px; color: white">
+              标准MQTT采集点
+            </h3>
             <el-divider></el-divider>
 
             <!-- <el-button type="info" plain @click="handleSelect">保存</el-button> -->
@@ -159,16 +237,24 @@
             <el-table-column property="mqtt_cjd_sbmc" label="设备名称">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.mqtt_cjd_sbmc" placeholder="">
-                  <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
-                    :value="option.value"></el-option>
+                  <el-option
+                    v-for="(option, index) in options2"
+                    :key="index"
+                    :label="option.label"
+                    :value="option.value"
+                  ></el-option>
                 </el-select>
               </template>
             </el-table-column>
             <el-table-column property="mqtt_cjd_tagid" label="TagID">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.mqtt_cjd_tagid" placeholder="">
-                  <el-option v-for="(option, index) in options3" :key="index" :label="option.label"
-                    :value="option.value"></el-option>
+                  <el-option
+                    v-for="(option, index) in options3"
+                    :key="index"
+                    :label="option.label"
+                    :value="option.value"
+                  ></el-option>
                 </el-select>
               </template>
             </el-table-column>
@@ -179,8 +265,14 @@
     <!-- 添加按钮下显示出来的弹框信息 -->
     <div>
       <el-dialog title="选择点" :visible.sync="choose_point" width="30%">
-        <el-tree :data="points" show-checkbox node-key="id" :default-expanded-keys="[1, 2]"
-          :default-checked-keys="[3, 4, 5, 6]" :props="defaultProps">
+        <el-tree
+          :data="points"
+          show-checkbox
+          node-key="id"
+          :default-expanded-keys="[1, 2]"
+          :default-checked-keys="[3, 4, 5, 6]"
+          :props="defaultProps"
+        >
         </el-tree>
         <span slot="footer" class="dialog-footer">
           <el-button type="primary" @click="savePoint">保 存</el-button>
@@ -192,16 +284,40 @@
     <!-- 网关信息 -->
     <div class="gateway">
       <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
-        <el-form :model="gateWay" :rules="rulesGate" ref="gateWay" label-width="85px" class="demo-ruleForm">
+        <el-form
+          :model="formData"
+          :rules="rulesGate"
+          ref="gateWay"
+          label-width="85px"
+          class="demo-ruleForm"
+        >
           <el-form-item label="网关名称:" prop="wgpz_wgmc">
-            <el-select v-model="gateWay.wgpz_wgmc" placeholder="请选择" style="width: 200px">
-              <el-option v-for="item in opts1" :key="item.value" :label="item.label" :value="item.value">
+            <el-select
+              v-model="formData.wgpz_wgmc"
+              placeholder="请选择"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in opts1"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="网关ID:" prop="wgpz_wgid">
-            <el-select v-model="gateWay.wgpz_wgid" placeholder="请选择" style="width: 200px">
-              <el-option v-for="item in opts2" :key="item.value" :label="item.label" :value="item.value">
+            <el-select
+              v-model="formData.wgpz_wgid"
+              placeholder="请选择"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in opts2"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -237,16 +353,55 @@ export default {
       gateway: "",
       trees: [],
       user_id: "",
+      mqtt_qiyong: false,
       formData: {
-        mqtt_qiyong: false,
         mqtt_ip: "",
         mqtt_wgsn: "",
         mqtt_port: "",
         mqtt_keepalive: "",
         mqtt_sssjfbzt: "",
-        // mqtt_tls: false,
-        // mqtt_clearsession: false,
-        mqtt_qos: "0",
+        mqtt_qos: "",
+
+        cjdpz_tagid: "",
+        cjdpz_mc: "",
+        cjdpz_dz: "",
+        cjdpz_jcqdz: "",
+        cjdpz_cjsjlx: "",
+        cjdpz_dxsx: "",
+        cjdpz_scms: "",
+        cjdpz_dw: "",
+        wgpz_wgmc: "",
+        wgpz_wgid: "",
+
+        ippz_wllx: "",
+        ippz_ip: "",
+        ippz_zwym: "",
+        ippz_wg: "",
+        ippz_dns: "",
+        ippz_dns_by: "",
+
+        sbpz_sbmc: "",
+        sbpz_kzqxy: "",
+        sbpz_ip: "",
+        sbpz_port: "",
+        sbpz_czdz: "",
+        sbpz_lxzq: "",
+        sbpz_qyhmcj: "",
+        sbpz_qyplcj: "",
+        sbpz_zdplcjs: "",
+        sbpz_cjcgsj: "",
+        sbpz_zqsbonchange: "",
+        sbpz_txsjjg: "",
+        sbpz_xqjcqxr: "",
+        sbpz_bcjcqxr: "",
+
+        cjdpz_tagid: "",
+        cjdpz_mc: "",
+        cjdpz_sjq: "",
+        cjdpz_jcqdz: "",
+        cjdpz_cjsjlx: "",
+        cjdpz_dxsx: "",
+        cjdpz_scms: "",
       },
       mqtt_ip1: "",
       mqtt_ip2: "",
@@ -492,15 +647,13 @@ export default {
             required: true,
             message: "",
             validator: this.validateIp,
-            trigger: "blur"
+            trigger: "blur",
           },
         ],
         mqtt_wgsn: [
           { required: true, message: "请输入网关SN", trigger: "blur" },
         ],
-        mqtt_port: [
-          { required: true, message: "请输入端口", trigger: "blur" },
-        ],
+        mqtt_port: [{ required: true, message: "请输入端口", trigger: "blur" }],
         mqtt_keepalive: [
           { required: true, message: "请输入KeepAlive", trigger: "blur" },
         ],
@@ -561,31 +714,31 @@ export default {
       console.log(res);
       console.log(JSON.parse(res.data.data.data));
       this.trees = JSON.parse(res.data.data.data);
-    })
+    });
   },
   methods: {
     //ip地址验证
     validateIp(rule, value, callback) {
       if (
         this.mqtt_ip1 +
-        "." +
-        this.mqtt_ip2 +
-        "." +
-        this.mqtt_ip3 +
-        "." +
-        this.mqtt_ip4 ===
+          "." +
+          this.mqtt_ip2 +
+          "." +
+          this.mqtt_ip3 +
+          "." +
+          this.mqtt_ip4 ===
         "..."
       ) {
         callback(new Error("请输入IP地址"));
       } else if (
         !/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
           this.mqtt_ip1 +
-          "." +
-          this.mqtt_ip2 +
-          "." +
-          this.mqtt_ip3 +
-          "." +
-          this.mqtt_ip4
+            "." +
+            this.mqtt_ip2 +
+            "." +
+            this.mqtt_ip3 +
+            "." +
+            this.mqtt_ip4
         )
       ) {
         callback(new Error("请输入有效的IP地址"));
@@ -604,27 +757,28 @@ export default {
         }
       });
     },
-    changeInput() {
-      this.flag = false;
-      this.trees[0].label = this.gateway;
-      this.sendTree();
-    },
+    // changeInput() {
+    //   this.flag = false;
+    //   this.trees[0].label = this.gateway;
+    //   this.sendTree();
+    // },
     async rightClick(e, data, node) {
       console.log(node);
       if (data.editing) {
         this.outerVisible = true;
-        let res2 = await GetUserAnswer({
-          mark: "CHGYWG_yx",
-          user_id: this.user_id,
-          // user_id: "USER202307301114011710",
-        });
-        if (res2.data.data && res2.data.state) {
-          console.log(res2.data.data.mark_value);
-          let res3 = JSON.parse(res2.data.data.mark_value);
-          this.gateWay.wgpz_wgid = res3.wgpz_wgid;
-          // console.log(this.formData.wgpz_wgid);
-          this.gateWay.wgpz_wgmc = res3.wgpz_wgmc;
-        }
+        this.GetUserAnswer();
+        // let res2 = await GetUserAnswer({
+        //   mark: "CHGYWG_yx",
+        //   user_id: this.user_id,
+        //   // user_id: "USER202307301114011710",
+        // });
+        // if (res2.data.data && res2.data.state) {
+        //   console.log(res2.data.data.mark_value);
+        //   let res3 = JSON.parse(res2.data.data.mark_value);
+        //   this.gateWay.wgpz_wgid = res3.wgpz_wgid;
+        //   // console.log(this.formData.wgpz_wgid);
+        //   this.gateWay.wgpz_wgmc = res3.wgpz_wgmc;
+        // }
       }
     },
     getParameter(data) {
@@ -664,17 +818,17 @@ export default {
         type: "success",
       });
     },
-    async handleSelect() {
-      let datas = sessionStorage.getItem("CHGYWG_yx");
-      datas = { ...JSON.parse(datas), ...this.tableData[0] };
-      let res = await SaveUserAnswer({
-        mark: "CHGYWG_yx",
-        user_id: this.user_id,
-        mark_value: JSON.stringify(datas),
-      });
-      console.log(res);
-      sessionStorage.setItem("CHGYWG_yx", JSON.stringify(datas));
-    },
+    // async handleSelect() {
+    //   let datas = sessionStorage.getItem("CHGYWG_yx");
+    //   datas = { ...JSON.parse(datas), ...this.tableData[0] };
+    //   let res = await SaveUserAnswer({
+    //     mark: "CHGYWG_yx",
+    //     user_id: this.user_id,
+    //     mark_value: JSON.stringify(datas),
+    //   });
+    //   console.log(res);
+    //   sessionStorage.setItem("CHGYWG_yx", JSON.stringify(datas));
+    // },
     async saveClone() {
       var obj = {
         // mqtt_qiyong: String(Number(this.formData.mqtt_qiyong)),
@@ -694,8 +848,7 @@ export default {
         mqtt_cjd_sbmc: this.tableData[0].mqtt_cjd_sbmc,
         mqtt_cjd_tagid: this.tableData[0].mqtt_cjd_tagid,
       };
-      let datas = sessionStorage.getItem("CHGYWG_yx");
-      datas = { ...JSON.parse(datas), ...obj };
+      let datas = { ...this.formData, ...obj };
       let res = await SaveUserAnswer({
         mark: "CHGYWG_yx",
         user_id: this.user_id,
@@ -714,7 +867,6 @@ export default {
           type: "error",
         });
       }
-
     },
     async GetUserAnswer() {
       this.loading = true;
@@ -734,12 +886,44 @@ export default {
           this.mqtt_ip2 = obj.mqtt_ip.split(".")[1];
           this.mqtt_ip3 = obj.mqtt_ip.split(".")[2];
           this.mqtt_ip4 = obj.mqtt_ip.split(".")[3];
+          this.formData.mqtt_ip = obj.mqtt_ip;
           this.formData.mqtt_wgsn = obj.mqtt_wgsn;
           this.formData.mqtt_port = obj.mqtt_port;
           this.formData.mqtt_keepalive = obj.mqtt_keepalive;
           this.formData.mqtt_sssjfbzt = obj.mqtt_sssjfbzt;
           this.formData.mqtt_qos = obj.mqtt_qos;
         }
+        this.formData.sbpz_sbmc = obj.sbpz_sbmc;
+        this.formData.sbpz_kzqxy = obj.sbpz_kzqxy;
+        this.formData.sbpz_ip = obj.sbpz_ip;
+        this.formData.sbpz_port = obj.sbpz_port;
+        this.formData.sbpz_czdz = obj.sbpz_czdz;
+        this.formData.sbpz_lxzq = obj.sbpz_lxzq;
+        this.formData.sbpz_qyhmcj = obj.sbpz_qyhmcj;
+        this.formData.sbpz_qyplcj = obj.sbpz_qyplcj;
+        this.formData.sbpz_zdplcjs = obj.sbpz_zdplcjs;
+        this.formData.sbpz_cjcgsj = obj.sbpz_cjcgsj;
+        this.formData.sbpz_zqsbonchange = obj.sbpz_zqsbonchange;
+        this.formData.sbpz_txsjjg = obj.sbpz_txsjjg;
+        this.formData.sbpz_xqjcqxr = obj.sbpz_xqjcqxr;
+        this.formData.sbpz_bcjcqxr = obj.sbpz_bcjcqxr;
+        this.formData.wgpz_wgid = obj.wgpz_wgid;
+        this.formData.wgpz_wgmc = obj.wgpz_wgmc;
+
+        this.formData.ippz_wllx = obj.ippz_wllx;
+        this.formData.ippz_ip = obj.ippz_ip;
+        this.formData.ippz_zwym = obj.ippz_zwym;
+        this.formData.ippz_wg = obj.ippz_wg;
+        this.formData.ippz_dns = obj.ippz_dns;
+        this.formData.ippz_dns_by = obj.ippz_dns_by;
+
+        this.formData.cjdpz_tagid = obj.mqtt_cjd_tagid;
+        this.formData.cjdpz_mc = obj.cjdpz_mc;
+        this.formData.cjdpz_sjq = obj.cjdpz_sjq;
+        this.formData.cjdpz_jcqdz = obj.cjdpz_cjsjlx;
+        this.formData.cjdpz_cjsjlx = obj.cjdpz_cjsjlx;
+        this.formData.cjdpz_dxsx = obj.cjdpz_dxsx;
+        this.formData.cjdpz_scms = obj.cjdpz_scms;
         if (obj.mqtt_cjd_sbmc) {
           this.tableData[0].mqtt_cjd_sbmc = obj.mqtt_cjd_sbmc;
         } else {
@@ -757,7 +941,7 @@ export default {
         user_id: this.user_id,
         data: JSON.stringify(this.trees),
         type: "3",
-      })
+      });
       console.log(result);
     },
     //网关配置的信息
@@ -772,28 +956,29 @@ export default {
         }
       });
     },
-    // 
+    //
     async saveGates() {
       this.outerVisible = false;
       // this.innerVisible = false;
-      let datas = sessionStorage.getItem("CHGYWG_yx");
+      // let datas = sessionStorage.getItem("CHGYWG_yx");
       // console.log(JSON.parse(datas));
-      datas = { ...JSON.parse(datas), ...this.gateWay };
-      console.log(datas);
+      // datas = { ...JSON.parse(datas), ...this.gateWay };
+      // console.log(datas);
       let res = await SaveUserAnswer({
         mark: "CHGYWG_yx",
         user_id: this.user_id,
         // user_id: "USER202307301114011710",
-        mark_value: JSON.stringify(datas),
+        mark_value: JSON.stringify(this.formData),
       });
+      console.log(res);
       if (res.data.state) {
         this.$message({
           message: "修改成功",
           type: "success",
         });
-        this.trees[0].label = this.gateWay.wgpz_wgid;
+        this.trees[0].label = this.formData.wgpz_wgid;
         this.sendTree();
-        sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.gateWay));
+        sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.formData));
       } else {
         this.$message({
           message: `保存失败,原因是${res.data.message}`,
@@ -801,7 +986,7 @@ export default {
         });
       }
       console.log(res);
-    }
+    },
   },
   mounted() {
     this.GetUserAnswer();
@@ -874,7 +1059,6 @@ export default {
     padding-right: 348px;
   }
 
-
   .el-row {
     height: 54px;
     display: flex;
diff --git a/src/components/ChiCollection.vue b/src/components/ChiCollection.vue
index bd36910..30e9cc3 100644
--- a/src/components/ChiCollection.vue
+++ b/src/components/ChiCollection.vue
@@ -134,7 +134,7 @@
     <div class="gateway">
       <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
         <el-form
-          :model="gateWay"
+          :model="tableData[0]"
           :rules="rulesGate"
           ref="gateWay"
           label-width="85px"
@@ -142,7 +142,7 @@
         >
           <el-form-item label="网关名称:" prop="wgpz_wgmc">
             <el-select
-              v-model="gateWay.wgpz_wgmc"
+              v-model="tableData[0].wgpz_wgmc"
               placeholder="请选择"
               style="width: 200px"
             >
@@ -157,7 +157,7 @@
           </el-form-item>
           <el-form-item label="网关ID:" prop="wgpz_wgid">
             <el-select
-              v-model="gateWay.wgpz_wgid"
+              v-model="tableData[0].wgpz_wgid"
               placeholder="请选择"
               style="width: 200px"
             >
@@ -575,56 +575,55 @@ export default {
           cjdpz_dxsx: "",
           cjdpz_scms: "",
           cjdpz_dw: "",
+          wgpz_wgmc: "",
+          wgpz_wgid: "",
+
+          ippz_wllx: "",
+          ippz_ip: "",
+          ippz_zwym: "",
+          ippz_wg: "",
+          ippz_dns: "",
+          ippz_dns_by: "",
+
+          sbpz_sbmc: "",
+          sbpz_kzqxy: "",
+          sbpz_ip: "",
+          sbpz_port: "",
+          sbpz_czdz: "",
+          sbpz_lxzq: "",
+          sbpz_qyhmcj: "",
+          sbpz_qyplcj: "",
+          sbpz_zdplcjs: "",
+          sbpz_cjcgsj: "",
+          sbpz_zqsbonchange: "",
+          sbpz_txsjjg: "",
+          sbpz_xqjcqxr: "",
+          sbpz_bcjcqxr: "",
+
+          cjdpz_tagid: "",
+          cjdpz_mc: "",
+          cjdpz_sjq: "",
+          cjdpz_jcqdz: "",
+          cjdpz_cjsjlx: "",
+          cjdpz_dxsx: "",
+          cjdpz_scms: "",
+
+          mqtt_ip: "",
+          mqtt_wgsn: "",
+          mqtt_port: "",
+          mqtt_keepalive: "",
+          mqtt_tls: "",
+          mqtt_clearsession: "",
+          mqtt_sssjfbzt: "",
+          mqtt_qos: "",
+
+          mqtt_cjd_sbmc: "",
+          mqtt_cjd_tagid: "",
         },
       ],
       // 网关配置的出现
       outerVisible: false,
-      gateWay: {
-        wgpz_wgmc: "",
-        wgpz_wgid: "",
-
-        ippz_wllx: "",
-        ippz_ip: "",
-        ippz_zwym: "",
-        ippz_wg: "",
-        ippz_dns: "",
-        ippz_dns_by: "",
-
-        sbpz_sbmc: "",
-        sbpz_kzqxy: "",
-        sbpz_ip: "",
-        sbpz_port: "",
-        sbpz_czdz: "",
-        sbpz_lxzq: "",
-        sbpz_qyhmcj: "",
-        sbpz_qyplcj: "",
-        sbpz_zdplcjs: "",
-        sbpz_cjcgsj: "",
-        sbpz_zqsbonchange: "",
-        sbpz_txsjjg: "",
-        sbpz_xqjcqxr: "",
-        sbpz_bcjcqxr: "",
-
-        cjdpz_tagid: "",
-        cjdpz_mc: "",
-        cjdpz_sjq: "",
-        cjdpz_jcqdz: "",
-        cjdpz_cjsjlx: "",
-        cjdpz_dxsx: "",
-        cjdpz_scms: "",
-
-        mqtt_ip: "",
-        mqtt_wgsn: "",
-        mqtt_port: "",
-        mqtt_keepalive: "",
-        mqtt_tls: "",
-        mqtt_clearsession: "",
-        mqtt_sssjfbzt: "",
-        mqtt_qos: "",
-
-        mqtt_cjd_sbmc: "",
-        mqtt_cjd_tagid: "",
-      },
+      // gateWay: {},
       rulesGate: {
         wgpz_wgmc: [
           { required: true, message: "请选择网关名称", trigger: "blur" },
@@ -665,18 +664,19 @@ export default {
       console.log(node);
       if (data.editing) {
         this.outerVisible = true;
-        let res2 = await GetUserAnswer({
-          mark: "CHGYWG_yx",
-          user_id: this.user_id,
-          // user_id: "USER202307301114011710",
-        });
-        if (res2.data.data && res2.data.state) {
-          console.log(res2.data.data.mark_value);
-          let res3 = JSON.parse(res2.data.data.mark_value);
-          this.gateWay.wgpz_wgid = res3.wgpz_wgid;
-          // console.log(this.formData.wgpz_wgid);
-          this.gateWay.wgpz_wgmc = res3.wgpz_wgmc;
-        }
+        this.GetUserAnswer();
+        // let res2 = await GetUserAnswer({
+        //   mark: "CHGYWG_yx",
+        //   user_id: this.user_id,
+        //   // user_id: "USER202307301114011710",
+        // });
+        // if (res2.data.data && res2.data.state) {
+        //   console.log(res2.data.data.mark_value);
+        //   let res3 = JSON.parse(res2.data.data.mark_value);
+        //   this.gateWay.wgpz_wgid = res3.wgpz_wgid;
+        //   // console.log(this.formData.wgpz_wgid);
+        //   this.gateWay.wgpz_wgmc = res3.wgpz_wgmc;
+        // }
       }
     },
     treeNodeClick() {
@@ -686,13 +686,13 @@ export default {
       this.diag_drive = true;
     },
     async handleSelect() {
-      let datas = sessionStorage.getItem("CHGYWG_yx");
+      // let datas = sessionStorage.getItem("CHGYWG_yx");
       // console.log(JSON.parse(datas));
-      datas = { ...JSON.parse(datas), ...this.tableData[0] };
+      // datas = { ...JSON.parse(datas), ...this.tableData[0] };
       let res = await SaveUserAnswer({
         mark: "CHGYWG_yx",
         user_id: this.user_id,
-        mark_value: JSON.stringify(datas),
+        mark_value: JSON.stringify(this.tableData[0]),
       });
       if (res.data.state) {
         this.$message({
@@ -700,7 +700,7 @@ export default {
           type: "success",
         });
         console.log(res);
-        sessionStorage.setItem("CHGYWG_yx", JSON.stringify(datas));
+        sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.tableData[0]));
       } else {
         this.$message({
           message: `保存失败`,
@@ -728,6 +728,38 @@ export default {
           this.tableData[0].cjdpz_scms = obj.cjdpz_scms;
           this.tableData[0].cjdpz_dw = obj.cjdpz_dw;
         }
+        this.tableData[0].sbpz_sbmc = obj.sbpz_sbmc;
+        this.tableData[0].sbpz_kzqxy = obj.sbpz_kzqxy;
+        this.tableData[0].sbpz_ip = obj.sbpz_ip;
+        this.tableData[0].sbpz_port = obj.sbpz_port;
+        this.tableData[0].sbpz_czdz = obj.sbpz_czdz;
+        this.tableData[0].sbpz_lxzq = obj.sbpz_lxzq;
+        this.tableData[0].sbpz_qyhmcj = obj.sbpz_qyhmcj;
+        this.tableData[0].sbpz_qyplcj = obj.sbpz_qyplcj;
+        this.tableData[0].sbpz_zdplcjs = obj.sbpz_zdplcjs;
+        this.tableData[0].sbpz_cjcgsj = obj.sbpz_cjcgsj;
+        this.tableData[0].sbpz_zqsbonchange = obj.sbpz_zqsbonchange;
+        this.tableData[0].sbpz_txsjjg = obj.sbpz_txsjjg;
+        this.tableData[0].sbpz_xqjcqxr = obj.sbpz_xqjcqxr;
+        this.tableData[0].sbpz_bcjcqxr = obj.sbpz_bcjcqxr;
+        this.tableData[0].wgpz_wgid = obj.wgpz_wgid;
+        this.tableData[0].wgpz_wgmc = obj.wgpz_wgmc;
+        this.tableData[0].ippz_wllx = obj.ippz_wllx;
+        this.tableData[0].ippz_ip = obj.ippz_ip;
+        this.tableData[0].ippz_zwym = obj.ippz_zwym;
+        this.tableData[0].ippz_wg = obj.ippz_wg;
+        this.tableData[0].ippz_dns = obj.ippz_dns;
+        this.tableData[0].ippz_dns_by = obj.ippz_dns_by;
+        this.tableData[0].mqtt_ip = obj.mqtt_ip;
+        this.tableData[0].mqtt_wgsn = obj.mqtt_wgsn;
+        this.tableData[0].mqtt_port = obj.mqtt_port;
+        this.tableData[0].mqtt_keepalive = obj.mqtt_keepalive;
+        this.tableData[0].mqtt_tls = obj.mqtt_tls;
+        this.tableData[0].mqtt_clearsession = obj.mqtt_clearsession;
+        this.tableData[0].mqtt_sssjfbzt = obj.mqtt_sssjfbzt;
+        this.tableData[0].mqtt_qos = obj.mqtt_qos;
+        this.tableData[0].mqtt_cjd_sbmc = obj.mqtt_cjd_sbmc;
+        this.tableData[0].mqtt_cjd_tagid = obj.mqtt_cjd_tagid;
       }
     },
     async sendTree() {
@@ -754,24 +786,24 @@ export default {
     async saveGates() {
       this.outerVisible = false;
       // this.innerVisible = false;
-      let datas = sessionStorage.getItem("CHGYWG_yx");
+      // datas = sessionStorage.getItem("CHGYWG_yx");
       // console.log(JSON.parse(datas));
-      datas = { ...JSON.parse(datas), ...this.gateWay };
-      console.log(datas);
+      // let datas = { ...this.tableData[0], ...this.gateWay };
+      // console.log(datas);
       let res = await SaveUserAnswer({
         mark: "CHGYWG_yx",
         user_id: this.user_id,
         // user_id: "USER202307301114011710",
-        mark_value: JSON.stringify(datas),
+        mark_value: JSON.stringify(this.tableData[0]),
       });
       if (res.data.state) {
         this.$message({
           message: "修改成功",
           type: "success",
         });
-        this.trees[0].label = this.gateWay.wgpz_wgid;
+        this.trees[0].label = this.tableData[0].wgpz_wgid;
         this.sendTree();
-        sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.gateWay));
+        sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.tableData[0]));
       } else {
         this.$message({
           message: `保存失败,原因是${res.data.message}`,
diff --git a/src/components/ChiDevice.vue b/src/components/ChiDevice.vue
index f446d50..e52dbf1 100644
--- a/src/components/ChiDevice.vue
+++ b/src/components/ChiDevice.vue
@@ -14,12 +14,6 @@
         @node-click="treeNodeClick"
         ref="tree"
       >
-        <!-- <span class="custom-tree-node" slot-scope="{ node, data }">
-                    <template v-if="data.editing == 1 && flag">
-                        <el-input style="width: 260px;" v-model="gateway" @change="changeInput"></el-input>
-                    </template>
-                    <template v-else>{{ data.label }}</template>
-                </span> -->
       </el-tree>
       <!-- 树形控件右键组件 -->
       <div v-show="menuShow" class="tree_rightmenu" :style="{ ...rightMenu }">
@@ -853,7 +847,7 @@ export default {
         sbpz_xqjcqxr: this.formData.sbpz_xqjcqxr,
         sbpz_bcjcqxr: this.formData.sbpz_bcjcqxr,
       };
-      datas = { ...formData, ...obj };
+      let datas = { ...this.formData, ...obj };
       let res = await SaveUserAnswer({
         mark: "CHGYWG_yx",
         user_id: this.user_id,
@@ -1004,7 +998,7 @@ export default {
   mounted() {
     this.user_id = this.$route.query.user_id;
     console.log(this.user_id);
-    console.log(this.$route.query.firstlabel);
+    // console.log(this.$route.query.firstlabel);
     this.getTree();
     // this.trees[0].label = this.$route.query.firstlabel;
     this.GetUserAnswer();