diff --git a/.env.development b/.env.development index b3e49ab5..b23cea2c 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,9 @@ NODE_ENV=development # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_API_SERVER = http://192.168.1.140/api -# VUE_APP_API_SERVER = http://192.168.51.36:8080/api + +#家中开发连级的后端服务 +# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_NODE_ENV=dev #项目根路径 diff --git a/public/index.html b/public/index.html index 840ae8cc..ebeef610 100644 --- a/public/index.html +++ b/public/index.html @@ -40,8 +40,8 @@ <% } %> diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss index 43f77201..e4672951 100644 --- a/src/assets/scss/modules/visual/issue-info.scss +++ b/src/assets/scss/modules/visual/issue-info.scss @@ -74,7 +74,7 @@ display: flex; padding-left: 15px; .info-title-2 { - width: 90px; + width: 100px; flex: 0 0 1; font-size: 14px; } diff --git a/src/assets/scss/modules/visual/resibuzz.scss b/src/assets/scss/modules/visual/resibuzz.scss index 91ff7705..8ea3f5ee 100644 --- a/src/assets/scss/modules/visual/resibuzz.scss +++ b/src/assets/scss/modules/visual/resibuzz.scss @@ -52,9 +52,10 @@ } } .status-select { - position: absolute; - top: 20px; - right: 10px; + margin-left: 10px; + // position: absolute; + // top: 20px; + // right: 10px; } .second-select:last-child { margin-left: 0; diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 18c4a157..c8a0d7c2 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -180,7 +180,7 @@ export default { computed: { tableHeight () { - return (this.clientHeight - 220) + return (this.clientHeight - 300) }, diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 4fc23e5e..a57e6a1e 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -185,7 +185,7 @@ export default { computed: { tableHeight () { - return (this.clientHeight - 320) + return (this.clientHeight - 300) }, rowHeight () { diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 8a065fb7..797b047e 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -63,6 +63,7 @@ :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" v-loading="tableLoading" border + :height="tableHeight" style="width: 100%"> this.under && item.count < this.above) { - item.color = this.colorArray[1] - item.fillColor = this.colorFillArray[1] - } else { - item.color = this.colorArray[2] - item.fillColor = this.colorFillArray[2] + } else { + if (this.above) { + if (item.count > this.under && item.count < this.above) { + item.color = this.colorArray[1] + item.fillColor = this.colorFillArray[1] + } else { + item.color = this.colorArray[2] + item.fillColor = this.colorFillArray[2] + } } } + + } break } diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue index 8ed41ee2..73236c98 100644 --- a/src/views/modules/visual/communityGovern/processAnalyze.vue +++ b/src/views/modules/visual/communityGovern/processAnalyze.vue @@ -424,7 +424,8 @@ export default { loadMap () { if (this.isfirstInit) { //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray - this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000) + // this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000) + this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle) } else { this.$refs.map.refreshMap(null, this.projectList) } diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue index 85b78d24..92d1c819 100644 --- a/src/views/modules/visual/communityGovern/resibuzz.vue +++ b/src/views/modules/visual/communityGovern/resibuzz.vue @@ -279,6 +279,7 @@ export default { let params = { orgId: this.orgId, orgType: this.orgType, + status: this.status, }; @@ -405,8 +406,10 @@ export default { }, - handleChangeState (index) { - this.getTable() + async handleChangeState (index) { + await this.getApiData() + this.assignPieChart() + }, async handleChangeAgency (value) { @@ -454,8 +457,8 @@ export default { item.createdTime ? item.createdTime : '', item.issueOriginator ? item.issueOriginator : '', item.voteAccount ? item.voteAccount : '', - item.supportCount ? item.supportCount : '', - item.oppositionCount ? item.oppositionCount : '', + item.supportCount ? item.supportCount : 0, + item.oppositionCount ? item.oppositionCount : 0, { type: "operate", list: ["查看"] }, ]; }); diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue index a1b3f1b0..0c17367a 100644 --- a/src/views/modules/visual/communityGovern/typeAnalyze.vue +++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue @@ -2,7 +2,7 @@
- 事件分类分析 + 项目分类分析
@@ -123,10 +123,7 @@ export default { align: "center", width: "5%", }, - { - align: "center", - width: "10%", - }, + { align: "center", width: "10%", @@ -145,7 +142,7 @@ export default { }, { align: "center", - width: "20%", + width: "30%", }, { align: "center", @@ -156,7 +153,7 @@ export default { width: "10%", }, ], - header: ["序号", "项目编号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"], + header: ["序号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"], list: [], pageSize: 10, pageNo: 1, @@ -427,7 +424,7 @@ export default { item.statusShow = item.status === 'pending' ? '待处理' : '已结案' return [ { type: "index" }, - item.projectCode ? item.projectCode : '', + // item.projectCode ? item.projectCode : '', item.categoryNames.join(','), item.originShow ? item.originShow : '', item.gridName ? item.gridName : '', diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index eba9be98..f33f095f 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -37,7 +37,7 @@ import { mapGetters } from "vuex"; import { Loading } from 'element-ui'; //引入Loading服务 import { requestPost } from "@/js/dai/request"; - +var centerPointGlobal = [120.38945519, 36.0722275] let loading;//加载动画 @@ -433,11 +433,15 @@ const vueGis = { }, //设置地图定位的中心点和缩放级别 setMapLocation () { - this.centerPoint = [] + if (this.mapInfo.longitude && this.mapInfo.latitude) { + this.centerPoint = [] this.centerPoint.push(this.mapInfo.longitude) this.centerPoint.push(this.mapInfo.latitude) + } else { + + this.centerPoint = centerPointGlobal } this.setZoom(this.mapInfo.level) @@ -446,11 +450,11 @@ const vueGis = { //根据组织层级设置缩放级别 setZoom (level) { if (level === 'district') { - this.zoom = 14 + this.zoom = 11 } else if (level === 'street') { - this.zoom = 15 + this.zoom = 12 } else if (level === 'community') { - this.zoom = 16 + this.zoom = 13 } }, diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue index 26bd786d..1267d16b 100644 --- a/src/views/modules/visual/heart/index.vue +++ b/src/views/modules/visual/heart/index.vue @@ -86,7 +86,7 @@ export default { name: "heart", data() { return { - agencyId: "", + agencyId: this.$store.state.user.agencyId, areaCode: "", monthId: dateFormat( @@ -202,7 +202,7 @@ export default { handleSearch() {}, async getApiData() { - await this.getAgencyInfo(); + //await this.getAgencyInfo(); this.getTb1(); this.getTb2(); this.getTb3(); diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue index 34e76f68..7d757740 100644 --- a/src/views/modules/visual/measure/volunteer.vue +++ b/src/views/modules/visual/measure/volunteer.vue @@ -1,16 +1,16 @@