-
-
+
+
+
+
+
@@ -144,7 +148,9 @@
/>
-
+
+
+
@@ -184,9 +190,12 @@ import sqrfph from "@/views/dataBoard/overview/components/sqrfph.vue";
import sq12345 from "@/views/dataBoard/overview/components/sq12345.vue";
import DynamicHumanRoomData from "@/views/dataBoard/overview/components/DynamicHumanRoomData.vue";
+import GridUpdateRanking from "@/views/dataBoard/overview/components/GridUpdateRanking.vue";
import CommunityResult from "@/views/dataBoard/overview/components/CommunityResult.vue";
import EventAndFollowUp from "@/views/dataBoard/overview/components/EventAndFollowUp.vue";
import RankingGridData from "@/views/dataBoard/overview/components/RankingGridData.vue";
+import FollowUp from "@/views/dataBoard/overview/components/FollowUp.vue";
+import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue";
import { requestPostBi } from "@/js/dai/request-bipass";
import { requestPost } from "@/js/dai/request";
@@ -210,6 +219,9 @@ export default {
CommunityResult,
EventAndFollowUp,
RankingGridData,
+ GridUpdateRanking,
+ FollowUp,
+ Tabs
},
data() {
@@ -238,6 +250,22 @@ export default {
displayedResiId: "",
displayedHouseId: "",
+ dynamicType: 1,
+ dynamicTypeList: [{
+ value: 1,
+ label: '更新动态'
+ }, {
+ value: 2,
+ label: '网格更新排行'
+ }],
+ eventType: 1,
+ eventTypeList: [{
+ value: 1,
+ label: '12345事件'
+ }, {
+ value: 2,
+ label: '事件回访'
+ }]
};
},
@@ -259,6 +287,12 @@ export default {
},
methods: {
+ dynamicTypeChange(val) {
+ this.dynamicType = val
+ },
+ eventTypeChange(val) {
+ this.eventType = val
+ },
async init(queryOrgId, queryOrgLevel) {
if (queryOrgId) {
this.orgId = queryOrgId;
@@ -311,7 +345,7 @@ export default {
breadList.push({ ...item, id: item.orgId, level: item.orgLevel });
this.breadList = breadList;
}
- this.getMapData(item.orgId, item.orgLevel);
+ this.getMapData(item.orgId, item.orgLevel)
},
// 点击搜索结果条目，在地图上显示点和详情弹窗
@@ -326,10 +360,7 @@ export default {
},
//获取地图上显示的组织数据
- async getMapData(
- orgId = this.$store.state.chooseArea.chooseName.orgId,
- level = this.$store.state.chooseArea.chooseName.level
- ) {
+ async getMapData(orgId = this.$store.state.chooseArea.chooseName.orgId, level = this.$store.state.chooseArea.chooseName.level) {
const url = "org_map";
this.$http
.post(`/gov/org/agency/maporg`, { orgId, level })
@@ -419,3 +450,9 @@ export default {
src="@/assets/scss/dataBoard/overview/index.scss"
scoped
>
+
+
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
index 6bd2b2eff..56e83fc80 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
@@ -15,15 +15,15 @@
事项详情
- 小区垃圾急需要处理，垃圾桶旁边垃圾堆积严重，现在已经影响居民的日常生活和出行，望有关部门能够重视。
+ {{unsatisfiedMattersModel.reason}}
- - 事项来源：省满意度调查
- - 事项类型：生态环境
- - 所属月份：2023-09
- - 所属社区：XXX社区
- - 提交人：张**
- - 提交人电话：133
+ - 事项来源：{{unsatisfiedMattersModel.satisfactionSource}}
+ - 事项类型：{{unsatisfiedMattersModel.satisfactionCategoryName}}
+ - 所属月份：{{unsatisfiedMattersModel.satisfactionCategoryName}}
+ - 所属社区：{{unsatisfiedMattersModel.organizationName}}
+ - 提交人：{{unsatisfiedMattersModel.name}}
+ - 提交人电话：{{unsatisfiedMattersModel.mobile}}
@@ -33,31 +33,31 @@
12345投诉
- 39
+ {{unsatisfiedHisCount.satisfaction_12345}}
人
省满意度调查
- 102
+ {{unsatisfiedHisCount.satisfaction_province}}
人
社区满意度自评
- 273
+ {{unsatisfiedHisCount.satisfaction_community}}
人
回访记录
-
-
杨建国（网格长）
-
2023-08-17
-
上门回访
+
+
{{item.followUpUser}}（{{item.roleName}}）
+
{{item.followUpDate}}
+
{{item.followUpWay}}
@@ -75,15 +75,42 @@ export default {
components: {Title},
data() {
return {
- dialogVisible: false
+ dialogVisible: false,
+ unsatisfiedMattersModel: '',
+ unsatisfiedHisCount: '',
+ followUpRecordDetails: '',
+ satisfactionSourceOptions: [{
+ value: 'satisfaction_12345',
+ label: '12345投诉',
+ color: '#FFB73C',
+ }, {
+ value: 'satisfaction_province',
+ label: '省满意度调查',
+ color: '#64C1FF'
+ }, {
+ value: 'satisfaction_community',
+ label: '社区满意度自查',
+ color: '#08EBAE'
+ }]
};
},
methods: {
handleClose(done) {
this.dialogVisible = false
},
- open() {
+ open(id) {
this.dialogVisible = true
+ this.getDetail(id)
+ },
+ getDetail(id) {
+ this.$http.post('/governance/satisfactionDetailList/getUnsatisfiedMattersDetailInfo', id).then(({data: {data}}) => {
+ this.unsatisfiedMattersModel = data.unsatisfiedMattersModel
+ this.unsatisfiedHisCount = data.unsatisfiedHisCount
+ this.followUpRecordDetails = data.followUpRecordDetails
+ if(this.unsatisfiedMattersModel.satisfactionSource) {
+ this.unsatisfiedMattersModel.satisfactionSource = satisfactionSourceOptions.filter(item => item.value === this.unsatisfiedMattersModel.satisfactionSource)[0].label
+ }
+ })
}
}
}
@@ -137,14 +164,17 @@ export default {
line-height: 32px;
margin: 0 0 10px;
}
+
ul {
margin: 0;
padding: 0;
list-style-type: none;
}
+
li {
color: #FFFFFF;
line-height: 28px;
+
span {
color: #9CB4D3
}
@@ -156,16 +186,19 @@ export default {
display: flex;
justify-content: space-between;
margin-bottom: 30px;
+
.text {
font-size: 14px;
font-weight: 400;
color: #A3B9DA;
margin-bottom: 17px;
}
+
.num {
font-size: 14px;
font-weight: 400;
color: #A3B9DA;
+
span {
font-size: 32px;
font-weight: bold;
@@ -173,17 +206,22 @@ export default {
}
}
}
+
.orange {
color: #FFB73C;
}
+
.green {
color: #08EBAE;
}
+
.light {
color: #7FCEFF;
}
+
.log {
padding-left: 26px;
+
.log-item {
display: flex;
justify-content: space-between;
@@ -191,6 +229,7 @@ export default {
color: #fff;
background: url("@/assets/images/manyidu/hf_line.png") bottom center no-repeat;
padding: 9px 0;
+
.name {
flex: 0 0 33.33333%;
}
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
index bb8e51eeb..3ecbdd4ce 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
@@ -3,45 +3,57 @@
+
+
-
+
-
+
-
+
-
-
-
-
-
-
- 查询
+
+ 查询
@@ -53,71 +65,90 @@
width="80"/>
-
+
+
+ {{ satisfactionSourceFormat(row.satisfactionSource).label }}
+
+
+
-
+
+
+ {{ row.completeFlag }}
+
+
+
-
+
+
+ {{ row.followUpStatus }}
+
+
-
+
+
+ {{ row.dangerFlag }}
+
+
+
- 查看
+ 查看
@@ -127,11 +158,11 @@
-
+
@@ -146,15 +177,16 @@ export default {
data() {
return {
queryParams: {
- month: '',
- org: '',
- matterSource: '',
- matterType: '',
- name: '',
- tel: '',
- pageNum: 1,
+ month: this.$moment().format('YYYY-MM'),
+ agencyId: "",
+ satisfactionSource: "",
+ satisfactionCategory: "",
+ name: "",
+ mobile: "",
+ pageNo: 1,
pageSize: 10,
},
+ id: {},
total: 0,
breadcrumbList: [{
path: '/dataBoard/satisfactionEval/index',
@@ -163,18 +195,80 @@ export default {
path: '',
name: '不满意事项列表'
}],
- monthOptions: new Array(12).fill(0).map((_, index) => {
- return {label: (index - 0 + 1) + '月', value: (index - 0 + 1)}
- }),
- list: [{}, {}, {}]
+ orgOptions: [],
+ satisfactionCategoryOptions: [],
+ list: [],
+ satisfactionSourceOptions: [{
+ value: 'satisfaction_12345',
+ label: '12345投诉',
+ color: '#FFB73C',
+ }, {
+ value: 'satisfaction_province',
+ label: '省满意度调查',
+ color: '#64C1FF'
+ }, {
+ value: 'satisfaction_community',
+ label: '社区满意度自查',
+ color: '#08EBAE'
+ }]
}
},
+ mounted() {
+ this.getOrg()
+ },
methods: {
+ getSatisfactionCategoryOptions() {
+ this.queryParams.satisfactionCategory = ''
+ if(!this.queryParams.satisfactionSource) {
+ this.satisfactionCategoryOptions = []
+ return
+ }
+ this.$http.get('/governance/satisfactionDetailList/getUnsatisfiedCategory?satisfactionSource=' + this.queryParams.satisfactionSource).then(({data: {data}}) => {
+ this.satisfactionCategoryOptions = data.map(item => {
+ return {
+ label: item.categoryName,
+ value: item.categoryCode
+ }
+ })
+ })
+
+ },
+ satisfactionSourceFormat(val) {
+ let satisfactionSource = this.satisfactionSourceOptions.filter(item => item.value === val)[0]
+ return satisfactionSource ? satisfactionSource : ''
+ },
+ search() {
+ this.queryParams.pageNo = 1
+ this.getList();
+ },
getList() {
+ this.$http.get('/governance/satisfactionDetailList/getUnsatisfiedMattersList?' + this.$paramsFormat(this.queryParams)).then(({data: {data}}) => {
+ this.total = data.total
+ this.list = data.list
+ })
+ },
+ getOrg() {
+ let params = {
+ orgId: this.$store.state.chooseArea.chooseName.orgId,
+ level: this.$store.state.chooseArea.chooseName.level
+ }
+ this.$http.post(`/gov/org/agency/maporg`, params).then(async ({data: {data}}) => {
+ this.queryParams.agencyId = this.$store.state.chooseArea.chooseName.orgId
+ let parent = {value: data.id, label: data.name}
+ this.orgOptions = [parent, ...data.children.map(item => {
+ return {
+ value: item.id,
+ label: item.name
+ }
+ })]
+ this.getList()
+ })
},
- handleView() {
- this.$refs.detail.open()
+ handleView(id) {
+ console.log(id)
+ this.id = id
+ this.$refs.detail.open(id)
}
}
}
@@ -204,18 +298,23 @@ export default {
height: 32px;
}
}
+
.orange {
color: #FFB73C;
}
+
.blue {
color: #64C1FF;
}
+
.green {
color: #08EBAE;
}
+
.light {
color: #3CF5FF;
}
+
.red {
color: #F95619;
}
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail.vue
index bee4c3220..0b3447516 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail.vue
@@ -3,50 +3,18 @@
-
-
- 事项详情
-
-
- 家庭关系
-
-
-
- 居民各项业务记录
-
-
-
- 享受服务次数统计
-
-
-
- 积分记录
-
-
-
-
-
-
+
