From fcf8473070f57e639316baad9f78c64885af5d6f Mon Sep 17 00:00:00 2001
From: jiayu <zheng_jiayu1@163.com>
Date: Sat, 27 Jul 2024 15:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=8F=9C=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/header.vue                               | 3 ++-
 src/views/companyAdmin/companyDiagram.vue               | 8 ++++++++
 src/views/home/login_v2.vue                             | 1 +
 src/views/jxjadmin/registerAudit.vue                    | 6 +++++-
 src/views/projectFront/aiAnalysis/reduceRulesManage.vue | 2 +-
 src/views/projectFront/configManage/roleManage.vue      | 2 +-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/header.vue b/src/components/header.vue
index 069ea113..fe623cb2 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -522,7 +522,8 @@ export default {
         console.log("当前跳转链接", this.newBigScreen);
         //-------------------- 跳转新版七参数
         this.jumpToken = localStorage.getItem("jumpToken");
-        window.open(this.newBigScreen + "?token=" + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self");
+        let userId = this.$store.state.userInfo.userId;
+        window.open(this.newBigScreen + "?userId=" + userId + '&sn=' + this.$store.state.projectSn, "_self");
         // window.open('http://192.168.34.138:8081/#/large?token=' + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self")//这里是后台跳到大屏的操作，携带token过去
       }
       // if (this.newBigScreen != null) {
diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue
index 46eb426c..4d2677c1 100644
--- a/src/views/companyAdmin/companyDiagram.vue
+++ b/src/views/companyAdmin/companyDiagram.vue
@@ -1105,6 +1105,14 @@
             :label="i.moduleId"
             >{{ i.moduleName }}</el-checkbox
           >
+          <div class="CheckboxTitle">新项目看板模块</div>
+          <el-checkbox
+            v-if="i.moduleType === 8"
+            v-for="i in checkArr"
+            :key="i.moduleId"
+            :label="i.moduleId"
+            >{{ i.moduleName }}</el-checkbox
+          >
         </el-checkbox-group>
         <div class="dialog-footer">
           <el-button
diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue
index 0c60fafa..c6006d4a 100644
--- a/src/views/home/login_v2.vue
+++ b/src/views/home/login_v2.vue
@@ -1077,6 +1077,7 @@ export default {
         });
     },
     parseLoginData(data, isOutside) {
+      // debugger;
       if (this.projectType == "zjsj") {
         this.$store.commit("setProjectSn", data.sn);
       }
diff --git a/src/views/jxjadmin/registerAudit.vue b/src/views/jxjadmin/registerAudit.vue
index bf108c66..8bea78f4 100644
--- a/src/views/jxjadmin/registerAudit.vue
+++ b/src/views/jxjadmin/registerAudit.vue
@@ -211,6 +211,10 @@
               <el-checkbox v-if="i.moduleType === 7" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
                 i.moduleName
               }}</el-checkbox>
+              <div class="CheckboxTitle">新项目看板模块</div>
+              <el-checkbox v-if="i.moduleType === 8" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
+                i.moduleName
+              }}</el-checkbox>
             </el-checkbox-group>
           </el-col>
         </el-row>
@@ -553,7 +557,7 @@ export default {
           })
           this.brHtm = brHtm
           // console.log('查看要换行的位置',brHtm)
-          // console.log('列表查询所有模块信息',this.companyArr)
+          console.log('列表查询所有模块信息',this.companyArr)
         }
       })
     },
diff --git a/src/views/projectFront/aiAnalysis/reduceRulesManage.vue b/src/views/projectFront/aiAnalysis/reduceRulesManage.vue
index 23338783..a9662694 100644
--- a/src/views/projectFront/aiAnalysis/reduceRulesManage.vue
+++ b/src/views/projectFront/aiAnalysis/reduceRulesManage.vue
@@ -383,7 +383,7 @@ export default {
     getProjectMenu() {
       getProjectModuleGroupMenuListApi({
         projectSn: this.$store.state.projectSn,
-        moduleTypes: "2,4,7",
+        moduleTypes: "2,4,7,8",
       }).then((res) => {
         var DATA = res.result;
         // DATA.forEach((element,i) => {
diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue
index f58ef9a4..90046108 100644
--- a/src/views/projectFront/configManage/roleManage.vue
+++ b/src/views/projectFront/configManage/roleManage.vue
@@ -358,7 +358,7 @@ export default {
     getProjectMenu() {
       getProjectModuleGroupMenuListApi({
         projectSn: this.$store.state.projectSn,
-        moduleTypes:'2,4,7',
+        moduleTypes:'2,4,7,8',
       }).then(res => {
         var DATA = res.result;
         // DATA.forEach((element,i) => {