shaogen1995 4 лет назад
Родитель
Сommit
0f41817633

+ 1 - 1
src/assets/style/initial.css

@@ -5,7 +5,7 @@ ul li {
 body {
   color:#a5acb3 ;
   background-color:#f0f2f5;
-  overflow: hidden;
+  /* overflow: hidden; */
 }
 * {
   margin: 0;

+ 6 - 0
src/router/index.js

@@ -78,6 +78,12 @@ const router = new VueRouter({
           path: 'holding3',
           meta: { myInd: 1 },
           component: () => import('@/views/holding/holding3.vue')
+        },
+        {
+          name: 'holding3_look',
+          path: 'holding3_look',
+          meta: { myInd: 1 },
+          component: () => import('@/views/holding/holding3_look.vue')
         }
       ]
     }

+ 3 - 2
src/views/holding/holding0.vue

@@ -171,7 +171,7 @@ export default {
   .left {
     width: 220px;
     min-width: 130px;
-    height: 100vh;
+    height: 868px;
     background-color: #fff;
     box-shadow: 1px 1px 10px 1px;
     ul {
@@ -193,6 +193,7 @@ export default {
   }
   .right {
     width: 100%;
+    height: 868px;
     .top {
       padding-left: 35px;
       display: flex;
@@ -205,7 +206,7 @@ export default {
     .conten {
       padding: 20px 20px 60px;
       width: 100%;
-      height: 850px;
+      height: 829px;
       .middle {
         position: relative;
         width: 100%;

+ 2 - 2
src/views/holding/holding0_add.vue

@@ -199,7 +199,7 @@ export default {
   .left {
     width: 220px;
     min-width: 130px;
-    height: 100vh;
+    height: 868px;
     background-color: #fff;
     box-shadow: 1px 1px 10px 1px;
     ul {
@@ -238,7 +238,7 @@ export default {
     padding: 40px 0 0 20px;
     flex: 1;
     background-color: #fff;
-    margin: 20px 20px 125px;
+    margin: 20px 20px 40px;
     .one_row {
       display: flex;
       justify-content: start;

+ 2 - 2
src/views/holding/holding0_audit.vue

@@ -192,7 +192,7 @@ export default {
   .left {
     width: 220px;
     min-width: 130px;
-    height: 100vh;
+    height: 868px;
     background-color: #fff;
     box-shadow: 1px 1px 10px 1px;
     ul {
@@ -230,7 +230,7 @@ export default {
     position: relative;
     flex: 1;
     background-color: #fff;
-    margin: 20px 20px 125px;
+    margin: 20px 20px 40px;
     padding: 35px;
     .info {
       display: flex;

+ 9 - 25
src/views/holding/holding0_result.vue

@@ -43,6 +43,12 @@
             >考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集
           </p>
         </div>
+        <div class="explain">
+          <p>
+            <span>审核说明:</span
+            >考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集
+          </p>
+        </div>
         <!-- 表格 -->
         <div class="table">
           <div class="title">
@@ -87,27 +93,8 @@
             </el-table-column>
           </el-table>
         </div>
-        <div class="txt">
-            <el-form
-          :model="fromData"
-          :rules="rules"
-          ref="fromData"
-          label-width="100px"
-          class="demo-ruleForm"
-        >
-          <el-form-item label="审核说明:" prop="textarea" style="width: 100%">
-            <el-input
-              type="textarea"
-              :rows="3"
-              v-model="fromData.textarea"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-            </el-form>
-        </div>
         <!-- 最下面的按钮 -->
           <div class="button">
-  <el-button type="primary">提交</el-button>
               <el-button @click="$router.go(-1)">返回</el-button>
           </div>
       </div>
@@ -190,7 +177,7 @@ export default {
   .left {
     width: 220px;
     min-width: 130px;
-    height: 100vh;
+    height: 868px;
     background-color: #fff;
     box-shadow: 1px 1px 10px 1px;
     ul {
@@ -228,7 +215,7 @@ export default {
     position: relative;
     flex: 1;
     background-color: #fff;
-    margin: 20px 20px 125px;
+    margin: 20px 20px 40px;
     padding: 35px;
     .info {
       display: flex;
@@ -273,9 +260,6 @@ export default {
         line-height: 50px;
       }
     }
-    .txt{
-      margin-top: 38px;
-    }
     .button {
       position: absolute;
       left: 50%;
@@ -283,7 +267,7 @@ export default {
       transform: translateX(-50%);
       width: 240px;
       display: flex;
-      justify-content: space-between;
+      justify-content: center;
     }
   }
 }

+ 2 - 2
src/views/holding/holding1.vue

@@ -148,7 +148,7 @@ export default {
   .left {
     width: 220px;
     min-width: 130px;
-    height: 100vh;
+    height: 868px;
     background-color: #fff;
     box-shadow: 1px 1px 10px 1px;
     ul {
@@ -182,7 +182,7 @@ export default {
     .conten {
       padding: 20px 20px 60px;
       width: 100%;
-      height: 850px;
+      height: 829px;
       .middle {
         position: relative;
         width: 100%;

+ 2 - 2
src/views/holding/holding2.vue

@@ -145,7 +145,7 @@ export default {
   display: flex;
   .left {
     width: 220px;
-    height: 100vh;
+    height: 868px;
     min-width: 130px;
     background-color: #fff;
     box-shadow: 1px 1px 10px 1px;
@@ -180,7 +180,7 @@ export default {
     .conten {
       padding: 20px 20px 60px;
       width: 100%;
-      height: 850px;
+      height: 829px;
       .middle {
         position: relative;
         width: 100%;

+ 3 - 3
src/views/holding/holding3.vue

@@ -89,7 +89,7 @@
               </el-table-column>
               <el-table-column label="操作" width="130">
                 <template #default>
-                  <el-button type="text">查看</el-button>
+                  <el-button type="text" @click="$router.push('/layout/holding3_look')">查看</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -207,7 +207,7 @@ export default {
   display: flex;
   .left {
     width: 220px;
-    height: 100vh;
+    height: 868px;
     min-width: 130px;
     background-color: #fff;
     box-shadow: 1px 1px 10px 1px;
@@ -242,7 +242,7 @@ export default {
     .conten {
       padding: 20px 20px 60px;
       width: 100%;
-      height: 850px;
+      height: 829px;
       .middle {
         position: relative;
         width: 100%;

+ 251 - 0
src/views/holding/holding3_look.vue

@@ -0,0 +1,251 @@
+<!--  -->
+<template>
+  <div class="holding3_look">
+    <div class="left">
+      <ul>
+        <li v-for="(item, index) in tabList" :key="index" @click="skip(index)">
+          <i class="el-icon-edit"></i>
+          {{ item }}
+        </li>
+      </ul>
+    </div>
+    <div class="right">
+      <div class="top">
+        <el-breadcrumb separator="/">
+          <el-breadcrumb-item to="">首页</el-breadcrumb-item>
+          <el-breadcrumb-item to="">馆藏管理</el-breadcrumb-item>
+          <el-breadcrumb-item>藏品总账</el-breadcrumb-item>
+          <el-breadcrumb-item id="mytitle">查看</el-breadcrumb-item>
+        </el-breadcrumb>
+      </div>
+      <div class="conten">
+        <div class="conten_left">
+          <img src="../../assets/img/user.png" alt="" />
+        </div>
+        <div class="conten_right">
+          <div class="title">
+            <h3>陶瓷花瓶</h3>
+            <div>已入库</div>
+          </div>
+          <div class="info">
+            <div class="row">
+              <div><span>藏品名称:</span>1111</div>
+              <div><span>总登记号:</span>1111</div>
+            </div>
+            <div class="row">
+              <div><span>编号类型:</span>1111</div>
+              <div><span>藏品编号:</span>1111</div>
+            </div>
+            <div class="row">
+              <div><span>原名:</span>1111</div>
+              <div><span>年代:</span>1111</div>
+            </div>
+            <div class="row">
+              <div><span>文物类别:</span>1111</div>
+              <div><span>文物质地:</span>1111</div>
+            </div>
+            <div class="row">
+              <div><span>数量:</span>1111</div>
+              <div><span>集体数量:</span>1111</div>
+            </div>
+            <div class="row">
+              <div><span>通长:</span>1111</div>
+              <div><span>通宽:</span>1111</div>
+              <div><span>通高:</span>1111</div>
+            </div>
+            <div class="row">
+              <div><span>文物类别:</span>1111</div>
+              <div><span>具体质量:</span>1111</div>
+            </div>
+            <div class="row">
+              <div><span>文物价格:</span>1111</div>
+              <div><span>完残程度:</span>1111</div>
+            </div>
+            <div class="row">
+              <div><span>保存状态:</span>1111</div>
+              <div><span>入藏时间范围:</span>1111</div>
+            </div>
+            <div class="row">
+              <div><span>藏品位置:</span>1111</div>
+            </div>
+          </div>
+        </div>
+        <div class="conten_bot">
+          <div class="resource">
+
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
+// 例如:import 《组件名称》 from '《组件路径》';
+
+export default {
+  name: 'Holding3_look',
+  // import引入的组件需要注入到对象中才能使用
+  components: {},
+  data () {
+    // 这里存放数据
+    return {
+      tabList: [
+        '藏品登记',
+        '入库管理',
+        '出库管理',
+        '藏品总账',
+        '藏品盘核',
+        '藏品注销'
+      ]
+    }
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {
+    skip (index) {
+      this.$router.push(`/layout/holding${index}`).catch(() => {})
+    }
+  },
+  // 生命周期 - 创建完成(可以访问当前this实例)
+  created () {},
+  // 生命周期 - 挂载完成(可以访问DOM元素)
+  mounted () {},
+  beforeCreate () {}, // 生命周期 - 创建之前
+  beforeMount () {}, // 生命周期 - 挂载之前
+  beforeUpdate () {}, // 生命周期 - 更新之前
+  updated () {}, // 生命周期 - 更新之后
+  beforeDestroy () {}, // 生命周期 - 销毁之前
+  destroyed () {}, // 生命周期 - 销毁完成
+  activated () {} // 如果页面有keep-alive缓存功能,这个函数会触发
+}
+</script>
+<style lang='less' scoped>
+body {
+  overflow: auto;
+}
+//@import url(); 引入公共css类
+.holding3_look {
+  /deep/#mytitle > span {
+    font-weight: 800;
+  }
+  display: flex;
+  .left {
+    width: 220px;
+    min-width: 130px;
+    height: 868px;
+    background-color: #fff;
+    box-shadow: 1px 1px 10px 1px;
+    ul {
+      li:nth-of-type(4) {
+        background-color: #e6f7ff;
+      }
+      li {
+        cursor: pointer;
+        color: black;
+        font-size: 16px;
+        height: 60px;
+        display: flex;
+        align-items: center;
+        i {
+          margin: 0 18px;
+        }
+      }
+    }
+  }
+  .right {
+    width: 100%;
+    height: 868px;
+    display: flex;
+    flex-direction: column;
+    .top {
+      padding-left: 35px;
+      display: flex;
+      align-items: center;
+      box-shadow: 1px 1px 10px 1px;
+      margin-left: 2px;
+      height: 40px;
+      background-color: #fff;
+    }
+  }
+  .conten {
+    display: flex;
+    flex-wrap: wrap;
+    flex: 1;
+    background-color: #fff;
+    margin: 20px 20px 40px;
+    padding: 10px 0 0 40px;
+    .conten_left {
+      width: 465px;
+      height: 500px;
+      background-color: #fafafa;
+      display: flex;
+      align-items: center;
+      img {
+        width: 100%;
+        height: 340px;
+        border: 15px solid #ccc;
+      }
+    }
+    .conten_right {
+      flex: 1;
+      height: 500px;
+      .title {
+        display: flex;
+        border-bottom: 2px solid #ccc;
+        height: 50px;
+        align-items: center;
+        margin: 0 20px;
+        h3 {
+          font-size: 20px;
+          color: black;
+          margin: 0 25px 0 35px;
+        }
+        &>div{
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 50px;
+          height: 20px;
+          background-color: #40a9ff;
+          color: #fff;
+          font-size: 13px;
+          border-radius: 5px;
+        }
+      }
+      .info {
+        margin: 20px 0 0 55px;
+        width: 90%;
+        // margin-bottom: 60px;
+        .row {
+          display: flex;
+          & > div {
+            padding-left: 20px;
+            flex: 1;
+            height: 43px;
+            line-height: 43px;
+            border: 1px solid #ccc;
+            font-size: 16px;
+            color: black;
+            span {
+              font-weight: 700;
+            }
+          }
+        }
+      }
+    }
+    .conten_bot{
+      height: 250px;
+      width: 100%;
+      .resource {
+        height: 200px;
+        border: 1px solid #ccc;
+      }
+    }
+  }
+}
+</style>

+ 2 - 2
src/views/holding/初始化.vue

@@ -77,7 +77,7 @@ export default {
   .left {
     width: 220px;
     min-width: 130px;
-    height: 100vh;
+    height: 868px;
     background-color: #fff;
     box-shadow: 1px 1px 10px 1px;
     ul {
@@ -114,7 +114,7 @@ export default {
   .conten {
     flex: 1;
     background-color: #fff;
-    margin: 20px 20px 125px;
+    margin: 20px 20px 110px;
   }
 }
 </style>

+ 1 - 1
src/views/login/index.vue

@@ -65,7 +65,7 @@ export default {
 .login {
   position: relative;
   width: 100%;
-  height: 100vh;
+  height: 868px;
   background-color: #f0f2f5;
   .input {
     position: absolute;