Browse Source

fix:附加数据功能接口联调+阿里云服务部署调试

xiebeibei 3 years ago
parent
commit
7c20bbe22a
2 changed files with 5 additions and 5 deletions
  1. 1 1
      package.json
  2. 4 4
      src/views/equipment/addDataDialog.vue

+ 1 - 1
package.json

@@ -6,7 +6,7 @@
         "host": "60.205.177.43",
         "path": "/root/apps/web/wandaBmGuide",
         "user": "root",
-        "password": "persagy_2021Persagy%#$=",
+        "password": "persagy_2021Persagy%#$",
         "local": "wandaBmGuide"
     },
     "scripts": {

+ 4 - 4
src/views/equipment/addDataDialog.vue

@@ -48,12 +48,12 @@
                     <span class="bg"></span>
                     <span>编辑附加数据</span>
                 </div>
-                <div class="dialog-right-table"  v-if="systemName=='弱电系统'">
+                <div class="dialog-right-table" ref="dialogRightTable"  v-if="systemName=='弱电系统'">
                     <a-table :columns="examplesTableHeaderREdit" :data-source="addDataTableData" bordered :pagination="false" :scroll="{ y: height }" >
                     </a-table>
                     <i @click="addFun" class="el-icon-circle-plus-outline" style="color:#2AA4FF;font-size: 16px;position: absolute;margin-top: -5px;margin-left: -5px;cursor: pointer; "></i>
                 </div>
-                <div class="dialog-right-table" v-if="systemName=='消防系统'">
+                <div class="dialog-right-table" ref="dialogRightTable" v-if="systemName=='消防系统'">
                     <a-table :columns="examplesTableHeaderEdit" :data-source="addDataTableData" bordered :pagination="false" :scroll="{ y: height }" >
                    <span slot="fireZone" slot-scope="text,record,index">
                        <a-input v-model="text" placeholder="请输入" type="normal" @change="getFireZoneFun(text,index)" :maxLength="15"/>
@@ -567,9 +567,9 @@
              this.systemCode=this.$parent.smsxt;
              this.floor= this.$parent.floorInfo.gname;
             this.$nextTick(()=>{
-                this.height = document.getElementsByClassName('dialog-right-table')[0].clientHeight-62;
+                this.height =window.innerHeight-200;
                 window.addEventListener('resize',()=>{
-                    this.height = document.getElementsByClassName('dialog-right-table')[0].clientHeight-62;
+                    this.height = window.innerHeight-200;
                 })
            })
         },