Browse Source

修大场景热点数据处理的bug;图片文件名不能用中文;

任一存 2 years ago
parent
commit
7af8267674

+ 0 - 2
package.json

@@ -5,10 +5,8 @@
   "scripts": {
     "serve": "vue-cli-service serve --mode dev",
     "build-test": "vue-cli-service build --mode test",
-    "build-prod": "vue-cli-service build --mode prod",
     "build-local": "vue-cli-service build --mode local",
     "build-local-test": "vue-cli-service build --mode local-test",
-    "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

+ 4 - 3
src/assets/data/data.js

@@ -4567,13 +4567,13 @@ export const goodsData = {
   {
     type: 'book',
     bs: '343',
-    name: '1927年侯绍裘烈士主编的《松江国民日报》第二期到第七期',
+    name: '1927年侯绍裘烈士主编的《松江国民日报》',
     age: '中华民国时期(1912~1949)',
     sort: '文件、宣传品',
     size: '49.2*36.1厘米',
     grain: '纸',
     estate: '二级',
-    imgNum: 6
+    imgNum: 4
   },
   {
     type: 'book',
@@ -7050,7 +7050,8 @@ export const goodsData = {
     size: '',
     grain: '',
     estate: '',
-    imgNum: 4
+    imgNum: 4,
+    noShow: true
   },
   ]
 }

BIN
src/assets/images/oblique/dong-xun-nan-chu.png


src/assets/images/oblique/烈士就义群雕.png → src/assets/images/oblique/lie-shi-jiu-yi-qun-diao.png


BIN
src/assets/images/oblique/xi-xun-nan-chu.png


src/assets/images/oblique/雨花台烈士纪念碑.png → src/assets/images/oblique/yu-hua-tai-lie-shi-ji-nian-bei.png


src/assets/images/oblique/雨花台烈士纪念馆.png → src/assets/images/oblique/yu-hua-tai-lie-shi-ji-nian-guan.png


src/assets/images/oblique/知名烈士墓.png → src/assets/images/oblique/zhi-ming-lie-shi-mu.png


src/assets/images/oblique/忠魂亭.png → src/assets/images/oblique/zhong-hun-ting.png


BIN
src/assets/images/oblique/东烈士殉难处.png


BIN
src/assets/images/oblique/西烈士殉难处.png


+ 16 - 1
src/components/HotspotList.vue

@@ -97,7 +97,22 @@ export default {
   },
   computed: {
     hotspotsCombiled() {
-      return this.hotspotData.filter(v => v.title.split("&")[2] || !v.title.includes("&"))
+      let tempArr = [...this.hotspotData]
+
+      // 排序。照抄的邵根代码。不想理解。
+      tempArr = tempArr.filter(
+        (v) => v.title.split("&")[2] || !v.title.includes("&")
+      )
+
+      tempArr.forEach((v, i) => {
+        const bs = v.title.split("&")[1]
+        if (bs) v.myBs = Number(bs)
+        else v.myBs = -i
+      })
+
+      tempArr = tempArr.sort((a, b) => a.myBs - b.myBs)
+
+      return tempArr
     },
   },
   mounted() {

+ 2 - 2
src/components/PanoList.vue

@@ -100,9 +100,9 @@ export default {
     },
     sceneList() {
       if (this.firstLineActiveIdx === 0) {
-        return this.catalogTopology[0].children[0].children
+        return [...this.catalogTopology[0].children[0].children].sort((a, b) => a.weight - b.weight)
       } else {
-        return this.catalogTopology[this.secondLineActiveIdx + 1].children[0].children
+        return [...this.catalogTopology[this.secondLineActiveIdx + 1].children[0].children].sort((a, b) => a.weight - b.weight)
       }
     }
   },

+ 7 - 7
src/views/ObliqueView.vue

@@ -50,7 +50,7 @@ export default {
         {
           posX: '10.25rem',
           posY: 'calc(50% - 25.5rem)',
-          bgImg: require(`@/assets/images/oblique/烈士就义群雕.png`),
+          bgImg: require(`@/assets/images/oblique/lie-shi-jiu-yi-qun-diao.png`),
           idx: 10,
           width: '10.5rem',
           height: '5.83rem',
@@ -58,7 +58,7 @@ export default {
         {
           posX: '18rem',
           posY: 'calc(50% - 22.5rem)',
-          bgImg: require(`@/assets/images/oblique/雨花台烈士纪念碑.png`),
+          bgImg: require(`@/assets/images/oblique/yu-hua-tai-lie-shi-ji-nian-bei.png`),
           idx: 13,
           width: '18.82rem',
           height: '6.89rem',
@@ -66,7 +66,7 @@ export default {
         {
           posX: '4.17rem',
           posY: 'calc(50% - 21rem)',
-          bgImg: require(`@/assets/images/oblique/西烈士殉难处.png`),
+          bgImg: require(`@/assets/images/oblique/xi-xun-nan-chu.png`),
           idx: 4,
           width: '10.5rem',
           height: '5.83rem',
@@ -74,7 +74,7 @@ export default {
         {
           posX: '32.42rem',
           posY: 'calc(50% - 18rem)',
-          bgImg: require(`@/assets/images/oblique/东烈士殉难处.png`),
+          bgImg: require(`@/assets/images/oblique/dong-xun-nan-chu.png`),
           idx: 1,
           width: '10.5rem',
           height: '5.83rem',
@@ -82,7 +82,7 @@ export default {
         {
           posX: '26.71rem',
           posY: 'calc(50% - 12rem)',
-          bgImg: require(`@/assets/images/oblique/知名烈士墓.png`),
+          bgImg: require(`@/assets/images/oblique/zhi-ming-lie-shi-mu.png`),
           idx: 3,
           width: '9.17rem',
           height: '5.83rem',
@@ -90,7 +90,7 @@ export default {
         {
           posX: '17.96rem',
           posY: 'calc(50% - 4rem)',
-          bgImg: require(`@/assets/images/oblique/雨花台烈士纪念馆.png`),
+          bgImg: require(`@/assets/images/oblique/yu-hua-tai-lie-shi-ji-nian-guan.png`),
           idx: 11,
           width: '13.33rem',
           height: '5.83rem',
@@ -98,7 +98,7 @@ export default {
         {
           posX: '24.63rem',
           posY: 'calc(50% + 5.5rem)',
-          bgImg: require(`@/assets/images/oblique/忠魂亭.png`),
+          bgImg: require(`@/assets/images/oblique/zhong-hun-ting.png`),
           idx: 7,
           width: '9.17rem',
           height: '5.83rem',

+ 1 - 1
src/views/SwkkView.vue

@@ -419,7 +419,7 @@ export default {
 
     // 全部热点数据
     kankan.store.on("tags", (tags) => {
-      this.baseHotData = tags.tags.reverse()
+      this.baseHotData = tags.tags
       console.log('baseHotData: ', this.baseHotData)
     })