shaogen1995 4 лет назад
Родитель
Сommit
b06665fa68
63 измененных файлов с 625 добавлено и 474 удалено
  1. 53 0
      src/assets/style/initial.css
  2. 3 3
      src/components/tabLeft.vue
  3. 3 3
      src/components/tabLeft2.vue
  4. 3 3
      src/components/tabLeft3.vue
  5. 3 3
      src/components/tabLeft4.vue
  6. 5 7
      src/views/collect/collect0.vue
  7. 3 3
      src/views/collect/collect0_DiaEdit.vue
  8. 8 10
      src/views/collect/collect0_look.vue
  9. 6 8
      src/views/collect/collect1.vue
  10. 1 1
      src/views/collect/collect1_Dialog.vue
  11. 4 6
      src/views/collect/collect1_add.vue
  12. 4 6
      src/views/collect/collect1_audit.vue
  13. 4 6
      src/views/collect/collect1_look.vue
  14. 6 8
      src/views/collect/collect2.vue
  15. 1 1
      src/views/collect/collect2_Dialog.vue
  16. 4 6
      src/views/collect/collect2_add.vue
  17. 4 6
      src/views/collect/collect2_audit.vue
  18. 4 6
      src/views/collect/collect2_look.vue
  19. 6 8
      src/views/collect/collect3.vue
  20. 3 5
      src/views/collect/collect3_audit.vue
  21. 3 3
      src/views/collect/collect3_audit_Dia.vue
  22. 3 5
      src/views/collect/collect3_look.vue
  23. 6 7
      src/views/holding/holding0.vue
  24. 3 3
      src/views/holding/holding0_DiaEdit.vue
  25. 3 3
      src/views/holding/holding0_Dialog.vue
  26. 4 6
      src/views/holding/holding0_add.vue
  27. 4 6
      src/views/holding/holding0_audit.vue
  28. 3 3
      src/views/holding/holding0_audit_Dia.vue
  29. 4 6
      src/views/holding/holding0_result.vue
  30. 7 9
      src/views/holding/holding1.vue
  31. 1 1
      src/views/holding/holding1_Dialog.vue
  32. 4 6
      src/views/holding/holding1_add.vue
  33. 4 6
      src/views/holding/holding1_audit.vue
  34. 4 6
      src/views/holding/holding1_look.vue
  35. 7 9
      src/views/holding/holding2.vue
  36. 1 1
      src/views/holding/holding2_Dialog.vue
  37. 4 6
      src/views/holding/holding2_add.vue
  38. 4 6
      src/views/holding/holding2_audit.vue
  39. 5 7
      src/views/holding/holding2_look.vue
  40. 8 10
      src/views/holding/holding3.vue
  41. 3 3
      src/views/holding/holding3_DiaEdit.vue
  42. 309 143
      src/views/holding/holding3_look.vue
  43. 7 9
      src/views/holding/holding4.vue
  44. 3 5
      src/views/holding/holding4_audit.vue
  45. 3 3
      src/views/holding/holding4_audit_Dia.vue
  46. 3 5
      src/views/holding/holding4_look.vue
  47. 7 9
      src/views/holding/holding5.vue
  48. 1 1
      src/views/holding/holding5_Dialog.vue
  49. 4 6
      src/views/holding/holding5_add.vue
  50. 4 6
      src/views/holding/holding5_audit.vue
  51. 4 6
      src/views/holding/holding5_look.vue
  52. 3 5
      src/views/holding/初始模板.vue
  53. 2 2
      src/views/home/News.vue
  54. 2 2
      src/views/home/index.vue
  55. 16 6
      src/views/layout/index.vue
  56. 10 10
      src/views/statistics/statistics0.vue
  57. 5 7
      src/views/statistics/statistics1.vue
  58. 7 9
      src/views/statistics/statistics2.vue
  59. 3 5
      src/views/statistics/statistics2_audit.vue
  60. 3 5
      src/views/statistics/statistics2_look.vue
  61. 4 6
      src/views/system/system1.vue
  62. 4 6
      src/views/system/system2.vue
  63. 8 7
      src/views/system/system3.vue

+ 53 - 0
src/assets/style/initial.css

@@ -25,4 +25,57 @@ a {
 }
 }
 .right{
 .right{
   max-width: 1723px;
   max-width: 1723px;
+}
+.el-button--primary{
+  /* color: #3E5EB3; */
+  color: #FFF;
+  background-color: #3E5EB3;
+  border-color: #3E5EB3;
+}
+.el-button:focus, .el-button:hover{
+  color: #3E5EB3;
+}
+.el-button--primary:focus, .el-button--primary:hover{
+  color: #FFF;
+  background-color: rgba(62, 94, 179, .8);
+  border-color: #3E5EB3;
+}
+.el-button--text{
+  color: #3E5EB3;
+}
+.el-pagination.is-background .el-pager li:not(.disabled).active{
+  background-color: #3E5EB3;
+}
+.el-pagination.is-background .el-pager li:not(.disabled):hover{
+  color:#3E5EB3 ;
+}
+.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li{
+  color: #999;
+}
+.el-select-dropdown__item.selected{
+  color: #3E5EB3;
+}
+.el-pagination__sizes .el-input .el-input__inner:hover{
+  border-color: #3E5EB3;
+}
+.el-input.is-active .el-input__inner, .el-input__inner:focus{
+  border-color: #3E5EB3;
+}
+.el-select .el-input.is-focus .el-input__inner{
+  border-color: #3E5EB3;
+}
+.el-select .el-input__inner:focus{
+  border-color: #3E5EB3;
+}
+.el-range-editor.is-active, .el-range-editor.is-active:hover{
+  border-color: #3E5EB3;
+}
+.el-date-table td.end-date span, .el-date-table td.start-date span{
+  background-color: #3E5EB3;
+}
+.el-date-table td.today span{
+  color: #3E5EB3;
+}
+.el-textarea__inner:focus{
+  border-color: #3E5EB3;
 }
 }

+ 3 - 3
src/components/tabLeft.vue

@@ -81,11 +81,11 @@ export default {
         }
         }
       }
       }
       li:hover{
       li:hover{
-        background:#e6f7ff ;
+        background:#3E5EB3 ;
       }
       }
       .active {
       .active {
-        background:#e6f7ff ;
-        color: #409eff;
+        background:#3E5EB3 ;
+        color: #fff;
       }
       }
     }
     }
   }</style>
   }</style>

+ 3 - 3
src/components/tabLeft2.vue

@@ -66,11 +66,11 @@ export default {
         }
         }
               }
               }
       li:hover{
       li:hover{
-        background:#e6f7ff ;
+        background:#3E5EB3 ;
       }
       }
       .active {
       .active {
-        background:#e6f7ff ;
-        color: #409eff;
+        background:#3E5EB3 ;
+        color: #fff;
       }
       }
     }
     }
   }</style>
   }</style>

+ 3 - 3
src/components/tabLeft3.vue

@@ -72,11 +72,11 @@ export default {
         }
         }
       }
       }
       li:hover{
       li:hover{
-        background:#e6f7ff ;
+        background:#3E5EB3 ;
       }
       }
       .active {
       .active {
-        background:#e6f7ff ;
-        color: #409eff;
+        background:#3E5EB3 ;
+        color: #fff;
       }
       }
     }
     }
   }</style>
   }</style>

+ 3 - 3
src/components/tabLeft4.vue

@@ -59,11 +59,11 @@ export default {
         }
         }
             }
             }
       li:hover{
       li:hover{
-        background:#e6f7ff ;
+        background:#3E5EB3 ;
       }
       }
       .active {
       .active {
-        background:#e6f7ff ;
-        color: #409eff;
+        background:#3E5EB3 ;
+        color: #fff;
       }
       }
     }
     }
   }</style>
   }</style>

+ 5 - 7
src/views/collect/collect0.vue

@@ -67,7 +67,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table" v-if="change">
           <div class="table" v-if="change">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -302,17 +302,15 @@ export default {
   display: flex;
   display: flex;
   .right {
   .right {
     width: 100%;
     width: 100%;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
     .conten {
     .conten {
-      padding: 20px 20px 40px;
+      padding: 0 20px 40px;
       width: 100%;
       width: 100%;
       height: 829px;
       height: 829px;
       .middle {
       .middle {
@@ -329,7 +327,7 @@ export default {
             width: 130px;
             width: 130px;
             height: 40px;
             height: 40px;
             .active {
             .active {
-              background-color: #3aa1ed;
+              background-color: #3E5EB3;
               color: #fff;
               color: #fff;
             }
             }
             div {
             div {

+ 3 - 3
src/views/collect/collect0_DiaEdit.vue

@@ -273,7 +273,7 @@
     </el-form>
     </el-form>
     <!-- 表格 -->
     <!-- 表格 -->
     <el-table
     <el-table
-      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+      :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
       :data="tableData"
       :data="tableData"
       border
       border
       style="width: 100%;margin-top: 40px;"
       style="width: 100%;margin-top: 40px;"
@@ -649,7 +649,7 @@ export default {
   }
   }
 }
 }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3E5EB3;
     margin: 4px;
     margin: 4px;
   }
   }
 /deep/.el-upload-list__item-name{
 /deep/.el-upload-list__item-name{
@@ -690,7 +690,7 @@ export default {
   overflow: hidden;
   overflow: hidden;
 }
 }
 .avatar-uploader .el-upload:hover {
 .avatar-uploader .el-upload:hover {
-  border-color: #409eff;
+  border-color: #3E5EB3;
 }
 }
 .avatar-uploader-icon {
 .avatar-uploader-icon {
   font-size: 28px;
   font-size: 28px;

+ 8 - 10
src/views/collect/collect0_look.vue

@@ -283,7 +283,7 @@
             </div>
             </div>
             <!-- 表格 -->
             <!-- 表格 -->
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -344,7 +344,7 @@
     <el-dialog title="操作记录" :visible.sync="dialogTableVisible">
     <el-dialog title="操作记录" :visible.sync="dialogTableVisible">
       <el-table
       <el-table
         :data="gridData"
         :data="gridData"
-        :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+        :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
         border
         border
       >
       >
         <el-table-column label="序号" width="50" :resizable="false">
         <el-table-column label="序号" width="50" :resizable="false">
@@ -599,7 +599,7 @@ body .el-table::before {
     }
     }
   }
   }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3E5EB3;
     margin: 4px;
     margin: 4px;
   }
   }
   .title {
   .title {
@@ -619,7 +619,7 @@ body .el-table::before {
       align-items: center;
       align-items: center;
       width: 50px;
       width: 50px;
       height: 20px;
       height: 20px;
-      background-color: #40a9ff;
+      background-color: #3E5EB3;
       color: #fff;
       color: #fff;
       font-size: 13px;
       font-size: 13px;
       border-radius: 5px;
       border-radius: 5px;
@@ -667,7 +667,7 @@ body .el-table::before {
     }
     }
   }
   }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3E5EB3;
   }
   }
   /deep/#mytitle > span {
   /deep/#mytitle > span {
     font-weight: 800;
     font-weight: 800;
@@ -678,14 +678,12 @@ body .el-table::before {
     height: 868px;
     height: 868px;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -699,7 +697,7 @@ body .el-table::before {
     flex-wrap: wrap;
     flex-wrap: wrap;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 10px 0 0 40px;
     padding: 10px 0 0 40px;
     .conten_left {
     .conten_left {
       width: 465px;
       width: 465px;

+ 6 - 8
src/views/collect/collect1.vue

@@ -39,7 +39,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -343,17 +343,15 @@ export default {
   display: flex;
   display: flex;
   .right {
   .right {
     width: 100%;
     width: 100%;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
     .conten {
     .conten {
-      padding: 20px 20px 40px;
+      padding: 0 20px 40px;
       width: 100%;
       width: 100%;
       height: 829px;
       height: 829px;
       .middle {
       .middle {
@@ -365,8 +363,8 @@ export default {
           align-items: center;
           align-items: center;
           color: black;
           color: black;
           .active{
           .active{
-            color: #409eff;
-            border-bottom: 2px solid #409eff;
+            color: #3E5EB3;
+            border-bottom: 2px solid #3E5EB3;
           }
           }
           li {
           li {
             height: 60px;
             height: 60px;

+ 1 - 1
src/views/collect/collect1_Dialog.vue

@@ -13,7 +13,7 @@
     <el-table
     <el-table
       ref="multipleTable"
       ref="multipleTable"
       @selection-change="handleSelectionChange"
       @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+      :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
       :data="tableData"
       :data="tableData"
       border
       border
       style="width: 100%"
       style="width: 100%"

+ 4 - 6
src/views/collect/collect1_add.vue

@@ -61,7 +61,7 @@
           <div class="table">
           <div class="table">
             <el-table
             <el-table
               @selection-change="handleSelectionChange"
               @selection-change="handleSelectionChange"
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -343,14 +343,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -358,7 +356,7 @@ export default {
     padding: 40px 0 0 20px;
     padding: 40px 0 0 20px;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .one_row {
     .one_row {
       display: flex;
       display: flex;
       justify-content: start;
       justify-content: start;

+ 4 - 6
src/views/collect/collect1_audit.vue

@@ -36,7 +36,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -199,21 +199,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 4 - 6
src/views/collect/collect1_look.vue

@@ -44,7 +44,7 @@
           </div>
           </div>
           <el-table
           <el-table
             @selection-change="handleSelectionChange"
             @selection-change="handleSelectionChange"
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -206,21 +206,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 6 - 8
src/views/collect/collect2.vue

@@ -39,7 +39,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -334,20 +334,18 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .middle {
     .middle {
               .title{
               .title{
           height: 60px;
           height: 60px;
@@ -357,8 +355,8 @@ export default {
           align-items: center;
           align-items: center;
           color: black;
           color: black;
           .active{
           .active{
-            color: #409eff;
-            border-bottom: 2px solid #409eff;
+            color: #3E5EB3;
+            border-bottom: 2px solid #3E5EB3;
           }
           }
           li {
           li {
             height: 60px;
             height: 60px;

+ 1 - 1
src/views/collect/collect2_Dialog.vue

@@ -13,7 +13,7 @@
     <el-table
     <el-table
       ref="multipleTable"
       ref="multipleTable"
       @selection-change="handleSelectionChange"
       @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+      :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
       :data="tableData"
       :data="tableData"
       border
       border
       style="width: 100%"
       style="width: 100%"

+ 4 - 6
src/views/collect/collect2_add.vue

@@ -47,7 +47,7 @@
           <div class="table">
           <div class="table">
             <el-table
             <el-table
               @selection-change="handleSelectionChange"
               @selection-change="handleSelectionChange"
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -320,14 +320,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -335,7 +333,7 @@ export default {
     padding: 40px 0 0 20px;
     padding: 40px 0 0 20px;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .one_row {
     .one_row {
       display: flex;
       display: flex;
       justify-content: start;
       justify-content: start;

+ 4 - 6
src/views/collect/collect2_audit.vue

@@ -32,7 +32,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -222,21 +222,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 4 - 6
src/views/collect/collect2_look.vue

@@ -44,7 +44,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -181,21 +181,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 6 - 8
src/views/collect/collect3.vue

@@ -43,7 +43,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -305,17 +305,15 @@ export default {
   display: flex;
   display: flex;
   .right {
   .right {
     width: 100%;
     width: 100%;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
     .conten {
     .conten {
-      padding: 20px 20px 40px;
+      padding: 0 20px 40px;
       width: 100%;
       width: 100%;
       height: 829px;
       height: 829px;
       .middle {
       .middle {
@@ -327,8 +325,8 @@ export default {
           align-items: center;
           align-items: center;
           color: black;
           color: black;
           .active{
           .active{
-            color: #409eff;
-            border-bottom: 2px solid #409eff;
+            color: #3E5EB3;
+            border-bottom: 2px solid #3E5EB3;
           }
           }
           li {
           li {
             height: 60px;
             height: 60px;

+ 3 - 5
src/views/collect/collect3_audit.vue

@@ -275,21 +275,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 24px;
     padding: 24px;
     .con_top{
     .con_top{
       color: black;
       color: black;

+ 3 - 3
src/views/collect/collect3_audit_Dia.vue

@@ -96,7 +96,7 @@
       </div>
       </div>
       <!-- 表格 -->
       <!-- 表格 -->
       <el-table
       <el-table
-        :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+        :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
         :data="tableData"
         :data="tableData"
         border
         border
         style="width: 100%"
         style="width: 100%"
@@ -250,7 +250,7 @@ export default {
   }
   }
 }
 }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3E5EB3;
     margin: 4px;
     margin: 4px;
   }
   }
 .title {
 .title {
@@ -266,7 +266,7 @@ export default {
     width: 50%;
     width: 50%;
   }
   }
   .active {
   .active {
-    background-color: #409eff;
+    background-color: #3E5EB3;
     color: #fff;
     color: #fff;
   }
   }
 }
 }

+ 3 - 5
src/views/collect/collect3_look.vue

@@ -211,14 +211,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -227,7 +225,7 @@ export default {
     color: black;
     color: black;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .info{
     .info{
       .row{
       .row{
         display: flex;
         display: flex;

+ 6 - 7
src/views/holding/holding0.vue

@@ -57,7 +57,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -103,6 +103,7 @@
                     >审核</el-button
                     >审核</el-button
                   >
                   >
                   <el-button
                   <el-button
+                    style="color:#C94848;"
                     v-show="userLimits.del"
                     v-show="userLimits.del"
                     type="text"
                     type="text"
                     @click="removeH0(row.id,row.status)"
                     @click="removeH0(row.id,row.status)"
@@ -406,16 +407,14 @@ export default {
     width: 100%;
     width: 100%;
     height: 868px;
     height: 868px;
     .top {
     .top {
-      padding-left: 35px;
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
     .conten {
     .conten {
-      padding: 20px 20px 40px;
+      padding: 0 20px 40px;
       width: 100%;
       width: 100%;
       height: 829px;
       height: 829px;
       .middle {
       .middle {
@@ -427,8 +426,8 @@ export default {
           align-items: center;
           align-items: center;
           color: black;
           color: black;
           .active {
           .active {
-            color: #409eff;
-            border-bottom: 2px solid #409eff;
+            color: #3E5EB3;
+            border-bottom: 2px solid #3E5EB3;
           }
           }
           li {
           li {
             height: 60px;
             height: 60px;

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

@@ -281,7 +281,7 @@
     </el-form>
     </el-form>
     <!-- 表格 -->
     <!-- 表格 -->
     <el-table
     <el-table
-      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+      :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
       :data="tableData"
       :data="tableData"
       border
       border
       style="width: 100%;margin-top: 40px;"
       style="width: 100%;margin-top: 40px;"
@@ -654,7 +654,7 @@ export default {
   }
   }
 }
 }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3E5EB3;
     margin: 4px;
     margin: 4px;
   }
   }
 /deep/.el-upload-list__item-name{
 /deep/.el-upload-list__item-name{
@@ -696,7 +696,7 @@ export default {
   overflow: hidden;
   overflow: hidden;
 }
 }
 .avatar-uploader .el-upload:hover {
 .avatar-uploader .el-upload:hover {
-  border-color: #409eff;
+  border-color: #3E5EB3;
 }
 }
 .avatar-uploader-icon {
 .avatar-uploader-icon {
   font-size: 28px;
   font-size: 28px;

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

@@ -283,7 +283,7 @@
     </el-form>
     </el-form>
     <!-- 表格 -->
     <!-- 表格 -->
     <el-table
     <el-table
-      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+      :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
       :data="tableData"
       :data="tableData"
       border
       border
       style="width: 100%;margin-top: 40px;"
       style="width: 100%;margin-top: 40px;"
@@ -669,7 +669,7 @@ export default {
   }
   }
 }
 }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3E5EB3;
     margin: 4px;
     margin: 4px;
   }
   }
 /deep/.el-upload-list__item-name{
 /deep/.el-upload-list__item-name{
@@ -711,7 +711,7 @@ export default {
   overflow: hidden;
   overflow: hidden;
 }
 }
 .avatar-uploader .el-upload:hover {
 .avatar-uploader .el-upload:hover {
-  border-color: #409eff;
+  border-color: #3E5EB3;
 }
 }
 .avatar-uploader-icon {
 .avatar-uploader-icon {
   font-size: 28px;
   font-size: 28px;

+ 4 - 6
src/views/holding/holding0_add.vue

@@ -55,7 +55,7 @@
           <div class="table">
           <div class="table">
             <el-table
             <el-table
               @selection-change="handleSelectionChange"
               @selection-change="handleSelectionChange"
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -339,14 +339,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -354,7 +352,7 @@ export default {
     padding: 40px 0 0 20px;
     padding: 40px 0 0 20px;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .one_row {
     .one_row {
       display: flex;
       display: flex;
       justify-content: start;
       justify-content: start;

+ 4 - 6
src/views/holding/holding0_audit.vue

@@ -42,7 +42,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -254,21 +254,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

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

@@ -99,7 +99,7 @@
       </div>
       </div>
       <!-- 表格 -->
       <!-- 表格 -->
       <el-table
       <el-table
-        :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+        :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
         :data="tableData"
         :data="tableData"
         border
         border
         style="width: 100%"
         style="width: 100%"
@@ -238,7 +238,7 @@ export default {
   }
   }
 }
 }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3E5EB3;
     margin: 4px;
     margin: 4px;
   }
   }
 
 
@@ -255,7 +255,7 @@ export default {
     width: 50%;
     width: 50%;
   }
   }
   .active {
   .active {
-    background-color: #409eff;
+    background-color: #3E5EB3;
     color: #fff;
     color: #fff;
   }
   }
 }
 }

+ 4 - 6
src/views/holding/holding0_result.vue

@@ -48,7 +48,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -179,21 +179,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 7 - 9
src/views/holding/holding1.vue

@@ -39,7 +39,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -61,7 +61,7 @@
                   <el-button type="text" v-if="row.status==='已完成'||row.status==='待入库'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
                   <el-button type="text" v-if="row.status==='已完成'||row.status==='待入库'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
                   <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLimits.audit">审核</el-button>
                   <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLimits.audit">审核</el-button>
                   <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLimits.edit">编辑</el-button>
                   <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLimits.edit">编辑</el-button>
-                  <el-button type="text" v-if="row.status!=='已完成'" @click="delData(row.id,row.status)" v-show="userLimits.del">删除</el-button>
+                  <el-button type="text" v-if="row.status!=='已完成'" @click="delData(row.id,row.status)" v-show="userLimits.del" style="color:#C94848;">删除</el-button>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
@@ -340,17 +340,15 @@ export default {
   display: flex;
   display: flex;
   .right {
   .right {
     width: 100%;
     width: 100%;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
     .conten {
     .conten {
-      padding: 20px 20px 40px;
+      padding: 0 20px 40px;
       width: 100%;
       width: 100%;
       height: 829px;
       height: 829px;
       .middle {
       .middle {
@@ -362,8 +360,8 @@ export default {
           align-items: center;
           align-items: center;
           color: black;
           color: black;
           .active{
           .active{
-            color: #409eff;
-            border-bottom: 2px solid #409eff;
+            color: #3E5EB3;
+            border-bottom: 2px solid #3E5EB3;
           }
           }
           li {
           li {
             height: 60px;
             height: 60px;

+ 1 - 1
src/views/holding/holding1_Dialog.vue

@@ -13,7 +13,7 @@
     <el-table
     <el-table
       ref="multipleTable"
       ref="multipleTable"
       @selection-change="handleSelectionChange"
       @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+      :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
       :data="tableData"
       :data="tableData"
       border
       border
       style="width: 100%"
       style="width: 100%"

+ 4 - 6
src/views/holding/holding1_add.vue

@@ -50,7 +50,7 @@
           <div class="table">
           <div class="table">
             <el-table
             <el-table
               @selection-change="handleSelectionChange"
               @selection-change="handleSelectionChange"
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -335,14 +335,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -350,7 +348,7 @@ export default {
     padding: 40px 0 0 20px;
     padding: 40px 0 0 20px;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .one_row {
     .one_row {
       display: flex;
       display: flex;
       justify-content: start;
       justify-content: start;

+ 4 - 6
src/views/holding/holding1_audit.vue

@@ -34,7 +34,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -219,21 +219,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 4 - 6
src/views/holding/holding1_look.vue

@@ -44,7 +44,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -175,21 +175,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 7 - 9
src/views/holding/holding2.vue

@@ -39,7 +39,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -63,7 +63,7 @@
                   <el-button type="text" v-if="row.status==='待归还'||row.status==='已归还'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
                   <el-button type="text" v-if="row.status==='待归还'||row.status==='已归还'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
                   <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLimits.audit">审核</el-button>
                   <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLimits.audit">审核</el-button>
                   <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLimits.edit">编辑</el-button>
                   <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLimits.edit">编辑</el-button>
-                  <el-button type="text" v-if="row.status==='待办理'||row.status==='待审核'||row.status==='审核不通过'" @click="delData(row.id,row.status)" v-show="userLimits.del">删除</el-button>
+                  <el-button type="text" v-if="row.status==='待办理'||row.status==='待审核'||row.status==='审核不通过'" @click="delData(row.id,row.status)" v-show="userLimits.del" style="color:#C94848;">删除</el-button>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
@@ -357,17 +357,15 @@ export default {
   display: flex;
   display: flex;
   .right {
   .right {
     width: 100%;
     width: 100%;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
     .conten {
     .conten {
-      padding: 20px 20px 40px;
+      padding: 0 20px 40px;
       width: 100%;
       width: 100%;
       height: 829px;
       height: 829px;
       .middle {
       .middle {
@@ -379,8 +377,8 @@ export default {
           align-items: center;
           align-items: center;
           color: black;
           color: black;
           .active{
           .active{
-            color: #409eff;
-            border-bottom: 2px solid #409eff;
+            color: #3E5EB3;
+            border-bottom: 2px solid #3E5EB3;
           }
           }
           li {
           li {
             height: 60px;
             height: 60px;

+ 1 - 1
src/views/holding/holding2_Dialog.vue

@@ -13,7 +13,7 @@
     <el-table
     <el-table
       ref="multipleTable"
       ref="multipleTable"
       @selection-change="handleSelectionChange"
       @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+      :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
       :data="tableData"
       :data="tableData"
       border
       border
       style="width: 100%"
       style="width: 100%"

+ 4 - 6
src/views/holding/holding2_add.vue

@@ -61,7 +61,7 @@
           <div class="table">
           <div class="table">
             <el-table
             <el-table
               @selection-change="handleSelectionChange"
               @selection-change="handleSelectionChange"
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -347,14 +347,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -362,7 +360,7 @@ export default {
     padding: 40px 0 0 20px;
     padding: 40px 0 0 20px;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .one_row {
     .one_row {
       display: flex;
       display: flex;
       justify-content: start;
       justify-content: start;

+ 4 - 6
src/views/holding/holding2_audit.vue

@@ -36,7 +36,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -199,21 +199,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 5 - 7
src/views/holding/holding2_look.vue

@@ -48,7 +48,7 @@
           </div>
           </div>
           <el-table
           <el-table
             @selection-change="handleSelectionChange"
             @selection-change="handleSelectionChange"
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -151,7 +151,7 @@
               </div>
               </div>
               <el-table
               <el-table
                 @selection-change="handleSelectionChange"
                 @selection-change="handleSelectionChange"
-                :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+                :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
                 :data="tableData"
                 :data="tableData"
                 border
                 border
                 style="width: 100%"
                 style="width: 100%"
@@ -448,14 +448,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -471,7 +469,7 @@ export default {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
 
 
     .button {
     .button {

+ 8 - 10
src/views/holding/holding3.vue

@@ -69,7 +69,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table" v-if="change">
           <div class="table" v-if="change">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -383,17 +383,15 @@ export default {
   display: flex;
   display: flex;
   .right {
   .right {
     width: 100%;
     width: 100%;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
     .conten {
     .conten {
-      padding: 20px 20px 40px;
+      padding: 0 20px 40px;
       width: 100%;
       width: 100%;
       height: 829px;
       height: 829px;
       .middle {
       .middle {
@@ -410,7 +408,7 @@ export default {
             width: 130px;
             width: 130px;
             height: 40px;
             height: 40px;
             .active {
             .active {
-              background-color: #3aa1ed;
+              background-color: #3E5EB3;
               color: #fff;
               color: #fff;
             }
             }
             div {
             div {
@@ -477,11 +475,11 @@ export default {
             border: 1px solid #ccc;
             border: 1px solid #ccc;
             img {
             img {
               // object-fit:scale-down;
               // object-fit:scale-down;
-              width: 215px;
+              width: 213px;
               height: 200px;
               height: 200px;
-              object-fit: contain;
               margin-bottom: 8px;
               margin-bottom: 8px;
-              border: 3px solid #ccc;
+              object-fit: cover;
+              border-bottom: 1px solid #ccc;
             }
             }
             span {
             span {
               color: black;
               color: black;

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

@@ -281,7 +281,7 @@
     </el-form>
     </el-form>
     <!-- 表格 -->
     <!-- 表格 -->
     <el-table
     <el-table
-      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+      :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
       :data="tableData"
       :data="tableData"
       border
       border
       style="width: 100%;margin-top: 40px;"
       style="width: 100%;margin-top: 40px;"
@@ -678,7 +678,7 @@ export default {
   }
   }
 }
 }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3E5EB3;
     margin: 4px;
     margin: 4px;
   }
   }
 /deep/.el-upload-list__item-name{
 /deep/.el-upload-list__item-name{
@@ -719,7 +719,7 @@ export default {
   overflow: hidden;
   overflow: hidden;
 }
 }
 .avatar-uploader .el-upload:hover {
 .avatar-uploader .el-upload:hover {
-  border-color: #409eff;
+  border-color: #3E5EB3;
 }
 }
 .avatar-uploader-icon {
 .avatar-uploader-icon {
   font-size: 28px;
   font-size: 28px;

+ 309 - 143
src/views/holding/holding3_look.vue

@@ -24,120 +24,171 @@
           </div>
           </div>
           <div v-else style="background-color: #85ce61">已出库</div>
           <div v-else style="background-color: #85ce61">已出库</div>
         </div>
         </div>
-        <div class="info" style="max-height: 100vh">
+        <div class="info">
           <div class="row">
           <div class="row">
             <div>
             <div>
-              <span>藏品名称:</span>{{ myObj.name ? myObj.name : "-" }}
+              <span>藏品名称</span>
+              <p>{{ myObj.name ? myObj.name : "-" }}</p>
             </div>
             </div>
             <div>
             <div>
-              <span>总登记号:</span
-              >{{ myObj.registerNum ? myObj.registerNum : "-" }}
-            </div>
-          </div>
-          <div class="row">
-            <div>
-              <span>编号类型:</span
-              >{{ myObj.numTypeId ? myObj.numTypeId : "-" }}
+              <span>原 名</span>
+              <p>
+                {{ myObj.primitiveName ? myObj.primitiveName : "-" }}
+              </p>
             </div>
             </div>
-            <div><span>藏品编号:</span>{{ myObj.num ? myObj.num : "-" }}</div>
-          </div>
-          <div class="row">
             <div>
             <div>
-              <span>原名:</span
-              >{{ myObj.primitiveName ? myObj.primitiveName : "-" }}
+              <span>年 代</span>
+              <p>{{ myObj.age ? myObj.age : "-" }}</p>
             </div>
             </div>
-            <div><span>年代:</span>{{ myObj.age ? myObj.age : "-" }}</div>
           </div>
           </div>
           <div class="row">
           <div class="row">
             <div>
             <div>
-              <span>文物类别:</span
-              >{{ myObj.goodsTypeName ? myObj.goodsTypeName : "-" }}
+              <span>总登记号</span>
+              <p>
+                {{ myObj.registerNum ? myObj.registerNum : "-" }}
+              </p>
             </div>
             </div>
             <div>
             <div>
-              <span>文物级别:</span>{{ myObj.level ? myObj.level : "-" }}
+              <span>编号类型</span>
+              <p>
+                {{ myObj.numTypeId ? myObj.numTypeId : "-" }}
+              </p>
             </div>
             </div>
             <div>
             <div>
-              <span>文物来源:</span
-              >{{ myObj.sourceName ? myObj.sourceName : "-" }}
+              <span>藏品编号</span>
+              <p>{{ myObj.num ? myObj.num : "-" }}</p>
             </div>
             </div>
           </div>
           </div>
           <div class="row">
           <div class="row">
             <div>
             <div>
-              <span>质地类型:</span
-              >{{ myObj.textureType ? myObj.textureType : "-" }}
+              <span>文物类别</span>
+              <p>
+                {{ myObj.goodsTypeName ? myObj.goodsTypeName : "-" }}
+              </p>
             </div>
             </div>
             <div>
             <div>
-              <span>质地类别:</span
-              >{{ myObj.textureCategory ? myObj.textureCategory : "-" }}
+              <span>文物级别</span>
+              <p>{{ myObj.level ? myObj.level : "-" }}</p>
             </div>
             </div>
             <div>
             <div>
-              <span>质地:</span>{{ myObj.texture ? myObj.texture : "-" }}
+              <span>文物来源</span>
+              <p>
+                {{ myObj.sourceName ? myObj.sourceName : "-" }}
+              </p>
             </div>
             </div>
           </div>
           </div>
           <div class="row">
           <div class="row">
             <div>
             <div>
-              <span>通长:</span>{{ myObj.length ? myObj.length : "-" }}
+              <span>质地类型</span>
+              <p>
+                {{ myObj.textureType ? myObj.textureType : "-" }}
+              </p>
+            </div>
+            <div>
+              <span>质地类别</span>
+              <p>
+                {{ myObj.textureCategory ? myObj.textureCategory : "-" }}
+              </p>
             </div>
             </div>
-            <div><span>通宽:</span>{{ myObj.width ? myObj.width : "-" }}</div>
             <div>
             <div>
-              <span>通高:</span>{{ myObj.height ? myObj.height : "-" }}
+              <span>质 地</span>
+              <p>
+                {{ myObj.texture ? myObj.texture : "-" }}
+              </p>
             </div>
             </div>
           </div>
           </div>
           <div class="row">
           <div class="row">
             <div>
             <div>
-              <span>完残程度:</span
-              >{{ myObj.integrity ? myObj.integrity : "-" }}
+              <span>通 长</span>
+              <p>
+                {{ myObj.length ? myObj.length : "-" }}
+              </p>
             </div>
             </div>
             <div>
             <div>
-              <span>保存状态:</span>{{ myObj.repair ? myObj.repair : "-" }}
+              <span>通 宽</span>
+              <p>{{ myObj.width ? myObj.width : "-" }}</p>
             </div>
             </div>
-          </div>
-          <div class="row">
             <div>
             <div>
-              <span>完残状况:</span
-              >{{ myObj.repairRemark ? myObj.repairRemark : "-" }}
+              <span>通 高</span>
+              <p>
+                {{ myObj.height ? myObj.height : "-" }}
+              </p>
             </div>
             </div>
           </div>
           </div>
           <div class="row">
           <div class="row">
             <div>
             <div>
-              <span>数量类型:</span
-              >{{ myObj.amountType ? myObj.amountType : "-" }}
+              <span>数量类型</span>
+              <p>
+                {{ myObj.amountType ? myObj.amountType : "-" }}
+              </p>
+            </div>
+            <div>
+              <span>具体数量</span>
+              <p>
+                {{ myObj.amount ? myObj.amount : "-" }}
+              </p>
             </div>
             </div>
             <div>
             <div>
-              <span>具体数量:</span>{{ myObj.amount ? myObj.amount : "-" }}
+              <span>质量范围</span>
+              <p>
+                {{ myObj.qualityScope ? myObj.qualityScope : "-" }}
+              </p>
             </div>
             </div>
           </div>
           </div>
           <div class="row">
           <div class="row">
             <div>
             <div>
-              <span>质量范围:</span
-              >{{ myObj.qualityScope ? myObj.qualityScope : "-" }}
+              <span>具体质量</span>
+              <p>
+                {{ myObj.quality ? myObj.quality : "-" }}
+              </p>
+            </div>
+            <div>
+              <span>入藏时间范围</span>
+              <p>
+                {{ myObj.checkInScope ? myObj.checkInScope : "-" }}
+              </p>
             </div>
             </div>
             <div>
             <div>
-              <span>具体质量:</span>{{ myObj.quality ? myObj.quality : "-" }}
+              <span>入藏年度</span>
+              <p>
+                {{ myObj.checkInYear ? myObj.checkInYear : "-" }}
+              </p>
             </div>
             </div>
           </div>
           </div>
           <div class="row">
           <div class="row">
             <div>
             <div>
-              <span>入藏时间范围:</span
-              >{{ myObj.checkInScope ? myObj.checkInScope : "-" }}
+              <span>完残程度</span>
+              <p>
+                {{ myObj.integrity ? myObj.integrity : "-" }}
+              </p>
+            </div>
+            <div>
+              <span>保存状态</span>
+              <p>
+                {{ myObj.repair ? myObj.repair : "-" }}
+              </p>
             </div>
             </div>
             <div>
             <div>
-              <span>入藏年度:</span
-              >{{ myObj.checkInYear ? myObj.checkInYear : "-" }}
+              <span>完残状况</span>
+              <p>
+                {{ myObj.repairRemark ? myObj.repairRemark : "-" }}
+              </p>
             </div>
             </div>
           </div>
           </div>
           <div class="row">
           <div class="row">
             <div>
             <div>
-              <span style="width: 80px">来源说明</span>
-              <p style="flex: 1; text-align: left">
+              <span>来源说明</span>
+              <p style="flex: 1">
                 {{ myObj.description ? myObj.description : "-" }}
                 {{ myObj.description ? myObj.description : "-" }}
               </p>
               </p>
             </div>
             </div>
           </div>
           </div>
           <div class="row">
           <div class="row">
-            <div><span>入库位置:</span>{{ rukuTxt ? rukuTxt : "-" }}</div>
+            <div><span>入库位置</span><p>{{ rukuTxt ? rukuTxt : "-" }}</p></div>
+          </div>
+          <div class="row">
             <div>
             <div>
-              <span>出库位置:</span>{{ myObj.outPath ? myObj.outPath : "-" }}
+              <span>出库位置</span><p>{{ myObj.outPath ? myObj.outPath : "-" }}</p>
             </div>
             </div>
           </div>
           </div>
         </div>
         </div>
@@ -162,7 +213,12 @@
             @click="begEdit"
             @click="begEdit"
             >申请编辑</el-button
             >申请编辑</el-button
           >
           >
-          <el-button type="primary" size="small" @click="applyMove" v-if="myObj.storageId&&myObj.status!=='已出库'" v-show="userLimits.move"
+          <el-button
+            type="primary"
+            size="small"
+            @click="applyMove"
+            v-if="myObj.storageId && myObj.status !== '已出库'"
+            v-show="userLimits.move"
             >申请移库</el-button
             >申请移库</el-button
           >
           >
           <el-button size="small" @click="record">操作记录</el-button>
           <el-button size="small" @click="record">操作记录</el-button>
@@ -187,120 +243,169 @@
           <div class="info">
           <div class="info">
             <div class="row">
             <div class="row">
               <div>
               <div>
-                <span>藏品名称:</span>{{ myObj.name ? myObj.name : "-" }}
+                <span>藏品名称</span>
+                <p :title="myObj.name">{{ myObj.name ? myObj.name : "-" }}</p>
+              </div>
+              <div>
+                <span>原 名</span>
+                <p :title="myObj.primitiveName">
+                  {{ myObj.primitiveName ? myObj.primitiveName : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>总登记号:</span
-                >{{ myObj.registerNum ? myObj.registerNum : "-" }}
+                <span>年 代</span>
+                <p :title="myObj.age">{{ myObj.age ? myObj.age : "-" }}</p>
               </div>
               </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
               <div>
               <div>
-                <span>编号类型:</span
-                >{{ myObj.numTypeId ? myObj.numTypeId : "-" }}
+                <span>总登记号</span>
+                <p :title="myObj.registerNum">
+                  {{ myObj.registerNum ? myObj.registerNum : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>藏品编号:</span>{{ myObj.num ? myObj.num : "-" }}
+                <span>编号类型</span>
+                <p :title="myObj.numTypeId">
+                  {{ myObj.numTypeId ? myObj.numTypeId : "-" }}
+                </p>
               </div>
               </div>
-            </div>
-            <div class="row">
               <div>
               <div>
-                <span>原名:</span
-                >{{ myObj.primitiveName ? myObj.primitiveName : "-" }}
+                <span>藏品编号</span>
+                <p :title="myObj.num">{{ myObj.num ? myObj.num : "-" }}</p>
               </div>
               </div>
-              <div><span>年代:</span>{{ myObj.age ? myObj.age : "-" }}</div>
             </div>
             </div>
             <div class="row">
             <div class="row">
               <div>
               <div>
-                <span>文物类别:</span
-                >{{ myObj.goodsTypeName ? myObj.goodsTypeName : "-" }}
+                <span>文物类别</span>
+                <p :title="myObj.goodsTypeName">
+                  {{ myObj.goodsTypeName ? myObj.goodsTypeName : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>文物级别:</span>{{ myObj.level ? myObj.level : "-" }}
+                <span>文物级别</span>
+                <p :title="myObj.level">
+                  {{ myObj.level ? myObj.level : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>文物来源:</span
-                >{{ myObj.sourceName ? myObj.sourceName : "-" }}
+                <span>文物来源</span>
+                <p :title="myObj.sourceName">
+                  {{ myObj.sourceName ? myObj.sourceName : "-" }}
+                </p>
               </div>
               </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
               <div>
               <div>
-                <span>质地类型:</span
-                >{{ myObj.textureType ? myObj.textureType : "-" }}
+                <span>质地类型</span>
+                <p :title="myObj.textureType">
+                  {{ myObj.textureType ? myObj.textureType : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>质地类别:</span
-                >{{ myObj.textureCategory ? myObj.textureCategory : "-" }}
+                <span>质地类别</span>
+                <p :title="myObj.textureCategory">
+                  {{ myObj.textureCategory ? myObj.textureCategory : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>质地:</span>{{ myObj.texture ? myObj.texture : "-" }}
+                <span>质 地</span>
+                <p :title="myObj.texture">
+                  {{ myObj.texture ? myObj.texture : "-" }}
+                </p>
               </div>
               </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
               <div>
               <div>
-                <span>通长:</span>{{ myObj.length ? myObj.length : "-" }}
+                <span>通 长</span>
+                <p :title="myObj.length">
+                  {{ myObj.length ? myObj.length : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>通宽:</span>{{ myObj.width ? myObj.width : "-" }}
+                <span>通 宽</span>
+                <p :title="myObj.width">
+                  {{ myObj.width ? myObj.width : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>通高:</span>{{ myObj.height ? myObj.height : "-" }}
+                <span>通 高</span>
+                <p :title="myObj.height">
+                  {{ myObj.height ? myObj.height : "-" }}
+                </p>
               </div>
               </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
               <div>
               <div>
-                <span>完残程度:</span
-                >{{ myObj.integrity ? myObj.integrity : "-" }}
+                <span>数量类型</span>
+                <p :title="myObj.amountType">
+                  {{ myObj.amountType ? myObj.amountType : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>保存状态:</span>{{ myObj.repair ? myObj.repair : "-" }}
+                <span>具体数量</span>
+                <p :title="myObj.amount">
+                  {{ myObj.amount ? myObj.amount : "-" }}
+                </p>
               </div>
               </div>
-            </div>
-            <div class="row">
               <div>
               <div>
-                <span>完残状况:</span
-                >{{ myObj.repairRemark ? myObj.repairRemark : "-" }}
+                <span>质量范围</span>
+                <p :title="myObj.qualityScope">
+                  {{ myObj.qualityScope ? myObj.qualityScope : "-" }}
+                </p>
               </div>
               </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
               <div>
               <div>
-                <span>数量类型:</span
-                >{{ myObj.amountType ? myObj.amountType : "-" }}
-              </div>
-              <div>
-                <span>具体数量:</span>{{ myObj.amount ? myObj.amount : "-" }}
+                <span>具体质量</span>
+                <p :title="myObj.quality">
+                  {{ myObj.quality ? myObj.quality : "-" }}
+                </p>
               </div>
               </div>
-            </div>
-            <div class="row">
               <div>
               <div>
-                <span>质量范围:</span
-                >{{ myObj.qualityScope ? myObj.qualityScope : "-" }}
+                <span>入藏时间范围</span>
+                <p :title="myObj.checkInScope">
+                  {{ myObj.checkInScope ? myObj.checkInScope : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>具体质量:</span>{{ myObj.quality ? myObj.quality : "-" }}
+                <span>入藏年度</span>
+                <p :title="myObj.checkInYear">
+                  {{ myObj.checkInYear ? myObj.checkInYear : "-" }}
+                </p>
               </div>
               </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
               <div>
               <div>
-                <span>入藏时间范围:</span
-                >{{ myObj.checkInScope ? myObj.checkInScope : "-" }}
+                <span>完残程度</span>
+                <p :title="myObj.integrity">
+                  {{ myObj.integrity ? myObj.integrity : "-" }}
+                </p>
               </div>
               </div>
               <div>
               <div>
-                <span>入藏年度:</span
-                >{{ myObj.checkInYear ? myObj.checkInYear : "-" }}
+                <span>保存状态</span>
+                <p :title="myObj.repair">
+                  {{ myObj.repair ? myObj.repair : "-" }}
+                </p>
+              </div>
+              <div>
+                <span>完残状况</span>
+                <p :title="myObj.repairRemark">
+                  {{ myObj.repairRemark ? myObj.repairRemark : "-" }}
+                </p>
               </div>
               </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
               <div>
               <div>
-                <span style="width: 80px">来源说明:</span>
-                <p style="flex: 1">
+                <span>来源说明</span>
+                <p style="flex: 1" :title="myObj.description">
                   {{ myObj.description ? myObj.description : "-" }}
                   {{ myObj.description ? myObj.description : "-" }}
                 </p>
                 </p>
               </div>
               </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
-              <div style="height:39px">
-                <span>入库位置</span>
+              <div style="height: 39px">
+                <span>入库位置</span>
                 <el-cascader
                 <el-cascader
                   ref="cascaderAddr"
                   ref="cascaderAddr"
                   v-if="myObj.location && myObj.location.length >= 1"
                   v-if="myObj.location && myObj.location.length >= 1"
@@ -313,8 +418,13 @@
                 ></el-cascader>
                 ></el-cascader>
                 <i v-else>-</i>
                 <i v-else>-</i>
               </div>
               </div>
+            </div>
+            <div class="row">
               <div>
               <div>
-                <span>出库位置:</span>{{ myObj.outPath ? myObj.outPath : "-" }}
+                <span>出库位置</span>
+                <p :title="myObj.outPath">
+                  {{ myObj.outPath ? myObj.outPath : "-" }}
+                </p>
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
@@ -335,7 +445,10 @@
             </div>
             </div>
             <!-- 表格 -->
             <!-- 表格 -->
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{
+                background: 'rgba(62, 94, 179, .5)',
+                color: '#404040',
+              }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -398,29 +511,30 @@
     <!-- 点击申请移库出现的弹窗 -->
     <!-- 点击申请移库出现的弹窗 -->
     <el-dialog title="申请移库" :visible.sync="moveDialog" class="myMove">
     <el-dialog title="申请移库" :visible.sync="moveDialog" class="myMove">
       <div class="block">
       <div class="block">
-        <div>入库位置:{{rukuTxt}}</div>
+        <div>入库位置:{{ rukuTxt }}</div>
         <div>
         <div>
-        <span class="demonstration">移库位置:</span>
-        <el-cascader
-          style="width:500px"
-          :props="{ value: 'id', label: 'name' }"
-          v-model="moveValue"
-          :options="options"
-          @change="handleChange"
-        ></el-cascader>
+          <span class="demonstration">移库位置:</span>
+          <el-cascader
+            style="width: 500px"
+            :props="{ value: 'id', label: 'name' }"
+            v-model="moveValue"
+            :options="options"
+            @change="handleChange"
+          ></el-cascader>
         </div>
         </div>
       </div>
       </div>
       <div class="moveBtn">
       <div class="moveBtn">
-          <el-button type="primary"  @click="moveOk"
-            >确 定</el-button
-          >
+        <el-button type="primary" @click="moveOk">确 定</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
     <!-- 点击操作记录出现的弹窗 -->
     <!-- 点击操作记录出现的弹窗 -->
     <el-dialog title="操作记录" :visible.sync="dialogTableVisible">
     <el-dialog title="操作记录" :visible.sync="dialogTableVisible">
       <el-table
       <el-table
         :data="gridData"
         :data="gridData"
-        :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+        :header-cell-style="{
+          background: 'rgba(62, 94, 179, .5)',
+          color: '#404040',
+        }"
         border
         border
       >
       >
         <el-table-column label="序号" width="50" :resizable="false">
         <el-table-column label="序号" width="50" :resizable="false">
@@ -548,8 +662,12 @@ export default {
       this.tempIds = val.join(',')
       this.tempIds = val.join(',')
     },
     },
     async moveOk () {
     async moveOk () {
-      if (this.tempIds === '') return this.$message.warning('还未选择移库位置!')
-      if (this.myObj.storageId === this.tempIds) return this.$message.warning('不能与之前入库位置相同!')
+      if (this.tempIds === '') {
+        return this.$message.warning('还未选择移库位置!')
+      }
+      if (this.myObj.storageId === this.tempIds) {
+        return this.$message.warning('不能与之前入库位置相同!')
+      }
       const res = await applyMove(this.myObj.id, this.tempIds)
       const res = await applyMove(this.myObj.id, this.tempIds)
       if (res.code === 0) {
       if (res.code === 0) {
         this.moveDialog = false
         this.moveDialog = false
@@ -658,10 +776,10 @@ export default {
         this.rukuTxt = txt
         this.rukuTxt = txt
       }
       }
       setTimeout(() => {
       setTimeout(() => {
-        htmlToPdf.downloadPDF(
-          document.querySelector('#myPdfCon'),
-          this.myObj.name
-        )
+        const targetDom = document.querySelector('#myPdfCon')
+        targetDom.style.width = targetDom.scrollWidth + 'px'
+        targetDom.style.height = targetDom.scrollHeight + 'px'
+        htmlToPdf.downloadPDF(targetDom, this.myObj.name)
         this.isShow = false
         this.isShow = false
       }, 100)
       }, 100)
     },
     },
@@ -713,20 +831,19 @@ export default {
 }
 }
 </script>
 </script>
 <style lang='less' scoped>
 <style lang='less' scoped>
-
-.moveBtn{
+.moveBtn {
   position: absolute;
   position: absolute;
   bottom: 20px;
   bottom: 20px;
   left: 50%;
   left: 50%;
   transform: translateX(-50%);
   transform: translateX(-50%);
 }
 }
-.myMove{
-  /deep/.el-dialog{
+.myMove {
+  /deep/.el-dialog {
     height: 400px;
     height: 400px;
   }
   }
 }
 }
-.block{
-  &>div {
+.block {
+  & > div {
     margin: 0px 100px 0;
     margin: 0px 100px 0;
     &:nth-of-type(1) {
     &:nth-of-type(1) {
       margin-bottom: 15px;
       margin-bottom: 15px;
@@ -774,7 +891,7 @@ body .el-table::before {
     }
     }
   }
   }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3e5eb3;
     margin: 4px;
     margin: 4px;
   }
   }
   .title {
   .title {
@@ -794,7 +911,7 @@ body .el-table::before {
       align-items: center;
       align-items: center;
       width: 50px;
       width: 50px;
       height: 20px;
       height: 20px;
-      background-color: #40a9ff;
+      background-color: #3e5eb3;
       color: #fff;
       color: #fff;
       font-size: 13px;
       font-size: 13px;
       border-radius: 5px;
       border-radius: 5px;
@@ -802,8 +919,8 @@ body .el-table::before {
   }
   }
   .info {
   .info {
     margin: 10px 0 0 55px;
     margin: 10px 0 0 55px;
-    max-height: 370px;
-    overflow-y: auto;
+    // max-height: 370px;
+    // overflow-y: auto;
     width: 90%;
     width: 90%;
     // margin-bottom: 60px;
     // margin-bottom: 60px;
     .row {
     .row {
@@ -824,15 +941,30 @@ body .el-table::before {
       & > div {
       & > div {
         // padding-left: 20px;
         // padding-left: 20px;
         flex: 1;
         flex: 1;
-        padding: 8px 20px;
+        // padding: 7px 20px;
         // height: 33px;
         // height: 33px;
         display: flex;
         display: flex;
+        height: 37px;
         align-items: center;
         align-items: center;
         border: 1px solid #ccc;
         border: 1px solid #ccc;
         font-size: 16px;
         font-size: 16px;
         color: black;
         color: black;
         span {
         span {
+          display: block;
+          width: 112px;
+          height: 37px;
+          line-height: 37px;
+          text-align: center;
+          background-color: #d9d9d9;
           font-weight: 700;
           font-weight: 700;
+          margin-right: 10px;
+        }
+        p {
+          cursor: pointer;
+          width: 229px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
         }
       }
       }
     }
     }
@@ -868,13 +1000,11 @@ body .el-table::before {
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
     .top {
     .top {
-      padding-left: 35px;
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -888,12 +1018,12 @@ body .el-table::before {
     flex-wrap: wrap;
     flex-wrap: wrap;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 10px 0 0 40px;
     padding: 10px 0 0 40px;
     .conten_left {
     .conten_left {
       width: 465px;
       width: 465px;
-      height: 400px;
-      background-color: #fafafa;
+      height: 460px;
+      background-color: rgba(64, 64, 64, 0.9);
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
       img {
       img {
@@ -905,10 +1035,14 @@ body .el-table::before {
     }
     }
     .conten_right {
     .conten_right {
       flex: 1;
       flex: 1;
-      height: 400px;
+      max-height: 460px;
+      overflow-y: auto;
     }
     }
     .conten_bot {
     .conten_bot {
+      margin-top: -40px;
       position: relative;
       position: relative;
+      height: 250px;
+      width: 100%;
 
 
       .btn {
       .btn {
         position: absolute;
         position: absolute;
@@ -916,8 +1050,6 @@ body .el-table::before {
         transform: translateX(-50%);
         transform: translateX(-50%);
         bottom: -45px;
         bottom: -45px;
       }
       }
-      height: 250px;
-      width: 100%;
       .resource {
       .resource {
         /deep/.el-table {
         /deep/.el-table {
           max-height: 190px;
           max-height: 190px;
@@ -935,10 +1067,10 @@ body .el-table::before {
         // overflow: auto;
         // overflow: auto;
         width: 97%;
         width: 97%;
         max-width: 1580px;
         max-width: 1580px;
-        border: 1px solid #ccc;
+        // border: 1px solid #ccc;
         .select {
         .select {
           h3 {
           h3 {
-            margin: 0 26px;
+            margin: 0 26px 0 0;
             color: black;
             color: black;
           }
           }
           display: flex;
           display: flex;
@@ -948,5 +1080,39 @@ body .el-table::before {
       }
       }
     }
     }
   }
   }
+  #myPdfCon{
+    .info{
+      .row{
+        height: auto;
+          display: inline;
+        &>div {
+          min-height: 37px;
+          position: relative;
+          flex-wrap: wrap;
+          height: auto;
+          &>span{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            min-height: 37px;
+            position: absolute;
+            left: 0;
+            top: 0;
+            height: 100%;
+          }
+          &>p {
+            padding-left: 122px;
+            flex: 1;
+            width: 176px;
+            height: auto;
+            word-wrap: break-word;
+            word-break: break-all;
+            overflow: visible;
+            white-space:normal
+          }
+        }
+      }
+    }
+  }
 }
 }
 </style>
 </style>

+ 7 - 9
src/views/holding/holding4.vue

@@ -43,7 +43,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -62,7 +62,7 @@
                 <template #default='{row}'>
                 <template #default='{row}'>
                   <el-button type="text"  @click="myLook(row)" v-if="row.status!=='待审核'">查看</el-button>
                   <el-button type="text"  @click="myLook(row)" v-if="row.status!=='待审核'">查看</el-button>
                   <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'" v-show="userLimits.audit">审核</el-button>
                   <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'" v-show="userLimits.audit">审核</el-button>
-                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'" v-show="userLimits.del">删除</el-button>
+                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'" v-show="userLimits.del" style="color:#C94848;">删除</el-button>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
@@ -315,17 +315,15 @@ export default {
   display: flex;
   display: flex;
   .right {
   .right {
     width: 100%;
     width: 100%;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
     .conten {
     .conten {
-      padding: 20px 20px 40px;
+      padding: 0 20px 40px;
       width: 100%;
       width: 100%;
       height: 829px;
       height: 829px;
       .middle {
       .middle {
@@ -337,8 +335,8 @@ export default {
           align-items: center;
           align-items: center;
           color: black;
           color: black;
           .active{
           .active{
-            color: #409eff;
-            border-bottom: 2px solid #409eff;
+            color: #3E5EB3;
+            border-bottom: 2px solid #3E5EB3;
           }
           }
           li {
           li {
             height: 60px;
             height: 60px;

+ 3 - 5
src/views/holding/holding4_audit.vue

@@ -276,21 +276,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 24px;
     padding: 24px;
     .con_top{
     .con_top{
       color: black;
       color: black;

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

@@ -99,7 +99,7 @@
       </div>
       </div>
       <!-- 表格 -->
       <!-- 表格 -->
       <el-table
       <el-table
-        :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+        :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
         :data="tableData"
         :data="tableData"
         border
         border
         style="width: 100%"
         style="width: 100%"
@@ -253,7 +253,7 @@ export default {
   }
   }
 }
 }
   .mydown {
   .mydown {
-    color: #40a9ff;
+    color: #3E5EB3;
     margin: 4px;
     margin: 4px;
   }
   }
 .title {
 .title {
@@ -269,7 +269,7 @@ export default {
     width: 50%;
     width: 50%;
   }
   }
   .active {
   .active {
-    background-color: #409eff;
+    background-color: #3E5EB3;
     color: #fff;
     color: #fff;
   }
   }
 }
 }

+ 3 - 5
src/views/holding/holding4_look.vue

@@ -212,14 +212,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -228,7 +226,7 @@ export default {
     color: black;
     color: black;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .info{
     .info{
       .row{
       .row{
         display: flex;
         display: flex;

+ 7 - 9
src/views/holding/holding5.vue

@@ -39,7 +39,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -59,7 +59,7 @@
                   <el-button type="text" v-if="row.status==='已完成'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
                   <el-button type="text" v-if="row.status==='已完成'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
                   <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLimits.audit">审核</el-button>
                   <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLimits.audit">审核</el-button>
                   <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLimits.edit">编辑</el-button>
                   <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLimits.edit">编辑</el-button>
-                  <el-button type="text" v-if="row.status!=='已完成'" @click="delOne(row.id,row.status)" v-show="userLimits.del">删除</el-button>
+                  <el-button type="text" v-if="row.status!=='已完成'" @click="delOne(row.id,row.status)" v-show="userLimits.del" style="color:#C94848;">删除</el-button>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
@@ -346,20 +346,18 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .middle {
     .middle {
               .title{
               .title{
           height: 60px;
           height: 60px;
@@ -369,8 +367,8 @@ export default {
           align-items: center;
           align-items: center;
           color: black;
           color: black;
           .active{
           .active{
-            color: #409eff;
-            border-bottom: 2px solid #409eff;
+            color: #3E5EB3;
+            border-bottom: 2px solid #3E5EB3;
           }
           }
           li {
           li {
             height: 60px;
             height: 60px;

+ 1 - 1
src/views/holding/holding5_Dialog.vue

@@ -13,7 +13,7 @@
     <el-table
     <el-table
       ref="multipleTable"
       ref="multipleTable"
       @selection-change="handleSelectionChange"
       @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+      :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
       :data="tableData"
       :data="tableData"
       border
       border
       style="width: 100%"
       style="width: 100%"

+ 4 - 6
src/views/holding/holding5_add.vue

@@ -47,7 +47,7 @@
           <div class="table">
           <div class="table">
             <el-table
             <el-table
               @selection-change="handleSelectionChange"
               @selection-change="handleSelectionChange"
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -324,14 +324,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -339,7 +337,7 @@ export default {
     padding: 40px 0 0 20px;
     padding: 40px 0 0 20px;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .one_row {
     .one_row {
       display: flex;
       display: flex;
       justify-content: start;
       justify-content: start;

+ 4 - 6
src/views/holding/holding5_audit.vue

@@ -32,7 +32,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -222,21 +222,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 4 - 6
src/views/holding/holding5_look.vue

@@ -44,7 +44,7 @@
             <h3>藏品信息</h3>
             <h3>藏品信息</h3>
           </div>
           </div>
           <el-table
           <el-table
-            :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+            :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
             :data="tableData"
             :data="tableData"
             border
             border
             style="width: 100%"
             style="width: 100%"
@@ -181,21 +181,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 35px;
     padding: 35px;
     .info {
     .info {
       display: flex;
       display: flex;

+ 3 - 5
src/views/holding/初始模板.vue

@@ -60,20 +60,18 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
   }
   }
 }
 }
 </style>
 </style>

+ 2 - 2
src/views/home/News.vue

@@ -119,7 +119,7 @@ export default {
       .active {
       .active {
         background-color: #e6f7ff;
         background-color: #e6f7ff;
         border-right: 2px solid #1890ff;
         border-right: 2px solid #1890ff;
-        color: #1890ff;
+        color: #3E5EB3;
       }
       }
       padding-top: 20px;
       padding-top: 20px;
       width: 230px;
       width: 230px;
@@ -148,7 +148,7 @@ export default {
       .active {
       .active {
         text-decoration: underline;
         text-decoration: underline;
         font-weight: 700;
         font-weight: 700;
-        color: #1890ff;
+        color: #3E5EB3;
       }
       }
       span {
       span {
         cursor: pointer;
         cursor: pointer;

+ 2 - 2
src/views/home/index.vue

@@ -323,7 +323,7 @@ export default {
           li {
           li {
             cursor: pointer;
             cursor: pointer;
             &:hover p{
             &:hover p{
-              color: #409eff;
+              color: #3E5EB3;
             }
             }
             p {
             p {
               color: black;
               color: black;
@@ -401,7 +401,7 @@ export default {
         margin-top: 30px;
         margin-top: 30px;
       }
       }
       .examine {
       .examine {
-        color: #1890ff;
+        color: #3E5EB3;
         cursor: pointer;
         cursor: pointer;
       }
       }
       .paging {
       .paging {

+ 16 - 6
src/views/layout/index.vue

@@ -16,7 +16,8 @@
             :class="{ active: $route.meta.myInd === index }"
             :class="{ active: $route.meta.myInd === index }"
           >
           >
             {{ item.name }}
             {{ item.name }}
-            <ul v-show="isShow === index" @mouseenter="isShow = index">
+            <!-- v-show="isShow === index" -->
+            <ul v-show="isShow === index"  @mouseenter="isShow = index">
               <li
               <li
                 v-for="(val, ind) in item.son"
                 v-for="(val, ind) in item.son"
                 :key="ind"
                 :key="ind"
@@ -310,17 +311,25 @@ export default {
       margin-right: 30px;
       margin-right: 30px;
     }
     }
     .active {
     .active {
-      color: #fff;
+      background-color: #3E5EB3;
+      font-weight: 700;
     }
     }
     .box {
     .box {
       position: relative;
       position: relative;
       cursor: pointer;
       cursor: pointer;
       margin: 0 30px;
       margin: 0 30px;
+      a{
+        color: #fff;
+        display: block;
+        height: 68px;
+        line-height: 68px;
+        padding: 0 15px;
+      }
       ul {
       ul {
         z-index: 9999;
         z-index: 9999;
         position: absolute;
         position: absolute;
-        top: 43px;
-        left: -32px;
+        top: 66px;
+        left: -18px;
         background-color: #001529;
         background-color: #001529;
         li {
         li {
           width: 130px;
           width: 130px;
@@ -331,16 +340,17 @@ export default {
           font-size: 14px;
           font-size: 14px;
         }
         }
         li:hover {
         li:hover {
-          background-color: #1890ff;
+          background-color: #3E5EB3;
           color: #fff;
           color: #fff;
         }
         }
       }
       }
     }
     }
     .box:hover a {
     .box:hover a {
-      color: #fff;
+      background-color: #3E5EB3;
     }
     }
   }
   }
   .right {
   .right {
+    color: #fff;
     position: relative;
     position: relative;
     .editPass {
     .editPass {
       .button{
       .button{

+ 10 - 10
src/views/statistics/statistics0.vue

@@ -53,7 +53,7 @@
           <!-- 表格 -->
           <!-- 表格 -->
           <div class="table" v-if="towList.name">
           <div class="table" v-if="towList.name">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -77,8 +77,10 @@
               ></el-table-column>
               ></el-table-column>
               <el-table-column label="操作" width="150" :resizable="false">
               <el-table-column label="操作" width="150" :resizable="false">
                 <template #default='{row}'>
                 <template #default='{row}'>
-                  <i class="el-icon-edit" @click="editThree(row)" v-if="userLimits.edit"></i>
-                  <i class="el-icon-delete" @click="delThree(row.id)" v-if="userLimits.del"></i>
+                  <el-button type="text" @click="editThree(row)" v-if="userLimits.edit">修 改</el-button>
+                  <el-button type="text" @click="delThree(row.id)" v-if="userLimits.del" style="color:#C94848;">删 除</el-button>
+                  <!-- <i class="el-icon-edit" @click="editThree(row)" v-if="userLimits.edit"></i>
+                  <i class="el-icon-delete" @click="delThree(row.id)" v-if="userLimits.del"></i> -->
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
@@ -453,21 +455,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     flex: 1;
     flex: 1;
     display: flex;
     display: flex;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 30px 60px 0;
     padding: 30px 60px 0;
     .conten_left {
     .conten_left {
       width: 380px;
       width: 380px;
@@ -518,10 +518,10 @@ export default {
           margin-left: 50px;
           margin-left: 50px;
         }
         }
         li:hover {
         li:hover {
-          color: #1890ff;
+          color: #3E5EB3;
         }
         }
         .active {
         .active {
-          color: #1890ff;
+          color: #3E5EB3;
         }
         }
       }
       }
     }
     }

+ 5 - 7
src/views/statistics/statistics1.vue

@@ -259,20 +259,18 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     flex: 1;
     flex: 1;
     // background-color: #fff;
     // background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     color: black;
     color: black;
     .oneRow {
     .oneRow {
       display: flex;
       display: flex;
@@ -296,12 +294,12 @@ export default {
           height: 30px;
           height: 30px;
           background-color: #f5f5f5;
           background-color: #f5f5f5;
           &:hover {
           &:hover {
-            background-color: #1890ff;
+            background-color: #3E5EB3;
             color: #fff;
             color: #fff;
           }
           }
         }
         }
         .active {
         .active {
-          background-color: #1890ff;
+          background-color: #3E5EB3;
           color: #fff;
           color: #fff;
         }
         }
       }
       }

+ 7 - 9
src/views/statistics/statistics2.vue

@@ -43,7 +43,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -62,7 +62,7 @@
                 <template #default='{row}'>
                 <template #default='{row}'>
                   <el-button type="text"  @click="myLook(row)" v-if="row.status!=='待审核'">查看</el-button>
                   <el-button type="text"  @click="myLook(row)" v-if="row.status!=='待审核'">查看</el-button>
                   <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'" v-show="userLimits.audit">审核</el-button>
                   <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'" v-show="userLimits.audit">审核</el-button>
-                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'" v-show="userLimits.del">删除</el-button>
+                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'" v-show="userLimits.del" style="color:#C94848;">删除</el-button>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
@@ -315,17 +315,15 @@ export default {
   display: flex;
   display: flex;
   .right {
   .right {
     width: 100%;
     width: 100%;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
     .conten {
     .conten {
-      padding: 20px 20px 40px;
+      padding: 0 20px 40px;
       width: 100%;
       width: 100%;
       height: 829px;
       height: 829px;
       .middle {
       .middle {
@@ -337,8 +335,8 @@ export default {
           align-items: center;
           align-items: center;
           color: black;
           color: black;
           .active{
           .active{
-            color: #409eff;
-            border-bottom: 2px solid #409eff;
+            color: #3E5EB3;
+            border-bottom: 2px solid #3E5EB3;
           }
           }
           li {
           li {
             height: 60px;
             height: 60px;

+ 3 - 5
src/views/statistics/statistics2_audit.vue

@@ -217,21 +217,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
     position: relative;
     position: relative;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     padding: 24px;
     padding: 24px;
     .con_top{
     .con_top{
       color: black;
       color: black;

+ 3 - 5
src/views/statistics/statistics2_look.vue

@@ -153,14 +153,12 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
   .conten {
   .conten {
@@ -169,7 +167,7 @@ export default {
     color: black;
     color: black;
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .info{
     .info{
       .row{
       .row{
         display: flex;
         display: flex;

+ 4 - 6
src/views/system/system1.vue

@@ -24,7 +24,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -138,21 +138,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
 
 
   .conten {
   .conten {
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .middle {
     .middle {
       position: relative;
       position: relative;
               .paging {
               .paging {

+ 4 - 6
src/views/system/system2.vue

@@ -42,7 +42,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -226,21 +226,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
 
 
   .conten {
   .conten {
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .middle {
     .middle {
       position: relative;
       position: relative;
               .paging {
               .paging {

+ 8 - 7
src/views/system/system3.vue

@@ -30,7 +30,7 @@
           <!--表格 -->
           <!--表格 -->
           <div class="table">
           <div class="table">
             <el-table
             <el-table
-              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :header-cell-style="{ background: 'rgba(62, 94, 179, .5)', color: '#404040' }"
               :data="tableData"
               :data="tableData"
               border
               border
               style="width: 100%"
               style="width: 100%"
@@ -71,7 +71,7 @@
                 <template slot-scope="scope">
                 <template slot-scope="scope">
                   <el-button type="text" @click="change(scope.row.isEnabled,scope.row.id)" :disabled='scope.row.roleKey==="sys_admin"||scope.row.roleKey==="sys_user"'>修改状态</el-button>
                   <el-button type="text" @click="change(scope.row.isEnabled,scope.row.id)" :disabled='scope.row.roleKey==="sys_admin"||scope.row.roleKey==="sys_user"'>修改状态</el-button>
                   <el-button type="text" @click="editJS(scope.row.id)" :disabled='scope.row.roleKey==="sys_admin"||scope.row.roleKey==="sys_user"'>编 辑</el-button>
                   <el-button type="text" @click="editJS(scope.row.id)" :disabled='scope.row.roleKey==="sys_admin"||scope.row.roleKey==="sys_user"'>编 辑</el-button>
-                  <el-button type="text" @click="delJS(scope.row.id)" :disabled='scope.row.roleKey==="sys_admin"||scope.row.roleKey==="sys_user"'>删 除</el-button>
+                  <el-button type="text" @click="delJS(scope.row.id)" :disabled='scope.row.roleKey==="sys_admin"||scope.row.roleKey==="sys_user"' :class="{myDel:scope.row.roleKey!=='sys_admin'&&scope.row.roleKey!=='sys_user'}">删 除</el-button>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
@@ -219,6 +219,9 @@ export default {
 <style lang='less' scoped>
 <style lang='less' scoped>
 //@import url(); 引入公共css类
 //@import url(); 引入公共css类
 .system2 {
 .system2 {
+  .myDel{
+    color:#C94848;
+  }
   /deep/#mytitle > span {
   /deep/#mytitle > span {
     font-weight: 800;
     font-weight: 800;
   }
   }
@@ -227,21 +230,19 @@ export default {
     width: 100%;
     width: 100%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
-    .top {
-      padding-left: 35px;
+   .top {
+      padding-left: 18px;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      box-shadow: 1px 1px 10px 1px;
       margin-left: 2px;
       margin-left: 2px;
       height: 40px;
       height: 40px;
-      background-color: #fff;
     }
     }
   }
   }
 
 
   .conten {
   .conten {
     flex: 1;
     flex: 1;
     background-color: #fff;
     background-color: #fff;
-    margin: 20px 20px 40px;
+    margin: 0 20px 40px;
     .middle {
     .middle {
       position: relative;
       position: relative;
       .paging {
       .paging {