Просмотр исходного кода

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

haojianlong 5 лет назад
Родитель
Сommit
1714577dab

+ 3 - 0
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -101,6 +101,9 @@
       },
       handleCopy(data) {
         let oInput = document.createElement('input')
+        if(typeof data != 'string') {
+          data = JSON.stringify(data)
+        }
         oInput.value = data
         document.body.appendChild(oInput)
         oInput.select()

+ 21 - 14
src/views/screen/splitscreen/spaceledger/index.vue

@@ -65,13 +65,11 @@
 
                   <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
                 </section>
-                <div v-show="activeTab === 'dynamicData'" style="width:100%;height:100%;">
-                  <div class="content-box">
+                <section v-show="activeTab === 'dynamicData'">
                     <div style="text-align: left;margin-bottom: 10px">
                       <el-checkbox v-model="onlyMessage" @change="handleCheckbox">只看需采集的信息点</el-checkbox>
                     </div>
-
-                    <el-table ref="multipleTable" :data="tableData" stripe :header-cell-style="headerStyle">
+                    <el-table height="700" ref="multipleTable" :data="tableData" stripe :header-cell-style="headerStyle">
                       <el-table-column prop="InfoPointName" label="信息点名称">
                         <template slot-scope="scope">
                           <div>
@@ -92,8 +90,8 @@
                         </div>
                       </template>
                     </el-table>
-                  </div>
-                </div>
+
+                </section>
                 <div v-if="activeTab === 'objectRelationship'" class="objectRelationship">
                   <div class="objectRelationship-left">
                     <h5>空间内设备:</h5>
@@ -193,6 +191,7 @@
         this.getData();
       }
     },
+
     updated() {
     },
     computed: {},
@@ -459,16 +458,24 @@
 </script>
 
 <style lang="less" scoped>
-.box.screen-router {
-  padding: 0;
-  section {
-    .el-container {
-      padding: 0;
+  /*.box{*/
+  /*  .content-box{*/
+  /*    width: 100%;*/
+  /*    height: calc(100% - 90px);*/
+  /*  }*/
+  /*}*/
+  .box.screen-router {
+    padding: 0;
+
+    section {
+      .el-container {
+        padding: 0;
+      }
     }
   }
-}
-.el-header {
-  padding: 0;
+
+  .el-header {
+    padding: 0;
   height: 30px !important;
   margin-top: -10px;
   .boxName {