Merge branch 'new_906' into new_908

pages/reportForm/reportForm.vue

@@ -298,6 +298,12 @@ export default {
         ChartPermissionId: this.tabAct_id,
       }).then((res) => {
         this.tabBarsTow = res.Data.List;
+        this.tabBarsTow.push({
+          CategoryId: 100001,
+          IsRed: false,
+          MatchTypeName: "曲线工具",
+          SubCategoryName: "",
+        });
         if (!this.tabAct_idTwo) {
           this.tabAct_idTwo = res.Data.List[0].CategoryId;
         }
@@ -330,6 +336,12 @@ export default {
     },
     //tabs切换二级事件
     toggleTabTwo(item, index) {
+      if (item.CategoryId === 100001) {
+        uni.navigateTo({
+          url: "/reportPages/selectedBulletin/selectedBulletin",
+        });
+        return;
+      }
       this.matchTypeName = item.MatchTypeName;
       this.strategyIndexTwo = index;
       if (this.tabAct_idTwo !== item.CategoryId) {