Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
dc4631ab by renchao@pashanhoo.com
Options

Merge branch 'master' into dev

2 parents dc92f2eb e5057d58
Inline Side-by-side
Showing 7 changed files with 22 additions and 57 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-27 15:43:24 4 * @LastEditTime: 2023-04-03 13:41:12
5 --> 5 -->
6 # 安装依赖 6 # 安装依赖
7 npm install 7 npm install
...@@ -30,6 +30,8 @@ npm install --registry=https://registry.npm.taobao.org ...@@ -30,6 +30,8 @@ npm install --registry=https://registry.npm.taobao.org
30 "THEME": "sb", 30 "THEME": "sb",
31 "CODE": "BDCJGPT", {"BDCSBPT":上报: "BDCJGPT":监管} 31 "CODE": "BDCJGPT", {"BDCSBPT":上报: "BDCJGPT":监管}
32 "SERVERAPI": "/bdcsjsb", 32 "SERVERAPI": "/bdcsjsb",
33 "AREARMAP": "hanzhong", // {"hanzhong","yushu"}
34 "AREARNAME": "汉中",// {汉中市,玉树}
33 "calcHeight": 200, {上报:160 监管:200} 35 "calcHeight": 200, {上报:160 监管:200}
34 "echartTextColor": "#FFFFFF", {上报:"#4A4A4A" 监管:"#FFFFFF"} 36 "echartTextColor": "#FFFFFF", {上报:"#4A4A4A" 监管:"#FFFFFF"}
35 "MANAGEMENTAPI": "http://192.168.2.38:8090/management" 37 "MANAGEMENTAPI": "http://192.168.2.38:8090/management"
......
1 { 1 {
2 "TITLE": "汉中市数据上报系统", 2 "TITLE": "汉中市数据上报系统",
3 "THEME": "sb", 3 "THEME": "jg",
4 "CODE": "BDCSBPT", 4 "CODE": "BDCJGPT",
5 "AREARMAP": "hanzhong",
6 "AREARNAME": "汉中市",
5 "SERVERAPI": "/bdcsjsb", 7 "SERVERAPI": "/bdcsjsb",
6 "calcHeight": 160, 8 "calcHeight": 160,
7 "echartTextColor": "#4A4A4A", 9 "echartTextColor": "#4A4A4A",
......
This diff could not be displayed because it is too large.
...@@ -31,7 +31,8 @@ export default { ...@@ -31,7 +31,8 @@ export default {
31 window.addEventListener("resize", () => { 31 window.addEventListener("resize", () => {
32 this.key++; 32 this.key++;
33 }); 33 });
34 this.getDistrictcode(); 34 // 根据行政区代码匹配行政区
35 require(`@/common/map/${this.BASE_API.AREARMAP}.js`);
35 }, 36 },
36 watch: { 37 watch: {
37 cdata: { 38 cdata: {
...@@ -83,15 +84,12 @@ export default { ...@@ -83,15 +84,12 @@ export default {
83 mapType: "", // 自定义扩展图表类型 84 mapType: "", // 自定义扩展图表类型
84 top: "15%", 85 top: "15%",
85 left: "10%", 86 left: "10%",
86 map: "汉中市", 87 map: this.BASE_API.AREARNAME,
87 itemStyle: { 88 itemStyle: {
88 normal: { 89 normal: {
89 //阴影 90 //阴影
90 areaColor: "#5689FD", 91 areaColor: "#5689FD",
91 // shadowColor: "#21371d",
92 borderWidth: 1, 92 borderWidth: 1,
93 // shadowOffsetX: 2,
94 // shadowOffsetY: 20,
95 }, 93 },
96 }, 94 },
97 }, { 95 }, {
...@@ -100,7 +98,7 @@ export default { ...@@ -100,7 +98,7 @@ export default {
100 mapType: "", // 自定义扩展图表类型 98 mapType: "", // 自定义扩展图表类型
101 top: "18%", 99 top: "18%",
102 left: "10%", 100 left: "10%",
103 map: "汉中市", 101 map: this.BASE_API.AREARNAME,
104 itemStyle: { 102 itemStyle: {
105 color: '#21371d', 103 color: '#21371d',
106 areaColor: "#21371d", 104 areaColor: "#21371d",
...@@ -110,11 +108,6 @@ export default { ...@@ -110,11 +108,6 @@ export default {
110 shadowBlur: 10, 108 shadowBlur: 10,
111 shadowOffsetX: 0, 109 shadowOffsetX: 0,
112 shadowOffsetY: -12, 110 shadowOffsetY: -12,
113 // normal: {
114 // //阴影
115 // color:'#21371d',
116 // areaColor: "#21371d",
117 // },
118 }, 111 },
119 emphasis: { 112 emphasis: {
120 disabled: true 113 disabled: true
...@@ -125,19 +118,15 @@ export default { ...@@ -125,19 +118,15 @@ export default {
125 type: "map", 118 type: "map",
126 aspectScale: 1, //长宽比 119 aspectScale: 1, //长宽比
127 zoom: 1.1, 120 zoom: 1.1,
128 mapType: "汉中市", // 自定义扩展图表类型 121 mapType: this.BASE_API.AREARNAME, // 自定义扩展图表类型
129 top: "15%", 122 top: "15%",
130 left: "10%", 123 left: "10%",
131 itemStyle: { 124 itemStyle: {
132 normal: { 125 normal: {
133 // areaColor: "rgba(19,54,162,.1)",
134 borderWidth: 1.6, 126 borderWidth: 1.6,
135 // shadowBlur: 2,
136 borderColor: "#9DFFFC", 127 borderColor: "#9DFFFC",
137 // shadowColor: "#44f2fc",
138 }, 128 },
139 emphasis: { 129 emphasis: {
140 // itemStyle:{
141 // 地图区域的高亮颜色 130 // 地图区域的高亮颜色
142 areaColor: { 131 areaColor: {
143 type: 'linear', 132 type: 'linear',
...@@ -158,7 +147,6 @@ export default { ...@@ -158,7 +147,6 @@ export default {
158 shadowColor: '#000', 147 shadowColor: '#000',
159 shadowBlur: 10, 148 shadowBlur: 10,
160 shadowOffsetY: 4 149 shadowOffsetY: 4
161 // }
162 } 150 }
163 }, 151 },
164 label: { 152 label: {
...@@ -177,41 +165,16 @@ export default { ...@@ -177,41 +165,16 @@ export default {
177 }, 165 },
178 }, 166 },
179 }, 167 },
180 // 选中区域颜色
181 // select:{
182 // itemStyle:{
183 // areaColor:'red'
184 // }
185 // },
186 data: newData, 168 data: newData,
187 }, 169 },
188 ], 170 ],
189 }; 171 };
190 // 重新选择区域
191 // this.handleMapRandomSelect();
192 }, 172 },
193
194 immediate: true, 173 immediate: true,
195 deep: true, 174 deep: true,
196 }, 175 },
197 }, 176 },
198 computed: {
199 ...mapGetters(["sidebar", "dicData"]),
200 logoName () {
201 return (
202 this.dicData["sysCode"].filter((item) => { return item.DCODE == "areaMap" })
203 );
204 },
205 },
206 methods: { 177 methods: {
207 // 根据行政区代码匹配行政区
208 getDistrictcode () {
209 this.mapjson = ""
210 if (this.logoName[0].DNAME) {
211 this.mapjson = this.logoName[0].DNAME;
212 require(`@/common/map/${this.mapjson}.js`);
213 }
214 },
215 // 开启定时器 178 // 开启定时器
216 startInterval () { 179 startInterval () {
217 const _self = this; 180 const _self = this;
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-04-03 13:40:18
5 -->
1 <template> 6 <template>
2 <Chart :cdata="cdata" /> 7 <Chart :cdata="cdata" />
3 </template> 8 </template>
...@@ -16,7 +21,6 @@ export default { ...@@ -16,7 +21,6 @@ export default {
16 }, 21 },
17 mounted () { 22 mounted () {
18 this.mapViews(); 23 this.mapViews();
19
20 }, 24 },
21 methods: { 25 methods: {
22 async mapViews () { 26 async mapViews () {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="navbar-con"> 2 <div class="navbar-con">
3 <div class="navbar"> 3 <div class="navbar">
4 <div class="title"> 4 <div class="title">
5 {{ logoName[0] && logoName[0].DNAME }} 5 {{ BASE_API.TITLE }}
6 </div> 6 </div>
7 <div class="user"> 7 <div class="user">
8 欢迎进入系统 {{ userName }} 8 欢迎进入系统 {{ userName }}
...@@ -29,12 +29,7 @@ export default { ...@@ -29,12 +29,7 @@ export default {
29 sidebarRight, 29 sidebarRight,
30 }, 30 },
31 computed: { 31 computed: {
32 ...mapGetters(["sidebar", "dicData", , "permission_routes", "userInfo"]), 32 ...mapGetters(["userInfo"]),
33 logoName () {
34 return this.dicData['sysCode'] && this.dicData['sysCode'].filter(item =>
35 item.DCODE == "systemTitle"
36 )
37 },
38 userName () { 33 userName () {
39 return this.userInfo ? this.userInfo.name : "" 34 return this.userInfo ? this.userInfo.name : ""
40 } 35 }
...@@ -54,11 +49,10 @@ export default { ...@@ -54,11 +49,10 @@ export default {
54 }); 49 });
55 }) 50 })
56 .catch((error) => { 51 .catch((error) => {
57 // console.dir(error);
58 }) 52 })
59 } 53 }
60 } 54 }
61 }; 55 }
62 </script> 56 </script>
63 <style lang="scss" scoped> 57 <style lang="scss" scoped>
64 .menubg { 58 .menubg {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <div class="navbar"> 3 <div class="navbar">
4 <div class="logo"> 4 <div class="logo">
5 <img :src="require('@/image/bdclogo.png')" alt="" /> 5 <img :src="require('@/image/bdclogo.png')" alt="" />
6 <h4>不动产登记上报系统</h4> 6 <h4>{{ BASE_API.TITLE }}</h4>
7 </div> 7 </div>
8 <div class="right-menu"> 8 <div class="right-menu">
9 <div class="user"> 9 <div class="user">
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
25 Breadcrumb 25 Breadcrumb
26 }, 26 },
27 computed: { 27 computed: {
28 ...mapGetters(["sidebar", "dicData", "userInfo"]), 28 ...mapGetters(["userInfo"]),
29 userName () { 29 userName () {
30 return this.userInfo ? this.userInfo.name : "" 30 return this.userInfo ? this.userInfo.name : ""
31 } 31 }
......