Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
罗超
confucius
Commits
5a9f8ed1
Commit
5a9f8ed1
authored
Jul 25, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d649f9bc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
32 deletions
+29
-32
quasar.conf.js
quasar.conf.js
+3
-3
socket.js
src/api/common/socket.js
+1
-1
notify.vue
src/components/global/notify.vue
+25
-27
MainLayout.vue
src/layouts/MainLayout.vue
+0
-1
No files found.
quasar.conf.js
View file @
5a9f8ed1
...
...
@@ -48,15 +48,15 @@ module.exports = function(ctx) {
env
:
ctx
.
dev
?
{
//API: 'http://localhost:5001/api',
API
:
'http://192.168.10.128:
5001
/api'
,
API
:
'http://192.168.10.128:
8300
/api'
,
// API: 'https://eduapi.oytour.com/api',
API_ZC
:
'http://192.168.10.2:8087/api'
,
API_SK
:
'ws:
192.168.10.214:
'
,
API_SK
:
'ws:
//websocket.oytour.com/ws
'
,
API_SIG
:
'http://localhost:5001/messagecenter'
}
:
{
API
:
'https://eduapi.oytour.com/api'
,
API_ZC
:
'http://propertyedu.oytour.com/api'
,
API_SK
:
'ws://
47.96.23.199:
'
,
API_SK
:
'ws://
websocket.oytour.com/ws
'
,
API_SK_WSS
:
'wss://sk.kookaku.com'
,
API_SIG
:
'http://eduapi.oytour.com/messagecenter'
},
...
...
src/api/common/socket.js
View file @
5a9f8ed1
var
websock
=
null
;
var
global_callback
=
null
;
//webSocket连接端口
var
serverPort
=
'
10086
'
;
var
serverPort
=
''
;
/**
* 初始化weosocket
...
...
src/components/global/notify.vue
View file @
5a9f8ed1
...
...
@@ -91,16 +91,14 @@
<
script
>
import
{
GetMyNoticePageList
,
GetMsgLogList
,
BeatchReadMsgLog
}
from
'../../api/course/index'
import
{
sendSock
}
from
'../../api/common/socket'
import
{
url_jump_zc
}
from
"../../utils/url"
import
{
url_jump_zc
}
from
"../../utils/url"
import
noneData
from
'./none-data'
import
NoneData
from
'./none-data.vue'
export
default
{
props
:
{
showObj
:
{
...
...
@@ -328,31 +326,31 @@ import {url_jump_zc} from "../../utils/url"
},
//跳转链接 新页面打开
goMsgDetail
(
url
,
item
)
{
if
(
item
.
CategoryId
==
5
){
let
zcurl
=
url_jump_zc
+
'#'
+
url
;
// let zcurl='http://www.test.com:8080/#'+url;
window
.
open
(
zcurl
)
}
else
{
var
hostName
=
window
.
location
.
hostname
;
var
port
=
window
.
location
.
port
;
var
newurl
=
""
if
(
url
!=
null
&&
url
.
length
>
0
)
{
if
(
url
.
indexOf
(
'http://'
)
==
-
1
||
url
.
indexOf
(
'https://'
)
==
-
1
)
{
if
(
url
.
indexOf
(
"www"
)
==
-
1
)
{
newurl
=
"http://"
+
hostName
+
(
port
!=
80
?
":"
+
port
:
""
)
+
"/#"
+
url
;
}
else
{
newurl
=
"http://"
+
url
;
}
goMsgDetail
(
url
,
item
)
{
if
(
item
.
CategoryId
==
5
)
{
let
zcurl
=
url_jump_zc
+
'#'
+
url
;
// let zcurl='http://www.test.com:8080/#'+url;
window
.
open
(
zcurl
)
}
else
{
var
hostName
=
window
.
location
.
hostname
;
var
port
=
window
.
location
.
port
;
var
newurl
=
""
if
(
url
!=
null
&&
url
.
length
>
0
)
{
if
(
url
.
indexOf
(
'http://'
)
==
-
1
||
url
.
indexOf
(
'https://'
)
==
-
1
)
{
if
(
url
.
indexOf
(
"www"
)
==
-
1
)
{
newurl
=
"http://"
+
hostName
+
(
port
!=
80
?
":"
+
port
:
""
)
+
"/#"
+
url
;
}
else
{
newurl
=
url
newurl
=
"http://"
+
url
;
}
}
else
{
newurl
=
url
}
if
(
newurl
)
{
window
.
open
(
newurl
,
"_blank"
);
}
}
if
(
newurl
)
{
window
.
open
(
newurl
,
"_blank"
);
}
}
},
//看过后删除
readMsgLog
(
Id
,
index
)
{
...
...
src/layouts/MainLayout.vue
View file @
5a9f8ed1
...
...
@@ -455,7 +455,6 @@ export default {
this
.
socektArr
.
unshift
(
newData
[
i
]);
}
}
// this.socektArr = this.socektArr.concat(newData)
this
.
showNotification
(
newData
[
0
].
Title
,
newData
[
0
].
Content
,
...
...
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