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 35 additions and 16 deletions
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
6 <!-- <div><span class="tip-title">宗地合并：</span></div>--> 6 <!-- <div><span class="tip-title">宗地合并：</span></div>-->
7 <!-- </div>--> 7 <!-- </div>-->
8 <div id="mountNode" ref="containerWidth"></div> 8 <div id="mountNode" ref="containerWidth"></div>
9 <div id="mountNodeRight"></div> 9 <div id="mountNodeRight">
10 单元信息
11 </div>
10 </div> 12 </div>
11 </template> 13 </template>
12 14
...@@ -52,6 +54,7 @@ export default { ...@@ -52,6 +54,7 @@ export default {
52 }, 54 },
53 methods: { 55 methods: {
54 initG6() { 56 initG6() {
57 const self=this;
55 const data = this.data; 58 const data = this.data;
56 const eWidth = this.$refs.containerWidth.clientWidth; 59 const eWidth = this.$refs.containerWidth.clientWidth;
57 const eHeight = this.$refs.containerWidth.clientHeight; 60 const eHeight = this.$refs.containerWidth.clientHeight;
...@@ -63,6 +66,11 @@ export default { ...@@ -63,6 +66,11 @@ export default {
63 'sql', 66 'sql',
64 { 67 {
65 drawShape(cfg, group) { 68 drawShape(cfg, group) {
69 var dClor='#ffffff';
70 if(cfg.id==self.bsm){
71 dClor='#C6E5FF';
72 }
73
66 const rect = group.addShape('rect', { 74 const rect = group.addShape('rect', {
67 attrs: { 75 attrs: {
68 x: -100, 76 x: -100,
...@@ -71,7 +79,7 @@ export default { ...@@ -71,7 +79,7 @@ export default {
71 height: 50, 79 height: 50,
72 radius: 10, 80 radius: 10,
73 stroke: '#5B8FF9', 81 stroke: '#5B8FF9',
74 fill: '#C6E5FF', 82 fill: dClor,
75 lineWidth: 1, 83 lineWidth: 1,
76 }, 84 },
77 name: 'rect-shape', 85 name: 'rect-shape',
...@@ -147,6 +155,7 @@ export default { ...@@ -147,6 +155,7 @@ export default {
147 defaultEdge: { 155 defaultEdge: {
148 type: 'polyline1', 156 type: 'polyline1',
149 style: { 157 style: {
158 endArrow: true,
150 radius: 10, 159 radius: 10,
151 offset: 10, 160 offset: 10,
152 // endArrow: true, 161 // endArrow: true,
...@@ -177,6 +186,10 @@ export default { ...@@ -177,6 +186,10 @@ export default {
177 graph.data(data); 186 graph.data(data);
178 graph.render(); 187 graph.render();
179 188
189 graph.on('node:click', e => {
190 alert(e);
191 });
192
180 graph.on('node:mouseenter', e => { 193 graph.on('node:mouseenter', e => {
181 graph.setItemState(e.item, 'active', true) 194 graph.setItemState(e.item, 'active', true)
182 }); 195 });
...@@ -235,6 +248,7 @@ export default { ...@@ -235,6 +248,7 @@ export default {
235 } 248 }
236 249
237 #mountNodeRight{ 250 #mountNodeRight{
251 margin-top: 20px;
238 width: 38%; 252 width: 38%;
239 float: right; 253 float: right;
240 height: 1000px; 254 height: 1000px;
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
141 141
142 142
143 ul { 143 ul {
144 margin-top: 20px; 144 margin-top: 40px;
145 li { 145 li {
146 line-height: 20px; 146 line-height: 20px;
147 color: red; 147 color: red;
......
...@@ -251,7 +251,7 @@ export default { ...@@ -251,7 +251,7 @@ export default {
251 if(this.$route.path == '/zrz'){ 251 if(this.$route.path == '/zrz'){
252 this.getTreeByBsm(this.$store.state.zrzbsm,'zrz',this.$route.query.auth) 252 this.getTreeByBsm(this.$store.state.zrzbsm,'zrz',this.$route.query.auth)
253 }else if(this.$route.path == '/zd'){ 253 }else if(this.$route.path == '/zd'){
254 this.getRightTree(this.$store.state.zdbsm) 254 this.getRightTree(this.$store.state.zdbsm,'0,1,2')
255 }else if(this.$route.path == '/dz'){ 255 }else if(this.$route.path == '/dz'){
256 this.getTreeByBsm(this.$store.state.dzbsm,'dz',this.$route.query.auth) 256 this.getTreeByBsm(this.$store.state.dzbsm,'dz',this.$route.query.auth)
257 }else if(this.$route.path == '/gzw'){ 257 }else if(this.$route.path == '/gzw'){
......
...@@ -91,12 +91,14 @@ ...@@ -91,12 +91,14 @@
91 91
92 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> 92 <tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
93 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle"> 93 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle">
94 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> 94 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo" v-if="!disabled"></i>
95 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
95 <span><i class="requisite">*</i>房屋用途</span> 96 <span><i class="requisite">*</i>房屋用途</span>
96 </td> 97 </td>
97 98
98 <td colspan="1" style="min-width:120px" class="tdright"> 99 <td colspan="1" style="min-width:120px" class="tdright">
99 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> 100 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)" v-if="!disabled"></i>
101 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px;cursor: not-allowed" v-if="disabled" ></i>
100 规划用途 102 规划用途
101 </td> 103 </td>
102 <td colspan="3" > 104 <td colspan="3" >
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane> 5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
6 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> 6 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
7 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 7 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
8 8
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 import hbj from "./../zrz/lpb/bjlp/hbj/index" 18 import hbj from "./../zrz/lpb/bjlp/hbj/index"
19 import djb from "./../zd/djb/index"; 19 import djb from "./../zd/djb/index";
20 import fjcl from "./../zd/fjcl/fjcl" 20 import fjcl from "./../zd/fjcl/fjcl"
21 21 import {queryStatus} from "@api/search"
22 export default { 22 export default {
23 name: "index", 23 name: "index",
24 components: { 24 components: {
......
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
99 </table> 99 </table>
100 </div> 100 </div>
101 <div class="dialog-footer"> 101 <div class="dialog-footer">
102 <el-button @click="centerDialogVisible = false">取 消</el-button>
103 <el-button type="primary" @click="jzdbatchsave">确 定</el-button> 102 <el-button type="primary" @click="jzdbatchsave">确 定</el-button>
103 <el-button @click="centerDialogVisible = false">取 消</el-button>
104 </div> 104 </div>
105 </el-dialog> 105 </el-dialog>
106 </div> 106 </div>
......
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
122 </table> 122 </table>
123 </div> 123 </div>
124 <div class="dialog-footer"> 124 <div class="dialog-footer">
125 <el-button @click="centerDialogVisible = false">取 消</el-button>
126 <el-button type="primary" @click="jzxbatchsave">确 定</el-button> 125 <el-button type="primary" @click="jzxbatchsave">确 定</el-button>
126 <el-button @click="centerDialogVisible = false">取 消</el-button>
127 </div> 127 </div>
128 </el-dialog> 128 </el-dialog>
129 </div> 129 </div>
......
...@@ -770,7 +770,6 @@ ...@@ -770,7 +770,6 @@
770 }else{ 770 }else{
771 updateQjZdjbxx(this.formData) 771 updateQjZdjbxx(this.formData)
772 .then((res) => { 772 .then((res) => {
773 console.log(res,'修改宗地基本信息')
774 if (res.code == 200) { 773 if (res.code == 200) {
775 this.$message({ 774 this.$message({
776 message: '保存成功', 775 message: '保存成功',
......
...@@ -147,12 +147,14 @@ ...@@ -147,12 +147,14 @@
147 147
148 <tr v-for="(item1,index) in form.fwytList" :key="index"> 148 <tr v-for="(item1,index) in form.fwytList" :key="index">
149 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle"> 149 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle">
150 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> 150 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo" v-if="!disabled"></i>
151 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
151 <span><i class="requisite">*</i>房屋用途</span> 152 <span><i class="requisite">*</i>房屋用途</span>
152 </td> 153 </td>
153 154
154 <td colspan="1" style="min-width:120px" class="tdright"> 155 <td colspan="1" style="min-width:120px" class="tdright">
155 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> 156 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)" v-if="!disabled"></i>
157 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
156 规划用途 158 规划用途
157 </td> 159 </td>
158 <td colspan="3" > 160 <td colspan="3" >
...@@ -191,11 +193,13 @@ ...@@ -191,11 +193,13 @@
191 193
192 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 194 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
193 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" class="tdright"> 195 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" class="tdright">
194 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo"></i> 196 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addFwjgInfo" v-if="!disabled"></i>
197 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
195 <span><i class="requisite">*</i>房屋结构</span> 198 <span><i class="requisite">*</i>房屋结构</span>
196 </td> 199 </td>
197 <td colspan="1" class="tdright"> 200 <td colspan="1" class="tdright">
198 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)"></i> 201 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteFwjgInfo(index)" v-if="!disabled"></i>
202 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px;cursor: not-allowed" v-if="disabled"></i>
199 房屋结构 203 房屋结构
200 204
201 </td> 205 </td>
...@@ -269,7 +273,7 @@ ...@@ -269,7 +273,7 @@
269 273
270 </table> 274 </table>
271 <div class="header-button" :style="{width:mainBoxWidth+'px'}"> 275 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
272 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled">保存</el-button> 276 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont el-icon-search">保存</el-button>
273 <el-button type="primary" @click="onSubmit" :disabled="disabled">提交</el-button> 277 <el-button type="primary" @click="onSubmit" :disabled="disabled">提交</el-button>
274 <el-button type="primary" @click="registerCall">登记调用</el-button> 278 <el-button type="primary" @click="registerCall">登记调用</el-button>
275 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> --> 279 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
......