Sfoglia il codice sorgente

💄 修改保护区概况页显示厦门市

imengyu 2 settimane fa
parent
commit
428ce83a0a
3 ha cambiato i file con 2625 aggiunte e 61 eliminazioni
  1. 2593 50
      package-lock.json
  2. 8 0
      package.json
  3. 24 11
      src/views/AboutView.vue

File diff suppressed because it is too large
+ 2593 - 50
package-lock.json


+ 8 - 0
package.json

@@ -17,8 +17,10 @@
     "@imengyu/vue-scroll-rect": "^0.1.3",
     "@vuemap/vue-amap": "^2.1.12",
     "ant-design-vue": "^4.2.6",
+    "axios": "^1.9.0",
     "bootstrap": "^5.3.0",
     "lodash-es": "^4.17.21",
+    "md5": "^2.3.0",
     "mitt": "^3.0.1",
     "pinia": "^3.0.1",
     "tslib": "^2.8.1",
@@ -27,11 +29,17 @@
     "vue3-carousel": "^0.15.0"
   },
   "devDependencies": {
+    "@inquirer/prompts": "^7.5.3",
     "@tsconfig/node22": "^22.0.1",
     "@types/node": "^22.14.0",
     "@vitejs/plugin-vue": "^5.2.3",
     "@vitejs/plugin-vue-jsx": "^4.1.2",
     "@vue/tsconfig": "^0.7.0",
+    "ali-oss": "^6.23.0",
+    "archiver": "^7.0.1",
+    "cli-progress": "^3.12.0",
+    "cli-table3": "^0.6.5",
+    "commander": "^14.0.0",
     "npm-run-all2": "^7.0.2",
     "sass": "^1.87.0",
     "typescript": "~5.8.0",

+ 24 - 11
src/views/AboutView.vue

@@ -43,6 +43,18 @@
       <div class="content">   
         <SimplePageContentLoader :loader="introdLoader">
           <div class="d-flex justify-content-center">
+            <h2>{{ introdLoader.content.value?.introd1?.title }}</h2>
+          </div>
+          <LeftRightBox 
+            class="mt-4"
+            :title="introdLoader.content.value?.introd1?.title"
+            :desc="introdLoader.content.value?.introd1?.content"
+            :image="introdLoader.content.value?.introd1?.image"
+            :rightItems="introdLoader.content.value?.list"
+            @rightItemDefaultClick="(item) => navTo('/news/detail', { id: item.id })"
+            @moreClick="navTo('/introduction/about')"
+          />
+          <div class="d-flex justify-content-center mt-5">
             <h2>{{ introdLoader.content.value?.introd2?.title }}</h2>
           </div>
           <LeftRightBox 
@@ -50,18 +62,16 @@
             :title="introdLoader.content.value?.introd2?.title"
             :desc="introdLoader.content.value?.introd2?.content"
             :image="introdLoader.content.value?.introd2?.image"
-            :rightItems="introdLoader.content.value?.list"
-            @rightItemDefaultClick="(item) => navTo('/news/detail', { id: item.id })"
             @moreClick="navTo('/introduction/about')"
           />
           <div class="d-flex justify-content-center mt-5">
-            <h2>{{ introdLoader.content.value?.introd1?.title }}</h2>
+            <h2>{{ introdLoader.content.value?.introd3?.title }}</h2>
           </div>
           <LeftRightBox 
             class="mt-4"
-            :title="introdLoader.content.value?.introd1?.title"
-            :desc="introdLoader.content.value?.introd1?.content"
-            :image="introdLoader.content.value?.introd1?.image"
+            :title="introdLoader.content.value?.introd3?.title"
+            :desc="introdLoader.content.value?.introd3?.content"
+            :image="introdLoader.content.value?.introd3?.image"
             :showMore="false"
             left
           />
@@ -124,6 +134,9 @@
 import { Carousel, Slide, Pagination, Navigation } from 'vue3-carousel'
 import { onMounted, ref, watch } from 'vue';
 import { useSimplePagerDataLoader } from '@/composeable/SimplePagerDataLoader';
+import { useRouter } from 'vue-router';
+import { useSimpleDataLoader } from '@/composeable/SimpleDataLoader';
+import { usePageAction } from '@/composeable/PageAction';
 import Pagination2 from '@/components/controls/Pagination.vue';
 import TitleDescBlock from '@/components/parts/TitleDescBlock.vue';
 import ImageTextSmallBlock from '@/components/parts/ImageTextSmallBlock.vue';
@@ -132,9 +145,6 @@ import CommonContent, { GetContentListParams } from '@/api/CommonContent';
 import DateUtils from '@/common/utils/DateUtils';
 import PolicyContent from '@/api/introduction/PolicyContent';
 import LawsTest from '@/assets/images/inheritor/LawsTest.jpg'
-import { useRouter } from 'vue-router';
-import { useSimpleDataLoader } from '@/composeable/SimpleDataLoader';
-import { usePageAction } from '@/composeable/PageAction';
 import LeftRightBox from '@/components/parts/LeftRightBox.vue';
 import NewsIndexContent from '@/api/news/NewsIndexContent';
 
@@ -169,14 +179,17 @@ const introdLoader = useSimpleDataLoader(async () => {
         .setMainBodyColumnId([ 234 ])
       , 1, 10);
 
-  const id1 = res2.list.find(item => item.title.includes('全国'))?.id; 
-  const id2 = res2.list.find(item => item.title.includes('闽南'))?.id; 
+  const id1 = res2.list.find(item => item.title.includes('厦门'))?.id; 
+  const id2 = res2.list.find(item => item.title.includes('闽南') && !item.title.includes('厦门'))?.id; 
+  const id3 = res2.list.find(item => item.title.includes('全国'))?.id; 
   
   const introd1 = id1 ? await NewsIndexContent.getContentDetail(id1) : undefined;
   const introd2 = id2 ? await NewsIndexContent.getContentDetail(id2) : undefined;
+  const introd3 = id3 ? await NewsIndexContent.getContentDetail(id3) : undefined;
   return {
     introd1,
     introd2,
+    introd3,
     list: res.list,
   };
 })