diff --git a/src/components/ChiDevice.vue b/src/components/ChiDevice.vue
index 8b60ecd..f446d50 100644
--- a/src/components/ChiDevice.vue
+++ b/src/components/ChiDevice.vue
@@ -1,947 +1,1208 @@
 <!-- 斥候有线的新建设备配置 -->
 <template>
-    <div>
-        <!-- 设置树形控件 -->
-        <!-- <div v-click-outside="closeMenu"> -->
-        <!-- <el-button type="info" plain @click="dialogVisible = true">斥候通道配置</el-button> -->
-        <div class="tree_menu" v-show="dialogVisible">
-            <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 }">
+  <div>
+    <!-- 设置树形控件 -->
+    <!-- <div v-click-outside="closeMenu"> -->
+    <!-- <el-button type="info" plain @click="dialogVisible = true">斥候通道配置</el-button> -->
+    <div class="tree_menu" v-show="dialogVisible">
+      <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>
                     </template>
                     <template v-else>{{ data.label }}</template>
                 </span> -->
-            </el-tree>
-            <!-- 树形控件右键组件 -->
-            <div v-show="menuShow" class="tree_rightmenu" :style="{ ...rightMenu }">
-
-                <el-menu class="el-menu-vertical-demo" @select="selectMenuNode" default-active="#0078FE">
-
-                    <el-menu-item id="menuitem" index="1" style="font-size: 12px;">
-                        <span slot="title">新建设备</span>
-                    </el-menu-item>
-                    <el-menu-item index="2" style="font-size: 12px;">
-                        <span slot="title">取 消</span>
-                    </el-menu-item>
-                </el-menu>
-            </div>
-        </div>
-        <!-- </div> -->
-        <div class="pas_params">
-            <el-dialog title="新建设备" :visible.sync="add_passage" width="902px" v-loading="loading">
-                <el-form :model="formData" :label-position="labelPosition" :rules="rules" ref="formData">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="设备名称:" :label-width="formLabelWidth" prop="sbpz_sbmc">
-                                <el-select v-model="formData.sbpz_sbmc" placeholder="" style="width: 200px;height:30px">
-                                    <el-option v-for="item in options1" :key="item.value" :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="控制器协议:" :label-width="formLabelWidth" prop="sbpz_kzqxy">
-                                <el-row>
-                                    <el-col :span="18">
-                                        <el-input v-model="formData.sbpz_kzqxy" placeholder=""
-                                            style="width: 200px;height:30px" disabled></el-input>
-                                    </el-col>
-                                    <el-col :span="6">
-                                        <el-button style="width: 50px; height: 30px;" @click="getDriveName">...</el-button>
-                                    </el-col>
-                                </el-row>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="IP地址:" :label-width="formLabelWidth" prop="sbpz_ip">
-                                <el-row>
-                                    <el-col :span="5">
-                                        <el-input v-model="sbpz_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="sbpz_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="sbpz_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="sbpz_ip4" style="width: 43px;height:30px"
-                                            maxlength="3"></el-input>
-                                    </el-col>
-                                </el-row>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="端口号:" :label-width="formLabelWidth" prop="sbpz_port">
-                                <el-input v-model="formData.sbpz_port" placeholder=""
-                                    style="width: 200px;height:30px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="从站地址:" :label-width="formLabelWidth" prop="sbpz_czdz">
-                                <el-input v-model="formData.sbpz_czdz" placeholder=""
-                                    style="width: 200px;height:30px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="轮询周期(ms):" :label-width="formLabelWidth" prop="sbpz_lxzq">
-                                <el-input v-model="formData.sbpz_lxzq" placeholder=""
-                                    style="width: 200px;height:30px"></el-input>
-                                <div class="infos">1-3600</div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <!-- </el-form> -->
-                    <div class="super_parmams">
-                        <h3>高级参数</h3>
-                        <div>
-                            <i class="el-icon-caret-bottom" v-if="is_retract"></i>
-                            <i class="el-icon-caret-top" v-else="is_retract"></i>
-                            <el-button type="text" plain @click="getRetract" style="width: 28px;
-                    color: rgba(16, 16, 16, 1);font-size: 14px;text-align: left; border: none;">
-                                收起</el-button>
-                        </div>
-                    </div>
-                    <el-divider></el-divider>
-                    <div class="super_con" v-show="is_retract">
-                        <!-- <el-form :label-position="labelPosition" :rules="rules" ref="ruleForm"> -->
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="启用毫秒采集:" :label-width="formLabelWidth" prop="sbpz_qyhmcj">
-                                    <el-switch v-model="formData.sbpz_qyhmcj"></el-switch>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="启用批量采集:" :label-width="formLabelWidth" prop="sbpz_qyplcj">
-                                    <el-switch v-model="formData.sbpz_qyplcj"></el-switch>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="最大批量采集数:" label-width="126px" prop="sbpz_zdplcjs">
-                                    <el-input v-model="formData.sbpz_zdplcjs" style="width: 200px;height:30px"></el-input>
-                                    <div class="infos">2-125</div>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="采集超过时间(ms):" label-width="140px" prop="sbpz_cjcgsj">
-                                    <el-input v-model="formData.sbpz_cjcgsj" style="width: 200px;height:30px"></el-input>
-                                    <div class="infos">2-60000</div>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="周期上报OnChange数据:" label-width="186px" prop="sbpz_zqsbonchange">
-                                    <el-switch v-model="formData.sbpz_zqsbonchange"></el-switch>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label="通讯事件间隔(ms):" label-width="140px" prop="sbpz_txsjjg">
-                                    <el-input v-model="formData.sbpz_txsjjg" style="width: 200px;height:30px"></el-input>
-                                    <div class="infos">0-1000</div>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <div class="footer_con">
-                            <el-row>
-                                <el-col :span="12">
-                                    <el-form-item label="线圈寄存器写入功能码:" label-width="120px" style="line-height: 20px;"
-                                        class="cjjcq_code">
-                                        <el-select v-model="formData.sbpz_xqjcqxr" placeholder=""
-                                            style="width: 200px;height:30px">
-                                            <el-option v-for="item in options2" :key="item.value" :label="item.label"
-                                                :value="item.value">
-                                            </el-option>
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="线圈寄存器写入功能码:" label-width="120px" class="cjjcq_code">
-                                        <el-select v-model="formData.sbpz_bcjcqxr" placeholder=""
-                                            style="width: 200px;height:30px">
-                                            <el-option v-for="item in options3" :key="item.value" :label="item.label"
-                                                :value="item.value">
-                                            </el-option>
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                        </div>
-                    </div>
-                </el-form>
-                <span slot="footer" class="dialog-footer">
-                    <el-button type="primary" @click="submitForm">保 存</el-button>
-                    <el-button @click="add_passage = false">取 消</el-button>
-                </span>
-            </el-dialog>
-        </div>
-        <div class="drvieName_All" v-show="diag_drive">
-            <div class="title">
-                <p class="title_l">协议选择</p>
-                <i class="el-icon-close title_r" @click="add_passage = false"></i>
-            </div>
-            <el-divider></el-divider>
-            <el-tree :data="datas2" :props="defaultProps" @node-click="handleDetailClick" default-expand-all></el-tree>
-        </div>
-
-        <!-- 网关信息 -->
-        <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-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-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-option>
-                        </el-select>
-                    </el-form-item>
-                </el-form>
-                <div slot="footer" class="dialog-footer-outer">
-                    <el-button type="primary" @click="submitGate">保存</el-button>
-                    <el-button @click="outerVisible = false">取 消</el-button>
-                </div>
-            </el-dialog>
-        </div>
+      </el-tree>
+      <!-- 树形控件右键组件 -->
+      <div v-show="menuShow" class="tree_rightmenu" :style="{ ...rightMenu }">
+        <el-menu
+          class="el-menu-vertical-demo"
+          @select="selectMenuNode"
+          default-active="#0078FE"
+        >
+          <el-menu-item id="menuitem" index="1" style="font-size: 12px">
+            <span slot="title">新建设备</span>
+          </el-menu-item>
+          <el-menu-item index="2" style="font-size: 12px">
+            <span slot="title">取 消</span>
+          </el-menu-item>
+        </el-menu>
+      </div>
     </div>
+    <!-- </div> -->
+    <div class="pas_params">
+      <el-dialog
+        title="新建设备"
+        :visible.sync="add_passage"
+        width="902px"
+        v-loading="loading"
+      >
+        <el-form
+          :model="formData"
+          :label-position="labelPosition"
+          :rules="rules"
+          ref="formData"
+        >
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label="设备名称:"
+                :label-width="formLabelWidth"
+                prop="sbpz_sbmc"
+              >
+                <el-select
+                  v-model="formData.sbpz_sbmc"
+                  placeholder=""
+                  style="width: 200px; height: 30px"
+                >
+                  <el-option
+                    v-for="item in options1"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label="控制器协议:"
+                :label-width="formLabelWidth"
+                prop="sbpz_kzqxy"
+              >
+                <el-row>
+                  <el-col :span="18">
+                    <el-input
+                      v-model="formData.sbpz_kzqxy"
+                      placeholder=""
+                      style="width: 200px; height: 30px"
+                      disabled
+                    ></el-input>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-button
+                      style="width: 50px; height: 30px"
+                      @click="getDriveName"
+                      >...</el-button
+                    >
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label="IP地址:"
+                :label-width="formLabelWidth"
+                prop="sbpz_ip"
+              >
+                <el-row>
+                  <el-col :span="5">
+                    <el-input
+                      v-model="sbpz_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="sbpz_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="sbpz_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="sbpz_ip4"
+                      style="width: 43px; height: 30px"
+                      maxlength="3"
+                    ></el-input>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label="端口号:"
+                :label-width="formLabelWidth"
+                prop="sbpz_port"
+              >
+                <el-input
+                  v-model="formData.sbpz_port"
+                  placeholder=""
+                  style="width: 200px; height: 30px"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row> </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item
+                label="从站地址:"
+                :label-width="formLabelWidth"
+                prop="sbpz_czdz"
+              >
+                <el-input
+                  v-model="formData.sbpz_czdz"
+                  placeholder=""
+                  style="width: 200px; height: 30px"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label="轮询周期(ms):"
+                :label-width="formLabelWidth"
+                prop="sbpz_lxzq"
+              >
+                <el-input
+                  v-model="formData.sbpz_lxzq"
+                  placeholder=""
+                  style="width: 200px; height: 30px"
+                ></el-input>
+                <div class="infos">1-3600</div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- </el-form> -->
+          <div class="super_parmams">
+            <h3>高级参数</h3>
+            <div>
+              <i class="el-icon-caret-bottom" v-if="is_retract"></i>
+              <i class="el-icon-caret-top" v-else="is_retract"></i>
+              <el-button
+                type="text"
+                plain
+                @click="getRetract"
+                style="
+                  width: 28px;
+                  color: rgba(16, 16, 16, 1);
+                  font-size: 14px;
+                  text-align: left;
+                  border: none;
+                "
+              >
+                收起</el-button
+              >
+            </div>
+          </div>
+          <el-divider></el-divider>
+          <div class="super_con" v-show="is_retract">
+            <!-- <el-form :label-position="labelPosition" :rules="rules" ref="ruleForm"> -->
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="启用毫秒采集:"
+                  :label-width="formLabelWidth"
+                  prop="sbpz_qyhmcj"
+                >
+                  <el-switch v-model="formData.sbpz_qyhmcj"></el-switch>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="启用批量采集:"
+                  :label-width="formLabelWidth"
+                  prop="sbpz_qyplcj"
+                >
+                  <el-switch v-model="formData.sbpz_qyplcj"></el-switch>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="最大批量采集数:"
+                  label-width="126px"
+                  prop="sbpz_zdplcjs"
+                >
+                  <el-input
+                    v-model="formData.sbpz_zdplcjs"
+                    style="width: 200px; height: 30px"
+                  ></el-input>
+                  <div class="infos">2-125</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="采集超过时间(ms):"
+                  label-width="140px"
+                  prop="sbpz_cjcgsj"
+                >
+                  <el-input
+                    v-model="formData.sbpz_cjcgsj"
+                    style="width: 200px; height: 30px"
+                  ></el-input>
+                  <div class="infos">2-60000</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="周期上报OnChange数据:"
+                  label-width="186px"
+                  prop="sbpz_zqsbonchange"
+                >
+                  <el-switch v-model="formData.sbpz_zqsbonchange"></el-switch>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="通讯事件间隔(ms):"
+                  label-width="140px"
+                  prop="sbpz_txsjjg"
+                >
+                  <el-input
+                    v-model="formData.sbpz_txsjjg"
+                    style="width: 200px; height: 30px"
+                  ></el-input>
+                  <div class="infos">0-1000</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <div class="footer_con">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item
+                    label="线圈寄存器写入功能码:"
+                    label-width="120px"
+                    style="line-height: 20px"
+                    class="cjjcq_code"
+                  >
+                    <el-select
+                      v-model="formData.sbpz_xqjcqxr"
+                      placeholder=""
+                      style="width: 200px; height: 30px"
+                    >
+                      <el-option
+                        v-for="item in options2"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="线圈寄存器写入功能码:"
+                    label-width="120px"
+                    class="cjjcq_code"
+                  >
+                    <el-select
+                      v-model="formData.sbpz_bcjcqxr"
+                      placeholder=""
+                      style="width: 200px; height: 30px"
+                    >
+                      <el-option
+                        v-for="item in options3"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">保 存</el-button>
+          <el-button @click="add_passage = false">取 消</el-button>
+        </span>
+      </el-dialog>
+    </div>
+    <div class="drvieName_All" v-show="diag_drive">
+      <div class="title">
+        <p class="title_l">协议选择</p>
+        <i class="el-icon-close title_r" @click="add_passage = false"></i>
+      </div>
+      <el-divider></el-divider>
+      <el-tree
+        :data="datas2"
+        :props="defaultProps"
+        @node-click="handleDetailClick"
+        default-expand-all
+      ></el-tree>
+    </div>
+
+    <!-- 网关信息 -->
+    <div class="gateway">
+      <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
+        <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="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="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>
+        </el-form>
+        <div slot="footer" class="dialog-footer-outer">
+          <el-button type="primary" @click="submitGate">保存</el-button>
+          <el-button @click="outerVisible = false">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
 </template>
 
 <script>
-import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from '@/api/user';
+import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from "@/api/user";
 export default {
-    name: 'ChiDevice',
-    data() {
-        return {
-            user_id: "",
-            loading: false,
-            flag: false,
-            nodekey: "",
-            gateway: "",
-            trees: [],
-            formData: {
-                sbpz_sbmc: "",
-                sbpz_kzqxy: "",
-                sbpz_ip: "",
-                sbpz_port: "",
-                sbpz_czdz: "",
-                sbpz_lxzq: "",
-                sbpz_qyhmcj: false,
-                sbpz_qyplcj: true,
-                sbpz_zdplcjs: "",
-                sbpz_cjcgsj: "",
-                sbpz_zqsbonchange: false,
-                sbpz_txsjjg: "",
-                sbpz_xqjcqxr: "05",
-                sbpz_bcjcqxr: "06",
-            },
-            diag_drive: false,
-            sbpz_ip1: "",
-            sbpz_ip2: "",
-            sbpz_ip3: "",
-            sbpz_ip4: "",
-            firstlabel: "",
-            options1: [{
-                value: '有线区精雕2',
-                label: '有线区精雕2'
-            }, {
-                value: '无线区精雕2',
-                label: '无线区精雕2'
-            }],
-            options2: [{
-                value: "05",
-                label: "05",
-            }],
-            options3: [{
-                value: "06",
-                label: "06"
-            }],
-            isdisabled: true,
-            radio: "1",
-            checked1: false,
-            is_retract: true,
-            labelPosition: "left",
-            formLabelWidth: "116px",
-            input1: 192,
-            add_passage: false,
-            rightMenu: "",
-            dialogVisible: true,
-            menuShow: false,
-            datas: [{
-                label: 'Gateway',
-                children: [{
-                    label: '数据采集',
-                    children: [{
-                        label: 'I/O点'
-                    },
-                    {
-                        label: '用户点',
-                    },
-                    {
-                        label: '计算点',
-                    },
-                    {
-                        label: '系统点',
-                    },
-                    ]
-                },
-                {
-                    label: "上云服务",
-                    children: [
-                        {
-                            label: "标准 MQTT"
-                        },
-                        {
-                            label: "AWS loT"
-                        }]
-                }]
-            }],
-            datas2: [{
-                label: 'Allen-Bradley',
-                children: [
-                    {
-                        label: 'EtherNet/IP(ControlLogix)',
-                    },
-                    {
-                        label: 'EtherNet/IP(MicroLogix)',
-                    },
-                ]
-            },
-            {
-                label: "Modbus",
-                children: [
-                    {
-                        label: "Modbus TCP"
-                    },
-                    {
-                        label: "Modbus RTU"
-                    },
-                    {
-                        label: "Modbus ASCII"
-                    },
-                    {
-                        label: "Modbus RTU Over TCP"
-                    },
-                ]
-            },
-            {
-                label: "MITSUBISHI",
-                children: [
-                    {
-                        label: "Mitsubishi CPU Port(Serial)"
-                    },
-                    {
-                        label: "Mitsubishi MC 3C"
-                    },
-                    {
-                        label: "Mitsubishi MC 1E"
-                    },
-                    {
-                        label: "Mitsubishi MC 3E"
-                    },
-                    {
-                        label: "Mitsubishi MC 3C Over TCP"
-                    }
-                ]
-            },
-            {
-                label: "OMRON",
-                children: [
-                    {
-                        label: "FINS TCP",
-                    },
-                    {
-                        label: "FINS UDP"
-                    },
-                    {
-                        label: "HostLink",
-                    }
+  name: "ChiDevice",
+  data() {
+    return {
+      user_id: "",
+      loading: false,
+      flag: false,
+      nodekey: "",
+      gateway: "",
+      trees: [],
+      formData: {
+        sbpz_sbmc: "",
+        sbpz_kzqxy: "",
+        sbpz_ip: "",
+        sbpz_port: "",
+        sbpz_czdz: "",
+        sbpz_lxzq: "",
+        sbpz_qyhmcj: false,
+        sbpz_qyplcj: true,
+        sbpz_zdplcjs: "",
+        sbpz_cjcgsj: "",
+        sbpz_zqsbonchange: false,
+        sbpz_txsjjg: "",
+        sbpz_xqjcqxr: "05",
+        sbpz_bcjcqxr: "06",
 
-                ]
+        ippz_wllx: "",
+        ippz_ip: "",
+        ippz_zwym: "",
+        ippz_wg: "",
+        ippz_dns: "",
+        ippz_dns_by: "",
+
+        wgpz_wgmc: "",
+        wgpz_wgid: "",
+
+        sbpz_sbmc: "",
+        sbpz_kzqxy: "",
+        sbpz_ip: "",
+        sbpz_port: "",
+        sbpz_czdz: "",
+        sbpz_lxzq: "",
+        sbpz_qyhmcj: false,
+        sbpz_qyplcj: true,
+        sbpz_zdplcjs: "",
+        sbpz_cjcgsj: "",
+        sbpz_zqsbonchange: false,
+        sbpz_txsjjg: "",
+        sbpz_xqjcqxr: "05",
+        sbpz_bcjcqxr: "06",
+
+        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: "",
+      },
+      diag_drive: false,
+      sbpz_ip1: "",
+      sbpz_ip2: "",
+      sbpz_ip3: "",
+      sbpz_ip4: "",
+      firstlabel: "",
+      options1: [
+        {
+          value: "有线区精雕2",
+          label: "有线区精雕2",
+        },
+        {
+          value: "无线区精雕2",
+          label: "无线区精雕2",
+        },
+      ],
+      options2: [
+        {
+          value: "05",
+          label: "05",
+        },
+      ],
+      options3: [
+        {
+          value: "06",
+          label: "06",
+        },
+      ],
+      isdisabled: true,
+      radio: "1",
+      checked1: false,
+      is_retract: true,
+      labelPosition: "left",
+      formLabelWidth: "116px",
+      input1: 192,
+      add_passage: false,
+      rightMenu: "",
+      dialogVisible: true,
+      menuShow: false,
+      datas: [
+        {
+          label: "Gateway",
+          children: [
+            {
+              label: "数据采集",
+              children: [
+                {
+                  label: "I/O点",
+                },
+                {
+                  label: "用户点",
+                },
+                {
+                  label: "计算点",
+                },
+                {
+                  label: "系统点",
+                },
+              ],
             },
             {
-                label: "SIEMENS",
-                children: [
-                    {
-                        label: "ISO-on-TCP",
-                    },
-                    {
-                        label: "PPI"
-                    }
-                ]
+              label: "上云服务",
+              children: [
+                {
+                  label: "标准 MQTT",
+                },
+                {
+                  label: "AWS loT",
+                },
+              ],
             },
-            ],
-            defaultProps: {
-                children: 'children',
-                label: 'label'
+          ],
+        },
+      ],
+      datas2: [
+        {
+          label: "Allen-Bradley",
+          children: [
+            {
+              label: "EtherNet/IP(ControlLogix)",
             },
-            rules: {
-                sbpz_sbmc: [
-                    { required: true, message: '请输入通道名称', trigger: 'change' },
-                ],
-                sbpz_kzqxy: [
-                    { required: true, message: '请输入控制器协议', trigger: 'blur' },
-                ],
-                sbpz_ip: [
-                    {
-                        required: true,
-                        message: '',
-                        validator: this.validateIp,
-                        trigger: 'blur'
-                    },
-                ],
-                sbpz_czdz: [
-                    { required: true, message: '请输入从站地址', trigger: 'blur' },
-                ],
-                sbpz_port: [
-                    { required: true, message: '请输入端口号', trigger: 'blur' },
-                ],
-                sbpz_lxzq: [
-                    { required: true, message: '请输入轮询时间', trigger: 'blur' },
-                ],
-                sbpz_qyhmcj: [
-                    { required: true, message: '启用毫秒采集', trigger: 'change' },
-                ],
-                sbpz_qyplcj: [
-                    { required: true, message: '启用批量采集', trigger: 'change' },
-                ],
-                sbpz_zdplcjs: [
-                    { required: true, message: '请输入最大批量采集数', trigger: 'blur' },
-                ],
-                sbpz_cjcgsj: [
-                    { required: true, message: '请输入采集超过时间', trigger: 'blur' },
-                ],
-                sbpz_zqsbonchange: [
-                    { required: true, message: '周期上报Onchange数据', trigger: 'change' },
-                ],
-                sbpz_txsjjg: [
-                    { required: true, message: '请输入通讯时间间隔', trigger: 'blur' },
-                ],
+            {
+              label: "EtherNet/IP(MicroLogix)",
             },
+          ],
+        },
+        {
+          label: "Modbus",
+          children: [
+            {
+              label: "Modbus TCP",
+            },
+            {
+              label: "Modbus RTU",
+            },
+            {
+              label: "Modbus ASCII",
+            },
+            {
+              label: "Modbus RTU Over TCP",
+            },
+          ],
+        },
+        {
+          label: "MITSUBISHI",
+          children: [
+            {
+              label: "Mitsubishi CPU Port(Serial)",
+            },
+            {
+              label: "Mitsubishi MC 3C",
+            },
+            {
+              label: "Mitsubishi MC 1E",
+            },
+            {
+              label: "Mitsubishi MC 3E",
+            },
+            {
+              label: "Mitsubishi MC 3C Over TCP",
+            },
+          ],
+        },
+        {
+          label: "OMRON",
+          children: [
+            {
+              label: "FINS TCP",
+            },
+            {
+              label: "FINS UDP",
+            },
+            {
+              label: "HostLink",
+            },
+          ],
+        },
+        {
+          label: "SIEMENS",
+          children: [
+            {
+              label: "ISO-on-TCP",
+            },
+            {
+              label: "PPI",
+            },
+          ],
+        },
+      ],
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      rules: {
+        sbpz_sbmc: [
+          { required: true, message: "请输入通道名称", trigger: "change" },
+        ],
+        sbpz_kzqxy: [
+          { required: true, message: "请输入控制器协议", trigger: "blur" },
+        ],
+        sbpz_ip: [
+          {
+            required: true,
+            message: "",
+            validator: this.validateIp,
+            trigger: "blur",
+          },
+        ],
+        sbpz_czdz: [
+          { required: true, message: "请输入从站地址", trigger: "blur" },
+        ],
+        sbpz_port: [
+          { required: true, message: "请输入端口号", trigger: "blur" },
+        ],
+        sbpz_lxzq: [
+          { required: true, message: "请输入轮询时间", trigger: "blur" },
+        ],
+        sbpz_qyhmcj: [
+          { required: true, message: "启用毫秒采集", trigger: "change" },
+        ],
+        sbpz_qyplcj: [
+          { required: true, message: "启用批量采集", trigger: "change" },
+        ],
+        sbpz_zdplcjs: [
+          { required: true, message: "请输入最大批量采集数", trigger: "blur" },
+        ],
+        sbpz_cjcgsj: [
+          { required: true, message: "请输入采集超过时间", trigger: "blur" },
+        ],
+        sbpz_zqsbonchange: [
+          {
+            required: true,
+            message: "周期上报Onchange数据",
+            trigger: "change",
+          },
+        ],
+        sbpz_txsjjg: [
+          { required: true, message: "请输入通讯时间间隔", trigger: "blur" },
+        ],
+      },
 
-            // 网关配置的出现
-            outerVisible: false,
-            gateWay: {
-                wgpz_wgmc: "",
-                wgpz_wgid: "",
-                wgpz_wglx: "",
-            },
-            rulesGate: {
-                wgpz_wgmc: [
-                    { required: true, message: "请选择网关名称", trigger: "blur" },
-                ],
-                wgpz_wgid: [
-                    { required: true, message: "请选择网关id", trigger: "blur" },
-                ],
-            },
-            opts1: [
-                {
-                    value: "有线区网关1",
-                    label: "有线区网关1",
-                },
-                {
-                    value: "无线区网关1",
-                    label: "无线区网关1",
-                },
-            ],
-            opts2: [
-                {
-                    value: "LAN-BOX1",
-                    label: "LAN-BOX1",
-                },
-                {
-                    value: "WLAN-BOX1",
-                    label: "WLAN-BOX1",
-                },
-            ],
-        };
+      // 网关配置的出现
+      outerVisible: false,
+      gateWay: {
+        wgpz_wgmc: "",
+        wgpz_wgid: "",
+        wgpz_wglx: "",
+      },
+      rulesGate: {
+        wgpz_wgmc: [
+          { required: true, message: "请选择网关名称", trigger: "blur" },
+        ],
+        wgpz_wgid: [
+          { required: true, message: "请选择网关id", trigger: "blur" },
+        ],
+      },
+      opts1: [
+        {
+          value: "有线区网关1",
+          label: "有线区网关1",
+        },
+        {
+          value: "无线区网关1",
+          label: "无线区网关1",
+        },
+      ],
+      opts2: [
+        {
+          value: "LAN-BOX1",
+          label: "LAN-BOX1",
+        },
+        {
+          value: "WLAN-BOX1",
+          label: "WLAN-BOX1",
+        },
+      ],
+    };
+  },
+
+  methods: {
+    //ip地址验证
+    validateIp(rule, value, callback) {
+      if (
+        this.sbpz_ip1 +
+          "." +
+          this.sbpz_ip2 +
+          "." +
+          this.sbpz_ip3 +
+          "." +
+          this.sbpz_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.sbpz_ip1 +
+            "." +
+            this.sbpz_ip2 +
+            "." +
+            this.sbpz_ip3 +
+            "." +
+            this.sbpz_ip4
+        )
+      ) {
+        callback(new Error("请输入有效的IP地址"));
+      } else {
+        callback();
+      }
     },
-
-    methods: {
-        //ip地址验证
-        validateIp(rule, value, callback) {
-            if (
-                this.sbpz_ip1 +
-                "." +
-                this.sbpz_ip2 +
-                "." +
-                this.sbpz_ip3 +
-                "." +
-                this.sbpz_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.sbpz_ip1 +
-                    "." +
-                    this.sbpz_ip2 +
-                    "." +
-                    this.sbpz_ip3 +
-                    "." +
-                    this.sbpz_ip4
-                )
-            ) {
-                callback(new Error("请输入有效的IP地址"));
-            } else {
-                callback();
-            }
-        },
-        // 提交时的校验
-        submitForm() {
-            this.$refs["formData"].validate((valid) => {
-                if (valid) {
-                    this.saveDevice();
-                } else {
-                    console.log("error submit!!");
-                    return false;
-                }
-            });
-        },
-        // changeInput() {
-        //     this.flag = false;
-        //     this.trees[0].label = this.gateway;
-        //     this.sendTree();
-        // },
-        async rightClick(e, data, 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;
-                }
-            }
-            if (node.level == 2) {
-                this.menuShow = false
-                this.menuShow = true
-                this.nodekey = data.id;
-                e.preventDefault() //关闭浏览器右键默认事件
-                this.rightMenu = { top: e.pageY + 'px', left: e.pageX + 'px' }
-                document.addEventListener('click', (ev) => {
-                    ev.stopImmediatePropagation()
-                    if (ev.target !== document.querySelector('.el-menu-item.is-active')) {
-                        this.foo()
-                    }
-                })
-            }
-        },
-        // 点击时候的判断,判断是否为新增网关
-        selectMenuNode(index, indexPath) {
-            console.log(index);
-            if (index == 1) {
-                this.add_passage = true;
-            }
-        },
-        foo() {
-            // 取消鼠标监听事件 菜单栏
-            this.menuShow = false
-            document.removeEventListener('click', this.foo) // 关掉监听，
-        },
-        treeNodeClick() {
-            this.foo()
-        },
-        // 收起点击事件的判断
-        getRetract() {
-            if (this.is_retract == true) {
-                this.is_retract = false;
-            } else {
-                this.is_retract = true;
-            }
-        },
-        getDriveName() {
-            this.diag_drive = true;
-        },
-        closeMenu(ev) {
-            console.log({ ev });
-            this.dialogVisible = false;
-        },
-        handleDetailClick(data, node, value) {
-            console.log(data.label);
-            if (node.childNodes.length == 0) {
-                this.formData.sbpz_kzqxy = data.label;
-                this.diag_drive = false;
-            }
-        },
-        async saveDevice() {
-            var obj = {
-                sbpz_sbmc: this.formData.sbpz_sbmc,
-                sbpz_kzqxy: this.formData.sbpz_kzqxy,
-                sbpz_ip: this.sbpz_ip1 + "." + this.sbpz_ip2 + "." + this.sbpz_ip3 + "." + this.sbpz_ip4,
-                sbpz_port: this.formData.sbpz_port,
-                sbpz_czdz: this.formData.sbpz_czdz,
-                sbpz_lxzq: this.formData.sbpz_lxzq,
-                sbpz_qyhmcj: String(Number(this.formData.sbpz_qyhmcj)),
-                sbpz_qyplcj: String(Number(this.formData.sbpz_qyplcj)),
-                sbpz_zdplcjs: this.formData.sbpz_zdplcjs,
-                sbpz_cjcgsj: this.formData.sbpz_cjcgsj,
-                sbpz_zqsbonchange: String(Number(this.formData.sbpz_zqsbonchange)),
-                sbpz_txsjjg: this.formData.sbpz_txsjjg,
-                sbpz_xqjcqxr: this.formData.sbpz_xqjcqxr,
-                sbpz_bcjcqxr: this.formData.sbpz_bcjcqxr,
-            }
-            let datas = sessionStorage.getItem("CHGYWG_yx");
-            datas = { ...JSON.parse(datas), ...obj };
-            let res = await SaveUserAnswer({
-                mark: "CHGYWG_yx",
-                user_id: this.user_id,
-                mark_value: JSON.stringify(datas),
-                step: "2",
-            });
-            if (res.data.state) {
-                this.$message({
-                    message: "保存成功",
-                    type: "success",
-                });
-                this.$refs["tree"].append({
-                    id: this.nodekey + 1000,
-                    label: this.formData.sbpz_sbmc,
-                }, this.nodekey);
-                // console.log(this.trees);
-                this.sendTree();
-                sessionStorage.setItem("CHGYWG_yx", JSON.stringify(datas));
-                this.$router.push(`/collectionpoint?user_id=${this.user_id}`)
-            } else {
-                this.$message({
-                    message: `保存失败`,
-                    type: "error",
-                });
-            }
-            // console.log(res);
-
-        },
-        async GetUserAnswer() {
-            this.loading = true;
-            let { data } = await GetUserAnswer({
-                mark: "CHGYWG_yx",
-                user_id: this.user_id,
-            });
-            this.loading = false;
-            // console.log(JSON.parse(data.data.mark_value));
-            if (data.data && data.state) {
-                let obj = JSON.parse(data.data.mark_value);
-                if (obj.sbpz_ip) {
-                    this.formData.sbpz_sbmc = obj.sbpz_sbmc;
-                    this.formData.sbpz_kzqxy = obj.sbpz_kzqxy;
-                    this.sbpz_ip1 = obj.sbpz_ip.split(".")[0];
-                    this.sbpz_ip2 = obj.sbpz_ip.split(".")[1];
-                    this.sbpz_ip3 = obj.sbpz_ip.split(".")[2];
-                    this.sbpz_ip4 = obj.sbpz_ip.split(".")[3];
-                    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 = Boolean(Number(obj.sbpz_qyhmcj));
-                    this.formData.sbpz_qyplcj = Boolean(Number(obj.sbpz_qyplcj));
-                    this.formData.sbpz_zdplcjs = obj.sbpz_zdplcjs;
-                    this.formData.sbpz_cjcgsj = obj.sbpz_cjcgsj;
-                    this.formData.sbpz_zqsbonchange = Boolean(Number(obj.sbpz_zqsbonchange));
-                    console.log(this.formData.sbpz_zqsbonchange);
-                    this.formData.sbpz_txsjjg = obj.sbpz_txsjjg;
-                    this.formData.sbpz_xqjcqxr = obj.sbpz_xqjcqxr;
-                    this.formData.sbpz_bcjcqxr = obj.sbpz_bcjcqxr;
-                }
-            }
-        },
-        async sendTree() {
-            let result = await SendTree({
-                user_id: this.user_id,
-                data: JSON.stringify(this.trees),
-                type: "3",
-            })
-            console.log(result);
-        },
-        async getTree() {
-            let res = await GetTree({
-                user_id: this.user_id,
-                type: "3",
-            })
-            console.log(res);
-            console.log(JSON.parse(res.data.data.data));
-            this.trees = JSON.parse(res.data.data.data);
-        },
-        //网关配置的信息
-        async submitGate() {
-            this.$refs["gateWay"].validate((valid) => {
-                if (valid) {
-                    // console.log('submit!');
-                    this.saveGates();
-                } else {
-                    console.log("error submit!!");
-                    return false;
-                }
-            });
-        },
-        // 
-        async saveGates() {
-            this.outerVisible = false;
-            // this.innerVisible = false;
-            let datas = sessionStorage.getItem("CHGYWG_yx");
-            // console.log(JSON.parse(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),
-            });
-            if (res.data.state) {
-                this.$message({
-                    message: "修改成功",
-                    type: "success",
-                });
-                this.trees[0].label = this.gateWay.wgpz_wgid;
-                this.sendTree();
-                sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.gateWay));
-            } else {
-                this.$message({
-                    message: `保存失败,原因是${res.data.message}`,
-                    type: "error",
-                });
-            }
-            console.log(res);
+    // 提交时的校验
+    submitForm() {
+      this.$refs["formData"].validate((valid) => {
+        if (valid) {
+          this.saveDevice();
+        } else {
+          console.log("error submit!!");
+          return false;
         }
+      });
     },
-    mounted() {
-        this.user_id = this.$route.query.user_id;
-        console.log(this.user_id);
-        console.log(this.$route.query.firstlabel);
-        this.getTree();
-        // this.trees[0].label = this.$route.query.firstlabel;
+    // changeInput() {
+    //     this.flag = false;
+    //     this.trees[0].label = this.gateway;
+    //     this.sendTree();
+    // },
+    async rightClick(e, data, 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();
+      }
+      if (node.level == 2) {
+        this.menuShow = false;
+        this.menuShow = true;
+        this.nodekey = data.id;
+        e.preventDefault(); //关闭浏览器右键默认事件
+        this.rightMenu = { top: e.pageY + "px", left: e.pageX + "px" };
+        document.addEventListener("click", (ev) => {
+          ev.stopImmediatePropagation();
+          if (ev.target !== document.querySelector(".el-menu-item.is-active")) {
+            this.foo();
+          }
+        });
+      }
     },
-    watch: {
-        checked1: {
-            handler(old,) {
-                if (old) {
-                    this.isdisabled = false;
-                } else {
-                    this.isdisabled = true;
-                }
-            }
+    // 点击时候的判断,判断是否为新增网关
+    selectMenuNode(index, indexPath) {
+      console.log(index);
+      if (index == 1) {
+        this.add_passage = true;
+      }
+    },
+    foo() {
+      // 取消鼠标监听事件 菜单栏
+      this.menuShow = false;
+      document.removeEventListener("click", this.foo); // 关掉监听，
+    },
+    treeNodeClick() {
+      this.foo();
+    },
+    // 收起点击事件的判断
+    getRetract() {
+      if (this.is_retract == true) {
+        this.is_retract = false;
+      } else {
+        this.is_retract = true;
+      }
+    },
+    getDriveName() {
+      this.diag_drive = true;
+    },
+    closeMenu(ev) {
+      console.log({ ev });
+      this.dialogVisible = false;
+    },
+    handleDetailClick(data, node, value) {
+      console.log(data.label);
+      if (node.childNodes.length == 0) {
+        this.formData.sbpz_kzqxy = data.label;
+        this.diag_drive = false;
+      }
+    },
+    async saveDevice() {
+      var obj = {
+        sbpz_sbmc: this.formData.sbpz_sbmc,
+        sbpz_kzqxy: this.formData.sbpz_kzqxy,
+        sbpz_ip:
+          this.sbpz_ip1 +
+          "." +
+          this.sbpz_ip2 +
+          "." +
+          this.sbpz_ip3 +
+          "." +
+          this.sbpz_ip4,
+        sbpz_port: this.formData.sbpz_port,
+        sbpz_czdz: this.formData.sbpz_czdz,
+        sbpz_lxzq: this.formData.sbpz_lxzq,
+        sbpz_qyhmcj: String(Number(this.formData.sbpz_qyhmcj)),
+        sbpz_qyplcj: String(Number(this.formData.sbpz_qyplcj)),
+        sbpz_zdplcjs: this.formData.sbpz_zdplcjs,
+        sbpz_cjcgsj: this.formData.sbpz_cjcgsj,
+        sbpz_zqsbonchange: String(Number(this.formData.sbpz_zqsbonchange)),
+        sbpz_txsjjg: this.formData.sbpz_txsjjg,
+        sbpz_xqjcqxr: this.formData.sbpz_xqjcqxr,
+        sbpz_bcjcqxr: this.formData.sbpz_bcjcqxr,
+      };
+      datas = { ...formData, ...obj };
+      let res = await SaveUserAnswer({
+        mark: "CHGYWG_yx",
+        user_id: this.user_id,
+        mark_value: JSON.stringify(datas),
+        step: "2",
+      });
+      if (res.data.state) {
+        this.$message({
+          message: "保存成功",
+          type: "success",
+        });
+        this.$refs["tree"].append(
+          {
+            id: this.nodekey + 1000,
+            label: this.formData.sbpz_sbmc,
+          },
+          this.nodekey
+        );
+        this.sendTree();
+        this.$router.push(`/collectionpoint?user_id=${this.user_id}`);
+      } else {
+        this.$message({
+          message: `保存失败`,
+          type: "error",
+        });
+      }
+      // console.log(res);
+    },
+    async GetUserAnswer() {
+      this.loading = true;
+      let { data } = await GetUserAnswer({
+        mark: "CHGYWG_yx",
+        user_id: this.user_id,
+      });
+      this.loading = false;
+      // console.log(JSON.parse(data.data.mark_value));
+      if (data.data && data.state) {
+        let obj = JSON.parse(data.data.mark_value);
+        if (obj.sbpz_ip) {
+          this.formData.sbpz_sbmc = obj.sbpz_sbmc;
+          this.formData.sbpz_kzqxy = obj.sbpz_kzqxy;
+          this.sbpz_ip1 = obj.sbpz_ip.split(".")[0];
+          this.sbpz_ip2 = obj.sbpz_ip.split(".")[1];
+          this.sbpz_ip3 = obj.sbpz_ip.split(".")[2];
+          this.sbpz_ip4 = obj.sbpz_ip.split(".")[3];
+          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 = Boolean(Number(obj.sbpz_qyhmcj));
+          this.formData.sbpz_qyplcj = Boolean(Number(obj.sbpz_qyplcj));
+          this.formData.sbpz_zdplcjs = obj.sbpz_zdplcjs;
+          this.formData.sbpz_cjcgsj = obj.sbpz_cjcgsj;
+          this.formData.sbpz_zqsbonchange = Boolean(
+            Number(obj.sbpz_zqsbonchange)
+          );
+          console.log(this.formData.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;
+
+          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_tls = obj.mqtt_tls;
+          this.formData.mqtt_clearsession = obj.mqtt_clearsession;
+          this.formData.mqtt_sssjfbzt = obj.mqtt_sssjfbzt;
+          this.formData.mqtt_qos = obj.mqtt_qos;
+
+          this.formData.mqtt_cjd_sbmc = obj.mqtt_cjd_sbmc;
+          this.formData.mqtt_cjd_tagid = obj.mqtt_cjd_tagid;
         }
+      }
     },
-    directives: {
-        'click-outside': {
-            bind: function (el, binding, vnode) {
-                console.log('el', el);
-                console.log("binding", binding);
-                el.event = function (event) {
-                    // 检查点击是否发生在节点之内（包括子节点）
-                    if (!(el == event.target || el.contains(event.target))) {
-                        // 如果没有，则触发调用
-                        // 若绑定值为函数，则执行
-                        // 这里我们可以通过钩子函数中的 vnode.context，来获取当前组件的作用域
-                        if (typeof vnode.context[binding.expression] == 'function') {
-                            vnode.context[binding.expression](event)
-                        }
-                    }
-                }
-                // 绑定事件
-                // 设置为true，代表在DOM树中，注册了该listener的元素，会先于它下方的任何事件目标，接收到该事件。
-                document.body.addEventListener('click', el.event, true)
-            },
-            unbind: function (el) {
-                // 解绑事件
-                document.body.removeEventListener('click', el.event, true)
-            },
-        },
+    async sendTree() {
+      let result = await SendTree({
+        user_id: this.user_id,
+        data: JSON.stringify(this.trees),
+        type: "3",
+      });
+      console.log(result);
     },
+    async getTree() {
+      let res = await GetTree({
+        user_id: this.user_id,
+        type: "3",
+      });
+      console.log(res);
+      console.log(JSON.parse(res.data.data.data));
+      this.trees = JSON.parse(res.data.data.data);
+    },
+    //网关配置的信息
+    async submitGate() {
+      this.$refs["gateWay"].validate((valid) => {
+        if (valid) {
+          // console.log('submit!');
+          this.saveGates();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    //
+    async saveGates() {
+      this.outerVisible = false;
+
+      let res = await SaveUserAnswer({
+        mark: "CHGYWG_yx",
+        user_id: this.user_id,
+        // user_id: "USER202307301114011710",
+        mark_value: JSON.stringify(this.formData),
+      });
+      if (res.data.state) {
+        this.$message({
+          message: "修改成功",
+          type: "success",
+        });
+        this.trees[0].label = this.formData.wgpz_wgid;
+        this.sendTree();
+      } else {
+        this.$message({
+          message: `保存失败,原因是${res.data.message}`,
+          type: "error",
+        });
+      }
+      console.log(res);
+    },
+  },
+  mounted() {
+    this.user_id = this.$route.query.user_id;
+    console.log(this.user_id);
+    console.log(this.$route.query.firstlabel);
+    this.getTree();
+    // this.trees[0].label = this.$route.query.firstlabel;
+    this.GetUserAnswer();
+  },
+  watch: {
+    checked1: {
+      handler(old) {
+        if (old) {
+          this.isdisabled = false;
+        } else {
+          this.isdisabled = true;
+        }
+      },
+    },
+  },
+  directives: {
+    "click-outside": {
+      bind: function (el, binding, vnode) {
+        console.log("el", el);
+        console.log("binding", binding);
+        el.event = function (event) {
+          // 检查点击是否发生在节点之内（包括子节点）
+          if (!(el == event.target || el.contains(event.target))) {
+            // 如果没有，则触发调用
+            // 若绑定值为函数，则执行
+            // 这里我们可以通过钩子函数中的 vnode.context，来获取当前组件的作用域
+            if (typeof vnode.context[binding.expression] == "function") {
+              vnode.context[binding.expression](event);
+            }
+          }
+        };
+        // 绑定事件
+        // 设置为true，代表在DOM树中，注册了该listener的元素，会先于它下方的任何事件目标，接收到该事件。
+        document.body.addEventListener("click", el.event, true);
+      },
+      unbind: function (el) {
+        // 解绑事件
+        document.body.removeEventListener("click", el.event, true);
+      },
+    },
+  },
 };
 </script>
 
 <style lang="less" scoped>
 .tree_menu {
-    position: absolute;
-    width: 286px;
-    height: 753px;
-    left: 64px;
-    top: 104px;
-    width: 286px;
-    height: 753px;
-    line-height: 20px;
-    border-radius: 3px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    border: 1px solid rgba(220, 220, 220, 1);
+  position: absolute;
+  width: 286px;
+  height: 753px;
+  left: 64px;
+  top: 104px;
+  width: 286px;
+  height: 753px;
+  line-height: 20px;
+  border-radius: 3px;
+  background-color: rgba(255, 255, 255, 1);
+  text-align: center;
+  border: 1px solid rgba(220, 220, 220, 1);
 }
 
 .tree_rightmenu {
-    position: fixed;
-    width: 120px;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-    z-index: 1000;
+  position: fixed;
+  width: 120px;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  z-index: 1000;
 }
 
 .super_parmams {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 668px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 668px;
 
-    i {
-        width: 24px;
-        height: 24px;
-        display: inline-block;
-    }
+  i {
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+  }
 }
 
 /deep/ .pas_params {
-    .el-form-item {
-        margin-bottom: 20px !important;
+  .el-form-item {
+    margin-bottom: 20px !important;
+  }
+
+  .el-col-12:last-child {
+    padding-right: 150px;
+  }
+
+  .el-col-12:first-child {
+    padding-right: 102px;
+  }
+
+  .el-divider--horizontal {
+    margin: 8px 0px;
+  }
+
+  .el-input__inner {
+    height: 30px;
+    text-align: left;
+    padding: 0px 8px;
+  }
+
+  .el-row {
+    display: flex;
+    align-items: flex-end;
+
+    .el-col-1 {
+      text-align: center;
+      line-height: 20px;
+      height: 20px;
     }
 
-    .el-col-12:last-child {
-        padding-right: 150px;
-    }
-
-    .el-col-12:first-child {
-        padding-right: 102px;
-    }
-
-    .el-divider--horizontal {
-        margin: 8px 0px;
-    }
-
-    .el-input__inner {
-        height: 30px;
-        text-align: left;
-        padding: 0px 8px;
-    }
-
-    .el-row {
-        display: flex;
-        align-items: flex-end;
-
-        .el-col-1 {
-            text-align: center;
-            line-height: 20px;
-            height: 20px;
-        }
-
-        .el-col-6 {
-            height: 40px;
-            top: 5px;
-            left: 25px;
-            position: relative;
-            width: 50px;
-        }
+    .el-col-6 {
+      height: 40px;
+      top: 5px;
+      left: 25px;
+      position: relative;
+      width: 50px;
     }
+  }
 }
 
 /deep/ .super_con {
+  .el-form-item {
+    margin-bottom: 7px;
+  }
 
-    .el-form-item {
-        margin-bottom: 7px;
-    }
+  .el-row {
+    display: flex;
+    align-items: flex-end;
+  }
 
-    .el-row {
-        display: flex;
-        align-items: flex-end;
-    }
-
-    .coil {
-        display: inline-block;
-        width: 98px;
-        height: 25px;
-        color: rgba(16, 16, 16, 1);
-        font-size: 14px;
-        text-align: left;
-    }
+  .coil {
+    display: inline-block;
+    width: 98px;
+    height: 25px;
+    color: rgba(16, 16, 16, 1);
+    font-size: 14px;
+    text-align: left;
+  }
 }
 
 .infos {
-    width: 60px;
-    position: absolute;
-    left: 208px;
-    top: 0;
+  width: 60px;
+  position: absolute;
+  left: 208px;
+  top: 0;
 }
 
 /deep/ .footer_con {
-    .cjjcq_code {
-
-        // margin-left: 140px !important;
-        .el-form-item__content {
-            margin-left: 140px !important;
-        }
+  .cjjcq_code {
+    // margin-left: 140px !important;
+    .el-form-item__content {
+      margin-left: 140px !important;
     }
+  }
 
-    .el-form-item__label {
-        line-height: 20px;
-    }
+  .el-form-item__label {
+    line-height: 20px;
+  }
 }
 
 /deep/ .drvieName_All {
-    position: absolute;
-    left: 1478px;
-    top: 140px;
-    width: 435px;
-    max-height: 720px;
-    z-index: 10000;
-    border: 1px solid #f5f5f5;
+  position: absolute;
+  left: 1478px;
+  top: 140px;
+  width: 435px;
+  max-height: 720px;
+  z-index: 10000;
+  border: 1px solid #f5f5f5;
 
-    .title {
-        background-color: #fff;
-        padding: 5px 6px 5px 25px;
-        display: flex;
-        justify-content: space-between;
+  .title {
+    background-color: #fff;
+    padding: 5px 6px 5px 25px;
+    display: flex;
+    justify-content: space-between;
 
-        .title_l {
-            width: 103px;
-            height: 26px;
-            color: rgba(16, 16, 16, 1);
-            font-size: 18px;
-            text-align: left;
-        }
-
-        .title_r {
-            width: 24px;
-            height: 24px;
-            line-height: 24px;
-            cursor: pointer;
-            color: rgba(111, 103, 103, 1);
-        }
+    .title_l {
+      width: 103px;
+      height: 26px;
+      color: rgba(16, 16, 16, 1);
+      font-size: 18px;
+      text-align: left;
     }
 
-    // h3 {
-    //   padding-bottom: 10px;
-    //   background-color: #fff;
-    // }
-
-    .el-divider--horizontal {
-        margin: 0px;
+    .title_r {
+      width: 24px;
+      height: 24px;
+      line-height: 24px;
+      cursor: pointer;
+      color: rgba(111, 103, 103, 1);
     }
+  }
+
+  .el-divider--horizontal {
+    margin: 0px;
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/ChiGate.vue b/src/components/ChiGate.vue
index af81527..8a4848f 100644
--- a/src/components/ChiGate.vue
+++ b/src/components/ChiGate.vue
@@ -1,7 +1,6 @@
 <!-- 斥候IP设置——无线网关页面 -->
 <template>
   <div v-loading="loading">
-    <!-- <el-button type="info" plain @click="getShow">斥候IP设置——无线网关</el-button> -->
     <div class="gateway" v-show="isShow">
       <div class="title">
         <p class="title_l">IP配置</p>
@@ -10,11 +9,23 @@
       </div>
       <el-divider></el-divider>
       <div class="content">
-        <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 label="客户端SSID:" :label-width="formLabelWidth" prop="ippz_ssid">
-                <el-input v-model="formData.ippz_ssid" placeholder="请输入WIFI名字"></el-input>
+              <el-form-item
+                label="客户端SSID:"
+                :label-width="formLabelWidth"
+                prop="ippz_ssid"
+              >
+                <el-input
+                  v-model="formData.ippz_ssid"
+                  placeholder="请输入WIFI名字"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -22,7 +33,12 @@
             <el-col :span="24">
               <el-form-item label="认证方式:" :label-width="formLabelWidth">
                 <el-select v-model="formData.ippz_rzfs" placeholder="开放式">
-                  <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option
+                    v-for="item in options1"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -32,7 +48,12 @@
             <el-col :span="24">
               <el-form-item label="加密方式:" :label-width="formLabelWidth">
                 <el-select v-model="formData.ippz_jmfs" placeholder="NONE">
-                  <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -40,8 +61,15 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="密码:" :label-width="formLabelWidth" prop="ippz_mm">
-                <el-input v-model="formData.ippz_mm" placeholder="请输入wifi密码"></el-input>
+              <el-form-item
+                label="密码:"
+                :label-width="formLabelWidth"
+                prop="ippz_mm"
+              >
+                <el-input
+                  v-model="formData.ippz_mm"
+                  placeholder="请输入wifi密码"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -68,6 +96,43 @@ export default {
         ippz_rzfs: "WPA2-PSK", //答案：WPA2-PSK
         ippz_jmfs: "AES", //答案：AES
         ippz_mm: "",
+
+        wgpz_wgmc: "",
+        wgpz_wgid: "",
+
+        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_sssjfbzt: "",
+        mqtt_qos: "",
+
+        mqtt_cjd_sbmc: "",
+        mqtt_cjd_tagid: "",
       },
       options1: [
         {
@@ -141,17 +206,12 @@ export default {
         }
       });
     },
-    getParameter(data) {
-      console.log(data);
-      this.user_id = data;
-    },
     async saveGate() {
-      let datas = sessionStorage.getItem("CHGYWG_wx");
-      datas = { ...JSON.parse(datas), ...this.formData };
       let res = await SaveUserAnswer({
         mark: "CHGYWG_wx",
         user_id: this.user_id,
-        mark_value: JSON.stringify(datas),
+        // user_id: "USER202307301109254198",
+        mark_value: JSON.stringify(this.formData),
       });
       if (res.data.state) {
         this.$message({
@@ -159,30 +219,33 @@ export default {
           type: "success",
         });
         console.log(res);
-        sessionStorage.setItem("CHGYWG_wx", JSON.stringify(datas));
       } else {
         this.$message({
           message: `保存失败,原因是${res.data.message}`,
           type: "error",
         });
       }
-
     },
     async GetUserAnswer() {
       this.loading = true;
       let { data } = await GetUserAnswer({
         mark: "CHGYWG_wx",
         user_id: this.user_id,
+        // user_id: "USER202307301109254198",
       });
       this.loading = false;
       if (data.data && data.state) {
-        // console.log(JSON.parse(data.data.mark_value));
+        console.log(JSON.parse(data.data.mark_value));
         let obj = JSON.parse(data.data.mark_value);
         if (obj.ippz_ssid) {
-          this.formData.ippz_ssid = obj.ippz_ssid;
-          this.formData.ippz_rzfs = obj.ippz_rzfs;
-          this.formData.ippz_jmfs = obj.ippz_jmfs;
-          this.formData.ippz_mm = obj.ippz_mm;
+          // this.formData.ippz_ssid = obj.ippz_ssid;
+          // this.formData.ippz_rzfs = obj.ippz_rzfs;
+          // this.formData.ippz_jmfs = obj.ippz_jmfs;
+          // this.formData.ippz_mm = obj.ippz_mm;
+          for (let key in obj) {
+            this.formData[key] = obj[key];
+          }
+          console.log(this.formData);
         }
       }
     },
diff --git a/src/components/ChiGateway.vue b/src/components/ChiGateway.vue
index 02a2f83..71f25e3 100644
--- a/src/components/ChiGateway.vue
+++ b/src/components/ChiGateway.vue
@@ -162,8 +162,50 @@ export default {
         },
       ],
       formData: {
+        ippz_wllx: "",
+        ippz_ip: "",
+        ippz_zwym: "",
+        ippz_wg: "",
+        ippz_dns: "",
+        ippz_dns_by: "",
+
         wgpz_wgmc: "",
         wgpz_wgid: "",
+
+        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: "",
       },
       innerVisible: false,
       outerVisible: true,
@@ -206,8 +248,6 @@ export default {
       this.user_id = data;
     },
     async saveGate() {
-      let datas = sessionStorage.getItem("CHGYWG_yx");
-      this.formData = { ...JSON.parse(datas), ...this.formData };
       let res = await SaveUserAnswer({
         mark: "CHGYWG_yx",
         user_id: this.user_id,
@@ -219,7 +259,6 @@ export default {
           message: "保存成功",
           type: "success",
         });
-        sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.formData));
         this.$router.push(
           `/configuration?user_id=${this.user_id}&firstlabel=${this.formData.wgpz_wgid}`
         );
@@ -250,6 +289,48 @@ export default {
           if (obj.wgpz_wgid) {
             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.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.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;
+
+            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_tls = obj.mqtt_tls;
+            this.formData.mqtt_clearsession = obj.mqtt_clearsession;
+            this.formData.mqtt_sssjfbzt = obj.mqtt_sssjfbzt;
+            this.formData.mqtt_qos = obj.mqtt_qos;
+
+            this.formData.mqtt_cjd_sbmc = obj.mqtt_cjd_sbmc;
+            this.formData.mqtt_cjd_tagid = obj.mqtt_cjd_tagid;
           }
         }
       }
diff --git a/src/components/ChiGatewifi.vue b/src/components/ChiGatewifi.vue
index 72ba821..1d73236 100644
--- a/src/components/ChiGatewifi.vue
+++ b/src/components/ChiGatewifi.vue
@@ -41,16 +41,40 @@
 
     <div class="gateway">
       <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
-        <el-form :model="formData" :rules="rules" ref="formData" label-width="85px" class="demo-ruleForm">
+        <el-form
+          :model="formData"
+          :rules="rules"
+          ref="formData"
+          label-width="85px"
+          class="demo-ruleForm"
+        >
           <el-form-item label="网关名称:" prop="wgpz_wgmc">
-            <el-select v-model="formData.wgpz_wgmc" placeholder="请选择" style="width: 200px">
-              <el-option v-for="item in options1" :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 options1"
+                :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="formData.wgpz_wgid" placeholder="请选择" style="width: 200px">
-              <el-option v-for="item in options2" :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 options2"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -62,7 +86,12 @@
       </el-dialog>
     </div>
     <div>
-      <el-dialog title="系统提示" :visible.sync="innerVisible" append-to-body width="382px">
+      <el-dialog
+        title="系统提示"
+        :visible.sync="innerVisible"
+        append-to-body
+        width="382px"
+      >
         <p class="inner_content" style="color: #fff">
           请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
         </p>
@@ -105,8 +134,44 @@ export default {
         },
       ],
       formData: {
+        ippz_ssid: "",
+        ippz_rzfs: "WPA2-PSK", //答案：WPA2-PSK
+        ippz_jmfs: "AES", //答案：AES
+        ippz_mm: "",
+
         wgpz_wgmc: "",
         wgpz_wgid: "",
+
+        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_sssjfbzt: "",
+        mqtt_qos: "",
       },
       innerVisible: false,
       outerVisible: true,
@@ -139,13 +204,7 @@ export default {
         }
       });
     },
-    getParameter(data) {
-      console.log(data);
-      this.user_id = data;
-    },
     async saveGate() {
-      let datas = sessionStorage.getItem("CHGYWG_wx");
-      this.formData = { ...JSON.parse(datas), ...this.formData };
       let res = await SaveUserAnswer({
         mark: "CHGYWG_wx",
         user_id: this.user_id,
@@ -158,7 +217,6 @@ export default {
           type: "success",
         });
         console.log(res);
-        sessionStorage.setItem("CHGYWG_wx", JSON.stringify(this.formData));
         this.$router.push(`/chiwifidevice?user_id=${this.user_id}`);
       } else {
         this.$message({
@@ -166,13 +224,13 @@ export default {
           type: "error",
         });
       }
-
     },
     async GetUserAnswer() {
       this.loading = true;
       let { data } = await GetUserAnswer({
         mark: "CHGYWG_wx",
-        user_id: this.user_id,
+        // user_id: this.user_id,
+        user_id: "USER202307301109254198",
       });
       this.loading = false;
       if (data.data && data.state) {
@@ -181,11 +239,15 @@ export default {
         } else if (data.data.step == 2) {
           this.$router.push(`/chiwificollect?user_id=${this.user_id}`);
         } else {
-          console.log(JSON.parse(data.data.mark_value));
+          // console.log(JSON.parse(data.data.mark_value));
           let obj = JSON.parse(data.data.mark_value);
           if (obj.wgpz_wgid) {
-            this.formData.wgpz_wgid = obj.wgpz_wgid;
-            this.formData.wgpz_wgmc = obj.wgpz_wgmc;
+            // this.formData.wgpz_wgid = obj.wgpz_wgid;
+            // this.formData.wgpz_wgmc = obj.wgpz_wgmc;
+            for (let key in obj) {
+              this.formData[key] = obj[key];
+            }
+            console.log(this.formData);
           }
         }
       }
diff --git a/src/components/ChiWireld.vue b/src/components/ChiWireld.vue
index 318d0dd..51eb3a4 100644
--- a/src/components/ChiWireld.vue
+++ b/src/components/ChiWireld.vue
@@ -1,7 +1,6 @@
 <!-- 斥候有线网关页面 -->
 <template>
   <div>
-    <!-- <el-button type="info" plain @click="getShow">斥候有线网关</el-button> -->
     <div class="gateway" v-show="isShow">
       <div class="title">
         <p class="title_l">IP配置</p>
@@ -11,11 +10,25 @@
       <el-divider></el-divider>
       <div class="content">
         <div class="lan">
-          <el-form v-loading="loading" :model="formData" :label-position="labelPosition" :rules="rules" ref="formData">
+          <el-form
+            v-loading="loading"
+            :model="formData"
+            :label-position="labelPosition"
+            :rules="rules"
+            ref="formData"
+          >
             <el-row>
               <el-col :span="24">
-                <el-form-item label="网络类型:" :label-width="formLabelWidth" prop="ippz_wllx">
-                  <el-select v-model="formData.ippz_wllx" placeholder="静态IP" style="width: 200px">
+                <el-form-item
+                  label="网络类型:"
+                  :label-width="formLabelWidth"
+                  prop="ippz_wllx"
+                >
+                  <el-select
+                    v-model="formData.ippz_wllx"
+                    placeholder="静态IP"
+                    style="width: 200px"
+                  >
                     <el-option label="静态IP" value="静态IP"></el-option>
                   </el-select>
                 </el-form-item>
@@ -23,7 +36,11 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="IP地址:" :label-width="formLabelWidth" prop="ippz_ip">
+                <el-form-item
+                  label="IP地址:"
+                  :label-width="formLabelWidth"
+                  prop="ippz_ip"
+                >
                   <el-row>
                     <el-col :span="5">
                       <el-input v-model="ippz_ip1"></el-input>
@@ -46,7 +63,11 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="子网掩码:" :label-width="formLabelWidth" prop="ippz_zwym">
+                <el-form-item
+                  label="子网掩码:"
+                  :label-width="formLabelWidth"
+                  prop="ippz_zwym"
+                >
                   <el-row>
                     <el-col :span="5">
                       <el-input v-model="ippz_zwym1"></el-input>
@@ -115,7 +136,11 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="备用DNS:" :label-width="formLabelWidth" prop="ippz_dns_by">
+                <el-form-item
+                  label="备用DNS:"
+                  :label-width="formLabelWidth"
+                  prop="ippz_dns_by"
+                >
                   <el-row>
                     <el-col :span="5">
                       <el-input v-model="ippz_dns_by1"></el-input>
@@ -164,6 +189,7 @@ export default {
         ippz_dns: "",
         ippz_dns_by: "",
       },
+
       ippz_ip1: "192",
       ippz_ip2: "168",
       ippz_ip3: "1",
@@ -190,57 +216,110 @@ export default {
       count: 0,
       isShow: true,
       rules: {
-        ippz_wllx: [{ required: true, message: "请输入网络类型", trigger: "blur" }],
-        ippz_ip: [{
-          required: true,
-          message: "",
-          validator: this.validateIp,
-          trigger: "blur"
-        }],
-        ippz_zwym: [{
-          required: true,
-          message: "",
-          validator: this.validateZwym,
-          trigger: "blur"
-        }],
-        ippz_dns_by: [{
-          required: true,
-          message: "",
-          validator: this.validateDnsBy,
-          trigger: "blur"
-        }],
+        ippz_wllx: [
+          { required: true, message: "请输入网络类型", trigger: "blur" },
+        ],
+        ippz_ip: [
+          {
+            required: true,
+            message: "",
+            validator: this.validateIp,
+            trigger: "blur",
+          },
+        ],
+        ippz_zwym: [
+          {
+            required: true,
+            message: "",
+            validator: this.validateZwym,
+            trigger: "blur",
+          },
+        ],
+        ippz_dns_by: [
+          {
+            required: true,
+            message: "",
+            validator: this.validateDnsBy,
+            trigger: "blur",
+          },
+        ],
       },
+      //斥候有线所有答案
+      ippz_wllx: "",
+      ippz_ip: "",
+      ippz_zwym: "",
+      ippz_wg: "",
+      ippz_dns: "",
+      ippz_dns_by: "",
+
+      wgpz_wgmc: "",
+      wgpz_wgid: "",
+
+      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: "",
     };
   },
   created() {
     this.user_id = window.location.href.split("?")[1];
     this.GetUserAnswer();
   },
-  mounted() { },
+  mounted() {},
 
   methods: {
     //子网掩码验证
     validateZwym(rule, value, callback) {
       if (
         this.ippz_zwym1 +
-        "." +
-        this.ippz_zwym2 +
-        "." +
-        this.ippz_zwym3 +
-        "." +
-        this.ippz_zwym4 ===
+          "." +
+          this.ippz_zwym2 +
+          "." +
+          this.ippz_zwym3 +
+          "." +
+          this.ippz_zwym4 ===
         "..."
       ) {
         callback(new Error("请输入子网掩码"));
       } 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.ippz_zwym1 +
-          "." +
-          this.ippz_zwym2 +
-          "." +
-          this.ippz_zwym3 +
-          "." +
-          this.ippz_zwym4
+            "." +
+            this.ippz_zwym2 +
+            "." +
+            this.ippz_zwym3 +
+            "." +
+            this.ippz_zwym4
         )
       ) {
         callback(new Error("请输入有效的子网掩码"));
@@ -252,24 +331,24 @@ export default {
     validateIp(rule, value, callback) {
       if (
         this.ippz_ip1 +
-        "." +
-        this.ippz_ip2 +
-        "." +
-        this.ippz_ip3 +
-        "." +
-        this.ippz_ip4 ===
+          "." +
+          this.ippz_ip2 +
+          "." +
+          this.ippz_ip3 +
+          "." +
+          this.ippz_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.ippz_ip1 +
-          "." +
-          this.ippz_ip2 +
-          "." +
-          this.ippz_ip3 +
-          "." +
-          this.ippz_ip4
+            "." +
+            this.ippz_ip2 +
+            "." +
+            this.ippz_ip3 +
+            "." +
+            this.ippz_ip4
         )
       ) {
         callback(new Error("请输入有效的IP地址"));
@@ -281,24 +360,24 @@ export default {
     validateMrwg(rule, value, callback) {
       if (
         this.ippz_wg1 +
-        "." +
-        this.ippz_wg2 +
-        "." +
-        this.ippz_wg3 +
-        "." +
-        this.ippz_wg4 ===
+          "." +
+          this.ippz_wg2 +
+          "." +
+          this.ippz_wg3 +
+          "." +
+          this.ippz_wg4 ===
         "..."
       ) {
         callback(new Error("请输入网关地址"));
       } 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.ippz_wg1 +
-          "." +
-          this.ippz_wg2 +
-          "." +
-          this.ippz_wg3 +
-          "." +
-          this.ippz_wg4
+            "." +
+            this.ippz_wg2 +
+            "." +
+            this.ippz_wg3 +
+            "." +
+            this.ippz_wg4
         )
       ) {
         callback(new Error("请输入有效的网关地址"));
@@ -310,24 +389,24 @@ export default {
     validateDnsBy(rule, value, callback) {
       if (
         this.ippz_dns_by1 +
-        "." +
-        this.ippz_dns_by2 +
-        "." +
-        this.ippz_dns_by3 +
-        "." +
-        this.ippz_dns_by4 ===
-        "..."
-      ) {
-        callback(new Error("请输入备用DNS服务器地址"));
-      } 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.ippz_dns_by1 +
           "." +
           this.ippz_dns_by2 +
           "." +
           this.ippz_dns_by3 +
           "." +
-          this.ippz_dns_by4
+          this.ippz_dns_by4 ===
+        "..."
+      ) {
+        callback(new Error("请输入备用DNS服务器地址"));
+      } 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.ippz_dns_by1 +
+            "." +
+            this.ippz_dns_by2 +
+            "." +
+            this.ippz_dns_by3 +
+            "." +
+            this.ippz_dns_by4
         )
       ) {
         callback(new Error("请输入有效的备用DNS服务器地址"));
@@ -361,7 +440,6 @@ export default {
     },
     // 保存数据,发送请求
     async saveAll() {
-      // this.dialogFormVisible = false;
       this.isShow = false;
       this.formData.ippz_ip = this.Merge(
         this.formData.ippz_ip,
@@ -398,25 +476,56 @@ export default {
         this.ippz_dns_by3,
         this.ippz_dns_by4
       );
+      let obj = {
+        ippz_wllx: this.formData.ippz_wllx,
+        ippz_ip: this.formData.ippz_ip,
+        ippz_zwym: this.formData.ippz_zwym,
+        ippz_wg: this.formData.ippz_wg,
+        ippz_dns: this.formData.ippz_dns,
+        ippz_dns_by: this.formData.ippz_dns_by,
+
+        wgpz_wgmc: this.wgpz_wgmc,
+        wgpz_wgid: this.wgpz_wgid,
+
+        sbpz_sbmc: this.sbpz_sbmc,
+        sbpz_kzqxy: this.sbpz_kzqxy,
+        sbpz_ip: this.sbpz_ip,
+        sbpz_port: this.sbpz_port,
+        sbpz_czdz: this.sbpz_czdz,
+        sbpz_lxzq: this.sbpz_lxzq,
+        sbpz_qyhmcj: this.sbpz_qyhmcj,
+        sbpz_qyplcj: this.sbpz_qyplcj,
+        sbpz_zdplcjs: this.sbpz_zdplcjs,
+        sbpz_cjcgsj: this.sbpz_cjcgsj,
+        sbpz_zqsbonchange: this.sbpz_zqsbonchange,
+        sbpz_txsjjg: this.sbpz_txsjjg,
+        sbpz_xqjcqxr: this.sbpz_xqjcqxr,
+        sbpz_bcjcqxr: this.sbpz_bcjcqxr,
+
+        cjdpz_tagid: this.mqtt_cjd_tagid,
+        cjdpz_mc: this.cjdpz_mc,
+        cjdpz_sjq: this.cjdpz_sjq,
+        cjdpz_jcqdz: this.cjdpz_cjsjlx,
+        cjdpz_cjsjlx: this.cjdpz_cjsjlx,
+        cjdpz_dxsx: this.cjdpz_dxsx,
+        cjdpz_scms: this.cjdpz_scms,
+      };
       let res = await SaveUserAnswer({
         mark: "CHGYWG_yx",
         user_id: this.user_id,
-        mark_value: JSON.stringify(this.formData),
+        mark_value: JSON.stringify(obj),
       });
       if (res.data.state) {
         this.$message({
           message: "保存成功",
           type: "success",
         });
-        console.log(res);
-      sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.formData));
-      }else{
+      } else {
         this.$message({
           message: `保存失败`,
           type: "error",
         });
       }
-
     },
     //读取缓存
     async GetUserAnswer() {
@@ -448,10 +557,54 @@ export default {
           this.ippz_dns2 = obj.ippz_dns.split(".")[1];
           this.ippz_dns3 = obj.ippz_dns.split(".")[2];
           this.ippz_dns4 = obj.ippz_dns.split(".")[3];
+          //拿到缓存数据保存在本页面
+          this.ippz_wllx = obj.ippz_wllx;
+          this.ippz_ip = obj.ippz_ip;
+          this.ippz_zwym = obj.ippz_zwym;
+          this.ippz_wg = obj.ippz_wg;
+          this.ippz_dns = obj.ippz_dns;
+          this.ippz_dns_by = obj.ippz_dns_by;
+
+          this.wgpz_wgmc = obj.wgpz_wgmc;
+          this.wgpz_wgid = obj.wgpz_wgid;
+
+          this.sbpz_sbmc = obj.sbpz_sbmc;
+          this.sbpz_kzqxy = obj.sbpz_kzqxy;
+          this.sbpz_ip = obj.sbpz_ip;
+          this.sbpz_port = obj.sbpz_port;
+          this.sbpz_czdz = obj.sbpz_czdz;
+          this.sbpz_lxzq = obj.sbpz_lxzq;
+          this.sbpz_qyhmcj = obj.sbpz_qyhmcj;
+          this.sbpz_qyplcj = obj.sbpz_qyplcj;
+          this.sbpz_zdplcjs = obj.sbpz_zdplcjs;
+          this.sbpz_cjcgsj = obj.sbpz_cjcgsj;
+          this.sbpz_zqsbonchange = obj.sbpz_zqsbonchange;
+          this.sbpz_txsjjg = obj.sbpz_txsjjg;
+          this.sbpz_xqjcqxr = obj.sbpz_xqjcqxr;
+          this.sbpz_bcjcqxr = obj.sbpz_bcjcqxr;
+
+          this.cjdpz_tagid = obj.mqtt_cjd_tagid;
+          this.cjdpz_mc = obj.cjdpz_mc;
+          this.cjdpz_sjq = obj.cjdpz_sjq;
+          this.cjdpz_jcqdz = obj.cjdpz_cjsjlx;
+          this.cjdpz_cjsjlx = obj.cjdpz_cjsjlx;
+          this.cjdpz_dxsx = obj.cjdpz_dxsx;
+          this.cjdpz_scms = obj.cjdpz_scms;
+
+          this.mqtt_ip = obj.mqtt_ip;
+          this.mqtt_wgsn = obj.mqtt_wgsn;
+          this.mqtt_port = obj.mqtt_port;
+          this.mqtt_keepalive = obj.mqtt_keepalive;
+          this.mqtt_tls = obj.mqtt_tls;
+          this.mqtt_clearsession = obj.mqtt_clearsession;
+          this.mqtt_sssjfbzt = obj.mqtt_sssjfbzt;
+          this.mqtt_qos = obj.mqtt_qos;
+
+          this.mqtt_cjd_sbmc = obj.mqtt_cjd_sbmc;
+          this.mqtt_cjd_tagid = obj.mqtt_cjd_tagid;
         }
       }
     },
-
   },
 };
 </script>
diff --git a/src/components/CloneWifi.vue b/src/components/CloneWifi.vue
index afff7a9..4e7a56c 100644
--- a/src/components/CloneWifi.vue
+++ b/src/components/CloneWifi.vue
@@ -4,8 +4,15 @@
     <!-- <div v-click-outside="closeMenu"> -->
     <!-- <el-button type="info" plain @click="dialogVisible = !dialogVisible">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,7 +29,12 @@
             MQTT Client
           </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>
@@ -32,30 +44,50 @@
             </el-row>
             <el-row class="serveip">
               <el-col :span="12">
-                <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-form-item prop="mqtt_ip1">
-                        <el-input v-model="mqtt_ip1" style="width: 43px; height: 30px" maxlength="3">
+                        <el-input
+                          v-model="mqtt_ip1"
+                          style="width: 43px; height: 30px"
+                          maxlength="3"
+                        >
                         </el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="1">. </el-col>
                     <el-col :span="5">
                       <el-form-item prop="mqtt_ip2">
-                        <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-form-item>
                     </el-col>
                     <el-col :span="1">.</el-col>
                     <el-col :span="5">
                       <el-form-item prop="mqtt_ip3">
-                        <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-form-item>
                     </el-col>
                     <el-col :span="1">.</el-col>
                     <el-col :span="5">
                       <el-form-item prop="mqtt_ip4">
-                        <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-form-item>
                     </el-col>
                   </el-row>
@@ -64,29 +96,63 @@
             </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="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-divider></el-divider>
             <el-row class="theme">
               <el-col :span="12">
-                <el-form-item label="实时数据发布的主题" style="display: block" label-width="168px" prop="mqtt_sssjfbzt">
+                <el-form-item
+                  label="实时数据发布的主题"
+                  style="display: block"
+                  label-width="168px"
+                  prop="mqtt_sssjfbzt"
+                >
                   <el-row>
                     <el-col :span="15">
-                      <el-input v-model="formData.mqtt_sssjfbzt" placeholder="" style="width: 200px"></el-input>
+                      <el-input
+                        v-model="formData.mqtt_sssjfbzt"
+                        placeholder=""
+                        style="width: 200px"
+                      ></el-input>
                     </el-col>
                     <el-col :span="9">
-                      <el-select v-model="formData.mqtt_qos" placeholder="请选择" style="width: 99px">
-                        <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
+                      <el-select
+                        v-model="formData.mqtt_qos"
+                        placeholder="请选择"
+                        style="width: 99px"
+                      >
+                        <el-option
+                          v-for="item in options1"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                        >
                         </el-option>
                       </el-select>
                     </el-col>
@@ -101,22 +167,47 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="上传模式:" :label-width="formLabelWidth" prop="mqtt_scms">
-                  <el-select v-model="formData.mqtt_scms" placeholder="请选择" style="width: 99px">
-                    <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
+                <el-form-item
+                  label="上传模式:"
+                  :label-width="formLabelWidth"
+                  prop="mqtt_scms"
+                >
+                  <el-select
+                    v-model="formData.mqtt_scms"
+                    placeholder="请选择"
+                    style="width: 99px"
+                  >
+                    <el-option
+                      v-for="item in options2"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="上传周期(s):" label-width="108px" prop="mqtt_sczq">
-                  <el-input v-model="formData.mqtt_sczq" placeholder="" style="width: 200px; height: 30px"></el-input>
+                <el-form-item
+                  label="上传周期(s):"
+                  label-width="108px"
+                  prop="mqtt_sczq"
+                >
+                  <el-input
+                    v-model="formData.mqtt_sczq"
+                    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_sjgl">
+                <el-form-item
+                  label="数据过滤:"
+                  :label-width="formLabelWidth"
+                  prop="mqtt_sjgl"
+                >
                   <el-row>
                     <el-col :span="24">
                       <el-checkbox-group v-model="formData.mqtt_sjgl">
@@ -137,7 +228,9 @@
         </div>
         <div>
           <div class="con_right">
-            <h3 class="mqtt" style="margin-top: 20px; color: white">MQTT Client采集点</h3>
+            <h3 class="mqtt" style="margin-top: 20px; color: white">
+              MQTT Client采集点
+            </h3>
             <el-divider></el-divider>
             <!-- <el-button type="info" plain @click="handleSelect">保存</el-button> -->
             <!-- <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect">
@@ -151,16 +244,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>
@@ -171,8 +272,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>
@@ -182,22 +289,55 @@
     </div>
     <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="gateWay"
+          :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="gateWay.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="gateWay.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>
           <el-form-item label="网关类型:" prop="wgpz_wglx">
-            <el-select v-model="gateWay.wgpz_wglx" placeholder="请选择" style="width: 200px">
-              <el-option v-for="item in opts3" :key="item.value" :label="item.label" :value="item.value">
+            <el-select
+              v-model="gateWay.wgpz_wglx"
+              placeholder="请选择"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in opts3"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -502,7 +642,7 @@ export default {
             required: true,
             message: "",
             validator: this.validateIp,
-            trigger: "blur"
+            trigger: "blur",
           },
         ],
         mqtt_port: [{ required: true, message: "请输入端口", trigger: "blur" }],
@@ -595,24 +735,24 @@ export default {
     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地址"));
@@ -791,12 +931,12 @@ export default {
         user_id: this.user_id,
         data: JSON.stringify(this.trees),
         type: "2",
-      })
+      });
       // console.log(result);
     },
     async getTree() {
-      console.log("12341")
-      let res = await GetTree({ user_id: this.user_id, type: "2", })
+      console.log("12341");
+      let res = await GetTree({ user_id: this.user_id, type: "2" });
       console.log(res);
       console.log(JSON.parse(res.data.data.data));
       this.trees = JSON.parse(res.data.data.data);
@@ -814,7 +954,7 @@ export default {
         }
       });
     },
-    // 
+    //
     async saveGates() {
       this.outerVisible = false;
       // this.innerVisible = false;
@@ -1021,4 +1161,4 @@ export default {
 .mqtt {
   margin-left: 20px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/ChWiredGatewayIP.vue b/src/views/ChWiredGatewayIP.vue
index f6d7e73..f297af1 100644
--- a/src/views/ChWiredGatewayIP.vue
+++ b/src/views/ChWiredGatewayIP.vue
@@ -8,28 +8,20 @@
 </template>
 
 <script>
-import ChiWireld from '@/components/ChiWireld.vue';
+import ChiWireld from "@/components/ChiWireld.vue";
 export default {
-  name: 'InternetCompetitionChWiredGatewayIP',
-  components:{
-    ChiWireld
+  name: "InternetCompetitionChWiredGatewayIP",
+  components: {
+    ChiWireld,
   },
   data() {
-    return {
-      
-    };
+    return {};
   },
 
-  mounted() {
-    
-  },
+  mounted() {},
 
-  methods: {
-    
-  },
+  methods: {},
 };
 </script>
 
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>
diff --git a/src/views/MqttConfigwifi.vue b/src/views/MqttConfigwifi.vue
index 8b2a5c0..258eb38 100644
--- a/src/views/MqttConfigwifi.vue
+++ b/src/views/MqttConfigwifi.vue
@@ -1,31 +1,23 @@
 <template>
-    <div>
-        <CloneWifi></CloneWifi>
-    </div>
+  <div>
+    <CloneWifi></CloneWifi>
+  </div>
 </template>
 
 <script>
-import CloneWifi from '@/components/CloneWifi.vue';
+import CloneWifi from "@/components/CloneWifi.vue";
 export default {
-    name: 'InternetCompetitionMqttConfigwifi',
-    components:{
-        CloneWifi
-    },
-    data() {
-        return {
-            
-        };
-    },
-    mounted() {
-        
-    },
+  name: "InternetCompetitionMqttConfigwifi",
+  components: {
+    CloneWifi,
+  },
+  data() {
+    return {};
+  },
+  mounted() {},
 
-    methods: {
-        
-    },
+  methods: {},
 };
 </script>
 
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>