|
@@ -75,20 +75,20 @@
|
|
|
</el-select>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div style="width: 100%;margin-bottom: 50px">
|
|
|
+ <div style="width: 100%;margin-bottom: 50px;">
|
|
|
<el-table :data="tableData" :header-cell-style="{borderBottom:'1px dashed #dfe6ec'}" :cell-style="cellStyle"
|
|
|
- style="width: 65%;float: left;"
|
|
|
+ style="width: 68%;float: left;"
|
|
|
>
|
|
|
- <el-table-column prop="name" label="待办事宜" width="360">
|
|
|
+ <el-table-column prop="name" label="待办事宜">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="date" label="时间" width="300"></el-table-column>
|
|
|
- <el-table-column prop="address" label="操作"></el-table-column>
|
|
|
+ <el-table-column prop="date" label="时间"></el-table-column>
|
|
|
+ <el-table-column prop="address" label="操作" width="100"></el-table-column>
|
|
|
</el-table>
|
|
|
<el-table :data="tableDataTwo" :header-cell-style="{borderBottom:'1px dashed #dfe6ec'}" :cell-style="cellStyle"
|
|
|
- style="width: 30%;float: left;margin-left: 20px;margin-right: 20px;"
|
|
|
+ style="width: 30%;float: right;margin-left: 20px;"
|
|
|
>
|
|
|
- <el-table-column prop="noticeTitle" :show-overflow-tooltip="true" label="消息中心" width="260"/>
|
|
|
- <el-table-column prop="address" label="操作">
|
|
|
+ <el-table-column prop="noticeTitle" :show-overflow-tooltip="true" label="消息中心"/>
|
|
|
+ <el-table-column prop="address" label="操作" width="100">
|
|
|
<span @click="bug()" style="cursor:pointer">查看详情</span>
|
|
|
<template slot-scope="scope">
|
|
|
<span @click="bug(scope.row.noticeContent)" style="cursor:pointer">查看详情</span>
|
|
@@ -98,8 +98,8 @@
|
|
|
</div>
|
|
|
<div style="width: 100%;float: left;margin-top:20px;">
|
|
|
<div style="display: flex;">
|
|
|
- <div id="box_s" style="width:100%;height:350px;"></div>
|
|
|
- <div id="box_ss" style="width:100%;height:350px;"></div>
|
|
|
+ <div id="box_s" style="width:68%;height:350px;"></div>
|
|
|
+ <div id="box_ss" style="width:30%;height:350px;margin-left: 20px"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-dialog
|
|
@@ -453,10 +453,11 @@ export default {
|
|
|
|
|
|
<style scoped lang="scss">
|
|
|
.block {
|
|
|
- width: 70%;
|
|
|
+ width: 68%;
|
|
|
float: left;
|
|
|
display: flex;
|
|
|
flex-wrap: wrap;
|
|
|
+ justify-content: space-around;
|
|
|
height: 350px;
|
|
|
|
|
|
li {
|