diff --git a/src/main.js b/src/main.js
index 296c9448..90e2269f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -70,6 +70,22 @@ Vue.use(Element, {
i18n: (key, value) => i18n.t(key, value),
});
+// 弹窗底部滚动问题 弹窗需配合v-if使用
+Vue.directive('fixed', {
+ inserted() {
+ let scrollTop = document.body.scrollTop || document.documentElement.scrollTop
+ document.body.style.cssText += 'position:fixed;width:100%;top:-' + scrollTop + 'px;'
+ },
+ unbind () {
+ let body = document.body
+ body.style.position = ''
+ let top = body.style.top
+ document.body.scrollTop = document.documentElement.scrollTop = -parseInt(top)
+ body.style.top = ''
+ }
+})
+
+
// 挂载全局
Vue.prototype.$http = http;
// Vue.prototype.$getDictLabel = getDictLabel
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index b0caff31..4ae9bbe2 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -62,11 +62,13 @@
-
+ @look="handleUnitLook">
@@ -180,6 +185,7 @@ import screenTable from "../components/screen-table/index";
import cptCard from "@/views/modules/visual/cpts/card";
import nextTick from "dai-js/tools/nextTick";
import dialogInfo from './dialogInfo.vue'
+import unitInfo from './unitInfo.vue'
import screenMap from "@/views/modules/visual/components/screen-map";
import screenEchartsFrame from "../components/screen-echarts-frame";
import { pieOption } from './options'
@@ -190,6 +196,7 @@ export default {
cptCard,
screenTable,
dialogInfo,
+ unitInfo,
screenMap,
screenEchartsFrame
},
@@ -197,8 +204,25 @@ export default {
return {
showedMoreInfo: false,
+ showedUnitMoreInfo: true,
tableLoading: false,
warningList: [],
+ headerTypeList: [
+ { title: "序号", coulmn: 'index' },
+ { title: "单位名称", coulmn: 'unitName' },
+ { title: "单位类型", coulmn: 'address' },
+ ],
+ headerStyle: [
+ {
+ 'width': '60px'
+ },
+ {
+ 'min-width': '160px'
+ },
+ {
+ 'width': '160px'
+ }
+ ],
headerList: [
{ title: "序号", coulmn: 'index' },
{ title: "活动标题", coulmn: 'title' },
@@ -212,6 +236,7 @@ export default {
// [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
],
detailId: '',
+ unitdetailId: '',
agencyId: '',
value2: '',
timeRange: '',
@@ -233,6 +258,7 @@ export default {
unitMapList: [],
detailInfo: {},
+ unitdetailInfo: {},
pieEduChartSs: null,
pieEduOptions: null,
eduList: [],
@@ -762,6 +788,11 @@ export default {
await this.getDetail(val.id)
this.showedMoreInfo = true
},
+ handleUnitLook(val) {
+ this.unitdetailId = val.id
+ // await this.getDetail(val.id)
+ this.showedUnitMoreInfo = true
+ },
handleSelectChange (val) {
this.getList(this.agencyId);
diff --git a/src/views/modules/visual/communityParty/unitInfo.vue b/src/views/modules/visual/communityParty/unitInfo.vue
new file mode 100644
index 00000000..1dbdb4f2
--- /dev/null
+++ b/src/views/modules/visual/communityParty/unitInfo.vue
@@ -0,0 +1,467 @@
+
+
+
+
+
+

+
单位活动
+
+
+
+

+
+
+
+
+
+
+
+
+
+ 服务事项:
+ {{ info.serviceMatterNameShow }}
+
+
+ 单位名称:
+ {{ info.unitNameShow }}
+
+
+ 活动标题:
+ {{ info.title }}
+
+
+ 活动内容:
+
+
+
+ 服务人数:
+ {{ info.peopleCount }}
+
+
+ 活动时间:
+ {{ info.activityTime }}
+
+
+
+ 活动地址:
+ {{ info.address }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+