Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica.cloud.web-education-admin
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
提交
打开侧边栏
com.pica.cloud.education.frontend
pica.cloud.web-education-admin
提交
b32b8b8d
提交
b32b8b8d
编写于
9月 17, 2020
作者:
bo.dang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
联想搜索
上级
0f53df6a
变更
4
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
195 行增加
和
22 行删除
+195
-22
renyuan.vue
src/components/yqrange/member-management/renyuan.vue
+16
-5
fetch.js
src/utils/fetch.js
+2
-2
create-live.vue
src/views/yqrange/create-live.vue
+176
-14
range-apply.vue
src/views/yqrange/range-apply.vue
+1
-1
未找到文件。
src/components/yqrange/member-management/renyuan.vue
浏览文件 @
b32b8b8d
...
@@ -336,11 +336,22 @@ export default {
...
@@ -336,11 +336,22 @@ export default {
closeLoading
(
vm
);
closeLoading
(
vm
);
if
(
res
.
code
==
"000000"
)
{
if
(
res
.
code
==
"000000"
)
{
this
.
$message
({
type
:
'success'
,
message
:
'导入成功!'
if
(
res
.
data
.
successNum
==
0
&&
res
.
data
.
wrongDataList
.
length
>
0
){
});
this
.
$message
({
vm
.
initRange
();
type
:
'error'
,
message
:
res
.
message
});
}
else
{
this
.
$message
({
type
:
'success'
,
message
:
'导入成功!'
});
vm
.
initRange
();
}
}
}
else
{
else
{
this
.
$message
({
this
.
$message
({
...
...
src/utils/fetch.js
浏览文件 @
b32b8b8d
...
@@ -54,9 +54,9 @@ service.interceptors.request.use(config => {
...
@@ -54,9 +54,9 @@ service.interceptors.request.use(config => {
}
}
if
(
process
.
env
.
BUILD_ENV
==
"development"
){
// 本地开发环境qgit
if
(
process
.
env
.
BUILD_ENV
==
"development"
){
// 本地开发环境qgit
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
config
.
headers
[
'token'
]
=
'9606E40DDB704396AB532B2AE771048E
'
;
// config.headers['token'] = '9098AE0A1DCE4F7B86178A9A8A1BFFCC
';
//
config.headers['token'] = localStorage.getItem('storageToken')
config
.
headers
[
'token'
]
=
localStorage
.
getItem
(
'storageToken'
)
}
else
{
}
else
{
config
.
headers
[
'token'
]
=
localStorage
.
getItem
(
'storageToken'
)
config
.
headers
[
'token'
]
=
localStorage
.
getItem
(
'storageToken'
)
}
}
...
...
src/views/yqrange/create-live.vue
浏览文件 @
b32b8b8d
...
@@ -494,13 +494,11 @@
...
@@ -494,13 +494,11 @@
</div>
</div>
<div
class=
"main-content"
>
<div
class=
"main-content"
style=
"position: relative;left:270px;top: -117px;"
>
<div
class=
"left-box left"
>
<div
class=
"left-box left"
style=
"background-color: white;"
>
<!-- 搜索列表 有搜索结果时-->
<!-- 搜索列表 有搜索结果时-->
<div
<!-- v-if="searchList && searchList.length > 0" v-infinite-scroll="loadMore"-->
v-if=
"searchList && searchList.length > 0"
<div
class=
"search-list-wrap"
class=
"search-list-wrap"
v-infinite-scroll=
"loadMore"
:infinite-scroll-disabled=
"busy"
:infinite-scroll-disabled=
"busy"
infinite-scroll-distance=
"5"
infinite-scroll-distance=
"5"
infinite-scroll-immediate-check=
"false"
infinite-scroll-immediate-check=
"false"
...
@@ -508,17 +506,17 @@
...
@@ -508,17 +506,17 @@
<ul
class=
"search-list"
>
<ul
class=
"search-list"
>
<li
v-for=
"(searchLi, index) in searchList"
@
mousedown=
"handleSearchLiClick(searchLi)"
>
<li
v-for=
"(searchLi, index) in searchList"
@
mousedown=
"handleSearchLiClick(searchLi)"
>
<div
class=
"left"
>
<div
class=
"left"
>
<p
class=
"disease-name"
v-html=
"searchLi.
diseaseN
ame"
></p>
<p
class=
"disease-name"
v-html=
"searchLi.
n
ame"
></p>
<div
class=
"one-line"
>
<div
class=
"one-line"
>
<p
class=
"alias"
v-html=
"searchLi.alias"
></p>
<p
class=
"alias"
v-html=
"searchLi.alias"
></p>
<p
class=
"sign"
v-if=
"searchLi.alias"
>
|
</p>
<p
class=
"sign"
v-if=
"searchLi.alias"
>
|
</p>
<p
class=
"code"
>
{{searchLi.
icdCod
e}}
</p>
<p
class=
"code"
>
{{searchLi.
hospitalNam
e}}
</p>
</div>
</div>
</div>
</div>
<
div
class=
"right"
v-if=
"isSearchLiSelected(searchLi)"
><i
class=
"el-icon-check"
></i></div
>
<
!--<div class="right" v-if="isSearchLiSelected(searchLi)"><i class="el-icon-check"></i></div>--
>
</li>
</li>
<
p
v-if=
"busy"
class=
"loading"
>
加载中...
</p
>
<
!--<p v-if="busy" class="loading">加载中...</p>--
>
<
p
v-if=
"noMore"
class=
"loading"
>
没有更多了...
</p
>
<
!--<p v-if="noMore" class="loading">没有更多了...</p>--
>
</ul>
</ul>
</div>
</div>
...
@@ -643,6 +641,7 @@
...
@@ -643,6 +641,7 @@
dialogVisible: false,
dialogVisible: false,
uploadProgress1: 0,
uploadProgress1: 0,
searchList: [],
searchList: [],
busy: false,
formData: {
formData: {
circleId: "",// 圈子ID
circleId: "",// 圈子ID
name: '',// 直播名称
name: '',// 直播名称
...
@@ -1961,7 +1960,7 @@
...
@@ -1961,7 +1960,7 @@
let that = this;
let that = this;
that.page = 1;
that.page = 1;
that.isInputResponse = false;
that.isInputResponse = false;
if(
that.searchInput
== ''){
if(
name
== ''){
that.searchList = [];
that.searchList = [];
return;
return;
}
}
...
@@ -1975,8 +1974,8 @@
...
@@ -1975,8 +1974,8 @@
// console.log('>>>>>>*********** search: ', res)
// console.log('>>>>>>*********** search: ', res)
if(res.code == '000000'){
if(res.code == '000000'){
that.isInputResponse = true;
that.isInputResponse = true;
that.totalPageNum = Math.ceil(res.data.total/that.pageSize); // 总页数
//
that.totalPageNum = Math.ceil(res.data.total/that.pageSize); // 总页数
let list = res.data.
icdContentsList
|| [];
let list = res.data.
chooseLiveMemberDtos
|| [];
if(list.length > 0){
if(list.length > 0){
if(that.searchInput == ''){
if(that.searchInput == ''){
that.searchList = [];
that.searchList = [];
...
@@ -2005,6 +2004,13 @@
...
@@ -2005,6 +2004,13 @@
// console.log('blur.....')
// console.log('blur.....')
},
},
handleSearchLiClick(item) {
this.searchInput = '';
console.log(item);
this.formData.lecturesUserName = item.name;
this.formData.lecturesPhone = item.mobilePhone;
},
},
},
}
}
...
@@ -2156,4 +2162,160 @@
...
@@ -2156,4 +2162,160 @@
.el-checkbox__input.is-checked
+
.el-checkbox__label
{
.el-checkbox__input.is-checked
+
.el-checkbox__label
{
color
:
#449284
;
color
:
#449284
;
}
}
.main-content
{
overflow
:
hidden
;
.left
{
float
:
left
;
}
.left-box
{
width
:
270px
;
height
:
300px
;
.common-diagnose
{
width
:
100%
;
height
:
300px
;
.title
{
color
:
#303133
;
font-size
:
16px
;
line-height
:
40px
;
margin-top
:
10px
;
.no-result
{
font-size
:
14px
;
color
:
#e6a23c
;
margin-left
:
28px
;
}
}
.list
{
width
:
100%
;
height
:
250px
;
overflow
:
hidden
;
overflow-y
:
scroll
;
/*.scroll-bar;*/
padding
:
10px
;
border
:
1px
solid
#DCDFE6
;
li
{
height
:
35px
;
line-height
:
35px
;
padding
:
0
15px
;
background
:
#fff
;
border
:
1px
solid
#dcdfe6
;
color
:
#606266
;
cursor
:
pointer
;
font-size
:
12px
;
&
.active
{
color
:
#fff
;
background
:
#409eff
;
border-color
:
#409eff
;
}
display
:
inline-block
;
margin
:
0
10px
10px
0
;
border-radius
:
4px
;
max-width
:
350px
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
}
}
.search-list-wrap
{
width
:
100%
;
height
:
290px
;
margin-top
:
10px
;
border
:
1px
solid
#DCDFE6
;
overflow
:
hidden
;
overflow-y
:
scroll
;
/*.scroll-bar;*/
.search-list
{
border-radius
:
4px
;
width
:
100%
;
padding
:
10px
;
li
{
position
:
relative
;
line-height
:
30px
;
overflow
:
hidden
;
cursor
:
pointer
;
font-size
:
12px
;
&
:hover
{
background
:
#eee
;
}
.left
{
width
:
310px
;
float
:
left
;
span
{
color
:
#ff8429
;
}
.disease-name
{
font-size
:
14px
;
}
.one-line
{
width
:
100%
;
overflow
:
hidden
;
font-size
:
12px
;
color
:
#aaa
;
.alias
{
float
:
left
;
}
.sign
{
float
:
left
;
margin
:
0
5px
;
}
.code
{
float
:
left
;
}
}
}
.right
{
position
:
absolute
;
right
:
0
;
top
:
50%
;
margin-top
:
-13px
;
// width: 0px;
// float: left;
display
:
inline-block
;
vertical-align
:
middle
;
i
{
font-size
:
24px
;
color
:
#449284
;
font-weight
:
700
;
}
}
.code
{
line-height
:
30px
;
}
}
.loading
{
color
:
#ccc
;
text-align
:
center
;
margin
:
0
;
font-size
:
12px
;
margin-top
:
5px
;
}
}
}
}
.choosed-list-wrap
{
width
:
450px
;
height
:
300px
;
margin-left
:
30px
;
.title
{
color
:
#303133
;
font-size
:
16px
;
line-height
:
40px
;
margin-top
:
10px
;
}
.choosed-list
{
overflow
:
hidden
;
overflow-y
:
scroll
;
width
:
450px
;
height
:
250px
;
padding
:
10px
;
border
:
1px
solid
#DCDFE6
;
/*.scroll-bar;*/
.el-tag
{
margin
:
0
10px
10px
0
;;
.text
{
display
:
inline-block
;
max-width
:
342px
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.el-tag__close
{
top
:
-12px
;
}
}
}
}
}
</
style
>
</
style
>
src/views/yqrange/range-apply.vue
浏览文件 @
b32b8b8d
...
@@ -250,7 +250,7 @@
...
@@ -250,7 +250,7 @@
"status"
:
0
"status"
:
0
}]
}]
};
};
this
.
$confirm
(
`
确定拒绝吗?`
,
`“
${
row
.
name
}
”申请加入"
${
row
.
circleName
}
"圈子
`
,
{
this
.
$confirm
(
`
拒绝后"
${
row
.
name
}
"将无法访问"
${
row
.
circleName
}
"`
,
`确认拒绝
`
,
{
confirmButtonText
:
'拒绝'
,
confirmButtonText
:
'拒绝'
,
cancelButtonText
:
'取消'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
,
type
:
'warning'
,
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录