Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Z
zhgh
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
xufei
zhgh
Commits
7bf678e9
Commit
7bf678e9
authored
Feb 26, 2019
by
Zhou Yang
🍋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
日期选择器更换之element
parent
b1f23c34
Pipeline
#41
failed with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
14 deletions
+27
-14
organization.html
...uts-web/src/main/webapp/WEB-INF/page/jk/organization.html
+22
-11
organization.js
beansprouts-web/src/main/webapp/js/jk/organization.js
+5
-3
No files found.
beansprouts-web/src/main/webapp/WEB-INF/page/jk/organization.html
View file @
7bf678e9
...
...
@@ -7,8 +7,16 @@
<!--
<link href="${rc.contextPath}/statics/plugins/umeditor/themes/default/_css/umeditor.css" type="text/css" rel="stylesheet">
-->
<link
href=
"${rc.contextPath}/js/jk/bootstrap-datetimepicker.min.css"
type=
"text/css"
rel=
"stylesheet"
>
<link
href=
"${rc.contextPath}/css/dropzone.css"
type=
"text/css"
rel=
"stylesheet"
>
<!-- 引入样式 -->
<link
rel=
"stylesheet"
href=
"https://unpkg.com/element-ui/lib/theme-chalk/index.css"
>
<!-- 引入组件库 -->
<script
src=
"https://unpkg.com/element-ui/lib/index.js"
></script>
<script
type=
"text/javascript"
src=
"${rc.contextPath}/statics/plugins/jqgrid/jquery.jqGrid.min.js"
></script>
<!--<link rel="stylesheet" type="text/css" href="${rc.contextPath}/simditor-2.3.23/site/assets/styles/simditor.css" />
...
...
@@ -29,8 +37,8 @@
<script
type=
"text/javascript"
charset=
"utf-8"
src=
"${rc.contextPath}/statics/plugins/umeditor/umeditor.config.js"
></script>
<script
type=
"text/javascript"
charset=
"utf-8"
src=
"${rc.contextPath}/statics/plugins/umeditor/_examples/editor_api.js"
></script>
<script
type=
"text/javascript"
src=
"${rc.contextPath}/statics/plugins/umeditor/lang/zh-cn/zh-cn.js"
></script>
<script
src=
"${rc.contextPath}/js/jk/bootstrap-datetimepicker.js"
></script>
<script
src=
"${rc.contextPath}/js/jk/bootstrap-datetimepicker.zh-CN.js"
></script>
<
!--<
script src="${rc.contextPath}/js/jk/bootstrap-datetimepicker.js"></script>
<script src="${rc.contextPath}/js/jk/bootstrap-datetimepicker.zh-CN.js"></script>
-->
<script
src=
"${rc.contextPath}/js/dropzone.js"
></script>
...
...
@@ -84,11 +92,14 @@
</div>
<div
class=
"form-group"
>
<div
class=
"col-sm-2 control-label"
>
发布日期
</div>
<div
class=
"input-group date form_date col-md-9"
>
<input
class=
"form-control"
size=
"16"
type=
"text"
value=
""
class=
"form-control"
placeholder=
"发布日期"
id=
"pubDate"
v-model=
"jgSubject.pubDate"
readonly
>
<span
class=
"input-group-addon"
>
<span
class=
"glyphicon glyphicon-remove"
></span></span>
<div
class=
"col-sm-10"
>
<el-date-picker
v-model=
"jgSubject.pubDate"
type=
"date"
value-format=
"yyyy-MM-dd"
format=
"yyyy-MM-dd"
placeholder=
"选择日期"
>
</el-date-picker>
</div>
<input
type=
"hidden"
id=
"dtp_input2"
value=
""
/><br/>
</div>
...
...
@@ -188,7 +199,7 @@
um.execCommand('forecolor','#000');*/
});
$
(
'.form_date'
).
datetimepicker
({
/*
$('.form_date').datetimepicker({
//年月日
format: 'yyyy-mm-dd',
language: 'zh-CN',
...
...
@@ -203,7 +214,7 @@
$('.form_date').datetimepicker()
.on('hide', function (ev) {
vm.jgSubject.pubDate = $("#pubDate").val();
});
});
*/
</script>
</body>
...
...
beansprouts-web/src/main/webapp/js/jk/organization.js
View file @
7bf678e9
...
...
@@ -136,7 +136,8 @@ var vm = new Vue({
showList
:
true
,
title
:
null
,
jgSubject
:
{
rankEntity
:{}
rankEntity
:{},
pubDate
:
''
},
rank
:[]
},
...
...
@@ -193,6 +194,7 @@ var vm = new Vue({
]
});
/* ue.ready(function(){
//设置编辑器的内容
ue.setContent('helloFFF');
...
...
@@ -211,7 +213,8 @@ var vm = new Vue({
vm
.
showList
=
false
;
vm
.
title
=
"新增"
;
vm
.
jgSubject
=
{
rankEntity
:{}
rankEntity
:{},
pubDate
:
''
};
vm
.
jgSubject
.
flag
=
0
;
...
...
@@ -248,7 +251,6 @@ var vm = new Vue({
saveOrUpdate
:
function
(
event
)
{
$
(
'#orgSave'
).
prop
(
'disabled'
,
true
);
vm
.
jgSubject
.
menuId
=
id
;
vm
.
jgSubject
.
pubDate
=
$
(
"#pubDate"
).
val
();
vm
.
jgSubject
.
atta
=
photo
;
vm
.
jgSubject
.
file
=
myname
;
//vm.jgSubject.content = UM.getEditor('myEditor').getContent();
...
...
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