Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
0abf948d by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 6f11ed03 96e3029f
Inline Side-by-side
Showing 5 changed files with 12 additions and 9 deletions
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#666666" d="M904.533333 311.466667c-17.066667-17.066667-42.666667-17.066667-59.733333 0L512 644.266667 179.2 311.466667c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l362.666666 362.666667c8.533333 8.533333 19.2 12.8 29.866667 12.8s21.333333-4.266667 29.866667-12.8l362.666666-362.666667c17.066667-17.066667 17.066667-42.666667 0-59.733333z" /></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1610702907780" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3703" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M471.3472 826.368a51.2 51.2 0 0 0 65.3312 5.9392l7.168-5.9392 409.6-409.6a51.2 51.2 0 0 0-65.4336-78.336l-7.0656 5.9392-373.3504 373.3504L134.144 344.3712a51.2 51.2 0 0 0-65.3312-5.9392l-7.0656 5.9392A51.2 51.2 0 0 0 55.808 409.6l5.9392 7.0656 409.6 409.6z" fill="#6D7278" p-id="3704"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#666666" d="M384 512L731.733333 202.666667c17.066667-14.933333 19.2-42.666667 4.266667-59.733334-14.933333-17.066667-42.666667-19.2-59.733333-4.266666l-384 341.333333c-10.666667 8.533333-14.933333 19.2-14.933334 32s4.266667 23.466667 14.933334 32l384 341.333333c8.533333 6.4 19.2 10.666667 27.733333 10.666667 12.8 0 23.466667-4.266667 32-14.933333 14.933333-17.066667 14.933333-44.8-4.266667-59.733334L384 512z" /></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1610702898690" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3569" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M211.1488 471.6544a51.2 51.2 0 0 0-5.9392 65.3312l5.9392 7.168 409.6 409.6a51.2 51.2 0 0 0 78.336-65.3312l-5.9392-7.168L319.7952 507.904l373.3504-373.3504a51.2 51.2 0 0 0 5.9392-65.3312L693.248 62.0544A51.2 51.2 0 0 0 627.8144 56.32l-7.0656 5.8368-409.6 409.6z" fill="#4A4A4A" p-id="3570"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
65 v-if="item.children" 65 v-if="item.children"
66 class="reTree_icon" 66 class="reTree_icon"
67 :style="{ 67 :style="{
68 height: (size || 16 * 1.2) + 'px', 68 height: 12 + 'px',
69 width: (size || 16 * 1.2) + 'px', 69 width: 12 + 'px',
70 }" 70 }"
71 :class="{ 71 :class="{
72 reTree_default_icon: item.children.length === 0, 72 reTree_default_icon: item.children.length === 0,
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
84 reTree_expand_icon: item.dm == 'G' || item.dm == 'J' || item.dm == 'Z', 84 reTree_expand_icon: item.dm == 'G' || item.dm == 'J' || item.dm == 'Z',
85 }" 85 }"
86 :style="{ 86 :style="{
87 height: (size || 16 * 1.2) + 'px', 87 height: 12 + 'px',
88 width: (size || 16 * 1.2) + 'px', 88 width: 12 + 'px',
89 }" 89 }"
90 ></div> 90 ></div>
91 </div> 91 </div>
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
20 <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconguoyou"></i> {{ item.mc }}</div><div 20 <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconguoyou"></i> {{ item.mc }}</div><div
21 class="reTree_icon" 21 class="reTree_icon"
22 :style="{ 22 :style="{
23 height: (size || 16 * 1.2) + 'px', 23 height: 12 + 'px',
24 width: (size || 16 * 1.2) + 'px', 24 width: 12 + 'px',
25 }" 25 }"
26 :class="{ 26 :class="{
27 reTree_default_icon: item.children.length === 0, 27 reTree_default_icon: item.children.length === 0,
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
119 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> 119 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
120 </el-dialog> 120 </el-dialog>
121 <!-- 添加定着物弹框 --> 121 <!-- 添加定着物弹框 -->
122 <el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :visible.sync="dialogVisible" width="48%"> 122 <el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :modal="false" :visible.sync="dialogVisible" width="48%">
123 <Create @closeDialog="closeDialog" :auth="true" :createZrz="createZrz" ></Create> 123 <Create @closeDialog="closeDialog" :auth="true" :createZrz="createZrz" ></Create>
124 </el-dialog> 124 </el-dialog>
125 <sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr> 125 <sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr>
......
...@@ -659,6 +659,8 @@ export default { ...@@ -659,6 +659,8 @@ export default {
659 } else { 659 } else {
660 //选中→未选中 660 //选中→未选中
661 e.className = ""; 661 e.className = "";
662 this.hbsmList = this.hbsmList.filter(i=>i!=bsm);
663 this.hqsztList = this.hqsztList.filter(i=>i!=hs.qszt);
662 switch (this.lpbParent) { 664 switch (this.lpbParent) {
663 case 'isHbfg': 665 case 'isHbfg':
664 self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs) 666 self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs)
...@@ -891,6 +893,7 @@ export default { ...@@ -891,6 +893,7 @@ export default {
891 //户合并 893 //户合并
892 handleHb(type){ 894 handleHb(type){
893 let olbBsms = ''; 895 let olbBsms = '';
896 console.log(this.fghbChoosedList,'fghbChoosedList');
894 this.hbsmList.forEach((item,index)=>{ 897 this.hbsmList.forEach((item,index)=>{
895 olbBsms+= index<this.hbsmList.length-1? item+',':item 898 olbBsms+= index<this.hbsmList.length-1? item+',':item
896 }) 899 })
......