diff --git a/.env.development b/.env.development index 1f981edf9..720586161 100644 --- a/.env.development +++ b/.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://oss.joylink.club/oss/joylink' +VUE_APP_VOICE_API = 'http://119.3.163.89/oss/joylink' VUE_APP_UPLOAD_API = 'https://upload.joylink.club' VUE_APP_BASE_SITE='https://test.joylink.club/cbtc' # VUE_APP_VOICE_API = 'http://192.168.8.110:9008' diff --git a/src/views/jlmap3d/simulation/show/configmenu.vue b/src/views/jlmap3d/simulation/show/configmenu.vue index 9ffedcf35..a4ba647db 100644 --- a/src/views/jlmap3d/simulation/show/configmenu.vue +++ b/src/views/jlmap3d/simulation/show/configmenu.vue @@ -8,7 +8,8 @@
-
+
+
@@ -29,10 +30,29 @@ export default { }, data() { return { - isActive:0, + timeActive:0, + weatherActive:0, isShowWeather:false, bt1name:this.$t('jlmap3d.stationInfoDisplay'), bt2name:this.$t('jlmap3d.trainInfoDisplay'), + timeMenu:[ + { + type:'zaoshang', + pic:JL3D_LOCAL_STATIC+'/sprite/zaoshang.png', + }, + { + type:'zhongwu', + pic:JL3D_LOCAL_STATIC+'/sprite/zhongwu.png', + }, + { + type:'bangwan', + pic:JL3D_LOCAL_STATIC+'/sprite/bangwan.png', + }, + { + type:'yewan', + pic:JL3D_LOCAL_STATIC+'/sprite/yewan.png', + } + ], weatherMenu:[ { type:'sunny', @@ -93,8 +113,12 @@ export default { this.isShowWeather = true; } }, + changetime(type,index){ + this.timeActive=index; + this.$emit('changeweather',type); + }, changeweather(type,index){ - this.isActive=index; + this.weatherActive=index; this.$emit('changeweather',type); }, }, diff --git a/static/sprite/bangwan.png b/static/sprite/bangwan.png new file mode 100644 index 000000000..af1d4dacd Binary files /dev/null and b/static/sprite/bangwan.png differ diff --git a/static/sprite/yewan.png b/static/sprite/yewan.png new file mode 100644 index 000000000..dab370eb6 Binary files /dev/null and b/static/sprite/yewan.png differ diff --git a/static/sprite/zaoshang.png b/static/sprite/zaoshang.png new file mode 100644 index 000000000..cb8531ebb Binary files /dev/null and b/static/sprite/zaoshang.png differ diff --git a/static/sprite/zhongwu.png b/static/sprite/zhongwu.png new file mode 100644 index 000000000..012c1a2ac Binary files /dev/null and b/static/sprite/zhongwu.png differ diff --git a/static/sprite/多云.png b/static/sprite/多云.png new file mode 100644 index 000000000..dcdca286c Binary files /dev/null and b/static/sprite/多云.png differ diff --git a/static/sprite/沙尘暴.png b/static/sprite/沙尘暴.png new file mode 100644 index 000000000..975fa0bc8 Binary files /dev/null and b/static/sprite/沙尘暴.png differ diff --git a/static/sprite/雾霾1(1).png b/static/sprite/雾霾1(1).png new file mode 100644 index 000000000..a41f1d83e Binary files /dev/null and b/static/sprite/雾霾1(1).png differ