Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
2 changed files
with
7 additions
and
5 deletions
| ... | @@ -187,7 +187,7 @@ export default { | ... | @@ -187,7 +187,7 @@ export default { |
| 187 | graph.render(); | 187 | graph.render(); |
| 188 | 188 | ||
| 189 | graph.on('node:click', e => { | 189 | graph.on('node:click', e => { |
| 190 | alert(e); | 190 | alert(e.item); |
| 191 | }); | 191 | }); |
| 192 | 192 | ||
| 193 | graph.on('node:mouseenter', e => { | 193 | graph.on('node:mouseenter', e => { |
| ... | @@ -240,19 +240,21 @@ export default { | ... | @@ -240,19 +240,21 @@ export default { |
| 240 | #mountNode{ | 240 | #mountNode{ |
| 241 | /*height: calc(100% - 68px);*/ | 241 | /*height: calc(100% - 68px);*/ |
| 242 | margin-top: 20px; | 242 | margin-top: 20px; |
| 243 | width: 60%; | 243 | width: 50%; |
| 244 | height: 80%; | 244 | height: 80%; |
| 245 | 245 | ||
| 246 | position:absolute; | 246 | position:absolute; |
| 247 | float: left; | 247 | float: left; |
| 248 | border: 1px solid red; | ||
| 248 | } | 249 | } |
| 249 | 250 | ||
| 250 | #mountNodeRight{ | 251 | #mountNodeRight{ |
| 251 | margin-top: 20px; | 252 | margin: 20px 20px 0 0; |
| 252 | width: 38%; | 253 | width: 38%; |
| 253 | float: right; | 254 | float: right; |
| 254 | height: 1000px; | 255 | height: 1000px; |
| 255 | border: 0 solid #5ebbff; | 256 | border: 0 solid #5ebbff; |
| 257 | background: white; | ||
| 256 | } | 258 | } |
| 257 | 259 | ||
| 258 | .slot{ | 260 | .slot{ | ... | ... |
| ... | @@ -97,7 +97,7 @@ | ... | @@ -97,7 +97,7 @@ |
| 97 | align="center" | 97 | align="center" |
| 98 | > | 98 | > |
| 99 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> | 99 | <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> |
| 100 | <span>用途</span> | 100 | <span>房屋用途</span> |
| 101 | </td> | 101 | </td> |
| 102 | <td colspan="1" align="center"> | 102 | <td colspan="1" align="center"> |
| 103 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> | 103 | <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> |
| ... | @@ -276,7 +276,7 @@ export default { | ... | @@ -276,7 +276,7 @@ export default { |
| 276 | deleteYtInfo(index) { | 276 | deleteYtInfo(index) { |
| 277 | if (this.form.ytList.length <= 1) { | 277 | if (this.form.ytList.length <= 1) { |
| 278 | this.$message({ | 278 | this.$message({ |
| 279 | message: "不能删除,最少含有一条用途信息", | 279 | message: "不能删除,最少含有一条房屋用途信息", |
| 280 | type: "warning", | 280 | type: "warning", |
| 281 | }); | 281 | }); |
| 282 | } else { | 282 | } else { | ... | ... |
-
Please register or sign in to post a comment