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
提交
22e419da
提交
22e419da
编写于
3月 13, 2019
作者:
zhentian.jia
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
角色管理页对接接口
上级
e89c6c30
变更
3
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
128 行增加
和
94 行删除
+128
-94
add-manager.vue
src/views/education/add-manager.vue
+45
-27
item-role.vue
src/views/system/item-role.vue
+1
-1
role.vue
src/views/system/role.vue
+82
-66
未找到文件。
src/views/education/add-manager.vue
浏览文件 @
22e419da
...
@@ -23,28 +23,19 @@
...
@@ -23,28 +23,19 @@
<el-form
ref=
"formData"
:model=
"formData"
:rules=
"rules"
label-width=
"150px"
>
<el-form
ref=
"formData"
:model=
"formData"
:rules=
"rules"
label-width=
"150px"
>
<el-form-item
label=
"项目名称:"
prop=
"projectName"
>
<el-form-item
label=
"项目名称:"
prop=
"projectName"
>
<el-col
:span=
"13"
>
<el-col
:span=
"13"
>
<el-input
v-model=
"formData.projectName"
placeholder=
"请输入项目名称"
></el-input>
<el-input
size=
"mini"
v-model=
"formData.projectName"
placeholder=
"请输入项目名称"
></el-input>
</el-col>
</el-col>
</el-form-item>
</el-form-item>
<el-form-item
label=
"项目时间:"
required
>
<el-form-item
label=
"项目时间:"
required
>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
prop=
"
projectBegint
ime"
>
<el-form-item
prop=
"
duringT
ime"
>
<el-date-picker
<el-date-picker
type=
"date"
size=
"mini"
placeholder=
"请选择项目时间"
type=
"daterange"
v-model=
"formData.projectBegintime"
start-placeholder=
"请选择项目开始时间"
style=
"width: 100%;"
end-placeholder=
"请选择项目结束时间"
></el-date-picker>
v-model=
"formData.duringTime"
</el-form-item>
value-format=
"yyyy-MM-dd HH:mm:ss"
</el-col>
<el-col
:span=
"1"
>
~
</el-col>
<el-col
:span=
"6"
>
<el-form-item
prop=
"projectEndtime"
>
<el-date-picker
type=
"date"
placeholder=
"请选择项目时间"
v-model=
"formData.projectEndtime"
style=
"width: 100%;"
></el-date-picker>
></el-date-picker>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -52,6 +43,7 @@
...
@@ -52,6 +43,7 @@
<el-form-item
label=
"项目简介:"
prop=
"projectIntro"
>
<el-form-item
label=
"项目简介:"
prop=
"projectIntro"
>
<el-col
:span=
"13"
>
<el-col
:span=
"13"
>
<el-input
<el-input
size=
"mini"
type=
"textarea"
type=
"textarea"
:autosize=
"
{ minRows: 5}"
:autosize=
"
{ minRows: 5}"
placeholder="请输入项目简介"
placeholder="请输入项目简介"
...
@@ -82,13 +74,14 @@
...
@@ -82,13 +74,14 @@
</el-upload>
</el-upload>
</el-form-item>
</el-form-item>
<el-form-item
label=
"封面类型:"
>
<el-form-item
label=
"封面类型:"
>
<el-radio-group
v-model=
"formData.type"
>
<el-radio-group
size=
"mini"
v-model=
"formData.type"
>
<el-radio
:label=
"1"
>
图片
</el-radio>
<el-radio
:label=
"1"
>
图片
</el-radio>
<el-radio
:label=
"2"
>
视频
</el-radio>
<el-radio
:label=
"2"
>
视频
</el-radio>
</el-radio-group>
</el-radio-group>
</el-form-item>
</el-form-item>
<el-form-item
label=
"封面图片(视频):"
prop=
"attachmentUrl2"
>
<el-form-item
label=
"封面图片(视频):"
prop=
"attachmentUrl2"
>
<el-upload
<el-upload
size=
"mini"
v-model=
"formData.attachmentUrl2"
v-model=
"formData.attachmentUrl2"
class=
"bg-uploader"
class=
"bg-uploader"
action=
"#"
action=
"#"
...
@@ -383,6 +376,7 @@ export default {
...
@@ -383,6 +376,7 @@ export default {
projectName
:
""
,
projectName
:
""
,
projectBegintime
:
""
,
projectBegintime
:
""
,
projectEndtime
:
""
,
projectEndtime
:
""
,
duringTime
:
""
,
projectIntro
:
""
,
projectIntro
:
""
,
type
:
1
,
type
:
1
,
attachmentUrl1
:
""
,
attachmentUrl1
:
""
,
...
@@ -470,6 +464,13 @@ export default {
...
@@ -470,6 +464,13 @@ export default {
trigger
:
"blur"
trigger
:
"blur"
}
}
],
],
duringTime
:
[
{
required
:
true
,
message
:
"请选择时间"
,
trigger
:
"change"
}
],
projectBegintime
:
[
projectBegintime
:
[
{
{
type
:
"date"
,
type
:
"date"
,
...
@@ -540,16 +541,22 @@ export default {
...
@@ -540,16 +541,22 @@ export default {
this
.
$refs
[
formName
].
resetFields
();
this
.
$refs
[
formName
].
resetFields
();
},
},
//编辑管理
//编辑管理
editManager
()
{
editManager
(
data
)
{
let
req
=
{};
let
projectId
=
23
;
vm
.
GET
(
"portalInfo/getProjectInfo/"
+
projectId
,
req
).
then
(
res
=>
{
if
(
res
.
code
==
"000000"
)
{
console
.
log
(
res
);
}
});
},
},
//编辑/更新 基础信息
//编辑/更新 基础信息
insertOrUpdate
()
{
insertOrUpdate
()
{
//console.log(this.formData);
//console.log(this.formData);
let
projectModel
=
{
let
projectModel
=
{
projectName
:
this
.
formData
.
projectName
,
projectName
:
this
.
formData
.
projectName
,
projectBegintime
:
Date
.
parse
(
this
.
formData
.
projectBegintime
)
/
1000
,
projectBegintime
:
this
.
formData
.
projectBegintime
,
projectEndtime
:
Date
.
parse
(
this
.
formData
.
projectEndtime
)
/
1000
,
projectEndtime
:
this
.
formData
.
projectEndtime
,
projectIntro
:
this
.
formData
.
projectIntro
projectIntro
:
this
.
formData
.
projectIntro
};
};
let
attachmentModel
=
[
let
attachmentModel
=
[
...
@@ -676,13 +683,24 @@ export default {
...
@@ -676,13 +683,24 @@ export default {
if
(
this
.
active
==
0
)
{
if
(
this
.
active
==
0
)
{
let
formName
=
"formData"
;
let
formName
=
"formData"
;
let
removeState
=
this
.
submitForm
(
formName
);
let
removeState
=
this
.
submitForm
(
formName
);
console
.
log
(
"判断移动"
+
removeState
);
console
.
log
(
"判断移动"
+
removeState
);
if
(
removeState
===
true
)
{
if
(
removeState
===
true
)
{
//移动到第二页 选择范围
//校验名字
this
.
insertOrUpdate
();
let
param
=
{
this
.
active
++
;
projectName
:
this
.
formData
.
projectName
this
.
stepData
=
[
false
,
true
,
false
];
};
this
.
checkAllTable
();
vm
.
GET
(
"portalInfo/checkProjectName"
,
param
).
then
(
res
=>
{
if
(
res
.
code
==
"000000"
)
{
//移动到第二页 选择范围
this
.
insertOrUpdate
();
this
.
active
++
;
this
.
stepData
=
[
false
,
true
,
false
];
this
.
checkAllTable
();
}
else
{
this
.
$message
.
error
(
"项目名称"
+
res
.
message
);
}
});
}
}
}
else
if
(
this
.
active
==
1
)
{
}
else
if
(
this
.
active
==
1
)
{
let
removeState
=
true
;
let
removeState
=
true
;
...
...
src/views/system/item-role.vue
浏览文件 @
22e419da
...
@@ -95,7 +95,7 @@ export default {
...
@@ -95,7 +95,7 @@ export default {
},
},
};
};
},
},
create
()
{},
create
d
()
{},
methods
:
{
methods
:
{
toPage
()
{
toPage
()
{
this
.
$router
.
push
(
"item-role"
);
this
.
$router
.
push
(
"item-role"
);
...
...
src/views/system/role.vue
浏览文件 @
22e419da
...
@@ -4,28 +4,28 @@
...
@@ -4,28 +4,28 @@
<div
class=
"component-content screenSet"
>
<div
class=
"component-content screenSet"
>
<div
class=
"header-title"
>
查询条件
</div>
<div
class=
"header-title"
>
查询条件
</div>
<el-row
:gutter=
"30"
class=
"row"
type=
"flex"
style=
"margin-top: 10px;"
>
<el-row
:gutter=
"30"
class=
"row"
type=
"flex"
style=
"margin-top: 10px;"
>
<el-form
<el-form
ref=
"formInline"
:model=
"formInline"
label-width=
"75px"
style=
"width:100%;"
>
:inline=
"true"
:model=
"formInline"
class=
"demo-form-inline"
label-width=
"75px"
style=
"width:100%;"
>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"项目名称:"
>
<el-form-item
label=
"项目名称:"
>
<el-input
v-model=
"formInline.
n
ame"
size=
"mini"
placeholder=
"审批人"
></el-input>
<el-input
v-model=
"formInline.
projectN
ame"
size=
"mini"
placeholder=
"审批人"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-form-item
label=
"项目时间:"
>
<el-col
:span=
"6"
>
<el-date-picker
v-model=
"formInline.startDates"
size=
"mini"
type=
"date"
placeholder=
"请选择开始时间"
></el-date-picker>
<el-form-item
label=
"项目时间:"
>
<el-date-picker
v-model=
"formInline.endDate"
size=
"mini"
type=
"date"
placeholder=
"请选择结束时间"
></el-date-picker>
<el-date-picker
</el-form-item>
size=
"mini"
<el-form-item
class=
"to-right"
>
type=
"daterange"
<el-button
size=
"small"
plain
>
重置
</el-button>
start-placeholder=
"请选择项目开始时间"
</el-form-item>
end-placeholder=
"请选择项目结束时间"
<el-form-item
class=
"to-right"
>
v-model=
"formInline.duringTime"
<el-button
size=
"small"
type=
"primary"
>
查询
</el-button>
value-format=
"yyyy-MM-dd HH:mm:ss"
</el-form-item>
></el-date-picker>
</el-form-item>
</el-col>
<el-col
:span=
"12"
style=
"padding:0;text-align:right;padding-right:15px;"
>
<el-button
type=
"primary"
size=
"small"
@
click=
"search"
>
查询
</el-button>
<el-button
type=
"default"
size=
"small"
@
click=
"reseat"
style=
"margin-left:0;"
>
重置
</el-button>
</el-col>
</el-form>
</el-form>
</el-row>
</el-row>
<el-table
<el-table
...
@@ -33,14 +33,17 @@
...
@@ -33,14 +33,17 @@
:data=
"tableData"
:data=
"tableData"
:header-cell-style=
"
{background:'#FAFAFA',color:'#000'}"
:header-cell-style=
"
{background:'#FAFAFA',color:'#000'}"
>
>
<el-table-column
prop=
"id"
label=
"ID编号"
width=
"140"
align=
"center"
></el-table-column>
<el-table-column
prop=
"createdId"
label=
"ID编号"
min-width=
"100"
align=
"center"
></el-table-column>
<el-table-column
prop=
"projectName"
label=
"项目名称"
min-width=
"120"
align=
"center"
></el-table-column>
<el-table-column
prop=
"projectName"
label=
"项目名称"
min-width=
"100"
align=
"center"
></el-table-column>
<el-table-column
prop=
"createName"
label=
"创建人"
align=
"center"
></el-table-column>
<el-table-column
prop=
"createdName"
label=
"创建人"
align=
"center"
></el-table-column>
<el-table-column
prop=
"projectBrief"
label=
"项目简介"
align=
"center"
></el-table-column>
<el-table-column
prop=
"projectIntro"
label=
"项目简介"
align=
"center"
></el-table-column>
<el-table-column
prop=
"address"
label=
"所属地区"
align=
"center"
></el-table-column>
<el-table-column
prop=
"projectBegintime"
label=
"项目开始时间"
align=
"center"
></el-table-column>
<el-table-column
prop=
"startTime"
label=
"项目开始时间"
align=
"center"
></el-table-column>
<el-table-column
prop=
"projectEndtime"
label=
"项目结束时间"
align=
"center"
></el-table-column>
<el-table-column
prop=
"endTime"
label=
"项目结束时间"
align=
"center"
></el-table-column>
<el-table-column
prop=
"projectStatus"
label=
"状态"
align=
"center"
>
<el-table-column
prop=
"state"
label=
"状态"
align=
"center"
></el-table-column>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
projectStatus
|
statusProject
}}
</span>
</
template
>
</el-table-column>
<el-table-column
fixed=
"right"
label=
"操作"
width=
"200"
align=
"center"
>
<el-table-column
fixed=
"right"
label=
"操作"
width=
"200"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"primary"
size=
"small"
@
click=
"toPage(scope)"
>
查看项目人员
</el-button>
<el-button
type=
"primary"
size=
"small"
@
click=
"toPage(scope)"
>
查看项目人员
</el-button>
...
@@ -52,11 +55,11 @@
...
@@ -52,11 +55,11 @@
background
background
@
size-change=
"handleSizeChange"
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
@
current-change=
"handleCurrentChange"
:current-page=
"
currentPage
"
:current-page=
"
formInline.pageNo
"
:page-sizes=
"[10
0, 200, 300, 4
00]"
:page-sizes=
"[10
, 30, 50, 1
00]"
:page-size=
"
100
"
:page-size=
"
formInline.pageSize
"
layout=
"total, sizes, prev, pager, next, jumper"
layout=
"total, sizes, prev, pager, next, jumper"
:total=
"
400
"
:total=
"
totalRows
"
></el-pagination>
></el-pagination>
</div>
</div>
</div>
</div>
...
@@ -65,6 +68,7 @@
...
@@ -65,6 +68,7 @@
<
script
>
<
script
>
import
BreadCrumb
from
"../../components/breadcrumb.vue"
;
import
BreadCrumb
from
"../../components/breadcrumb.vue"
;
import
{
create
}
from
"domain"
;
import
{
create
}
from
"domain"
;
let
vm
=
null
;
export
default
{
export
default
{
components
:
{
components
:
{
BreadCrumb
BreadCrumb
...
@@ -87,47 +91,59 @@ export default {
...
@@ -87,47 +91,59 @@ export default {
loading
:
false
,
loading
:
false
,
timingTime
:
""
,
timingTime
:
""
,
currentPage
:
1
,
currentPage
:
1
,
duringTime
:
0
,
totalRows
:
0
,
formInline
:
{
formInline
:
{
name
:
""
,
projectName
:
""
,
startDate
:
""
,
projectBegintime
:
""
,
endDate
:
""
,
projectEndtime
:
""
,
type
:
""
duringTime
:
""
,
},
pageNo
:
1
,
pickerOptions
:
{
pageSize
:
10
shortcuts
:
[
{
text
:
"最近一周"
,
onClick
(
picker
)
{
const
end
=
new
Date
();
const
start
=
new
Date
();
start
.
setTime
(
start
.
getTime
()
-
3600
*
1000
*
24
*
7
);
picker
.
$emit
(
"pick"
,
[
start
,
end
]);
}
},
{
text
:
"最近一个月"
,
onClick
(
picker
)
{
const
end
=
new
Date
();
const
start
=
new
Date
();
start
.
setTime
(
start
.
getTime
()
-
3600
*
1000
*
24
*
30
);
picker
.
$emit
(
"pick"
,
[
start
,
end
]);
}
},
{
text
:
"最近三个月"
,
onClick
(
picker
)
{
const
end
=
new
Date
();
const
start
=
new
Date
();
start
.
setTime
(
start
.
getTime
()
-
3600
*
1000
*
24
*
90
);
picker
.
$emit
(
"pick"
,
[
start
,
end
]);
}
}
]
}
}
};
};
},
},
create
()
{},
created
()
{
vm
=
this
;
this
.
search
();
},
methods
:
{
methods
:
{
setParam
(
data
)
{
let
param
=
{};
if
(
data
.
duringTime
!==
null
&&
data
.
duringTime
!==
""
&&
data
.
duringTime
[
0
]
!==
null
&&
data
.
duringTime
[
1
]
!==
null
)
{
param
.
projectBegintime
=
data
.
duringTime
[
0
];
param
.
projectEndtime
=
data
.
duringTime
[
1
];
}
for
(
let
key
in
data
)
{
if
(
key
!==
"duringTime"
&&
key
!==
"projectBegintime"
&&
key
!==
"projectEndtime"
)
{
param
[
key
]
=
data
[
key
];
}
}
console
.
log
(
param
);
return
param
;
},
search
()
{
let
req
=
{};
console
.
log
(
this
.
formInline
);
req
=
this
.
setParam
(
this
.
formInline
);
vm
.
GET
(
"portalInfo/getProjectList"
,
req
).
then
(
res
=>
{
if
(
res
.
code
==
"000000"
)
{
vm
.
tableData
=
res
.
data
.
data
;
vm
.
totalRows
=
res
.
data
.
totalRows
;
this
.
loading
=
false
;
}
});
},
reseat
()
{},
toPage
()
{
toPage
()
{
this
.
$router
.
push
(
"item-role"
);
this
.
$router
.
push
(
"item-role"
);
},
},
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录