diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index dc93596d..8e464525 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -152,6 +152,7 @@
-
@@ -93,7 +93,7 @@
prop="reward"
style="display: block"
label-width="150px">
-
@@ -141,7 +141,7 @@
style="display: block"
prop="signUpEndTime"
label-width="150px">
-
-
@@ -424,7 +424,7 @@ export default {
signInEndTime: "",
signInLatitude: null,
signInLongitude: null,
- signInRadius: undefined,
+ signInRadius: 200,
signInStartTime: "",
signUpEndTime: "",
sponsorContacts: "",
@@ -918,7 +918,7 @@ export default {
signInEndTime: "",
signInLatitude: null,
signInLongitude: null,
- signInRadius: undefined,
+ signInRadius: 200,
signInStartTime: "",
signUpEndTime: "",
sponsorContacts: "",
@@ -1020,11 +1020,15 @@ export default {
}
.text_p {
+ width: 1000px;
margin: 0 0;
border: 3px;
- > p {
- margin: 0 0;
+ p {
+ margin: 0;
+ padding: 0;
+ -webkit-margin-start: 0;
+ -webkit-margin-end: 0;
}
}
.div_content {
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
index 37c2f935..f6cc8bca 100644
--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -283,6 +283,7 @@
class="dialog-h"
@closed="personDiaClose">
@@ -586,6 +587,10 @@ export default {
this.personShow = false//
},
+ personDiaClose () {
+
+ this.personShow = false//
+ },
finishDiaClose () {
this.finishShow = false//
diff --git a/src/views/modules/communityParty/heart/heartPerson.vue b/src/views/modules/communityParty/heart/heartPerson.vue
index 0acab6d6..898a27b4 100644
--- a/src/views/modules/communityParty/heart/heartPerson.vue
+++ b/src/views/modules/communityParty/heart/heartPerson.vue
@@ -104,6 +104,11 @@
+
+ 关 闭
+
+
@@ -220,6 +225,9 @@ export default {
this.cancleShow = true
},
+ handleCancle () {
+ this.$emit('personDiaClose')
+ },
// 开启加载动画
startLoading () {
@@ -278,6 +286,6 @@ export default {
.div_btn {
margin-top: 10px;
display: flex;
- justify-content: flex-end;
+ justify-content: center;
}
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
new file mode 100644
index 00000000..7ee8f5f8
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
@@ -0,0 +1,2063 @@
+
+
+
+
+
+
+
+
+
+ 五大图层
+
+
五大图层>
+
+ 个人档案
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
{{item.label}}
+
+
+
+
+
+
+
+
+
![]()
+
{{colItem.categoryName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
new file mode 100644
index 00000000..efc340eb
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
@@ -0,0 +1,1987 @@
+
+
+
+
+
+
+
+
+
+ 五大图层
+
+
五大图层>
+
+ 个人档案
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
{{item.label}}
+
+
+
+
+
+
+
+
+
![]()
+
{{colItem.categoryName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 5535dc57..efc340eb 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -373,6 +373,8 @@
import 'ol/ol.css'
import { Map, View } from 'ol'
import TileLayer from 'ol/layer/Tile.js';
+import ImageLayer from 'ol/layer/Image';
+import { Raster as RasterSource } from 'ol/source';
import XYZ from 'ol/source/XYZ.js';
import VectorLayer from 'ol/layer/Vector.js';
import VectorSource from 'ol/source/Vector.js';
@@ -489,6 +491,28 @@ var polygonStyleFunction = (function () {
};
})()
+//定义颜色转换方法
+let reverseFunc = function (pixelsTemp) {
+ //蓝色
+ for (var i = 0; i < pixelsTemp.length; i += 4) {
+ var r = pixelsTemp[i];
+ var g = pixelsTemp[i + 1];
+ var b = pixelsTemp[i + 2];
+ //运用图像学公式,设置灰度值
+ var grey = r * 0.3 + g * 0.59 + b * 0.11;
+ //将rgb的值替换为灰度值
+ pixelsTemp[i] = grey;
+ pixelsTemp[i + 1] = grey;
+ pixelsTemp[i + 2] = grey;
+
+ //基于灰色,设置为蓝色,这几个数值是我自己试出来的,可以根据需求调整
+ pixelsTemp[i] = 55 - pixelsTemp[i];
+ pixelsTemp[i + 1] = 255 - pixelsTemp[i + 1];
+ pixelsTemp[i + 2] = 305 - pixelsTemp[i + 2];
+ }
+};
+
+
const vueGis = {
name: 'HomeMap',
data () {
@@ -1642,9 +1666,13 @@ const vueGis = {
url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
wrapX: true//x方向平铺,也可以选择false
}),
- zIndex: 20
+ zIndex: 20,
+ crossOrigin: 'anonymous'
});
+
+
+
mapView = new View({
//中心点坐标
center: this.centerPoint,
@@ -1674,6 +1702,8 @@ const vueGis = {
});
map.removeInteraction(dblClickInteraction);
+
+
},
//添加标注图层
addParentLayer () {
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 58206f45..7e13d380 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -422,7 +422,7 @@ const vueGis = {
// imgSize: [32, 32],
// scale: 0.5,
// src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0]
- src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index &&this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0]
+ src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index && this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0]
}),
// text: createTextStyle(oneIcon)
});
@@ -627,6 +627,8 @@ const vueGis = {
this.zoom = 13
} else if (level === 'community') {
this.zoom = 14
+ } else {
+ this.zoom = 12
}
},