Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
0425b0b5 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents ac783df5 c8f5310b
Inline Side-by-side
Showing 6 changed files with 23 additions and 9 deletions
...@@ -219,7 +219,8 @@ export default { ...@@ -219,7 +219,8 @@ export default {
219 width: 16px; 219 width: 16px;
220 left: 9px; 220 left: 9px;
221 top: 9px; 221 top: 9px;
222 background: #c3c5c8; 222 background: url('../../assets/images/rowline.png');
223 background-position-y: center;
223 } 224 }
224 .third_layer::before { 225 .third_layer::before {
225 content: ""; 226 content: "";
...@@ -238,7 +239,8 @@ export default { ...@@ -238,7 +239,8 @@ export default {
238 width: 1px; 239 width: 1px;
239 left: 9px; 240 left: 9px;
240 top: 0px; 241 top: 0px;
241 background: #c3c5c8; 242 background: url('../../assets/images/colline.png');
243 background-position-x: center;
242 } 244 }
243 .linkLine_first::after { 245 .linkLine_first::after {
244 content: ""; 246 content: "";
...@@ -248,7 +250,8 @@ export default { ...@@ -248,7 +250,8 @@ export default {
248 height: calc(100% + 14px); 250 height: calc(100% + 14px);
249 width: 1px; 251 width: 1px;
250 left: 9px; 252 left: 9px;
251 background: #c3c5c8; 253 background: url('../../assets/images/colline.png');
254 background-position-x: center;
252 } 255 }
253 // 上半截 256 // 上半截
254 .linkLine_half_top::after { 257 .linkLine_half_top::after {
...@@ -258,7 +261,8 @@ export default { ...@@ -258,7 +261,8 @@ export default {
258 top: -14px; 261 top: -14px;
259 width: 1px; 262 width: 1px;
260 left: 9px; 263 left: 9px;
261 background: #c3c5c8; 264 background: url('../../assets/images/colline.png');
265 background-position-x: center;
262 } 266 }
263 .linkLine_last::after { 267 .linkLine_last::after {
264 content: ""; 268 content: "";
...@@ -267,7 +271,8 @@ export default { ...@@ -267,7 +271,8 @@ export default {
267 width: 1px; 271 width: 1px;
268 left: 9px; 272 left: 9px;
269 top: 0px; 273 top: 0px;
270 background: #c3c5c8; 274 background: url('../../assets/images/colline.png');
275 background-position-x: center;
271 } 276 }
272 .reTree_collapse_icon { 277 .reTree_collapse_icon {
273 background: url("../../assets/images/reTree_collapse_.svg") no-repeat center 278 background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
55 total: 0, 55 total: 0,
56 pageNo: 1, 56 pageNo: 1,
57 pageSize: 10, 57 pageSize: 10,
58 qszt: 1,
58 queryData: {}, 59 queryData: {},
59 formData: { 60 formData: {
60 user: "", 61 user: "",
...@@ -68,7 +69,10 @@ ...@@ -68,7 +69,10 @@
68 created() { 69 created() {
69 }, 70 },
70 mounted() { 71 mounted() {
71 this.getData({}) 72 this.getData({
73 pageNo: this.pageNo,
74 pageSize: this.pageSize,
75 })
72 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 76 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
73 }, 77 },
74 methods: { 78 methods: {
...@@ -79,6 +83,7 @@ ...@@ -79,6 +83,7 @@
79 this.getData(this.queryData); 83 this.getData(this.queryData);
80 }, 84 },
81 getData(data) { 85 getData(data) {
86 data['qszt'] = this.qszt
82 getSearchList(data).then(res => { 87 getSearchList(data).then(res => {
83 this.tableData = res.result.records 88 this.tableData = res.result.records
84 this.total = res.result.total 89 this.total = res.result.total
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </el-table> 42 </el-table>
43 <div class="pagination"> 43 <div class="pagination">
44 <el-pagination background layout="prev, pager, next" :total="total" 44 <el-pagination background layout="prev, pager, next" :total="total"
45 :current-page="pageNo" @current-change="handleCurrentChange"> 45 :current-page="pageNo" @current-change="handleCurrentChange">
46 </el-pagination> 46 </el-pagination>
47 </div> 47 </div>
48 </div> 48 </div>
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
59 props: {}, 59 props: {},
60 data() { 60 data() {
61 return { 61 return {
62 qszt:2,
62 total: 0, 63 total: 0,
63 pageNo: 1, 64 pageNo: 1,
64 pageSize: 10, 65 pageSize: 10,
...@@ -90,6 +91,7 @@ ...@@ -90,6 +91,7 @@
90 this.getData(this.queryData); 91 this.getData(this.queryData);
91 }, 92 },
92 getData(data) { 93 getData(data) {
94 data['qszt'] = this.qszt
93 getSearchList(data).then(res => { 95 getSearchList(data).then(res => {
94 this.tableData = res.result.records 96 this.tableData = res.result.records
95 this.total = res.result.total 97 this.total = res.result.total
...@@ -136,7 +138,7 @@ ...@@ -136,7 +138,7 @@
136 width: 100%; 138 width: 100%;
137 height: 100%; 139 height: 100%;
138 box-sizing: border-box; 140 box-sizing: border-box;
139 padding: 0 18px!important; 141 padding: 0 18px !important;
140 display: flex; 142 display: flex;
141 flex-direction: column; 143 flex-direction: column;
142 background-color: #fcfdff; 144 background-color: #fcfdff;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 </el-table> 36 </el-table>
37 <div class="pagination"> 37 <div class="pagination">
38 <el-pagination background layout="prev, pager, next" :total="total" 38 <el-pagination background layout="prev, pager, next" :total="total"
39 :current-page="pageNo" @current-change="handleCurrentChange"> 39 :current-page="pageNo" @current-change="handleCurrentChange">
40 </el-pagination> 40 </el-pagination>
41 </div> 41 </div>
42 </div> 42 </div>
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
53 props: {}, 53 props: {},
54 data() { 54 data() {
55 return { 55 return {
56 qszt: 1,
56 total: 0, 57 total: 0,
57 pageNo: 1, 58 pageNo: 1,
58 pageSize: 10, 59 pageSize: 10,
...@@ -80,6 +81,7 @@ ...@@ -80,6 +81,7 @@
80 this.getData(this.queryData); 81 this.getData(this.queryData);
81 }, 82 },
82 getData(data) { 83 getData(data) {
84 data['qszt'] = this.qszt
83 getSearchList(data).then(res => { 85 getSearchList(data).then(res => {
84 this.tableData = res.result.records 86 this.tableData = res.result.records
85 this.total = res.result.total 87 this.total = res.result.total
......