3a3b5f07 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 1365fc5f 68ffbd22
...@@ -5,31 +5,14 @@ ...@@ -5,31 +5,14 @@
5 </template> 5 </template>
6 6
7 <script> 7 <script>
8 import { getDdicByMC } from "../src/api/common";
9 export default { 8 export default {
10 mounted() { 9 mounted() {
11 this.getDic();
12 window.addEventListener("unload", this.saveState); 10 window.addEventListener("unload", this.saveState);
13 }, 11 },
14 methods: { 12 methods: {
15 saveState() { 13 saveState() {
16 sessionStorage.setItem("state", JSON.stringify(this.$store.state)); 14 sessionStorage.setItem("state", JSON.stringify(this.$store.state));
17 }, 15 },
18 //请求字典数据
19 getDic() {
20 let s = this.$store.state;
21 s.zjzlList = s.zjzlList.length == 0 ? this.getDicData("证件种类") : s.zjzlList;
22 s.gjList = s.gjList.length == 0 ? this.getDicData("国家和地区") : s.gjList;
23 s.ssList = s.ssList.length == 0 ? this.getDicData("省市") : s.ssList;
24 s.qlrlxList = s.qlrlxList.length == 0 ? this.getDicData("权利人类型") : s.qlrlxList;
25 s.xbList = s.xbList.length == 0 ? this.getDicData("性别") : s.xbList;
26 s.sshyList = s.sshyList.length == 0 ? this.getDicData("国民经济行业分类代码") : s.sshyList;
27 },
28 getDicData(name) {
29 getDdicByMC(name).then((res) => {
30 return res.result;
31 });
32 },
33 }, 16 },
34 }; 17 };
35 </script> 18 </script>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <td colspan="3"> 61 <td colspan="3">
62 <el-select class="formSelect" v-model="formData.qlrlxbsm"> 62 <el-select class="formSelect" v-model="formData.qlrlxbsm">
63 <el-option 63 <el-option
64 v-for="item in qlrlxList" 64 v-for="item in $store.state.qlrlxList"
65 :key="item.bsm" 65 :key="item.bsm"
66 :label="item.mc" 66 :label="item.mc"
67 :value="item.bsm" 67 :value="item.bsm"
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 <td colspan="3"> 75 <td colspan="3">
76 <el-select class="formSelect" v-model="formData.zjzlbsm"> 76 <el-select class="formSelect" v-model="formData.zjzlbsm">
77 <el-option 77 <el-option
78 v-for="item in zlzlList" 78 v-for="item in $store.state.zjzlList"
79 :key="item.bsm" 79 :key="item.bsm"
80 :label="item.mc" 80 :label="item.mc"
81 :value="item.bsm" 81 :value="item.bsm"
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 <td colspan="3"> 103 <td colspan="3">
104 <el-select class="formSelect" v-model="formData.gjbsm"> 104 <el-select class="formSelect" v-model="formData.gjbsm">
105 <el-option 105 <el-option
106 v-for="item in gjList" 106 v-for="item in $store.state.gjList"
107 :key="item.bsm" 107 :key="item.bsm"
108 :label="item.mc" 108 :label="item.mc"
109 :value="item.bsm" 109 :value="item.bsm"
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 <td colspan="3"> 115 <td colspan="3">
116 <el-select class="formSelect" v-model="formData.hjszssbsm"> 116 <el-select class="formSelect" v-model="formData.hjszssbsm">
117 <el-option 117 <el-option
118 v-for="item in ssList" 118 v-for="item in $store.state.ssList"
119 :key="item.bsm" 119 :key="item.bsm"
120 :label="item.mc" 120 :label="item.mc"
121 :value="item.bsm" 121 :value="item.bsm"
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
129 <td colspan="3"> 129 <td colspan="3">
130 <el-select class="formSelect" v-model="formData.xbbsm"> 130 <el-select class="formSelect" v-model="formData.xbbsm">
131 <el-option 131 <el-option
132 v-for="item in xbList" 132 v-for="item in $store.state.xbList"
133 :key="item.bsm" 133 :key="item.bsm"
134 :label="item.mc" 134 :label="item.mc"
135 :value="item.bsm" 135 :value="item.bsm"
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
147 <td colspan="3"> 147 <td colspan="3">
148 <el-select class="formSelect" v-model="formData.sshy"> 148 <el-select class="formSelect" v-model="formData.sshy">
149 <el-option 149 <el-option
150 v-for="item in sshyList" 150 v-for="item in $store.state.sshyList"
151 :key="item.bsm" 151 :key="item.bsm"
152 :label="item.mc" 152 :label="item.mc"
153 :value="item.bsm" 153 :value="item.bsm"
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
176 <td colspan="3"> 176 <td colspan="3">
177 <el-select class="formSelect" v-model="formData.fr.zjzlbsm"> 177 <el-select class="formSelect" v-model="formData.fr.zjzlbsm">
178 <el-option 178 <el-option
179 v-for="item in zjzlList" 179 v-for="item in $store.state.zjzlList"
180 :key="item.bsm" 180 :key="item.bsm"
181 :label="item.mc" 181 :label="item.mc"
182 :value="item.bsm" 182 :value="item.bsm"
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
222 <td colspan="3"> 222 <td colspan="3">
223 <el-select class="formSelect" v-model="item.zjzlbsm"> 223 <el-select class="formSelect" v-model="item.zjzlbsm">
224 <el-option 224 <el-option
225 v-for="item in zjzlList" 225 v-for="item in $store.state.zjzlList"
226 :key="item.bsm" 226 :key="item.bsm"
227 :label="item.mc" 227 :label="item.mc"
228 :value="item.bsm" 228 :value="item.bsm"
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
251 <td colspan="3"> 251 <td colspan="3">
252 <el-select class="formSelect" v-model="formData.gyfsbsm"> 252 <el-select class="formSelect" v-model="formData.gyfsbsm">
253 <el-option 253 <el-option
254 v-for="item in qlrlxList" 254 v-for="item in $store.state.qlrlxList"
255 :key="item.bsm" 255 :key="item.bsm"
256 :label="item.mc" 256 :label="item.mc"
257 :value="item.bsm" 257 :value="item.bsm"
...@@ -356,12 +356,6 @@ export default { ...@@ -356,12 +356,6 @@ export default {
356 zjh: "", 356 zjh: "",
357 zjzlbsm: "", 357 zjzlbsm: "",
358 }, 358 },
359 qlrlxList: this.$store.state.qlrlxList,
360 zjzlList: this.$store.state.zjzlList,
361 xbList: this.$store.state.xbList,
362 gjList: this.$store.state.gjList,
363 ssList: this.$store.state.ssList,
364 sshyList: this.$store.state.sshyList,
365 }; 359 };
366 }, 360 },
367 methods: { 361 methods: {
......
...@@ -211,14 +211,12 @@ export default { ...@@ -211,14 +211,12 @@ export default {
211 getDicData(){ 211 getDicData(){
212 getDdicByMC("土地用途") 212 getDdicByMC("土地用途")
213 .then((res) => { 213 .then((res) => {
214 console.log(res.result);
215 this.pzytList = res.result; 214 this.pzytList = res.result;
216 this.sjytList = res.result; 215 this.sjytList = res.result;
217 }) 216 })
218 .catch((error) => {}); 217 .catch((error) => {});
219 getDdicByMC("土地等级") 218 getDdicByMC("土地等级")
220 .then((res) => { 219 .then((res) => {
221 console.log(res.result);
222 this.djList = res.result; 220 this.djList = res.result;
223 }) 221 })
224 .catch((error) => {}); 222 .catch((error) => {});
......
...@@ -5,20 +5,22 @@ import user from './modules/user' ...@@ -5,20 +5,22 @@ import user from './modules/user'
5 import permission_routes from './modules/permission_routes' 5 import permission_routes from './modules/permission_routes'
6 import setTabs from './modules/setTabs' 6 import setTabs from './modules/setTabs'
7 7
8 Vue.use(Vuex) 8 Vue.use(Vuex);
9
10 const store = new Vuex.Store({ 9 const store = new Vuex.Store({
11 state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : { 10 state: sessionStorage.getItem('state') ? JSON.parse(sessionStorage.getItem('state')) : {
12 zdbsm: '', 11 zdbsm: '',
13 xzqList: [], 12 qllxList:[],
14 djqList: [], 13 zdtzmList:[],
15 djzqList: [], 14 qlsdfsList:[],
16 zjzlList:[], 15 zjzlList:[],
17 gjList:[], 16 gjList:[],
18 ssList:[], 17 ssList:[],
19 qlrlxList:[], 18 qlrlxList:[],
20 xbList:[], 19 xbList:[],
21 sshyList:[], 20 sshyList:[],
21 xzqList: [],
22 djqList: [],
23 djzqList: [],
22 //创建自然幢时需要用到的临时存储信息 24 //创建自然幢时需要用到的临时存储信息
23 zrzbsm: '', 25 zrzbsm: '',
24 xmmc: '', 26 xmmc: '',
......
1 <template> 1 <template>
2 <div class="home-box"> 2 <div class="home-box">
3 <el-container> 3 <el-container>
4 <el-aside :class="{ 'aside-show': isActive }"> 4 <el-aside :class="{ 'aside-show': isActive }">
5 <div class="logo-box" :class="{ 'logo-box-show': isActive }"> 5 <div class="logo-box" :class="{ 'logo-box-show': isActive }">
6 <img 6 <img
7 class="logo-img" 7 class="logo-img"
8 src="@/assets/images/logo-realestate.png" 8 src="@/assets/images/logo-realestate.png"
9 alt="" 9 alt=""
10 /> 10 />
11 <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> 11 <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
12 </div> 12 </div>
13 <div class="treeModule"> 13 <div class="treeModule">
14 <LineTree :pd="pd" @itemClick="itemClick"></LineTree> 14 <LineTree :pd="pd" @itemClick="itemClick"></LineTree>
15 </div> 15 </div>
16 </el-aside> 16 </el-aside>
17 <el-container> 17 <el-container>
18 <el-header height="100px"> 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 hamburger" v-show="!isActive"></i>
22 <i class="fa fa-indent hamburger" v-show="isActive"></i> 22 <i class="fa fa-indent hamburger" v-show="isActive"></i>
23 </div> 23 </div>
24 <div 24 <div
25 class="top-items" 25 class="top-items"
26 v-for="(item, index) in headTop" 26 v-for="(item, index) in headTop"
27 :key="index + '1'" 27 :key="index + '1'"
28 :class="{ 'is-active': item.select }" 28 :class="{ 'is-active': item.select }"
29 @click="selectTopItems(index)" 29 @click="selectTopItems(index)"
30 > 30 >
31 <i :class="item.icon"></i> 31 <i :class="item.icon"></i>
32 <span>{{ item.name }}</span> 32 <span>{{ item.name }}</span>
33 </div> 33 </div>
34 </div> 34 </div>
35 <div class="header-bottom"> 35 <!-- <div class="header-bottom">
36 <Navigation ref="navigation"></Navigation> 36 <Navigation ref="navigation"></Navigation>
37 </div> 37 </div> -->
38 <el-dialog 38 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
39 title="新建" 39 <Create @closeDialog="closeDialog"></Create>
40 :visible.sync="dialogVisible" 40 </el-dialog>
41 width="40%" 41 </el-header>
42 > 42 <el-main>
43 <Create @closeDialog="closeDialog"></Create> 43 <router-view />
44 </el-dialog> 44 </el-main>
45 </el-header> 45 </el-container>
46 <el-main> 46 </el-container>
47 <router-view/> 47 </div>
48 </el-main>
49 </el-container>
50 </el-container>
51 </div>
52 </template> 48 </template>
53 <script> 49 <script>
54 import util from "@/libs/util.js"; 50 import util from "@/libs/util.js";
55 import Navigation from "../components/IvyElement/navigation"; 51 import Navigation from "../components/IvyElement/navigation";
56 import Create from "./panel/create/index"; 52 import Create from "./panel/create/index";
57 import LineTree from "../components/lineTree/lineTree"; 53 import LineTree from "../components/lineTree/lineTree";
58 import {setTimeout} from "timers"; 54 import { setTimeout } from "timers";
59 import {getTree} from "../api/common" 55 import { getTree,getDdicByMC } from "../api/common";
60 56
61 export default { 57 export default {
62 components: { 58 components: {
63 Navigation, 59 // Navigation,
64 LineTree, 60 LineTree,
65 Create, 61 Create,
66 }, 62 },
67 data() { 63 data() {
68 return { 64 return {
69 navigationList: [], 65 navigationList: [],
70 isActive: false, 66 isActive: false,
71 textLogo: false, 67 textLogo: false,
72 activePath: "", 68 activePath: "",
73 defaultActive: "", 69 defaultActive: "",
74 headTop: [ 70 headTop: [
75 { 71 {
76 path: "/create", 72 path: "/create",
77 select: false, 73 select: false,
78 }, 74 },
79 { 75 {
80 path: "/add", 76 path: "/add",
81 select: false, 77 select: false,
82 }, 78 },
83 { 79 {
84 path: "/modify", 80 path: "/modify",
85 select: false, 81 select: false,
86 }, 82 },
87 { 83 {
88 path: "/change", 84 path: "/change",
89 select: false, 85 select: false,
90 }, 86 },
91 { 87 {
92 path: "/search", 88 path: "/search",
93 select: false, 89 select: false,
94 }, 90 },
95 ], 91 ],
96 tempTab: [ 92 tempTab: [
97 { 93 {
98 path: "/zrz", 94 path: "/zrz",
99 name: "自然幢", 95 name: "自然幢",
100 }, 96 },
101 { 97 {
102 path: "/dz", 98 path: "/dz",
103 name: "多幢", 99 name: "多幢",
104 }, 100 },
105 { 101 {
106 path: "/h", 102 path: "/h",
107 name: "户", 103 name: "户",
108 }, 104 },
109 { 105 {
110 path: "/zd", 106 path: "/zd",
111 name: "宗地", 107 name: "宗地",
112 }, 108 },
113 ], 109 ],
114 // 上导航选中id 110 // 上导航选中id
115 indId: undefined, 111 indId: undefined,
116 menuList: [], 112 menuList: [],
117 pathAndCodeObj: { 113 pathAndCodeObj: {
118 "/article-draft": "PSH004", 114 "/article-draft": "PSH004",
119 "/article-publish": "PSH005", 115 "/article-publish": "PSH005",
120 "/article-recycle": "PSH006", 116 "/article-recycle": "PSH006",
121 "/notice-draft": "PSH007", 117 "/notice-draft": "PSH007",
122 "/notice-publish": "PSH008", 118 "/notice-publish": "PSH008",
123 "/notice-recycle": "PSH009", 119 "/notice-recycle": "PSH009",
124 "/column_management": "PSH018", 120 "/column_management": "PSH018",
125 "/announcement_template": "PSH019", 121 "/announcement_template": "PSH019",
126 "/business_management": "PSH020", 122 "/business_management": "PSH020",
127 }, 123 },
128 pd: [ 124 pd: [
129 { 125 {
130 mc: "行政区(1)", 126 mc: "行政区(1)",
131 children: [], 127 children: [],
132 }, 128 },
133 { 129 {
134 mc: "行政区(2)", 130 mc: "行政区(2)",
135 children: [ 131 children: [
136 { 132 {
137 mc: "地籍区1", 133 mc: "地籍区1",
138 children: [], 134 children: [],
139 }, 135 },
140 { 136 {
141 mc: "地籍区2", 137 mc: "地籍区2",
142 children: [ 138 children: [
143 { 139 {
144 mc: "国有", 140 mc: "国有",
145 children: [ 141 children: [
146 { 142 {
147 mc: "宗地代码1933", 143 mc: "宗地代码1933",
148 isZD: true, 144 isZD: true,
149 }, 145 },
150 { 146 {
151 mc: "自然幢2100", 147 mc: "自然幢2100",
152 isZD: false, 148 isZD: false,
153 }, 149 },
154 ], 150 ],
155 }, 151 },
156 ], 152 ],
157 }, 153 },
158 { 154 {
159 label: "地籍区3", 155 label: "地籍区3",
160 children: [], 156 children: [],
161 }, 157 },
162 { 158 {
163 label: "地籍区4", 159 label: "地籍区4",
164 children: [], 160 children: [],
165 }, 161 },
166 ], 162 ],
167 }, 163 },
168 { 164 {
169 mc: "行政区(3)", 165 mc: "行政区(3)",
170 children: [], 166 children: [],
171 }, 167 },
172 { 168 {
173 mc: "行政区(4)", 169 mc: "行政区(4)",
174 children: [], 170 children: [],
175 }, 171 },
176 { 172 {
177 mc: "行政区(5)", 173 mc: "行政区(5)",
178 children: [], 174 children: [],
179 }, 175 },
180 ], 176 ],
181 dialogVisible: false, 177 dialogVisible: false,
182 }; 178 };
183 }, 179 },
184 computed: { 180 computed: {
185 permission_routes() { 181 permission_routes() {
186 return this.$store.state.permission_routes.navigation; 182 return this.$store.state.permission_routes.navigation;
187 }, 183 },
188 }, 184 },
189 watch: { 185 watch: {
190 "$route.path": function (newPath) { 186 "$route.path": function(newPath) {
191 //监测路由变化,高亮顶部导航 187 //监测路由变化,高亮顶部导航
192 this.headTop.forEach((item, index) => { 188 this.headTop.forEach((item, index) => {
193 item.select = false; 189 item.select = false;
194 if (item.path == newPath) { 190 if (item.path == newPath) {
195 item.select = true; 191 item.select = true;
196 } 192 }
197 }); 193 });
198 if(newPath == '/zd'){ 194 if (newPath == "/zd") {
199 this.getRightTree(this.$store.state.zdbsm) 195 this.getRightTree(this.$store.state.zdbsm);
200 } 196 }
201 }, 197 },
202 "$store.state.zdbsm": function (bsm) { 198 "$store.state.zdbsm": function(bsm) {
203 this.getRightTree(bsm) 199 this.getRightTree(bsm);
204 } 200 },
205 }, 201 },
206 created() { 202 created() {
207 if (this.$route.meta) { 203 if (this.$route.meta) {
208 this.defaultActive = this.$route.meta.code; 204 this.defaultActive = this.$route.meta.code;
209 } 205 }
210 if (this.permission_routes.length !== 0) { 206 if (this.permission_routes.length !== 0) {
211 this.navigationList = this.permission_routes; 207 this.navigationList = this.permission_routes;
212 } else { 208 } else {
213 // let list = JSON.parse(util.cookies.get('navigation-1')).concat(JSON.parse(util.cookies.get('navigation'))) 209 // let list = JSON.parse(util.cookies.get('navigation-1')).concat(JSON.parse(util.cookies.get('navigation')))
214 //mock数据 210 //mock数据
215 let list = [ 211 let list = [
216 { 212 {
217 name: "新建", 213 name: "新建",
218 icon: "fa fa-address-card-o", 214 icon: "fa fa-address-card-o",
219 path: "/create", 215 path: "/create",
220 }, 216 },
221 { 217 {
222 name: "添加", 218 name: "添加",
223 icon: "fa fa-address-card-o", 219 icon: "fa fa-address-card-o",
224 path: "/add", 220 path: "/add",
225 }, 221 },
226 {name: "更正", icon: "fa fa-address-card-o", path: "/modify"}, 222 { name: "更正", icon: "fa fa-address-card-o", path: "/modify" },
227 { 223 {
228 name: "变更", 224 name: "变更",
229 icon: "fa fa-address-card-o", 225 icon: "fa fa-address-card-o",
230 path: "/change", 226 path: "/change",
231 }, 227 },
232 { 228 {
233 name: "综合查询", 229 name: "综合查询",
234 icon: "fa fa-address-card-o", 230 icon: "fa fa-address-card-o",
235 path: "/search", 231 path: "/search",
236 }, 232 },
237 ]; 233 ];
238 this.navigationList = list; 234 this.navigationList = list;
239 } 235 }
240 this.sortNavigation(this.navigationList, 0); 236 this.sortNavigation(this.navigationList, 0);
241 // if (util.cookies.get("indId")) { 237 // if (util.cookies.get("indId")) {
242 // let indId = util.cookies.get("indId") - 0; 238 // let indId = util.cookies.get("indId") - 0;
243 // this.navSelect(indId); 239 // this.navSelect(indId);
244 // this.sortNavigation(this.navigationList, indId); 240 // this.sortNavigation(this.navigationList, indId);
245 // } 241 // }
246 }, 242 this.getDic();
247 methods: { 243 },
248 getRightTree(bsm) { 244 methods: {
249 getTree(bsm).then(res => { 245 //请求字典数据
250 if (res.success) { 246 async getDic() {
251 this.pd=res.result 247 let s = this.$store.state;
252 } 248 s.zjzlList = s.zjzlList.length == 0 ?await this.getDicData("证件种类") : s.zjzlList;
253 }) 249 s.gjList = s.gjList.length == 0 ?await this.getDicData("国家和地区") : s.gjList;
254 }, 250 s.ssList = s.ssList.length == 0 ?await this.getDicData("省市") : s.ssList;
255 sortNavigation(data, selectId) { 251 s.qlrlxList = s.qlrlxList.length == 0 ?await this.getDicData("权利人类型") : s.qlrlxList;
256 let headTop = this.headTop; 252 s.xbList = s.xbList.length == 0 ? await this.getDicData("性别") : s.xbList;
257 data.forEach((item, index) => { 253 s.sshyList = s.sshyList.length == 0 ?await this.getDicData("国民经济行业分类代码") : s.sshyList;
258 headTop[index].name = item.name; 254 s.qllxList = s.qllxList.length == 0 ?await this.getDicData("权利类型") : s.qllxList;
259 headTop[index].icon = item.icon; 255 s.zdtzmList = s.zdtzmList.length == 0 ?await this.getDicData("宗地(宗海)特征码") : s.sshyList;
260 }); 256 s.qlsdfsList = s.qlsdfsList.length == 0 ?await this.getDicData("权利设定方式") : s.qlsdfsList;
261 }, 257 },
262 // menuSelect(data, selectId) { 258 async getDicData(name) {
263 // this.menuList = data[selectId].children; 259 return await getDdicByMC(name).then((res)=> {
264 // }, 260 return res.result
265 handleOpen(key, keyPath) { 261 });
266 console.log(key, keyPath); 262 },
267 }, 263 getRightTree(bsm) {
268 handleClose(key, keyPath) { 264 getTree(bsm).then((res) => {
269 console.log(key, keyPath); 265 if (res.success) {
270 }, 266 this.pd = res.result;
271 toggleClick() { 267 }
272 this.isActive = !this.isActive; 268 });
273 if (!this.isActive) { 269 },
274 setTimeout(() => { 270 sortNavigation(data, selectId) {
275 this.textLogo = this.isActive; 271 let headTop = this.headTop;
276 }, 200); 272 data.forEach((item, index) => {
277 } else { 273 headTop[index].name = item.name;
278 this.textLogo = this.isActive; 274 headTop[index].icon = item.icon;
279 } 275 });
280 }, 276 },
281 selectTopItems(ind) { 277 // menuSelect(data, selectId) {
282 if (ind == 0) { 278 // this.menuList = data[selectId].children;
283 //点击新建,弹框 279 // },
284 this.dialogVisible = true; 280 handleOpen(key, keyPath) {
285 } else { 281 console.log(key, keyPath);
286 this.dialogVisible = false; 282 },
287 this.indId = ind; 283 handleClose(key, keyPath) {
288 // this.menuSelect(this.navigationList, ind); 284 console.log(key, keyPath);
289 // this.$store.dispatch("setTabs/init_tabs"); 285 },
290 // this.$store.dispatch("setTabs/set_active_index", "/panel"); 286 toggleClick() {
291 this.$router.push(this.headTop[ind].path); 287 this.isActive = !this.isActive;
292 this.navSelect(ind); 288 if (!this.isActive) {
293 // util.cookies.set("indId", ind); 289 setTimeout(() => {
294 } 290 this.textLogo = this.isActive;
295 }, 291 }, 200);
296 // 上导航选中id 292 } else {
297 navSelect(id) { 293 this.textLogo = this.isActive;
298 this.headTop.forEach((item, index) => { 294 }
299 item.select = false; 295 },
300 if (index == id) { 296 selectTopItems(ind) {
301 item.select = true; 297 if (ind == 0) {
302 } 298 //点击新建,弹框
303 }); 299 this.dialogVisible = true;
304 }, 300 } else {
305 //树控件点击事件 301 this.dialogVisible = false;
306 itemClick(data) { 302 this.indId = ind;
307 console.log(data); 303 // this.menuSelect(this.navigationList, ind);
308 }, 304 // this.$store.dispatch("setTabs/init_tabs");
309 //关闭新建子组件弹框 305 // this.$store.dispatch("setTabs/set_active_index", "/panel");
310 closeDialog() { 306 this.$router.push(this.headTop[ind].path);
311 this.dialogVisible = false; 307 this.navSelect(ind);
312 } 308 // util.cookies.set("indId", ind);
313 }, 309 }
314 }; 310 },
311 // 上导航选中id
312 navSelect(id) {
313 this.headTop.forEach((item, index) => {
314 item.select = false;
315 if (index == id) {
316 item.select = true;
317 }
318 });
319 },
320 //树控件点击事件
321 itemClick(data) {
322 console.log(data);
323 },
324 //关闭新建子组件弹框
325 closeDialog() {
326 this.dialogVisible = false;
327 },
328 },
329 };
315 </script> 330 </script>
316 <style lang="less" scoped> 331 <style lang="less" scoped>
317 .home-box { 332 .home-box {
318 width: 100%; 333 width: 100%;
319 height: 100vh; 334 height: 100vh;
320 .el-container { 335 .el-container {
321 height: 100%; 336 height: 100%;
322 } 337 }
323 .el-header { 338 .el-header {
324 background-color: #fff; 339 background-color: #fff;
325 padding: 0 !important; 340 padding: 0 !important;
326 .header-top { 341 .header-top {
327 height: 60px; 342 height: 60px;
328 border-bottom: 1px solid rgba(242, 242, 242, 1); 343 border-bottom: 1px solid rgba(242, 242, 242, 1);
329 box-sizing: border-box; 344 box-sizing: border-box;
330 .top-items { 345 .top-items {
331 cursor: pointer; 346 cursor: pointer;
332 height: 60px; 347 height: 60px;
333 padding: 0 30px; 348 padding: 0 30px;
334 font-size: 16px; 349 font-size: 16px;
335 line-height: 60px; 350 line-height: 60px;
336 float: left; 351 float: left;
337 position: relative; 352 position: relative;
338 color: #4a4a4a; 353 color: #4a4a4a;
339 i { 354 i {
340 margin-right: 6px; 355 margin-right: 6px;
341 } 356 }
342 .hamburger { 357 .hamburger {
343 font-size: 16px; 358 font-size: 16px;
344 line-height: 60px; 359 line-height: 60px;
345 color: #000; 360 color: #000;
346 } 361 }
347 } 362 }
348 .top-items:not(:last-child)::after { 363 .top-items:not(:last-child)::after {
349 content: ""; 364 content: "";
350 width: 1px; 365 width: 1px;
351 height: 14px; 366 height: 14px;
352 background: #eaeaea; 367 background: #eaeaea;
353 position: absolute; 368 position: absolute;
354 right: -1px; 369 right: -1px;
355 top: 24px; 370 top: 24px;
356 } 371 }
357 .top-items.is-active { 372 .top-items.is-active {
358 color: #006cff; 373 color: #006cff;
359 } 374 }
360 } 375 }
361 .header-bottom { 376 .header-bottom {
362 height: 50px; 377 height: 50px;
363 box-shadow: 0px 2px 4px 0px rgba(222, 222, 222, 0.7); 378 box-shadow: 0px 2px 4px 0px rgba(222, 222, 222, 0.7);
364 border-bottom: 1px solid rgba(234, 234, 234, 1); 379 border-bottom: 1px solid rgba(234, 234, 234, 1);
365 box-sizing: border-box; 380 box-sizing: border-box;
366 } 381 }
367 } 382 }
368 .el-aside { 383 .el-aside {
369 width: 290px !important; 384 width: 290px !important;
370 background-color: #1d50dd; 385 background-color: #1d50dd;
371 color: #333; 386 color: #333;
372 // text-align: center; 387 // text-align: center;
373 overflow: hidden; 388 overflow: hidden;
374 transition: width 0.3s; 389 transition: width 0.3s;
375 .logo-box { 390 .logo-box {
376 width: 100%; 391 width: 100%;
377 height: 120px; 392 height: 120px;
378 border-bottom: 1px solid rgba(255, 255, 255, 0.2); 393 border-bottom: 1px solid rgba(255, 255, 255, 0.2);
379 padding: 30px 0 28px 0; 394 padding: 30px 0 28px 0;
380 box-sizing: border-box; 395 box-sizing: border-box;
381 display: flex; 396 display: flex;
382 flex-direction: column; 397 flex-direction: column;
383 justify-content: space-between; 398 justify-content: space-between;
384 align-items: center; 399 align-items: center;
385 transition: width 0.3s; 400 transition: width 0.3s;
386 .logo-img { 401 .logo-img {
387 width: 38px; 402 width: 38px;
388 height: 38px; 403 height: 38px;
389 } 404 }
390 .logo-text { 405 .logo-text {
391 font-size: 14px; 406 font-size: 14px;
392 color: rgba(255, 255, 255, 1); 407 color: rgba(255, 255, 255, 1);
393 line-height: 14px; 408 line-height: 14px;
394 } 409 }
395 } 410 }
396 .treeModule { 411 .treeModule {
397 box-sizing: border-box; 412 box-sizing: border-box;
398 padding: 20px 20px; 413 padding: 20px 20px;
399 } 414 }
400 .logo-box-show { 415 .logo-box-show {
401 width: 64px; 416 width: 64px;
402 } 417 }
403 .el-menu { 418 .el-menu {
404 border-right: 0; 419 border-right: 0;
405 } 420 }
406 .el-submenu .el-menu-item { 421 .el-submenu .el-menu-item {
407 text-align: left; 422 text-align: left;
408 text-indent: 15px; 423 text-indent: 15px;
409 } 424 }
410 } 425 }
411 .aside-show { 426 .aside-show {
412 width: 64px !important; 427 width: 64px !important;
413 } 428 }
414 429
415 .el-main { 430 .el-main {
416 background-color: #f1f4fc; 431 background-color: #f1f4fc;
417 color: #333; 432 color: #333;
418 // text-align: center; 433 // text-align: center;
419 // line-height: 160px; 434 // line-height: 160px;
420 padding: 0; 435 padding: 0;
421 } 436 }
422 } 437 }
423 </style> 438 </style>
......
...@@ -83,8 +83,9 @@ ...@@ -83,8 +83,9 @@
83 </el-form-item> 83 </el-form-item>
84 <el-form-item label="特征码"> 84 <el-form-item label="特征码">
85 <el-select 85 <el-select
86 v-model="tzmCode" 86 v-model="zdtzm.value"
87 placeholder="地籍子区" 87 placeholder="宗地特征码"
88 @change="changeZdtzm(zdtzm.value)"
88 style="width:200px;" 89 style="width:200px;"
89 > 90 >
90 <el-option 91 <el-option
...@@ -203,8 +204,8 @@ export default { ...@@ -203,8 +204,8 @@ export default {
203 djzqbsm: this.djzqValue, 204 djzqbsm: this.djzqValue,
204 syqlxbsm: this.syqlxCode, 205 syqlxbsm: this.syqlxCode,
205 xmmc: this.zdProjectName, 206 xmmc: this.zdProjectName,
206 // zdtzmbsm: this.tzmCode, 207 zdtzmbsm: this.tzmCode,
207 zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010", 208 //zdtzmbsm: "PSHGSBDCQJDC000000000000DC440010",
208 }; 209 };
209 insertQjZdjbxx(data) 210 insertQjZdjbxx(data)
210 .then((res) => { 211 .then((res) => {
...@@ -310,6 +311,12 @@ export default { ...@@ -310,6 +311,12 @@ export default {
310 this.syqlxCode = id; 311 this.syqlxCode = id;
311 console.log(this.syqlxCode); 312 console.log(this.syqlxCode);
312 }, 313 },
314 changeZdtzm(id){
315
316 this.tzmCode=id;
317 console.log(this.tzmCode);
318
319 },
313 close() { 320 close() {
314 this.$emit("closeDialog"); 321 this.$emit("closeDialog");
315 }, 322 },
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
2 <div class="main"> 2 <div class="main">
3 <div class="formMenu"> 3 <div class="formMenu">
4 <Qlr ref="qlrxxModule"></Qlr> 4 <Qlr ref="qlrxxModule"></Qlr>
5
6 <!-- <el-button 5 <!-- <el-button
7 type="primary" 6 type="primary"
8 class="changeBtn" 7 class="changeBtn"
...@@ -28,7 +27,7 @@ ...@@ -28,7 +27,7 @@
28 @change="changeXzq(formData.xzqbsm)" 27 @change="changeXzq(formData.xzqbsm)"
29 > 28 >
30 <el-option 29 <el-option
31 v-for="item in xzqList" 30 v-for="item in $store.state.xzqList"
32 :key="item.xzqbsm" 31 :key="item.xzqbsm"
33 :label="item.xzqmc" 32 :label="item.xzqmc"
34 :value="item.xzqbsm" 33 :value="item.xzqbsm"
...@@ -44,7 +43,7 @@ ...@@ -44,7 +43,7 @@
44 @change="changeDjq(formData.djqbsm)" 43 @change="changeDjq(formData.djqbsm)"
45 > 44 >
46 <el-option 45 <el-option
47 v-for="item in djqList" 46 v-for="item in $store.state.djqList"
48 :key="item.bsm" 47 :key="item.bsm"
49 :label="item.mc" 48 :label="item.mc"
50 :value="item.bsm" 49 :value="item.bsm"
...@@ -56,7 +55,7 @@ ...@@ -56,7 +55,7 @@
56 <td colspan="2"> 55 <td colspan="2">
57 <el-select class="formSelect" v-model="formData.djzqbsm"> 56 <el-select class="formSelect" v-model="formData.djzqbsm">
58 <el-option 57 <el-option
59 v-for="item in djzqList" 58 v-for="item in $store.state.djzqList"
60 :key="item.bsm" 59 :key="item.bsm"
61 :label="item.mc" 60 :label="item.mc"
62 :value="item.bsm" 61 :value="item.bsm"
...@@ -70,7 +69,7 @@ ...@@ -70,7 +69,7 @@
70 <td colspan="4"> 69 <td colspan="4">
71 <el-select class="formSelect" v-model="formData.qllxbsm"> 70 <el-select class="formSelect" v-model="formData.qllxbsm">
72 <el-option 71 <el-option
73 v-for="item in qllxList" 72 v-for="item in $store.state.qllxList"
74 :key="item.bsm" 73 :key="item.bsm"
75 :label="item.mc" 74 :label="item.mc"
76 :value="item.bsm" 75 :value="item.bsm"
...@@ -82,7 +81,7 @@ ...@@ -82,7 +81,7 @@
82 <td colspan="4"> 81 <td colspan="4">
83 <el-select class="formSelect" v-model="formData.zdtzmbsm"> 82 <el-select class="formSelect" v-model="formData.zdtzmbsm">
84 <el-option 83 <el-option
85 v-for="item in zdtzmList" 84 v-for="item in $store.state.zdtzmList"
86 :key="item.bsm" 85 :key="item.bsm"
87 :label="item.mc" 86 :label="item.mc"
88 :value="item.bsm" 87 :value="item.bsm"
...@@ -96,7 +95,7 @@ ...@@ -96,7 +95,7 @@
96 <td colspan="4"> 95 <td colspan="4">
97 <el-select class="formSelect" v-model="formData.qlsdfs"> 96 <el-select class="formSelect" v-model="formData.qlsdfs">
98 <el-option 97 <el-option
99 v-for="item in qlsdfsList" 98 v-for="item in $store.state.qlsdfsList"
100 :key="item.bsm" 99 :key="item.bsm"
101 :label="item.mc" 100 :label="item.mc"
102 :value="item.bsm" 101 :value="item.bsm"
...@@ -152,7 +151,7 @@ ...@@ -152,7 +151,7 @@
152 <td colspan="4"> 151 <td colspan="4">
153 <el-select class="formSelect" v-model="formData.gmjjhyfl"> 152 <el-select class="formSelect" v-model="formData.gmjjhyfl">
154 <el-option 153 <el-option
155 v-for="item in gmjjhyflList" 154 v-for="item in $store.state.sshyList"
156 :key="item.value" 155 :key="item.value"
157 :label="item.label" 156 :label="item.label"
158 :value="item.value" 157 :value="item.value"
...@@ -180,8 +179,8 @@ ...@@ -180,8 +179,8 @@
180 </tr> 179 </tr>
181 <tr> 180 <tr>
182 <td colspan="2">容积率</td> 181 <td colspan="2">容积率</td>
183 <td colspan="4"> 182 <td colspan="2">
184 <el-select class="formSelect percent30" v-model="formData.rjl"> 183 <el-select class="formSelect" v-model="formData.rjl">
185 <el-option 184 <el-option
186 v-for="item in compareList" 185 v-for="item in compareList"
187 :key="item.value" 186 :key="item.value"
...@@ -190,7 +189,9 @@ ...@@ -190,7 +189,9 @@
190 > 189 >
191 </el-option> 190 </el-option>
192 </el-select> 191 </el-select>
193 <input type="text" class="formInput percent68"/> 192 </td>
193 <td colspan="2">
194 <input type="text" class="formInput"/>
194 </td> 195 </td>
195 <td colspan="2">容积说明</td> 196 <td colspan="2">容积说明</td>
196 <td colspan="4" class="psr"> 197 <td colspan="4" class="psr">
...@@ -199,8 +200,8 @@ ...@@ -199,8 +200,8 @@
199 </tr> 200 </tr>
200 <tr> 201 <tr>
201 <td colspan="2">建筑密度</td> 202 <td colspan="2">建筑密度</td>
202 <td colspan="4"> 203 <td colspan="2">
203 <el-select class="formSelect percent30" v-model="formData.jzmd"> 204 <el-select class="formSelect" v-model="formData.jzmd">
204 <el-option 205 <el-option
205 v-for="item in compareList" 206 v-for="item in compareList"
206 :key="item.value" 207 :key="item.value"
...@@ -209,7 +210,9 @@ ...@@ -209,7 +210,9 @@
209 > 210 >
210 </el-option> 211 </el-option>
211 </el-select> 212 </el-select>
212 <input type="text" class="formInput percent68"/> 213 </td>
214 <td colspan="2">
215 <input type="text" class="formInput"/>
213 </td> 216 </td>
214 <td colspan="2">建筑密度说明</td> 217 <td colspan="2">建筑密度说明</td>
215 <td colspan="4" class="psr"> 218 <td colspan="4" class="psr">
...@@ -218,8 +221,8 @@ ...@@ -218,8 +221,8 @@
218 </tr> 221 </tr>
219 <tr> 222 <tr>
220 <td colspan="2">建筑限高</td> 223 <td colspan="2">建筑限高</td>
221 <td colspan="4"> 224 <td colspan="2">
222 <el-select class="formSelect percent30" v-model="formData.jzxg"> 225 <el-select class="formSelect" v-model="formData.jzxg">
223 <el-option 226 <el-option
224 v-for="item in compareList" 227 v-for="item in compareList"
225 :key="item.value" 228 :key="item.value"
...@@ -228,6 +231,8 @@ ...@@ -228,6 +231,8 @@
228 > 231 >
229 </el-option> 232 </el-option>
230 </el-select> 233 </el-select>
234 </td>
235 <td colspan="2">
231 <input type="text" class="formInput percent68"/> 236 <input type="text" class="formInput percent68"/>
232 </td> 237 </td>
233 <td colspan="2">建筑限高说明</td> 238 <td colspan="2">建筑限高说明</td>
...@@ -321,14 +326,9 @@ ...@@ -321,14 +326,9 @@
321 props: {}, 326 props: {},
322 data() { 327 data() {
323 return { 328 return {
324 qllxList: [],
325 zdtzmList: [],
326 qlsdfsList: [],
327 gmjjhyflList: [],
328 xzqList: this.$store.state.xzqList,
329 djqList: this.$store.state.djqList,
330 djzqList: this.$store.state.djzqList,
331 compareList: [ 329 compareList: [
330 {label: "<", value: "<"},
331 {label: ">", value: ">"},
332 {label: "=", value: "="}, 332 {label: "=", value: "="},
333 {label: "<=", value: "<="}, 333 {label: "<=", value: "<="},
334 {label: ">=", value: ">="}, 334 {label: ">=", value: ">="},
...@@ -369,7 +369,6 @@ ...@@ -369,7 +369,6 @@
369 }; 369 };
370 }, 370 },
371 created() { 371 created() {
372 this.getDicData();
373 this.getZdjbxxData(); 372 this.getZdjbxxData();
374 }, 373 },
375 mounted() { 374 mounted() {
...@@ -407,37 +406,6 @@ ...@@ -407,37 +406,6 @@
407 getQlxzData() { 406 getQlxzData() {
408 console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据 407 console.log(this.$refs.qlxzModule.getQlxzDataList()); //权利性质数据
409 }, 408 },
410 //获取字典数据信息
411 getDicData() {
412 getDdicByMC("权利类型")
413 .then((res) => {
414 console.log(res.result);
415 this.qllxList = res.result;
416 })
417 .catch((error) => {
418 });
419 getDdicByMC("宗地(宗海)特征码")
420 .then((res) => {
421 console.log(res.result);
422 this.zdtzmList = res.result;
423 })
424 .catch((error) => {
425 });
426 getDdicByMC("权利设定方式")
427 .then((res) => {
428 console.log(res.result);
429 this.qlsdfsList = res.result;
430 })
431 .catch((error) => {
432 });
433 getDdicByMC("国民经济行业分类代码")
434 .then((res) => {
435 console.log(res.result);
436 this.gmjjhyflList = res.result;
437 })
438 .catch((error) => {
439 });
440 },
441 //行政区划选择 409 //行政区划选择
442 changeXzq(id) { 410 changeXzq(id) {
443 getListByXzqbsm(id) 411 getListByXzqbsm(id)
......