zt_yangl 4 rokov pred
rodič
commit
c4a86e191c

+ 7 - 4
src/style/home.scss

@@ -107,6 +107,7 @@ $height: 50px;
 	// border: 1px solid red;
 	padding:20px 20px;
 	position: relative;
+	overflow:hidden;
 	section>p{
 		color:#666666;
 		font-size:14px;
@@ -119,8 +120,9 @@ $height: 50px;
 		background: #fff;
 		padding: 20px;
 		margin-top: 12px;
-		min-height: calc(100vh - 190px);
+		height: calc(100vh - 190px);
 		box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
+		// overflow:scroll;
 	}
 	.title_top{
 		
@@ -137,10 +139,11 @@ $height: 50px;
 		}
 	}
 
-    .table_div{
+    .table{
         background: #fff;
-        border: 1px solid #EDEDED;
-        min-height: calc(100vh - 430px);
+        // border: 1px solid #EDEDED;
+		// min-height: calc(100vh - 430px);
+		height:calc(100vh - 350px);
     }
     .edit_btn{
         color: #25486A;

+ 233 - 132
src/views/conference/AddConference.vue

@@ -1,152 +1,253 @@
 <style lang="scss">
-    .preview{
-        .el-form-item{
-            margin-bottom:15px;
-        }
-        label,p{
-            line-height: 25px !important;
-        }
+.preview {
+    .el-form-item {
+        margin-bottom: 15px;
     }
+    label,
+    p {
+        line-height: 25px !important;
+    }
+}
+.content .title {
+    height: 32px;
+    font-size: 14px;
+    font-weight: bold;
+    color: #333333;
+    border-bottom: 1px solid #d8d8d8;
+    margin-bottom: 25px;
+}
+.el-form{
+    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-tabs__header{
+    margin:0;
+    .el-tabs__active-bar{
+        height:0px;
+    }
+    .el-tabs__item{
+        width: 160px;
+        height: 40px;
+        text-align: center;
+        border-radius: 8px 8px 0px 0px;
+        color:#333333;
+        background: #ECECEC;
+        margin-right:10px;
+    }
+    .el-tabs__item.is-active{
+        background: #3895FE;
+        
+        color:#ffffff;
+        
+    }
+}
+.el-button{
+    width:120px;
+    height:36px;
+}
 </style>
 <template>
     <section>
         <p><span>会议管理></span>新增会议</p>
         <div class="content">
-            <div class="filter">
-                <el-form size="small" label-width="70px" :inline="true"  label-position="left">
-                    <el-form-item label="">
-                            <el-input clearable placeholder="请输入标题" v-model="form.name"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button  type="primary">搜索</el-button>
-                    </el-form-item>
-                    <el-form-item style="float:right" >
-                        <el-button @click="dialogVisible=true,dialogTitle='新增调查问卷'" type="primary">发送消息</el-button>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <el-table
-                    class="table"
-                    :data="list" height="57vh"
-                    border  v-loading="loading"
-                    default-expand-all row-key="id"
-                    style="width: 100%">
-                    <el-table-column
-                    prop="name"  
-                    label="标题">
-                    </el-table-column>
-                    <el-table-column
-                    prop="username"  
-                    label="发送者">
-                    </el-table-column>
-                    <el-table-column
-                    prop="username"  
-                    label="接收者">
-                    </el-table-column>
-                    <el-table-column
-                    prop=""  
-                    label="发送时间">
-                    </el-table-column>
-                    <el-table-column  
-                    prop="zip"  width="150"
-                    label="操作">
-                    <template slot-scope="">
-                        <el-button class="edit" type="text" @click="dialogVisible=true,edit=0">编辑</el-button>
-                        <el-button class="del" @click="del" type="text">删除</el-button>
-                    </template>
-                    </el-table-column>
-            </el-table>
-            <Page  ref="pageButton" :current='form.page' :page_size='form.page_size' :total='total' @pageChange='gopage'/>
-        </div>
-
-        <el-dialog
-        :title="dialogTitle" :close-on-click-modal='false'
-        :visible.sync="dialogVisible">
-        <el-form size="small" class="preview" :inline='false' label-width="80px">
-                <el-form-item label="角色名称">
-                    <el-input v-model="form1.name"></el-input>
+            <div class="title">新增会议</div>
+            <el-form size="small" label-width="140px">
+                <el-form-item label="会议名称:">
+                    <el-input
+                        placeholder="请输入会议名称"
+                        v-model="form.name"
+                        clearable
+                    ></el-input>
+                </el-form-item>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="主办方:">
+                            <el-select placeholder="请选择主办方" v-model="form.sponsor">
+                                <el-option
+                                    v-for="(item, index) in optionList"
+                                    :key="index"
+                                    :label="item.name"
+                                    :value="item.id"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10" :offset="2">
+                        <el-form-item label="会议时间:">
+                            <el-date-picker
+                                v-model="form.time"
+                                type="daterange"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="城市:">
+                            <el-select placeholder="请选择城市" v-model="form.city">
+                                <el-option
+                                    v-for="(item, index) in optionList"
+                                    :key="index"
+                                    :label="item.name"
+                                    :value="item.id"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10" :offset="2">
+                        <el-form-item label="会议时间:">
+                            <el-input placeholder="请输入详细地址" v-model="form.address"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-form-item label='会议简介:'>
+                    <el-input type='textarea' v-model="form.introduce" :rows="3" placeholder="请输入会议介绍"></el-input>
+                </el-form-item>
+                <el-form-item label='是否报名:'>
+                    <el-radio-group v-model='form.isEnable'>
+                        <el-radio :label='1'>可报名</el-radio>
+                        <el-radio :label='0'>不可报名</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label='报名需提交信息:'>
+                    <el-checkbox-group v-model='form.info'>
+                        <el-checkbox v-for='(item,index) in InfoList' :key='index' :label='item.id'>{{item.name}}</el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <el-form-item label='是否热门:'>
+                    <el-radio-group v-model='form.isEnable'>
+                        <el-radio :label='1'>热门</el-radio>
+                        <el-radio :label='0'>不热门</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label='是否推荐:'>
+                    <el-radio-group v-model='form.isEnable'>
+                        <el-radio :label='1'>推荐</el-radio>
+                        <el-radio :label='0'>不推荐</el-radio>
+                    </el-radio-group>
                 </el-form-item>
-                <el-form-item label="角色权限">
-                    <!-- <el-input placeholder="请输入内容" v-model="input" class="input-with-select">
-                        <el-button slot="append" icon="el-icon-search"></el-button>
-                    </el-input> -->
-                    <el-tree
-                    :data="data"
-                    show-checkbox
-                    node-key="id" default-expand-all
-                    :props="defaultProps">
-                    </el-tree>
+                <el-form-item label='封面图:'>
+                    <el-upload
+                        action="https://jsonplaceholder.typicode.com/posts/"
+                        list-type="picture-card"
+                        :on-preview="handlePictureCardPreview"
+                        :on-remove="handleRemove">
+                        <i class="el-icon-plus"></i>
+                    </el-upload>
+                    <span style='font-size:12px;color:#999999;'>建议图片尺寸为:210*160</span>
                 </el-form-item>
-                <el-form-item label="角色描述">
-                    <el-input v-model="form1.desc"></el-input>
+                <el-form-item label=''>
+                    <el-tabs v-model="activeName" @tab-click="handleClick">
+                        <el-tab-pane label="会议详情" name="first">
+                            <fuEditor></fuEditor>
+                        </el-tab-pane>
+                        <el-tab-pane label="主讲人" name="second">
+                            <fuEditor></fuEditor>
+                        </el-tab-pane>
+                        <el-tab-pane label="酒店信息" name="third">
+                            <fuEditor></fuEditor>
+                        </el-tab-pane>
+                    </el-tabs>
                 </el-form-item>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-            <el-button size="small" type="primary" @click="dialogVisible = false">确 定</el-button>
-        </span>
-        </el-dialog>
+                <el-form-item>
+                    <el-button type='primary'>预览</el-button>
+                    <el-button type='success'>发布</el-button>
+                    <el-button type='default'>保存并新增</el-button>
+                    <el-button type='default'>保存</el-button>
+                    <el-button type="danger" plain>删除</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
     </section>
 </template>
 <script>
-import Page from '../../components/Page';
+import fuEditor from '../../components/fuEditor'
 export default {
-  components:{
-        Page
-  },
-  data(){
-    return{
-      edit:0,
-      form:{name:'',page:1,page_size:20},
-      form1:{},
-      total:1,
-      list:[{name:'2333'}],
-      loading:false,
-      input:'',
-      dialogVisible:false,
-      dialogTitle:"",
-      defaultProps:{},
-      data: [],
-    }
-  },
-  methods:{
-      gopage(size){
-            if(size){
-                this.form.page_size=size
+    components: {
+        fuEditor,
+    },
+    data() {
+        return {
+            form: {info:[]},
+            optionList: [
+                { name: "成都交通", id: "1" },
+                { name: "成都交通", id: "1" },
+            ],
+            InfoList:[
+                { name: "姓名", id: "1" },
+                { name: "性别", id: "2" },
+                { name: "年龄", id: "3" },
+                { name: "职务", id: "4" },
+                { name: "职称", id: "5" },
+                { name: "职称", id: "5" },
+            ],
+            activeName:'first',
+        };
+    },
+    methods: {
+        handleClick(){
+
+        },
+        gopage(size) {
+            if (size) {
+                this.form.page_size = size;
             }
-            this.form.page=this.$refs.pageButton.page
-            this.getData()
+            this.form.page = this.$refs.pageButton.page;
+            this.getData();
         },
-        getPermissions(){
-            this.$api.getUserPermissions().then(res=>{
-                this.data = res.data.data
-            })
+        getPermissions() {
+            this.$api.getUserPermissions().then((res) => {
+                this.data = res.data.data;
+            });
         },
-        getData(){
-            var parm=this.form;        
-            this.loading=true
-            this.$api.getEnterpriseList(parm).then(res=>{
-                this.list=res.data.data.list;
-                this.total=res.data.data.total
-                this.loading=false
-            })
+        getData() {
+            var parm = this.form;
+            this.loading = true;
+            this.$api.getEnterpriseList(parm).then((res) => {
+                this.list = res.data.data.list;
+                this.total = res.data.data.total;
+                this.loading = false;
+            });
         },
-        del(id){
-                this.$confirm('确定删除吗', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                    this.$api.deleteEnterprise({id:id}).then((res)=>{
-                            this.$message({
-                                message: '删除成功',
-                                type: 'success'
-                            })
-                            this.getData()
-                    })
-                })
+        del(id) {
+            this.$confirm("确定删除吗", "提示", {
+                type: "warning",
+            }).then(() => {
+                this.$api.deleteEnterprise({ id: id }).then((res) => {
+                    this.$message({
+                        message: "删除成功",
+                        type: "success",
+                    });
+                    this.getData();
+                });
+            });
         },
-  },
-  created(){
-    //   this.getPermissions()
-    //   this.getData()
-  }
-}
+    },
+    created() {
+        //   this.getPermissions()
+        //   this.getData()
+    },
+};
 </script>

+ 1 - 1
src/views/conference/Manage.vue

@@ -27,7 +27,7 @@
             </div>
             <el-table
                     class="table"
-                    :data="list" height="57vh"
+                    :data="list"
                     border  v-loading="loading"
                     default-expand-all row-key="id"
                     style="width: 100%">

+ 1 - 1
src/views/message/Message.vue

@@ -27,7 +27,7 @@
             </div>
             <el-table
                     class="table"
-                    :data="list" height="57vh"
+                    :data="list"
                     border  v-loading="loading"
                     default-expand-all row-key="id"
                     style="width: 100%">

+ 1 - 1
src/views/message/investigation.vue

@@ -27,7 +27,7 @@
             </div>
             <el-table
                     class="table"
-                    :data="list" height="57vh"
+                    :data="list"
                     border  v-loading="loading"
                     default-expand-all row-key="id"
                     style="width: 100%">