Bladeren bron

扫楼bug修改

zhangyu 5 jaren geleden
bovenliggende
commit
aab87b442c

+ 11 - 7
src/components/data_admin/buildData/style.scss

@@ -54,8 +54,8 @@ h3 {
     padding: 20px;
     box-sizing: border-box;
     border-radius: 4px;
-    // flex-direction: column;
-    // display: flex;
+    flex-direction: column;
+    display: flex;
     background-color: $bg2;
     .icon {
         position: absolute;
@@ -268,21 +268,25 @@ h3 {
         }
     }
     .build_table {
-        // flex: 1;
+        flex: 1;
         overflow: hidden;
         width: 100%;
+        display: flex;
+        min-height: 400px;
         // height: 400px;
         .el-tabs {
-            // height: 400px;
+            flex: 1;
             width: 100%;
+            display: flex;
+            flex-direction: column;
         }
         .el-tabs__content {
             height: 100%;
         }
         .data_page {
-            // position: absolute;
+            position: absolute;
             width: 100%;
-            // bottom: 0;
+            bottom: 0;
             background-color: #fff;
         }
     }
@@ -317,7 +321,7 @@ h3 {
             height: 100%;
             width: 4rem;
             z-index: 90;
-            // flex: 1;
+            flex: 1;
             i {
                 cursor: pointer;
                 font-size: 4rem;

+ 6 - 1
src/components/ledger/handsontables/device.vue

@@ -556,7 +556,7 @@ export default {
       }
 
       let data = showTools.changeHeader(arr, readArr, this.onlyRead, this.isWatch, this.allMess)
-      data.unshift("操作", "当前关联的资产", "所属系统实例");
+      data.unshift("操作", "当前关联的资产", "所属系统实例", "包含的部件");
       return data;
     },
 
@@ -567,6 +567,7 @@ export default {
      * @return 处理好的数据格式
      */
     getType(list) {
+      debugger;
       let arr = tools.copyArr(list)
       // 如果不是只读状态,添加四大厂商选择
       if (!this.onlyRead) {
@@ -602,6 +603,10 @@ export default {
           data: "linkSystem",
           renderer: text.systemList,
           readOnly: true
+        }, {
+          data: "partsNum",
+          renderer: text.systemList,
+          readOnly: true
         }
       );
       //   data.splice(1, 0, {

+ 6 - 3
src/views/data_admin/buildData/index.vue

@@ -571,11 +571,14 @@
                 document.onmousemove = function(e) {
                     e.preventDefault();
                     let endY = e.clientY;
-                    let headerH = _this.$refs['header'].offsetHeight + 48 + _this.$refs['operate'].offsetHeight + 300
-                    if (headerH > endY) {
+                    // let headerH = _this.$refs['header'].offsetHeight + 48 + _this.$refs['operate'].offsetHeight + 300
+                    // if (headerH > endY) {
+                    //     _this.mouseUp()
+                    // }
+                    _this.picHeight = _this.picHeight - endY + startY;
+                    if (_this.picHeight > 245){
                         _this.mouseUp()
                     }
-                    _this.picHeight = _this.picHeight - endY + startY;
                     startY = endY;
                     //如果图片容器高度大于表格最小高度,停止拖拽
                 };