diff --git a/src/assets/images/cj.png b/src/assets/images/cj.png
new file mode 100644
index 0000000..785cbe4
Binary files /dev/null and b/src/assets/images/cj.png differ
diff --git a/src/assets/images/cj_logo.png b/src/assets/images/cj_logo.png
new file mode 100644
index 0000000..662eeae
Binary files /dev/null and b/src/assets/images/cj_logo.png differ
diff --git a/src/store/modules/dialog.js b/src/store/modules/dialog.js
index ed143f7..201a5f3 100644
--- a/src/store/modules/dialog.js
+++ b/src/store/modules/dialog.js
@@ -22,6 +22,8 @@ export default {
archiveQueryVisible: false, // 小弹窗-档案查询
oneClickServiceVisible: false, // 小弹窗-一键服务除了一键直通、档案查询其他的模块
gridInfoDialog:false, // 小弹窗-网格信息弹窗
+ disabilityVisible: false, // 大弹窗-矛盾调解
+
},
mutations: {
set_buildLeaderAttachVisible (state, visible) {
@@ -89,7 +91,11 @@ export default {
},
set_gridInfoDialog(state, visible) {
state.gridInfoDialog = visible
- }
+ },
+ set_disabilityVisible (state, visible) {
+ state.disabilityVisible = visible
+ console.log(visible);
+ },
},
actions: {
SET_BUILDLEADERATTACHVISIBLE (context, visible) {
@@ -159,6 +165,10 @@ export default {
context.commit('set_gridInfoDialog', visible)
},
+ SET_DISABILITYVISIBLE (context, visible) {
+
+ context.commit('set_disabilityVisible', visible)
+ },
// 确保当前只能显示最近点击的弹窗
showGlobalDialog (context, type) {
context.commit('set_buildLeaderAttachVisible', false)
@@ -230,5 +240,6 @@ export default {
archiveQueryVisible: state => state.archiveQueryVisible,
oneClickServiceVisible: state => state.oneClickServiceVisible,
gridInfoDialog:state => state.gridInfoDialog,
+ disabilityVisible:state => state.disabilityVisible,
}
}
diff --git a/src/views/next/dialog-module/disabilityVisible/index.vue b/src/views/next/dialog-module/disabilityVisible/index.vue
new file mode 100644
index 0000000..acd5ca0
--- /dev/null
+++ b/src/views/next/dialog-module/disabilityVisible/index.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/next/index.vue b/src/views/next/index.vue
index c7913a5..23835a8 100644
--- a/src/views/next/index.vue
+++ b/src/views/next/index.vue
@@ -35,6 +35,7 @@
+
@@ -67,6 +68,8 @@ import DirectCommunication from './dialog-module/direct-communication'
import ArchiveQuery from './dialog-module/archive-query'
import OneClickService from './dialog-module/one-click-service'
import GridInfoDialog from './dialog-module/grid-info-dialog'
+import DisabilityDialog from './dialog-module/disabilityVisible'
+
let width = 0
let height = 0
export default {
@@ -106,7 +109,8 @@ export default {
DirectCommunication,
ArchiveQuery,
OneClickService,
- GridInfoDialog
+ GridInfoDialog,
+ DisabilityDialog
},
beforeRouteEnter (to, from, next) {
if (window.location.search) {
diff --git a/src/views/next/screen-content-map/index.vue b/src/views/next/screen-content-map/index.vue
index f48782a..32894ce 100644
--- a/src/views/next/screen-content-map/index.vue
+++ b/src/views/next/screen-content-map/index.vue
@@ -133,7 +133,7 @@ export default {
],
mapTabListGrid: [],
mapTabList: [
- // { icon: require('@/assets/images/red-cross-blue-icon.png'), label: '红十字会', selectIcon: require('@/assets/images/red-cross-yellow-icon.png') },
+ { icon: require('@/assets/images/cj.png'), label: '残联基层组织', selectIcon: require('@/assets/images/cj.png') },
{ icon: require('@/assets/images/volunteer-blue-icon.png'), label: '志愿者', selectIcon: require('@/assets/images/volunteer-yellow-icon.png') }
],
currentTab: '',
@@ -189,6 +189,7 @@ export default {
set_communityId: 'SET_COMMUNITYID',
showGlobalDialog: 'showGlobalDialog',
set_gridInfoDialog: "SET_GRIDINFODIALOG",
+ set_disabilityVisible: 'SET_DISABILITYVISIBLE',
}),
getResidentClassifyStatistics() {
let params = {
@@ -295,7 +296,7 @@ export default {
// numAnimation(this.statisticsList[2].value, communityNum, this.statisticsList[2], 'value')
// numAnimation(this.statisticsList[3].value, gridNum, this.statisticsList[3], 'value')
// numAnimation(this.statisticsList[4].value, itemOverCount, this.statisticsList[4], 'value')
- numAnimation(this.statisticsList[5].value, gridUserNum, this.statisticsList[5], 'value')
+ numAnimation(this.statisticsList[5].value, 62, this.statisticsList[5], 'value')
// numAnimation(this.statisticsList[5].value, partyMemberNum, this.statisticsList[5], 'value')
}).catch(err => {
console.error('获取地图中心上方统计数', err)
@@ -397,9 +398,8 @@ export default {
} else {
this.currentTab = tab.label
}
-
- if (this.currentTab === '红十字会') {
- Bus.$emit('drawRedCrossMarker')
+ if (this.currentTab === '残联基层组织') {
+ this.set_disabilityVisible(true)
} else if (this.currentTab === '志愿者') {
Bus.$emit('drawVolunteerMarker')
} else {
@@ -747,7 +747,7 @@ img {
z-index: 20;
.tab-item {
- width: 115px;
+ width: 137px;
height: 36px;
background: rgba(8, 31, 57, 0.61);
border: 1px solid #12d0ff;