shaun-sheep 5 years ago
parent
commit
1daba88c71

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

@@ -18,7 +18,7 @@
                 type="primary"
                 size="mini"
                 @click="handleCopy"
-              >复制
+              >复制N
               </el-button>
             </div>
             <el-button
@@ -85,8 +85,8 @@
 <style scoped lang="less">
   .exhibition-baseInformation {
     section {
-      border: 1px solid #eeeeee;
-      margin: 10px;
+      /*border: 1px solid #eeeeee;*/
+      /*margin: 10px;*/
       .base{
         margin: 10px;
         font-weight: 600;

+ 25 - 0
src/components/ledger/details/detail/exhibitionCrux.vue

@@ -0,0 +1,25 @@
+<template>
+  <section class="exhibition-crux">
+    <p class="title">{{exhibitionCrux.title}}</p>
+  </section>
+</template>
+
+<script>
+  export default {
+    name: "exhibition-crux",
+    props: ['exhibitionCrux']
+  }
+</script>
+
+<style lang="less" scoped>
+  .exhibition-crux {
+    .title {
+      border-left: 8px solid black;
+      margin: 10px 40px 10px 10px;
+      font-weight: 600;
+      text-indent: 10px;
+      display: inline-block;
+
+    }
+  }
+</style>

+ 19 - 0
src/components/ledger/details/detail/exhibitionMaintain.vue

@@ -0,0 +1,19 @@
+<template>
+  <div class="exhibition-maintain">
+    <p class="title">
+      <span class=" iconfont icon-weixiubeijing" style="margin: 0 30px 0 10px"></span>
+      {{exhibitionMaintain.title}}
+      <span class="iconfont icon-right" style="float: right;margin-right: 20px"></span></p>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "exhibitionMaintain",
+props:['exhibitionMaintain']
+  }
+</script>
+
+<style scoped>
+
+</style>

+ 45 - 10
src/views/ledger/facility/details/index.vue

@@ -29,26 +29,37 @@
     </div>
     <div class="content">
       <div class="content-left">
-        <div class="content-keyPoint"></div>
-        <div class="content-showType"></div>
+        <div class="content-keyPoint">
+          <exhibitionCrux :exhibitionCrux="exhibitionCrux"/>
+        </div>
+        <div class="content-showType">
+          <selectRadio :selectRadio="selectRadio"/>
+        </div>
         <div class="content-point">
           <div class="content-point-left">
             <el-scrollbar style="height:100%;">
-              <div style="height:1000px"></div>
+              <div style="height:1000px">
+                <exhibitionBaseInformation :exhibitionBaseInformation="exhibitionBaseInformation"/>
+              </div>
             </el-scrollbar>
           </div>
           <div class="content-point-right">
             <el-scrollbar style="height:100%;">
-              <div style="height:1000px"></div>
+              <div style="height:1000px">6</div>
             </el-scrollbar>
           </div>
         </div>
       </div>
       <div class="content-right">
-        <div class="content-repair"></div>
+        <div class="content-repair">
+          <exhibitionMaintain :exhibitionMaintain="exhibitionMaintain"/>
+        </div>
         <div class="content-media">
           <el-scrollbar style="height:100%;">
-            <div style="height:1000px"></div>
+            <div style="height:1000px">
+              <exhibitionImage :exhibitionImage="exhibitionImage"/>
+              <exhibitionFile :exhibitionFile="exhibitionFile"/>
+            </div>
           </el-scrollbar>
         </div>
       </div>
@@ -61,14 +72,23 @@
   import exhibitionBaseInformation from "@/components/ledger/details/detail/exhibitionBaseInformation";
   import exhibitionFile from "@/components/ledger/details/detail/exhibitionFile";
   import exhibitionImage from "@/components/ledger/details/detail/exhibitionImage";
+  import exhibitionCrux from "@/components/ledger/details/detail/exhibitionCrux";
+  import exhibitionMaintain from "@/components/ledger/details/detail/exhibitionMaintain";
   import selectRadio from "@/components/ledger/details/detail/selectRadio";
 
-  import { getDataDictionary, queryEquip, BeatchQueryParam } from "@/api/scan/request";
-  import { mapGetters, mapActions } from "vuex";
+  import {getDataDictionary, queryEquip} from "@/api/scan/request";
+  import {mapGetters} from "vuex";
 
   export default {
     name: "deviceDetails",
-    components: {exhibitionBaseInformation, exhibitionFile, exhibitionImage, selectRadio},
+    components: {
+      exhibitionBaseInformation,
+      exhibitionFile,
+      exhibitionImage,
+      exhibitionMaintain,
+      selectRadio,
+      exhibitionCrux
+    },
     created() {
       this.id = this.$route.query.equipId;
       this.name = this.$route.query.equipName;
@@ -129,9 +149,15 @@
             supplierParameters: '台账参数 / 供应购买'
           }
         },
+        exhibitionMaintain:{
+          title:'维修/维保记录'
+        },
         exhibitionFile: {},
+        exhibitionCrux: {
+          title: '关键信息点:'
+        },
         exhibitionImage: {
-          title:'图片'
+          title: '图片'
         }
       }
     },
@@ -176,6 +202,7 @@
 </script>
 
 <style scoped lang="less">
+  @bgc:#fff;
   .tableDisplay {
     .header {
       padding-bottom: 10px;
@@ -202,12 +229,14 @@
           height: 100px;
           margin-bottom: 10px;
           overflow: hidden;
+          background: @bgc;
         }
         .content-showType {
           height: 50px;
           border: 1px solid #ccc;
           border-bottom: none;
           box-sizing: border-box;
+          background: @bgc;
         }
         .content-point {
           display: flex;
@@ -215,9 +244,12 @@
           height: calc(100% - 160px);
           border: 1px solid #ccc;
           box-sizing: border-box;
+          background: @bgc;
+
           .content-point-left {
             flex: 1;
           }
+
           .content-point-right {
             width: 400px;
             border-left: 1px solid #ccc;
@@ -229,12 +261,15 @@
         margin-left: 10px;
         .content-repair {
           height: 50px;
+          line-height: 50px;
           margin-bottom: 10px;
           border: 1px solid #ccc;
+          background: @bgc;
         }
         .content-media {
           height: calc(100% - 60px);
           border: 1px solid #ccc;
+          background: @bgc;
         }
       }
     }