elink-star
/
epmet-work-pc-chengyang
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

feature
13176889840 4 years ago
parent
89fd76f7a3 90daf157bf
commit
4171674d0a
5 changed files with 159 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/assets/scss/modules/visual/people.scss
  2. 2
      src/views/modules/visual/basicinfo/cpts/incident-info.vue
  3. 2
      src/views/modules/visual/basicinfo/cpts/topic-info.vue
  4. 21
      src/views/modules/visual/basicinfo/people.vue
  5. 215
      src/views/modules/visual/measure/dialogInfo.vue

15
src/assets/scss/modules/visual/people.scss
View File

@ -633,3 +633,18 @@
background: #002e74; background: #002e74;
} }
} }
.m-hint {
position: relative;
height: 300px;
// 暂无数据
img {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
}
}

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

@ -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
View File

@ -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>

21
src/views/modules/visual/basicinfo/people.vue
View File

@ -365,6 +365,13 @@
> >
</el-pagination> </el-pagination>
</div> </div>
<div v-if="incident.list.length == 0" class="m-hint">
<img
src="@/assets/img/modules/visual/noData.png"
class="no-data-img"
/>
</div>
</div> </div>
<div class="list-wrap" v-show="showedIncidentOrTopic == 'topic'"> <div class="list-wrap" v-show="showedIncidentOrTopic == 'topic'">
@ -391,6 +398,13 @@
> >
</el-pagination> </el-pagination>
</div> </div>
<div v-if="topic.list.length == 0" class="m-hint">
<img
src="@/assets/img/modules/visual/noData.png"
class="no-data-img"
/>
</div>
</div> </div>
</cpt-card> </cpt-card>
</div> </div>
@ -433,6 +447,13 @@
> >
</el-pagination> </el-pagination>
</div> </div>
<div v-if="point.list.length == 0" class="m-hint">
<img
src="@/assets/img/modules/visual/noData.png"
class="no-data-img"
/>
</div>
</div> </div>
</cpt-card> </cpt-card>
</div> </div>

215
src/views/modules/visual/measure/dialogInfo.vue
View File

@ -13,7 +13,6 @@
<div class="list-title">需求内容</div> <div class="list-title">需求内容</div>
<div class="list-wr"> <div class="list-wr">
<div class="list"> <div class="list">
<div class="item-desc"> <div class="item-desc">
<!-- <span class="item-field">所属网格：</span> --> <!-- <span class="item-field">所属网格：</span> -->
<span>{{ info.content }}</span> <span>{{ info.content }}</span>
@ -58,12 +57,18 @@
</div> </div>
<div class="item"> <div class="item">
<span class="item-field">实际服务时间：</span> <span class="item-field">实际服务时间：</span>
<span v-if="info.serviceStartTime">{{ info.serviceStartTime }} 至 <br/> <span v-if="info.serviceStartTime"
{{ info.serviceEndTime }}</span> >{{ info.serviceStartTime }} 至 <br />
{{ info.serviceEndTime }}</span
>
</div> </div>
<div class="item"> <div class="item">
<span class="item-field">完成情况：</span> <span class="item-field">完成情况：</span>
<span>{{ info.finishResult == 'resolved' ? '已解决' : '未解决' }} <br /> {{ info.finishDesc }}</span> <span
>{{ info.finishResult == "resolved" ? "已解决" : "未解决" }}
<br />
{{ info.finishDesc }}</span
>
</div> </div>
<div class="item"> <div class="item">
<span class="item-field">评价：</span> <span class="item-field">评价：</span>
@ -75,24 +80,16 @@
</div> </div>
<div class="tabs"> <div class="tabs">
<div <div class="tab-btn">
class="tab-btn"
>
<img src="@/assets/img/shuju/people/arrow-double-left.png" /> <img src="@/assets/img/shuju/people/arrow-double-left.png" />
</div> </div>
<div <div class="tab z-on">研判分析</div>
class="tab z-on" <div class="tab-btn">
>
研判分析
</div>
<div
class="tab-btn"
>
<img src="@/assets/img/shuju/people/arrow-double-right.png" /> <img src="@/assets/img/shuju/people/arrow-double-right.png" />
</div> </div>
</div> </div>
<div style="padding: 30px 0;"> <div style="padding: 30px 0">
<analyse <analyse
v-if="!loading" v-if="!loading"
:single-list="demandList" :single-list="demandList"
@ -106,8 +103,6 @@
@user="handleToUser" @user="handleToUser"
/> />
</div> </div>
</cpt-card> </cpt-card>
</div> </div>
</div> </div>
@ -115,7 +110,7 @@
<script> <script>
import cptCard from "@/views/modules/visual/cpts/card"; import cptCard from "@/views/modules/visual/cpts/card";
import analyse from '../cpts/analyse.vue' import analyse from "../cpts/analyse.vue";
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
export default { export default {
@ -126,13 +121,13 @@ export default {
default: "", default: "",
}, },
demandId: String, demandId: String,
queryOrigin: String queryOrigin: String,
// info: Object, // info: Object,
}, },
components: { components: {
cptCard, cptCard,
analyse analyse,
}, },
data() { data() {
@ -399,103 +394,101 @@ export default {
// } // }
// ] // ]
// } // }
], ],
userLists: [ userLists: [
{ {
homeId: '1', homeId: "1",
icUserId: '1', icUserId: "1",
icUserName: '沾上干' icUserName: "沾上干",
}, },
{ {
homeId: '2', homeId: "2",
icUserId: '2', icUserId: "2",
icUserName: '李四' icUserName: "李四",
}, },
{ {
homeId: '3', homeId: "3",
icUserId: '3', icUserId: "3",
icUserName: '王五哈哈' icUserName: "王五哈哈",
} },
], ],
userName: '王亚男哈', userName: "王亚男哈",
eventList: [ eventList: [
{ {
categoryName: '辨明服务', categoryName: "辨明服务",
categoryCode: '1', categoryCode: "1",
projectList: [ projectList: [
{ {
title: '不知道写了什么哈哈哈', title: "不知道写了什么哈哈哈",
status: 'closed', status: "closed",
projectId: '1' projectId: "1",
}, },
{ {
title: '罗里吧嗦写了什么哈哈哈', title: "罗里吧嗦写了什么哈哈哈",
status: 'closed', status: "closed",
projectId: '2' projectId: "2",
}, },
{ {
title: '胡说八道写了什么哈哈哈', title: "胡说八道写了什么哈哈哈",
status: 'closed', status: "closed",
projectId: '1=3' projectId: "1=3",
}, },
{ {
title: '费眼飞鱼不知道写了什么哈哈哈', title: "费眼飞鱼不知道写了什么哈哈哈",
status: 'closed', status: "closed",
projectId: '1=4' projectId: "1=4",
}, },
{ {
title: '狗屁不通不知道写了什么哈哈哈', title: "狗屁不通不知道写了什么哈哈哈",
status: 'closed', status: "closed",
projectId: '5' projectId: "5",
}, },
{ {
title: '啦啦啦不知道写了什么哈哈哈', title: "啦啦啦不知道写了什么哈哈哈",
status: 'closed', status: "closed",
projectId: '6' projectId: "6",
} },
] ],
}, },
{ {
categoryName: '水煮鱼辨明服务辨明服务', categoryName: "水煮鱼辨明服务辨明服务",
categoryCode: '4', categoryCode: "4",
projectList: [ projectList: [
{ {
title: '熟煮雨不知道写了什么哈哈哈', title: "熟煮雨不知道写了什么哈哈哈",
status: 'pending', status: "pending",
projectId: '4' projectId: "4",
} },
] ],
}, },
{ {
categoryName: '开心麻花', categoryName: "开心麻花",
categoryCode: '2', categoryCode: "2",
projectList: [ projectList: [
{ {
title: '不知道开心麻花写了什么哈哈哈', title: "不知道开心麻花写了什么哈哈哈",
status: 'closed', status: "closed",
projectId: '1' projectId: "1",
} },
] ],
}, },
{ {
categoryName: '酸菜鱼', categoryName: "酸菜鱼",
categoryCode: '3', categoryCode: "3",
projectList: [ projectList: [
{ {
title: '不知道酸菜鱼写了什么哈哈哈', title: "不知道酸菜鱼写了什么哈哈哈",
status: 'pending', status: "pending",
projectId: '3' projectId: "3",
} },
] ],
} },
], ],
}; };
}, },
async mounted() { async mounted() {
await this.getInfo(this.demandId) await this.getInfo(this.demandId);
}, },
methods: { methods: {
@ -504,78 +497,81 @@ export default {
}, },
async getInfo(demandId) { async getInfo(demandId) {
// const url = "/gov/org/customeragency/staffinagencylist"; // const url = "/gov/org/customeragency/staffinagencylist";
const url = '/heart/userdemand/demandDetail' const url = "/heart/userdemand/demandDetail";
let params = { let params = {
demandRecId: demandId, demandRecId: demandId,
}; };
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
// console.log('data-org----dict', data) // console.log('data-org----dict', data)
this.info = data this.info = data;
this.getAnalyse() this.getAnalyse();
} else { } else {
this.$message.error(msg) this.$message.error(msg);
} }
}, },
async getAnalyse() { async getAnalyse() {
// const url = "/gov/org/customeragency/staffinagencylist"; // const url = "/gov/org/customeragency/staffinagencylist";
this.loading = true this.loading = true;
const url = '/heart/userdemand/demand-research-analysis' const url = "/heart/userdemand/demand-research-analysis";
let params = { let params = {
firstCategoryCode: this.info.firstCategoryCode, firstCategoryCode: this.info.firstCategoryCode,
icResiUserId: this.info.demandUserId, icResiUserId: this.info.icResiUserId,
epmetUserIdList: [this.info.epmetUserId], epmetUserIdList: [this.info.epmetUserId],
queryOrigin: this.queryOrigin queryOrigin: this.queryOrigin,
}; };
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
console.log('data-org----a', data) console.log("data-org----a", data);
this.userLists = data.houseUserList.map(item => { this.userLists = data.houseUserList.map((item) => {
return { return {
...item, ...item,
icUserId: item.icResiUserId icUserId: item.icResiUserId,
} };
}) });
this.demandList = data.demandData.map(item => { this.demandList = data.demandData.map((item) => {
return { return {
...item, ...item,
showItem: true, showItem: true,
categoryName: item.firstCategoryName, categoryName: item.firstCategoryName,
categoryCode: item.firstCategoryCode, categoryCode: item.firstCategoryCode,
projectList: item.demandList.map(n => { projectList: item.demandList.map((n) => {
return { return {
...n, ...n,
title: n.content, title: n.content,
status: n.status, status: n.status,
statusName: n.statusName, statusName: n.statusName,
projectId: n.demandRecId projectId: n.demandRecId,
} };
}) }),
} };
}) });
console.log('demandList-dd', this.demandList) console.log("demandList-dd", this.demandList);
} else { } else {
this.$message.error(msg) this.$message.error(msg);
} }
this.loading = false this.loading = false;
}, },
handleToProject(val) { handleToProject(val) {
console.log('val---v', val) console.log("val---v", val);
this.getInfo(val.projectId) this.getInfo(val.projectId);
}, },
handleToUser(val) { handleToUser(val) {
console.log('val-uuu', val) console.log("val-uuu", val);
this.$router.push({ this.$router.push({
path: `/main-shuju/visual-basicinfo-people/${val.icUserId}`, path: `/main-shuju/visual-basicinfo-people/${val.icUserId}`,
}); });
} },
} },
}; };
</script> </script>
<style lang="scss" src="@/assets/scss/modules/visual/people.scss" scoped></style> <style
lang="scss"
src="@/assets/scss/modules/visual/people.scss"
scoped
></style>
<style lang="scss" scoped> <style lang="scss" scoped>
.m-pop { .m-pop {
.wrap { .wrap {
@ -609,6 +605,5 @@ export default {
.list-wr { .list-wr {
display: flex; display: flex;
padding: 0 32px; padding: 0 32px;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save