|
|
@@ -1,10 +1,12 @@
|
|
|
import {Booth} from './booth'
|
|
|
|
|
|
//计算点位分布
|
|
|
-let calcuSpread = (start, end, other=[]) => {
|
|
|
+let calcuSpread = (start, end, other=[], getRid=[] ) => {
|
|
|
let arr = [];
|
|
|
for (let i = 0; i <= end - start; i++) {
|
|
|
- arr.push(start + i);
|
|
|
+ if (!(getRid.indexOf(start + i)>-1)) {
|
|
|
+ arr.push(start + i);
|
|
|
+ }
|
|
|
}
|
|
|
return arr.concat(other);
|
|
|
};
|
|
|
@@ -18,7 +20,7 @@ let region = [
|
|
|
desc: "大众创业万众创新",
|
|
|
short: "序厅",
|
|
|
company: Booth.find(item=>item.id=='xuting').company, //序厅展位ID
|
|
|
- spread: calcuSpread(0, 7,[244,245]),
|
|
|
+ spread: calcuSpread(0, 7,[244,245],[4]),
|
|
|
firstView: {
|
|
|
panoId: "0",
|
|
|
panoQuaternion: {
|
|
|
@@ -36,7 +38,7 @@ let region = [
|
|
|
desc: "拓展就业空间", //展区简介,
|
|
|
short: "新业态",
|
|
|
company: Booth.find(item=>item.id=='one').company, //对应展位id
|
|
|
- spread: calcuSpread(8, 47,[4,238,252,253]),
|
|
|
+ spread: calcuSpread(8, 47,[4,238,252,253],[47]),
|
|
|
firstView: {
|
|
|
panoId: "4",
|
|
|
panoQuaternion: {
|
|
|
@@ -54,7 +56,7 @@ let region = [
|
|
|
desc: "助力自立自强",
|
|
|
short: "新技术",
|
|
|
company: Booth.find(item=>item.id=='two').company, //展区二展位ID
|
|
|
- spread: calcuSpread(48, 97,[47,239,240]),
|
|
|
+ spread: calcuSpread(48, 97,[47,239,240],[66]),
|
|
|
firstView: {
|
|
|
panoId: "47",
|
|
|
panoQuaternion: {
|
|
|
@@ -72,7 +74,7 @@ let region = [
|
|
|
desc: "激发主体活力",
|
|
|
short: "新生态",
|
|
|
company: Booth.find(item=>item.id=='three').company,
|
|
|
- spread: calcuSpread(98, 133,[66,241]),
|
|
|
+ spread: calcuSpread(98, 133,[66,241],[133]),
|
|
|
firstView: {
|
|
|
panoId: "66",
|
|
|
panoQuaternion: {
|
|
|
@@ -90,7 +92,7 @@ let region = [
|
|
|
desc: "提升发展韧性",
|
|
|
short: "新动能",
|
|
|
company: Booth.find(item=>item.id=='four').company,
|
|
|
- spread: calcuSpread(134, 186,[133]),
|
|
|
+ spread: calcuSpread(134, 186,[133],[181]),
|
|
|
firstView: {
|
|
|
panoId: "133",
|
|
|
panoQuaternion: {
|
|
|
@@ -108,7 +110,7 @@ let region = [
|
|
|
desc: "促进共同富裕",
|
|
|
short: "新模式",
|
|
|
company: Booth.find(item=>item.id=='five').company,
|
|
|
- spread: calcuSpread(187, 232,[181]),
|
|
|
+ spread: calcuSpread(187, 232,[181],[232]),
|
|
|
firstView: {
|
|
|
panoId: "181",
|
|
|
panoQuaternion: {
|
tremble