Browse Source

爱心互助bug

master
jiangyy 3 years ago
parent
commit
538d6222fd
  1. 4
      src/views/modules/base/epidemic/antiInfo.vue
  2. 4
      src/views/modules/base/epidemic/natInfo/natList.vue
  3. 20
      src/views/modules/communityParty/heart/heartForm.vue
  4. 5
      src/views/modules/communityParty/heart/heartList.vue
  5. 10
      src/views/modules/communityParty/heart/heartPerson.vue
  6. 2063
      src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
  7. 1987
      src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
  8. 32
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
  9. 4
      src/views/modules/visual/components/screen-map/index.vue

4
src/views/modules/base/epidemic/antiInfo.vue

@ -152,6 +152,7 @@
<el-table class="table"
:data="tableData"
border
ref="ref_table"
:height="tableHeight"
v-loading="tableLoading"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
@ -554,6 +555,9 @@ export default {
await this.loadTable()
this.sHeight = this.$refs.div_search.offsetHeight + 230
},
activated () {
this.$refs['ref_table'].doLayout()
},
methods: {
handleCnalceForm () {

4
src/views/modules/base/epidemic/natInfo/natList.vue

@ -332,6 +332,10 @@ export default {
await this.loadTable()
},
activated () {
this.$refs['ref_table'].doLayout()
},
methods: {
async handleSearch () {

20
src/views/modules/communityParty/heart/heartForm.vue

@ -84,7 +84,7 @@
prop="actQuota"
style="display: block"
label-width="150px">
<el-input-number class="item_width_6"
<el-input-number class="item_width_2"
v-model="formData.actQuota"
label="活动人数"></el-input-number>
</el-form-item>
@ -93,7 +93,7 @@
prop="reward"
style="display: block"
label-width="150px">
<el-input-number class="item_width_6"
<el-input-number class="item_width_2"
v-model="formData.reward"
label="活动积分"></el-input-number>
</el-form-item>
@ -141,7 +141,7 @@
style="display: block"
prop="signUpEndTime"
label-width="150px">
<el-date-picker class="item_width_6"
<el-date-picker class="item_width_2"
v-model="formData.signUpEndTime"
value-format="yyyy-MM-dd HH:mm"
format="yyyy-MM-dd HH:mm"
@ -187,7 +187,7 @@
prop="signInRadius"
style="display: block"
label-width="150px">
<el-input-number class="item_width_6"
<el-input-number class="item_width_2"
v-model="formData.signInRadius"
label="签到有效范围"></el-input-number>
</el-form-item>
@ -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 {

5
src/views/modules/communityParty/heart/heartList.vue

@ -283,6 +283,7 @@
class="dialog-h"
@closed="personDiaClose">
<heart-person ref="ref_person"
@personDiaClose="personDiaClose"
:status="status"></heart-person>
</el-dialog>
@ -586,6 +587,10 @@ export default {
this.personShow = false//
},
personDiaClose () {
this.personShow = false//
},
finishDiaClose () {
this.finishShow = false//

10
src/views/modules/communityParty/heart/heartPerson.vue

@ -104,6 +104,11 @@
</el-table>
</div>
<div class="div_btn">
<el-button size="small"
@click="handleCancle"> </el-button>
</div>
</div>
</template>
@ -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;
}
</style>

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

File diff suppressed because it is too large

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

File diff suppressed because it is too large

32
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//xfalse
}),
zIndex: 20
zIndex: 20,
crossOrigin: 'anonymous'
});
mapView = new View({
//
center: this.centerPoint,
@ -1674,6 +1702,8 @@ const vueGis = {
});
map.removeInteraction(dblClickInteraction);
},
//
addParentLayer () {

4
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
}
},

Loading…
Cancel
Save