Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

.env.development

@@ -6,7 +6,7 @@ NODE_ENV = 'development'
 # VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
 # VUE_APP_BASE_API = 'http://192.168.3.4:9000'
 VUE_APP_BASE_API = 'http://192.168.3.6:9000'
-VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud/'
+VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
 # VUE_APP_VOICE_API = 'http://192.168.8.110:9008'
 
 

.env.native

@@ -4,4 +4,4 @@ VUE_APP_PRO = 'local'
 
 # base api
 VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://joylink.club/jlcloud/'
+VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'

.env.production

@@ -3,4 +3,4 @@ NODE_ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://joylink.club/jlcloud/'
+VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'

.env.staging

@@ -3,4 +3,4 @@ NODE_ENV = 'test'
 
 # base api
 VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
-VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud/'
+VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'

src/jlmap3d/edit/neweditmodel/StationStandList.js

@@ -28,7 +28,7 @@ export function StationStandList() {
 
         let newstationstand = new StationStandModel(stationdata[i]);
         //判断站台是否显示
-      
+
         if(stationdata[i].visible == true){
 
           //遍历车站站台数据
@@ -198,16 +198,36 @@ export function StationStandList() {
         let newstationstand = new StationStandModel(standsdata[i]);
         let newstationmesh;
         for(let j=0;j<jlmapstanddata.length;j++){
+          if(jlmapstanddata[j].code == standsdata[i].direction1.code){
+            if(standsdata[i].code != "Station96090"){
+              if(standsdata[i].inside == true){
+                newstationmesh = assetloader.modellist[num].mesh.clone(true);
+              }else{
+                newstationmesh = assetloader.modellist[num2].mesh.clone(true);
+              }
+              // console.log(jlmapstanddata[j]);
+              newstationstand.code = standsdata[i].code;
+              newstationstand.name = standsdata[i].name;
+              newstationstand.direction1.code = standsdata[i].direction1.code;
+              newstationstand.direction1.name = standsdata[i].direction1.name;
+              newstationstand.direction2.code = standsdata[i].direction2.code;
+              newstationstand.direction2.name = standsdata[i].direction2.name;
+              newstationstand.inside = standsdata[i].inside;
+              // console.log(standsdata[i]);
+              newstationmesh.position.x = standsdata[i].position.x;
+              newstationmesh.position.y = standsdata[i].position.y;
+              newstationmesh.position.z = standsdata[i].position.z;
+              // newstationmesh.rotation.x = standsdata[i].rotation._x;
+              // newstationmesh.rotation.y = standsdata[i].rotation._y;
+              // newstationmesh.rotation.z = standsdata[i].rotation._z;
+              newstationstand.mesh = newstationmesh;
+              scope.group.add(newstationmesh);
+              scope.list.push(newstationstand);
+              j = jlmapstanddata.length;
+            }else{
+              if(jlmapstanddata[j].code == standsdata[i].direction1.code){
 
-
+                newstationmesh = assetloader.modellist[num3].mesh.clone(true);
-            if(jlmapstanddata[j].code == standsdata[i].direction1.code){
-              if(standsdata[i].code != "Station96090"){
-
-                if(standsdata[i].inside == true){
-                  newstationmesh = assetloader.modellist[num].mesh.clone(true);
-                }else{
-                  newstationmesh = assetloader.modellist[num2].mesh.clone(true);
-                }
                 // console.log(jlmapstanddata[j]);
                 newstationstand.code = standsdata[i].code;
                 newstationstand.name = standsdata[i].name;
@@ -215,7 +235,7 @@ export function StationStandList() {
                 newstationstand.direction1.name = standsdata[i].direction1.name;
                 newstationstand.direction2.code = standsdata[i].direction2.code;
                 newstationstand.direction2.name = standsdata[i].direction2.name;
-                newstationstand.inside = standsdata[i].inside;
+                newstationstand.inside = jlmapstanddata[j].inside;
                 // console.log(standsdata[i]);
                 newstationmesh.position.x = standsdata[i].position.x;
                 newstationmesh.position.y = standsdata[i].position.y;
@@ -227,35 +247,10 @@ export function StationStandList() {
                 scope.group.add(newstationmesh);
                 scope.list.push(newstationstand);
                 j = jlmapstanddata.length;
-              }else{
-                if(jlmapstanddata[j].code == standsdata[i].direction1.code){
-
-                  newstationmesh = assetloader.modellist[num3].mesh.clone(true);
-                  // console.log(jlmapstanddata[j]);
-                  newstationstand.code = standsdata[i].code;
-                  newstationstand.name = standsdata[i].name;
-                  newstationstand.direction1.code = standsdata[i].direction1.code;
-                  newstationstand.direction1.name = standsdata[i].direction1.name;
-                  newstationstand.direction2.code = standsdata[i].direction2.code;
-                  newstationstand.direction2.name = standsdata[i].direction2.name;
-                  newstationstand.inside = jlmapstanddata[j].inside;
-                  // console.log(standsdata[i]);
-                  newstationmesh.position.x = standsdata[i].position.x;
-                  newstationmesh.position.y = standsdata[i].position.y;
-                  newstationmesh.position.z = standsdata[i].position.z;
-                  // newstationmesh.rotation.x = standsdata[i].rotation._x;
-                  // newstationmesh.rotation.y = standsdata[i].rotation._y;
-                  // newstationmesh.rotation.z = standsdata[i].rotation._z;
-                  newstationstand.mesh = newstationmesh;
-                  scope.group.add(newstationmesh);
-                  scope.list.push(newstationstand);
-                  j = jlmapstanddata.length;
-                }
               }
-
+            }
           }
         }
-
       }
       scene.add(scope.group);
       resolve("loadedstation");

src/jlmap3d/jl3dmaintainer/maintainerconnect.js

@@ -60,7 +60,7 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
 			// }
 				// console.log(event.data);
 			if(event.data.type == "Device_Fault_Set_3D"){
-
+				// console.log(event.data);
 				let newfault = {
 					code:event.data.body.code,
 					name:'',
@@ -98,8 +98,11 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
 				if(event.data.body.type == "STAND"){
 					newfault.name = newfault.code;
 					newfault.typetext = "屏蔽门";
-					if(event.data.body.fault == "FAULT_PSD_OPEN"){
+					if(event.data.body.fault == "PSD_CANNOT_BE_CLOSED"){
-						newfault.text = "屏蔽门无法关闭故障";
+						newfault.text = "屏蔽门无法关闭";
+					}
+					if(event.data.body.fault == "PSD_CANNOT_BE_OPENED"){
+						newfault.text = "屏蔽门无法开启";
 					}
 
 				}
@@ -162,8 +165,11 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) {
 					if(fault[i].type == "STAND"){
 						newfault.name = newfault.code;
 						newfault.typetext = "屏蔽门";
-						if(fault[i].fault == "FAULT_PSD_OPEN"){
+						if(fault[i].fault == "PSD_CANNOT_BE_CLOSED"){
-							newfault.text = "屏蔽门无法关闭故障";
+							newfault.text = "屏蔽门无法关闭";
+						}
+						if(fault[i].fault == "PSD_CANNOT_BE_OPENED"){
+							newfault.text = "屏蔽门无法开启";
 						}
 
 					}

src/store/modules/socket.js

@@ -179,7 +179,7 @@ function handleRecordList(state, data) {
         value: data.message,
         self: isSelf,
         voice: data.isAudio,
-        src: data.isAudio ? `/jlcloud/audio/${data.audioPath}` : '',
+        src: data.isAudio ? `${data.audioPath}` : '',
         other: !isSelf,
         userName: data.member.nickName,
         chatTime: data.chatTime,

src/views/jlmap3d/edit/component/property.vue

@@ -33,8 +33,8 @@
                       <el-input v-model="selectmodel.code" ></el-input>
                   </el-form-item>
 
-                  <el-form-item label="name:"  disabled="true">
+                  <el-form-item label="name:"  v-if="selectmodel.name" disabled="true">
-                      <el-input ></el-input>
+                      <el-input v-model="selectmodel.name"></el-input>
                   </el-form-item>
 
                   <el-form-item label="类型" prop="name" disabled="true">

src/views/newMap/chatView/chatBox.vue

@@ -941,7 +941,7 @@ export default {
                     resp.data.forEach(conversation => {
                         (conversation.messageList || []).forEach(message => {
                             const member = this.memberData[message.memberId];
-                            message.src = `/audio/${message.audioPath}`;
+                            message.src = `${message.audioPath}`;
                             message.members = conversation.memberList;
                             if (member) {
                                 message.self = this.$store.state.userId == member.userId;
@@ -950,7 +950,7 @@ export default {
                         });
                         const tempMessageList = [];
                         !conversation.over && conversation.messageList.forEach(message => {
-                            message.src = `/audio/${message.audioPath}`;
+                            message.src = `${message.audioPath}`;
                             tempMessageList.push(message);
                         });
                         !conversation.over && conversation.memberList.forEach(member => {

src/views/newMap/chatView/chatContent.vue

@@ -87,11 +87,11 @@ export default {
         '$store.state.socket.conversationInfo':function (val, old) { //  仿真聊天
             const conversationInfo = this.$store.state.socket.conversationInfo;
             const member = this.$store.state.training.memberData[val.message.memberId];
-            conversationInfo.message.src = `/audio/${conversationInfo.message.audioPath}`;
+            conversationInfo.message.src = `${conversationInfo.message.audioPath}`;
             this.$emit('changeMessageList', conversationInfo);
             if (this.conversitionId == val.id) {
                 if (member && member.userId != this.$store.state.user.id) {
-                    this.currentAudioList.push({audioUrl:this.baseUrl + '/audio/' + conversationInfo.message.audioPath, id:val.message.id});
+                    this.currentAudioList.push({audioUrl:this.baseUrl + conversationInfo.message.audioPath, id:val.message.id});
                     if (!this.isPlay) {
                         this.isPlay = true;
                         this.$store.dispatch('scriptRecord/updateAudioPlay', true);
@@ -101,7 +101,7 @@ export default {
                 this.scrollTop();
             } else if (this.userRole === 'AUDIENCE' || this.commonConversation) {
                 if (member && member.userId != this.$store.state.user.id) {
-                    this.currentAudioList.push({audioUrl:this.baseUrl + '/audio/' + conversationInfo.message.audioPath, id:val.message.id});
+                    this.currentAudioList.push({audioUrl:this.baseUrl + conversationInfo.message.audioPath, id:val.message.id});
                     if (!this.isPlay) {
                         this.isPlay = true;
                         this.$store.dispatch('scriptRecord/updateAudioPlay', true);