From 587a48fb76ff25b48eaf79f22dff27ac5c9935d3 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 9 Jun 2023 17:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E9=A1=B5/=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/images/index/fandui.png | Bin 0 -> 661 bytes
src/assets/images/index/zhichi.png | Bin 0 -> 639 bytes
.../scss/modules/shequzhili/event-info.scss | 29 +-
.../scss/modules/shequzhili/project-info.scss | 2 -
.../shequzhili/event/cpts/event-detail.vue | 460 ++++++++++-------
.../shequzhili/event/cpts/event-info.vue | 50 +-
.../shequzhili/issue/cpts/issue-detail.vue | 416 +++++++++-------
.../shequzhili/issue/cpts/issue-info.vue | 465 +++++++++++-------
.../shequzhili/issue/cpts/process-form.vue | 3 +-
9 files changed, 863 insertions(+), 562 deletions(-)
create mode 100644 src/assets/images/index/fandui.png
create mode 100644 src/assets/images/index/zhichi.png
diff --git a/src/assets/images/index/fandui.png b/src/assets/images/index/fandui.png
new file mode 100644
index 0000000000000000000000000000000000000000..67545666e985a25f1537af721de63609b7751612
GIT binary patch
literal 661
zcmV;G0&4w
Px%Pf0{UR7gv;mQ83AK@`XTv$LB`(!|=U0X=w75mclH>7|H@q9C3G5tQmh5u4D|*rX<{nwsurvmYa=CfK^MNpNjT*=eAhHQ6_4S4)wc$yh!cu~#K2UO!mG>~
zhhC=RNflB9=yx${=y>xl;#FUcB0`VgO66PwsCRG<4A0g8Xam4MQ%TS-3?jZ3a0U#|
zR|E<8IoT6u;35K1!9buf-jqc-t-vvM)+;V1Y6b**g+W}X3&_ZxZF#lrYC(0M@QMo~
zC0#5ksxWRwkeOp-$EJkh5x-t;7?75_w&&IMOTDe{4yPpFY1OdF-LBMiGr*%v|Ii-q
z>&RwW9J2&4nU3z?-8mHt*gp?%2rwi0Mm57$t{1_>%)UURBYDGbpO1op{i@;LYmhB%
z2`*`_o0(NR}{6|
zJg5KGBP%FP1+OfQG}IIuA%RZeE*&JL#_UF&hpMC&%;dVOH#I4k?k=au#>
z$Jjkf0O?Yfj{vt`E$*Dy)%M{~*!k)Be~q9bmXLzOEwnUb7$oj@Px%IY~r8R7gv;mQ83AQ4q)9yiNA)wh0s^#FRiV$w#R^oSizGNdhiwyEP~$D
z77v~jq@;da6!B0L>q+n=p2U;r(GP^i1|(vIeAwEOhTVO;?2K$eBGI%>F#B%rG4ua1
z^Jd;WU_LMKS)bJb)LU{8fKHH0VE}MjffJDe3TzU=Yx|1$QuVC?%HoVpa>Vzo2>)%1
zoR1TOS5-(2AZ}Y1xr-nFN4)Bb3O^z*YxlkVp9qrXRfW-;b^u%kN9|dCt_~pPtr<@E
zZaaYdS~!j-OezuWt{M%0+sYP!$K{MR-x2@~yHhT&KI9?g2^w@tAKiPYtpIbWaDj6w
z2BV>uGP9P{$9t#S2C%ameQw^kt_?@0spNFZOrgC1^HcT?4+ox${>WP_IU$+OE-+$P
zj(`||P(O&_SQ0pqchuA!$n?(%v@y;Qbw;S@qdl|Lln??ibSf2yL9jk&7R5mKIUZ7t
zrT}Exnw82u=DWjlxM{>W=S49Td)g@HWV))AT6v@$+MfVbDR=*l5mYKB_dp-(O~~ck
zBy%Y&hGL720QRa8aaY!F>SH~%OK%O3%1$xHI>f=o0Qvpb2yR$s^uyiPYMs1OAJj#V
z%1<$dTLaSh2_~IEF|zMo^MI1wA=9}9(ZA=slUqN{5Q4!2yPh>lk<6?mc!2*91JM^v
z13W{yR5**abIdElietF~|6M##Q2M%Vs9jodTY&2OW9R#G?f1a(^5^TwY{#H!q~ZIo
Z;x}r8Z7BFV=G_1Q002ovPDHLkV1j17DIEX+
literal 0
HcmV?d00001
diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss
index 922683d66..44d88221e 100644
--- a/src/assets/scss/modules/shequzhili/event-info.scss
+++ b/src/assets/scss/modules/shequzhili/event-info.scss
@@ -117,6 +117,25 @@
}
.div-btn{
+ margin-top:50px;
+ display: flex;
+ justify-content: right;
+ .item_btn {
+ font-size: 14px;
+ padding: 8px 16px;
+ cursor: pointer;
+ color:#fff;
+
+ border: 1px dashed #0c81fe;
+ border-radius: 6px;
+ background-color: #0c81fe;
+ }
+
+ .mgl {
+ margin-left: 20px;
+ }
+}
+.div-btn-info{
margin-top:50px;
display: flex;
justify-content: right;
@@ -224,7 +243,7 @@
padding-left: 15px;
.line{
- color: #3e8ef7;
+ color: #0056d6;
}
.line:hover{
cursor:pointer
@@ -295,18 +314,16 @@
.stat-item {
width: 33%;
text-align: center;
-
+
div {
font-size: 17px;
font-family: Source Han Serif SC;
font-weight: 500;
- color: rgba(#000, 0.5);
line-height: 24px;
&.z-weak {
- font-size: 12px;
+ font-size: 14px;
font-family: Source Han Serif SC;
- font-weight: 500;
- color: rgba(#000, 0.5);
+ font-weight: 600;
line-height: 24px;
}
}
diff --git a/src/assets/scss/modules/shequzhili/project-info.scss b/src/assets/scss/modules/shequzhili/project-info.scss
index f4b9c5b13..d55deb94c 100644
--- a/src/assets/scss/modules/shequzhili/project-info.scss
+++ b/src/assets/scss/modules/shequzhili/project-info.scss
@@ -210,13 +210,11 @@
font-size: 17px;
font-family: Source Han Serif SC;
font-weight: 500;
- color: rgba(#000, 0.5);
line-height: 24px;
&.z-weak {
font-size: 12px;
font-family: Source Han Serif SC;
font-weight: 500;
- color: rgba(#000, 0.5);
line-height: 24px;
}
}
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 39b561599..c074cd4cb 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -1,92 +1,179 @@
-
-
事件详情
+
+
+
+ 事件详情
+
-
+
所属网格:
{{ info.gridName }}
-
+
上报时间:
{{ info.happenTime }}
-
+
事件内容:
{{ info.eventContent }}
-
-
+
图片:
-
![]()
+
-
+
-
+
反映渠道:
{{ info.sourceTypeName }}
-
+
地址:
{{ info.address }}
-
+
上报人:
{{ info.name }}
-
+
联系电话:
{{ info.mobile }}
-
+
证件号:
- {{ info.idCard?info.idCard:'--' }}
+ {{ info.idCard ? info.idCard : "--" }}
-
+
标记:
- {{ info.markTypeName|| '--' }}
+ {{ info.markTypeName || "--" }}
-
+
-
+
-
+
-
+
满意度:
-
{{info.satisfactionName}}
+
{{ info.satisfactionName }}
-
-
-
关闭
-
+
+ 关闭
-
-
+
满意度评价
-
-
关闭
-
确定
+
+ 关闭
+ 确定
-
-
-
-
-
关闭
-
确定
+
+
+ 关闭
+ 确定
-
-
@@ -169,16 +272,16 @@ import foldText from "@/views/components/foldText";
import projectInfo from "../../xiangmu/cpts/project-info";
import dateFormat from "dai-js/tools/dateFormat";
-function iniData () {
+function iniData() {
return {
user: {},
- projectPageType: 'info',
+ projectPageType: "info",
info: {},
eventDetailCopy: {},
- showType: '',
+ showType: "",
- projectId: '',
+ projectId: "",
demandForm: {
gridId: "",
@@ -200,12 +303,12 @@ function iniData () {
selBad: false,
selGood: false,
selPerfect: false,
- badurl: require('@/assets/img/satisfy-images/face1.png'),
- badurl_light: require('@/assets/img/satisfy-images/face1_light.png'),
- goodurl: require('@/assets/img/satisfy-images/face2.png'),
- goodurl_light: require('@/assets/img/satisfy-images/face2_light.png'),
- perfecturl: require('@/assets/img/satisfy-images/face3.png'),
- perfecturl_light: require('@/assets/img/satisfy-images/face3_light.png'),
+ badurl: require("@/assets/img/satisfy-images/face1.png"),
+ badurl_light: require("@/assets/img/satisfy-images/face1_light.png"),
+ goodurl: require("@/assets/img/satisfy-images/face2.png"),
+ goodurl_light: require("@/assets/img/satisfy-images/face2_light.png"),
+ perfecturl: require("@/assets/img/satisfy-images/face3.png"),
+ perfecturl_light: require("@/assets/img/satisfy-images/face3_light.png"),
};
}
@@ -222,36 +325,43 @@ export default {
},
eventDetailData: {
-
type: Object,
- default () {
- return {}
- }
+ default() {
+ return {};
+ },
},
- source: {//展示来源:manage 管理平台 visiual 可视化平台
+ source: {
+ //展示来源:manage 管理平台 visiual 可视化平台
type: String,
- default: 'manage'
- }
+ default: "manage",
+ },
},
components: {
- foldText, projectInfo
+ foldText,
+ projectInfo,
},
data: iniData,
- computed: {},
- watch: {
-
- },
- created () {
-
-
- },
-
- mounted () {
- this.user = this.$store.state.user
+ watch: {},
+ created() {},
+ computed: {
+ containerStyle() {
+ if (this.type === 'info') {
+ return {
+ minHeight: 'calc(88vh - 50px)',
+ overflow: 'auto',
+ position: 'relative'
+ }
+ } else {
+ return {}
+ }
+ }
+},
+ mounted() {
+ this.user = this.$store.state.user;
if (this.eventId) {
this.info = JSON.parse(JSON.stringify(this.eventDetailData));
@@ -261,27 +371,25 @@ export default {
// }
}
// this.getApiData();
-
},
methods: {
- watchImg (src) {
+ watchImg(src) {
window.open(src);
},
- handleClose () {
- this.showType = ''
+ handleClose() {
+ this.showType = "";
},
- handleCloseEvent () {
+ handleCloseEvent() {
this.$emit("handleClose");
},
- async getApiData () {
- },
+ async getApiData() {},
- handleToProject () {
- this.$emit("handleToProject")
+ handleToProject() {
+ this.$emit("handleToProject");
// if (this.info.status === 'processing') {
// this.projectPageType = 'edit'
// } else {
@@ -290,99 +398,99 @@ export default {
// this.showType = 'project'
},
- handleToDemand () {
- this.$emit("handleToDemand")
+ handleToDemand() {
+ this.$emit("handleToDemand");
},
- handleToIssue () {
- this.$emit("handleToIssue")
+ handleToIssue() {
+ this.$emit("handleToIssue");
},
//满意度评价
- handleSatisfy () {
-
- this.showSatisfy = true
+ handleSatisfy() {
+ this.showSatisfy = true;
},
- clickSatisfy (type) {
+ clickSatisfy(type) {
if (this.info.satisfactionName) {
- return false
+ return false;
}
- this.changeSatisfyType(type)
-
+ this.changeSatisfyType(type);
},
- changeSatisfyType (type) {
- if (type === 'bad') {
- this.selGood = false
- this.selPerfect = false
- this.selBad = true
- } else if (type === 'good') {
- this.selGood = true
- this.selPerfect = false
- this.selBad = false
- } else if (type === 'perfect') {
- this.selGood = false
- this.selPerfect = true
- this.selBad = false
+ changeSatisfyType(type) {
+ if (type === "bad") {
+ this.selGood = false;
+ this.selPerfect = false;
+ this.selBad = true;
+ } else if (type === "good") {
+ this.selGood = true;
+ this.selPerfect = false;
+ this.selBad = false;
+ } else if (type === "perfect") {
+ this.selGood = false;
+ this.selPerfect = true;
+ this.selBad = false;
}
},
- async handleComfirmSatisfy () {
- let satisfyLevel = ''
+ async handleComfirmSatisfy() {
+ let satisfyLevel = "";
if (!this.selBad && !this.selGood && !this.selPerfect) {
this.$message.info("请选择评价级别");
} else {
if (this.selBad) {
- satisfyLevel = 'bad'
+ satisfyLevel = "bad";
} else if (this.selGood) {
- satisfyLevel = 'good'
+ satisfyLevel = "good";
} else if (this.selPerfect) {
- satisfyLevel = 'perfect'
+ satisfyLevel = "perfect";
}
}
- const url = "/governance/icEvent/comment"
+ const url = "/governance/icEvent/comment";
let params = {
icEventId: this.eventId,
- satisfaction: satisfyLevel
- }
+ satisfaction: satisfyLevel,
+ };
- const { data, code, msg } = await requestPost(url, params)
+ const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$message.success("评价成功");
- this.info.satisfactionName = satisfyLevel == 'bad'?'不满意':satisfyLevel == "good"?'满意':'非常满意'
- this.showSatisfy = false
-
+ this.info.satisfactionName =
+ satisfyLevel == "bad"
+ ? "不满意"
+ : satisfyLevel == "good"
+ ? "满意"
+ : "非常满意";
+ this.showSatisfy = false;
} else {
- this.$message.error(msg)
+ this.$message.error(msg);
}
},
-
-
},
};
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 54ea579d3..3b78b3c7c 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -44,11 +44,15 @@
-
+
查看详情
-
+
-
+
0" class="g-right">
+
-
处理进展
+
+ 处理进展
:first-child{//
+.list {
+ & > :last-child {
border: none !important;
- .name{
- background: url('../../../../../assets/images/index/bubble.png') no-repeat;
- color: #fff !important;
- padding: 0px 10px 3px 13px!important;
- background-size: 100% 100%;
- border: none !important;
- }
- }
+ }
+ & > :first-child {
+ .name {
+ background: url("../../../../../assets/images/index/bubble.png") no-repeat;
+ color: #fff !important;
+ padding: 0px 10px 3px 13px !important;
+ background-size: 100% 100%;
+ border: none !important;
+ }
+ }
}
-.g-left {
+.g-left-top40 {
margin-top: 40px;
}
-.g-right {
+.g-right-top40 {
margin-top: 40px;
}
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
index 18d76b318..466897617 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -1,187 +1,258 @@
-
- 议题详情
+
+
+
议题详情
+
-
-
+
议题标题:
{{ issueInfo.issueTitle }}
-
+
处理意见:
- {{ issueInfo.issueSuggestion||'--' }}
+ {{ issueInfo.issueSuggestion || "--" }}
-
+
所属网格:
- {{ issueInfo.belongsGridName||'--' }}
+ {{ issueInfo.belongsGridName || "--" }}
-
+
议题发表人:
- {{ issueInfo.issueInitiator||'--' }}
+ {{ issueInfo.issueInitiator || "--" }}
-
+
议题来源:
-
查看话题
-
查看事件
+
+ 查看话题
+
+
+ 查看事件
+
-
查看话题>--
+
查看话题>--
-
+
-
+
分类:
-
-
+
+
{{ item.name }}
-
--
-
-
-
+
--
+
+
+
更改分类
-
- 确定
+
+ 确定
-
+
标签:
-
-
+
+
{{ item.name }}
-
--
-
-
-
+
--
+
+
+
更改标签
-
+
-
+
-
+
- 确定
+ 确定
-
-
-
{{ issueTrend.supportAmount }}
-
支持
+
+
-
{{ issueTrend.oppositionAmount }}
-
反对
+
+
+ {{ issueTrend.realityVoteCount }}/{{
+ issueTrend.shouldVoteCount
+ }}
+
+
-
@@ -191,15 +262,10 @@
1、状态=完成 (已评价)||(没评价&&不是本人)
2、状态=未完成 (有操作id) -->
-
@@ -210,13 +276,13 @@ import projectInfo from "../../xiangmu/cpts/project-info";
import dateFormat from "dai-js/tools/dateFormat";
import lineChart from "@/views/modules/visual/cpts/line-chart";
-function iniData () {
+function iniData() {
return {
user: {},
- projectPageType: 'info',
+ projectPageType: "info",
issueInfo: {},
- showType: '',
+ showType: "",
popSelIssueCate: [],
issueCate: [],
@@ -231,7 +297,6 @@ function iniData () {
issueTrend: {},
issueChartData: [],
-
};
}
@@ -248,20 +313,22 @@ export default {
},
issueDetailData: {
-
type: Object,
- default () {
- return {}
- }
+ default() {
+ return {};
+ },
},
- source: {//展示来源:manage 管理平台 visiual 可视化平台
+ source: {
+ //展示来源:manage 管理平台 visiual 可视化平台
type: String,
- default: 'manage'
- }
+ default: "manage",
+ },
},
components: {
- foldText, projectInfo, lineChart
+ foldText,
+ projectInfo,
+ lineChart,
},
data: iniData,
@@ -269,7 +336,7 @@ export default {
computed: {},
watch: {
- selectedCateData (val) {
+ selectedCateData(val) {
const { cateOptions } = this;
this.popSelIssueCate = val
.filter((arr) => arr.length > 0)
@@ -282,7 +349,7 @@ export default {
};
});
},
- async selectedTagData (val) {
+ async selectedTagData(val) {
const { tagOptions } = this;
this.issueTag = await Promise.all(
val.map(async (id) => {
@@ -310,50 +377,47 @@ export default {
this.issueTag = this.issueTag.filter((item) => item.id);
},
},
- created () { },
+ created() {},
- mounted () {
- this.user = this.$store.state.user
+ mounted() {
+ this.user = this.$store.state.user;
if (this.issueId) {
this.issueInfo = JSON.parse(JSON.stringify(this.issueDetailData));
-
}
this.getChartInfo();
this.getIssueCate();
-
},
methods: {
- watchImg (src) {
+ watchImg(src) {
window.open(src);
},
- handleClose () {
- this.showType = ''
+ handleClose() {
+ this.showType = "";
},
- handleCloseEvent () {
+ handleCloseEvent() {
this.$emit("handleClose");
},
- async getApiData () {
- },
+ async getApiData() {},
- handleToTopic () {
- this.$emit("handleToTopic")
+ handleToTopic() {
+ this.$emit("handleToTopic");
},
- handleToEvent () {
- this.$emit("handleToEvent")
+ handleToEvent() {
+ this.$emit("handleToEvent");
},
- handleToSuggest () {
- this.$emit("handleToSuggest")
+ handleToSuggest() {
+ this.$emit("handleToSuggest");
},
- handleToEvaluation () {
- this.$emit("handleToEvaluation")
+ handleToEvaluation() {
+ this.$emit("handleToEvaluation");
},
- async getChartInfo () {
+ async getChartInfo() {
const url = "/governance/manage/votingTrendV2";
const { data, code, msg } = await requestPost(url, {
@@ -361,7 +425,6 @@ export default {
});
if (code === 0) {
-
this.issueTrend = data;
let chartData = [];
data.polyLine.forEach((item) => {
@@ -381,14 +444,11 @@ export default {
);
});
this.issueChartData = chartData;
-
-
-
} else {
this.$message.error(msg);
}
},
- async getIssueCate () {
+ async getIssueCate() {
const url = "/governance/issuecategory/categorytaglist";
const { data, code, msg } = await requestPost(url, {
@@ -407,7 +467,7 @@ export default {
}
},
- async getCateOptions () {
+ async getCateOptions() {
const url = "/governance/issueprojectcategorydict/list";
const { data, code, msg } = await requestPost(url, {});
@@ -424,7 +484,7 @@ export default {
}
},
- async getTagOptions () {
+ async getTagOptions() {
const url = "/governance/issueprojecttagdict/list";
const { data, code, msg } = await requestPost(url, {
@@ -442,7 +502,7 @@ export default {
}
},
- async updateIssueCate () {
+ async updateIssueCate() {
const url = "/governance/issuecategory/save";
const { popSelIssueCate } = this;
if (popSelIssueCate.length == 0) {
@@ -457,14 +517,14 @@ export default {
if (code === 0) {
this.$message.success("更改成功");
this.visibleCatePanel = false;
- this.issueCate = popSelIssueCate
+ this.issueCate = popSelIssueCate;
this.getTagOptions();
} else {
this.$message.error(msg);
}
},
- async updateIssueTag () {
+ async updateIssueTag() {
const url = "/governance/issuetags/save";
const { issueTag } = this;
@@ -480,10 +540,9 @@ export default {
this.$message.error(msg);
}
},
- handleTagChange (val) {
+ handleTagChange(val) {
console.log(val);
},
-
},
};
@@ -491,8 +550,29 @@ export default {
lang="scss"
src="@/assets/scss/modules/shequzhili/project-info.scss"
scoped
->
+>
+
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-info.vue b/src/views/modules/shequzhili/issue/cpts/issue-info.vue
index 3f6ce3ccf..71d3c95a6 100644
--- a/src/views/modules/shequzhili/issue/cpts/issue-info.vue
+++ b/src/views/modules/shequzhili/issue/cpts/issue-info.vue
@@ -1,55 +1,97 @@