a5cdec84 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 96c84786 a88ab7fa
...@@ -120,3 +120,14 @@ export function submit (data) { ...@@ -120,3 +120,14 @@ export function submit (data) {
120 data:data 120 data:data
121 }) 121 })
122 } 122 }
123
124 /**
125 * 添加附件
126 */
127 export function insertFile(data) {
128 return request({
129 url:'/file',
130 method:'post',
131 data:data
132 })
133 }
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> 2 <svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 55.1 (78136) - https://sketchapp.com --> 3 <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
4 <title>icon_files_collapse_</title> 4 <title></title>
5 <desc>Created with Sketch.</desc> 5 <desc>Created with Sketch.</desc>
6 <g id="报告工作站" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> 6 <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7 <g id="1--报告工作站_书写报告" transform="translate(-100.000000, -217.000000)"> 7 <g id="画板" transform="translate(-4.000000, -58.000000)" fill="#FFFFFF" fill-rule="nonzero">
8 <g id="模板" transform="translate(80.000000, 51.000000)"> 8 <g id="子" transform="translate(4.000000, 58.000000)">
9 <g id="分组" transform="translate(20.000000, 135.000000)"> 9 <path d="M2,0.5 L12,0.5 C12.8284271,0.5 13.5,1.17157288 13.5,2 L13.5,12 C13.5,12.8284271 12.8284271,13.5 12,13.5 L2,13.5 C1.17157288,13.5 0.5,12.8284271 0.5,12 L0.5,2 C0.5,1.17157288 1.17157288,0.5 2,0.5 Z M2,1.5 C1.72385763,1.5 1.5,1.72385763 1.5,2 L1.5,12 C1.5,12.2761424 1.72385763,12.5 2,12.5 L12,12.5 C12.2761424,12.5 12.5,12.2761424 12.5,12 L12.5,2 C12.5,1.72385763 12.2761424,1.5 12,1.5 L2,1.5 Z" id="矩形"></path>
10 <g id="icon_files_collapse_" transform="translate(0.000000, 31.000000)"> 10 <g id="编组-5" transform="translate(4.000000, 3.500000)">
11 <rect id="矩形-copy-18" fill="#D8D8D8" opacity="0" x="0" y="0" width="17" height="17"></rect> 11 <path d="M0,4 L6,4 C6.27614237,4 6.5,3.77614237 6.5,3.5 C6.5,3.22385763 6.27614237,3 6,3 L0,3 C-0.276142375,3 -0.5,3.22385763 -0.5,3.5 C-0.5,3.77614237 -0.276142375,4 0,4 Z" id="直线-3"></path>
12 <path d="M5,10 L12,10 L12,11 L5,11 L5,10 Z M16,4 L16,3 L6,3 L6,2 L6,1 L1,1 L1,4 L16,4 Z M16,5 L1,5 L1,16 L16,16 L16,5 Z M17,16 L17,17 L0,17 L0,16 L-3.85312697e-16,1 L0,0 L7,0 L7,1 L7,2 L17,2 L17,3 L17,16 Z" id="合并形状" fill="#7FB9A2"></path>
13 </g>
14 </g> 12 </g>
15 </g> 13 </g>
16 </g> 14 </g>
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> 2 <svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 55.1 (78136) - https://sketchapp.com --> 3 <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
4 <title>icon_file_default_</title> 4 <title></title>
5 <desc>Created with Sketch.</desc> 5 <desc>Created with Sketch.</desc>
6 <g id="报告工作站" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> 6 <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7 <g id="1--报告工作站_书写报告" transform="translate(-127.000000, -246.000000)"> 7 <g id="画板" transform="translate(-4.000000, -77.000000)">
8 <g id="模板" transform="translate(80.000000, 51.000000)"> 8 <g id="正" transform="translate(4.000000, 77.000000)">
9 <g id="分组" transform="translate(20.000000, 135.000000)"> 9 <path d="M2,0.5 L12,0.5 C12.8284271,0.5 13.5,1.17157288 13.5,2 L13.5,12 C13.5,12.8284271 12.8284271,13.5 12,13.5 L2,13.5 C1.17157288,13.5 0.5,12.8284271 0.5,12 L0.5,2 C0.5,1.17157288 1.17157288,0.5 2,0.5 Z M2,1.5 C1.72385763,1.5 1.5,1.72385763 1.5,2 L1.5,12 C1.5,12.2761424 1.72385763,12.5 2,12.5 L12,12.5 C12.2761424,12.5 12.5,12.2761424 12.5,12 L12.5,2 C12.5,1.72385763 12.2761424,1.5 12,1.5 L2,1.5 Z" id="矩形" fill="#FFFFFF" fill-rule="nonzero"></path>
10 <g id="icon_file_default_" transform="translate(27.000000, 60.000000)"> 10 <g id="编组-5" transform="translate(3.000000, 3.500000)"></g>
11 <rect id="矩形" fill="#D8D8D8" opacity="0" x="0" y="0" width="17" height="17"></rect>
12 <path d="M16,4 L16,3 L6,3 L6,2 L6,1 L1,1 L1,4 L16,4 Z M16,5 L1,5 L1,16 L16,16 L16,5 Z M17,16 L17,17 L0,17 L0,16 L-3.85312697e-16,1 L0,0 L7,0 L7,1 L7,2 L17,2 L17,3 L17,16 Z" id="合并形状" fill="#C3C5C8"></path>
13 </g>
14 </g>
15 </g> 11 </g>
16 </g> 12 </g>
17 </g> 13 </g>
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> 2 <svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 55.1 (78136) - https://sketchapp.com --> 3 <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
4 <title>icon_files_expand_</title> 4 <title></title>
5 <desc>Created with Sketch.</desc> 5 <desc>Created with Sketch.</desc>
6 <g id="报告工作站" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> 6 <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7 <g id="1--报告工作站_书写报告" transform="translate(-100.000000, -187.000000)"> 7 <g id="画板" transform="translate(-4.000000, -41.000000)" fill="#FFFFFF" fill-rule="nonzero">
8 <g id="模板" transform="translate(80.000000, 51.000000)"> 8 <g id="父" transform="translate(4.000000, 41.000000)">
9 <g id="分组" transform="translate(20.000000, 135.000000)"> 9 <path d="M2,0.5 L12,0.5 C12.8284271,0.5 13.5,1.17157288 13.5,2 L13.5,12 C13.5,12.8284271 12.8284271,13.5 12,13.5 L2,13.5 C1.17157288,13.5 0.5,12.8284271 0.5,12 L0.5,2 C0.5,1.17157288 1.17157288,0.5 2,0.5 Z M2,1.5 C1.72385763,1.5 1.5,1.72385763 1.5,2 L1.5,12 C1.5,12.2761424 1.72385763,12.5 2,12.5 L12,12.5 C12.2761424,12.5 12.5,12.2761424 12.5,12 L12.5,2 C12.5,1.72385763 12.2761424,1.5 12,1.5 L2,1.5 Z" id="矩形"></path>
10 <g id="icon_files_expand_" transform="translate(0.000000, 1.000000)"> 10 <g id="编组-5" transform="translate(4.000000, 3.500000)">
11 <rect id="矩形-copy-17" fill="#D8D8D8" opacity="0" x="0" y="0" width="17" height="17"></rect> 11 <path d="M0,4 L6,4 C6.27614237,4 6.5,3.77614237 6.5,3.5 C6.5,3.22385763 6.27614237,3 6,3 L0,3 C-0.276142375,3 -0.5,3.22385763 -0.5,3.5 C-0.5,3.77614237 -0.276142375,4 0,4 Z" id="直线-3"></path>
12 <path d="M8,10 L8,7 L9,7 L9,10 L12,10 L12,11 L9,11 L9,14 L8,14 L8,11 L5,11 L5,10 L8,10 Z M16,4 L16,3 L6,3 L6,2 L6,1 L1,1 L1,4 L16,4 Z M16,5 L1,5 L1,16 L16,16 L16,5 Z M17,16 L17,17 L0,17 L0,16 L-3.85312697e-16,1 L0,0 L7,0 L7,1 L7,2 L17,2 L17,3 L17,16 Z" id="合并形状" fill="#C3C5C8"></path> 12 <path d="M0,4 L6,4 C6.27614237,4 6.5,3.77614237 6.5,3.5 C6.5,3.22385763 6.27614237,3 6,3 L0,3 C-0.276142375,3 -0.5,3.22385763 -0.5,3.5 C-0.5,3.77614237 -0.276142375,4 0,4 Z" id="直线-3" transform="translate(3.000000, 3.500000) rotate(-270.000000) translate(-3.000000, -3.500000) "></path>
13 </g>
14 </g> 13 </g>
15 </g> 14 </g>
16 </g> 15 </g>
......
...@@ -48,11 +48,13 @@ table,td,tr,.el-col,.title{ ...@@ -48,11 +48,13 @@ table,td,tr,.el-col,.title{
48 border: none; 48 border: none;
49 color: #606764; 49 color: #606764;
50 overflow: visible; 50 overflow: visible;
51 cursor: text;
52 text-align: left; 51 text-align: left;
53 text-indent: 20px; 52 text-indent: 20px;
54 padding: 0; 53 padding: 0;
55 } 54 }
55 input:disabled{
56 cursor: not-allowed;
57 }
56 .formInput:focus{ 58 .formInput:focus{
57 border: 1px solid #A0C5F6!important; 59 border: 1px solid #A0C5F6!important;
58 } 60 }
...@@ -122,3 +124,27 @@ ol, ul { list-style:none; } ...@@ -122,3 +124,27 @@ ol, ul { list-style:none; }
122 .el-tabs__content{ 124 .el-tabs__content{
123 position: unset; 125 position: unset;
124 } 126 }
127 // 自定义右键菜单样式
128 .contextmenu {
129 margin: 0;
130 background: #fff;
131 z-index: 3000;
132 position: absolute;
133 list-style-type: none;
134 padding: 5px 0;
135 border-radius: 4px;
136 font-size: 12px;
137 font-weight: 400;
138 color: #333;
139 box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
140 }
141 .contextmenu li {
142 margin: 0;
143 padding: 7px 16px;
144 cursor: pointer;
145 }
146
147 .contextmenu li:hover {
148 background: #eee;
149 }
150 // end
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,14 +8,19 @@ ...@@ -8,14 +8,19 @@
8 <el-row> 8 <el-row>
9 <el-col :span="16" class="fl"> 9 <el-col :span="16" class="fl">
10 <el-radio-group v-model="gyfs"> 10 <el-radio-group v-model="gyfs">
11 <el-radio :label="item.bsm" :key="item.bsm" v-for="item in $store.state.gyfsList">{{item.mc}}</el-radio> 11 <el-radio :label="item.bsm" :disabled="qszt!='0'" :key="item.bsm" v-for="item in $store.state.gyfsList">{{item.mc}}</el-radio>
12 </el-radio-group> 12 </el-radio-group>
13 </el-col> 13 </el-col>
14 <el-col :span="4" class="fr"> 14 <el-col :span="4" class="fr" v-show="qszt=='0'">
15 <span class="span" @click="addRow">新增</span> 15 <span class="span" @click="addRow">新增</span>
16 <span class="span" @click="changeRow">修改</span> 16 <span class="span" @click="changeRow">修改</span>
17 <span class="span" @click="delRow">删除</span> 17 <span class="span" @click="delRow">删除</span>
18 </el-col> 18 </el-col>
19 <el-col :span="4" class="fr" v-show="qszt!='0'">
20 <span class="noEdit" @click="addRow">新增</span>
21 <span class="noEdit" @click="changeRow">修改</span>
22 <span class="noEdit" @click="delRow">删除</span>
23 </el-col>
19 </el-row> 24 </el-row>
20 </td> 25 </td>
21 </tr> 26 </tr>
...@@ -300,9 +305,9 @@ ...@@ -300,9 +305,9 @@
300 305
301 export default { 306 export default {
302 props: { 307 props: {
303 widtd: { 308 qszt: {
304 type: String, 309 type: String,
305 default: "70%", 310 default: "0",
306 }, 311 },
307 title: { 312 title: {
308 type: String, 313 type: String,
...@@ -539,6 +544,11 @@ ...@@ -539,6 +544,11 @@
539 margin-right: 10px; 544 margin-right: 10px;
540 cursor: pointer; 545 cursor: pointer;
541 } 546 }
547 .noEdit {
548 color:#606266;
549 margin-right: 10px;
550 cursor: not-allowed;
551 }
542 .el-radio { 552 .el-radio {
543 margin-right: 20px !important; 553 margin-right: 20px !important;
544 } 554 }
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 :default-expand-all="defaultExpandAll" 77 :default-expand-all="defaultExpandAll"
78 :multiple="multiple" 78 :multiple="multiple"
79 :placeholder="placeholder" 79 :placeholder="placeholder"
80 :disabled="disabled" 80 :disabled="formData.qszt!='0'"
81 :data="$store.state.tdytList" 81 :data="$store.state.tdytList"
82 :props="treeProps" 82 :props="treeProps"
83 :check-strictly="checkStrictly" 83 :check-strictly="checkStrictly"
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
92 :default-expand-all="defaultExpandAll" 92 :default-expand-all="defaultExpandAll"
93 :multiple="multiple" 93 :multiple="multiple"
94 :placeholder="placeholder" 94 :placeholder="placeholder"
95 :disabled="disabled" 95 :disabled="formData.qszt!='0'"
96 :data="$store.state.tdytList" 96 :data="$store.state.tdytList"
97 :props="treeProps" 97 :props="treeProps"
98 :check-strictly="checkStrictly" 98 :check-strictly="checkStrictly"
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
102 </li> 102 </li>
103 <li> 103 <li>
104 <el-date-picker 104 <el-date-picker
105 :disabled="formData.qszt!='0'"
105 v-model="childItem.tdsyqssj" 106 v-model="childItem.tdsyqssj"
106 type="date" 107 type="date"
107 value-format="yyyy-MM-dd" 108 value-format="yyyy-MM-dd"
...@@ -131,6 +132,7 @@ ...@@ -131,6 +132,7 @@
131 <li> 132 <li>
132 <input 133 <input
133 type="text" 134 type="text"
135 :disabled="formData.qszt!='0'"
134 placeholder="请输入" 136 placeholder="请输入"
135 v-model="childItem.pzytdm" 137 v-model="childItem.pzytdm"
136 class="formInput" 138 class="formInput"
...@@ -139,6 +141,7 @@ ...@@ -139,6 +141,7 @@
139 <li> 141 <li>
140 <input 142 <input
141 type="text" 143 type="text"
144 :disabled="formData.qszt!='0'"
142 placeholder="请输入" 145 placeholder="请输入"
143 v-model="childItem.sjytdm" 146 v-model="childItem.sjytdm"
144 class="formInput" 147 class="formInput"
...@@ -147,6 +150,7 @@ ...@@ -147,6 +150,7 @@
147 <li> 150 <li>
148 <input 151 <input
149 type="text" 152 type="text"
153 :disabled="formData.qszt!='0'"
150 placeholder="请输入" 154 placeholder="请输入"
151 v-model="childItem.syqx" 155 v-model="childItem.syqx"
152 class="formInput" 156 class="formInput"
...@@ -174,6 +178,7 @@ ...@@ -174,6 +178,7 @@
174 <ul> 178 <ul>
175 <li> 179 <li>
176 <el-select 180 <el-select
181 :disabled="formData.qszt!='0'"
177 class="formSelect percent30" 182 class="formSelect percent30"
178 v-model="childItem.pzdjbsm" 183 v-model="childItem.pzdjbsm"
179 > 184 >
...@@ -188,6 +193,7 @@ ...@@ -188,6 +193,7 @@
188 </li> 193 </li>
189 <li> 194 <li>
190 <el-select 195 <el-select
196 :disabled="formData.qszt!='0'"
191 class="formSelect percent30" 197 class="formSelect percent30"
192 v-model="childItem.sjdjbsm" 198 v-model="childItem.sjdjbsm"
193 > 199 >
...@@ -202,6 +208,7 @@ ...@@ -202,6 +208,7 @@
202 </li> 208 </li>
203 <li> 209 <li>
204 <el-date-picker 210 <el-date-picker
211 :disabled="formData.qszt!='0'"
205 v-model="childItem.tdsyjssj" 212 v-model="childItem.tdsyjssj"
206 type="date" 213 type="date"
207 value-format="yyyy-MM-dd" 214 value-format="yyyy-MM-dd"
...@@ -216,10 +223,10 @@ ...@@ -216,10 +223,10 @@
216 <div class="title"> 223 <div class="title">
217 <el-select-tree 224 <el-select-tree
218 v-if="show" 225 v-if="show"
226 :disabled="formData.qszt!='0'"
219 :default-expand-all="defaultExpandAll" 227 :default-expand-all="defaultExpandAll"
220 :multiple="multiple" 228 :multiple="multiple"
221 :placeholder="placeholder" 229 :placeholder="placeholder"
222 :disabled="disabled"
223 :data="$store.state.qlxzList" 230 :data="$store.state.qlxzList"
224 :props="treeProps" 231 :props="treeProps"
225 :check-strictly="checkStrictly" 232 :check-strictly="checkStrictly"
...@@ -235,10 +242,12 @@ ...@@ -235,10 +242,12 @@
235 import { getDdicByMC } from "../../api/common"; 242 import { getDdicByMC } from "../../api/common";
236 export default { 243 export default {
237 props: { 244 props: {
238 // widtd: { 245 formData: {
239 // type: String, 246 type: Object,
240 // default: "70%", 247 default: () => {
241 // }, 248 return {};
249 },
250 },
242 }, 251 },
243 data() { 252 data() {
244 return { 253 return {
...@@ -290,6 +299,9 @@ export default { ...@@ -290,6 +299,9 @@ export default {
290 }; 299 };
291 }, 300 },
292 created() {}, 301 created() {},
302 mounted(){
303 console.log(this.formData,'formData');
304 },
293 methods: { 305 methods: {
294 //外层操作 306 //外层操作
295 handleClick(ind, type) { 307 handleClick(ind, type) {
......
1 <template> 1 <template>
2 <div class="main">
3 <el-dialog 2 <el-dialog
4 title="户重新落宗" 3 title="户重新落宗"
5 :visible.sync="isVisible" 4 :visible.sync="isVisible"
...@@ -68,7 +67,6 @@ ...@@ -68,7 +67,6 @@
68 <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx" 67 <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
69 :isZdClose="true"></query-data> 68 :isZdClose="true"></query-data>
70 </el-dialog> 69 </el-dialog>
71 </div>
72 </template> 70 </template>
73 71
74 <script> 72 <script>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 ></div> 35 ></div>
36 <div 36 <div
37 class="layer_text nowrap" 37 class="layer_text nowrap"
38 @contextmenu.prevent="openMenu($event, item)" 38 @contextmenu.prevent="openMenu($event, item,list)"
39 :class="{ 39 :class="{
40 active_color: item.expand, 40 active_color: item.expand,
41 }" 41 }"
...@@ -86,7 +86,8 @@ export default { ...@@ -86,7 +86,8 @@ export default {
86 // 开启延时器,300ms的间隔区分单击和双击,解决双击时执行两次单击事件 86 // 开启延时器,300ms的间隔区分单击和双击,解决双击时执行两次单击事件
87 clearTimeout(self.time); 87 clearTimeout(self.time);
88 self.time = setTimeout(() => { 88 self.time = setTimeout(() => {
89 item.expand = !item.expand; 89
90 item.expand = item.expand == undefined? true:!item.expand;
90 self.$emit("itemClick", item); 91 self.$emit("itemClick", item);
91 if (!item.children) { 92 if (!item.children) {
92 self.$emit("valClick", item); 93 self.$emit("valClick", item);
...@@ -94,10 +95,17 @@ export default { ...@@ -94,10 +95,17 @@ export default {
94 }, 300); 95 }, 300);
95 }, 96 },
96 // 右键点击事件 97 // 右键点击事件
97 openMenu(e, item) { 98 openMenu(e, item,list) {
99 console.log(list,'右键list');
98 this.$emit("changeTop", e.pageY); 100 this.$emit("changeTop", e.pageY);
99 this.$emit("changeLeft", e.pageX); 101 this.$emit("changeLeft", e.pageX);
100 this.$emit("changeZdData",item); 102 this.$emit("changeZdData",item);
103 //判断所有权类型
104 console.log(item.dm,'item.dm ');
105 if(item.dm == 'G' || item.dm == 'J' ||item.dm == 'Z'){
106 this.$emit("changeCreateVisible", true);
107 }
108 //判断楼盘类型
101 switch (item.type) { 109 switch (item.type) {
102 case 'zd': 110 case 'zd':
103 this.$emit("changeIsZD", true); 111 this.$emit("changeIsZD", true);
...@@ -224,9 +232,10 @@ export default { ...@@ -224,9 +232,10 @@ export default {
224 position: absolute; 232 position: absolute;
225 height: 1px; 233 height: 1px;
226 width: 16px; 234 width: 16px;
227 left: 9px; 235 left: 8px;
228 top: 9px; 236 top: 8px;
229 background: url('../../assets/images/rowline.png'); 237 opacity: .5;
238 background: url('../../assets/images/rowline1.png');
230 background-position-y: center; 239 background-position-y: center;
231 } 240 }
232 .third_layer::before { 241 .third_layer::before {
...@@ -234,9 +243,10 @@ export default { ...@@ -234,9 +243,10 @@ export default {
234 position: absolute; 243 position: absolute;
235 height: 1px; 244 height: 1px;
236 width: 22px; 245 width: 22px;
237 left: 9px; 246 left: 8px;
238 top: 9px; 247 top: 8px;
239 background: url('../../assets/images/rowline.png'); 248 opacity: .5;
249 background: url('../../assets/images/rowline1.png');
240 background-position-y: center; 250 background-position-y: center;
241 } 251 }
242 252
...@@ -247,7 +257,8 @@ export default { ...@@ -247,7 +257,8 @@ export default {
247 width: 1px; 257 width: 1px;
248 left: 7px; 258 left: 7px;
249 top: 0px; 259 top: 0px;
250 background: url('../../assets/images/colline.png'); 260 opacity: .5;
261 background: url('../../assets/images/colline1.png');
251 background-position-x: center; 262 background-position-x: center;
252 } 263 }
253 .linkLine_first::after { 264 .linkLine_first::after {
...@@ -258,7 +269,8 @@ export default { ...@@ -258,7 +269,8 @@ export default {
258 height: calc(100% + 14px); 269 height: calc(100% + 14px);
259 width: 1px; 270 width: 1px;
260 left: 7px; 271 left: 7px;
261 background: url('../../assets/images/colline.png'); 272 opacity: .5;
273 background: url('../../assets/images/colline1.png');
262 background-position-x: center; 274 background-position-x: center;
263 } 275 }
264 // 上半截 276 // 上半截
...@@ -269,7 +281,8 @@ export default { ...@@ -269,7 +281,8 @@ export default {
269 top: -14px; 281 top: -14px;
270 width: 1px; 282 width: 1px;
271 left: 7px; 283 left: 7px;
272 background: url('../../assets/images/colline.png'); 284 opacity: .5;
285 background: url('../../assets/images/colline1.png');
273 background-position-x: center; 286 background-position-x: center;
274 } 287 }
275 .linkLine_last::after { 288 .linkLine_last::after {
...@@ -279,28 +292,33 @@ export default { ...@@ -279,28 +292,33 @@ export default {
279 width: 1px; 292 width: 1px;
280 left: 7px; 293 left: 7px;
281 top: 0px; 294 top: 0px;
282 background: url('../../assets/images/colline.png'); 295 opacity: .5;
296 background: url('../../assets/images/colline1.png');
283 background-position-x: center; 297 background-position-x: center;
284 } 298 }
285 .reTree_collapse_icon { 299 .reTree_collapse_icon {
300 opacity: .5;
286 background: url("../../assets/images/reTree_collapse_.svg") no-repeat center 301 background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
287 center; 302 center;
288 background-size: contain; 303 background-size: contain;
289 } 304 }
290 305
291 .reTree_default_icon { 306 .reTree_default_icon {
307 opacity: .5;
292 background: url("../../assets/images/reTree_default_.svg") no-repeat center 308 background: url("../../assets/images/reTree_default_.svg") no-repeat center
293 center; 309 center;
294 background-size: contain; 310 background-size: contain;
295 } 311 }
296 312
297 .reTree_expand_icon { 313 .reTree_expand_icon {
314 opacity: .5;
298 background: url("../../assets/images/reTree_expand_.svg") no-repeat center 315 background: url("../../assets/images/reTree_expand_.svg") no-repeat center
299 center; 316 center;
300 background-size: contain; 317 background-size: contain;
301 } 318 }
302 319
303 .reTree_focus_icon { 320 .reTree_focus_icon {
321 opacity: .5;
304 background: url("../../assets/images/reTree_focus_.svg") no-repeat center 322 background: url("../../assets/images/reTree_focus_.svg") no-repeat center
305 center; 323 center;
306 background-size: contain; 324 background-size: contain;
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
40 @changeVisible="changeVisible" 40 @changeVisible="changeVisible"
41 @changeLpbVisible="changeLpbVisible" 41 @changeLpbVisible="changeLpbVisible"
42 @changeIsZD="changeIsZD" 42 @changeIsZD="changeIsZD"
43 @changeCreateVisible="changeCreateVisible"
43 :list="item.children" 44 :list="item.children"
44 :visible="visible" 45 :visible="visible"
45 :size="size" 46 :size="size"
...@@ -62,13 +63,20 @@ ...@@ -62,13 +63,20 @@
62 <li @click="deleteByBsm()">删除</li> 63 <li @click="deleteByBsm()">删除</li>
63 </ul> 64 </ul>
64 <ul 65 <ul
66 v-show="createVisible"
67 :style="{ left: left + 'px', top: top + 'px' }"
68 class="contextmenu"
69 >
70 <li @click="openCreateDialog">新建宗地</li>
71 </ul>
72 <ul
65 v-show="lpbvisible" 73 v-show="lpbvisible"
66 :style="{ left: lpbleft + 'px', top: lpbtop + 'px' }" 74 :style="{ left: lpbleft + 'px', top: lpbtop + 'px' }"
67 class="contextmenu" 75 class="contextmenu"
68 > 76 >
69 <li v-show="zdData.type == 'zrz'" @click="openLpbDialog('ljz')">添加逻辑幢</li> 77 <li v-show="zdData.type == 'zrz'" @click="openLpbDialog('ljz')">添加逻辑幢</li>
70 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz'" @click="openLpbDialog('zdy')">添加幢单元</li> 78 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz'" @click="openLpbDialog('zdy')">添加幢单元</li>
71 <li @click="openLpbDialog('ch')">添加层户</li> 79 <li v-show="zdData.type == 'zrz' || zdData.type == 'ljz' || zdData.type == 'zdy'" @click="openLpbDialog('ch')">添加层户</li>
72 </ul> 80 </ul>
73 <!-- 添加定着物弹框 --> 81 <!-- 添加定着物弹框 -->
74 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> 82 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
...@@ -109,6 +117,8 @@ export default { ...@@ -109,6 +117,8 @@ export default {
109 lpbvisible: false, 117 lpbvisible: false,
110 lpbtop: 0, 118 lpbtop: 0,
111 lpbleft: 0, 119 lpbleft: 0,
120 //控制新建宗地菜单
121 createVisible:false,
112 }; 122 };
113 }, 123 },
114 watch: { 124 watch: {
...@@ -123,12 +133,20 @@ export default { ...@@ -123,12 +133,20 @@ export default {
123 } else { 133 } else {
124 document.body.removeEventListener("click", this.closeMenu); 134 document.body.removeEventListener("click", this.closeMenu);
125 } 135 }
136 },
137
138 createVisible(value) {
139 if (value) {
140 document.body.addEventListener("click", this.closeMenu);
141 } else {
142 document.body.removeEventListener("click", this.closeMenu);
143 }
126 } 144 }
127 }, 145 },
128 created() { 146 created() {
129 console.log("lineTree create"); 147 console.log("lineTree create");
130 this.preDealData(this.pd); 148 // this.preDealData(this.pd);
131 this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]); 149 // this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
132 }, 150 },
133 151
134 methods: { 152 methods: {
...@@ -153,9 +171,12 @@ export default { ...@@ -153,9 +171,12 @@ export default {
153 changeLpbVisible(data) { 171 changeLpbVisible(data) {
154 this.lpbvisible = data; 172 this.lpbvisible = data;
155 }, 173 },
174 changeCreateVisible(data){
175 this.createVisible = true;
176 },
156 //添加定着物 177 //添加定着物
157 openCreateDialog(){ 178 openCreateDialog(){
158 this.dialogVisible = true 179 this.dialogVisible = true;
159 this.$store.state.rightClickZdbsm = this.zdData.zdbsm; 180 this.$store.state.rightClickZdbsm = this.zdData.zdbsm;
160 }, 181 },
161 //关闭添加定着物弹框 182 //关闭添加定着物弹框
...@@ -163,12 +184,8 @@ export default { ...@@ -163,12 +184,8 @@ export default {
163 this.dialogVisible = false; 184 this.dialogVisible = false;
164 }, 185 },
165 preDealData(list) { 186 preDealData(list) {
166 list.forEach((x) => { 187 //楼盘表目录树没有expand属性
167 if (!x.expand) this.$set(x, "expand", true); 188 list[0].expand = list[0].expand == undefined ? true:list[0].expand;
168 if (x.children && x.children.length > 0) {
169 this.preDealData(x.children);
170 }
171 });
172 return list; 189 return list;
173 }, 190 },
174 // 根据id展开树的具体项 191 // 根据id展开树的具体项
...@@ -189,7 +206,7 @@ export default { ...@@ -189,7 +206,7 @@ export default {
189 console.log(this.formatData, "this.formatData"); 206 console.log(this.formatData, "this.formatData");
190 }, 207 },
191 itemClick(item) { 208 itemClick(item) {
192 item.expand = !item.expand; 209 item.expand = item.expand == undefined? true:!item.expand;
193 this.$emit("itemClick", item); 210 this.$emit("itemClick", item);
194 }, 211 },
195 // 详情点击 212 // 详情点击
...@@ -202,14 +219,16 @@ export default { ...@@ -202,14 +219,16 @@ export default {
202 }, 219 },
203 //自然幢右键点击事件 220 //自然幢右键点击事件
204 openMenu(e,item){ 221 openMenu(e,item){
222 console.log(item,'右键item');
205 this.lpbleft = e.pageX; 223 this.lpbleft = e.pageX;
206 this.lpbtop = e.pageY; 224 this.lpbtop = e.pageY;
207 this.zdData = item; 225 this.zdData = item;
208 this.changeLpbVisible(true); 226 this.changeLpbVisible(true);
209 }, 227 },
210 //关闭自然幢右击菜单 228 //关闭右键菜单
211 closeMenu(){ 229 closeMenu(){
212 this.lpbvisible = false 230 this.lpbvisible = false;
231 this.createVisible = false;
213 }, 232 },
214 //楼盘表右键菜单项打开父组件弹框 233 //楼盘表右键菜单项打开父组件弹框
215 openLpbDialog(type){ 234 openLpbDialog(type){
...@@ -222,22 +241,7 @@ export default { ...@@ -222,22 +241,7 @@ export default {
222 }, 241 },
223 //右键菜单的删除 242 //右键菜单的删除
224 deleteByBsm(){ 243 deleteByBsm(){
225 //let zdBsm = this.zdData.zdbsm;
226 //let type;
227 console.log(this.zdData.zdbsm); 244 console.log(this.zdData.zdbsm);
228 //switch (this.zdData.type){
229 // case "zd":
230 // type="0";
231 // break;
232 // case "zrz":
233 // type="1";
234 // break;
235 // case "h":
236 // type="2";
237 // break;
238 // default:
239 // break;
240 //}
241 let params={"bsm":this.zdData.zdbsm,"type":this.zdData.type} 245 let params={"bsm":this.zdData.zdbsm,"type":this.zdData.type}
242 deleteZdInfoByBsm(params) 246 deleteZdInfoByBsm(params)
243 .then((res) => { 247 .then((res) => {
...@@ -260,31 +264,7 @@ export default { ...@@ -260,31 +264,7 @@ export default {
260 }; 264 };
261 </script> 265 </script>
262 <style lang="less" scoped> 266 <style lang="less" scoped>
263 // 自定义右键菜单样式 start
264 .contextmenu {
265 margin: 0;
266 background: #fff;
267 z-index: 3000;
268 position: absolute;
269 list-style-type: none;
270 padding: 5px 0;
271 border-radius: 4px;
272 font-size: 12px;
273 font-weight: 400;
274 color: #333;
275 box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
276 }
277 267
278 .contextmenu li {
279 margin: 0;
280 padding: 7px 16px;
281 cursor: pointer;
282 }
283
284 .contextmenu li:hover {
285 background: #eee;
286 }
287 // end
288 .content { 268 .content {
289 height: 100%; 269 height: 100%;
290 width: 100%; 270 width: 100%;
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
18 <el-header> 18 <el-header>
19 <div class="header-top"> 19 <div class="header-top">
20 <div class="top-items" @click="toggleClick"> 20 <div class="top-items" @click="toggleClick">
21 <i class="fa fa-outdent hamburger" v-show="!isActive"></i> 21 <i class="fa fa-outdent" v-show="!isActive"></i>
22 <i class="fa fa-indent hamburger" v-show="isActive"></i> 22 <i class="fa fa-indent" v-show="isActive"></i>
23 </div> 23 </div>
24 <div 24 <div
25 class="top-items" 25 class="top-items"
...@@ -163,23 +163,23 @@ export default { ...@@ -163,23 +163,23 @@ export default {
163 let list = [ 163 let list = [
164 { 164 {
165 name: "新建", 165 name: "新建",
166 icon: "fa fa-address-card-o", 166 icon: "fa fa-plus-square",
167 path: "/create", 167 path: "/create",
168 }, 168 },
169 { 169 {
170 name: "添加", 170 name: "添加",
171 icon: "fa fa-address-card-o", 171 icon: "fa fa-plus-circle",
172 path: "/add", 172 path: "/add",
173 }, 173 },
174 { name: "更正", icon: "fa fa-address-card-o", path: "/modify" }, 174 { name: "更正", icon: "fa fa-pencil-square", path: "/modify" },
175 { 175 {
176 name: "变更", 176 name: "变更",
177 icon: "fa fa-address-card-o", 177 icon: "fa fa-exchange",
178 path: "/change", 178 path: "/change",
179 }, 179 },
180 { 180 {
181 name: "综合查询", 181 name: "综合查询",
182 icon: "fa fa-address-card-o", 182 icon: "fa fa-search",
183 path: "/search", 183 path: "/search",
184 }, 184 },
185 ]; 185 ];
......
...@@ -75,17 +75,17 @@ export default { ...@@ -75,17 +75,17 @@ export default {
75 data() { 75 data() {
76 return { 76 return {
77 workList: [ 77 workList: [
78 { name: "待办箱", img: require("../../assets/images/temp1.png") }, 78 { name: "待办箱", img: require("../../assets/images/dbx.png") },
79 { name: "退件箱", img: require("../../assets/images/temp2.png") }, 79 { name: "退件箱", img: require("../../assets/images/tjx.png") },
80 ], 80 ],
81 list: [ 81 list: [
82 { name: "宗地分割", img: require("../../assets/images/temp1.png") }, 82 { name: "宗地分割", img: require("../../assets/images/zdfg.png") },
83 { 83 {
84 name: "导入楼盘表模板", 84 name: "导入楼盘表模板",
85 img: require("../../assets/images/temp2.png"), 85 img: require("../../assets/images/drlpbmb.png"),
86 }, 86 },
87 { name: "新办房屋", img: require("../../assets/images/temp1.png") }, 87 { name: "新办房屋", img: require("../../assets/images/xbfw.png") },
88 { name: "重新落宗", img: require("../../assets/images/temp2.png") }, 88 { name: "重新落宗", img: require("../../assets/images/cxlz.png") },
89 ], 89 ],
90 tableData: [ 90 tableData: [
91 91
......
1 <template>
2 <div class="main">
3 <el-upload
4 class="upload-demo"
5 action="/api/file/uploadList"
6 :on-preview="handlePreview"
7 :on-remove="handleRemove"
8 :before-remove="beforeRemove"
9 :on-success="uploadSuccess"
10 :on-error="uploadError"
11 multiple
12 :limit="3"
13 :on-exceed="handleExceed"
14 >
15 <el-button size="small" type="primary">上传</el-button>
16 </el-upload>
17 <table border="2">
18 <tr>
19 <th>序号</th>
20 <th>文件名称</th>
21 <th>文件类型</th>
22 <th>操作</th>
23 </tr>
24 <tr v-for="(item,index) in list" :key="index">
25 <td>{{index+1}}</td>
26 <td>{{item.wjmc}}</td>
27 <td>{{item.wjlx}}</td>
28 <td>
29 <span>下载</span>
30 <span>预览</span>
31 </td>
32 </tr>
33 </table>
34 </div>
35 </template>
36
37 <script>
38 import {insertFile} from "./../../../api/common"
39 import {Message} from "element-ui"
40 export default {
41 name: "fjcl",
42 data() {
43 return {
44 list: [
45 {
46 wjmc: '调查文档1',
47 wjlx: 'doc',
48 url: ''
49 },
50 {
51 wjmc: '调查文档2',
52 wjlx: 'doc',
53 url: ''
54 },
55 {
56 wjmc: '调查文档3',
57 wjlx: 'doc',
58 url: ''
59 },
60 {
61 wjmc: '调查文档4',
62 wjlx: 'doc',
63 url: ''
64 },
65 ],
66 filesData:{
67 dylx: "",
68 glbsm: "",
69 list: [
70 {
71 filename: "",
72 filepostfix: "",
73 fileurl: ""
74 }
75 ]
76 },
77 }
78 },
79 mounted(){
80 switch (this.$route.name) {
81 case "宗地":
82 this.filesData.dylx='zd';
83 this.filesData.glbsm=this.$store.state.zdbsm
84 break;
85 case "自然幢":
86 this.filesData.dylx='zrz';
87 this.filesData.glbsm=this.$store.state.zrzbsm
88 break
89 default:
90 break
91 }
92 },
93 methods: {
94 uploadError(err,file,fileList){
95 console.log("上传文件失败",err)
96 },
97 uploadSuccess(res, file, fileList) {
98 this.filesData.list = res.result;
99 console.log(res,"res=========")
100 insertFile(this.filesData).then(res=>{
101 if (res.success) {
102 Message.warning("上传成功")
103 }else {
104 Message.error(res.message)
105 }
106 })
107 },
108 handleRemove(file, fileList) {
109 console.log(file, fileList);
110 },
111 handlePreview(file) {
112 console.log(file);
113 },
114 handleExceed(files, fileList) {
115 console.log(fileList)
116 this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
117 },
118 beforeRemove(file, fileList) {
119 return this.$confirm(`确定移除 ${ file.name }?`);
120 }
121 },
122 watch:{
123 }
124 }
125 </script>
126
127 <style scoped lang="less">
128 .main {
129 box-sizing: border-box;
130 padding: 18px;
131 height: auto;
132 width: 80%;
133 }
134
135 table {
136 margin-top: 10px;
137 background-color: #fff;
138 font-size: 14px;
139 width: 100%;
140 td, th {
141 text-align: center;
142 height: 36px;
143 min-width: 50px;
144 }
145 }
146
147
148 </style>
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
7 <el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane> 7 <el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane>
8 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 8 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
9 <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> 9 <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
10 <el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane>
10 </el-tabs> 11 </el-tabs>
11 </div> 12 </div>
12 </template> 13 </template>
...@@ -18,10 +19,11 @@ import jzd from "./jzd"; ...@@ -18,10 +19,11 @@ import jzd from "./jzd";
18 import jzx from "./jzx"; 19 import jzx from "./jzx";
19 import djb from "./djb"; 20 import djb from "./djb";
20 import lshs from "./lshs"; 21 import lshs from "./lshs";
22 import fjcl from "./fjcl/fjcl"
21 export default { 23 export default {
22 name: "", 24 name: "",
23 components: { 25 components: {
24 zddcb,mjftb,jzd,jzx,djb,lshs 26 zddcb,mjftb,jzd,jzx,djb,lshs,fjcl
25 }, 27 },
26 props: {}, 28 props: {},
27 data() { 29 data() {
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
12 <table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> 12 <table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
13 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> 13 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
14 <!-- 显示层数 --> 14 <!-- 显示层数 -->
15 <td class="floor">{{cs.sjc}}</td> 15 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}</td>
16 <!-- 显示户 --> 16 <!-- 显示户 -->
17 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td> 17 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
18 </tr> 18 </tr>
19 </table> 19 </table>
20 <!-- </div> --> 20 <!-- </div> -->
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
28 <table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0"> 28 <table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0">
29 <tr v-for="(cs) in ljzs.cs" :key="cs.bsm"> 29 <tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
30 <!-- 显示层数 --> 30 <!-- 显示层数 -->
31 <td class="floor">{{cs.sjc}}</td> 31 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}</td>
32 <!-- 显示户 --> 32 <!-- 显示户 -->
33 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td> 33 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
34 </tr> 34 </tr>
35 </table> 35 </table>
36 </div> 36 </div>
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
53 <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> 53 <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
54 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> 54 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
55 <!-- 显示层数 --> 55 <!-- 显示层数 -->
56 <td class="floor">{{cs.sjc}}</td> 56 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}</td>
57 <!-- 显示户 --> 57 <!-- 显示户 -->
58 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td> 58 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
59 </tr> 59 </tr>
60 </table> 60 </table>
61 </div> 61 </div>
...@@ -65,9 +65,9 @@ ...@@ -65,9 +65,9 @@
65 <table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" > 65 <table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" >
66 <tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex"> 66 <tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex">
67 <!-- 显示层数 --> 67 <!-- 显示层数 -->
68 <td class="floor">{{cs.sjc}}</td> 68 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}</td>
69 <!-- 显示户 --> 69 <!-- 显示户 -->
70 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)">{{hs.shbw}}</td> 70 <td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
71 </tr> 71 </tr>
72 </table> 72 </table>
73 </div> 73 </div>
...@@ -81,6 +81,18 @@ ...@@ -81,6 +81,18 @@
81 > 81 >
82 {{ lpbData.xmmc }} 82 {{ lpbData.xmmc }}
83 </div> 83 </div>
84 <ul
85 v-show="lpbChVisible"
86 :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }"
87 class="contextmenu"
88 >
89 <li v-show='rightClickFlag=="h"' @click="handleAddH">添加</li>
90 <li v-show='rightClickFlag=="h"' @click="handleMoveH">移动</li>
91 <li v-show='rightClickFlag=="h"' @click="handleDeleteH">删除</li>
92 <li v-show='rightClickFlag=="h"' @click="handleSyczh">实预测转换</li>
93 <li v-show='rightClickFlag=="c"' @click="handleAddC">添加</li>
94 <li v-show='rightClickFlag=="c"' @click="handleDeleteC">删除</li>
95 </ul>
84 </div> 96 </div>
85 </template> 97 </template>
86 <script> 98 <script>
...@@ -109,6 +121,12 @@ export default { ...@@ -109,6 +121,12 @@ export default {
109 searchNum: Math.random(), 121 searchNum: Math.random(),
110 //接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList 122 //接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList
111 choosedList: [], 123 choosedList: [],
124 lpbChVisible:false, //层户右键菜单显隐
125 lpbChLeft:100,
126 lpbChTop:100,
127 //右键层户数据
128 chData:'',
129 rightClickFlag:""
112 }; 130 };
113 }, 131 },
114 created() {}, 132 created() {},
...@@ -247,7 +265,7 @@ export default { ...@@ -247,7 +265,7 @@ export default {
247 }, 265 },
248 //清除选中户 266 //清除选中户
249 clearChoosedH() { 267 clearChoosedH() {
250 this.$nextTick(() => { 268 // this.$nextTick(() => {
251 //将每个选中的户的选中状态清除 269 //将每个选中的户的选中状态清除
252 this.$refs.hBsm.forEach((item) => { 270 this.$refs.hBsm.forEach((item) => {
253 if (item.className == "tdSelect") { 271 if (item.className == "tdSelect") {
...@@ -256,8 +274,43 @@ export default { ...@@ -256,8 +274,43 @@ export default {
256 }); 274 });
257 // 清空hbsmList 275 // 清空hbsmList
258 this.hbsmList = []; 276 this.hbsmList = [];
259 }); 277 // });
278 },
279 //户右键点击事件
280 openMenu(e,item,type){
281 console.log(e,'e');
282 this.lpbChLeft = e.pageX;
283 this.lpbChTop = e.pageY;
284 this.chData = item;
285 this.rightClickFlag = type;
286 this.lpbChVisible = true;
287 },
288 //关闭右键菜单
289 closeMenu(){
290 this.lpbChVisible = false
291 },
292 //户右键菜单 start
293 handleAddH(){
294
295 },
296 handleMoveH(){
297
260 }, 298 },
299 handleDeleteH(){
300
301 },
302 handleSyczh(){
303
304 },
305 //end
306 // 层右键菜单 start
307 handleAddC(){
308
309 },
310 handleDeleteC(){
311
312 },
313 //end
261 }, 314 },
262 computed: { 315 computed: {
263 createFlagChange() { 316 createFlagChange() {
...@@ -298,11 +351,19 @@ export default { ...@@ -298,11 +351,19 @@ export default {
298 this.$refs.hBsm.forEach((item) => { 351 this.$refs.hBsm.forEach((item) => {
299 this.choosedList.forEach((i) => { 352 this.choosedList.forEach((i) => {
300 if (item.dataset.bsm == i) { 353 if (item.dataset.bsm == i) {
354 console.log(item.dataset.bsm+'----分割线-----'+i);
301 item.className = "tdSelect"; 355 item.className = "tdSelect";
302 } 356 }
303 }); 357 });
304 }); 358 });
305 }, 359 },
360 lpbChVisible(value) {
361 if (value) {
362 document.body.addEventListener("click", this.closeMenu);
363 } else {
364 document.body.removeEventListener("click", this.closeMenu);
365 }
366 }
306 }, 367 },
307 }; 368 };
308 </script> 369 </script>
...@@ -311,7 +372,6 @@ export default { ...@@ -311,7 +372,6 @@ export default {
311 width: 100%; 372 width: 100%;
312 height: 100%; 373 height: 100%;
313 overflow: hidden; 374 overflow: hidden;
314 position: relative;
315 .lpbContent { 375 .lpbContent {
316 width: 100%; 376 width: 100%;
317 height: 100%; 377 height: 100%;
...@@ -438,8 +498,8 @@ export default { ...@@ -438,8 +498,8 @@ export default {
438 height: 60px; 498 height: 60px;
439 line-height: 60px; 499 line-height: 60px;
440 background-color: darkgoldenrod; 500 background-color: darkgoldenrod;
441 position: absolute; 501 position: relative;
442 bottom: 6px; 502 bottom: 66px;
443 text-align: center; 503 text-align: center;
444 transition: 0.5s; 504 transition: 0.5s;
445 } 505 }
......