update

backstage/src/components/uploadFile/index.vue

@@ -35,7 +35,7 @@ export default {
       this.loading = this.$loading(this.loadOption)
     },
     beforeMultipleUpload(file){
-      let typeArr = this.desc.indexOf('4dage')>-1 ? ['.4dage'] : ['avi','mov','rmvb','rm','mp4']
+      let typeArr = this.desc.indexOf('4dage')>-1 ? ['.4dage'] : ['mov','rmvb','rm','mp4']
       let type = this.isTypeBySend(file.name,typeArr);
       if (!type) {
         this.$message.error('只允许指定文件格式的文件');

backstage/src/pages/content/collection/componets/video.vue

@@ -18,7 +18,7 @@
     </el-form-item>
 
     <el-form-item label="视频文件：" prop="filePath">
-      <uploadFile :url="fileUrl"  @update="data=>{form.fileName = data.fileName,form.filePath = data.filePath}" :filePath="form.filePath" :desc="'支持AVI、mov、rmvb、rm、mp4等格式的视频文件，大小不超过2GB'" />
+      <uploadFile :url="fileUrl"  @update="data=>{form.fileName = data.fileName,form.filePath = data.filePath}" :filePath="form.filePath" :desc="'支持mov、rmvb、rm、mp4等格式的视频文件，大小不超过2GB'" />
       <video class="svideo" v-if="form.filePath" controls :src="form.filePath">
       </video>
     </el-form-item>

backstage/src/pages/content/expert/componets/expert.vue

@@ -107,7 +107,7 @@
             "
             :filePath="form.filePath"
             :desc="
-              '支持AVI、mov、rmvb、rm、mp4等格式的视频文件，大小不超过2GB'
+              '支持mov、rmvb、rm、mp4等格式的视频文件，大小不超过2GB'
             "
           />
 

web/src/components/exhibition/data.js

@@ -4,7 +4,7 @@ let data = {
       {
         id: 1,
         name: "序厅",
-        pano: "56fa4a8ee09542e69e0e5e763cf3a4eb",
+        pano: "d879e313fa5542deb51211c2b48f4eb0",
         quaternion: {
           w: 0.732101964384876,
           x: -0.01689940520219317,
@@ -26,7 +26,7 @@ let data = {
       {
         id: 3,
         name: "第二部分 创建成长",
-        pano: "b2431912b20d4df7b81f47821fca6d1a",
+        pano: "f5b385d34af94a4cb4e3fbc3b8d18a8a",
         quaternion: {
           w: 0.11635247170122785,
           x: 0.00932045997324726,
@@ -48,7 +48,7 @@ let data = {
       {
         id: 5,
         name: "第四部分 转型重塑",
-        pano: "3ba6dd741a334ab095d8c95a1cc607c6",
+        pano: "2eb9d9d718c8416391993b7a9099ca25",
         quaternion: {
           w: 0.9761976323387423,
           x: 0.17472071359144192,
@@ -74,7 +74,7 @@ let data = {
       {
         id: 1,
         name: "第一专题 政治建设",
-        pano: "750ebbb1b7054170832b42041c4aafbb",
+        pano: "a41ac86a09964d6eab14f68d6c17a53a",
         quaternion: {
           w: 0.987983651266762,
           x: 0.04918396279780948,
@@ -85,7 +85,7 @@ let data = {
       {
         id: 2,
         name: "第二专题 学科强院",
-        pano: "9146a4822b5649228ce709ed13e1435b",
+        pano: "2de5ab0d80f94d02bfa9305f4c3f425f",
         quaternion: {
           w: 0.8085772286906441,
           x: 0.09466102532222974,
@@ -96,7 +96,7 @@ let data = {
       {
         id: 3,
         name: "第三专题 人才辈出",
-        pano: "3138091eb931442d8b6b14ea900c49e2",
+        pano: "46bf7f7b998d4b7aa7ffadbdcbbc72e8",
         quaternion: {
           w: 0.7539939236434033,
           x: 0.020223748541140448,
@@ -107,7 +107,7 @@ let data = {
       {
         id: 4,
         name: "第四专题 卫勤备战",
-        pano: "57807acdc74d495d91e04d231e3c7320",
+        pano: "3de0ce3b3d9a467cbff96b0fbf03f2f1",
         quaternion: {
           w: 0.9357009713004085,
           x: 0.062398523838925544,
@@ -118,7 +118,7 @@ let data = {
       {
         id: 5,
         name: "第五专题 保健求精",
-        pano: "e0cd9e7e0c56442d8eba1b5675af2edd",
+        pano: "d247fbc322a142cc9cc345efa204d88b",
         quaternion: {
           w: 0.7796894509208903,
           x: 0.05547368430247829,
@@ -130,7 +130,7 @@ let data = {
       {
         id: 6,
         name: "第六专题 医疗优质",
-        pano: "da5444bb32634606869d029db62ef710",
+        pano: "796913a8e6a341d6bf0960b0ac9eea4a",
         quaternion: {
           w: -0.21157988349594872,
           x: -0.01166138420109815,
@@ -142,7 +142,7 @@ let data = {
       {
         id: 7,
         name: "第七专题 办学育人",
-        pano: "a9c1af7fa1044523ae487296290e5c2b",
+        pano: "9f3aa24084424cc48c3c66b3c1cffa7c",
         quaternion: {
           w: 0.1345770351174761,
           x: 0.004428972236580291,
@@ -154,7 +154,7 @@ let data = {
       {
         id: 8,
         name: "第八专题 科研创新",
-        pano: "9fd8819039f04f499d3e391aa9c413c6",
+        pano: "f9bffdea17914725a6db42d3c8b28a0e",
         quaternion: {
           w: -0.31053416355535446,
           x: -0.029193626498188706,
@@ -166,7 +166,7 @@ let data = {
       {
         id: 9,
         name: "第九专题 保障高效",
-        pano: "d38b0573a8d9453a9d11c037f9c1062b",
+        pano: "7f10f4c115ce4556b79dfe63385009b3",
         quaternion: {
           w: 0.6720707353204242,
           x: 0.03882597660679923,
@@ -220,7 +220,6 @@ let region = {
     '2d792cec5a444191b04c01de507df606',
     'bd279aa2ee3445658d5949ccdc3d0dec',
     '4ffa834115f54461b03956611df78da2',
-    'f5b385d34af94a4cb4e3fbc3b8d18a8a',
     '24cbbd1b488e4908862149cfc91472e0',
     '9f12ccd87b81431eafb9f6c7aaa5cb78',
     'a78e76ac17ab42208e16971c24df1b0d',
@@ -233,6 +232,7 @@ let region = {
     'b2431912b20d4df7b81f47821fca6d1a',
     'cab33e74a2464473ac8e673fb56725e2',
     '80af451fa1954bd6bb542f5db7ec52c4',
+    'f5b385d34af94a4cb4e3fbc3b8d18a8a',
     'ae83ee9af3d046e5bc8883d968947ccc',
     '1a9e3ea5ce5e4c74a804745a97f0ef25',
     'c7bd1b41ecaa425b9c17ffbba2ac043e',
@@ -295,7 +295,6 @@ let region = {
     '362ff858c4f3428dac16db60778418d8',
     '7833c64ba87b4bfe897dd32543304e0f',
     '97717eb4e39f429794f2191d841a3947',
-    '2eb9d9d718c8416391993b7a9099ca25',
     'da9395ca41b24b9eb676bf392a793d57'
 
   ],
@@ -306,6 +305,7 @@ let region = {
     '0700efb27923408ba3a37eb235c97705',
     '3ba6dd741a334ab095d8c95a1cc607c6',
     'fdac9c572f6343129fa53786cadf4887',
+    '2eb9d9d718c8416391993b7a9099ca25',
     'd440c9d93bae4804bdbb9a96dc32f3b4',
     '8326a1b68a604d40935c54338b8f6af8',
     'f0f47bf7f6da4b678d61ba7d17638e55',
@@ -395,19 +395,17 @@ let region = {
     '2de5ab0d80f94d02bfa9305f4c3f425f',
     '9146a4822b5649228ce709ed13e1435b',
     'd23c9bea39574b4689140456d5390ac4',
-    '46bf7f7b998d4b7aa7ffadbdcbbc72e8'
   ],
 
   '第三专题 人才辈出': [
     '07fee7c4ed8047b3a13f0b4be771f351',
     '6329ad57790740caa796c3abfeccd0a1',
-    '3138091eb931442d8b6b14ea900c49e2'
-
+    '3138091eb931442d8b6b14ea900c49e2',
+    '46bf7f7b998d4b7aa7ffadbdcbbc72e8'
   ],
 
   '第四专题 卫勤备战': [
     'e6987fd9ac894ee0b2b6cb6844177ab1',
-    'd247fbc322a142cc9cc345efa204d88b',
     '39b7176a95244f9f9ab641e28c5f5b13',
     '7baf933b5729404198528f61b0265378',
     'adb80a216a7a4a278043e30f4f58f176',
@@ -437,6 +435,7 @@ let region = {
     'c9a043c5f3ea4c1a90dfdda74c5c1691',
     '7f1fe65d3d584bbd97428103a641b2aa',
     'e05d73fecf784cbc81ea27f7c462bd4a',
+    'd247fbc322a142cc9cc345efa204d88b',
     'd251cd3b284942629be45f4f8ec3bb7c',
     '5afa0e786289453a819a4f33d9439cd5',
     '8e68d5f735ae47b3805986a9c806fc12',
@@ -467,7 +466,6 @@ let region = {
   ],
 
   '第七专题 办学育人': [
-    'f9bffdea17914725a6db42d3c8b28a0e',
     '0ac122e5b8da44e494d7ce0c55c6fb4d',
     '4acf18458fb34c7a9c1bd820ff24a9c4',
     'c6404215062d43458fdccf0c6e6307e0',
@@ -481,6 +479,7 @@ let region = {
 
   '第八专题 科研创新': [
     '7016bdb90d0543528f126cfbfecbeeb1',
+    'f9bffdea17914725a6db42d3c8b28a0e',
     'efadf7b6ffe94d18ac9a6a51a741cf71',
     '04ebf132158145d095c891b4f64015e8',
     '641cadd82f184fb29471ff9e340699cc',

web/src/views/expert/index.vue

@@ -363,7 +363,7 @@ export default {
     position: absolute;
     right: 30px;
     top: 30px;
-    z-index: 99999;
+    z-index: 999;
   }
 }
 

web/src/views/scene/gui/menu.vue

@@ -331,18 +331,18 @@ export default {
           img: "chat",
         },
         {
-          name: "精品典藏",
-          link: "/collection",
-          id: 1,
-          img: "collection",
-        },
-        {
           name: "捐赠",
           link: "/message",
           id: 3,
           img: "donate",
         },
         {
+          name: "精品典藏",
+          link: "/collection",
+          id: 1,
+          img: "collection",
+        },
+        {
           name: "问答",
           link: "/message",
           id: 4,