Merge branch 'master' into yp-dev

package.json

@@ -18,7 +18,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@antv/g6": "^4.8.24",
+    "@antv/g6": "^4.8.25",
     "@element-plus/icons-vue": "^2.3.1",
     "@kangc/v-md-editor": "^2.3.18",
     "@microsoft/fetch-event-source": "^2.0.1",

src/views/bill/billLayout/index.vue

@@ -18,8 +18,8 @@
 							<div
 								class="left-box-bottom-item"
 								:class="{ leftBoxBottomItemActive: activeTitle === item.name }"
-								v-for="(item, index) in mainHeaderBtnList"
-								:key="index"
+								v-for="item in mainHeaderBtnList"
+								:key="item.path"
 								@click="handleClickMainHeaderBtn(item)"
 							>
 								<div class="icon">
@@ -133,6 +133,7 @@
 import { ref, onMounted } from "vue";
 import router from "@/router";
 import { useRoute } from "vue-router";
+import { ElMessage } from "element-plus";
 import { getBillInfoGlobal, getBillFullText } from "@/api/bill";
 
 const route = useRoute();
@@ -227,6 +228,10 @@ const mainHeaderBtnList = ref([
 const activeTitle = ref("法案概况");
 
 const handleClickMainHeaderBtn = item => {
+	if (["影响分析", "相关情况"].includes(item.name)) {
+		ElMessage.warning("当前功能正在开发中，敬请期待！");
+		return;
+	}
 	activeTitle.value = item.name;
 	window.sessionStorage.setItem("activeTitle", activeTitle.value);
 	router.push({