xjc 4 rokov pred
rodič
commit
4d06b13328

+ 1 - 0
package.json

@@ -19,6 +19,7 @@
     "vue": "^2.6.6",
     "vue-baidu-map": "^0.21.22",
     "vue-router": "^3.0.1",
+    "vuedraggable": "^2.24.3",
     "vuex": "^3.0.1",
     "wangeditor": "^3.1.1"
   },

BIN
src/assets/book.png


BIN
src/assets/book_medium.png


BIN
src/assets/network.png


BIN
src/assets/network_medium.png


BIN
src/assets/图层 4.png


BIN
src/assets/图层 4@2x.png


+ 20 - 0
src/style/home.scss

@@ -208,6 +208,26 @@ tbody{
 		opacity: 0;
 	}
 }
+// 内容区域滚动
+.el-form.over_y{
+    max-height: calc( 100vh - 290px);
+    padding:0 10px;
+    overflow-y:auto;
+    &::-webkit-scrollbar {/*滚动条整体样式*/
+        width:4px;/*高宽分别对应横竖滚动条的尺寸*/
+        height:4px;
+    }
+    &::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+        border-radius:5px;
+        -webkit-box-shadow: inset005pxrgba(0,0,0,0.2);
+        background:rgba(0,0,0,0.2);
+    }
+    &::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        -webkit-box-shadow: inset005pxrgba(0,0,0,0.2);
+        border-radius:0;
+        background:rgba(0,0,0,0.1);
+    }
+}
 // 弹框
 .el-dialog__footer{
 	text-align: center;

+ 122 - 2
src/views/Index.vue

@@ -1,5 +1,125 @@
 <template>
     <section>
-        <p>首页</p>
+        <div class='index_header'>
+            <div class='header-item'>
+                <div class='item-img'>
+                    <img src="../assets/book.png" alt="">
+                    <span class='text'>  期刊总数 <br/><span class='count'>356</span></span>
+                </div>
+                <div class='item-img'>
+                    <img src="../assets/network.png" alt="">
+                    <span class='text'>  文章发布量 <br/><span class='count'>356</span></span>
+                </div>
+            </div>
+            <div class='header-item'>
+                <div class='item-text'>
+                    <div><span class='text'>活动举办次数</span> <span class='count'> 82</span></div>
+                    <div><span class='text'>活动参与次数</span><span class='count'> 82</span></div>
+                </div>
+                <div class='item-text'>
+                     <div><span class='text'>总阅读次数</span><span class='count'> 82</span></div>
+                    <div><span class='text'>转发次数</span><span class='count'> 82</span></div>
+                </div>
+            </div>
+            <div class='header-item'>
+                
+            </div>
+        </div>
+        <div class='index-main'>
+            <div class='main-item'>
+                <div class='item-title'>期刊统计</div>
+                <div class='item-more'>查看更多>></div>
+            </div>
+        </div>
     </section>
-</template>
+</template>
+<script>
+    export default {
+        data(){
+            return {
+
+            }
+        }
+    }
+</script>
+<style lang='scss' scoped>
+    section{
+        // border:1px solid red;
+        width:100%;
+        .index_header{
+            background: #FFFFFF;
+            height:102px;
+            border-radius: 10px;
+            display:flex;
+            align-items: center;
+            
+            .header-item{
+                flex:1;
+                display:flex;
+                justify-content: space-evenly;
+                align-items: center;
+                height:56px;
+                &:not(:last-child){
+                    border-right:1px solid #d8d8d8;
+                }
+                .text{
+                    font-size: 16px;
+                    color: #666666;
+                }
+                .count{
+                    font-size: 32px;
+                }
+                .item-img{
+                    display:flex;
+                    img{
+                        width:56px;
+                        height:56px;
+                        margin-right:30px;
+                    }
+                    .text{
+                        position:relative;
+                        top:-8px;
+                    }
+                    .count{
+                        color: #208CFE;
+                        position:relative;
+                        bottom:-11px;
+                    }
+                }
+                .item-text{
+                    &>div{
+                        display:flex;
+                        align-items: center;
+                        .text{
+                            width:120px;
+                        }
+                    }
+                }
+                
+            }
+            
+        
+        }
+        .index-main{
+            .main-item{
+                margin-top:20px;
+                padding:20px;
+                background: #FFFFFF;
+                border-radius: 10px;
+                position:relative;
+                .item-title{
+                    font-size: 18px;
+                    font-weight: bold;
+                    color: #333333;
+                }
+                .item-more{
+                    position:absolute;
+                    top:20px;
+                    right:20px;
+                    font-size: 14px;
+                    color: #3895FE;
+                }
+            }
+        }
+    }
+</style>

+ 6 - 20
src/views/conference/AddConference.vue

@@ -1,4 +1,4 @@
-<style lang="scss">
+<style lang="scss" scoped>
 .preview {
     .el-form-item {
         margin-bottom: 15px;
@@ -20,22 +20,8 @@
     font-size: 14px;
     font-weight: 400;
     color: #666666;
-    height: calc( 100vh - 300px);
-    padding:0 10px;
-    overflow-y:scroll;
-    &::-webkit-scrollbar {/*滚动条整体样式*/
-        width:4px;/*高宽分别对应横竖滚动条的尺寸*/
-        height:4px;
-    }
-    &::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
-        border-radius:5px;
-        -webkit-box-shadow: inset005pxrgba(0,0,0,0.2);
-        background:rgba(0,0,0,0.2);
-    }
-    &::-webkit-scrollbar-track {/*滚动条里面轨道*/
-        -webkit-box-shadow: inset005pxrgba(0,0,0,0.2);
-        border-radius:0;
-        background:rgba(0,0,0,0.1);
+    .el-select,.el-range-editor--small.el-input__inner{
+        width:100%;
     }
 }
 .el-tabs__header{
@@ -69,7 +55,7 @@
         <p><span>会议管理></span>新增会议</p>
         <div class="content">
             <div class="title">新增会议</div>
-            <el-form size="small" label-width="140px">
+            <el-form size="small" label-width="140px" class='over_y'>
                 <el-form-item label="会议名称:">
                     <el-input
                         placeholder="请输入会议名称"
@@ -90,7 +76,7 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="10" :offset="2">
+                    <el-col :span="10" :offset="4">
                         <el-form-item label="会议时间:">
                             <el-date-picker
                                 v-model="form.time"
@@ -116,7 +102,7 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="10" :offset="2">
+                    <el-col :span="10" :offset="4">
                         <el-form-item label="会议时间:">
                             <el-input placeholder="请输入详细地址" v-model="form.address"></el-input>
                         </el-form-item>

+ 5 - 2
src/views/message/modelForm.vue

@@ -98,6 +98,9 @@
                 border: 1px solid #DDDDDD;
                 box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.13);
                 border-radius: 20px; 
+                .el-form.over_y{
+                    max-height:calc( 100vh - 340px);
+                }
             }
             // label样式
             .edit_label {
@@ -182,7 +185,7 @@
             <div class="content-item middle">
                 <div class='item-title'>编辑模板-{{title}}</div>
 
-                <el-form size="small" label-width="" label-position="top">
+                <el-form size="small" label-width="" label-position="top" class='over_y'>
                     <vuedraggable class="wrapper" v-model="widgetList">
                     <transition-group>
                     <el-form-item v-for="(item,index) in widgetList" :key="index">
@@ -278,7 +281,7 @@
                 <div class='item-main'>
                     <img src="" alt="">
                     <h5 align='center' class="tpl_title">{{title}}</h5>
-                    <el-form ref="form" :model="form" class="tpl_form">
+                    <el-form ref="form" :model="form" class="tpl_form over_y">
                         <el-form-item v-for="(item,index) in widgetList" :key="index" :label="item.label">
                             <el-input v-if="item.type=='input'" v-model="form.label" :placeholder="item.placeholder"></el-input>
                             <el-input v-if="item.type=='textarea'" type="textarea" v-model="form.label" :placeholder="item.placeholder"></el-input>