Browse Source

Merge branch 'dev-shuju' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-shuju

shibei_master
jiangyy 4 years ago
parent
commit
a3f5d15f50
  1. 19
      src/views/modules/communityService/measure/index.vue
  2. 2
      src/views/modules/visual/basicinfo/cpts/incident-info.vue
  3. 2
      src/views/modules/visual/basicinfo/cpts/topic-info.vue
  4. 22
      src/views/modules/visual/cpts/analyse.vue
  5. 352
      src/views/modules/visual/measure/dialogInfo.vue
  6. 9
      src/views/modules/visual/measure/service.vue

19
src/views/modules/communityService/measure/index.vue

@ -299,7 +299,7 @@
type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input> type="textarea" clearable class="input-width-textarea" placeholder="请输入内容"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="addType === 'appoint' || addType == 'finish' || addType == 'look'" v-if="addType === 'appoint' || addType == 'finish' || (addType == 'look' && form.serviceShowFlag)"
label="服务方" prop="serviceType"> label="服务方" prop="serviceType">
<template v-if="disabled && addType !== 'appoint'"> <template v-if="disabled && addType !== 'appoint'">
<el-input v-model="form.serviceShowName" :disabled="disabled" class="input-width"></el-input> <el-input v-model="form.serviceShowName" :disabled="disabled" class="input-width"></el-input>
@ -337,7 +337,10 @@
</el-select> </el-select>
</template> </template>
</el-form-item> </el-form-item>
<template v-if="addType == 'finish' || addType == 'look'"> <el-form-item v-if="addType == 'look' && form.status == 'canceled'" label="取消时间" prop="cancelTime">
<span>{{ form.cancelTime }}</span>
</el-form-item>
<template v-if="addType == 'finish' || (addType == 'look' && form.status == 'finished')">
<el-form-item label="完成情况" prop="finishResult"> <el-form-item label="完成情况" prop="finishResult">
<el-radio v-model="form.finishResult" <el-radio v-model="form.finishResult"
label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio> label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
@ -360,7 +363,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="评价" prop="score" class="form-score"> <el-form-item label="评价" prop="score" class="form-score">
<el-rate v-model="form.score" :disabled="disabled && addType != 'finish'" ></el-rate> <el-rate v-model="form.score" :allow-half="true" :disabled="disabled && addType != 'finish'" ></el-rate>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="finishDesc"> <el-form-item label="备注" prop="finishDesc">
<el-input v-model="form.finishDesc" :autosize="{ minRows: 2, maxRows: 10}" <el-input v-model="form.finishDesc" :autosize="{ minRows: 2, maxRows: 10}"
@ -373,9 +376,9 @@
</el-form> </el-form>
<div class="resi-btns"> <div class="resi-btns">
<el-button size="small" @click="handlerCancle">取消</el-button> <el-button size="small" @click="handlerCancle">{{ addType != 'look' ? '取消' : '关闭'}}</el-button>
<el-button <el-button
v-if="!disabled" v-if="addType != 'look'"
type="primary" type="primary"
size="small" size="small"
:loading="btnLoading" :loading="btnLoading"
@ -592,7 +595,7 @@ export default {
serviceType: [{ required: true, message: '服务方不能为空', trigger: 'blur' }], serviceType: [{ required: true, message: '服务方不能为空', trigger: 'blur' }],
serviceStartTime: [{ required: true, message: '实际服务时间不能为空', trigger: 'blur' }], serviceStartTime: [{ required: true, message: '实际服务时间不能为空', trigger: 'blur' }],
score: [{ required: true, message: '评分不能为空', trigger: 'blur' }], score: [{ required: true, message: '评分不能为空', trigger: 'blur' }],
finishDesc: [{ required: true, message: '备注不能为空', trigger: 'blur' }], // finishDesc: [{ required: true, message: '', trigger: 'blur' }],
finishResult: [{ required: true, message: '完成情况不能为空', trigger: 'blur' }], finishResult: [{ required: true, message: '完成情况不能为空', trigger: 'blur' }],
} }
} }
@ -715,6 +718,7 @@ export default {
// this.form.demandUserId = '' // this.form.demandUserId = ''
this.$delete(this.form, 'demandRecId') this.$delete(this.form, 'demandRecId')
this.selectDemandUser = '' this.selectDemandUser = ''
this.finishServiceTime = ''
for(const n in this.form) { for(const n in this.form) {
this.form[n] = '' this.form[n] = ''
} }
@ -733,6 +737,9 @@ export default {
if (addType == 'look') { if (addType == 'look') {
this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || '' this.finishServiceTime = row.serviceStartTime && [row.serviceStartTime, row.serviceEndTime] || ''
} }
if (addType == 'finish') {
this.form.finishResult = 'resolved'
}
if (addType == 'appoint' && row.serviceType) { if (addType == 'appoint' && row.serviceType) {
await this.getServiceuserList(row.serviceType) await this.getServiceuserList(row.serviceType)
} }

2
src/views/modules/visual/basicinfo/cpts/incident-info.vue

@ -106,7 +106,7 @@
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>项目方案</span> <span>项目方案</span>
<span>{{ projectInfo.projectTitle }}</span> <span>{{ projectInfo.backGround }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>内部备注</span> <span>内部备注</span>

2
src/views/modules/visual/basicinfo/cpts/topic-info.vue

@ -166,7 +166,7 @@
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>项目方案</span> <span>项目方案</span>
<span>{{ projectInfo.projectTitle }}</span> <span>{{ projectInfo.backGround }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>内部备注</span> <span>内部备注</span>

22
src/views/modules/visual/cpts/analyse.vue

@ -109,6 +109,7 @@
<div class="cate-list-w0" <div class="cate-list-w0"
:class="item.showItem && 'cate-list-w100'"> :class="item.showItem && 'cate-list-w100'">
<div class="list list-wr"> <div class="list list-wr">
<template v-if="item.projectList && item.projectList.length > 0">
<div v-for="(n, i) in item.projectList" <div v-for="(n, i) in item.projectList"
:key="i" :key="i"
class="item" class="item"
@ -117,6 +118,8 @@
:class="'item-status-'+n.status">{{filterStatus(n.status)}}</div> :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
<div class="item-content">{{n.title}}</div> <div class="item-content">{{n.title}}</div>
</div> </div>
</template>
<div v-else class="no-data">暂无数据</div>
<!-- <div class="item"> <!-- <div class="item">
<div class="item-status">已结案</div> <div class="item-status">已结案</div>
<div class="item-content">合肥路与安宁路交合肥路与安宁路交</div> <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
@ -187,6 +190,7 @@
<div class="cate-list-w0" <div class="cate-list-w0"
:class="item.showItem && 'cate-list-w100'"> :class="item.showItem && 'cate-list-w100'">
<div class="list list-wr"> <div class="list list-wr">
<template v-if="item.projectList && item.projectList.length > 0">
<div v-for="(n, i) in item.projectList" <div v-for="(n, i) in item.projectList"
:key="i" :key="i"
class="item" class="item"
@ -197,6 +201,8 @@
</div> </div>
<div class="item-content">{{n.title}}</div> <div class="item-content">{{n.title}}</div>
</div> </div>
</template>
<div v-else class="no-data">暂无数据</div>
<!-- <div class="item"> <!-- <div class="item">
<div class="item-status">已结案</div> <div class="item-status">已结案</div>
<div class="item-content">合肥路与安宁路交合肥路与安宁路交</div> <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
@ -242,13 +248,13 @@ export default {
}, },
moreTitle: String, // hasEvent true moreTitle: String, // hasEvent true
moreList: Array, // hasEvent true moreList: Array, // hasEvent true
singleTitle: { // singleTitle: { //
type: String, type: String,
default: '楼院小组' default: '楼院小组'
}, },
userList: Array, // userList: Array, //
userName: String, // userName: String, //
singleList: Array, // singleList: Array, //
}, },
data () { data () {
@ -541,6 +547,14 @@ export default {
} }
} }
} }
.no-data {
display: flex;
justify-content: center;
align-items: center;
height: 100%;
text-align: center;
line-height: 100%;
}
.pad10 { .pad10 {
padding-top: 10px; padding-top: 10px;
} }

352
src/views/modules/visual/measure/dialogInfo.vue

@ -144,346 +144,35 @@ export default {
// title: '', // title: '',
// status: 'closed', // status: 'closed',
// projectId: '1' // projectId: '1'
// },
// {
// title: '',
// status: 'closed',
// projectId: '2'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=3'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=4'
// },
// {
// title: '',
// status: 'closed',
// projectId: '5'
// },
// {
// title: '',
// status: 'closed',
// projectId: '6'
// }
// ]
// },
// {
// categoryName: '',
// categoryCode: '1',
// showItem: false,
// projectList: [
// {
// title: '',
// status: 'closed',
// projectId: '1'
// },
// {
// title: '',
// status: 'closed',
// projectId: '2'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=3'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=4'
// },
// {
// title: '',
// status: 'closed',
// projectId: '5'
// },
// {
// title: '',
// status: 'closed',
// projectId: '6'
// }
// ]
// },
// {
// categoryName: '',
// categoryCode: '1',
// showItem: false,
// projectList: [
// {
// title: '',
// status: 'closed',
// projectId: '1'
// },
// {
// title: '',
// status: 'closed',
// projectId: '2'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=3'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=4'
// },
// {
// title: '',
// status: 'closed',
// projectId: '5'
// },
// {
// title: '',
// status: 'closed',
// projectId: '6'
// }
// ]
// },
// {
// categoryName: '',
// categoryCode: '1',
// showItem: false,
// projectList: [
// {
// title: '',
// status: 'closed',
// projectId: '1'
// },
// {
// title: '',
// status: 'closed',
// projectId: '2'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=3'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=4'
// },
// {
// title: '',
// status: 'closed',
// projectId: '5'
// },
// {
// title: '',
// status: 'closed',
// projectId: '6'
// }
// ]
// },
// {
// categoryName: '',
// categoryCode: '1',
// showItem: false,
// projectList: [
// {
// title: '',
// status: 'closed',
// projectId: '1'
// },
// {
// title: '',
// status: 'closed',
// projectId: '2'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=3'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=4'
// },
// {
// title: '',
// status: 'closed',
// projectId: '5'
// },
// {
// title: '',
// status: 'closed',
// projectId: '6'
// } // }
//
// ] // ]
// }, // },
],
userLists: [
// { // {
// categoryName: '', // homeId: "1",
// categoryCode: '1', // icUserId: "1",
// showItem: false, // icUserName: "",
// projectList: [
// {
// title: '',
// status: 'closed',
// projectId: '1'
// },
// {
// title: '',
// status: 'closed',
// projectId: '2'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=3'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=4'
// },
// {
// title: '',
// status: 'closed',
// projectId: '5'
// },
// {
// title: '',
// status: 'closed',
// projectId: '6'
// } // }
// ] ],
// }, userName: "王亚男哈",
eventList: [
// { // {
// categoryName: '', // categoryName: "",
// categoryCode: '1', // categoryCode: "1",
// showItem: false,
// projectList: [ // projectList: [
// { // {
// title: '', // title: "",
// status: 'closed', // status: "closed",
// projectId: '1' // projectId: "1",
// },
// {
// title: '',
// status: 'closed',
// projectId: '2'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=3'
// },
// {
// title: '',
// status: 'closed',
// projectId: '1=4'
// }, // },
// {
// title: '', // ],
// status: 'closed',
// projectId: '5'
// }, // },
// {
// title: '', ]
// status: 'closed',
// projectId: '6'
// }
// ]
// }
],
userLists: [
{
homeId: "1",
icUserId: "1",
icUserName: "沾上干",
},
{
homeId: "2",
icUserId: "2",
icUserName: "李四",
},
{
homeId: "3",
icUserId: "3",
icUserName: "王五哈哈",
},
],
userName: "王亚男哈",
eventList: [
{
categoryName: "辨明服务",
categoryCode: "1",
projectList: [
{
title: "不知道写了什么哈哈哈",
status: "closed",
projectId: "1",
},
{
title: "罗里吧嗦写了什么哈哈哈",
status: "closed",
projectId: "2",
},
{
title: "胡说八道写了什么哈哈哈",
status: "closed",
projectId: "1=3",
},
{
title: "费眼飞鱼不知道写了什么哈哈哈",
status: "closed",
projectId: "1=4",
},
{
title: "狗屁不通不知道写了什么哈哈哈",
status: "closed",
projectId: "5",
},
{
title: "啦啦啦不知道写了什么哈哈哈",
status: "closed",
projectId: "6",
},
],
},
{
categoryName: "水煮鱼辨明服务辨明服务",
categoryCode: "4",
projectList: [
{
title: "熟煮雨不知道写了什么哈哈哈",
status: "pending",
projectId: "4",
},
],
},
{
categoryName: "开心麻花",
categoryCode: "2",
projectList: [
{
title: "不知道开心麻花写了什么哈哈哈",
status: "closed",
projectId: "1",
},
],
},
{
categoryName: "酸菜鱼",
categoryCode: "3",
projectList: [
{
title: "不知道酸菜鱼写了什么哈哈哈",
status: "pending",
projectId: "3",
},
],
},
],
}; };
}, },
@ -574,6 +263,7 @@ export default {
></style> ></style>
<style lang="scss" scoped> <style lang="scss" scoped>
.m-pop { .m-pop {
color: #fff;
.wrap { .wrap {
.list { .list {
display: block; display: block;
@ -589,6 +279,7 @@ export default {
} }
.item-desc { .item-desc {
font-size: 16px; font-size: 16px;
color: #fff;
margin-bottom: 10px; margin-bottom: 10px;
line-height: 24px; line-height: 24px;
} }
@ -599,6 +290,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding: 20px 0 10px 62px; padding: 20px 0 10px 62px;
font-size: 20px; font-size: 20px;
color: #fff;
cursor: pointer; cursor: pointer;
} }
} }

9
src/views/modules/visual/measure/service.vue

@ -175,7 +175,7 @@ export default {
{ title: "上报类型", coulmn: 'reportTypeName' }, { title: "上报类型", coulmn: 'reportTypeName' },
{ title: "上报人", coulmn: 'reportUserName' }, { title: "上报人", coulmn: 'reportUserName' },
{ title: "上报时间", coulmn: 'reportTime' }, { title: "上报时间", coulmn: 'reportTime' },
{ title: "需求人", coulmn: 'gridName' }, { title: "需求人", coulmn: 'demandUserName' },
{ title: "服务方", coulmn: 'serviceName' }, { title: "服务方", coulmn: 'serviceName' },
{ title: "服务时间", coulmn: 'wantServiceTime' }, { title: "服务时间", coulmn: 'wantServiceTime' },
], ],
@ -316,7 +316,7 @@ export default {
this.categoryList = categoryList this.categoryList = categoryList
let xData = categoryList.map(item => item.categoryName) let xData = categoryList.map(item => item.categoryName)
let yData = [] let yData = []
yData = legend.map(item => { yData = legend.map((item, index) => {
return { return {
name: item.legendName, name: item.legendName,
type: 'bar', type: 'bar',
@ -328,9 +328,12 @@ export default {
emphasis: { emphasis: {
focus: 'series' focus: 'series'
}, },
data: categoryList.map(n => n.total) data: categoryList.map(n => {
return n.detail[index].serviceDemandTotal
})
} }
}) })
console.log('yData', yData)
this.initCharts(xData, yData) this.initCharts(xData, yData)
this.getServiceList(orgId, orgType, data.categoryList[0].categoryCode) this.getServiceList(orgId, orgType, data.categoryList[0].categoryCode)

Loading…
Cancel
Save