shaun-sheep 5 lat temu
rodzic
commit
9c4ac35899
1 zmienionych plików z 39 dodań i 31 usunięć
  1. 39 31
      src/components/ledger/details/tableDisplay.vue

+ 39 - 31
src/components/ledger/details/tableDisplay.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="tableDisplay">
-<<<<<<< HEAD
-<!--    <el-page-header @back="goBack" content="详情页面">-->
-<!--    </el-page-header>-->
-    <el-row :gutter="24">
-=======
     <!-- <el-row :gutter="24">
->>>>>>> 086ece3b873c315c7eb6c172760870588bbe4e72
       <el-col :span="18">
         设备信息点
         <div class="grid-content bgc-white">
@@ -26,7 +20,6 @@
       <el-col :span="6">
         <div class="grid-content bgc-white">
           <exhibitionImage :exhibitionImage="exhibitionImage"/>
-          <exhibitionFile :exhibitionFile="exhibitionFile"/>
         </div>
       </el-col>
     </el-row> -->
@@ -34,7 +27,31 @@
       <el-button style="float:left;" size="small" type="default" icon="el-icon-back" @click="goBack"></el-button>
       <span class="details-title"><b>设备本地名称-设备本地编码</b></span>
     </div>
-    <div class="content"></div>
+    <div class="content">
+      <el-row :gutter="24" class="mt-10">
+        <el-col :span="18" class="border">
+          <!--          设备信息点-->
+          <div class="grid-content bgc-white">
+            <selectRadio :selectRadio="selectRadio"/>
+            <el-row>
+              <!--              :span的值可以根据条件改变 是一个24 or 两个 16:8-->
+              <el-col :span="16">
+                <exhibitionBaseInformation/>
+              </el-col>
+              <el-col :span="8">
+                能耗信息点
+              </el-col>
+            </el-row>
+
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div class="grid-content bgc-white">
+            <exhibitionImage :exhibitionImage="exhibitionImage"/>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
     <div class="footer"></div>
   </div>
 </template>
@@ -89,13 +106,9 @@
             supplierParameters: '台账参数 / 供应购买'
           }
         },
-        exhibitionFile: {
-          title: '文件'
-        },
+        exhibitionFile: {},
         exhibitionImage: {
-          title: '图片',
-          videoTitle: '视频',
-
+          title: '图片'
         }
       }
     },
@@ -110,11 +123,6 @@
       }, {
         label: '资产详情'
       }])
-    },
-    methods:{
-      // goBack() {
-      //   console.log('go back');
-      // }
     }
   }
 </script>
@@ -131,22 +139,22 @@
       }
     }
 
-<<<<<<< HEAD
-    .el-col {
-      border-radius: 4px;
-    }
-
-
-
-    .grid-content {
-      border-radius: 4px;
-      min-height: 36px;
-=======
     .content {
       box-sizing: border-box;
       border: 1px solid #ccc;
       height: calc(100% - 82px);
->>>>>>> 086ece3b873c315c7eb6c172760870588bbe4e72
+
+      .border {
+
+      }
+
+      .bgc-white {
+        background: #fff;
+      }
+
+      .mt-10 {
+        margin-top: 10px;
+      }
     }
 
     .footer {