Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5e282b4d by cheliming
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents eaf00331 0425b0b5
Inline Side-by-side
Showing 10 changed files with 51 additions and 15 deletions
...@@ -71,3 +71,16 @@ export function getTree(zdbsm) { ...@@ -71,3 +71,16 @@ export function getTree(zdbsm) {
71 } 71 }
72 }) 72 })
73 } 73 }
74
75 /**
76 * 根据自然幢BSM获取左侧目录树
77 */
78 export function getTreeByZrzbsm(zrzbsm) {
79 return request({
80 url: 'system/xzq/getMenuTreeByZrzbsm',
81 method: 'get',
82 params: {
83 zrzbsm
84 }
85 })
86 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -220,7 +220,8 @@ export default { ...@@ -220,7 +220,8 @@ export default {
220 width: 16px; 220 width: 16px;
221 left: 9px; 221 left: 9px;
222 top: 9px; 222 top: 9px;
223 background: #c3c5c8; 223 background: url('../../assets/images/rowline.png');
224 background-position-y: center;
224 } 225 }
225 .third_layer::before { 226 .third_layer::before {
226 content: ""; 227 content: "";
...@@ -239,7 +240,8 @@ export default { ...@@ -239,7 +240,8 @@ export default {
239 width: 1px; 240 width: 1px;
240 left: 9px; 241 left: 9px;
241 top: 0px; 242 top: 0px;
242 background: #c3c5c8; 243 background: url('../../assets/images/colline.png');
244 background-position-x: center;
243 } 245 }
244 .linkLine_first::after { 246 .linkLine_first::after {
245 content: ""; 247 content: "";
...@@ -249,7 +251,8 @@ export default { ...@@ -249,7 +251,8 @@ export default {
249 height: calc(100% + 14px); 251 height: calc(100% + 14px);
250 width: 1px; 252 width: 1px;
251 left: 9px; 253 left: 9px;
252 background: #c3c5c8; 254 background: url('../../assets/images/colline.png');
255 background-position-x: center;
253 } 256 }
254 // 上半截 257 // 上半截
255 .linkLine_half_top::after { 258 .linkLine_half_top::after {
...@@ -259,7 +262,8 @@ export default { ...@@ -259,7 +262,8 @@ export default {
259 top: -14px; 262 top: -14px;
260 width: 1px; 263 width: 1px;
261 left: 9px; 264 left: 9px;
262 background: #c3c5c8; 265 background: url('../../assets/images/colline.png');
266 background-position-x: center;
263 } 267 }
264 .linkLine_last::after { 268 .linkLine_last::after {
265 content: ""; 269 content: "";
...@@ -268,7 +272,8 @@ export default { ...@@ -268,7 +272,8 @@ export default {
268 width: 1px; 272 width: 1px;
269 left: 9px; 273 left: 9px;
270 top: 0px; 274 top: 0px;
271 background: #c3c5c8; 275 background: url('../../assets/images/colline.png');
276 background-position-x: center;
272 } 277 }
273 .reTree_collapse_icon { 278 .reTree_collapse_icon {
274 background: url("../../assets/images/reTree_collapse_.svg") no-repeat center 279 background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
......
...@@ -52,7 +52,7 @@ import Navigation from "../components/IvyElement/navigation"; ...@@ -52,7 +52,7 @@ import Navigation from "../components/IvyElement/navigation";
52 import Create from "./panel/create/index"; 52 import Create from "./panel/create/index";
53 import LineTree from "../components/lineTree/lineTree"; 53 import LineTree from "../components/lineTree/lineTree";
54 import { setTimeout } from "timers"; 54 import { setTimeout } from "timers";
55 import { getTree,getDdicByMC,getTreeList } from "../api/common"; 55 import { getTree,getDdicByMC,getTreeList,getTreeByZrzbsm } from "../api/common";
56 56
57 export default { 57 export default {
58 components: { 58 components: {
...@@ -194,14 +194,14 @@ export default { ...@@ -194,14 +194,14 @@ export default {
194 if (newPath == "/zd") { 194 if (newPath == "/zd") {
195 this.getRightTree(this.$store.state.zdbsm); 195 this.getRightTree(this.$store.state.zdbsm);
196 }else if (newPath == "/zrz") { 196 }else if (newPath == "/zrz") {
197 this.getRightTree(this.$store.state.zdbsm); 197 this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
198 }else { 198 }else {
199 this.getTreeList(); 199 this.getTreeList();
200 } 200 }
201 }, 201 },
202 "$store.state.zdbsm": function(bsm) { 202 // "$store.state.zdbsm": function(bsm) {
203 this.getRightTree(bsm); 203 // this.getRightTree(bsm);
204 }, 204 // },
205 }, 205 },
206 created() { 206 created() {
207 if (this.$route.meta) { 207 if (this.$route.meta) {
...@@ -282,6 +282,14 @@ export default { ...@@ -282,6 +282,14 @@ export default {
282 } 282 }
283 }); 283 });
284 }, 284 },
285
286 getRightTreeByZrzbsm(bsm) {
287 getTreeByZrzbsm(bsm).then((res) => {
288 if (res.success) {
289 this.pd = res.result;
290 }
291 });
292 },
285 sortNavigation(data, selectId) { 293 sortNavigation(data, selectId) {
286 let headTop = this.headTop; 294 let headTop = this.headTop;
287 data.forEach((item, index) => { 295 data.forEach((item, index) => {
......
...@@ -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;
......
...@@ -258,7 +258,7 @@ export default { ...@@ -258,7 +258,7 @@ export default {
258 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm 258 //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
259 this.$refs['ruleForm1'].validate((valid) => { 259 this.$refs['ruleForm1'].validate((valid) => {
260 if (valid) { 260 if (valid) {
261 insertDzjbxx(this.ruleForm1) 261 insertZrzjbxx(this.ruleForm1)
262 .then((res) => { 262 .then((res) => {
263 if (res.code == "200") { 263 if (res.code == "200") {
264 this.$message({ 264 this.$message({
......
...@@ -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
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
109 let path = ""; 109 let path = "";
110 switch (row.dylx) { 110 switch (row.dylx) {
111 case "zrz": 111 case "zrz":
112 this.$store.state.zrzbsm = row.glbsm;
112 path = "/zrz"; 113 path = "/zrz";
113 break; 114 break;
114 case "zd": 115 case "zd":
......