Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
This commit is contained in:
commit
826dbe2741
|
@ -118,7 +118,7 @@
|
|||
:label="item.title"
|
||||
:name="item.title"
|
||||
>
|
||||
{{item.content}}
|
||||
<iframe :src='ms.manager+"/"+item.url'></iframe>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-main>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
</el-form-item>
|
||||
<el-form-item prop="code" class="ms-admin-form-item ms-admin-form-item-code">
|
||||
<el-input type="text" placeholder='验证码' v-model="loginForm.rand_code" autocomplete="off"></el-input>
|
||||
<img :src="code" class="code-img" @click="code" />
|
||||
<img :src="verifCode" class="code-img" @click="code" />
|
||||
<p><span>看不清?</span><span @click="code">换一张</span></p>
|
||||
</el-form-item>
|
||||
<el-form-item class="ms-admin-form-item ms-admin-form-item-checkout">
|
||||
|
@ -52,7 +52,7 @@ var loginVue = new Vue({
|
|||
managerPassword: "",
|
||||
rand_code: '',
|
||||
},
|
||||
code: ms.manager + "/code?t=" + new Date().getTime(),
|
||||
verifCode: ms.manager + "/code?t=" + new Date().getTime(),
|
||||
rememberPass: '',
|
||||
loginFormRule: {
|
||||
managerName: [{
|
||||
|
@ -97,7 +97,7 @@ var loginVue = new Vue({
|
|||
// 登录
|
||||
checkLogin: function() {
|
||||
var that = this;
|
||||
ms.http.post(ms.manager + "/ms/checkLogin.do", that.loginForm).then(function(data) {
|
||||
ms.http.post(ms.manager + "/checkLogin.do", that.loginForm).then(function(data) {
|
||||
if (data.result) {
|
||||
that.$notify({
|
||||
title: '成功',
|
||||
|
@ -117,12 +117,12 @@ var loginVue = new Vue({
|
|||
})
|
||||
},
|
||||
code: function() {
|
||||
code: ms.manager + "/code?t=" + new Date().getTime();
|
||||
this.verifCode = ms.manager + "/code?t=" + new Date().getTime();
|
||||
},
|
||||
|
||||
},
|
||||
mounted:function(){
|
||||
this.code = ms.manager + "/code?t=" + new Date().getTime()
|
||||
this.verifCode = ms.manager + "/code?t=" + new Date().getTime()
|
||||
}
|
||||
})
|
||||
</script>
|
|
@ -0,0 +1,51 @@
|
|||
<!-- 新建图文 -->
|
||||
<script src="//cdnjs.cloudflare.com/ajax/libs/vue/2.5.2/vue.min.js"></script>
|
||||
<script src="//cdn.jsdelivr.net/npm/sortablejs@1.7.0/Sortable.min.js"></script>
|
||||
<script src="//cdnjs.cloudflare.com/ajax/libs/Vue.Draggable/2.17.0/vuedraggable.min.js"></script>
|
||||
<!-- v-if="menuVue.menuActive == '新建图文'" -->
|
||||
<div id='article'>
|
||||
<el-container>
|
||||
<el-aside width="280px">
|
||||
<draggable v-model="myArray" :options="{draggable:'.item'}">
|
||||
<div v-for="element in myArray" :key="element.id" class="item">
|
||||
{{element.name}}
|
||||
</div>
|
||||
<button slot="footer" @click="addPeople">Add</button>
|
||||
</draggable>
|
||||
</el-aside>
|
||||
<el-main>Main</el-main>
|
||||
</el-container>
|
||||
</div>
|
||||
<script>
|
||||
var articleVue = new Vue({
|
||||
el: '#article',
|
||||
data:{
|
||||
myArray:[{
|
||||
name:'染发个人',
|
||||
id:'001100'
|
||||
},{
|
||||
name:'个问题grew',
|
||||
id:'001100'
|
||||
},{
|
||||
name:'跟他玩过任务',
|
||||
id:'001100'
|
||||
},{
|
||||
name:'供热外国人',
|
||||
id:'001100'
|
||||
},{
|
||||
name:'天文台认为',
|
||||
id:'001100'
|
||||
}]
|
||||
},
|
||||
watch:{
|
||||
myArray:function(n,o){
|
||||
console.log('n',n);
|
||||
}
|
||||
},
|
||||
methods:{
|
||||
addPeople:function(){
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
</script>
|
|
@ -69,6 +69,32 @@ textarea::-webkit-input-placeholder {
|
|||
background-color: #ddd;
|
||||
/*滚动条的背景颜色*/
|
||||
}
|
||||
.ms-container {
|
||||
margin: 12px;
|
||||
height: 100%;
|
||||
padding: 14px 14px 0 14px;
|
||||
background: #fff;
|
||||
}
|
||||
.ms-header {
|
||||
padding: 10px;
|
||||
margin: 0;
|
||||
border-bottom: 1px solid #ddd;
|
||||
background: #fff;
|
||||
height: 50px;
|
||||
}
|
||||
.ms-pagination {
|
||||
padding: 20px 0;
|
||||
text-align: right;
|
||||
}
|
||||
.ms-fr {
|
||||
float: right;
|
||||
}
|
||||
.ms-tr {
|
||||
text-align: right;
|
||||
}
|
||||
.el-button + .el-button {
|
||||
margin-left: 0;
|
||||
}
|
||||
.ms-admin-header {
|
||||
display: flex;
|
||||
padding: 0;
|
||||
|
@ -291,6 +317,15 @@ textarea::-webkit-input-placeholder {
|
|||
padding: 0;
|
||||
background-color: #fff;
|
||||
}
|
||||
.ms-admin-container > .ms-admin-main .ms-admin-tabs {
|
||||
height: 100%;
|
||||
}
|
||||
.ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__content {
|
||||
height: 100%;
|
||||
}
|
||||
.ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__content .el-tab-pane {
|
||||
height: 100%;
|
||||
}
|
||||
.ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-scroll {
|
||||
background: #fafafa;
|
||||
}
|
||||
|
@ -298,3 +333,8 @@ textarea::-webkit-input-placeholder {
|
|||
border-left: none;
|
||||
border-radius: 0;
|
||||
}
|
||||
.ms-admin-container > .ms-admin-main iframe {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border: none !important;
|
||||
}
|
||||
|
|
|
@ -221,6 +221,13 @@
|
|||
background-color: #fff;
|
||||
//选项卡
|
||||
.ms-admin-tabs {
|
||||
height: 100%;
|
||||
.el-tabs__content{
|
||||
height: 100%;
|
||||
.el-tab-pane{
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
.el-tabs__nav-scroll {
|
||||
background: #fafafa;
|
||||
.el-tabs__nav {
|
||||
|
@ -229,5 +236,10 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
// 嵌套iframe
|
||||
iframe{
|
||||
.ms-width-height(100%);
|
||||
border: none !important;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue