Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-admin-consultation
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.education.frontend
pica-admin-consultation
提交
d4916d36
提交
d4916d36
编写于
1月 28, 2021
作者:
guangjun.yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
样式调整等
上级
47898252
变更
13
显示空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
149 行增加
和
122 行删除
+149
-122
plus-task.png
src/assets/image/IM/plus-task.png
+0
-0
user-info.vue
src/components/IM/user-info.vue
+5
-1
common.scss
src/style/common.scss
+11
-11
global.scss
src/style/global.scss
+2
-2
list.vue
src/views/IM/chain-history/list.vue
+1
-1
index.vue
src/views/IM/chain-message/index.vue
+2
-1
index.scss
src/views/IM/current-session/index.scss
+30
-12
index.vue
src/views/IM/current-session/index.vue
+91
-88
list.vue
src/views/IM/search-message/list.vue
+1
-1
list.vue
src/views/IM/waiting-session/list.vue
+2
-1
home.vue
src/views/home.vue
+2
-2
header.vue
src/views/layout/header.vue
+1
-1
slidebar.vue
src/views/layout/slidebar.vue
+1
-1
未找到文件。
src/assets/image/IM/plus-task.png
0 → 100755
浏览文件 @
d4916d36
296 字节
src/components/IM/user-info.vue
浏览文件 @
d4916d36
...
@@ -205,7 +205,10 @@ export default {
...
@@ -205,7 +205,10 @@ export default {
color
:
#666666
;
color
:
#666666
;
}
}
.other-info-wrapper
{
.other-info-wrapper
{
margin
:
20px
24px
50px
;
// margin: 20px 24px 50px;
padding
:
10px
0
20px
;
margin
:
0
20px
;
border-bottom
:
1px
dashed
#F0F0F0
;
.other-info
{
.other-info
{
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
...
@@ -243,6 +246,7 @@ export default {
...
@@ -243,6 +246,7 @@ export default {
.qt-wrapper
{
.qt-wrapper
{
margin
:
0
25px
;
margin
:
0
25px
;
.title
{
.title
{
margin-top
:
25px
;
text-align
:
left
;
text-align
:
left
;
font-weight
:
700
;
font-weight
:
700
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
...
...
src/style/common.scss
浏览文件 @
d4916d36
...
@@ -199,30 +199,30 @@ html,body{
...
@@ -199,30 +199,30 @@ html,body{
.el-button--primary
{
.el-button--primary
{
line-height
:
40px
;
line-height
:
40px
;
background
:
#
449284
!
important
;
background
:
#
0D9078
!
important
;
border
:
1px
solid
#
449284
!
important
;
border
:
1px
solid
#
0D9078
!
important
;
}
}
.el-button.is-disabled
{
.el-button.is-disabled
{
background
:
#
449284
!
important
;
background
:
#
0D9078
!
important
;
border
:
1px
solid
#
449284
!
important
;
border
:
1px
solid
#
0D9078
!
important
;
opacity
:
0
.5
;
opacity
:
0
.5
;
}
}
.el-pagination.is-background
.el-pager
li
:not
(
.disabled
)
.active
{
.el-pagination.is-background
.el-pager
li
:not
(
.disabled
)
.active
{
background
:
#
449284
!
important
;
background
:
#
0D9078
!
important
;
}
}
// 主题样式修改
// 主题样式修改
.el-radio__input.is-checked
.el-radio__inner
{
.el-radio__input.is-checked
.el-radio__inner
{
border-color
:
#
449284
!
important
;
border-color
:
#
0D9078
!
important
;
background
:
#
449284
!
important
;
background
:
#
0D9078
!
important
;
}
}
.el-radio__input.is-checked
+
.el-radio__label
,
.el-tabs__item.is-active
,
.el-checkbox__input.is-checked
+
.el-checkbox__label
{
.el-radio__input.is-checked
+
.el-radio__label
,
.el-tabs__item.is-active
,
.el-checkbox__input.is-checked
+
.el-checkbox__label
{
color
:
#
449284
!
important
;
color
:
#
0D9078
!
important
;
}
}
.el-checkbox__input.is-checked
.el-checkbox__inner
,
.el-checkbox__input.is-indeterminate
.el-checkbox__inner
{
.el-checkbox__input.is-checked
.el-checkbox__inner
,
.el-checkbox__input.is-indeterminate
.el-checkbox__inner
{
border-color
:
#
449284
!
important
;
border-color
:
#
0D9078
!
important
;
background
:
#
449284
!
important
;
background
:
#
0D9078
!
important
;
}
}
// 面包屑导航
// 面包屑导航
...
@@ -230,7 +230,7 @@ html,body{
...
@@ -230,7 +230,7 @@ html,body{
font-weight
:
300
!
important
;
font-weight
:
300
!
important
;
}
}
.el-breadcrumb__inner.is-link
:hover
{
.el-breadcrumb__inner.is-link
:hover
{
color
:
#
449284
!
important
;
color
:
#
0D9078
!
important
;
}
}
.current-session-wrap
{
.current-session-wrap
{
...
...
src/style/global.scss
浏览文件 @
d4916d36
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
}
}
.button-green
{
.button-green
{
color
:
#ffffff
;
color
:
#ffffff
;
background
:
#
449284
;
background
:
#
0D9078
;
border-color
:
#bfdad5
;
border-color
:
#bfdad5
;
border-radius
:
2px
;
border-radius
:
2px
;
}
}
...
@@ -122,5 +122,5 @@
...
@@ -122,5 +122,5 @@
}
}
.el-button--text
>
span
{
.el-button--text
>
span
{
font-weight
:
700
;
font-weight
:
700
;
color
:
#
449284
!
important
;
color
:
#
0D9078
!
important
;
}
}
src/views/IM/chain-history/list.vue
浏览文件 @
d4916d36
...
@@ -158,7 +158,7 @@ export default {
...
@@ -158,7 +158,7 @@ export default {
margin-bottom
:
20px
;
margin-bottom
:
20px
;
border-bottom
:
1px
solid
#efefef
;
border-bottom
:
1px
solid
#efefef
;
.num
{
.num
{
color
:
#
449284
;
color
:
#
0D9078
;
}
}
}
}
.create-button
{
.create-button
{
...
...
src/views/IM/chain-message/index.vue
浏览文件 @
d4916d36
...
@@ -356,6 +356,7 @@ export default {
...
@@ -356,6 +356,7 @@ export default {
padding
:
0
10px
;
padding
:
0
10px
;
}
}
.el-form-item
.el-form-item__label
{
.el-form-item
.el-form-item__label
{
font-size
:
14px
!
important
;
float
:
none
!
important
;
float
:
none
!
important
;
line-height
:
20px
;
line-height
:
20px
;
}
}
...
@@ -419,7 +420,7 @@ export default {
...
@@ -419,7 +420,7 @@ export default {
}
}
.confirm-btn
{
.confirm-btn
{
margin
:
0
10px
;
margin
:
0
10px
;
background
:
#
449284
;
background
:
#
0D9078
;
color
:
#fff
;
color
:
#fff
;
}
}
}
}
...
...
src/views/IM/current-session/index.scss
浏览文件 @
d4916d36
...
@@ -15,19 +15,37 @@
...
@@ -15,19 +15,37 @@
height
:
52px
;
height
:
52px
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
padding
:
0
25px
;
padding
:
0
12px
0
25px
;
&
>
span
:first-child
{
p
{
font-size
:
16p
x
;
display
:
fle
x
;
}
flex-direction
:
row
;
&
>
span
:last-child
{
align-items
:
center
;
color
:
#0d9078
;
color
:
#0d9078
;
cursor
:
pointer
;
cursor
:
pointer
;
img
{
width
:
16px
;
height
:
16px
;
margin-right
:
4px
;
}
span
{
font-size
:
14px
;
color
:
#0d9078
;
}
}
}
}
// & > span:first-child {
// font-size: 14px;
// }
// & > span:last-child {
// color: #0d9078;
// cursor: pointer;
// }
}
.c-num
{
.c-num
{
padding
:
0
25px
;
padding
:
0
25px
;
height
:
40px
;
height
:
40px
;
line-height
:
40px
;
line-height
:
40px
;
font-size
:
12px
;
background
:
#fffbe6
;
background
:
#fffbe6
;
}
}
.session-list
{
.session-list
{
...
@@ -40,14 +58,14 @@
...
@@ -40,14 +58,14 @@
height
:
72px
;
height
:
72px
;
flex-direction
:
row
;
flex-direction
:
row
;
align-items
:
center
;
align-items
:
center
;
padding
:
0
25px
;
padding
:
0
12px
0
25px
;
cursor
:
pointer
;
cursor
:
pointer
;
.img-wrapper
{
.img-wrapper
{
// position: relative;
// position: relative;
// top: 0;
// top: 0;
// left: 0;
// left: 0;
width
:
40
px
;
width
:
24
px
;
height
:
40
px
;
height
:
24
px
;
margin-right
:
10px
;
margin-right
:
10px
;
img
{
img
{
width
:
100%
;
width
:
100%
;
...
@@ -144,9 +162,9 @@
...
@@ -144,9 +162,9 @@
flex-direction
:
row
;
flex-direction
:
row
;
margin
:
12px
0
;
margin
:
12px
0
;
.msg-item-img
{
.msg-item-img
{
width
:
44
px
;
width
:
36
px
;
height
:
44
px
;
height
:
36
px
;
margin-right
:
8
px
;
margin-right
:
12
px
;
&
>
img
{
&
>
img
{
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
...
@@ -316,7 +334,7 @@
...
@@ -316,7 +334,7 @@
}
}
.c-bottom
{
.c-bottom
{
position
:
relative
;
position
:
relative
;
top
:
0
;
top
:
-8px
;
left
:
0
;
left
:
0
;
display
:
flex
;
display
:
flex
;
flex-direction
:
row
;
flex-direction
:
row
;
...
...
src/views/IM/current-session/index.vue
浏览文件 @
d4916d36
...
@@ -5,7 +5,10 @@
...
@@ -5,7 +5,10 @@
<article
class=
"left"
>
<article
class=
"left"
>
<div
class=
"l-header"
>
<div
class=
"l-header"
>
<span>
我的任务(
{{
this
.
sessionListData
.
myTaskCount
}}
)
</span>
<span>
我的任务(
{{
this
.
sessionListData
.
myTaskCount
}}
)
</span>
<span
@
click=
"fetchOneTask"
>
再来一个
</span>
<p
@
click=
"fetchOneTask"
>
<img
src=
"../../../assets/image/IM/plus-task.png"
/>
<span>
再来一个
</span>
</p>
</div>
</div>
<p
class=
"c-num"
>
当前等待会话:
{{
this
.
sessionListData
.
waitingTaskCount
}}
个
</p>
<p
class=
"c-num"
>
当前等待会话:
{{
this
.
sessionListData
.
waitingTaskCount
}}
个
</p>
<!--
<ul
id=
"sessionListId"
class=
"session-list"
:style=
"
{'height': containerHeight + 'px'}"> -->
<!--
<ul
id=
"sessionListId"
class=
"session-list"
:style=
"
{'height': containerHeight + 'px'}"> -->
...
@@ -42,7 +45,11 @@
...
@@ -42,7 +45,11 @@
</li>
</li>
</ul>
</ul>
</article>
</article>
<article
v-show=
"sessionListData.sessionList.length"
class=
"center"
v-loadmore=
"getOldMSGHistory"
>
<article
v-show=
"sessionListData.sessionList.length"
class=
"center"
v-loadmore=
"getOldMSGHistory"
>
<section
class=
"c-header"
>
<section
class=
"c-header"
>
<div
class=
"c-header-l"
>
<div
class=
"c-header-l"
>
<img
:src=
"currentSession.avatarImageUrl"
alt
/>
<img
:src=
"currentSession.avatarImageUrl"
alt
/>
...
@@ -56,11 +63,8 @@
...
@@ -56,11 +63,8 @@
id=
"msgContentId"
id=
"msgContentId"
class=
"msg-content scroll-box"
class=
"msg-content scroll-box"
:style=
"
{'height': (containerHeight - 35) + 'px'}"
:style=
"
{'height': (containerHeight - 35) + 'px'}"
> -->
>-->
<section
<section
id=
"msgContentId"
class=
"msg-content scroll-box"
>
id=
"msgContentId"
class=
"msg-content scroll-box"
>
<article
<article
v-for=
"(item, index) in messageList"
v-for=
"(item, index) in messageList"
:key=
"index"
:key=
"index"
...
@@ -83,7 +87,7 @@
...
@@ -83,7 +87,7 @@
<img
<img
v-if=
"item.sendOrReceive && item.isShowLoadingIcon"
v-if=
"item.sendOrReceive && item.isShowLoadingIcon"
class=
"icon ld"
class=
"icon ld"
src=
"../../../assets/image/IM/
icon-fresh-2
.png"
src=
"../../../assets/image/IM/
loading-icon
.png"
alt
alt
/>
/>
<div
v-if=
"item.showType == 1"
class=
"mid-text-wrapper"
style=
"max-width: 520px;"
>
<div
v-if=
"item.showType == 1"
class=
"mid-text-wrapper"
style=
"max-width: 520px;"
>
...
@@ -96,7 +100,8 @@
...
@@ -96,7 +100,8 @@
:imgUrl=
"item.url"
:imgUrl=
"item.url"
:imgData=
"item"
:imgData=
"item"
:index=
"index"
:index=
"index"
@
imgHandle=
"imgHandle"
></img-size>
@
imgHandle=
"imgHandle"
></img-size>
</div>
</div>
<div
v-if=
"item.showType == 3"
class=
"mid-pdf"
@
click=
"openPDF(item)"
>
<div
v-if=
"item.showType == 3"
class=
"mid-pdf"
@
click=
"openPDF(item)"
>
<div
class=
"midp-left"
>
<div
class=
"midp-left"
>
...
@@ -149,7 +154,7 @@
...
@@ -149,7 +154,7 @@
<UserInfo
:userInfo=
"doctorInfo"
:taskLogId=
"currentTaskLogId"
></UserInfo>
<UserInfo
:userInfo=
"doctorInfo"
:taskLogId=
"currentTaskLogId"
></UserInfo>
</article>
</article>
<article
v-show=
"!sessionListData.sessionList.length"
class=
"center no-content"
>
<article
v-show=
"!sessionListData.sessionList.length"
class=
"center no-content"
>
<img
src=
"../../../assets/image/IM/no-search-list.png"
alt
=
""
>
<img
src=
"../../../assets/image/IM/no-search-list.png"
alt
/
>
<p>
任务都做完啦!休息一下吧~
</p>
<p>
任务都做完啦!休息一下吧~
</p>
</article>
</article>
</section>
</section>
...
@@ -207,21 +212,16 @@ import BreadCrumb from "@/components/breadcrumb.vue";
...
@@ -207,21 +212,16 @@ import BreadCrumb from "@/components/breadcrumb.vue";
import
ImgSize
from
"@/components/IM/img-size.vue"
;
import
ImgSize
from
"@/components/IM/img-size.vue"
;
import
{
doUpload
,
getFilePath
}
from
"@/utils/qiniu-util"
;
import
{
doUpload
,
getFilePath
}
from
"@/utils/qiniu-util"
;
import
{
validateWord
}
from
"@/utils/validate.js"
;
import
{
validateWord
}
from
"@/utils/validate.js"
;
import
{
import
{
openLoading
,
closeLoading
,
betaHandle
}
from
"@/utils/utils"
;
openLoading
,
closeLoading
,
betaHandle
,
}
from
"@/utils/utils"
;
import
{
getPicaKFAccid
,
getPhomeDemain
}
from
"@/utils"
;
import
{
getPicaKFAccid
,
getPhomeDemain
}
from
"@/utils"
;
import
UserInfo
from
"@/components/IM/user-info.vue"
;
import
UserInfo
from
"@/components/IM/user-info.vue"
;
// const CONTAINER_HEIGHT = 300;
// const CONTAINER_HEIGHT = 300;
const
CONTAINER_HEIGHT
=
700
;
const
CONTAINER_HEIGHT
=
700
;
let
forwardMsgIntervalId
=
null
,
let
forwardMsgIntervalId
=
null
,
sessionIntervalId
=
null
,
sessionIntervalId
=
null
,
continueIntervalId
=
null
,
continueIntervalId
=
null
,
autoCompletionIntervalId
=
null
,
autoCompletionIntervalId
=
null
,
cacheMap
=
{};
cacheMap
=
{};
let
_this
=
null
;
let
_this
=
null
;
export
default
{
export
default
{
...
@@ -296,8 +296,8 @@ export default {
...
@@ -296,8 +296,8 @@ export default {
deep
:
true
deep
:
true
},
},
// 监听到有变化,就缓存一下
// 监听到有变化,就缓存一下
sendText
(
newText
){
sendText
(
newText
)
{
cacheMap
[
this
.
currentSession
.
id
]
=
newText
||
''
;
cacheMap
[
this
.
currentSession
.
id
]
=
newText
||
""
;
}
}
},
},
...
@@ -331,11 +331,13 @@ export default {
...
@@ -331,11 +331,13 @@ export default {
cacheMap
=
{};
cacheMap
=
{};
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
_this
.
containerHeight
=
document
.
body
.
clientHeight
-
80
;
_this
.
containerHeight
=
document
.
body
.
clientHeight
-
80
;
_this
.
getElmByID
(
'screenSet'
).
style
.
height
=
_this
.
getElmByID
(
"screenSet"
).
style
.
height
=
_this
.
containerHeight
-
152
+
"px"
;
_this
.
containerHeight
-
152
+
"px"
;
// console.log('_this.containerHeight', _this.containerHeight);
// console.log('_this.containerHeight', _this.containerHeight);
_this
.
getElmByID
(
"sessionListId"
).
style
.
height
=
_this
.
containerHeight
-
252
+
'px'
;
_this
.
getElmByID
(
"sessionListId"
).
style
.
height
=
_this
.
getElmByID
(
"msgContentId"
).
style
.
height
=
_this
.
containerHeight
-
287
+
'px'
;
_this
.
containerHeight
-
252
+
"px"
;
_this
.
getElmByID
(
"msgContentId"
).
style
.
height
=
_this
.
containerHeight
-
287
+
"px"
;
});
});
},
},
...
@@ -346,24 +348,25 @@ export default {
...
@@ -346,24 +348,25 @@ export default {
// 含有敏感信息的消息,自行补全提示文案
// 含有敏感信息的消息,自行补全提示文案
// 每30秒监测敏感信息
// 每30秒监测敏感信息
autoCompletionInterval
()
{
autoCompletionInterval
()
{
if
(
!
this
.
messageList
)
return
;
if
(
!
this
.
messageList
)
return
;
// console.log('in autoCompletionInterval');
// console.log('in autoCompletionInterval');
// 将带有loading的消息转成失败的
// 将带有loading的消息转成失败的
this
.
messageList
.
forEach
(
item
=>
{
this
.
messageList
.
forEach
(
item
=>
{
if
(
item
.
isShowLoadingIcon
)
{
if
(
item
.
isShowLoadingIcon
)
{
item
.
isShowLoadingIcon
=
false
;
item
.
isShowLoadingIcon
=
false
;
item
.
isShowErrorIcon
=
true
;
item
.
isShowErrorIcon
=
true
;
}
}
});
});
let
flag
=
false
,
msg
;
let
flag
=
false
,
for
(
let
i
=
0
;
i
<
this
.
messageList
.
length
;
i
++
)
{
msg
;
for
(
let
i
=
0
;
i
<
this
.
messageList
.
length
;
i
++
)
{
msg
=
this
.
messageList
[
i
];
msg
=
this
.
messageList
[
i
];
if
(
msg
.
isShowErrorIcon
&&
!
msg
.
isShowErrorMsg
)
{
if
(
msg
.
isShowErrorIcon
&&
!
msg
.
isShowErrorMsg
)
{
flag
=
true
;
flag
=
true
;
break
;
break
;
}
}
}
}
if
(
flag
)
{
if
(
flag
)
{
this
.
getMSGForwardForAC
(
msg
);
this
.
getMSGForwardForAC
(
msg
);
}
}
},
},
...
@@ -404,11 +407,11 @@ export default {
...
@@ -404,11 +407,11 @@ export default {
msg
.
fromAccount
=
this
.
currentToAccId
;
msg
.
fromAccount
=
this
.
currentToAccId
;
msg
.
toAccount
=
this
.
picakfAccId
;
msg
.
toAccount
=
this
.
picakfAccId
;
// type: 0, // 类型 0文本 1图片 2pdf 3链接
// type: 0, // 类型 0文本 1图片 2pdf 3链接
msg
.
text
=
params
.
info
||
''
;
msg
.
text
=
params
.
info
||
""
;
msg
.
suffix
=
params
.
remark
||
''
;
msg
.
suffix
=
params
.
remark
||
""
;
if
(
msg
.
type
==
3
)
{
if
(
msg
.
type
==
3
)
{
msg
.
suffix
=
params
.
info
;
msg
.
suffix
=
params
.
info
;
msg
.
text
=
params
.
remark
||
''
;
msg
.
text
=
params
.
remark
||
""
;
}
}
msg
.
size
=
params
.
fileSize
;
msg
.
size
=
params
.
fileSize
;
msg
.
url
=
params
.
url
;
msg
.
url
=
params
.
url
;
...
@@ -500,7 +503,7 @@ export default {
...
@@ -500,7 +503,7 @@ export default {
this
.
POST
(
"/im/msg/forward"
,
params
).
then
(
res
=>
{
this
.
POST
(
"/im/msg/forward"
,
params
).
then
(
res
=>
{
if
(
res
.
code
===
"000000"
)
{
if
(
res
.
code
===
"000000"
)
{
this
.
convertMessageList
(
res
.
data
,
2
);
this
.
convertMessageList
(
res
.
data
,
2
);
if
(
res
.
data
.
length
)
{
if
(
res
.
data
.
length
)
{
this
.
readAllMsg
();
this
.
readAllMsg
();
}
}
}
else
{
}
else
{
...
@@ -743,13 +746,13 @@ export default {
...
@@ -743,13 +746,13 @@ export default {
this
.
getMSGHistory
(
this
.
currentSession
);
this
.
getMSGHistory
(
this
.
currentSession
);
this
.
readAllMsg
();
this
.
readAllMsg
();
// 如果是点击“再来一个”或“给我一个任务吧”按钮分配的任务,则要滚动到最后
// 如果是点击“再来一个”或“给我一个任务吧”按钮分配的任务,则要滚动到最后
if
(
this
.
isFromAssignTask
)
{
if
(
this
.
isFromAssignTask
)
{
this
.
$nextTick
(
()
=>
{
this
.
$nextTick
(()
=>
{
let
element
=
this
.
getElmByID
(
"sessionListId"
);
let
element
=
this
.
getElmByID
(
"sessionListId"
);
if
(
element
)
{
if
(
element
)
{
element
.
scrollTop
=
element
.
scrollHeight
;
element
.
scrollTop
=
element
.
scrollHeight
;
}
}
})
})
;
}
}
}
}
if
(
sLength
)
{
if
(
sLength
)
{
...
@@ -891,7 +894,7 @@ export default {
...
@@ -891,7 +894,7 @@ export default {
"progress"
,
"progress"
,
""
""
).
then
(
function
(
resData
)
{
).
then
(
function
(
resData
)
{
closeLoading
(
_this
)
closeLoading
(
_this
)
;
let
params
=
{};
let
params
=
{};
params
.
fileSize
=
resData
.
size
;
params
.
fileSize
=
resData
.
size
;
params
.
fileExt
=
resData
.
ext
;
params
.
fileExt
=
resData
.
ext
;
...
@@ -971,12 +974,13 @@ export default {
...
@@ -971,12 +974,13 @@ export default {
let
sendId
=
new
Date
().
getTime
();
let
sendId
=
new
Date
().
getTime
();
this
.
handleSendMsg
(
params
,
sendId
);
this
.
handleSendMsg
(
params
,
sendId
);
// console.log("sendMsgParams", params);
// console.log("sendMsgParams", params);
await
this
.
POST
(
"/im/msg/sendMessage"
,
params
).
then
(
res
=>
{
await
this
.
POST
(
"/im/msg/sendMessage"
,
params
)
.
then
(
res
=>
{
if
(
res
.
code
===
"000000"
)
{
if
(
res
.
code
===
"000000"
)
{
// 校验结果:1校验通过 2校验不通过
// 校验结果:1校验通过 2校验不通过
// console.log(res.data.checkFlag);
// console.log(res.data.checkFlag);
let
msg
=
this
.
messageList
[
this
.
messageList
.
length
-
1
];
let
msg
=
this
.
messageList
[
this
.
messageList
.
length
-
1
];
if
(
msg
.
sendId
!==
sendId
)
{
if
(
msg
.
sendId
!==
sendId
)
{
msg
=
this
.
getMsgBySendId
(
sendId
);
msg
=
this
.
getMsgBySendId
(
sendId
);
}
}
if
(
res
.
data
.
checkFlag
==
1
)
{
if
(
res
.
data
.
checkFlag
==
1
)
{
...
@@ -996,9 +1000,10 @@ export default {
...
@@ -996,9 +1000,10 @@ export default {
type
:
"error"
type
:
"error"
});
});
}
}
}).
catch
(
error
=>
{
})
.
catch
(
error
=>
{
let
msg
=
this
.
messageList
[
this
.
messageList
.
length
-
1
];
let
msg
=
this
.
messageList
[
this
.
messageList
.
length
-
1
];
if
(
msg
.
sendId
!==
sendId
)
{
if
(
msg
.
sendId
!==
sendId
)
{
msg
=
this
.
getMsgBySendId
(
sendId
);
msg
=
this
.
getMsgBySendId
(
sendId
);
}
}
msg
.
isShowLoadingIcon
=
false
;
msg
.
isShowLoadingIcon
=
false
;
...
@@ -1015,10 +1020,11 @@ export default {
...
@@ -1015,10 +1020,11 @@ export default {
// 根据sendId,查找到对应的消息
// 根据sendId,查找到对应的消息
getMsgBySendId
(
sendId
)
{
getMsgBySendId
(
sendId
)
{
console
.
log
(
'------------getMsgBySendId------------'
);
console
.
log
(
"------------getMsgBySendId------------"
);
let
l
=
this
.
messageList
.
length
,
i
=
l
-
1
;
let
l
=
this
.
messageList
.
length
,
for
(;
i
>
0
;
i
--
)
{
i
=
l
-
1
;
if
(
this
.
messageList
[
i
].
sendId
==
sendId
)
{
for
(;
i
>
0
;
i
--
)
{
if
(
this
.
messageList
[
i
].
sendId
==
sendId
)
{
break
;
break
;
}
}
}
}
...
@@ -1030,15 +1036,12 @@ export default {
...
@@ -1030,15 +1036,12 @@ export default {
return
betaHandle
(
val
);
return
betaHandle
(
val
);
},
},
imgHandle
(
data
)
{
imgHandle
(
data
)
{
this
.
$set
(
this
.
messageList
[
data
.
index
],
'newW'
,
data
.
width
)
this
.
$set
(
this
.
messageList
[
data
.
index
],
"newW"
,
data
.
width
);
this
.
$set
(
this
.
messageList
[
data
.
index
],
'newH'
,
data
.
height
)
this
.
$set
(
this
.
messageList
[
data
.
index
],
"newH"
,
data
.
height
);
}
,
}
},
},
beforeDestroy
()
{
beforeDestroy
()
{
sessionIntervalId
&&
clearInterval
(
sessionIntervalId
);
sessionIntervalId
&&
clearInterval
(
sessionIntervalId
);
forwardMsgIntervalId
&&
clearInterval
(
forwardMsgIntervalId
);
forwardMsgIntervalId
&&
clearInterval
(
forwardMsgIntervalId
);
...
...
src/views/IM/search-message/list.vue
浏览文件 @
d4916d36
...
@@ -172,7 +172,7 @@ export default {
...
@@ -172,7 +172,7 @@ export default {
margin-bottom
:
20px
;
margin-bottom
:
20px
;
border-bottom
:
1px
solid
#efefef
;
border-bottom
:
1px
solid
#efefef
;
.num
{
.num
{
color
:
#
449284
;
color
:
#
0D9078
;
}
}
}
}
.create-button
{
.create-button
{
...
...
src/views/IM/waiting-session/list.vue
浏览文件 @
d4916d36
...
@@ -138,7 +138,8 @@ export default {
...
@@ -138,7 +138,8 @@ export default {
color
:
#000
;
color
:
#000
;
}
}
.num
{
.num
{
color
:
#449284
;
font-weight
:
700
;
color
:
#0D9078
;
}
}
}
}
.create-button
{
.create-button
{
...
...
src/views/home.vue
浏览文件 @
d4916d36
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<el-row>
<el-row>
<el-col
class=
"visitor"
:span=
"24"
v-if=
"tableData.length > 0"
>
<el-col
class=
"visitor"
:span=
"24"
v-if=
"tableData.length > 0"
>
<div
class=
"visitor-title"
>
<div
class=
"visitor-title"
>
<div
class=
"title"
>
今日随访:
<span
style=
"color:#
449284
;"
>
10人
</span></div>
<div
class=
"title"
>
今日随访:
<span
style=
"color:#
0D9078
;"
>
10人
</span></div>
<span
class=
"visitor-more"
@
click=
"lookMore"
>
查看更多
</span>
<span
class=
"visitor-more"
@
click=
"lookMore"
>
查看更多
</span>
</div>
</div>
<div
class=
"visitor-info"
>
<div
class=
"visitor-info"
>
...
@@ -112,7 +112,7 @@ export default {
...
@@ -112,7 +112,7 @@ export default {
}
}
.visitor-more
{
.visitor-more
{
font-size
:
12px
;
font-size
:
12px
;
color
:
#
449284
;
color
:
#
0D9078
;
border
:
1px
solid
rgba
(
68
,
146
,
132
,
0
.3
);
border
:
1px
solid
rgba
(
68
,
146
,
132
,
0
.3
);
padding
:
5px
14px
;
padding
:
5px
14px
;
border-radius
:
3px
;
border-radius
:
3px
;
...
...
src/views/layout/header.vue
浏览文件 @
d4916d36
...
@@ -129,7 +129,7 @@ export default {
...
@@ -129,7 +129,7 @@ export default {
box-sizing
:
border-box
;
box-sizing
:
border-box
;
height
:
64px
;
height
:
64px
;
width
:
100%
;
width
:
100%
;
z-index
:
99999
;
z-index
:
1000
;
font-size
:
22px
;
font-size
:
22px
;
line-height
:
64px
;
line-height
:
64px
;
color
:
#fff
;
color
:
#fff
;
...
...
src/views/layout/slidebar.vue
浏览文件 @
d4916d36
...
@@ -150,7 +150,7 @@ export default {
...
@@ -150,7 +150,7 @@ export default {
}
}
.el-menu-item.is-active
{
.el-menu-item.is-active
{
color
:
#fff
;
color
:
#fff
;
background
:
#
509284
!
important
;
background
:
#
0D9078
!
important
;
}
}
.el-menu-item
:hover
,
.el-menu-item
:hover
,
.el-submenu__title
:hover
,
.el-submenu__title
:hover
,
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录