代码提交

public/htWeb/unity.html

@@ -645,6 +645,60 @@
                     if (this.modulesFiles.length == 1) {
                         this.getData()
                     }
+                }else if (getQueryString('src') =='WXBCXTKJ') {
+                    this.modulesFiles = ['BHLLL_cam01','BHLLL_cam02','BHLLL_cam03','BHLLL_cam04','BHLLL_cam05','BHLLL_cam06','BHLLL_cam07','BHLLL_DX','BHLLL_PeiDianFang']
+                    this.modulesFiles.forEach((item, index) => {
+                        var obj = {
+                            cId: 1,
+                            parentName: "车架",
+                            name: '车架',
+                            pos: [0, 0, 0],
+                            size: [0.06, 0.06 ,0.06],
+                            rotate: [0, 0, 0],
+                            wirePos: [],
+                            affiliation: [],
+                            type: "车架",
+                            visible: true,
+                            passenger: [],
+                            taskCode: -1,
+                        }
+                        obj.cId = index
+                        obj.parentName = item
+                        obj.type = item
+                        obj.name = item
+                        this.modelResource.push(obj)
+                    })
+                    this.modelUrl = 'wxbckjExport/wxbckjModel/'
+                    if (this.modulesFiles.length == 9) {
+                        this.getData()
+                    }
+                }else if (getQueryString('src') =='BHLLL_PeiDianFang') {
+                    this.modulesFiles = ['BHLLL_PeiDianFang']
+                    this.modulesFiles.forEach((item, index) => {
+                        var obj = {
+                            cId: 1,
+                            parentName: "车架",
+                            name: '车架',
+                            pos: [0, 0, 0],
+                            size: [0.3,0.3,0.3],
+                            rotate: [0, 0,0],
+                            wirePos: [],
+                            affiliation: [],
+                            type: "车架",
+                            visible: true,
+                            passenger: [],
+                            taskCode: -1,
+                        }
+                        obj.cId = index
+                        obj.parentName = item
+                        obj.type = item
+                        obj.name = item
+                        this.modelResource.push(obj)
+                    })
+                    this.modelUrl = 'wxbckjExport/wxbckjModel/'
+                    if (this.modulesFiles.length == 1) {
+                        this.getData()
+                    }
                 }
 
 

public/htWeb/wxbckjExport/wxbckjModel/BHLLL_DX.mtl

@@ -0,0 +1,71 @@
+# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
+# File Created: 08.11.2023 15:27:55
+
+newmtl Material__29
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Tr 0.0000
+	d 1.0000
+	Tf 1.0000 1.0000 1.0000
+	Pr 0.0000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2
+	map_Kd Tech_Stripe_0a_gray.jpg
+
+newmtl lumian
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Tr 0.0000
+	d 1.0000
+	Tf 1.0000 1.0000 1.0000
+	Pr 0.0000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2
+	map_Kd LuMianLan.jpg
+
+newmtl wire_214229166
+	Ns 32
+	d 1
+	Tr 0
+	Tf 1 1 1
+	illum 2
+	Ka 0.8392 0.8980 0.6510
+	Kd 0.8392 0.8980 0.6510
+	Ks 0.3500 0.3500 0.3500
+
+newmtl dimian
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Tr 0.0000
+	d 1.0000
+	Tf 1.0000 1.0000 1.0000
+	Pr 0.0000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2
+	map_Kd DiMianLan.jpg
+
+newmtl Material__31
+	Kd 1.0000 1.0000 1.0000
+	Ks 1.0000 1.0000 1.0000
+	Tr 0.0000
+	d 1.0000
+	Tf 1.0000 1.0000 1.0000
+	Pr 0.0000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2

public/htWeb/wxbckjExport/wxbckjModel/BHLLL_PeiDianFang.mtl

@@ -0,0 +1,109 @@
+# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
+# File Created: 08.11.2023 15:23:05
+
+newmtl wall
+	Kd 0.5882 0.5882 0.5882
+	Ks 0.9000 0.9000 0.9000
+	Tr 0.9000
+	d 0.1000
+	Tf 1.0000 1.0000 1.0000
+	Pr 0.9000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2
+
+newmtl Material__9
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Tr 0.0000
+	d 1.0000
+	Tf 1.0000 1.0000 1.0000
+	Pr 0.0000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2
+	map_Kd shuini.jpg
+
+newmtl wire_225143087
+	Ns 32
+	d 1
+	Tr 0
+	Tf 1 1 1
+	illum 2
+	Ka 0.8824 0.5608 0.3412
+	Kd 0.8824 0.5608 0.3412
+	Ks 0.3500 0.3500 0.3500
+
+newmtl Material__5
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Tr 0.0000
+	d 1.0000
+	Tf 1.0000 1.0000 1.0000
+	Pr 0.0000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2
+	map_Kd dianxian.jpg
+
+newmtl ground_ns_02
+	Kd 0.0980 0.0980 0.0980
+	Ks 0.9000 0.9000 0.9000
+	Tr 0.0000
+	d 1.0000
+	Tf 1.0000 1.0000 1.0000
+	Pr 0.9000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2
+
+newmtl other
+	Kd 0.5882 0.5882 0.5882
+	Ks 0.9000 0.9000 0.9000
+	Tr 0.0000
+	d 1.0000
+	Tf 1.0000 1.0000 1.0000
+	Pr 0.9000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2
+	map_Kd other.jpg
+
+newmtl wire_204204204
+	Ns 32
+	d 1
+	Tr 0
+	Tf 1 1 1
+	illum 2
+	Ka 0.8000 0.8000 0.8000
+	Kd 0.8000 0.8000 0.8000
+	Ks 0.3500 0.3500 0.3500
+
+newmtl guizi01
+	Kd 0.4000 0.4000 0.4000
+	Ks 0.0000 0.0000 0.0000
+	Tr 0.0000
+	d 1.0000
+	Tf 0.0000 0.0000 0.0000
+	Pr 0.0000
+	Pm 0.0000
+	Pc 0.0000
+	Pcr 0.0000
+	Ni 1.5200
+	Ke 0.0000 0.0000 0.0000
+	illum 2

public/htWeb/wxbckjExport/wxbckjModel/BHLLL_cam01.mtl

@@ -0,0 +1,16 @@
+# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
+# File Created: 08.11.2023 13:22:35
+
+newmtl SecurityCamera_0a
+	Ns 100.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5500 0.5500 0.5500
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka SecurityCamera_0a_D.jpg
+	map_Kd SecurityCamera_0a_D.jpg

public/htWeb/wxbckjExport/wxbckjModel/BHLLL_cam02.mtl

@@ -0,0 +1,16 @@
+# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
+# File Created: 08.11.2023 13:22:41
+
+newmtl SecurityCamera_0a
+	Ns 100.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5500 0.5500 0.5500
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka SecurityCamera_0a_D.jpg
+	map_Kd SecurityCamera_0a_D.jpg

public/htWeb/wxbckjExport/wxbckjModel/BHLLL_cam03.mtl

@@ -0,0 +1,16 @@
+# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
+# File Created: 08.11.2023 13:22:47
+
+newmtl SecurityCamera_0a
+	Ns 100.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5500 0.5500 0.5500
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka SecurityCamera_0a_D.jpg
+	map_Kd SecurityCamera_0a_D.jpg

public/htWeb/wxbckjExport/wxbckjModel/BHLLL_cam04.mtl

@@ -0,0 +1,16 @@
+# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
+# File Created: 08.11.2023 13:22:52
+
+newmtl SecurityCamera_0a
+	Ns 100.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5500 0.5500 0.5500
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka SecurityCamera_0a_D.jpg
+	map_Kd SecurityCamera_0a_D.jpg

public/htWeb/wxbckjExport/wxbckjModel/BHLLL_cam05.mtl

@@ -0,0 +1,16 @@
+# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
+# File Created: 08.11.2023 13:22:59
+
+newmtl SecurityCamera_0a
+	Ns 100.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5500 0.5500 0.5500
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka SecurityCamera_0a_D.jpg
+	map_Kd SecurityCamera_0a_D.jpg

public/htWeb/wxbckjExport/wxbckjModel/BHLLL_cam06.mtl

@@ -0,0 +1,16 @@
+# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
+# File Created: 08.11.2023 13:23:05
+
+newmtl SecurityCamera_0a
+	Ns 100.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5500 0.5500 0.5500
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka SecurityCamera_0a_D.jpg
+	map_Kd SecurityCamera_0a_D.jpg

public/htWeb/wxbckjExport/wxbckjModel/BHLLL_cam07.mtl

@@ -0,0 +1,16 @@
+# 3ds Max Wavefront OBJ Exporter v0.99 - (c)2007 guruware
+# File Created: 08.11.2023 13:23:11
+
+newmtl SecurityCamera_0a
+	Ns 100.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5500 0.5500 0.5500
+	Kd 0.5000 0.5000 0.5000
+	Ks 1.0000 1.0000 1.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka SecurityCamera_0a_D.jpg
+	map_Kd SecurityCamera_0a_D.jpg

public/pdf/xinguanyongdian.pdf

@@ -1 +1,2 @@
+46.50厘米
 

src/views/land/index.vue

@@ -2503,12 +2503,11 @@
           <img src="@/assets/newbanImg/yixing.png" class="yixing" />
         </div>
         <!-- 无锡市广电大厦配电房 -->
-        <div class="wuxiGDDS" v-show="selectMapShow == 'wuxi'" @click="intoMain('WXGD')">
+        <div class="wuxiGDDS" v-show="selectMapShow == 'wuxi'" @click="intoMain('WXGD')" v-if="wxgddsAdmin">
           <div class="yellowIcon2">
             <div
               style="width: 288px; height: 47px"
               v-show="WXGDPopShow"
-              v-if="wxgddsAdmin"
               @mouseover="popInfor('WXGD')"
               @mouseleave="popInforLeave('WXGD')"
             ></div>
@@ -5448,7 +5447,7 @@ export default {
           this.nttzjyMap.transformerCapacity = res.data.data[i].transformerCapacity;
           this.nttzjyMap.contacts = res.data.data[i].contacts;
           this.nttzjyMap.phone = res.data.data[i].phone;
-        }else if (res.data.data[i].siteName == '侵华日军南京大屠杀遇难同胞纪念馆旧馆') {
+        }else if (res.data.data[i].siteName == '南京大屠杀遇难同胞纪念馆-旧馆' || res.data.data[i].siteName == '南京大屠杀遇难同胞纪念馆-新馆' ) {
           this.njdtsAdmin = true
         }
       }
@@ -9880,11 +9879,11 @@ export default {
    @keyframes wuxiBCXTKJ {
     0% {
       top: 0px;
-      left: 54%;
+      left: 48%;
     }
     100% {
-      top: 37%;
-      left: 54%;
+      top: 47%;
+      left: 48%;
     }
   }
    @keyframes xuzhouLDBR1 {

src/views/pop/model.vue

@@ -69,6 +69,9 @@ mounted(){
     }else if(this.popStatus == 'NTPD'){
         this.unityUrl = "/htWeb/unity.html?src=NTPD";
         this.text = '南通广播电视台配电房'
+    }else if(this.popStatus == 'BHLLL_PeiDianFang'){
+        this.unityUrl = "/htWeb/unity.html?src=BHLLL_PeiDianFang";
+        this.text = '无锡柏诚系统科技配电房'
     }
     
 },