simple 3 жил өмнө
parent
commit
afa4d3cb22

+ 22 - 22
src/assets/css/common.scss

@@ -51,28 +51,28 @@ html,body{
 }
 
 //!*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*!
-::-webkit-scrollbar
-{
-    width:10px;
-    height:10px;
-    background-color: #F5F5F5;
-}
-
-//!*定义滚动条轨道 内阴影+圆角*!
-::-webkit-scrollbar-track
-{
-    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-    // border-radius:5px;
-    background-color: #fff;
-}
-
-//!*定义滑块 内阴影+圆角*!
-::-webkit-scrollbar-thumb
-{
-    // border-radius:5px;
-    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.1);
-    background-color: #dfdfdf;
-}
+// ::-webkit-scrollbar
+// {
+//     width:10px;
+//     height:10px;
+//     background-color: #F5F5F5;
+// }
+
+// //!*定义滚动条轨道 内阴影+圆角*!
+// ::-webkit-scrollbar-track
+// {
+//     -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+//     // border-radius:5px;
+//     background-color: #fff;
+// }
+
+// //!*定义滑块 内阴影+圆角*!
+// ::-webkit-scrollbar-thumb
+// {
+//     // border-radius:5px;
+//     -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.1);
+//     background-color: #dfdfdf;
+// }
 
 
 

+ 2 - 2
src/assets/css/ebei_iview.css

@@ -19,7 +19,7 @@ input.ivu-input::-webkit-input-placeholder,
 	width: calc(100% - 1px);
 }
 .main-header .navbar{
-	margin-left: 210px;
+	margin-left: 217px;
 	}
 .ivu-table-cell,.ivu-tabs{
 	color:#2f2f2f
@@ -34,6 +34,6 @@ th .ivu-table-cell{
 /*FireFox*/
 @-moz-document url-prefix() {
     .main-header .navbar{
-		margin-left: 200px;
+		margin-left: 217px;
 	}
 }

+ 1 - 1
src/page/Slider.vue

@@ -97,7 +97,7 @@ export default {
   padding-top: 54px;
   background-color: #484f61 !important;
   width: 217px;
-  overflow-y: scroll;
+  overflow-y: auto;
   height: 100%;
 }
 .main-sidebar::-webkit-scrollbar-track {/*滚动条里面轨道*/

+ 7 - 1
src/page/purchase/purchasePool.vue

@@ -502,12 +502,18 @@ export default {
       areaList.forEach((a) => allArea.push(a.areaId));
       projectList.forEach((a) => allProject.push(a.projectId));
       let postData = {
+        // page: this.pageNum,
+        // pageSize: 50,
         firstClassId: this.searchForm.yjfl,
         secondClassId: this.searchForm.ejfl,
         areaIds: this.searchForm.ssqy,
-        queryText1: this.searchForm.title ? this.searchForm.title : "",
+        queryText1: this.searchForm.title,
         queryText2: this.searchForm.sgjh,
         projectIds: this.searchForm.ssxm,
+        type: this.searchForm.type,
+        purchaserId: this.searchForm.purchaserId,
+        applyMonth: this.searchForm.applyMonth,
+        applicantName: this.searchForm.applicantName,
         // storehouseId: this.searchForm.ck
       };
       if (!this.searchForm.ssqy) {