修复bug

src/assets/style/initial.css

@@ -7,6 +7,9 @@ body {
   background-color:#f0f2f5;
   /* overflow: hidden; */
 }
+img {
+  object-fit: contain;
+}
 * {
   margin: 0;
   padding: 0;

src/views/collect/collect0.vue

@@ -403,7 +403,7 @@ export default {
               height: 200px;
               object-fit: contain;
               margin-bottom: 8px;
-              border: 5px solid #ccc;
+              border: 3px solid #ccc;
             }
             span {
               color: black;

src/views/collect/collect0_look.vue

@@ -375,7 +375,7 @@ body .el-table::before {
         object-fit: contain;
         width: 100%;
         height: 340px;
-        border: 15px solid #ccc;
+        // border: 15px solid #ccc;
       }
     }
     .conten_right {

src/views/collect/collect1_Dialog.vue

@@ -213,7 +213,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    border: 3px solid #ccc;
+    // border: 3px solid #ccc;
   }
 }
 </style>

src/views/collect/collect1_add.vue

@@ -376,7 +376,7 @@ export default {
           overflow-y: auto;
         }
         .smimg {
-          border: 3px solid #ccc;
+           // border: 3px solid #ccc;
           height: 78px;
           img {
             width: 100%;

src/views/collect/collect1_audit.vue

@@ -220,7 +220,7 @@ export default {
       max-height: 288px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 68px;
         img {
           width: 100%;

src/views/collect/collect1_look.vue

@@ -256,7 +256,7 @@ export default {
       max-height: 360px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 70px;
         img {
           width: 100%;

src/views/collect/collect2_Dialog.vue

@@ -213,7 +213,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    border: 3px solid #ccc;
+    // border: 3px solid #ccc;
   }
 }
 </style>

src/views/collect/collect2_add.vue

@@ -149,7 +149,13 @@ export default {
   methods: {
     // 点击查看
     myLook (val) {
-      this.myObj = val
+      const obj = val
+      if (typeof (obj.level) === 'number') obj.level = this.myWwjb(obj.level) // 修改文物级别
+      if (obj.textureType === 0) obj.textureType = '单一质地'
+      else if (obj.textureType === 1) obj.textureType = '复合质地'// 修改质地类型
+      if (obj.amountType === 0) obj.amountType = '单件'
+      else if (obj.amountType === 1) obj.amountType = '一套多件'// 修改数量类型
+      this.myObj = obj
       // 调用子组件的方法，获取附件信息
       this.$refs.mylook.getFileList(val.id, 'video')
       this.isShow = true
@@ -348,7 +354,7 @@ export default {
           overflow-y: auto;
         }
         .smimg {
-          border: 3px solid #ccc;
+          // border: 3px solid #ccc;
           height: 78px;
           img {
             width: 100%;

src/views/collect/collect2_audit.vue

@@ -143,7 +143,14 @@ export default {
   methods: {
     // 点击查看
     myLook (val) {
-      this.myObj = val
+      const obj = val
+      obj.goodsTypeName = val.goodsTypeId // 修改文物类别
+      if (typeof (obj.level) === 'number') obj.level = this.myWwjb(obj.level) // 修改文物级别
+      if (obj.textureType === 0) obj.textureType = '单一质地'
+      else if (obj.textureType === 1) obj.textureType = '复合质地'// 修改质地类型
+      if (obj.amountType === 0) obj.amountType = '单件'
+      else if (obj.amountType === 1) obj.amountType = '一套多件'// 修改数量类型
+      this.myObj = obj
       // 调用子组件的方法，获取附件信息
       this.$refs.mylook.getFileList(val.id, 'video')
       this.isShow = true
@@ -236,7 +243,7 @@ export default {
       max-height: 288px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 68px;
         img {
           width: 100%;

src/views/collect/collect2_look.vue

@@ -120,7 +120,14 @@ export default {
   methods: {
     // 点击查看
     myLook (val) {
-      this.myObj = val
+      const obj = val
+      obj.goodsTypeName = val.goodsTypeId // 修改文物类别
+      if (typeof (obj.level) === 'number') obj.level = this.myWwjb(obj.level) // 修改文物级别
+      if (obj.textureType === 0) obj.textureType = '单一质地'
+      else if (obj.textureType === 1) obj.textureType = '复合质地'// 修改质地类型
+      if (obj.amountType === 0) obj.amountType = '单件'
+      else if (obj.amountType === 1) obj.amountType = '一套多件'// 修改数量类型
+      this.myObj = obj
       // 调用子组件的方法，获取附件信息
       this.$refs.mylook.getFileList(val.id, 'video')
       this.isShow = true
@@ -217,7 +224,7 @@ export default {
       max-height: 380px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 70px;
         img {
           width: 100%;

src/views/holding/holding0_DiaEdit.vue

@@ -575,7 +575,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    border: 3px solid #ccc;
+    // border: 3px solid #ccc;
   }
 }
 /deep/.el-icon-plus {

src/views/holding/holding0_Dialog.vue

@@ -608,7 +608,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    border: 3px solid #ccc;
+    // border: 3px solid #ccc;
   }
 }
 /deep/.el-icon-plus {

src/views/holding/holding0_add.vue

@@ -358,7 +358,7 @@ export default {
         overflow: auto;
         max-height: 350px;
         .smimg{
-          border: 3px solid #ccc;
+          // border: 3px solid #ccc;
           height: 78px;
           img {
             width: 100%;

src/views/holding/holding0_audit.vue

@@ -175,7 +175,12 @@ export default {
     },
     // 点击查看
     myLook (val) {
-      this.myObj = val
+      const obj = val
+      obj.goodsTypeName = val.goodsTypeId // 修改文物类别
+      if (typeof (obj.level) === 'number') obj.level = this.myWwjb(obj.level) // 修改文物级别
+      if (obj.textureType === 0) obj.textureType = '单一质地'
+      else if (obj.textureType === 1) obj.textureType = '复合质地'// 修改质地类型
+      this.myObj = obj
       // 调用子组件的方法，获取附件信息
       this.$refs.mylook.getFileList(val.id, 'video')
       this.isShow = true
@@ -276,7 +281,7 @@ export default {
       max-height: 288px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 50px;
         img {
           width: 100%;

src/views/holding/holding0_audit_Dia.vue

@@ -6,54 +6,75 @@
       <div :class="{ active: index === 1 }" @click="change(1)">附件</div>
     </div>
     <div class="info" v-if="!index">
-      <div class="row">
-        <div><span>藏品名称：</span>{{ myObj.name }}</div>
-        <div><span>总登记号：</span>{{ myObj.registerNum }}</div>
-      </div>
-      <div class="row">
-        <div><span>编号类型：</span>{{ myObj.numTypeId }}</div>
-        <div><span>藏品编号：</span>{{ myObj.num }}</div>
-      </div>
-      <div class="row">
-        <div><span>原名：</span>{{ myObj.primitiveName }}</div>
-        <div><span>年代：</span>{{ myObj.age }}</div>
-      </div>
-      <div class="row">
-        <div><span>文物类别：</span>{{ myObj.goodsTypeId }}</div>
-        <div><span>文物质地：</span>{{ myObj.texture }}</div>
-      </div>
-      <div class="row">
-        <div>
-          <span>数量类型：</span
-          >{{ myObj.amountType}}
-        </div>
-        <div><span>具体数量：</span>{{ myObj.amount }}</div>
-      </div>
-      <div class="row">
-        <div><span>通长：</span>{{ myObj.length }}</div>
-        <div><span>通宽：</span>{{ myObj.width }}</div>
-        <div><span>通高：</span>{{ myObj.height }}</div>
-      </div>
-      <div class="row">
-        <!-- <div><span>文物类别：</span>{{myObj.goodsTypeName}}</div> -->
-        <!-- <div><span>文物价格：</span>找不到字段</div> -->
-      </div>
-      <div class="row">
-        <div><span>具体质量：</span>{{ myObj.quality }}</div>
-        <div><span>完残程度：</span>{{ myObj.integrity }}</div>
-      </div>
             <div class="row">
-                <div><span>完残状况：</span>{{ myObj.repairRemark }}</div>
+              <div><span>藏品名称：</span>{{ myObj.name?myObj.name:'-' }}</div>
+              <div><span>总登记号：</span>{{ myObj.registerNum?myObj.registerNum:'-' }}</div>
             </div>
-      <div class="row">
-        <div><span>保存状态：</span>{{ myObj.repair }}</div>
-        <div><span>入藏时间范围：</span>{{ myObj.checkInScope }}</div>
-      </div>
+            <div class="row">
+              <div><span>编号类型：</span>{{ myObj.numTypeId?myObj.numTypeId:'-' }}</div>
+              <div><span>藏品编号：</span>{{ myObj.num?myObj.num:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>原名：</span>{{ myObj.primitiveName?myObj.primitiveName:'-' }}</div>
+              <div><span>年代：</span>{{ myObj.age?myObj.age:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>文物类别：</span>{{ myObj.goodsTypeName?myObj.goodsTypeName:'-' }}</div>
+              <div><span>文物级别：</span>{{ myObj.level?myObj.level:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>质地类型：</span>{{ myObj.textureType?myObj.textureType:'-' }}</div>
+              <div><span>质地类别：</span>{{ myObj.textureCategory?myObj.textureCategory:'-' }}</div>
+              <div><span>质地：</span>{{ myObj.texture?myObj.texture:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>通长：</span>{{ myObj.length?myObj.length:'-' }}</div>
+              <div><span>通宽：</span>{{ myObj.width?myObj.width:'-' }}</div>
+              <div><span>通高：</span>{{ myObj.height?myObj.height:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>完残程度：</span>{{ myObj.integrity?myObj.integrity:'-' }}</div>
+              <div><span>保存状态：</span>{{ myObj.repair?myObj.repair:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>完残状况：</span>{{ myObj.repairRemark?myObj.repairRemark:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>数量类型：</span>{{ myObj.amountType?myObj.amountType:'-' }}</div>
+              <div><span>具体数量：</span>{{ myObj.amount?myObj.amount:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>质量范围：</span>{{ myObj.qualityScope?myObj.qualityScope:'-' }}</div>
+              <div><span>具体质量：</span>{{ myObj.quality?myObj.quality:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>入藏时间范围：</span>{{ myObj.checkInScope?myObj.checkInScope:'-' }}</div>
+              <div><span>入藏年度：</span>{{ myObj.checkInYear?myObj.checkInYear:'-' }}</div>
+            </div>
+            <!-- <div class="row">
+              <div>
+                <span>入库位置：</span>
+                <el-cascader
+                  ref="cascaderAddr"
+                  v-if="myObj.location && myObj.location.length === 3"
+                  placeholder=""
+                  disabled
+                  style="width: 80%"
+                  :props="{ value: 'id', label: 'name' }"
+                  v-model="myObj.location"
+                  :options="options"
+                ></el-cascader>
+                <i v-else>-</i>
+              </div>
+              <div>
+                <span>出库位置：</span>{{ myObj.outPath ? myObj.outPath : "-" }}
+              </div>
+            </div> -->
     </div>
     <div class="affix" v-else>
       <div class="row">
         <span>藏品图片：</span
-        ><img class="img" :src="baseURL + myObj.thumb" alt="" />
+        ><img class="img" :src="baseURL + myObj.thumb" alt="" :onerror='defaultImg'/>
       </div>
       <div class="row row2">
         <span>类型：</span>
@@ -90,7 +111,7 @@
 </template>
 
 <script>
-import { getFileList } from '../../apis/holding'
+import { getFileList } from '@/apis/holding'
 import axios from '@/utils/request'
 export default {
   name: 'Holding0_audit_Dia',
@@ -109,6 +130,7 @@ export default {
   },
   data () {
     return {
+      options: [],
       baseURL: '',
       index: 0,
       select: 'video',
@@ -196,8 +218,7 @@ export default {
     & > div {
       padding-left: 20px;
       flex: 1;
-      height: 50px;
-      line-height: 50px;
+      padding: 10px;
       border: 1px solid #ccc;
       font-size: 16px;
       color: black;
@@ -209,7 +230,7 @@ export default {
 }
 .affix {
   .smimg {
-    border: 3px solid #ccc;
+    // border: 3px solid #ccc;
     height: 50px;
     img {
       width: 100%;
@@ -233,9 +254,11 @@ export default {
     }
     img {
       margin-left: 15px;
-      width: 85px;
-      height: 85px;
-      border: 3px solid #ccc;
+      max-width: 700px;
+      max-height: 200px;
+      // width: 85px;
+      // height: 85px;
+      // border: 3px solid #ccc;
     }
   }
 }

src/views/holding/holding0_result.vue

@@ -124,7 +124,15 @@ export default {
   methods: {
     // 点击查看
     myLook (val) {
-      this.myObj = val
+      const obj = val
+      obj.goodsTypeName = val.goodsTypeId // 修改文物类别
+      if (typeof (obj.level) === 'number') obj.level = this.myWwjb(obj.level) // 修改文物级别
+      if (obj.textureType === 0) obj.textureType = '单一质地'
+      else if (obj.textureType === 1) obj.textureType = '复合质地'// 修改质地类型
+      if (obj.amountType === 0) obj.amountType = '单件'
+      else if (obj.amountType === 1) obj.amountType = '一套多件'// 修改数量类型
+
+      this.myObj = obj
       // 调用子组件的方法，获取附件信息
       this.$refs.mylook.getFileList(val.id, 'video')
       this.isShow = true
@@ -214,7 +222,7 @@ export default {
       max-height: 325px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 50px;
         img {
           width: 100%;

src/views/holding/holding1_Dialog copy.vue

@@ -231,7 +231,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    border: 3px solid #ccc;
+    // border: 3px solid #ccc;
   }
 }
 </style>

src/views/holding/holding1_Dialog.vue

@@ -213,7 +213,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    border: 3px solid #ccc;
+    // border: 3px solid #ccc;
   }
 }
 </style>

src/views/holding/holding1_add.vue

@@ -362,7 +362,7 @@ export default {
           overflow-y: auto;
         }
         .smimg {
-          border: 3px solid #ccc;
+          // border: 3px solid #ccc;
           height: 78px;
           img {
             width: 100%;

src/views/holding/holding1_audit.vue

@@ -258,7 +258,7 @@ export default {
       max-height: 288px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 60px;
         img {
           width: 100%;

src/views/holding/holding1_look.vue

@@ -226,7 +226,7 @@ export default {
       max-height: 380px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 70px;
         img {
           width: 100%;

src/views/holding/holding2_Dialog.vue

@@ -213,7 +213,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    border: 3px solid #ccc;
+    // border: 3px solid #ccc;
   }
 }
 </style>

src/views/holding/holding2_add.vue

@@ -376,7 +376,7 @@ export default {
           overflow-y: auto;
         }
         .smimg {
-          border: 3px solid #ccc;
+          // border: 3px solid #ccc;
           height: 78px;
           img {
             width: 100%;

src/views/holding/holding2_audit.vue

@@ -220,7 +220,7 @@ export default {
       max-height: 288px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 68px;
         img {
           width: 100%;

src/views/holding/holding2_look.vue

@@ -266,7 +266,7 @@ export default {
       max-height: 360px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 70px;
         img {
           width: 100%;

src/views/holding/holding3.vue

@@ -488,7 +488,7 @@ export default {
               height: 200px;
               object-fit: contain;
               margin-bottom: 8px;
-              border: 5px solid #ccc;
+              border: 3px solid #ccc;
             }
             span {
               color: black;

src/views/holding/holding3_look.vue

@@ -455,7 +455,7 @@ body .el-table::before {
         object-fit: contain;
         width: 100%;
         height: 340px;
-        border: 15px solid #ccc;
+        // border: 15px solid #ccc;
       }
     }
     .conten_right {

src/views/holding/holding5_Dialog.vue

@@ -213,7 +213,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    border: 3px solid #ccc;
+    // border: 3px solid #ccc;
   }
 }
 </style>

src/views/holding/holding5_add.vue

@@ -149,7 +149,13 @@ export default {
   methods: {
     // 点击查看
     myLook (val) {
-      this.myObj = val
+      const obj = val
+      if (typeof (obj.level) === 'number') obj.level = this.myWwjb(obj.level) // 修改文物级别
+      if (obj.textureType === 0) obj.textureType = '单一质地'
+      else if (obj.textureType === 1) obj.textureType = '复合质地'// 修改质地类型
+      if (obj.amountType === 0) obj.amountType = '单件'
+      else if (obj.amountType === 1) obj.amountType = '一套多件'// 修改数量类型
+      this.myObj = obj
       // 调用子组件的方法，获取附件信息
       this.$refs.mylook.getFileList(val.id, 'video')
       this.isShow = true
@@ -348,7 +354,7 @@ export default {
           overflow-y: auto;
         }
         .smimg {
-          border: 3px solid #ccc;
+          // border: 3px solid #ccc;
           height: 78px;
           img {
             width: 100%;

src/views/holding/holding5_audit.vue

@@ -143,7 +143,14 @@ export default {
   methods: {
     // 点击查看
     myLook (val) {
-      this.myObj = val
+      const obj = val
+      obj.goodsTypeName = val.goodsTypeId // 修改文物类别
+      if (typeof (obj.level) === 'number') obj.level = this.myWwjb(obj.level) // 修改文物级别
+      if (obj.textureType === 0) obj.textureType = '单一质地'
+      else if (obj.textureType === 1) obj.textureType = '复合质地'// 修改质地类型
+      if (obj.amountType === 0) obj.amountType = '单件'
+      else if (obj.amountType === 1) obj.amountType = '一套多件'// 修改数量类型
+      this.myObj = obj
       // 调用子组件的方法，获取附件信息
       this.$refs.mylook.getFileList(val.id, 'video')
       this.isShow = true
@@ -236,7 +243,7 @@ export default {
       max-height: 288px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 68px;
         img {
           width: 100%;

src/views/holding/holding5_look.vue

@@ -120,7 +120,14 @@ export default {
   methods: {
     // 点击查看
     myLook (val) {
-      this.myObj = val
+      const obj = val
+      obj.goodsTypeName = val.goodsTypeId // 修改文物类别
+      if (typeof (obj.level) === 'number') obj.level = this.myWwjb(obj.level) // 修改文物级别
+      if (obj.textureType === 0) obj.textureType = '单一质地'
+      else if (obj.textureType === 1) obj.textureType = '复合质地'// 修改质地类型
+      if (obj.amountType === 0) obj.amountType = '单件'
+      else if (obj.amountType === 1) obj.amountType = '一套多件'// 修改数量类型
+      this.myObj = obj
       // 调用子组件的方法，获取附件信息
       this.$refs.mylook.getFileList(val.id, 'video')
       this.isShow = true
@@ -217,7 +224,7 @@ export default {
       max-height: 380px;
       overflow: auto;
       .smimg {
-        border: 3px solid #ccc;
+        // border: 3px solid #ccc;
         height: 70px;
         img {
           width: 100%;

src/views/home/News.vue

@@ -175,7 +175,7 @@ export default {
             border-radius: 50%;
           }
           .dianX {
-            border: 3px solid #ccc;
+            // border: 3px solid #ccc;
           }
         }
       }