Merge remote-tracking branch 'origin/master'

src/views/museums/specimeninfo/SpecimenImportForm.vue

@@ -205,7 +205,7 @@ const handleExceed = (): void => {
 /** 下载模板操作 */
 const importTemplate = async () => {
   const res = await SpecimenInfoApi.importSpecimenInfoTemplate()
-  download.excel(res, '用户导入模版.xls')
+  download.excel(res, '标本批量导入模版.xls')
 }
 
 /** 图片上传成功 */

src/views/museums/specimeninfo/specimenDetails.vue

@@ -55,7 +55,7 @@
                     }}
                   </el-descriptions-item>
                   <el-descriptions-item label="国际命名:" label-align="right"
-                                        label-class-name="my-label"> {{
+                                        label-class-name="my-label" v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 "> {{
                       specimenData.internationalName
                     }}
                   </el-descriptions-item>
@@ -88,7 +88,7 @@
                 >
 
                   <el-descriptions-item label="成分/化学式:" label-align="right"
-                                        label-class-name="my-label"> {{
+                                        label-class-name="my-label" v-if="specimenData.specimenType !== 2"> {{
                       specimenData.composition
                     }}
                   </el-descriptions-item>
@@ -107,7 +107,7 @@
                                         label-class-name="my-label">{{ specimenData.meteoriteType }}
                   </el-descriptions-item>
                   <el-descriptions-item label="形成时代:" label-width="100px" label-align="right"
-                                        label-class-name="my-label">{{
+                                        label-class-name="my-label" v-if="specimenData.specimenType !== 1 && specimenData.specimenType !== 3 ">{{
                       specimenData.era
                     }}
                   </el-descriptions-item>
@@ -122,7 +122,7 @@
                     }}
                   </el-descriptions-item>
                   <el-descriptions-item label="重量(g):" label-width="100px" label-align="right"
-                                        label-class-name="my-label">{{
+                                        label-class-name="my-label" v-if="specimenData.specimenType !== 2">{{
                       specimenData.weight
                     }}
                   </el-descriptions-item>
@@ -168,12 +168,12 @@
                     }}
                   </el-descriptions-item>
                   <el-descriptions-item label="发现时间:" label-class-name="my-label"
-                                        label-align="right"> {{
+                                        label-align="right" v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 "> {{
                       specimenData.discoveryTime
                     }}
                   </el-descriptions-item>
                   <el-descriptions-item label="降落时间:" label-class-name="my-label"
-                                        label-align="right">{{
+                                        label-align="right" v-if="specimenData.specimenType !== 2 && specimenData.specimenType !== 0 && specimenData.specimenType !== 1 ">{{
                       specimenData.fallTime
                     }}
                   </el-descriptions-item>
@@ -275,7 +275,7 @@
               <h1 class="text1" style="margin-bottom: 10px">馆藏状态</h1>
             </div>
           </template>
-          <el-scrollbar height="600px">
+          <el-scrollbar height="650px">
             <el-timeline style="max-width: 600px;margin-left: 15px">
               <el-timeline-item
                 v-for="(item, index) in stustuss"