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

src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -63,6 +63,9 @@ export default {
       options: [{//方案
         value: '1',
         label: '标准'
+      }, {
+        value: '2',
+        label: '极简'
       }],
       tableData: [],
       loading: false,

src/components/point/report/integrateStatistics.vue

@@ -20,7 +20,7 @@
       <hr style="width:90%;margin-top: 1px;" />
       <div ref="barchart" class="chart" id="barchart" :style="{height:barChartData.length * 120 + 'px'}"></div>
     </div>
-    <!-- 点位/表号共更好对应总览 -->
+    <!-- 点位/表号功能号对应总览 -->
     <pointTabOverview ref="overviewDialog"></pointTabOverview>
   </div>
 </template>

src/components/point/report/pointTabOverview.vue

@@ -1,8 +1,8 @@
 <template>
-  <!-- 点位/表号共更好对应总览 -->
+  <!-- 点位/表号功能号对应总览 -->
   <div id="pointTabOverview">
     <!-- 对话框 -->
-    <el-dialog title="点位/表号共更好对应总览" :visible.sync="dialogVisiable">
+    <el-dialog title="点位/表号功能号对应总览" :visible.sync="dialogVisiable">
       <el-tabs v-model="activeName" style="height:600px;overflow:auto;">
         <!-- 一对多数据 -->
         <el-tab-pane label="一对多" name="otm">

src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -92,6 +92,9 @@ export default {
       options: [{//方案
         value: '1',
         label: '标准'
+      }, {
+        value: '2',
+        label: '极简'
       }],
       tableData: [],
       multipleSelection:[],

src/views/model/report/deleted.vue

@@ -72,7 +72,8 @@ export default {
       view: '',
     }
   },
-  mounted() { },
+  mounted() {
+  },
   created() {
     this.equipComDelList = decodeURIComponent(this.$route.query.equipComDelList);
     this.queryToBelDelEquip();
@@ -168,7 +169,6 @@ export default {
         Filters: `ModelId in ${this.equipComDelList}`
       }
       toBeDelEquipPage(params, res => {
-        console.log(res.Content, 123)
         this.pageData = res.Content;
         this.pageData.forEach(item => {
           if (item.BIMLocation) {

src/views/model/report/index.vue

@@ -480,6 +480,12 @@ export default {
 }
 </style>
 <style lang="less">
+.el-table {
+  .el-table__fixed {
+    height: auto !important;
+    bottom: 17px;
+  }
+}
 .el-table__row.warning-row {
   td {
     background: #f3f3f3 !important;

src/views/model/report/supplement.vue

@@ -100,6 +100,7 @@ export default {
     }
   },
   mounted() {
+    // document.addEventListener('scroll', this.onmousewheel, false);
     this.getToBeSuppement();
   },
   created() {
@@ -109,6 +110,14 @@ export default {
     ...mapGetters('layout', ['projectId'])
   },
   methods: {
+    // onmousewheel() {
+    //   let scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+    //   let clientHeight = document.documentElement.clientHeight;
+    //   let contentTop = document.body.scrollHeight;
+    //   if (scrollTop + clientHeight + 100 >= contentTop) {
+    //     console.log(1);
+    //   }
+    // },
     copyContent(element) {
       // 双击复制
       let content = element.target.innerText;
@@ -230,6 +239,9 @@ export default {
 
 
 <style lang="less" scoped>
+html {
+  height: auto;
+}
 // 取消打印功能默认的左右边距
 @media print {
   @page {
@@ -353,4 +365,9 @@ export default {
 canvas {
   position: static !important;
 }
+</style>
+<style>
+html {
+  height: auto;
+}
 </style>

src/views/screen/splitscreen/spaceledger/index.vue

@@ -47,14 +47,14 @@
             </el-scrollbar>
           </div>
         </el-aside>
-        <el-main style="height:100%">
+        <el-main>
           <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"></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">
+                  <div class="content-box">
+                    <el-table ref="multipleTable" :data="tableData" stripe :header-cell-style="headerStyle">
                       <el-table-column prop="InfoPointName" label="信息点名称">
                         <template slot-scope="scope">
                           <div>
@@ -76,7 +76,7 @@
                     </el-table>
                   </div>
                 </div>
-                <div v-if="activeTab === 'objectRelationship'" class="objectRelationship" style="height:100%">
+                <div v-if="activeTab === 'objectRelationship'" class="objectRelationship">
                   <div class="objectRelationship-left">
                     <h5>空间内设备：</h5>
                     <eqToSpaceTable :params="params" type="Equipment"></eqToSpaceTable>
@@ -402,14 +402,15 @@ export default {
 #floorCanvas {
   position: static;
 }
-</style>
-<style>
-.el-scrollbar__wrap {
+/deep/ .el-scrollbar__wrap {
   height: 100%;
   overflow-x: hidden !important;
   overflow-y: auto !important;
 }
-.el-tabs__content {
+.objectRelationship{
   height: calc(100% - 46px) !important;
 }
+/deep/ .el-tabs__content{
+  height: 100%;
+}
 </style>