Skip to content

刘远 / 3d_dc

Go to a project
Toggle navigation
Toggle navigation pinning
174b1c3a by 刘远
Options

解决冲突

1 parent 27e59d25
Inline Side-by-side
Showing 2 changed files with 2 additions and 1 deletions
1 // 淹没分析弹窗 1 // 可视域分析弹窗
2 <template> 2 <template>
3 <div class="container"> 3 <div class="container">
4 <div class="wrapper"> 4 <div class="wrapper">
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
46 :allSee='allSee' 46 :allSee='allSee'
47 :ymAnslysis='ymAnslysis' 47 :ymAnslysis='ymAnslysis'
48 :tjxAnslysis='tjxAnslysis' 48 :tjxAnslysis='tjxAnslysis'
49 :visualField='visualField'
49 :yyAnslysis='yyAnslysis' 50 :yyAnslysis='yyAnslysis'
50 :kgAnalusis='kgAnalusis'></rightFunc> 51 :kgAnalusis='kgAnalusis'></rightFunc>
51 </div> 52 </div>
......