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/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 71601608..0c2833d5 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -6,13 +6,20 @@ src="../../../../assets/img/shuju/title-tip.png" />
区域化党建 + +
党建单位分类统计
@@ -31,6 +38,7 @@ end-placeholder="结束日期" prefix-icon="el-icon-caret-bottom" value-format="yyyy-MM-dd HH:mm:ss" + :clearable="false" :default-time="['00:00:00', '23:59:59']" > @@ -135,7 +143,7 @@ export default { { title: "区域化党建单位名称", coulmn: 'unitName' }, { title: "活动标题", coulmn: 'title' }, { title: "活动地址", coulmn: 'address' }, - { title: "服务事项", coulmn: 'serviceMatter' }, + { title: "服务事项", coulmn: 'serviceMatterName' }, { title: "服务人数", coulmn: 'peopleCount' }, { title: "活动时间", coulmn: 'activityTime' } ], @@ -147,13 +155,15 @@ export default { value2: '', timeRange: '', visibleLoading: true, - serviceMatter: '', + serviceMatter: 'all', pageNo: 1, pageSize: 10, total: 0, activeIndex: 0, activeLevel: "1", + selectAgency: '', unitList: [], + propTree: [], partyItem: [ { name: '楼宇党建', @@ -231,33 +241,37 @@ export default { async mounted () { const { user } = this.$store.state this.agencyId = user.agencyId + console.log('agencyId-------', this.agencyId) + this.initTime() await nextTick(100); + await this.getAgencyList() this.loadUnit() - this.getList(); - this.getCateCount() - this.getCateType() + this.getList(this.agencyId) + this.getCateCount(this.agencyId) + this.getCateType(this.agencyId) + await this.getWorkUserInfo() - await this.getMapUnitList() + await this.getMapUnitList(this.agencyId) }, watch: { timeRange(val) { console.log('val-www', val) - this.getList(); + this.getList(this.agencyId); } }, methods: { //具体人员列表 - async getList () { + async getList (agencyId) { this.visibleLoading = true const url = "/heart/icpartyactivity/activitylist" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" let params = { - agencyId: this.agencyId, + agencyId, pageSize: this.pageSize, pageNo: this.pageNo, - serviceMatter: this.serviceMatter, + serviceMatter: this.serviceMatter == 'all' ? '' : this.serviceMatter, startTime: this.timeRange && this.timeRange[0] || '', endTime: this.timeRange && this.timeRange[1] || '' } @@ -277,12 +291,61 @@ export default { } this.visibleLoading = false }, - async getCateCount () { + async getAgencyList() { + // const url = "/gov/org/customeragency/staffinagencylist"; + // const url = '/gov/org/customeragency/agencygridtree' + const url = '/gov/org/customeragency/staffinagencylist' + // let params = { + // agencyId: this.$store.state.user.agencyId, + // }; + const { data, code, msg } = await requestPost(url); + if (code === 0) { + console.log('data-org----o', data) + let { agencyList, subAgencyList } = data + this.selectAgency = [`${agencyList.agencyId}-${agencyList.level}`] + let arr = [] + agencyList.subAgencyList = subAgencyList + arr.push(agencyList) + this.propTree = arr && this.getTreeData(arr) + + } else { + this.$message.error(msg) + } + }, + getTreeData(data){ + if (!Array.isArray(data)) return [] + let arr = data.map(item => { + let _item = {} + if (item.subAgencyList) { + if (item.subAgencyList.length === 0) { + _item = { + label: item.agencyName, + value: item.agencyId + '-' + item.level, + level: item.level, + children: undefined + } + } else _item = { + label: item.agencyName, + value: item.agencyId + '-' + item.level, + level: item.level, + children: this.getTreeData(item.subAgencyList)} + } else { + _item = { + label: item.agencyName, + value: item.agencyId + '-' + item.level, + level: item.level, + } + } + return _item + }) + return arr + }, + async getCateCount (agencyId) { const url = "/heart/icpartyactivity/statistics" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" let params = { - agencyId: this.agencyId + agencyId } const { data, code, msg } = await requestPost(url, params) @@ -293,12 +356,12 @@ export default { this.$message.error(msg) } }, - async getCateType () { + async getCateType (agencyId) { const url = "/heart/icpartyunit/typestatistics" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" let params = { - agencyId: this.agencyId + agencyId } const { data, code, msg } = await requestPost(url, params) @@ -352,7 +415,37 @@ export default { this.$message.error(msg) } }, - + handleCascader(val) { + console.log('val-vvv', val) + if (val.length > 0) { + const _arr = val[val.length - 1].split('-') + const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' + this.getList(_arr[0]) + this.getMapUnitList(_arr[0]) + this.getCateCount(_arr[0]) + this.getCateType(_arr[0]) + } + + }, + initTime() { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + console.log('time-rtt', this.timeFormat(start), this.timeFormat(end)) + this.timeRange = [this.timeFormat(start), this.timeFormat(end)] + }, + timeFormat(date) { + if (!date || typeof date === 'string') { + return false + } + var y = date.getFullYear() //年 + var m = date.getMonth() + 1 //月 + if (m < 10) m = '0' + m + var d = date.getDate() //日 + if (d < 10) d = '0' + d + + return y + '-' + m + '-' + d + ' 00:00:00' + }, async loadUnit () { const url = "/heart/icresidemanddict/subcodelist" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option" @@ -365,7 +458,10 @@ export default { if (code === 0) { this.unitList = data - + this.unitList.unshift({ + label: '全部', + value: 'all' + }) } else { this.$message.error(msg) } @@ -419,27 +515,33 @@ export default { // }, //获取联建单位分布图 - async getMapUnitList () { + async getMapUnitList (agencyId) { const url = "/heart/icpartyunit/distribution" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" let params = { - agencyId: this.agencyId + agencyId } const { data, code, msg } = await requestPost(url, params) if (code === 0) { - // this.unitMapList = data - this.unitMapList = this.unitMapList1 - + console.log('unitMapList----data', data) + this.unitMapList = data.map((item, index) => { + return { + ...item, + urlIndex: index + } + }) + // this.unitMapList = this.unitMapList1 + console.log('unitMapList----', this.unitMapList) this.unitMapList.forEach(item => { - if (item.type === '党建楼宇') { + if (item.type === '楼宇党建') { item.urlIndex = 0 - } else if (item.type === '两新党建') { + } else if (item.type === '两新组织') { item.urlIndex = 1 - } else if (item.type === '辖区单位') { + } else if (item.type === '区域单位党建') { item.urlIndex = 2 } else if (item.type === '机关直属部门') { item.urlIndex = 3 @@ -492,7 +594,7 @@ export default { this.showedMoreInfo = true }, - handleSelectChange () { + handleSelectChange (val) { this.getList(); }, pageSizeChangeHandleNew (val) { @@ -562,8 +664,22 @@ export default { margin-right: 6px; } .title-label { - font-size: 16px; + font-size: 20px; font-weight: 800; + ::v-deep .el-input { + width: 180px; + margin-left: 10px; + .el-input__inner { + font-size: 18px; + font-weight: 800; + color: #fff; + background: transparent; + border: 0; + } + .el-icon-arrow-down::before { + content: "\e790"; + } + } } ::v-deep .el-dropdown { font-size: 16px; diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue index ca13dcae..238e8160 100644 --- a/src/views/modules/visual/communityParty/party.vue +++ b/src/views/modules/visual/communityParty/party.vue @@ -40,7 +40,7 @@
-
+
{{ item.name }}
@@ -59,6 +59,7 @@ :tableData="ageList" :visibleLoading="visibleLoading" :operate="false" + @row="handleClickRow" >