1

src/components/ChiCollection.vue

@@ -4,12 +4,23 @@
     <!-- 设置树形控件 -->
     <!-- <el-button type="info" plain @click="dialogVisible = true">斥候采集点设置</el-button> -->
     <div v-show="dialogVisible" class="tree_menu">
-      <el-tree :data="trees" node-key="id" :props="defaultProps" default-expand-all @node-contextmenu="rightClick"
+      <el-tree
-        @node-click="treeNodeClick" ref="tree">
+        :data="trees"
+        node-key="id"
+        :props="defaultProps"
+        default-expand-all
+        @node-contextmenu="rightClick"
+        @node-click="treeNodeClick"
+        ref="tree"
+      >
       </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
+          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>
@@ -34,40 +45,63 @@
         <el-table-column property="cjdpz_tagid" label="TagID">
           <template slot-scope="scope">
             <el-select v-model="scope.row.cjdpz_tagid" placeholder="">
-              <el-option v-for="(option, index) in options1" :key="index" :label="option.label"
+              <el-option
-                :value="option.value"></el-option>
+                v-for="(option, index) in options1"
+                :key="index"
+                :label="option.label"
+                :value="option.value"
+              ></el-option>
             </el-select>
           </template>
         </el-table-column>
         <el-table-column property="cjdpz_mc" label="名称">
           <template slot-scope="scope">
             <el-select v-model="scope.row.cjdpz_mc" placeholder="">
-              <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
+              <el-option
-                :value="option.value"></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="cjdpz_jcqdz" label="地址">
           <template slot-scope="scope">
             <el-select v-model="scope.row.cjdpz_dz" placeholder="">
-              <el-option v-for="(option, index) in options3" :key="index" :label="option.label"
+              <el-option
-                :value="option.value"></el-option>
+                v-for="(option, index) in options3"
+                :key="index"
+                :label="option.label"
+                :value="option.value"
+              ></el-option>
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column property="cjdpz_jcqdz" label="寄存地址(十进制)" width="150px">
+        <el-table-column
+          property="cjdpz_jcqdz"
+          label="寄存地址(十进制)"
+          width="150px"
+        >
           <template slot-scope="scope">
             <!-- <el-select v-model="scope.row.cjdpz_jcqdz" placeholder="1">
               <el-option v-for="(option,index) in options4" :key="index" :label="option.label" :value="option.value"></el-option>
             </el-select> -->
-            <el-input v-model="scope.row.cjdpz_jcqdz" placeholder="1-9999"></el-input>
+            <el-input
+              v-model="scope.row.cjdpz_jcqdz"
+              placeholder="1-9999"
+            ></el-input>
           </template>
         </el-table-column>
         <el-table-column property="cjdpz_cjsjlx" label="采集数据类型">
           <template slot-scope="scope">
             <el-select v-model="scope.row.cjdpz_cjsjlx" placeholder="">
-              <el-option v-for="(option, index) in options5" :key="index" :label="option.label"
+              <el-option
-                :value="option.value"></el-option>
+                v-for="(option, index) in options5"
+                :key="index"
+                :label="option.label"
+                :value="option.value"
+              ></el-option>
             </el-select>
           </template>
         </el-table-column>
@@ -75,16 +109,24 @@
         <el-table-column property="cjdpz_dxsx" label="读写属性">
           <template slot-scope="scope">
             <el-select v-model="scope.row.cjdpz_dxsx" placeholder="">
-              <el-option v-for="(option, index) in options6" :key="index" :label="option.label"
+              <el-option
-                :value="option.value"></el-option>
+                v-for="(option, index) in options6"
+                :key="index"
+                :label="option.label"
+                :value="option.value"
+              ></el-option>
             </el-select>
           </template>
         </el-table-column>
         <el-table-column property="cjdpz_scms" label="上传模式">
           <template slot-scope="scope">
             <el-select v-model="scope.row.cjdpz_scms" placeholder="">
-              <el-option v-for="(option, index) in options7" :key="index" :label="option.label"
+              <el-option
-                :value="option.value"></el-option>
+                v-for="(option, index) in options7"
+                :key="index"
+                :label="option.label"
+                :value="option.value"
+              ></el-option>
             </el-select>
           </template>
         </el-table-column>
@@ -98,16 +140,40 @@
     <!-- 网关信息 -->
     <div class="gateway">
       <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
-        <el-form :model="tableData[0]" :rules="rulesGate" ref="gateWay" label-width="85px" class="demo-ruleForm">
+        <el-form
+          :model="tableData[0]"
+          :rules="rulesGate"
+          ref="gateWay"
+          label-width="85px"
+          class="demo-ruleForm"
+        >
           <el-form-item label="网关名称:" prop="wgpz_wgmc">
-            <el-select v-model="tableData[0].wgpz_wgmc" placeholder="请选择" style="width: 200px">
+            <el-select
-              <el-option v-for="item in opts1" :key="item.value" :label="item.label" :value="item.value">
+              v-model="tableData[0].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="tableData[0].wgpz_wgid" placeholder="请选择" style="width: 200px">
+            <el-select
-              <el-option v-for="item in opts2" :key="item.value" :label="item.label" :value="item.value">
+              v-model="tableData[0].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>
@@ -122,26 +188,61 @@
     <!-- 设备信息 -->
     <div class="deviceinfo">
       <!-- <el-tree :data="datas2" :props="defaultProps" @node-click="handleDetailClick" default-expand-all></el-tree> -->
-      <el-dialog title="新建设备" :visible.sync="add_device" width="902px" v-loading="loading">
+      <el-dialog
-        <el-form :model="tableData[0]" :label-position="labelPosition" :rules="rulesDevice" ref="formData">
+        title="新建设备"
+        :visible.sync="add_device"
+        width="902px"
+        v-loading="loading"
+      >
+        <el-form
+          :model="tableData[0]"
+          :label-position="labelPosition"
+          :rules="rulesDevice"
+          ref="formData"
+        >
           <el-row>
             <el-col :span="12">
-              <el-form-item label="设备名称:" :label-width="formLabelWidth" prop="sbpz_sbmc">
+              <el-form-item
-                <el-select v-model="tableData[0].sbpz_sbmc" placeholder="" style="width: 200px; height: 30px">
+                label="设备名称:"
-                  <el-option v-for="item in opt1" :key="item.value" :label="item.label" :value="item.value">
+                :label-width="formLabelWidth"
+                prop="sbpz_sbmc"
+              >
+                <el-select
+                  v-model="tableData[0].sbpz_sbmc"
+                  placeholder=""
+                  style="width: 200px; height: 30px"
+                >
+                  <el-option
+                    v-for="item in opt1"
+                    :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-form-item
+                label="控制器协议:"
+                :label-width="formLabelWidth"
+                prop="sbpz_kzqxy"
+              >
                 <el-row>
                   <el-col :span="18">
-                    <el-input v-model="tableData[0].sbpz_kzqxy" placeholder="" style="width: 200px; height: 30px"
+                    <el-input
-                      disabled></el-input>
+                      v-model="tableData[0].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-button
+                      style="width: 50px; height: 30px"
+                      @click="getDriveName"
+                      >...</el-button
+                    >
                   </el-col>
                 </el-row>
               </el-form-item>
@@ -149,42 +250,86 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="IP地址:" :label-width="formLabelWidth" prop="sbpz_ip">
+              <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-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-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-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-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-form-item
-                <el-input v-model="tableData[0].sbpz_port" placeholder="" style="width: 200px; height: 30px"></el-input>
+                label="端口号:"
+                :label-width="formLabelWidth"
+                prop="sbpz_port"
+              >
+                <el-input
+                  v-model="tableData[0].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-form-item
-                <el-input v-model="tableData[0].sbpz_czdz" placeholder="" style="width: 200px; height: 30px"></el-input>
+                label="从站地址:"
+                :label-width="formLabelWidth"
+                prop="sbpz_czdz"
+              >
+                <el-input
+                  v-model="tableData[0].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-form-item
-                <el-input v-model="tableData[0].sbpz_lxzq" placeholder="" style="width: 200px; height: 30px"></el-input>
+                label="轮询周期(ms):"
+                :label-width="formLabelWidth"
+                prop="sbpz_lxzq"
+              >
+                <el-input
+                  v-model="tableData[0].sbpz_lxzq"
+                  placeholder=""
+                  style="width: 200px; height: 30px"
+                ></el-input>
                 <div class="infos">1-3600</div>
               </el-form-item>
             </el-col>
@@ -195,14 +340,20 @@
             <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="
+              <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>
+              >
+                收起</el-button
+              >
             </div>
           </div>
           <el-divider></el-divider>
@@ -210,41 +361,76 @@
             <!-- <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-form-item
+                  label="启用毫秒采集:"
+                  :label-width="formLabelWidth"
+                  prop="sbpz_qyhmcj"
+                >
                   <el-switch v-model="tableData[0].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-form-item
+                  label="启用批量采集:"
+                  :label-width="formLabelWidth"
+                  prop="sbpz_qyplcj"
+                >
                   <el-switch v-model="tableData[0].sbpz_qyplcj"></el-switch>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="最大批量采集数:" label-width="126px" prop="sbpz_zdplcjs">
+                <el-form-item
-                  <el-input v-model="tableData[0].sbpz_zdplcjs" style="width: 200px; height: 30px"></el-input>
+                  label="最大批量采集数:"
+                  label-width="126px"
+                  prop="sbpz_zdplcjs"
+                >
+                  <el-input
+                    v-model="tableData[0].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-form-item
-                  <el-input v-model="tableData[0].sbpz_cjcgsj" style="width: 200px; height: 30px"></el-input>
+                  label="采集超过时间(ms):"
+                  label-width="140px"
+                  prop="sbpz_cjcgsj"
+                >
+                  <el-input
+                    v-model="tableData[0].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-form-item
-                  <el-switch v-model="tableData[0].sbpz_zqsbonchange"></el-switch>
+                  label="周期上报OnChange数据:"
+                  label-width="186px"
+                  prop="sbpz_zqsbonchange"
+                >
+                  <el-switch
+                    v-model="tableData[0].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-form-item
-                  <el-input v-model="tableData[0].sbpz_txsjjg" style="width: 200px; height: 30px"></el-input>
+                  label="通讯事件间隔(ms):"
+                  label-width="140px"
+                  prop="sbpz_txsjjg"
+                >
+                  <el-input
+                    v-model="tableData[0].sbpz_txsjjg"
+                    style="width: 200px; height: 30px"
+                  ></el-input>
                   <div class="infos">0-1000</div>
                 </el-form-item>
               </el-col>
@@ -252,17 +438,44 @@
             <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-form-item
-                    <el-select v-model="tableData[0].sbpz_xqjcqxr" placeholder="" style="width: 200px; height: 30px">
+                    label="线圈寄存器写入功能码:"
-                      <el-option v-for="item in opt2" :key="item.value" :label="item.label" :value="item.value">
+                    label-width="120px"
+                    style="line-height: 20px"
+                    class="cjjcq_code"
+                  >
+                    <el-select
+                      v-model="tableData[0].sbpz_xqjcqxr"
+                      placeholder=""
+                      style="width: 200px; height: 30px"
+                    >
+                      <el-option
+                        v-for="item in opt2"
+                        :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-form-item
-                    <el-select v-model="tableData[0].sbpz_bcjcqxr" placeholder="" style="width: 200px; height: 30px">
+                    label="线圈寄存器写入功能码:"
-                      <el-option v-for="item in opt3" :key="item.value" :label="item.label" :value="item.value">
+                    label-width="120px"
+                    class="cjjcq_code"
+                  >
+                    <el-select
+                      v-model="tableData[0].sbpz_bcjcqxr"
+                      placeholder=""
+                      style="width: 200px; height: 30px"
+                    >
+                      <el-option
+                        v-for="item in opt3"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -283,9 +496,13 @@
         <i class="el-icon-close title_r" @click="diag_drive = false"></i>
       </div>
       <el-divider></el-divider>
-      <el-tree :data="datas2" :props="defaultProps" @node-click="handleDetailClick" default-expand-all></el-tree>
+      <el-tree
+        :data="datas2"
+        :props="defaultProps"
+        @node-click="handleDetailClick"
+        default-expand-all
+      ></el-tree>
     </div>
-
   </div>
 </template>
 
@@ -913,7 +1130,7 @@ export default {
           if (ev.target !== document.querySelector(".el-menu-item.is-active")) {
             this.foo();
           }
-        })
+        });
       }
     },
     // 点击时候的判断,判断是否为新增网关
@@ -923,8 +1140,7 @@ export default {
         this.add_device = true;
         this.add_passage = false;
         this.outerVisible = false;
-      }
+      } else if (index == 2) {
-      else if (index == 2) {
         this.$refs["tree"].remove(this.nodekey);
         this.sendTree();
       }
@@ -1094,7 +1310,14 @@ export default {
       var obj = {
         sbpz_sbmc: this.tableData[0].sbpz_sbmc,
         sbpz_kzqxy: this.tableData[0].sbpz_kzqxy,
-        sbpz_ip: this.sbpz_ip1 + "." + this.sbpz_ip2 + "." + this.sbpz_ip3 + "." + this.sbpz_ip4,
+        sbpz_ip:
+          this.sbpz_ip1 +
+          "." +
+          this.sbpz_ip2 +
+          "." +
+          this.sbpz_ip3 +
+          "." +
+          this.sbpz_ip4,
         sbpz_port: this.tableData[0].sbpz_port,
         sbpz_czdz: this.tableData[0].sbpz_czdz,
         sbpz_lxzq: this.tableData[0].sbpz_lxzq,
@@ -1461,7 +1684,6 @@ export default {
 
 /deep/ .footer_con {
   .cjjcq_code {
-
     // margin-left: 140px !important;
     .el-form-item__content {
       margin-left: 140px !important;

src/components/ChiGate.vue

@@ -209,14 +209,45 @@ export default {
         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;
+          // for (let key in obj) {
-          // this.formData.ippz_rzfs = obj.ippz_rzfs;
+          //   this.formData[key] = obj[key];
-          // this.formData.ippz_jmfs = obj.ippz_jmfs;
+          // }
-          // this.formData.ippz_mm = obj.ippz_mm;
+          // console.log(this.formData);
-          for (let key in obj) {
+          (this.formData.ippz_ssid = obj.ippz_ssid),
-            this.formData[key] = obj[key];
+            (this.formData.ippz_rzfs = obj.ippz_rzfs),
-          }
+            (this.formData.ippz_jmfs = obj.ippz_jmfs),
-          console.log(this.formData);
+            (this.formData.ippz_mm = obj.ippz_mm),
+            (this.formData.wgpz_wgmc = obj.wgpz_wgmc),
+            (this.formData.wgpz_wgid = obj.wgpz_wgid),
+            (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.cjdpz_tagid),
+            (this.formData.cjdpz_mc = obj.cjdpz_mc),
+            (this.formData.cjdpz_sjq = obj.cjdpz_sjq),
+            (this.formData.cjdpz_jcqdz = obj.cjdpz_jcqdz),
+            (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_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);
         }
       }
     },

src/components/ChiGateway.vue

@@ -3,16 +3,40 @@
   <div>
     <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-select
-              <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
+              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-select
-              <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
+              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>
@@ -24,7 +48,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">
           请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
         </p>
@@ -166,7 +195,7 @@ export default {
       });
     },
     async saveGate() {
-      console.log(this.formData)
+      console.log(this.formData);
       let res = await SaveUserAnswer({
         mark: "CHGYWG_yx",
         user_id: this.user_id,
@@ -206,7 +235,7 @@ export default {
           // this.isShow = true;
           console.log(JSON.parse(data.data.mark_value));
           let obj = JSON.parse(data.data.mark_value);
-          console.log(obj)
+          console.log(obj);
           this.formData.wgpz_wgid = obj.wgpz_wgid;
           this.formData.wgpz_wgmc = obj.wgpz_wgmc;
           this.formData.ippz_wllx = obj.ippz_wllx;
@@ -234,7 +263,7 @@ export default {
           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_jcqdz = obj.cjdpz_jcqdz;
           this.formData.cjdpz_cjsjlx = obj.cjdpz_cjsjlx;
           this.formData.cjdpz_dxsx = obj.cjdpz_dxsx;
           this.formData.cjdpz_scms = obj.cjdpz_scms;

src/views/Cockpit.vue

@@ -52,7 +52,7 @@
       <div class="chartsDiv">
         <div class="mainshaftChart">
           <p>
-            <span>主轴转换监控</span>
+            <span>主轴转速监控</span>
           </p>
           <div id="mainshaftChart" v-show="zzgrade && resultObj.YXCHWG"></div>
         </div>
@@ -116,13 +116,6 @@ export default {
     };
   },
   created() {
-    // this.getClGrade();
-    // this.getJtGrade();
-    // this.getZzGrade();
-    // this.getQxGrade();
-    // this.getYxGrade();
-    // this.getWxGrade();
-
     // DB网关有线-产量
     // DB网关无线-急停状态
     // 斥候网关有线-主轴转速
@@ -131,15 +124,15 @@ export default {
     // 有线串口 - 负载电流;
     // 无线串口 - 额定电流;
     // 这两个只要设备连线和设备配置信息对就展示数据;
-
     this.user_id = decodeURIComponent(window.location.href)
       .split("?")[1]
       .split("|")[0];
-    console.log(this.user_id);
+    // this.user_id = "USER202311150117464304";
     this.toObj(
       decodeURIComponent(window.location.href).split("?")[1].split("|")[1]
     );
   },
+  // http://localhost:8080/#/cockpit?USER202311150117464304%7CYXDBWG,True%3BYXCHWG,True%3BWXDBWG,True%3BWXCHWG,True%3BSerialServerYX,True%3BSerialServerWX,True%3BYXDBWG,True%3BYXCHWG,True%3BWXDBWG,True%3BWXCHWG,True%3BSerialServerYX,True%3BSerialServerWX,True%3B
   methods: {
     //获取三维数据
     toObj(data) {
@@ -161,8 +154,14 @@ export default {
           resultObject[key] = value;
         }
       }
-      console.log(resultObject);
       this.resultObj = resultObject;
+      alert(this.resultObj.SerialServerWX);
+      this.getClGrade();
+      this.getJtGrade();
+      this.getZzGrade();
+      this.getQxGrade();
+      this.getYxGrade();
+      this.getWxGrade();
     },
     //根据屏幕自适应图表字体
     fontSize(res) {
@@ -194,6 +193,7 @@ export default {
         mark: "DB-IotLite_yx",
       });
       this.clgrade = data.data;
+      this.getLoadEcharts("productChart", this.productChartOption);
     },
     //获取急停状态分数
     async getJtGrade() {
@@ -202,7 +202,8 @@ export default {
         mark: "DB-IotLite_wx",
       });
       this.jtgrade = data.data;
-      this.jtgrade = true;
+      // this.jtgrade = true;
+      this.getLoadEcharts("two", this.stopChartOption);
     },
     //获取主轴转速分数
     async getZzGrade() {
@@ -211,6 +212,7 @@ export default {
         mark: "CHGYWG_yx",
       });
       this.zzgrade = data.data;
+      this.getLoadEcharts("mainshaftChart", this.mainshaftChartOption);
     },
     //获取切削速度分数
     async getQxGrade() {
@@ -219,6 +221,7 @@ export default {
         mark: "CHGYWG_wx",
       });
       this.qxgrade = data.data;
+      this.getLoadEcharts("one", this.CuttingSpeedChartOption);
     },
     //获取有线串口分数
     async getYxGrade() {
@@ -227,33 +230,23 @@ export default {
         mark: "CKFWQ_yx",
       });
       this.yxgrade = data.data;
+      this.getLoadEcharts("loadChart", this.loadChartChartOption);
     },
     //获取无线串口分数
-    async getWxGrade() {
+    getWxGrade() {
-      let { data } = await getGrade({
+      getGrade({
         user_id: this.user_id,
         mark: "CKFWQ_wx",
-      });
+      }).then((res) => {
-      this.wxgrade = data.data;
+        console.log(res);
-      // this.wxgrade = true;
+        this.wxgrade = res.data.data;
         // this.resultObj.SerialServerWX = true;
+        // alert(this.resultObj.SerialServerWX, "11111111");
+        this.getLoadEcharts("ratedChart", this.ratedChartOption);
+      });
     },
   },
   mounted() {
-    this.getClGrade();
-    this.getJtGrade();
-    this.getZzGrade();
-    this.getQxGrade();
-    this.getYxGrade();
-    this.getWxGrade();
-    this.$nextTick(() => {
-      this.getLoadEcharts("productChart", this.productChartOption);
-      this.getLoadEcharts("mainshaftChart", this.mainshaftChartOption);
-      this.getLoadEcharts("loadChart", this.loadChartChartOption);
-      this.getLoadEcharts("ratedChart", this.ratedChartOption);
-      this.getLoadEcharts("one", this.CuttingSpeedChartOption);
-      this.getLoadEcharts("two", this.stopChartOption);
-    });
     //实时更新日期数据
     this.timer = setInterval(() => {
       this.time = this.$moment().format("HH:mm:ss");