Browse Source

Merge branch 'screen' into dev

yangjunjing 5 năm trước cách đây
mục cha
commit
773f4a8d37
1 tập tin đã thay đổi với 1 bổ sung5 xóa
  1. 1 5
      src/views/screen/splitscreen/spaceledger/index.vue

+ 1 - 5
src/views/screen/splitscreen/spaceledger/index.vue

@@ -40,8 +40,6 @@
                   <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.key}`" alt="空间图片">
                 </div>
               </div>
-              <div class="space-img" v-if="!spaceDetails.Pic">
-              </div>
               <div v-show="!spaceDetails.Pic" style="height:100%;transform: translateY(50%);textAlign:center;">
                 <i class="icon-wushuju iconfont"></i>
                 数据暂无
@@ -53,9 +51,7 @@
           <el-tabs v-model="activeTab" type='card'>
             <template v-for="(item,index) in tabsList">
               <el-tab-pane :name="item.Code" :key="index" :label="item.Name">
-                <div v-show="activeTab === 'staticData'" style="width:100%;height:100%;textAlign:left;" id="iframe-box">
-                  <!-- <iframe height="100%" width="100%" :src="iframeSrc" id="screenIframe"></iframe> -->
-                </div>
+                <div v-show="activeTab === 'staticData'" style="width:100%;height:100%;textAlign:left;" id="iframe-box"></div>
                 <div v-show="activeTab === 'dynamicData'" style="width:100%;height:100%;">
                   <div class="content-box" style="height:100%;">
                     <el-table ref="multipleTable" :data="tableData" stripe height="100%" :header-cell-style="headerStyle">