Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-admin-IM
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.education.frontend
pica-admin-IM
提交
8a2481c3
提交
8a2481c3
编写于
3月 21, 2019
作者:
zhentian.jia
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
table空状态 时间组件
上级
fd31c18d
变更
4
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
132 行增加
和
73 行删除
+132
-73
add-manager.vue
src/views/education/add-manager.vue
+71
-47
item-manager.vue
src/views/education/item-manager.vue
+22
-7
item-role.vue
src/views/system/item-role.vue
+15
-4
role.vue
src/views/system/role.vue
+24
-15
未找到文件。
src/views/education/add-manager.vue
浏览文件 @
8a2481c3
...
...
@@ -28,26 +28,28 @@
</el-form-item>
<el-form-item
label=
"项目时间:"
required
>
<el-col
:span=
"3"
>
<el-form-item
label
>
<el-form-item
prop=
"projectBegintime"
>
<el-date-picker
v-model=
"formData.projectBegintime"
size=
"mini"
type=
"date"
type=
"date
time
"
placeholder=
"请选择开始时间"
value-format=
"yyyy-MM-dd HH:mm:ss"
:picker-options=
"pickerOptions0"
></el-date-picker>
</el-form-item>
</el-col>
<el-col
:span=
"5"
>
<el-form-item
label=
"~"
>
<el-col
class=
"line"
:span=
"0"
></el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
" "
prop=
"projectEndtime"
>
<el-date-picker
v-model=
"formData.projectEndtime"
size=
"mini"
type=
"date"
type=
"date
time
"
placeholder=
"请选择结束时间"
value-format=
"yyyy-MM-dd
23:59:59
"
value-format=
"yyyy-MM-dd
HH:mm:ss
"
:picker-options=
"pickerOptions1"
default-time=
"23:59:59"
></el-date-picker>
</el-form-item>
</el-col>
...
...
@@ -254,6 +256,12 @@
<el-table-column
prop=
"cityName"
label=
"所属城市"
align=
"center"
></el-table-column>
<el-table-column
prop=
"countyName"
label=
"所属区县"
align=
"center"
></el-table-column>
<el-table-column
prop=
"townName"
label=
"所属街道"
align=
"center"
></el-table-column>
<div
slot=
"empty"
>
<div
class=
"table-empty"
>
<img
src=
"../../assets/image/no-content1.png"
>
<p>
没有查询到相关结果
</p>
</div>
</div>
</el-table>
<div
class=
"pagination"
>
<el-pagination
...
...
@@ -280,6 +288,12 @@
>
<el-table-column
type=
"selection"
width=
"55"
></el-table-column>
<el-table-column
prop=
"name"
label=
"科室名称"
align=
"center"
></el-table-column>
<div
slot=
"empty"
>
<div
class=
"table-empty"
>
<img
src=
"../../assets/image/no-content1.png"
>
<p>
没有查询到相关结果
</p>
</div>
</div>
</el-table>
</el-col>
</el-tab-pane>
...
...
@@ -338,6 +352,12 @@
<el-table-column
prop=
"provinceName"
label=
"所属省份"
align=
"center"
></el-table-column>
<el-table-column
prop=
"cityName"
label=
"所属城市"
align=
"center"
></el-table-column>
<el-table-column
prop=
"countyName"
label=
"所属区县"
align=
"center"
></el-table-column>
<div
slot=
"empty"
>
<div
class=
"table-empty"
>
<img
src=
"../../assets/image/no-content1.png"
>
<p>
没有查询到相关结果
</p>
</div>
</div>
</el-table>
<div
class=
"pagination"
>
<el-pagination
...
...
@@ -601,7 +621,6 @@ export default {
],
projectBegintime
:
[
{
type
:
"date"
,
required
:
true
,
message
:
"请选择时间"
,
trigger
:
"change"
...
...
@@ -609,7 +628,6 @@ export default {
],
projectEndtime
:
[
{
type
:
"date"
,
required
:
true
,
message
:
"请选择时间"
,
trigger
:
"change"
...
...
@@ -650,7 +668,7 @@ export default {
this
.
idTypeValue
=
vm
.
idType
;
if
(
vm
.
idType
==
2
)
{
this
.
activeName
=
"second"
;
this
.
activeName
=
"second"
;
}
this
.
$nextTick
(
function
()
{
//this.getDepartment();
...
...
@@ -1010,7 +1028,6 @@ export default {
});
}
});
}
else
{
//没有选择范围
vm
.
$message
({
...
...
@@ -1022,39 +1039,39 @@ export default {
}
else
{
//外部人员
let
req
=
{
projectId
:
this
.
projectId
,
setKindOfAdministrative
:
0
,
setKindOfOrganization
:
this
.
getKind
(
"organization"
),
setKindOfDepartment
:
this
.
getKind
(
"department"
),
setKindOfPeople
:
this
.
getKind
(
"person"
)
};
if
(
req
.
setKindOfOrganization
==
2
||
req
.
setKindOfOrganization
==
3
)
{
req
.
scopeOfOrganization
=
this
.
getScopeOrganization
(
req
.
setKindOfOrganization
);
}
if
(
req
.
setKindOfDepartment
==
3
)
{
req
.
scopeOfDepartment
=
this
.
getScopeDepartment
();
}
if
(
req
.
setKindOfPeople
==
2
||
req
.
setKindOfPeople
==
3
)
{
req
.
scopeOfPeople
=
this
.
getScopePeople
(
req
.
setKindOfPeople
);
projectId
:
this
.
projectId
,
setKindOfAdministrative
:
0
,
setKindOfOrganization
:
this
.
getKind
(
"organization"
),
setKindOfDepartment
:
this
.
getKind
(
"department"
),
setKindOfPeople
:
this
.
getKind
(
"person"
)
};
if
(
req
.
setKindOfOrganization
==
2
||
req
.
setKindOfOrganization
==
3
)
{
req
.
scopeOfOrganization
=
this
.
getScopeOrganization
(
req
.
setKindOfOrganization
);
}
if
(
req
.
setKindOfDepartment
==
3
)
{
req
.
scopeOfDepartment
=
this
.
getScopeDepartment
();
}
if
(
req
.
setKindOfPeople
==
2
||
req
.
setKindOfPeople
==
3
)
{
req
.
scopeOfPeople
=
this
.
getScopePeople
(
req
.
setKindOfPeople
);
}
vm
.
POST
(
"scope"
,
req
).
then
(
res
=>
{
if
(
res
.
code
==
"000000"
)
{
//移动到选择项目组件
console
.
log
(
res
);
this
.
active
++
;
this
.
stepData
=
[
false
,
false
,
true
];
}
else
{
this
.
$notify
({
title
:
""
,
message
:
res
.
message
});
}
vm
.
POST
(
"scope"
,
req
).
then
(
res
=>
{
if
(
res
.
code
==
"000000"
)
{
//移动到选择项目组件
console
.
log
(
res
);
this
.
active
++
;
this
.
stepData
=
[
false
,
false
,
true
];
}
else
{
this
.
$notify
({
title
:
""
,
message
:
res
.
message
});
}
});
});
}
}
},
...
...
@@ -1225,7 +1242,7 @@ export default {
if
(
this
.
idType
==
1
)
{
this
.
getAdministrative
();
}
else
{
this
.
activeName
=
'second'
;
this
.
activeName
=
"second"
;
this
.
getOrganization
();
}
}
...
...
@@ -1612,7 +1629,7 @@ export default {
}
}
else
if
(
type
==
"administrativeUpdate"
)
{
//console.log(this.allSelectedKeys.length);
if
(
this
.
allSelectedKeys
.
length
>
0
)
{
if
(
this
.
allSelectedKeys
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
this
.
allSelectedKeys
.
length
;
i
++
)
{
scope
+=
this
.
allSelectedKeys
[
i
].
key
+
":"
+
this
.
allSelectedKeys
[
i
].
type
;
...
...
@@ -1621,11 +1638,10 @@ export default {
}
}
}
else
{
let
noChangeTree
=
this
.
getTreeCheck
();
let
noChangeTree
=
this
.
getTreeCheck
();
console
.
log
(
noChangeTree
);
for
(
let
i
=
0
;
i
<
noChangeTree
.
length
;
i
++
)
{
scope
+=
noChangeTree
[
i
].
key
+
":"
+
noChangeTree
[
i
].
type
;
scope
+=
noChangeTree
[
i
].
key
+
":"
+
noChangeTree
[
i
].
type
;
if
(
i
<
noChangeTree
.
length
-
1
)
{
scope
+=
"|"
;
}
...
...
@@ -2019,6 +2035,14 @@ export default {
.second-step
{
margin
:
10px
0
0
20px
;
//隐藏树展开
.table-empty
{
img
{
width
:
100px
;
}
p
{
margin-top
:
-50px
;
}
}
.el-tree-node__expand-icon
{
display
:
none
;
}
...
...
src/views/education/item-manager.vue
浏览文件 @
8a2481c3
...
...
@@ -27,7 +27,7 @@
<el-date-picker
v-model=
"formInline.projectBegintime"
size=
"mini"
type=
"date"
type=
"date
time
"
placeholder=
"请选择开始时间"
value-format=
"yyyy-MM-dd HH:mm:ss"
:picker-options=
"pickerOptions0"
...
...
@@ -39,14 +39,15 @@
<el-date-picker
v-model=
"formInline.projectEndtime"
size=
"mini"
type=
"date"
type=
"date
time
"
placeholder=
"请选择结束时间"
value-format=
"yyyy-MM-dd
23:59:59
"
value-format=
"yyyy-MM-dd
HH:mm:ss
"
:picker-options=
"pickerOptions1"
default-time=
"23:59:59"
></el-date-picker>
</el-form-item>
</el-col>
<el-col
:span=
"
9
"
style=
"padding:0;text-align:right;padding-right:15px;"
>
<el-col
:span=
"
8
"
style=
"padding:0;text-align:right;padding-right:15px;"
>
<el-button
type=
"primary"
size=
"small"
@
click=
"getProjectList"
>
查询
</el-button>
<el-button
type=
"default"
size=
"small"
@
click=
"resetForm"
style=
"margin-left:0;"
>
重置
</el-button>
</el-col>
...
...
@@ -149,6 +150,12 @@
>
删除
</el-button>
</
template
>
</el-table-column>
<div
slot=
"empty"
>
<div
class=
"table-empty"
>
<img
src=
"../../assets/image/no-content1.png"
>
<p>
没有查询到相关结果
</p>
</div>
</div>
</el-table>
<div
class=
"pagination"
>
<el-pagination
...
...
@@ -277,11 +284,11 @@ export default {
let
typeStr
=
parseInt
(
type
);
//console.log("状态:"+projectStatus+ "等级:" + level + " 按钮类型:" + type);
//console.log('idType',idType);
let
buttonStatus
=
''
;
if
(
idType
==
1
)
{
let
buttonStatus
=
""
;
if
(
idType
==
1
)
{
//内部项目
buttonStatus
=
returnData
().
buttonStatusIn
;
}
else
{
}
else
{
//外部项目
buttonStatus
=
returnData
().
buttonStatusOut
;
}
...
...
@@ -404,6 +411,14 @@ export default {
.add-button
{
float
:
right
;
}
.table-empty
{
img
{
width
:
100px
;
}
p
{
margin-top
:
-50px
;
}
}
}
}
</
style
>
\ No newline at end of file
src/views/system/item-role.vue
浏览文件 @
8a2481c3
...
...
@@ -57,10 +57,7 @@
</el-col>
</el-form>
</el-row>
<el-table
:data=
"tableData"
style=
"width: 100%"
>
<el-table
:data=
"tableData"
style=
"width: 100%"
>
<el-table-column
prop=
"userId"
label=
"用户ID"
align=
"center"
></el-table-column>
<el-table-column
prop=
"userName"
label=
"姓名"
align=
"center"
></el-table-column>
<el-table-column
prop=
"projeceRole"
label=
"角色"
align=
"center"
>
...
...
@@ -92,6 +89,12 @@
>
降为普通用户
</el-button>
</
template
>
</el-table-column>
<div
slot=
"empty"
>
<div
class=
"table-empty"
>
<img
src=
"../../assets/image/no-content1.png"
>
<p>
没有查询到相关结果
</p>
</div>
</div>
</el-table>
<div
class=
"pagination"
>
<el-pagination
...
...
@@ -342,6 +345,14 @@ export default {
color
:
#449284
;
}
}
.table-empty
{
img
{
width
:
100px
;
}
p
{
margin-top
:
-50px
;
}
}
}
}
</
style
>
\ No newline at end of file
src/views/system/role.vue
浏览文件 @
8a2481c3
...
...
@@ -15,7 +15,7 @@
<el-date-picker
v-model=
"formInline.projectBegintime"
size=
"mini"
type=
"date"
type=
"date
time
"
placeholder=
"请选择开始时间"
value-format=
"yyyy-MM-dd HH:mm:ss"
:picker-options=
"pickerOptions0"
...
...
@@ -27,10 +27,11 @@
<el-date-picker
v-model=
"formInline.projectEndtime"
size=
"mini"
type=
"date"
type=
"date
time
"
placeholder=
"请选择结束时间"
value-format=
"yyyy-MM-dd
23:59:59
"
value-format=
"yyyy-MM-dd
HH:mm:ss
"
:picker-options=
"pickerOptions1"
default-time=
"23:59:59"
></el-date-picker>
</el-form-item>
</el-col>
...
...
@@ -40,9 +41,7 @@
</el-col>
</el-form>
</el-row>
<el-table
:data=
"tableData"
style=
"width: 100%"
>
<el-table
:data=
"tableData"
style=
"width: 100%"
>
<el-table-column
prop=
"id"
label=
"ID编号"
min-width=
"100"
align=
"center"
></el-table-column>
<el-table-column
prop=
"projectName"
label=
"项目名称"
min-width=
"100"
align=
"center"
></el-table-column>
<el-table-column
prop=
"createdName"
label=
"创建人"
align=
"center"
></el-table-column>
...
...
@@ -59,6 +58,12 @@
<el-button
type=
"primary"
size=
"small"
@
click=
"toPage(scope.row)"
>
查看项目人员
</el-button>
</
template
>
</el-table-column>
<div
slot=
"empty"
>
<div
class=
"table-empty"
>
<img
src=
"../../assets/image/no-content1.png"
>
<p>
没有查询到相关结果
</p>
</div>
</div>
</el-table>
<div
class=
"pagination"
>
<el-pagination
...
...
@@ -100,12 +105,15 @@ export default {
projectEndtime
:
""
,
pageNo
:
1
,
pageSize
:
10
,
type
:
2
,
type
:
2
},
pickerOptions0
:
{
disabledDate
:
time
=>
{
if
(
this
.
formInline
.
projectEndtime
!=
""
)
{
return
time
.
getTime
()
>
new
Date
(
this
.
formInline
.
projectEndtime
).
getTime
();
return
(
time
.
getTime
()
>
new
Date
(
this
.
formInline
.
projectEndtime
).
getTime
()
);
}
}
},
...
...
@@ -180,13 +188,14 @@ export default {
.add-button
{
float
:
right
;
}
// .el-table .cell {
// color: #929292;
// }
// .el-table th > .cell {
// font-weight: bold;
// color: #000;
// }
.table-empty
{
img
{
width
:
100px
;
}
p
{
margin-top
:
-50px
;
}
}
}
}
</
style
>
\ No newline at end of file
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录