Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
乳
乳山瑞博-大屏
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
xinzhedeai
乳山瑞博-大屏
Commits
d2b1994c
Commit
d2b1994c
authored
Feb 28, 2025
by
forevertyler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:表格
parent
d4031d51
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
122 additions
and
99 deletions
+122
-99
.env.development
.env.development
+1
-1
settings.js
config/settings.js
+2
-1
dist.zip
dist.zip
+0
-0
chartTemplates.js
src/assets/js/chartTemplates.js
+2
-2
index.vue
src/views/Screen/index.vue
+117
-95
No files found.
.env.development
View file @
d2b1994c
...
...
@@ -5,7 +5,7 @@ VUE_APP_LOCAL_PORT = '8059'
VUE_APP_WS_API = 'ws://localhost:8000'
VUE_APP_BASE_API = 'http://192.168.2.15:8059'
VUE_APP_LOCAL_API = 'http://192.168.2.37:90
0
5'
VUE_APP_LOCAL_API = 'http://192.168.2.37:90
1
5'
VUE_APP_D3Tileset = 'http://192.168.2.15:8080/Apps/assets/media/rushanruibo'
VUE_APP_SYS_PORT = '8060'
...
...
config/settings.js
View file @
d2b1994c
var
ServiceURL
=
'
http://192.168.2.37:9005
'
;
var
ServiceURL
=
'
http://192.168.10.11:9005
'
;
// var ServiceURL = 'http://192.168.2.37:9005';
window
.
VUE_APP_API
=
{
ServiceURL
:
ServiceURL
}
dist.zip
0 → 100644
View file @
d2b1994c
File added
src/assets/js/chartTemplates.js
View file @
d2b1994c
...
...
@@ -374,7 +374,7 @@ var Highchart = function(){
//series = addAlarmLine(data.alarm, data.lists, series, opts.warningLine);
// 识别最大值
var
maxVal
=
chartData
&&
chartData
.
maxVal
>
alarmData
.
maxAlarm
?
chartData
.
maxVal
:
alarmData
.
maxAlarm
;
//
var maxVal = chartData && chartData.maxVal > alarmData.maxAlarm ? chartData.maxVal : alarmData.maxAlarm;
var
option
=
{
chart
:
{
type
:
data
.
chartType
,
...
...
@@ -428,7 +428,7 @@ var Highchart = function(){
gridLineColor
:
'
#0F5680
'
,
//minorGridLineWidth: 5,
//gridLineWidth: 5,
max
:
opts
.
maxValDev
?
maxVal
+
maxVal
*
opts
.
maxValDev
:
null
,
//
max:opts.maxValDev ? maxVal + maxVal * opts.maxValDev : null,
},
plotOptions
:
{
column
:
{
...
...
src/views/Screen/index.vue
View file @
d2b1994c
This diff is collapsed.
Click to expand it.
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