a5cdec84 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 96c84786 a88ab7fa
......@@ -119,4 +119,15 @@ export function submit (data) {
method: 'post',
data:data
})
}
\ No newline at end of file
}
/**
* 添加附件
*/
export function insertFile(data) {
return request({
url:'/file',
method:'post',
data:data
})
}
......
<?xml version="1.0" encoding="UTF-8"?>
<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">
<!-- Generator: Sketch 55.1 (78136) - https://sketchapp.com -->
<title>icon_files_collapse_</title>
<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">
<!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
<title></title>
<desc>Created with Sketch.</desc>
<g id="报告工作站" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1--报告工作站_书写报告" transform="translate(-100.000000, -217.000000)">
<g id="模板" transform="translate(80.000000, 51.000000)">
<g id="分组" transform="translate(20.000000, 135.000000)">
<g id="icon_files_collapse_" transform="translate(0.000000, 31.000000)">
<rect id="矩形-copy-18" fill="#D8D8D8" opacity="0" x="0" y="0" width="17" height="17"></rect>
<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>
</g>
<g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="画板" transform="translate(-4.000000, -58.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="子" transform="translate(4.000000, 58.000000)">
<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>
<g id="编组-5" transform="translate(4.000000, 3.500000)">
<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>
</g>
</g>
</g>
......
<?xml version="1.0" encoding="UTF-8"?>
<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">
<!-- Generator: Sketch 55.1 (78136) - https://sketchapp.com -->
<title>icon_file_default_</title>
<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">
<!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
<title></title>
<desc>Created with Sketch.</desc>
<g id="报告工作站" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1--报告工作站_书写报告" transform="translate(-127.000000, -246.000000)">
<g id="模板" transform="translate(80.000000, 51.000000)">
<g id="分组" transform="translate(20.000000, 135.000000)">
<g id="icon_file_default_" transform="translate(27.000000, 60.000000)">
<rect id="矩形" fill="#D8D8D8" opacity="0" x="0" y="0" width="17" height="17"></rect>
<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>
</g>
</g>
<g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="画板" transform="translate(-4.000000, -77.000000)">
<g id="正" transform="translate(4.000000, 77.000000)">
<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>
<g id="编组-5" transform="translate(3.000000, 3.500000)"></g>
</g>
</g>
</g>
......
<?xml version="1.0" encoding="UTF-8"?>
<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">
<!-- Generator: Sketch 55.1 (78136) - https://sketchapp.com -->
<title>icon_files_expand_</title>
<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">
<!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
<title></title>
<desc>Created with Sketch.</desc>
<g id="报告工作站" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1--报告工作站_书写报告" transform="translate(-100.000000, -187.000000)">
<g id="模板" transform="translate(80.000000, 51.000000)">
<g id="分组" transform="translate(20.000000, 135.000000)">
<g id="icon_files_expand_" transform="translate(0.000000, 1.000000)">
<rect id="矩形-copy-17" fill="#D8D8D8" opacity="0" x="0" y="0" width="17" height="17"></rect>
<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>
</g>
<g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="画板" transform="translate(-4.000000, -41.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="父" transform="translate(4.000000, 41.000000)">
<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>
<g id="编组-5" transform="translate(4.000000, 3.500000)">
<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>
<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>
</g>
</g>
</g>
......
......@@ -48,11 +48,13 @@ table,td,tr,.el-col,.title{
border: none;
color: #606764;
overflow: visible;
cursor: text;
text-align: left;
text-indent: 20px;
padding: 0;
}
input:disabled{
cursor: not-allowed;
}
.formInput:focus{
border: 1px solid #A0C5F6!important;
}
......@@ -121,4 +123,28 @@ ol, ul { list-style:none; }
}
.el-tabs__content{
position: unset;
}
\ No newline at end of file
}
// 自定义右键菜单样式
.contextmenu {
margin: 0;
background: #fff;
z-index: 3000;
position: absolute;
list-style-type: none;
padding: 5px 0;
border-radius: 4px;
font-size: 12px;
font-weight: 400;
color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
}
.contextmenu li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
}
.contextmenu li:hover {
background: #eee;
}
// end
\ No newline at end of file
......
......@@ -8,14 +8,19 @@
<el-row>
<el-col :span="16" class="fl">
<el-radio-group v-model="gyfs">
<el-radio :label="item.bsm" :key="item.bsm" v-for="item in $store.state.gyfsList">{{item.mc}}</el-radio>
<el-radio :label="item.bsm" :disabled="qszt!='0'" :key="item.bsm" v-for="item in $store.state.gyfsList">{{item.mc}}</el-radio>
</el-radio-group>
</el-col>
<el-col :span="4" class="fr">
<el-col :span="4" class="fr" v-show="qszt=='0'">
<span class="span" @click="addRow">新增</span>
<span class="span" @click="changeRow">修改</span>
<span class="span" @click="delRow">删除</span>
</el-col>
<el-col :span="4" class="fr" v-show="qszt!='0'">
<span class="noEdit" @click="addRow">新增</span>
<span class="noEdit" @click="changeRow">修改</span>
<span class="noEdit" @click="delRow">删除</span>
</el-col>
</el-row>
</td>
</tr>
......@@ -300,9 +305,9 @@
export default {
props: {
widtd: {
qszt: {
type: String,
default: "70%",
default: "0",
},
title: {
type: String,
......@@ -539,6 +544,11 @@
margin-right: 10px;
cursor: pointer;
}
.noEdit {
color:#606266;
margin-right: 10px;
cursor: not-allowed;
}
.el-radio {
margin-right: 20px !important;
}
......
......@@ -77,7 +77,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:disabled="formData.qszt!='0'"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -92,7 +92,7 @@
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:disabled="formData.qszt!='0'"
:data="$store.state.tdytList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -102,6 +102,7 @@
</li>
<li>
<el-date-picker
:disabled="formData.qszt!='0'"
v-model="childItem.tdsyqssj"
type="date"
value-format="yyyy-MM-dd"
......@@ -131,6 +132,7 @@
<li>
<input
type="text"
:disabled="formData.qszt!='0'"
placeholder="请输入"
v-model="childItem.pzytdm"
class="formInput"
......@@ -139,6 +141,7 @@
<li>
<input
type="text"
:disabled="formData.qszt!='0'"
placeholder="请输入"
v-model="childItem.sjytdm"
class="formInput"
......@@ -147,6 +150,7 @@
<li>
<input
type="text"
:disabled="formData.qszt!='0'"
placeholder="请输入"
v-model="childItem.syqx"
class="formInput"
......@@ -174,6 +178,7 @@
<ul>
<li>
<el-select
:disabled="formData.qszt!='0'"
class="formSelect percent30"
v-model="childItem.pzdjbsm"
>
......@@ -188,6 +193,7 @@
</li>
<li>
<el-select
:disabled="formData.qszt!='0'"
class="formSelect percent30"
v-model="childItem.sjdjbsm"
>
......@@ -202,6 +208,7 @@
</li>
<li>
<el-date-picker
:disabled="formData.qszt!='0'"
v-model="childItem.tdsyjssj"
type="date"
value-format="yyyy-MM-dd"
......@@ -216,10 +223,10 @@
<div class="title">
<el-select-tree
v-if="show"
:disabled="formData.qszt!='0'"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
:data="$store.state.qlxzList"
:props="treeProps"
:check-strictly="checkStrictly"
......@@ -235,10 +242,12 @@
import { getDdicByMC } from "../../api/common";
export default {
props: {
// widtd: {
// type: String,
// default: "70%",
// },
formData: {
type: Object,
default: () => {
return {};
},
},
},
data() {
return {
......@@ -290,6 +299,9 @@ export default {
};
},
created() {},
mounted(){
console.log(this.formData,'formData');
},
methods: {
//外层操作
handleClick(ind, type) {
......
<template>
<div class="main">
<el-dialog
title="户重新落宗"
:visible.sync="isVisible"
......@@ -68,7 +67,6 @@
<query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
:isZdClose="true"></query-data>
</el-dialog>
</div>
</template>
<script>
......
......@@ -35,7 +35,7 @@
></div>
<div
class="layer_text nowrap"
@contextmenu.prevent="openMenu($event, item)"
@contextmenu.prevent="openMenu($event, item,list)"
:class="{
active_color: item.expand,
}"
......@@ -86,7 +86,8 @@ export default {
// 开启延时器,300ms的间隔区分单击和双击,解决双击时执行两次单击事件
clearTimeout(self.time);
self.time = setTimeout(() => {
item.expand = !item.expand;
item.expand = item.expand == undefined? true:!item.expand;
self.$emit("itemClick", item);
if (!item.children) {
self.$emit("valClick", item);
......@@ -94,10 +95,17 @@ export default {
}, 300);
},
// 右键点击事件
openMenu(e, item) {
openMenu(e, item,list) {
console.log(list,'右键list');
this.$emit("changeTop", e.pageY);
this.$emit("changeLeft", e.pageX);
this.$emit("changeZdData",item);
//判断所有权类型
console.log(item.dm,'item.dm ');
if(item.dm == 'G' || item.dm == 'J' ||item.dm == 'Z'){
this.$emit("changeCreateVisible", true);
}
//判断楼盘类型
switch (item.type) {
case 'zd':
this.$emit("changeIsZD", true);
......@@ -224,9 +232,10 @@ export default {
position: absolute;
height: 1px;
width: 16px;
left: 9px;
top: 9px;
background: url('../../assets/images/rowline.png');
left: 8px;
top: 8px;
opacity: .5;
background: url('../../assets/images/rowline1.png');
background-position-y: center;
}
.third_layer::before {
......@@ -234,9 +243,10 @@ export default {
position: absolute;
height: 1px;
width: 22px;
left: 9px;
top: 9px;
background: url('../../assets/images/rowline.png');
left: 8px;
top: 8px;
opacity: .5;
background: url('../../assets/images/rowline1.png');
background-position-y: center;
}
......@@ -247,7 +257,8 @@ export default {
width: 1px;
left: 7px;
top: 0px;
background: url('../../assets/images/colline.png');
opacity: .5;
background: url('../../assets/images/colline1.png');
background-position-x: center;
}
.linkLine_first::after {
......@@ -258,7 +269,8 @@ export default {
height: calc(100% + 14px);
width: 1px;
left: 7px;
background: url('../../assets/images/colline.png');
opacity: .5;
background: url('../../assets/images/colline1.png');
background-position-x: center;
}
// 上半截
......@@ -269,7 +281,8 @@ export default {
top: -14px;
width: 1px;
left: 7px;
background: url('../../assets/images/colline.png');
opacity: .5;
background: url('../../assets/images/colline1.png');
background-position-x: center;
}
.linkLine_last::after {
......@@ -279,28 +292,33 @@ export default {
width: 1px;
left: 7px;
top: 0px;
background: url('../../assets/images/colline.png');
opacity: .5;
background: url('../../assets/images/colline1.png');
background-position-x: center;
}
.reTree_collapse_icon {
opacity: .5;
background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
center;
background-size: contain;
}
.reTree_default_icon {
opacity: .5;
background: url("../../assets/images/reTree_default_.svg") no-repeat center
center;
background-size: contain;
}
.reTree_expand_icon {
opacity: .5;
background: url("../../assets/images/reTree_expand_.svg") no-repeat center
center;
background-size: contain;
}
.reTree_focus_icon {
opacity: .5;
background: url("../../assets/images/reTree_focus_.svg") no-repeat center
center;
background-size: contain;
......
......@@ -40,6 +40,7 @@
@changeVisible="changeVisible"
@changeLpbVisible="changeLpbVisible"
@changeIsZD="changeIsZD"
@changeCreateVisible="changeCreateVisible"
:list="item.children"
:visible="visible"
:size="size"
......@@ -62,13 +63,20 @@
<li @click="deleteByBsm()">删除</li>
</ul>
<ul
v-show="createVisible"
:style="{ left: left + 'px', top: top + 'px' }"
class="contextmenu"
>
<li @click="openCreateDialog">新建宗地</li>
</ul>
<ul
v-show="lpbvisible"
:style="{ left: lpbleft + 'px', top: lpbtop + 'px' }"
class="contextmenu"
>
<li v-show="zdData.type == 'zrz'" @click="openLpbDialog('ljz')">添加逻辑幢</li>
<li v-show="zdData.type == 'zrz' || zdData.type == 'ljz'" @click="openLpbDialog('zdy')">添加幢单元</li>
<li @click="openLpbDialog('ch')">添加层户</li>
<li v-show="zdData.type == 'zrz' || zdData.type == 'ljz' || zdData.type == 'zdy'" @click="openLpbDialog('ch')">添加层户</li>
</ul>
<!-- 添加定着物弹框 -->
<el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
......@@ -109,6 +117,8 @@ export default {
lpbvisible: false,
lpbtop: 0,
lpbleft: 0,
//控制新建宗地菜单
createVisible:false,
};
},
watch: {
......@@ -123,12 +133,20 @@ export default {
} else {
document.body.removeEventListener("click", this.closeMenu);
}
},
createVisible(value) {
if (value) {
document.body.addEventListener("click", this.closeMenu);
} else {
document.body.removeEventListener("click", this.closeMenu);
}
}
},
created() {
console.log("lineTree create");
this.preDealData(this.pd);
this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
// this.preDealData(this.pd);
// this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
},
methods: {
......@@ -153,9 +171,12 @@ export default {
changeLpbVisible(data) {
this.lpbvisible = data;
},
changeCreateVisible(data){
this.createVisible = true;
},
//添加定着物
openCreateDialog(){
this.dialogVisible = true
this.dialogVisible = true;
this.$store.state.rightClickZdbsm = this.zdData.zdbsm;
},
//关闭添加定着物弹框
......@@ -163,12 +184,8 @@ export default {
this.dialogVisible = false;
},
preDealData(list) {
list.forEach((x) => {
if (!x.expand) this.$set(x, "expand", true);
if (x.children && x.children.length > 0) {
this.preDealData(x.children);
}
});
//楼盘表目录树没有expand属性
list[0].expand = list[0].expand == undefined ? true:list[0].expand;
return list;
},
// 根据id展开树的具体项
......@@ -189,7 +206,7 @@ export default {
console.log(this.formatData, "this.formatData");
},
itemClick(item) {
item.expand = !item.expand;
item.expand = item.expand == undefined? true:!item.expand;
this.$emit("itemClick", item);
},
// 详情点击
......@@ -202,14 +219,16 @@ export default {
},
//自然幢右键点击事件
openMenu(e,item){
console.log(item,'右键item');
this.lpbleft = e.pageX;
this.lpbtop = e.pageY;
this.zdData = item;
this.changeLpbVisible(true);
},
//关闭自然幢右击菜单
//关闭右键菜单
closeMenu(){
this.lpbvisible = false
this.lpbvisible = false;
this.createVisible = false;
},
//楼盘表右键菜单项打开父组件弹框
openLpbDialog(type){
......@@ -222,22 +241,7 @@ export default {
},
//右键菜单的删除
deleteByBsm(){
//let zdBsm = this.zdData.zdbsm;
//let type;
console.log(this.zdData.zdbsm);
//switch (this.zdData.type){
// case "zd":
// type="0";
// break;
// case "zrz":
// type="1";
// break;
// case "h":
// type="2";
// break;
// default:
// break;
//}
let params={"bsm":this.zdData.zdbsm,"type":this.zdData.type}
deleteZdInfoByBsm(params)
.then((res) => {
......@@ -260,31 +264,7 @@ export default {
};
</script>
<style lang="less" scoped>
// 自定义右键菜单样式 start
.contextmenu {
margin: 0;
background: #fff;
z-index: 3000;
position: absolute;
list-style-type: none;
padding: 5px 0;
border-radius: 4px;
font-size: 12px;
font-weight: 400;
color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
}
.contextmenu li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
}
.contextmenu li:hover {
background: #eee;
}
// end
.content {
height: 100%;
width: 100%;
......
......@@ -18,8 +18,8 @@
<el-header>
<div class="header-top">
<div class="top-items" @click="toggleClick">
<i class="fa fa-outdent hamburger" v-show="!isActive"></i>
<i class="fa fa-indent hamburger" v-show="isActive"></i>
<i class="fa fa-outdent" v-show="!isActive"></i>
<i class="fa fa-indent" v-show="isActive"></i>
</div>
<div
class="top-items"
......@@ -163,23 +163,23 @@ export default {
let list = [
{
name: "新建",
icon: "fa fa-address-card-o",
icon: "fa fa-plus-square",
path: "/create",
},
{
name: "添加",
icon: "fa fa-address-card-o",
icon: "fa fa-plus-circle",
path: "/add",
},
{ name: "更正", icon: "fa fa-address-card-o", path: "/modify" },
{ name: "更正", icon: "fa fa-pencil-square", path: "/modify" },
{
name: "变更",
icon: "fa fa-address-card-o",
icon: "fa fa-exchange",
path: "/change",
},
{
name: "综合查询",
icon: "fa fa-address-card-o",
icon: "fa fa-search",
path: "/search",
},
];
......
......@@ -75,17 +75,17 @@ export default {
data() {
return {
workList: [
{ name: "待办箱", img: require("../../assets/images/temp1.png") },
{ name: "退件箱", img: require("../../assets/images/temp2.png") },
{ name: "待办箱", img: require("../../assets/images/dbx.png") },
{ name: "退件箱", img: require("../../assets/images/tjx.png") },
],
list: [
{ name: "宗地分割", img: require("../../assets/images/temp1.png") },
{ name: "宗地分割", img: require("../../assets/images/zdfg.png") },
{
name: "导入楼盘表模板",
img: require("../../assets/images/temp2.png"),
img: require("../../assets/images/drlpbmb.png"),
},
{ name: "新办房屋", img: require("../../assets/images/temp1.png") },
{ name: "重新落宗", img: require("../../assets/images/temp2.png") },
{ name: "新办房屋", img: require("../../assets/images/xbfw.png") },
{ name: "重新落宗", img: require("../../assets/images/cxlz.png") },
],
tableData: [
......
<template>
<div class="main">
<el-upload
class="upload-demo"
action="/api/file/uploadList"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:on-success="uploadSuccess"
:on-error="uploadError"
multiple
:limit="3"
:on-exceed="handleExceed"
>
<el-button size="small" type="primary">上传</el-button>
</el-upload>
<table border="2">
<tr>
<th>序号</th>
<th>文件名称</th>
<th>文件类型</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in list" :key="index">
<td>{{index+1}}</td>
<td>{{item.wjmc}}</td>
<td>{{item.wjlx}}</td>
<td>
<span>下载</span>
<span>预览</span>
</td>
</tr>
</table>
</div>
</template>
<script>
import {insertFile} from "./../../../api/common"
import {Message} from "element-ui"
export default {
name: "fjcl",
data() {
return {
list: [
{
wjmc: '调查文档1',
wjlx: 'doc',
url: ''
},
{
wjmc: '调查文档2',
wjlx: 'doc',
url: ''
},
{
wjmc: '调查文档3',
wjlx: 'doc',
url: ''
},
{
wjmc: '调查文档4',
wjlx: 'doc',
url: ''
},
],
filesData:{
dylx: "",
glbsm: "",
list: [
{
filename: "",
filepostfix: "",
fileurl: ""
}
]
},
}
},
mounted(){
switch (this.$route.name) {
case "宗地":
this.filesData.dylx='zd';
this.filesData.glbsm=this.$store.state.zdbsm
break;
case "自然幢":
this.filesData.dylx='zrz';
this.filesData.glbsm=this.$store.state.zrzbsm
break
default:
break
}
},
methods: {
uploadError(err,file,fileList){
console.log("上传文件失败",err)
},
uploadSuccess(res, file, fileList) {
this.filesData.list = res.result;
console.log(res,"res=========")
insertFile(this.filesData).then(res=>{
if (res.success) {
Message.warning("上传成功")
}else {
Message.error(res.message)
}
})
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
},
handleExceed(files, fileList) {
console.log(fileList)
this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${ file.name }?`);
}
},
watch:{
}
}
</script>
<style scoped lang="less">
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
td, th {
text-align: center;
height: 36px;
min-width: 50px;
}
}
</style>
......@@ -7,6 +7,7 @@
<el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane>
</el-tabs>
</div>
</template>
......@@ -18,10 +19,11 @@ import jzd from "./jzd";
import jzx from "./jzx";
import djb from "./djb";
import lshs from "./lshs";
import fjcl from "./fjcl/fjcl"
export default {
name: "",
components: {
zddcb,mjftb,jzd,jzx,djb,lshs
zddcb,mjftb,jzd,jzx,djb,lshs,fjcl
},
props: {},
data() {
......
......@@ -12,9 +12,9 @@
<table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}</td>
<!-- 显示户 -->
<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>
<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>
</tr>
</table>
<!-- </div> -->
......@@ -28,9 +28,9 @@
<table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0">
<tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}</td>
<!-- 显示户 -->
<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>
<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>
</tr>
</table>
</div>
......@@ -53,9 +53,9 @@
<table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}</td>
<!-- 显示户 -->
<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>
<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>
</tr>
</table>
</div>
......@@ -65,9 +65,9 @@
<table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" >
<tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex">
<!-- 显示层数 -->
<td class="floor">{{cs.sjc}}</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}</td>
<!-- 显示户 -->
<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>
<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>
</tr>
</table>
</div>
......@@ -81,6 +81,18 @@
>
{{ lpbData.xmmc }}
</div>
<ul
v-show="lpbChVisible"
:style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }"
class="contextmenu"
>
<li v-show='rightClickFlag=="h"' @click="handleAddH">添加</li>
<li v-show='rightClickFlag=="h"' @click="handleMoveH">移动</li>
<li v-show='rightClickFlag=="h"' @click="handleDeleteH">删除</li>
<li v-show='rightClickFlag=="h"' @click="handleSyczh">实预测转换</li>
<li v-show='rightClickFlag=="c"' @click="handleAddC">添加</li>
<li v-show='rightClickFlag=="c"' @click="handleDeleteC">删除</li>
</ul>
</div>
</template>
<script>
......@@ -109,6 +121,12 @@ export default {
searchNum: Math.random(),
//接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList
choosedList: [],
lpbChVisible:false, //层户右键菜单显隐
lpbChLeft:100,
lpbChTop:100,
//右键层户数据
chData:'',
rightClickFlag:""
};
},
created() {},
......@@ -247,7 +265,7 @@ export default {
},
//清除选中户
clearChoosedH() {
this.$nextTick(() => {
// this.$nextTick(() => {
//将每个选中的户的选中状态清除
this.$refs.hBsm.forEach((item) => {
if (item.className == "tdSelect") {
......@@ -256,8 +274,43 @@ export default {
});
// 清空hbsmList
this.hbsmList = [];
});
// });
},
//户右键点击事件
openMenu(e,item,type){
console.log(e,'e');
this.lpbChLeft = e.pageX;
this.lpbChTop = e.pageY;
this.chData = item;
this.rightClickFlag = type;
this.lpbChVisible = true;
},
//关闭右键菜单
closeMenu(){
this.lpbChVisible = false
},
//户右键菜单 start
handleAddH(){
},
handleMoveH(){
},
handleDeleteH(){
},
handleSyczh(){
},
//end
// 层右键菜单 start
handleAddC(){
},
handleDeleteC(){
},
//end
},
computed: {
createFlagChange() {
......@@ -298,11 +351,19 @@ export default {
this.$refs.hBsm.forEach((item) => {
this.choosedList.forEach((i) => {
if (item.dataset.bsm == i) {
console.log(item.dataset.bsm+'----分割线-----'+i);
item.className = "tdSelect";
}
});
});
},
lpbChVisible(value) {
if (value) {
document.body.addEventListener("click", this.closeMenu);
} else {
document.body.removeEventListener("click", this.closeMenu);
}
}
},
};
</script>
......@@ -311,7 +372,6 @@ export default {
width: 100%;
height: 100%;
overflow: hidden;
position: relative;
.lpbContent {
width: 100%;
height: 100%;
......@@ -438,8 +498,8 @@ export default {
height: 60px;
line-height: 60px;
background-color: darkgoldenrod;
position: absolute;
bottom: 6px;
position: relative;
bottom: 66px;
text-align: center;
transition: 0.5s;
}
......