Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
4634ae6e by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 7e52eea7 8b5158df
Inline Side-by-side
Showing 10 changed files with 41 additions and 22 deletions
......@@ -6,7 +6,9 @@
<!-- <div><span class="tip-title">宗地合并：</span></div>-->
<!-- </div>-->
<div id="mountNode" ref="containerWidth"></div>
<div id="mountNodeRight"></div>
<div id="mountNodeRight">
单元信息
</div>
</div>
</template>
......@@ -52,6 +54,7 @@ export default {
},
methods: {
initG6() {
const self=this;
const data = this.data;
const eWidth = this.$refs.containerWidth.clientWidth;
const eHeight = this.$refs.containerWidth.clientHeight;
......@@ -63,6 +66,11 @@ export default {
'sql',
{
drawShape(cfg, group) {
var dClor='#ffffff';
if(cfg.id==self.bsm){
dClor='#C6E5FF';
}
const rect = group.addShape('rect', {
attrs: {
x: -100,
......@@ -71,7 +79,7 @@ export default {
height: 50,
radius: 10,
stroke: '#5B8FF9',
fill: '#C6E5FF',
fill: dClor,
lineWidth: 1,
},
name: 'rect-shape',
......@@ -147,6 +155,7 @@ export default {
defaultEdge: {
type: 'polyline1',
style: {
endArrow: true,
radius: 10,
offset: 10,
// endArrow: true,
......@@ -177,6 +186,10 @@ export default {
graph.data(data);
graph.render();
graph.on('node:click', e => {
alert(e);
});
graph.on('node:mouseenter', e => {
graph.setItemState(e.item, 'active', true)
});
......@@ -235,6 +248,7 @@ export default {
}
#mountNodeRight{
margin-top: 20px;
width: 38%;
float: right;
height: 1000px;
......
......@@ -141,7 +141,7 @@
ul {
margin-top: 20px;
margin-top: 40px;
li {
line-height: 20px;
color: red;
......
......@@ -11,7 +11,7 @@
/>
<span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
</div>
<div class="search-box">
<el-input
maxlength="28"
......@@ -172,7 +172,7 @@ export default {
} else if(newPath == '/viewMap'){
this.isMap = true;
}else{
}
},
"$store.state.treeData":function (val) {
......@@ -218,9 +218,9 @@ export default {
icon: "iconfont icontianjia",
path: "/add",
},
{
name: "更正",
icon: "iconfont icongengzheng",
{
name: "更正",
icon: "iconfont icongengzheng",
path: "/modify" },
{
name: "变更",
......@@ -251,7 +251,7 @@ export default {
if(this.$route.path == '/zrz'){
this.getTreeByBsm(this.$store.state.zrzbsm,'zrz',this.$route.query.auth)
}else if(this.$route.path == '/zd'){
this.getRightTree(this.$store.state.zdbsm)
this.getRightTree(this.$store.state.zdbsm,'0,1,2')
}else if(this.$route.path == '/dz'){
this.getTreeByBsm(this.$store.state.dzbsm,'dz',this.$route.query.auth)
}else if(this.$route.path == '/gzw'){
......
......@@ -91,12 +91,14 @@
<tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
<td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle">
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo" v-if="!disabled"></i>
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
<span><i class="requisite">*</i>房屋用途</span>
</td>
<td colspan="1" style="min-width:120px" class="tdright">
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)" v-if="!disabled"></i>
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px;cursor: not-allowed" v-if="disabled" ></i>
规划用途
</td>
<td colspan="3" >
......
......@@ -2,7 +2,7 @@
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
......
......@@ -18,7 +18,7 @@
import hbj from "./../zrz/lpb/bjlp/hbj/index"
import djb from "./../zd/djb/index";
import fjcl from "./../zd/fjcl/fjcl"
import {queryStatus} from "@api/search"
export default {
name: "index",
components: {
......
......@@ -99,8 +99,8 @@
</table>
</div>
<div class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="jzdbatchsave">确 定</el-button>
<el-button @click="centerDialogVisible = false">取 消</el-button>
</div>
</el-dialog>
</div>
......
......@@ -122,8 +122,8 @@
</table>
</div>
<div class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="jzxbatchsave">确 定</el-button>
<el-button @click="centerDialogVisible = false">取 消</el-button>
</div>
</el-dialog>
</div>
......
......@@ -770,7 +770,6 @@
}else{
updateQjZdjbxx(this.formData)
.then((res) => {
console.log(res,'修改宗地基本信息')
if (res.code == 200) {
this.$message({
message: '保存成功',
......
......@@ -118,7 +118,7 @@
</td>
</tr>
<tr>
<td colspan="2" class="tdright">产别</td>
......@@ -147,12 +147,14 @@
<tr v-for="(item1,index) in form.fwytList" :key="index">
<td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle">
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo" v-if="!disabled"></i>
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
<span><i class="requisite">*</i>房屋用途</span>
</td>
<td colspan="1" style="min-width:120px" class="tdright">
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)" v-if="!disabled"></i>
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
规划用途
</td>
<td colspan="3" >
......@@ -191,11 +193,13 @@
<tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" class="tdright">
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i>
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo" v-if="!disabled"></i>
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
<span><i class="requisite">*</i>房屋结构</span>
</td>
<td colspan="1" class="tdright">
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i>
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)" v-if="!disabled"></i>
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
房屋结构
</td>
......@@ -269,7 +273,7 @@
</table>
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled">保存</el-button>
<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont el-icon-search">保存</el-button>
<el-button type="primary" @click="onSubmit" :disabled="disabled">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
<!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
......