From e57b69ae299aa95bf80353e64e2f748f586fe3ec Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Mon, 23 Sep 2024 16:32:56 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E6=8F=90=E4=BA=A4=E9=98=B3?=
 =?UTF-8?q?=E5=85=89=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  4 ++--
 src/api/modules/sunshineProject.ts            | 17 ++++++++++++++
 .../sunshineProject/bottomCenter.vue          |  8 +++----
 .../sunshineProject/bottomLeft.vue            |  6 ++---
 .../sunshineProject/bottomRight.vue           |  6 ++---
 .../sunshineProject/dialog-article.vue        | 14 ++++--------
 .../sunshineProject/index.vue                 | 18 +++++++--------
 .../sunshineProject/leftCenter.vue            |  6 ++---
 .../sunshineProject/leftTop.vue               |  4 ++--
 .../sunshineProject/party-build-dialog.vue    | 22 +++++++++----------
 .../sunshineProject/rightCenter.vue           |  6 ++---
 .../sunshineProject/rightTop.vue              |  6 ++---
 .../sunshineProject/topBottomCenter.vue       |  8 +++----
 .../sunshineProject/topCenter.vue             | 10 ++++-----
 14 files changed, 72 insertions(+), 63 deletions(-)
 create mode 100644 src/api/modules/sunshineProject.ts

diff --git a/.env.production b/.env.production
index e2b1dc1..3e830a0 100644
--- a/.env.production
+++ b/.env.production
@@ -6,7 +6,7 @@ NODE_ENV = "production"
 # VITE_API_URL = "http://139.9.66.234:6688"
 # VITE_API_URL = "http://jxj.zhgdyun.com:6688"
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
-VITE_API_URL = 'http://jxj.zhgdyun.com:33981'
+# VITE_API_URL = 'http://jxj.zhgdyun.com:33981'
 # 沈阳合盈线上
 # VITE_API_URL = "http://101.43.164.214:45022"
 # 嘉兴王江泾公用码头
@@ -41,7 +41,7 @@ VITE_API_URL = 'http://jxj.zhgdyun.com:33981'
 # 九柱集团
 # VITE_API_URL = 'http://218.95.151.122:31004'
 # 包头化工
-# VITE_API_URL = 'http://jxj.zhgdyun.com:18000'
+VITE_API_URL = 'http://jxj.zhgdyun.com:18000'
 # 大连金笔
 # VITE_API_URL = 'http://101.43.164.214:11126'
 # 打包
diff --git a/src/api/modules/sunshineProject.ts b/src/api/modules/sunshineProject.ts
new file mode 100644
index 0000000..ccf3e4e
--- /dev/null
+++ b/src/api/modules/sunshineProject.ts
@@ -0,0 +1,17 @@
+// 党建引领接口API
+import http from "@/api";
+const BASEURL = import.meta.env.VITE_API_URL;
+
+// 分页列表查询阳光工程信息
+export const getSunshineProjectPage = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/sunshineProject/page`, params, {
+		headers: { noLoading: true }
+	});
+};
+
+// 通过id查询阳光工程信息
+export const getSunshineProjectById = (params: {}) => {
+	return http.get(BASEURL + `/xmgl/sunshineProject/queryById`, params, {
+		headers: { noLoading: true }
+	});
+};
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomCenter.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomCenter.vue
index 5d340be..466e514 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomCenter.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomCenter.vue
@@ -20,16 +20,16 @@
 import Card from "@/components/card.vue";
 import { onMounted, ref } from "vue";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 const memberCareList = ref({} as any);
 //获取党建新闻
 const getMemberCareList = () => {
-	getPartyBuildingGuidancePage({
+	getSunshineProjectPage({
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
-		type: 1
+		type: 8
 	}).then((res: any) => {
 		console.log("获取装置投用运行效果后评价公开", res);
 		if (res.success) {
@@ -69,7 +69,7 @@ onMounted(() => {
 	.list-content {
 		width: 95%;
 		height: 100%;
-		margin: 0 2% 0 5%;
+		margin: 0 2% 0 2%;
 
 		.list-detail {
 			display: flex;
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomLeft.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomLeft.vue
index 0c2292a..f6b1921 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomLeft.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomLeft.vue
@@ -20,16 +20,16 @@
 import Card from "@/components/card.vue";
 import { onMounted, ref } from "vue";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 const memberCareList = ref({} as any);
 //获取党建新闻
 const getMemberCareList = () => {
-	getPartyBuildingGuidancePage({
+	getSunshineProjectPage({
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
-		type: 1
+		type: 7
 	}).then((res: any) => {
 		console.log("获取重大合同及设计变更公开", res);
 		if (res.success) {
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomRight.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomRight.vue
index 4126361..5f1ff7b 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomRight.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/bottomRight.vue
@@ -20,16 +20,16 @@
 import Card from "@/components/card.vue";
 import { onMounted, ref } from "vue";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 const memberCareList = ref({} as any);
 //获取党建新闻
 const getMemberCareList = () => {
-	getPartyBuildingGuidancePage({
+	getSunshineProjectPage({
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
-		type: 1
+		type: 9
 	}).then((res: any) => {
 		console.log("获取各类检查", res);
 		if (res.success) {
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/dialog-article.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/dialog-article.vue
index 3ebcab1..0d3ff2f 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/dialog-article.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/dialog-article.vue
@@ -6,13 +6,7 @@
 		<div class="main-article" v-if="articleNewList.length > 0">
 			<el-scrollbar class="left-content" v-infinite-scroll="loadChildren">
 				<div class="content-tab">
-					<div
-						class="tab-box"
-						:style="boxStyle(item)"
-						v-for="(item, index) in articleNewList"
-						:key="item.id"
-						@click="activeBtn(item, index)"
-					>
+					<div class="tab-box" :style="boxStyle(item)" v-for="item in articleNewList" :key="item.id" @click="activeBtn(item)">
 						<div class="text" :title="item.title" :style="getStyle(item)">{{ item.title || "" }}</div>
 						<div class="time">时间: {{ item.createDate || "" }}</div>
 					</div>
@@ -39,7 +33,7 @@
 import { ref, watch, onMounted, reactive } from "vue";
 import firstIcon from "@/assets/images/smartPartyBuilding/contentBox.png";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage, getPartyBuildingGuidanceQueryById } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage, getSunshineProjectById } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 
 let selectTitle = ref("" as any);
@@ -126,7 +120,7 @@ watch(
 );
 
 const getArticleDetail = async () => {
-	const res: any = await getPartyBuildingGuidanceQueryById({ id: detailId.value });
+	const res: any = await getSunshineProjectById({ id: detailId.value });
 	console.log("获取详情数据", res);
 	if (res.success) {
 		detailData.value = res.result;
@@ -152,7 +146,7 @@ const loadChildren = () => {
 // 列表查询党员活动、学习讲话、党员关怀信息  type类型：1党员活动2学习讲话3党员关怀
 const getArticleList = async () => {
 	// 当前类型
-	const res: any = await getPartyBuildingGuidancePage({
+	const res: any = await getSunshineProjectPage({
 		projectSn: store.sn,
 		type: props.currentListIndex,
 		title: selectTitle.value,
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/index.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/index.vue
index b70724f..4d6a09b 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/index.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/index.vue
@@ -8,42 +8,42 @@
 				</div>
 				<div class="left-center">
 					<left-center></left-center>
-					<div class="show-more" @click="openPeopleCountDialog(1)">更多</div>
+					<div class="show-more" @click="openPeopleCountDialog(4)">更多</div>
 				</div>
 			</div>
 			<div class="topCenter">
 				<div class="center-top">
 					<topCenter></topCenter>
-					<div class="show-more" @click="openPeopleCountDialog(1)">更多</div>
+					<div class="show-more" @click="openPeopleCountDialog(2)">更多</div>
 				</div>
 				<div class="center-bottom">
 					<topBottomCenter></topBottomCenter>
-					<div class="show-more" @click="openPeopleCountDialog(1)">更多</div>
+					<div class="show-more" @click="openPeopleCountDialog(5)">更多</div>
 				</div>
 			</div>
 			<div class="topRight">
 				<div class="right-top">
 					<rightTop></rightTop>
-					<div class="show-more" @click="openPeopleCountDialog(1)">更多</div>
+					<div class="show-more" @click="openPeopleCountDialog(3)">更多</div>
 				</div>
 				<div class="right-center">
 					<rightCenter></rightCenter>
-					<div class="show-more" @click="openPeopleCountDialog(2)">更多</div>
+					<div class="show-more" @click="openPeopleCountDialog(6)">更多</div>
 				</div>
 			</div>
 		</div>
 		<div class="bottom">
 			<div class="bottomLeft">
 				<BottomLeft @open-dialog="openPeopleCountDialog"></BottomLeft>
-				<div class="show-more" @click="openPeopleCountDialog(9)">更多</div>
+				<div class="show-more" @click="openPeopleCountDialog(7)">更多</div>
 			</div>
 			<div class="bottomCenter">
 				<BottomCenter @open-dialog="openPeopleCountDialog"></BottomCenter>
-				<div class="show-more" @click="openPeopleCountDialog(4)">更多</div>
+				<div class="show-more" @click="openPeopleCountDialog(8)">更多</div>
 			</div>
 			<div class="bottomRight">
 				<BottomRight></BottomRight>
-				<div class="show-more" @click="openPeopleCountDialog(3)">更多</div>
+				<div class="show-more" @click="openPeopleCountDialog(9)">更多</div>
 			</div>
 		</div>
 		<party-build-dialog ref="partyBuildRef" @openCancelDialog="openCancelDialog"></party-build-dialog>
@@ -63,7 +63,7 @@ import leftTop from "@/views/sevenLargeScreen/comprehensiveManage/sunshineProjec
 import leftCenter from "@/views/sevenLargeScreen/comprehensiveManage/sunshineProject/leftCenter.vue";
 
 import partyBuildDialog from "@/views/sevenLargeScreen/comprehensiveManage/sunshineProject/party-build-dialog.vue";
-import { ref, reactive, onMounted, watch } from "vue";
+import { ref } from "vue";
 
 // 人员情况弹窗
 const partyBuildRef = ref();
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/leftCenter.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/leftCenter.vue
index eef9cf9..33fbafa 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/leftCenter.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/leftCenter.vue
@@ -23,16 +23,16 @@
 import Card from "@/components/card.vue";
 import { onMounted, ref } from "vue";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 const memberCareList = ref({} as any);
 //获取党建新闻
 const getMemberCareList = () => {
-	getPartyBuildingGuidancePage({
+	getSunshineProjectPage({
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
-		type: 1
+		type: 4
 	}).then((res: any) => {
 		console.log("获取交工验收", res);
 		if (res.success) {
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/leftTop.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/leftTop.vue
index db1b565..0310183 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/leftTop.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/leftTop.vue
@@ -23,12 +23,12 @@
 import Card from "@/components/card.vue";
 import { onMounted, ref } from "vue";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 const memberCareList = ref({} as any);
 //获取党建新闻
 const getMemberCareList = async () => {
-	getPartyBuildingGuidancePage({
+	getSunshineProjectPage({
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/party-build-dialog.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/party-build-dialog.vue
index bc7e735..1e76d15 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/party-build-dialog.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/party-build-dialog.vue
@@ -27,7 +27,7 @@
 import { ref, onMounted } from "vue";
 // import partyMemberDemeanor from "@/views/sevenLargeScreen/comprehensiveManage/guidancePartyBuilding/party-member-demeanor.vue";
 // import politicalOutlook from "@/views/sevenLargeScreen/comprehensiveManage/guidancePartyBuilding/political-outlook.vue";
-import dialogArticle from "@/views/sevenLargeScreen/comprehensiveManage/guidancePartyBuilding/dialog-article.vue";
+import dialogArticle from "@/views/sevenLargeScreen/comprehensiveManage/sunshineProject/dialog-article.vue";
 // import { GlobalStore } from "@/stores";
 let showDialog = ref(false as any);
 const emits = defineEmits(["openCancelDialog"]);
@@ -45,25 +45,23 @@ function openDialog(type: any) {
 	dialogIndex.value = type;
 	showDialog.value = true;
 	if (type === 1) {
-		dialogTitle.value = "宣传报道";
+		dialogTitle.value = "招标过程";
 	} else if (type === 2) {
-		dialogTitle.value = "专题活动";
+		dialogTitle.value = "资金使用公开";
 	} else if (type === 3) {
-		dialogTitle.value = "学习园地";
+		dialogTitle.value = "施工管理过程";
 	} else if (type === 4) {
-		dialogTitle.value = "党建共建活动纪实";
+		dialogTitle.value = "交工验收";
 	} else if (type === 5) {
-		dialogTitle.value = "党建共建方案";
+		dialogTitle.value = "非招标类物资 服务采购公开";
 	} else if (type === 6) {
-		dialogTitle.value = "党建共建协议";
+		dialogTitle.value = "征地管理";
 	} else if (type === 7) {
-		dialogTitle.value = "党建品牌";
+		dialogTitle.value = "重大合同及设计变更公开";
 	} else if (type === 8) {
-		dialogTitle.value = "党员示范岗";
+		dialogTitle.value = "装置投用运行效果后评价公开";
 	} else if (type === 9) {
-		dialogTitle.value = "模范先锋";
-	} else if (type === 10) {
-		dialogTitle.value = "联合党小组";
+		dialogTitle.value = "各类检查";
 	}
 }
 
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/rightCenter.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/rightCenter.vue
index 62171fc..68ce388 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/rightCenter.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/rightCenter.vue
@@ -20,16 +20,16 @@
 import Card from "@/components/card.vue";
 import { onMounted, ref } from "vue";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 const memberCareList = ref({} as any);
 //获取党建新闻
 const getMemberCareList = () => {
-	getPartyBuildingGuidancePage({
+	getSunshineProjectPage({
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
-		type: 1
+		type: 6
 	}).then((res: any) => {
 		console.log("获取征地管理", res);
 		if (res.success) {
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/rightTop.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/rightTop.vue
index 85a3aaa..a1aa54d 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/rightTop.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/rightTop.vue
@@ -20,16 +20,16 @@
 import Card from "@/components/card.vue";
 import { onMounted, ref } from "vue";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 const memberCareList = ref({} as any);
 //获取党建新闻
 const getMemberCareList = () => {
-	getPartyBuildingGuidancePage({
+	getSunshineProjectPage({
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
-		type: 1
+		type: 3
 	}).then((res: any) => {
 		console.log("获取施工管理过程", res);
 		if (res.success) {
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/topBottomCenter.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/topBottomCenter.vue
index 2d112b8..e2f412f 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/topBottomCenter.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/topBottomCenter.vue
@@ -20,16 +20,16 @@
 import Card from "@/components/card.vue";
 import { onMounted, ref } from "vue";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 const memberCareList = ref({} as any);
 //获取党建新闻
 const getMemberCareList = () => {
-	getPartyBuildingGuidancePage({
+	getSunshineProjectPage({
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
-		type: 1
+		type: 5
 	}).then((res: any) => {
 		console.log("获取非招标类物资 服务采购公开查", res);
 		if (res.success) {
@@ -69,7 +69,7 @@ onMounted(() => {
 	.list-content {
 		width: 95%;
 		height: 100%;
-		margin: 0 2% 0 5%;
+		margin: 0 2% 0 2%;
 
 		.list-detail {
 			display: flex;
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/topCenter.vue b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/topCenter.vue
index 746ed69..f998ee1 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/topCenter.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/sunshineProject/topCenter.vue
@@ -20,18 +20,18 @@
 import Card from "@/components/card.vue";
 import { onMounted, ref } from "vue";
 import { GlobalStore } from "@/stores";
-import { getPartyBuildingGuidancePage } from "@/api/modules/guidancePartyBuilding";
+import { getSunshineProjectPage } from "@/api/modules/sunshineProject";
 const store = GlobalStore();
 const memberCareList = ref({} as any);
 //获取党建新闻
 const getMemberCareList = () => {
-	getPartyBuildingGuidancePage({
+	getSunshineProjectPage({
 		projectSn: store.sn,
 		pageNo: 1,
 		pageSize: 10,
-		type: 1
+		type: 2
 	}).then((res: any) => {
-		console.log("获取各类检查", res);
+		console.log("获取资金使用公开", res);
 		if (res.success) {
 			memberCareList.value = res.result.records;
 		}
@@ -69,7 +69,7 @@ onMounted(() => {
 	.list-content {
 		width: 95%;
 		height: 100%;
-		margin: 0 2% 0 5%;
+		margin: 0 2% 0 2%;
 
 		.list-detail {
 			display: flex;