Browse Source

Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov-zhengwu-yantai

# Conflicts:
#	public/index.html
#	src/views/modules/base/epidemic/antiInfo.vue
#	src/views/modules/base/epidemic/travel.vue
yantai_master
dai 3 years ago
parent
commit
e1bc820c9f
  1. 2
      .env.production
  2. 22
      src/router/index.js
  3. 26
      src/utils/request.js
  4. 30
      src/views/main-navbar.vue
  5. 37
      src/views/main-shuju/main-navbar.vue
  6. 8
      src/views/modules/visual/basicinfo/basicInfoMain-备份.vue
  7. 2
      src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
  8. 8
      src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
  9. 8
      src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
  10. 8
      src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
  11. 8
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
  12. 4
      src/views/modules/visual/communityGovern/processAnalyze.vue
  13. 10
      src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
  14. 2
      src/views/modules/visual/communityParty/community.vue
  15. 2
      src/views/modules/visual/communityParty/gridParty.vue
  16. 6
      src/views/modules/visual/components/screen-map/index.vue
  17. 14
      src/views/modules/visual/plugin/power/components/screen-org-map.vue

2
.env.production

@ -1,5 +1,5 @@
NODE_ENV=production
VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api
VUE_APP_API_SERVER = http://172.20.46.177/api
VUE_APP_NODE_ENV=prod
VUE_APP_PUBLIC_PATH=epmet-oper
VUE_APP_CUSTOMER=yantai

22
src/router/index.js

@ -26,17 +26,37 @@ export const pageRoutes = [
},
},
{
path: "/login",
path: "/login-local",
component: () => {
return CUSTOMER == "yantai"
? import("@/views/pages/yantai-login")
: import("@/views/pages/login");
},
name: "login-local",
meta: {
title: "登录",
},
},
{
path: "/login/",
component: () => {
return import("@/views/pages/yantai-login-transit");
},
name: "login",
meta: {
title: "登录",
},
},
{
path: "/login",
name: "login2",
meta: {
title: "登录",
},
redirect: {
name: "login",
},
},
{
path: "/",
name: "index",

26
src/utils/request.js

@ -54,13 +54,6 @@ http.interceptors.response.use(response => {
const code = [10007, 401, 10001, 10005]
if (code.includes(response.data.code)) {
clearLoginInfo()
// localStorage.setItem('userType', 'work')
// let userType = localStorage.getItem("userType");
// if (userType === 'work'){
// router.replace({ name: 'loginWork' })
// }else {
// router.replace({ name: 'login' })
// }
router.replace({ name: 'login' })
return Promise.reject(response.data.msg)
@ -71,4 +64,23 @@ http.interceptors.response.use(response => {
return Promise.reject(error)
})
http.put = function (url, data, config) {
return http.post(url, data, {
...config,
headers: {
"X-HTTP-Method-Override": "PUT",
},
});
};
http.delete = function (url, config) {
return http.post(url, config.data || {}, {
// ...config,
headers: {
"X-HTTP-Method-Override": "DELETE",
},
});
};
export default http

30
src/views/main-navbar.vue

@ -8,10 +8,12 @@
<div class="aui-navbar__header">
<h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
<a class="aui-navbar__brand-lg" href="javascript:;">{{
$store.state.user.agencyName
$store.state.user.agencyName
}}</a>
<a class="aui-navbar__brand-mini" href="javascript:;">{{
$store.state.user.agencyName .slice(0, 2)
$store.state.user.agencyName
? $store.state.user.agencyName.slice(0, 2)
: ""
}}</a>
</h1>
</div>
@ -48,7 +50,7 @@
</el-menu-item>
<el-menu-item
v-show="menu.showFlag==1"
v-show="menu.showFlag == 1"
v-for="(menu, idx) in $store.state.sidebarMenuList"
:key="menu.id"
:menu="menu"
@ -127,6 +129,8 @@ import { mapGetters } from "vuex";
import screenfull from "screenfull";
import UpdatePasswordWork from "./main-navbar-update-password-work";
import { clearLoginInfo } from "@/utils";
import { logout } from "@/utils/yantai-transit";
export default {
inject: ["refresh"],
data() {
@ -211,12 +215,6 @@ export default {
}
)
.then(() => {
//
// tabs,
this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
(item) => item.name === "home"
);
this.$http
.post("/auth/login/logout")
.then(({ data: res }) => {
@ -228,12 +226,14 @@ export default {
}
clearLoginInfo();
this.$router.push({ name: "login" });
// if (localStorage.getItem('userType') === 'work') {
// this.$router.push({ name: 'loginWork' })
// } else {
// this.$router.push({ name: 'login' })
// }
logout();
//
this.$store.state.contentTabs =
this.$store.state.contentTabs.filter(
(item) => item.name === "home"
);
// this.$router.push({ name: "login" });
})
.catch(() => {});
})

37
src/views/main-shuju/main-navbar.vue

@ -3,9 +3,13 @@
<nav v-if="showHeader" class="m-navbar">
<div class="navbar__header">
<h1 class="navbar__brand" @click="$router.push({ name: 'home' })">
<a class="navbar__brand-lg" href="javascript:;">{{ $store.state.user.agencyName }}</a>
<a class="navbar__brand-lg" href="javascript:;">{{
$store.state.user.agencyName
}}</a>
<a class="navbar__brand-mini" href="javascript:;">{{
$store.state.user.agencyName.slice(0, 2)
$store.state.user.agencyName
? $store.state.user.agencyName.slice(0, 2)
: ""
}}</a>
</h1>
</div>
@ -141,6 +145,8 @@ import { mapGetters } from "vuex";
import screenfull from "screenfull";
import UpdatePasswordWork from "@/views/main-navbar-update-password-work";
import { clearLoginInfo } from "@/utils";
import { logout } from "@/utils/yantai-transit";
export default {
inject: ["refresh"],
data() {
@ -167,10 +173,15 @@ export default {
const customerId = localStorage.getItem("customerId");
let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
// 亿 -
if ("04c0d396e298f13e57aa5904a657eaa6" != customerId && "3fdd0380deff5b30f45376cdf995d1c1" != customerId){
for (let index in siteconfigElement){
if (siteconfigElement[index].id == '6'){
let newMenuArr = siteconfigElement[index].children.filter(item =>item.id !== 'duoyuanfuwufenxi');
if (
"04c0d396e298f13e57aa5904a657eaa6" != customerId &&
"3fdd0380deff5b30f45376cdf995d1c1" != customerId
) {
for (let index in siteconfigElement) {
if (siteconfigElement[index].id == "6") {
let newMenuArr = siteconfigElement[index].children.filter(
(item) => item.id !== "duoyuanfuwufenxi"
);
siteconfigElement[index].children = newMenuArr;
}
}
@ -226,12 +237,6 @@ export default {
}
)
.then(() => {
//
// tabs,
this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
(item) => item.name === "home2"
);
this.$http
.post("/auth/login/logout")
.then(({ data: res }) => {
@ -243,8 +248,14 @@ export default {
}
clearLoginInfo();
logout();
this.$router.push({ name: "login" });
//
this.$store.state.contentTabs =
this.$store.state.contentTabs.filter(
(item) => item.name === "home2"
);
// this.$router.push({ name: "login" });
})
.catch(() => {});
})

8
src/views/modules/visual/basicinfo/basicInfoMain-备份.vue

@ -179,9 +179,9 @@ let yoffset = 0
//url
let iconUrlArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png',
'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png',
'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png'
];
let textColorArray = [
'rgba(236, 69, 4, 0.66)',
@ -762,7 +762,7 @@ const vueGis = {
// imgSize: [32, 32],
scale: 0.5,
// src: "/img/largeScreen/icon_camra.png"
// src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
// src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png"
src: iconUrlArray[oneIcon.values_.colorIndex]
})
});

2
src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue

@ -487,7 +487,7 @@ export default {
// this.agencyInfo.level = 'agency'
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
const polygonIconArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png',
]
this.$refs.map.loadMap(this.agencyInfo, this.polygonList, polygonIconArray, this.distributionsList, this.iconUrlArray, null)
} else {

8
src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue

@ -421,9 +421,9 @@ let yoffset = 0
// let iconUrlArray = [
// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
// 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png',
// 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png',
// 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png'
// ];
let iconUrlArray = [
require('../../../../../assets/img/shuju/measure/lxdj.png'),
@ -1605,7 +1605,7 @@ const vueGis = {
// imgSize: [32, 32],
scale: 0.5,
// src: "/img/largeScreen/icon_camra.png"
// src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
// src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png"
src: iconUrlArray[oneIcon.values_.colorIndex],
})

8
src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue

@ -419,9 +419,9 @@ let yoffset = 0
//url
let iconUrlArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png',
'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png',
'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png'
];
let textColorArray = [
'rgba(236, 69, 4, 0.66)',
@ -1614,7 +1614,7 @@ const vueGis = {
// imgSize: [32, 32],
scale: 0.5,
// src: "/img/largeScreen/icon_camra.png"
// src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
// src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png"
src: iconUrlArray[oneIcon.values_.colorIndex]
})
});

8
src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue

@ -424,9 +424,9 @@ let yoffset = 0
// let iconUrlArray = [
// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
// 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
// 'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png',
// 'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png',
// 'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png'
// ];
let iconUrlArray = [
require('../../../../../assets/img/shuju/measure/lxdj.png'),
@ -1608,7 +1608,7 @@ const vueGis = {
// imgSize: [32, 32],
scale: 0.5,
// src: "/img/largeScreen/icon_camra.png"
// src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
// src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png"
src: iconUrlArray[oneIcon.values_.colorIndex],
})

8
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

@ -417,9 +417,9 @@ let yoffset = 0
//url
let iconUrlArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png',
'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png',
'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png'
];
let textColorArray = [
'rgba(236, 69, 4, 0.66)',
@ -1613,7 +1613,7 @@ const vueGis = {
// imgSize: [32, 32],
scale: 0.5,
// src: "/img/largeScreen/icon_camra.png"
// src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
// src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png"
src: iconUrlArray[oneIcon.values_.colorIndex]
})
});

4
src/views/modules/visual/communityGovern/processAnalyze.vue

@ -386,8 +386,8 @@ export default {
});
this.iconUrlArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211209/0994757e8962405ca1cdf9792bf325e4.png',//
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211209/2a80f800b04442448c41a6ed4592cd95.png'//
'http://10.2.2.50/epmet-oss-01/20220923/32f637c7610d406db71d93b70e3f7267.png',//
'http://10.2.2.50/epmet-oss-01/20220923/cf8e580192ff467b84b809f10c1bfe29.png'//
]
this.iconTextStyle = {

10
src/views/modules/visual/communityGovern/shijianchuli/lineOption.js

@ -109,7 +109,7 @@ export function lineOption () {
type: 'bar',
zlevel: 1,
itemStyle: {
normal: {
barBorderRadius: 0,
color: function (params) {
@ -119,9 +119,9 @@ export function lineOption () {
['rgba(36, 253, 231, .2)', 'rgba(36, 253, 231, 1)'],
];
var colorItem
colorItem = colorList[1];
// 设置线条渐变色
return new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
offset: 0,
@ -139,13 +139,13 @@ export function lineOption () {
barWidth: 7,
// data: serviceCount
},
{
name: 'XXX',
type: 'pictorialBar',
symbol: function (params, value) {
// 设置图片
return circleList[1]
},
symbolPosition: 'end',

2
src/views/modules/visual/communityParty/community.vue

@ -886,7 +886,7 @@ export default {
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
const polIconUrlArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png'
'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png'
]
console.log('this.unitTableData', this.unitTableData)
this.$refs.cmap.loadMap(this.agencyInfo, this.parentPolygon, polIconUrlArray, this.unitTableData, this.iconUrlArray, null)

2
src/views/modules/visual/communityParty/gridParty.vue

@ -183,7 +183,7 @@ export default {
loadMap () {
if (this.isfirstInit) {
const polIconUrlArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png'
'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png'
]
this.$refs.map.loadMap(this.agencyInfo, this.parentPolygon, polIconUrlArray, this.unitMapList, this.iconUrlArray, null,)
} else {

6
src/views/modules/visual/components/screen-map/index.vue

@ -190,9 +190,9 @@ const vueGis = {
//policon
polIconUrlArray: [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png',
'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png',
'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png'
],
//icon
iconUrlArray: [],

14
src/views/modules/visual/plugin/power/components/screen-org-map.vue

@ -51,9 +51,9 @@ let iconLayer; // icon标注图层
var centerPointGlobal = [120.38945519, 36.0722275]
const iconArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png',
'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png',
'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png'
]
const textColorArray = [
'rgba(236, 69, 4, 0.66)',
@ -66,9 +66,9 @@ let polygonColorArray = [
'rgba(183, 185, 0, 0.16)'
];
let iconUrlArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
'http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png',
'http://10.2.2.50/epmet-oss-01/20220923/dd51bf949fb14b6aac205adef1695f74.png',
'http://10.2.2.50/epmet-oss-01/20220923/d09770eeee65439a840df2c5b7c80bb4.png'
];
//
var createTextStyle = function (feature) {
@ -529,7 +529,7 @@ export default {
// imgSize: [32, 32],
scale: 0.5,
// src: "/img/largeScreen/icon_camra.png"
// src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
// src: "http://10.2.2.50/epmet-oss-01/20220923/79cd2d034f594df2b144a31076f83248.png"
src: iconUrlArray[oneIcon.values_.colorIndex]
})
});

Loading…
Cancel
Save