diff --git a/src/assets/scss/modules/visual/a_customize.scss b/src/assets/scss/modules/visual/a_customize.scss new file mode 100644 index 00000000..147218a5 --- /dev/null +++ b/src/assets/scss/modules/visual/a_customize.scss @@ -0,0 +1,34 @@ +@import '../../c/config'; +@import '../../c/function'; +@import './c/common'; + +.single-select { + + margin: 0 10px 0 10px; + + ::v-deep .el-input { + width: 180px; + height: 36px; + .el-input__inner { + height: 100%; + padding: 0 10px; + color: #fff; + line-height: 36px; + background: #06186d; + border: 1px solid #1a64cc; + } + + .el-icon-arrow-up:before { + content: '\e78f'; + } + // .el-select__caret:before { + // content: '\E790' + // } + } + + + + +} + + \ No newline at end of file diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index dba68e17..b85407f3 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -280,7 +280,7 @@ export default { Object.keys(data).forEach((k) => { this[k] = data[k]; }); - this.getApiData(); + // this.getApiData(); }, }, diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index 058eb24e..1790d751 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -578,8 +578,6 @@ export default { }, async handleWatch (row) { - this.eventId = row.icEventId - this.eventId = row.icEventId const url = "/gov/project/icEvent/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index 2fe8caee..81190d69 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -1,12 +1,11 @@ @@ -555,7 +474,7 @@ export default { }, }, - data() { + data () { return { breadList: [], showedMoreInfo: false, @@ -659,7 +578,7 @@ export default { computed: {}, - beforeRouteEnter(to, from, next) { + beforeRouteEnter (to, from, next) { console.log("让我看看", to); if (from) { const arr = [{ ...from }, { ...to, meta: { title: "个人详情" } }]; @@ -671,14 +590,14 @@ export default { } }, watch: { - uid(id) { + uid (id) { this.userId = id; }, - userId() { + userId () { this.getApiData(); window.scrollTo(0, 0); }, - $route(route) { + $route (route) { // if you go to the redirect page, do not update the breadcrumbs if (route.path.startsWith("/redirect/")) { return; @@ -687,21 +606,21 @@ export default { }, }, - async mounted() { + async mounted () { this.userId = this.uid; console.log(this.$router); this.getApiData(); }, - deactivated() { + deactivated () { this.breadList = []; console.log("breadList-----", this.breadList); }, - destroyed() { + destroyed () { this.breadList = []; console.log("breadList-----", this.breadList); }, methods: { - getBreadcrumb() { + getBreadcrumb () { // only show routes with meta.title console.log("routest----", this.$route); let matched = this.$route.matched.filter( @@ -717,16 +636,16 @@ export default { (item) => item.meta && item.meta.title && item.meta.breadcrumb !== false ); }, - isDashboard(route) { + isDashboard (route) { const name = route && route.name; if (!name) { return false; } return name.trim().toLocaleLowerCase() === "Home".toLocaleLowerCase(); }, - handleSearch() {}, + handleSearch () { }, - async getApiData() { + async getApiData () { await this.getInfo(); this.getHouseInfo(); this.getDemandData(); @@ -735,12 +654,12 @@ export default { this.getPointData(); }, - toUserInfo(uid) { + toUserInfo (uid) { this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); }, //加载组织数据 - async getInfo() { + async getInfo () { const url = "/epmetuser/icresiuser/persondata"; let params = { userId: this.userId, @@ -756,7 +675,7 @@ export default { }, //加载组织数据 - async getHouseInfo() { + async getHouseInfo () { const url = "/epmetuser/icresiuser/ownerrelation"; let params = { userId: this.userId, @@ -771,20 +690,25 @@ export default { } }, - handlePageNoChangeDemand(val) { + handlePageNoChangeDemand (val) { this.demand.pageNo = val; this.getDemandData(); }, - handleOperateDemandList(index, type) { + handleOperateDemandList (index, type) { if (type == "查看") { this.showedDemandInfo = true; this.demand.currentIndex = index; } }, + //指派成功后刷新 + handleAssignOk () { + this.getDemandData(); + }, + //加载组织数据 - async getDemandData() { + async getDemandData () { const url = "/heart/userdemand/mydemand"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -814,18 +738,18 @@ export default { } }, - handlePageNoChangeIncident(val) { + handlePageNoChangeIncident (val) { this.incident.pageNo = val; this.getIncidentData(); }, - handleClickIncident(index) { + handleClickIncident (index) { this.incident.showedInfo = true; this.incident.currentIndex = index; }, //加载组织数据 - async getIncidentData() { + async getIncidentData () { let url = "/gov/project/icEvent/icevent-pageuserreported"; // 市北沿用旧接口 @@ -853,18 +777,18 @@ export default { } }, - handlePageNoChangeTopic(val) { + handlePageNoChangeTopic (val) { this.topic.pageNo = val; this.getTopicData(); }, - handleClickTopic(index) { + handleClickTopic (index) { this.topic.showedInfo = true; this.topic.currentIndex = index; }, //加载组织数据 - async getTopicData() { + async getTopicData () { const url = "/data/aggregator/resigroup/pageusertopic"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -884,18 +808,18 @@ export default { } }, - handlePageNoChangePoint(val) { + handlePageNoChangePoint (val) { this.point.pageNo = val; this.getPointData(); }, - handleClickPoint(index) { + handleClickPoint (index) { this.point.showedInfo = true; this.point.currentIndex = index; }, //加载组织数据 - async getPointData() { + async getPointData () { const url = "/point/resi/point/pageuserpoint"; let params = { epmetUserIdList: this.info.epmetUserIdList, diff --git a/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue new file mode 100644 index 00000000..0e5ccee6 --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue @@ -0,0 +1,177 @@ + + + + + + diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 117deb9a..c794653d 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -2,359 +2,362 @@
+
+
+
+
+
+ 五大图层 +
+
五大图层> -
-
-
-
- 五大图层 -
-
五大图层> - - 个人档案 + 个人档案 +
-
-
+
-
-
+
+
-
-
- -
- -
- - {{item.label}} +
+
+ +
+ +
+ + {{item.label}} +
-
-
-
- -
- -
{{colItem.categoryName}} +
+
+ +
+ +
{{colItem.categoryName}} + +
-
-
- -
+ +
-
- -
- - - - - - -
搜索
+
+ +
+ + + + + + +
搜索
-
-
+
+
-
- +
+ +
+
+ + +
-
- - -
-
- -
+ +
+
-
-