Przeglądaj źródła

🎨 修改细节问题

快乐的梦鱼 1 tydzień temu
rodzic
commit
3cd9fa7c25

+ 9 - 3
src/components/content/SimplePointedMap.vue

@@ -14,6 +14,7 @@
 
 <script setup lang="ts">
 import { onMounted, ref, watch } from 'vue';
+import { defaultCenter } from '../dynamicf/Map/MapConfig';
 
 const props = defineProps({
   latitude: {
@@ -35,7 +36,7 @@ const props = defineProps({
 });
 
 const zoom = ref(12);
-const center = ref([121.59996, 31.197646]);
+const center = ref(defaultCenter);
 let map: any = null;
 
 function handleInit(mapRef: any) {
@@ -47,10 +48,15 @@ function loadMaker() {
   center.value = [Number(props.longitude), Number(props.latitude)];
 }
 
-watch(() => [props.latitude, props.longitude], () => {
+watch(() => props.latitude, () => {
   loadMaker();
 });
-onMounted(() => {
+watch(() => props.longitude, () => {
   loadMaker();
 });
+onMounted(() => {
+  setTimeout(() => {
+    loadMaker();
+  }, 200);
+});
 </script>

+ 6 - 14
src/pages/inheritor.vue

@@ -25,7 +25,6 @@
                 <a-descriptions-item label="简介" :span="3"><SimpleRichHtml :contents="[ ichData.content.value.intro ]" /></a-descriptions-item>
                 <a-descriptions-item label="类别"><ShowValueOrNull :value="ichData.content.value.ichTypeText" /></a-descriptions-item>
                 <a-descriptions-item label="级别"><ShowValueOrNull :value="ichData.content.value.levelText" /></a-descriptions-item>
-                <a-descriptions-item label="级别"><ShowValueOrNull :value="ichData.content.value.levelText" /></a-descriptions-item>
                 <a-descriptions-item label="批次"><ShowValueOrNull :value="ichData.content.value.batchText" /></a-descriptions-item>
                 <a-descriptions-item label="区域"><ShowValueOrNull :value="ichData.content.value.regionText" /></a-descriptions-item>
                 <a-descriptions-item label="保护单位"><ShowValueOrNull :value="ichData.content.value.unit" /></a-descriptions-item>
@@ -38,7 +37,6 @@
                 <a-descriptions-item v-if="ichData.content.value.audio" label="音频">
                   <audio controls :src="ichData.content.value.audio" style="max-width:300px;" />
                 </a-descriptions-item>
-                <a-descriptions-item label="类型"><ShowValueOrNull :value="ichData.content.value.typeText" /></a-descriptions-item>
                 <a-descriptions-item v-if="ichData.content.value.latitude && ichData.content.value.longitude" label="地图">
                   <SimplePointedMap :longitude="ichData.content.value.longitude" :latitude="ichData.content.value.latitude" :zoom="15" height="300px"  />
                 </a-descriptions-item>
@@ -59,17 +57,14 @@
                 </a-descriptions-item>
                 <a-descriptions-item label="传承人等级"><ShowValueOrNull :value="inheritorData.content.value.levelText" /></a-descriptions-item>
                 <a-descriptions-item label="传承人批次"><ShowValueOrNull :value="inheritorData.content.value.batchText" /></a-descriptions-item>
-                <a-descriptions-item label="别称"><ShowValueOrNull :value="inheritorData.content.value.alsoName" /></a-descriptions-item>
                 <a-descriptions-item label="时代"><ShowValueOrNull :value="inheritorData.content.value.age" /></a-descriptions-item>
-                <a-descriptions-item label="出生地"><ShowValueOrNull :value="inheritorData.content.value.birthplace" /></a-descriptions-item>
                 <a-descriptions-item label="民族"><ShowValueOrNull :value="inheritorData.content.value.nation" /></a-descriptions-item>
+                <a-descriptions-item label="籍贯"><ShowValueOrNull :value="inheritorData.content.value.birthplace" /></a-descriptions-item>
                 <a-descriptions-item label="出生日期"><ShowValueOrNull :value="inheritorData.content.value.dateBirth" /></a-descriptions-item>
-                <a-descriptions-item label="逝世日期"><ShowValueOrNull :value="inheritorData.content.value.deathBirth" /></a-descriptions-item>
                 <a-descriptions-item label="单位"><ShowValueOrNull :value="inheritorData.content.value.unit" /></a-descriptions-item>
                 <a-descriptions-item label="区域"><ShowValueOrNull :value="inheritorData.content.value.regionText" /></a-descriptions-item>
 
                 <a-descriptions-item label="简介" :span="3"><SimpleRichHtml :contents="[ inheritorData.content.value.intro ]" /></a-descriptions-item>
-                <a-descriptions-item label="描述" :span="3"><SimpleRichHtml :contents="[ inheritorData.content.value.content! ]" /></a-descriptions-item>
                 <a-descriptions-item label="奖项/成就" :span="3"><SimpleRichHtml :contents="[ inheritorData.content.value.prize ]" /></a-descriptions-item>
                       
                 <a-descriptions-item v-if="inheritorData.content.value.images" label="代表性图片">
@@ -89,8 +84,7 @@
               <a-alert v-if="seminarData.content.value?.progress == -1" message="提交的信息被退回,您可以去修改" type="warning" showIcon></a-alert>
               <a-descriptions class="mt-3" title="传习所信息" v-if="seminarData.content.value" bordered :column="{ xs: 1, sm: 1, md: 1, lg: 2 }">
                 <a-descriptions-item label="标题"><ShowValueOrNull :value="seminarData.content.value.title" /></a-descriptions-item>
-                <a-descriptions-item label="简介" :span="3"><SimpleRichHtml :contents="[ seminarData.content.value.desc as string ]" /></a-descriptions-item>
-                <a-descriptions-item label="介绍" :span="3"><SimpleRichHtml :contents="[ seminarData.content.value.content as string ]" /></a-descriptions-item>
+                <a-descriptions-item label="简介" :span="3"><SimpleRichHtml :contents="[ seminarData.content.value.intro as string ]" /></a-descriptions-item>
                 <a-descriptions-item v-if="seminarData.content.value.latitude && seminarData.content.value.longitude" label="地图">
                   <SimplePointedMap :longitude="seminarData.content.value.longitude" :latitude="seminarData.content.value.latitude" :zoom="15" height="300px"  />
                 </a-descriptions-item>
@@ -117,15 +111,13 @@
                 <a-descriptions-item v-if="seminarData.content.value.audio" label="音频">
                   <audio controls :src="seminarData.content.value.audio" style="max-width:300px;" />
                 </a-descriptions-item>
-                <a-descriptions-item label="类型"><ShowValueOrNull :value="seminarData.content.value.typeText" /></a-descriptions-item>
-
               </a-descriptions>
             </EmptyToRecord>
           </a-tab-pane>
           <a-tab-pane key="4" tab="作品">
             <EmptyToRecord title="作品" buttonText="新增作品" :loader="ichData" :showEdited="false" @edit="router.push({ name: 'FormWork' })">
-              <div class="d-flex justify-content-end">
-                <a-button type="primary" @click="router.push({ name: 'FormWork' })">+ 新增</a-button>
+              <div class="d-flex justify-content-end me-2 mb-2">
+                <a-button type="primary" size="small" @click="router.push({ name: 'FormWork' })">+ 新增</a-button>
               </div>
               <a-list class="light-round" item-layout="horizontal" :data-source="worksData || []">
                 <template #renderItem="{ item }">
@@ -148,8 +140,8 @@
           </a-tab-pane>
           <!-- <a-tab-pane key="5" tab="五年计划">
             <EmptyToRecord title="五年计划" :model="planData" :showEdited="false" @edit="router.push({ name: 'FormPlan' })">
-              <div class="d-flex justify-content-end">
-                <a-button type="primary" @click="router.push({ name: 'FormPlan' })">+ 新增</a-button>
+              <div class="d-flex justify-content-end me-2 mb-2">
+                <a-button type="primary" size="small" @click="router.push({ name: 'FormPlan' })">+ 新增</a-button>
               </div>
               <a-list item-layout="horizontal" :data-source="planData">
                 <template #renderItem="{ item }">