update

src/views/bill/billLayout/index.vue

@@ -3,63 +3,60 @@
 		<!-- 导航菜单 -->
 		<div class="layout-main">
 			<div class="header-main">
-				
 				<div class="layout-main-header">
-				<div class="layout-main-header-left-box">
-					<div class="left-box-top">
-						<div class="icon">
-							<img :src="billInfoGlobal.imageUrl || USALogo" alt="" />
-						</div>
-						<div class="info">
-							<div class="info-box1">{{ billInfoGlobal.billName }}</div>
-							<div class="info-box2">
-								{{ billInfoGlobal.description }} {{ billInfoGlobal.billNameEn }}
-							</div>
-						</div>
-					</div>
-					<div class="left-box-bottom">
-						<div
-							class="left-box-bottom-item"
-							:class="{ leftBoxBottomItemActive: activeTitle === item.name }"
-							v-for="(item, index) in mainHeaderBtnList"
-							:key="index"
-							@click="handleClickMainHeaderBtn(item)"
-						>
+					<div class="layout-main-header-left-box">
+						<div class="left-box-top">
 							<div class="icon">
-								<img v-if="activeTitle === item.name" :src="item.activeIcon" alt="" />
-								<img v-else :src="item.icon" alt="" />
+								<img :src="billInfoGlobal.imageUrl || USALogo" alt="" />
 							</div>
-							<div class="name" :class="{ nameActive: activeTitle === item.name }">
-								{{ item.name }}
+							<div class="info">
+								<div class="info-box1">{{ billInfoGlobal.billName }}</div>
+								<div class="info-box2">{{ billInfoGlobal.description }} {{ billInfoGlobal.billNameEn }}</div>
 							</div>
 						</div>
-					</div>
-				</div>
-				<div class="layout-main-header-right-box">
-					<div class="right-box-top">
-						<div class="time">{{ billInfoGlobal.introductionDate }}</div>
-						<div class="name">{{ billInfoGlobal.tarName }}</div>
-					</div>
-					<div class="right-box-bottom">
-						<div class="btn1" @click="handleSwitchActiveName('法案原文')">
-							<div class="icon">
-								<img src="./assets/icons/btn-icon1.png" alt="" />
+						<div class="left-box-bottom">
+							<div
+								class="left-box-bottom-item"
+								:class="{ leftBoxBottomItemActive: activeTitle === item.name }"
+								v-for="(item, index) in mainHeaderBtnList"
+								:key="index"
+								@click="handleClickMainHeaderBtn(item)"
+							>
+								<div class="icon">
+									<img v-if="activeTitle === item.name" :src="item.activeIcon" alt="" />
+									<img v-else :src="item.icon" alt="" />
+								</div>
+								<div class="name" :class="{ nameActive: activeTitle === item.name }">
+									{{ item.name }}
+								</div>
 							</div>
-							<div class="text">{{ "法案原文" }}</div>
 						</div>
-						<!-- <div class="btn2">
+					</div>
+					<div class="layout-main-header-right-box">
+						<div class="right-box-top">
+							<div class="time">{{ billInfoGlobal.introductionDate }}</div>
+							<div class="name">{{ billInfoGlobal.tarName }}</div>
+						</div>
+						<div class="right-box-bottom">
+							<div class="btn1" @click="handleSwitchActiveName('法案原文')">
+								<div class="icon">
+									<img src="./assets/icons/btn-icon1.png" alt="" />
+								</div>
+								<div class="text">{{ "法案原文" }}</div>
+							</div>
+							<!-- <div class="btn2">
 							<div class="icon">
 								<img src="./assets/icons/btn-icon2.png" alt="" />
 							</div>
 							<div class="text">{{ "查看官网" }}</div>
 						</div> -->
-						<div class="btn3">
-							<div class="icon">
-								<img src="./assets/icons/btn-icon3.png" alt="" />
+							<div class="btn3" @click="handleAnalysisClick">
+								<div class="icon">
+									<img src="./assets/icons/btn-icon3.png" alt="" />
+								</div>
+								<div class="text">{{ "分析报告" }}</div>
 							</div>
-							<div class="text">{{ "分析报告" }}</div>
-						</div>
-						<!-- <div class="btn4">
+							<!-- <div class="btn4">
 							<div class="icon">
 								<img src="./assets/icons/btn-icon4.png" alt="" />
 							</div>
@@ -68,11 +65,11 @@
 								<img src="./assets/icons/btn-icon5.png" alt="" />
 							</div>
 						</div> -->
+						</div>
 					</div>
 				</div>
-				</div>
 			</div>
-			
+
 			<div class="layout-main-center">
 				<router-view />
 			</div>
@@ -150,7 +147,6 @@ import icon4 from "./assets/icons/icon4.svg";
 import icon4Active from "./assets/icons/icon4_active.svg";
 import USALogo from "./assets/images/USA-logo.png";
 
-
 // 法案原文
 const billFullText = ref("");
 const getBillFullTextFn = async () => {
@@ -213,7 +209,7 @@ const mainHeaderBtnList = ref([
 		activeIcon: icon2Active,
 		name: "深度挖掘",
 		path: "/billLayout/deepDig"
-	},
+	}
 	// {
 	// 	icon: icon3,
 	// 	activeIcon: icon3Active,
@@ -241,6 +237,16 @@ const handleClickMainHeaderBtn = item => {
 	});
 };
 
+const handleAnalysisClick = () => {
+	router.push({
+		path: "/writtingAsstaint",
+		query: {
+			topic: "法案",
+			fileId: route.query.billId
+		}
+	});
+};
+
 onMounted(() => {
 	getBillInfoGlobalFn();
 	if (window.sessionStorage.getItem("activeTitle")) {
@@ -375,12 +381,11 @@ onMounted(() => {
 				// margin-right: 150px;
 				// margin-top: 19px;
 				.right-box-top {
-
 					height: 64px;
 					display: flex;
-						align-items: right;
-						flex-direction: column;
-						justify-content: center;
+					align-items: right;
+					flex-direction: column;
+					justify-content: center;
 					.time {
 						// height: 24px;
 						// line-height: 24px;

src/views/decree/decreeLayout/index.vue

@@ -3,23 +3,29 @@
 		<!-- 导航菜单 -->
 		<div class="layout-main">
 			<div class="header-main">
-
 				<div class="layout-main-header">
 					<div class="layout-main-header-container">
-	
 						<div class="layout-main-header-left-box">
 							<div class="left-box-top">
 								<div class="icon">
-									
-									<img v-if="summaryInfo.imageUrl" :src="summaryInfo.imageUrl" alt="" style="height: 40px;margin-top: 12px;"/>
+									<img
+										v-if="summaryInfo.imageUrl"
+										:src="summaryInfo.imageUrl"
+										alt=""
+										style="height: 40px; margin-top: 12px"
+									/>
 									<img v-else :src="USALogo" alt="" />
 								</div>
 								<div class="info">
 									<div class="info-box1">{{ summaryInfo.name }}</div>
 									<div class="info-box2">
-										<div class="info-box2-item item1" v-if="summaryInfo.order">{{ summaryInfo.order +" | "}}</div>
-										
-										<div class="info-box2-item item2" v-if="summaryInfo.type">{{ summaryInfo.type + " | " }}</div>
+										<div class="info-box2-item item1" v-if="summaryInfo.order">
+											{{ summaryInfo.order + " | " }}
+										</div>
+
+										<div class="info-box2-item item2" v-if="summaryInfo.type">
+											{{ summaryInfo.type + " | " }}
+										</div>
 										<div class="info-box2-item item3" v-if="summaryInfo.ename">{{ summaryInfo.ename }}</div>
 									</div>
 								</div>
@@ -54,7 +60,7 @@
 									</div>
 									<div class="text">{{ "政令原文" }}</div>
 								</div>
-								<div class="btn-active">
+								<div class="btn-active" @click="handleAnalysisClick">
 									<div class="icon-active">
 										<img src="./assets/icons/edit-icon.png" alt="" />
 									</div>
@@ -265,6 +271,16 @@ const handleShowReport = () => {
 	window.open(curRoute.href, "_blank");
 };
 
+const handleAnalysisClick = () => {
+	router.push({
+		path: "/writtingAsstaint",
+		query: {
+			topic: "政令",
+			fileId: route.query.id
+		}
+	});
+};
+
 onMounted(() => {
 	handleGetSummary();
 	console.log(route.path);

src/views/thinkTank/ReportDetail/index.vue

@@ -57,7 +57,7 @@
 						</div>
 						<div class="text">{{ "文档下载" }}</div>
 					</div>
-					<div class="btn btn1">
+					<div class="btn btn1" @click="handleAnalysisClick">
 						<div class="icon">
 							<img src="./images/btn-icon4.png" alt="" />
 						</div>
@@ -79,8 +79,9 @@ import { ref, onMounted } from "vue";
 import ReportAnalysis from "./reportAnalysis/index.vue";
 import PolicyTracking from "./policyTracking/index.vue";
 import { getThinkTankReportSummary } from "@/api/thinkTank/overview";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 const router = useRouter();
+const route = useRoute();
 const reportUrl = ref("");
 const thinkInfo = ref({});
 
@@ -113,6 +114,16 @@ const tabActiveName = ref("报告分析");
 const switchTab = name => {
 	tabActiveName.value = name;
 };
+
+const handleAnalysisClick = () => {
+	router.push({
+		path: "/writtingAsstaint",
+		query: {
+			topic: "智库",
+			fileId: router.currentRoute._value.params.id
+		}
+	});
+};
 onMounted(async () => {
 	handleGetThinkTankReportSummary();
 });