Commit 4ffd7846 authored by zhanglw's avatar zhanglw

tokenKey

parent c6489942
...@@ -2,11 +2,11 @@ ENV = 'development' ...@@ -2,11 +2,11 @@ ENV = 'development'
# 接口地址 # 接口地址
#VUE_APP_BASE_API = 'http://39.164.225.220:5002' VUE_APP_BASE_API = 'http://39.164.225.220:5002'
#VUE_APP_LOCAL_API = 'http://39.164.225.220:5002' VUE_APP_LOCAL_API = 'http://39.164.225.220:5002'
VUE_APP_BASE_API = 'http://192.168.3.23:9400' #VUE_APP_BASE_API = 'http://192.168.3.23:9400'
VUE_APP_LOCAL_API = 'http://192.168.3.23:9400' #VUE_APP_LOCAL_API = 'http://192.168.3.23:9400'
#VUE_APP_BASE_API = 'http://60.212.188.152:9400' #VUE_APP_BASE_API = 'http://60.212.188.152:9400'
#VUE_APP_LOCAL_API = 'http://60.212.188.152:9400' #VUE_APP_LOCAL_API = 'http://60.212.188.152:9400'
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="right-menu"> <div class="right-menu">
<div style="display:inline-block;height:100%;vertical-align:unset;margin-right:10px;"> <div style="display:inline-block;height:100%;vertical-align:unset;margin-right:10px;">
<el-tooltip content="三维大屏" effect="dark" placement="bottom"> <el-tooltip content="三维大屏" effect="dark" placement="bottom">
<a href="http://39.164.225.220:5003/edge/Screen" class="el-icon-s-platform" style="font-size:24px;"></a> <a :href="'http://39.164.225.220:5003/edge/Screen?key='+tokenKey" class="el-icon-s-platform" style="font-size:24px;"></a>
</el-tooltip> </el-tooltip>
<el-tooltip content="可视化大屏" effect="dark" placement="bottom"> <el-tooltip content="可视化大屏" effect="dark" placement="bottom">
<router-link class="el-icon-s-marketing" style="font-size:24px;" to="/MLargeScreen/index" tag="a" ></router-link> <router-link class="el-icon-s-marketing" style="font-size:24px;" to="/MLargeScreen/index" tag="a" ></router-link>
...@@ -48,6 +48,7 @@ import Hamburger from '@/components/Hamburger' ...@@ -48,6 +48,7 @@ import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull' import Screenfull from '@/components/Screenfull'
import ScrollPane from './TagsView/ScrollPane' import ScrollPane from './TagsView/ScrollPane'
import path from 'path'; import path from 'path';
import { getToken } from '@/utils/auth'
export default { export default {
components: { components: {
...@@ -59,7 +60,7 @@ export default { ...@@ -59,7 +60,7 @@ export default {
data() { data() {
return { return {
dialogVisible: false, dialogVisible: false,
tokenKey: getToken(),
/* visible: false, /* visible: false,
top: 0, top: 0,
left: 0, left: 0,
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<img src="../../assets/images/cutGraph/light7.png" width="85" style="margin-top:-1vh;" v-if="selectModule == item.componentName"> <img src="../../assets/images/cutGraph/light7.png" width="85" style="margin-top:-1vh;" v-if="selectModule == item.componentName">
</div> </div>
<div> <div>
<div class="top_titl_left_textStyle1"><a href="http://39.164.225.220:5003/edge/Screen">三维大屏</a></div> <div class="top_titl_left_textStyle1"><a :href="'http://39.164.225.220:5003/edge/Screen?key='+tokenKey">三维大屏</a></div>
</div> </div>
</div> </div>
<!-- 时间 --> <!-- 时间 -->
...@@ -123,6 +123,7 @@ import videojs from 'video.js' ...@@ -123,6 +123,7 @@ import videojs from 'video.js'
import 'videojs-contrib-hls' import 'videojs-contrib-hls'
import dialView from "@/components/DialView/index"; import dialView from "@/components/DialView/index";
import { getToken } from '@/utils/auth'
export default { export default {
components: { components: {
...@@ -160,6 +161,7 @@ export default { ...@@ -160,6 +161,7 @@ export default {
}, },
data() { data() {
return { return {
tokenKey: getToken(),
websocket: null, websocket: null,
websocketHeadBeatTimer:null, websocketHeadBeatTimer:null,
//监控视频 //监控视频
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</div> </div>
</el-form> </el-form>
<div style="width: 100%;text-align: center;margin-top: 60px"> <div style="width: 100%;text-align: center;margin-top: 60px">
<el-button><a href="http://39.164.225.220:5003/edge/Screen">跳转到三维大屏</a></el-button> <el-button><a :href="'http://39.164.225.220:5003/edge/Screen?key='+tokenKey">跳转到三维大屏</a></el-button>
<el-button type="primary" @click="submitForm()">保存</el-button> <el-button type="primary" @click="submitForm()">保存</el-button>
</div> </div>
</div> </div>
...@@ -81,6 +81,7 @@ export default { ...@@ -81,6 +81,7 @@ export default {
return { return {
title: '', title: '',
visible: false, visible: false,
tokenKey: getToken(),
formData: { formData: {
mineralresources: '', // 总量 mineralresources: '', // 总量
dpsycl: '', // 剩余量 dpsycl: '', // 剩余量
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment