Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
K
kd_control
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhanglw
kd_control
Commits
4ffd7846
Commit
4ffd7846
authored
Oct 10, 2023
by
zhanglw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tokenKey
parent
c6489942
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
.env.development
.env.development
+4
-4
Navbar.vue
src/layout/components/Navbar.vue
+3
-2
index.vue
src/views/MLargeScreen/index.vue
+3
-1
index.vue
src/views/productionPlanManagement/trendsSet/index.vue
+2
-1
No files found.
.env.development
View file @
4ffd7846
...
@@ -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'
...
...
src/layout/components/Navbar.vue
View file @
4ffd7846
...
@@ -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,
...
...
src/views/MLargeScreen/index.vue
View file @
4ffd7846
...
@@ -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
,
//监控视频
//监控视频
...
...
src/views/productionPlanManagement/trendsSet/index.vue
View file @
4ffd7846
...
@@ -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
:
''
,
// 剩余量
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment