a83785e6 by 焦小希

修改侧边栏的样式,优化页面的整体风格

1 parent af213db2
...@@ -265,6 +265,10 @@ ...@@ -265,6 +265,10 @@
265 display: flex; 265 display: flex;
266 align-items: center; 266 align-items: center;
267 } 267 }
268 /*批后管理左侧菜单颜色色的更改*/
269 .el-submenu .el-submenu__title span{
270 color:#00E7FF
271 }
268 .el-menu-vertical-demo .el-submenu .el-submenu__title .el-icon-arrow-down::before { 272 .el-menu-vertical-demo .el-submenu .el-submenu__title .el-icon-arrow-down::before {
269 content: ''; 273 content: '';
270 display: block; 274 display: block;
...@@ -431,7 +435,7 @@ ...@@ -431,7 +435,7 @@
431 </div> 435 </div>
432 <!-- FIXME: left: 160px; => left: 186px; ;right: 24px;bottom: 16px; --> 436 <!-- FIXME: left: 160px; => left: 186px; ;right: 24px;bottom: 16px; -->
433 437
434 <div class="row" id="divContentRight" style="float: left; box-sizing: border-box;display:inline-block;position: fixed;top: 54px;left: 201px;right: 15px;bottom: 0px;;"> 438 <div class="row" id="divContentRight" style="float: left; box-sizing: border-box;display:inline-block;position: fixed;top: 54px;left: 201px;right: 15px;bottom: 0px;background: #fff;">
435 <div id="divFrame"> 439 <div id="divFrame">
436 <%--<div class="the_mask" style="height: 100%;position: absolute;width: 100%;background: black;opacity: 0.8;z-index: 5">这个是图层蒙版</div>--%> 440 <%--<div class="the_mask" style="height: 100%;position: absolute;width: 100%;background: black;opacity: 0.8;z-index: 5">这个是图层蒙版</div>--%>
437 <iframe id="iframecontent" name="syiframe" frameborder="0" scrolling="no" class="tabindex-0" marginwidth="0" style="height: 100%;width: 100%; display:inline-block;"></iframe> 441 <iframe id="iframecontent" name="syiframe" frameborder="0" scrolling="no" class="tabindex-0" marginwidth="0" style="height: 100%;width: 100%; display:inline-block;"></iframe>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 .search{ 21 .search{
22 display: flex; 22 display: flex;
23 justify-content: space-between; 23 justify-content: space-between;
24 background: #ccc; 24 height: 37px;
25 } 25 }
26 .opt{ 26 .opt{
27 display: flex; 27 display: flex;
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
41 } 41 }
42 .el-table{ 42 .el-table{
43 margin-top: 20px; 43 margin-top: 20px;
44 border: 1px solid #cac8c8 44 border: 1px solid #cac8c8;
45 min-height: 750px;
45 } 46 }
46 .el-table th { 47 .el-table th {
47 background:#F2F2F2 !important; 48 background:#F2F2F2 !important;
...@@ -53,12 +54,29 @@ ...@@ -53,12 +54,29 @@
53 float: right; 54 float: right;
54 background: #fff; 55 background: #fff;
55 position: fixed; 56 position: fixed;
56 bottom: 0; 57 bottom: 15px;
57 right: 0; 58 right: 11px;
58 } 59 }
59 .el-table__row{ 60 .el-table__row{
60 cursor: pointer; 61 cursor: pointer;
61 } 62 }
63 .div-search{
64 border: 1px solid #cac8c8;
65 border-radius: 2px;
66 margin-right: 0;
67 width: 280px;
68 height: 30px;
69 margin-left: 10px;
70 margin-left: -120px;
71 margin-top: 3px;
72 }
73 .div-search input{
74 border: none;
75 height: 27px;
76 padding-left: 15px;
77 border-radius: 2px;
78 outline: 0;
79 }
62 </style> 80 </style>
63 </head> 81 </head>
64 <body> 82 <body>
...@@ -77,9 +95,11 @@ ...@@ -77,9 +95,11 @@
77 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button> 95 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button>
78 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button> 96 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button>
79 </div> 97 </div>
80 <div style="float: right"> 98 <div style="float: right" class="div-search">
81 <el-input style="width:300px;margin-right: 20px" placeholder="请输入搜索的内容"></el-input> 99 <!-- <el-input style="width:300px;margin-right: 20px" placeholder="请输入搜索的内容"></el-input>-->
82 <el-button type ="primary" size="mini" icon="el-icon-search">查询</el-button> 100 <!-- <el-button type ="primary" size="mini" icon="el-icon-search">查询</el-button>-->
101 <input id="searchInput" type="text" placeholder="搜索待办项目" style="width: 82%;" v-model="search">
102 <img id="searchBtn" src="../../../../image/projecttask/search.png" style="margin-right: 10px; margin-top: 4px; width: 20px; height: 20px; float: right;">
83 </div> 103 </div>
84 </div> 104 </div>
85 <!-- 表格区域--> 105 <!-- 表格区域-->
......
...@@ -92,7 +92,8 @@ var self = new Vue({ ...@@ -92,7 +92,8 @@ var self = new Vue({
92 clickData(row, column, event) { 92 clickData(row, column, event) {
93 // console.log(row, column, event) 93 // console.log(row, column, event)
94 this.jumpdetailPage(row); 94 this.jumpdetailPage(row);
95 },// 详情 95 },
96 // 详情
96 jumpdetailPage(data) { 97 jumpdetailPage(data) {
97 var taskid = data.TASKID; 98 var taskid = data.TASKID;
98 var detailType = data.detailType; 99 var detailType = data.detailType;
......
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
21 .search{ 21 .search{
22 display: flex; 22 display: flex;
23 justify-content: space-between; 23 justify-content: space-between;
24 background: #ccc; 24 /*background: #cccc;*/
25 height: 37px;
25 } 26 }
26 .opt{ 27 .opt{
27 display: flex; 28 display: flex;
...@@ -41,7 +42,9 @@ ...@@ -41,7 +42,9 @@
41 } 42 }
42 .el-table{ 43 .el-table{
43 margin-top: 20px; 44 margin-top: 20px;
44 border: 1px solid #cac8c8 45 border: 1px solid #cac8c8;
46 min-height: 750px;
47
45 } 48 }
46 .el-table th { 49 .el-table th {
47 background:#F2F2F2 !important; 50 background:#F2F2F2 !important;
...@@ -53,12 +56,29 @@ ...@@ -53,12 +56,29 @@
53 float: right; 56 float: right;
54 background: #fff; 57 background: #fff;
55 position: fixed; 58 position: fixed;
56 bottom: 0; 59 bottom: 15px;
57 right: 0; 60 right: 11px;
58 } 61 }
59 .el-table__row{ 62 .el-table__row{
60 cursor: pointer; 63 cursor: pointer;
61 } 64 }
65 .div-search{
66 border: 1px solid #cac8c8;
67 border-radius: 2px;
68 margin-right: 0;
69 width: 280px;
70 height: 30px;
71 margin-left: 10px;
72 margin-left: -120px;
73 margin-top: 3px;
74 }
75 .div-search input{
76 border: none;
77 height: 27px;
78 padding-left: 15px;
79 border-radius: 2px;
80 outline: 0;
81 }
62 </style> 82 </style>
63 </head> 83 </head>
64 <body> 84 <body>
...@@ -77,9 +97,11 @@ ...@@ -77,9 +97,11 @@
77 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610d86125b9a801612600a4c60003','1')">添加</el-button> 97 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610d86125b9a801612600a4c60003','1')">添加</el-button>
78 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button> 98 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button>
79 </div> 99 </div>
80 <div style="float: right"> 100 <div style="float: right" class="div-search" >
81 <el-input style="width:300px;margin-right: 20px" placeholder="请输入搜索的内容"></el-input> 101 <!-- <el-input style="width:300px;margin-right: 20px" placeholder="请输入搜索的内容"></el-input>-->
82 <el-button type ="primary" size="mini" icon="el-icon-search">查询</el-button> 102 <!-- <el-button type ="primary" size="mini" icon="el-icon-search">查询</el-button>-->
103 <input id="searchInput" type="text" placeholder="搜索待办项目" style="width: 82%;" v-model="search">
104 <img id="searchBtn" src="../../../../image/projecttask/search.png" style="margin-right: 10px; margin-top: 4px; width: 20px; height: 20px; float: right;">
83 </div> 105 </div>
84 </div> 106 </div>
85 <!-- 表格区域--> 107 <!-- 表格区域-->
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 .search{ 21 .search{
22 display: flex; 22 display: flex;
23 justify-content: space-between; 23 justify-content: space-between;
24 background: #ccc; 24 height: 37px;
25 } 25 }
26 .opt{ 26 .opt{
27 display: flex; 27 display: flex;
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
41 } 41 }
42 .el-table{ 42 .el-table{
43 margin-top: 20px; 43 margin-top: 20px;
44 border: 1px solid #cac8c8 44 border: 1px solid #cac8c8;
45 min-height:750px
45 } 46 }
46 .el-table th { 47 .el-table th {
47 background:#F2F2F2 !important; 48 background:#F2F2F2 !important;
...@@ -53,12 +54,29 @@ ...@@ -53,12 +54,29 @@
53 float: right; 54 float: right;
54 background: #fff; 55 background: #fff;
55 position: fixed; 56 position: fixed;
56 bottom: 0; 57 bottom: 15px;
57 right: 0; 58 right: 11px;
58 } 59 }
59 .el-table__row{ 60 .el-table__row{
60 cursor: pointer; 61 cursor: pointer;
61 } 62 }
63 .div-search{
64 border: 1px solid #cac8c8;
65 border-radius: 2px;
66 margin-right: 0;
67 width: 280px;
68 height: 30px;
69 margin-left: 10px;
70 margin-left: -120px;
71 margin-top: 3px;
72 }
73 .div-search input{
74 border: none;
75 height: 27px;
76 padding-left: 15px;
77 border-radius: 2px;
78 outline: 0;
79 }
62 </style> 80 </style>
63 </head> 81 </head>
64 <body> 82 <body>
...@@ -77,9 +95,11 @@ ...@@ -77,9 +95,11 @@
77 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button> 95 <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button>
78 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button> 96 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button>
79 </div> 97 </div>
80 <div style="float: right"> 98 <div style="float: right" class="div-search">
81 <el-input style="width:300px;margin-right: 20px" placeholder="请输入搜索的内容"></el-input> 99 <!-- <el-input style="width:300px;margin-right: 20px" placeholder="请输入搜索的内容"></el-input>-->
82 <el-button type ="primary" size="mini" icon="el-icon-search">查询</el-button> 100 <!-- <el-button type ="primary" size="mini" icon="el-icon-search">查询</el-button>-->
101 <input id="searchInput" type="text" placeholder="搜索待办项目" style="width: 82%;" v-model="search">
102 <img id="searchBtn" src="../../../../image/projecttask/search.png" style="margin-right: 10px; margin-top: 4px; width: 20px; height: 20px; float: right;">
83 </div> 103 </div>
84 </div> 104 </div>
85 <!-- 表格区域--> 105 <!-- 表格区域-->
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 .search{ 22 .search{
23 display: flex; 23 display: flex;
24 justify-content: space-between; 24 justify-content: space-between;
25 background: #ccc; 25 height: 37px;
26 } 26 }
27 .opt{ 27 .opt{
28 display: flex; 28 display: flex;
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
42 } 42 }
43 .el-table{ 43 .el-table{
44 margin-top: 20px; 44 margin-top: 20px;
45 min-height: 750px;
45 } 46 }
46 .el-table th { 47 .el-table th {
47 background:#F2F2F2 !important; 48 background:#F2F2F2 !important;
...@@ -56,8 +57,8 @@ ...@@ -56,8 +57,8 @@
56 float: right; 57 float: right;
57 background: #fff; 58 background: #fff;
58 position: fixed; 59 position: fixed;
59 bottom: 0; 60 bottom: 15px;
60 right: 0; 61 right: 11px;
61 } 62 }
62 .el-table__row{ 63 .el-table__row{
63 cursor: pointer; 64 cursor: pointer;
...@@ -65,6 +66,23 @@ ...@@ -65,6 +66,23 @@
65 .el-table__row{ 66 .el-table__row{
66 cursor: pointer; 67 cursor: pointer;
67 } 68 }
69 .div-search{
70 border: 1px solid #cac8c8;
71 border-radius: 2px;
72 margin-right: 0;
73 width: 280px;
74 height: 30px;
75 margin-left: 10px;
76 margin-left: -120px;
77 margin-top: 3px;
78 }
79 .div-search input{
80 border: none;
81 height: 27px;
82 padding-left: 15px;
83 border-radius: 2px;
84 outline: 0;
85 }
68 </style> 86 </style>
69 </head> 87 </head>
70 <body> 88 <body>
...@@ -83,9 +101,11 @@ ...@@ -83,9 +101,11 @@
83 <!-- <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button>--> 101 <!-- <el-button v-show="isActive == 5" type ="primary" size="mini" @click="openHandleJumpUrl('t1001_8a8610de737b99270173937337e00133','1')">添加</el-button>-->
84 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button> 102 <el-button v-show="isActive == 5" type ="primary" size="mini">删除</el-button>
85 </div> 103 </div>
86 <div style="float: right"> 104 <div style="float: right" class="div-search">
87 <el-input style="width:300px;margin-right: 20px" placeholder="请输入搜索的内容"></el-input> 105 <!-- <el-input style="width:300px;margin-right: 20px" placeholder="请输入搜索的内容"></el-input>-->
88 <el-button type ="primary" size="mini" icon="el-icon-search">查询</el-button> 106 <!-- <el-button type ="primary" size="mini" icon="el-icon-search">查询</el-button>-->
107 <input id="searchInput" type="text" placeholder="搜索待办项目" style="width: 82%;" v-model="search">
108 <img id="searchBtn" src="../../../../image/projecttask/search.png" style="margin-right: 10px; margin-top: 4px; width: 20px; height: 20px; float: right;">
89 </div> 109 </div>
90 </div> 110 </div>
91 <!-- 表格区域--> 111 <!-- 表格区域-->
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <script type="text/javascript" src="/frontweb/common/js/global/global.modelctls.js"></script> 14 <script type="text/javascript" src="/frontweb/common/js/global/global.modelctls.js"></script>
15 <style> 15 <style>
16 .contanier{ 16 .contanier{
17 margin:10px 10px 0 10px; 17 margin:-20px 10px 0 10px;
18 height:100%; 18 height:100%;
19 background: #fff; 19 background: #fff;
20 } 20 }
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
28 margin-top: 20px; 28 margin-top: 20px;
29 } 29 }
30 .el-table{ 30 .el-table{
31 border: 1px solid #cac8c8 31 border: 1px solid #cac8c8;
32 min-height:750px
32 } 33 }
33 .el-table th { 34 .el-table th {
34 background:#F2F2F2 !important; 35 background:#F2F2F2 !important;
...@@ -40,8 +41,8 @@ ...@@ -40,8 +41,8 @@
40 float: right; 41 float: right;
41 background: #fff; 42 background: #fff;
42 position: fixed; 43 position: fixed;
43 bottom: 0; 44 bottom: 15px;
44 right: 0; 45 right: 11px;
45 } 46 }
46 .el-pagination__jump{ 47 .el-pagination__jump{
47 margin-top: -15px; 48 margin-top: -15px;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <script type="text/javascript" src="/frontweb/common/js/global/global.modelctls.js"></script> 14 <script type="text/javascript" src="/frontweb/common/js/global/global.modelctls.js"></script>
15 <style> 15 <style>
16 .contanier{ 16 .contanier{
17 margin:10px 10px 0 10px; 17 margin:-20px 10px 0 10px;
18 height:100%; 18 height:100%;
19 background: #fff; 19 background: #fff;
20 } 20 }
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
31 background:#F2F2F2 !important; 31 background:#F2F2F2 !important;
32 } 32 }
33 .el-table{ 33 .el-table{
34 border: 1px solid #cac8c8 34 border: 1px solid #cac8c8;
35 min-height: 750px;
35 } 36 }
36 .el-table tbody tr:hover>td { 37 .el-table tbody tr:hover>td {
37 background-color:#EEF9FF!important 38 background-color:#EEF9FF!important
...@@ -40,8 +41,8 @@ ...@@ -40,8 +41,8 @@
40 float: right; 41 float: right;
41 background: #fff; 42 background: #fff;
42 position: fixed; 43 position: fixed;
43 bottom: 0; 44 bottom: 15px;
44 right: 0; 45 right: 11px;
45 } 46 }
46 .el-pagination__jump{ 47 .el-pagination__jump{
47 margin-top: -15px; 48 margin-top: -15px;
...@@ -76,7 +77,7 @@ ...@@ -76,7 +77,7 @@
76 width: 280px; 77 width: 280px;
77 height: 30px; 78 height: 30px;
78 margin-left: 10px; 79 margin-left: 10px;
79 margin-left: -120px; 80 margin-left: -200px;
80 margin-top: 18px; 81 margin-top: 18px;
81 } 82 }
82 .div-search input{ 83 .div-search input{
......