Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
X
xxx_phase2_web
Project overview
Project overview
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
夏敏伟
xxx_phase2_web
Commits
b059a92e
Commit
b059a92e
authored
Nov 09, 2023
by
以墨为白
🎧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
关闭的会议感叹号提醒
parent
f390dca3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
src/view/ddkz/components/chatRoomDialog.vue
src/view/ddkz/components/chatRoomDialog.vue
+12
-2
src/view/ddkz/components/chatRoomInfo.vue
src/view/ddkz/components/chatRoomInfo.vue
+1
-1
src/view/sjgl/ddkzConfig/ddkzConfigAdd.vue
src/view/sjgl/ddkzConfig/ddkzConfigAdd.vue
+1
-1
No files found.
src/view/ddkz/components/chatRoomDialog.vue
View file @
b059a92e
...
...
@@ -20,6 +20,8 @@
</div>
</
template
>
<
template
v-else-if=
"item.fromUserId == userInfo.account"
>
<span
v-if=
"item.messageType == 'CLOSED'"
class=
"el-icon-warning"
style=
"color: red;font-size: x-large;"
></span>
<div
class=
"mySides-text"
v-if=
"item.messageForm == 'TEXT'"
v-html=
"item.content"
style=
"background-color: #85ce61;"
>
</div>
...
...
@@ -149,6 +151,9 @@ export default {
this
.
$refs
.
chatContent
.
scrollTop
=
this
.
$refs
.
chatContent
.
scrollHeight
;
},
subscribe
(
item
)
{
if
(
!
item
.
teamAddress
)
{
//关闭的会议理论上不再订阅
return
;
}
//取消群聊的订阅
for
(
const
sub
in
this
.
stompClient
.
subscriptions
)
{
if
(
sub
.
startsWith
(
"
multicastTeam
"
))
{
...
...
@@ -156,10 +161,15 @@ export default {
}
}
this
.
stompClient
.
subscribe
(
item
.
teamAddress
,
data
=>
{
let
message
=
JSON
.
parse
(
data
.
body
);
if
(
data
.
headers
.
messageType
==
"
CLOSED
"
&&
data
.
headers
.
fromUserId
!=
this
.
userInfo
.
account
)
{
return
;
//已经关闭的会议室当自己收到消息时候需要感叹号提醒
}
this
.
chatMessageList
.
push
({
content
:
JSON
.
parse
(
data
.
body
)
.
content
,
content
:
message
.
content
,
fromUserId
:
data
.
headers
.
fromUserId
,
messageForm
:
JSON
.
parse
(
data
.
body
).
messageForm
messageForm
:
message
.
messageForm
,
messageType
:
data
.
headers
.
messageType
});
this
.
$nextTick
(()
=>
{
this
.
keepBottom
();
...
...
src/view/ddkz/components/chatRoomInfo.vue
View file @
b059a92e
...
...
@@ -80,7 +80,7 @@
<el-button
size=
"mini"
type=
"info"
@
click=
"showPeopleList"
>
人员列表
</el-button>
</div>
<div>
<el-button
size=
"mini"
type=
"info"
@
click=
"showChatRoom"
v-if=
"currentChatRoomInfo.status.value=='ONGOING'"
>
聊天室
</el-button>
<el-button
size=
"mini"
type=
"info"
@
click=
"showChatRoom"
>
聊天室
</el-button>
</div>
<div>
<el-button
size=
"mini"
type=
"info"
@
click=
"sendNotice"
v-if=
"currentChatRoomInfo.status.value=='ONGOING'"
>
发送公告
</el-button>
...
...
src/view/sjgl/ddkzConfig/ddkzConfigAdd.vue
View file @
b059a92e
...
...
@@ -6,7 +6,7 @@
</el-form-item>
<el-form-item
label=
"演习主持人"
>
<!--
<el-input
v-model=
"formData.chatroomOwner"
></el-input>
-->
<el-select
v-model=
"formData.director"
multiple
placeholder=
"请选择"
>
<el-select
v-model=
"formData.director"
multiple
placeholder=
"请选择"
filterable
>
<el-option
v-for=
"item in allData"
:key=
"item.account"
:label=
"item.account"
:value=
"item.account"
>
</el-option>
</el-select>
...
...
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