Commit 7bf678e9 authored by Zhou Yang's avatar Zhou Yang 🍋

日期选择器更换之element

parent b1f23c34
Pipeline #41 failed with stages
...@@ -7,8 +7,16 @@ ...@@ -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}/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}/js/jk/bootstrap-datetimepicker.min.css" type="text/css" rel="stylesheet">
<link href="${rc.contextPath}/css/dropzone.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> <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" /> <!--<link rel="stylesheet" type="text/css" href="${rc.contextPath}/simditor-2.3.23/site/assets/styles/simditor.css" />
...@@ -29,8 +37,8 @@ ...@@ -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/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" 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 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.js"></script>
<script src="${rc.contextPath}/js/jk/bootstrap-datetimepicker.zh-CN.js"></script> <script src="${rc.contextPath}/js/jk/bootstrap-datetimepicker.zh-CN.js"></script>-->
<script src="${rc.contextPath}/js/dropzone.js"></script> <script src="${rc.contextPath}/js/dropzone.js"></script>
...@@ -81,15 +89,18 @@ ...@@ -81,15 +89,18 @@
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" class="form-control" v-model="jgSubject.source" placeholder="来源"/> <input type="text" class="form-control" v-model="jgSubject.source" placeholder="来源"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-2 control-label">发布日期</div> <div class="col-sm-2 control-label">发布日期</div>
<div class="input-group date form_date col-md-9"> <div class="col-sm-10">
<input class="form-control" size="16" type="text" value="" class="form-control" <el-date-picker
placeholder="发布日期" id="pubDate" v-model="jgSubject.pubDate" readonly> v-model="jgSubject.pubDate"
<span class="input-group-addon"> type="date"
<span class="glyphicon glyphicon-remove"></span></span> value-format="yyyy-MM-dd"
</div> format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</div>
<input type="hidden" id="dtp_input2" value="" /><br/> <input type="hidden" id="dtp_input2" value="" /><br/>
</div> </div>
<div class="form-group" v-if="rank !=null"> <div class="form-group" v-if="rank !=null">
...@@ -188,7 +199,7 @@ ...@@ -188,7 +199,7 @@
um.execCommand('forecolor','#000');*/ um.execCommand('forecolor','#000');*/
}); });
$('.form_date').datetimepicker({ /*$('.form_date').datetimepicker({
//年月日 //年月日
format: 'yyyy-mm-dd', format: 'yyyy-mm-dd',
language: 'zh-CN', language: 'zh-CN',
...@@ -203,7 +214,7 @@ ...@@ -203,7 +214,7 @@
$('.form_date').datetimepicker() $('.form_date').datetimepicker()
.on('hide', function (ev) { .on('hide', function (ev) {
vm.jgSubject.pubDate = $("#pubDate").val(); vm.jgSubject.pubDate = $("#pubDate").val();
}); });*/
</script> </script>
</body> </body>
......
...@@ -136,7 +136,8 @@ var vm = new Vue({ ...@@ -136,7 +136,8 @@ var vm = new Vue({
showList: true, showList: true,
title: null, title: null,
jgSubject: { jgSubject: {
rankEntity:{} rankEntity:{},
pubDate:''
}, },
rank:[] rank:[]
}, },
...@@ -193,6 +194,7 @@ var vm = new Vue({ ...@@ -193,6 +194,7 @@ var vm = new Vue({
] ]
}); });
/* ue.ready(function(){ /* ue.ready(function(){
//设置编辑器的内容 //设置编辑器的内容
ue.setContent('helloFFF'); ue.setContent('helloFFF');
...@@ -211,7 +213,8 @@ var vm = new Vue({ ...@@ -211,7 +213,8 @@ var vm = new Vue({
vm.showList = false; vm.showList = false;
vm.title = "新增"; vm.title = "新增";
vm.jgSubject = { vm.jgSubject = {
rankEntity:{} rankEntity:{},
pubDate:''
}; };
vm.jgSubject.flag=0; vm.jgSubject.flag=0;
...@@ -248,7 +251,6 @@ var vm = new Vue({ ...@@ -248,7 +251,6 @@ var vm = new Vue({
saveOrUpdate: function (event) { saveOrUpdate: function (event) {
$('#orgSave').prop('disabled', true); $('#orgSave').prop('disabled', true);
vm.jgSubject.menuId = id ; vm.jgSubject.menuId = id ;
vm.jgSubject.pubDate = $("#pubDate").val();
vm.jgSubject.atta = photo ; vm.jgSubject.atta = photo ;
vm.jgSubject.file = myname ; vm.jgSubject.file = myname ;
//vm.jgSubject.content = UM.getEditor('myEditor').getContent(); //vm.jgSubject.content = UM.getEditor('myEditor').getContent();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment