Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
a9de72a5 by 杨威
Options

Merge remote-tracking branch 'origin/master' into master 

# Conflicts:
#	src/views/zd/jzd/index.vue
2 parents f0fcba17 5dca44b4
Inline Side-by-side
Showing 9 changed files with 21 additions and 7 deletions
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
48 active_color: item.expand, 48 active_color: item.expand,
49 }" 49 }"
50 > 50 >
51 <span v-if="item.qszt=='0'" style="color:red">(临)</span> 51 <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
52 <span v-if="item.qszt=='1'" style="color:green">(正)</span> 52 <img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/>
53 <span v-if="item.qszt=='2'" style="color:blue">(现)</span> 53 <img class="qsztImg" v-if="item.qszt=='2'" :src="xianshi"/>
54 {{ item.mc }} 54 {{ item.mc }}
55 </div> 55 </div>
56 </div> 56 </div>
...@@ -97,6 +97,9 @@ export default { ...@@ -97,6 +97,9 @@ export default {
97 return { 97 return {
98 time:null, 98 time:null,
99 treeXzqHeight:0, 99 treeXzqHeight:0,
100 linshi:require("../../assets/images/lin.png"),
101 zhengshi:require("../../assets/images/zheng.png"),
102 xianshi:require("../../assets/images/xian.png"),
100 } 103 }
101 }, 104 },
102 mounted(){ 105 mounted(){
...@@ -370,4 +373,9 @@ export default { ...@@ -370,4 +373,9 @@ export default {
370 center; 373 center;
371 background-size: contain; 374 background-size: contain;
372 } 375 }
376 .qsztImg{
377 width: 14px;
378 position: relative;
379 top: 1px;
380 }
373 </style> 381 </style>
......
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
154 this.$router.push({ 154 this.$router.push({
155 path: path, 155 path: path,
156 query: { 156 query: {
157 bsm: newGlbsm, 157 bsm: res.result,
158 source: 2 158 source: 2
159 } 159 }
160 }); 160 });
......
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
36 }, 36 },
37 methods: { 37 methods: {
38 handleClick(tab, event) { 38 handleClick(tab, event) {
39 console.log(tab, event); 39 // console.log(tab, event);
40 }, 40 },
41 //查询界址点 41 //查询界址点
42 getJZD(){ 42 getJZD(){
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <el-button type="primary" @click="batchExit">批量修改</el-button> 6 <el-button type="primary" @click="batchExit">批量修改</el-button>
7 </div> 7 </div>
8 <div class="table"> 8 <div class="table">
9 <table :data="jzdlist" border="1"> 9 <table border="1">
10 <tr> 10 <tr>
11 <td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td> 11 <td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td>
12 <td class="jzdh">界址点号</td> 12 <td class="jzdh">界址点号</td>
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
93 <script> 93 <script>
94 import {queryjzd, jzdsingleModify, jzdbatchModify} from '../../../api/zd' 94 import {queryjzd, jzdsingleModify, jzdbatchModify} from '../../../api/zd'
95 import {Message} from 'element-ui' 95 import {Message} from 'element-ui'
96
96 export default { 97 export default {
97 name: "jzd", 98 name: "jzd",
98 components: {}, 99 components: {},
...@@ -165,7 +166,8 @@ ...@@ -165,7 +166,8 @@
165 }, 166 },
166 mounted() { 167 mounted() {
167 let bsm = this.$store.state.zdbsm 168 let bsm = this.$store.state.zdbsm
168 this.getData({"glBsm":bsm}) 169 this.bsm=bsm;
170 this.getData(bsm)
169 }, 171 },
170 methods: { 172 methods: {
171 getData(bsm) { 173 getData(bsm) {
...@@ -259,6 +261,7 @@ ...@@ -259,6 +261,7 @@
259 computed: {}, 261 computed: {},
260 watch: { 262 watch: {
261 "$store.state.zdbsm": function (bsm) { 263 "$store.state.zdbsm": function (bsm) {
264 this.bsm=bsm
262 this.getData(bsm) 265 this.getData(bsm)
263 } 266 }
264 }, 267 },
......
...@@ -233,6 +233,7 @@ ...@@ -233,6 +233,7 @@
233 }, 233 },
234 mounted() { 234 mounted() {
235 let bsm = this.$store.state.zdbsm 235 let bsm = this.$store.state.zdbsm
236 this.bsm=bsm;
236 this.getData(bsm) 237 this.getData(bsm)
237 }, 238 },
238 methods: { 239 methods: {
...@@ -327,6 +328,7 @@ ...@@ -327,6 +328,7 @@
327 computed: {}, 328 computed: {},
328 watch: { 329 watch: {
329 "$store.state.zdbsm": function (bsm) { 330 "$store.state.zdbsm": function (bsm) {
331 this.bsm=bsm;
330 this.getData(bsm) 332 this.getData(bsm)
331 } 333 }
332 }, 334 },
......
...@@ -687,6 +687,7 @@ export default { ...@@ -687,6 +687,7 @@ export default {
687 background-color: #fff; 687 background-color: #fff;
688 font-size: 14px; 688 font-size: 14px;
689 width: 100%; 689 width: 100%;
690 table-layout: fixed;
690 th { 691 th {
691 height: 36px; 692 height: 36px;
692 line-height: 36px; 693 line-height: 36px;
......