From 9c60d0ea96c33d5c29a53d9ff0c94f3281e4d3fe Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 17 May 2023 10:19:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.vue                     |  2 +-
 src/router/modules/report.js                  |  2 +-
 src/views/Layout.vue                          |  2 +-
 src/views/Login.vue                           |  2 +-
 src/views/Report/ReportDetail.vue             |  1 +
 src/views/Report/ReportList.vue               | 10 ++++++----
 src/views/Report/ReportManager.vue            |  5 +++--
 src/views/System/MenuManager.vue              |  2 +-
 .../reportProcess/components/reportForm.vue   |  2 +-
 src/views/userCenter/processCenter/tabs.vue   | 20 ++++++++++++++-----
 10 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index 470b636..6ac837a 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -2,7 +2,7 @@
     <div class="header">
         <div class="logo">
 <!--            <img src="@/assets/imgs/logo.jpg" alt="">-->
-          <span class="logo-title">洞察数据库</span>
+          <span class="logo-title">洞察图书馆</span>
         </div>
         <div class="breadcrumb">
             <el-breadcrumb separator="/">
diff --git a/src/router/modules/report.js b/src/router/modules/report.js
index d6ba60e..e64224c 100644
--- a/src/router/modules/report.js
+++ b/src/router/modules/report.js
@@ -11,7 +11,7 @@ const routes = [
         name: 'ReportList',
         component: () => import('../../views/Report/ReportList.vue'),
         meta: {
-          crumb: ['报告列表']
+          crumb: ['报告查询']
         }
       },
       // 报告详情
diff --git a/src/views/Layout.vue b/src/views/Layout.vue
index 3be3665..cc451f1 100644
--- a/src/views/Layout.vue
+++ b/src/views/Layout.vue
@@ -86,7 +86,7 @@ export default {
           data = []
         }
         data = data.sort((a, b) => a.sort - b.sort)
-        const menu = data.filter(item => item.belong && item.isButton=='0')
+        const menu = data.filter(item => item.belong && (item.isButton=='0'|| !item.isButton))
         // 存储有权限的按钮
         const menuBtn = data.filter(item => item.belong && item.isButton=='1')
         this.$store.commit('setBtnPerssion', menuBtn)
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 75cd736..6103850 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -118,7 +118,7 @@ export default {
               data = []
             }
             data = data.sort((a, b) => a.sort - b.sort)
-            const menu = data.filter(item => item.belong && item.isButton == '0')
+            const menu = data.filter(item => item.belong && (item.isButton=='0'|| !item.isButton))
             if(menu.length==0){
               this.$api.login.logout().then(_ => {
                 this.$message.warning('暂无权限，请联系管理员授权')
diff --git a/src/views/Report/ReportDetail.vue b/src/views/Report/ReportDetail.vue
index 1c343c4..1d894bc 100644
--- a/src/views/Report/ReportDetail.vue
+++ b/src/views/Report/ReportDetail.vue
@@ -175,6 +175,7 @@ export default {
     },
     //评分
     saveScore() {
+      // if(this.userRating == )
       let userRating = this.userRating * 2
       this.$api.report.addScore({userRating: +userRating, reportId: this.reportId}).then(res => {
 
diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue
index 3d9ead5..8655ef4 100644
--- a/src/views/Report/ReportList.vue
+++ b/src/views/Report/ReportList.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="content-height report-list">
     <div class="title">
-      <span>报告列表</span>
+      <span>报告查询</span>
     </div>
     <div class="tag-search">
       <el-row>
         <el-col :span="6">
           <div class="tag-item">
-            <label class="tag-title">关键词:</label>
-            <el-input v-model="q.keyContent" placeholder="请输入关键词"></el-input>
+            <label class="tag-title">全文检索:</label>
+            <el-input v-model="q.keyContent" placeholder="请输入搜索词"></el-input>
           </div>
         </el-col>
         <el-col :span="6">
@@ -467,7 +467,9 @@ export default {
     },
     // 跳转到详情
     goReportDetail(row) {
-      this.$router.push({path: '/report/detail', query: {id: this.$route.query.id, reportId: row.id}})
+      window.open('/report/detail?id='+this.$route.query.id+'&reportId='+row.id)
+      this.reportList()
+      // this.$router.push({path: '/report/detail', query: {id: this.$route.query.id, reportId: row.id}})
     }
   },
   created() {
diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index d85ef51..8ef7bba 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -971,8 +971,9 @@ export default {
             //     this.content = data.content;
             //     this.dialogPreview = true;
             // })
-          this.$router.push({path: '/report/detail', query: {id: this.$route.query.id, reportId: row.id}})
-
+          window.open('/report/detail?id='+this.$route.query.id+'&reportId='+row.id)
+          // this.$router.push({path: '/report/detail', query: {id: this.$route.query.id, reportId: row.id}})
+          this.reportDateList();
         },
         // 下载
         downloadRow(row) {
diff --git a/src/views/System/MenuManager.vue b/src/views/System/MenuManager.vue
index bda77b8..c2ffb15 100644
--- a/src/views/System/MenuManager.vue
+++ b/src/views/System/MenuManager.vue
@@ -119,7 +119,7 @@ export default {
     // 菜单
     sysMenuFindAllMenus () {
       this.$api.menu.sysMenuFindAllMenus().then(({ data }) => {
-        this.tableData = data.filter(item => item.id !== '6f6fafb4a7' && item.isButton=='0').sort((a, b) => {
+        this.tableData = data.filter(item => item.id !== '6f6fafb4a7' && (item.isButton=='0'|| !item.isButton)).sort((a, b) => {
           return a.sort - b.sort
         })
       })
diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue
index f3ca439..a73873b 100644
--- a/src/views/reportProcess/components/reportForm.vue
+++ b/src/views/reportProcess/components/reportForm.vue
@@ -69,7 +69,7 @@
         </el-col>
         <el-col :span="10" :offset="2">
           <el-form-item label="关键词:" prop="tags">
-            <vue-tags-input :disabled="formControl" :class="{'is-diable':formControl}" placeholder="请输入关键词"
+            <vue-tags-input :disabled="formControl" :class="{'is-diable':formControl}" placeholder="采用回车进行关键词分割"
                             v-model="form.tags" :tags="tags"
                             @before-deleting-tag="delTag"
                             @before-adding-tag="addTags"
diff --git a/src/views/userCenter/processCenter/tabs.vue b/src/views/userCenter/processCenter/tabs.vue
index 32fd34a..5e3435f 100644
--- a/src/views/userCenter/processCenter/tabs.vue
+++ b/src/views/userCenter/processCenter/tabs.vue
@@ -1,16 +1,16 @@
 <template>
     <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="待办流程" name="first">
+            <el-tab-pane  v-if="controlNode('RXXTU4A5YN')" label="待办流程" name="first">
                 <gencyProcess v-if="activeName == 'first'" :form="form"></gencyProcess>
             </el-tab-pane>
-            <el-tab-pane label="已办流程" name="second">
+            <el-tab-pane v-if="controlNode('RXXTU4A5YN')"  label="已办流程" name="second">
                 <finishProcess v-if="activeName=='second'" :form="form"></finishProcess>
             </el-tab-pane>
-            <el-tab-pane label="已发流程" name="third">
+            <el-tab-pane v-if="controlNode('RXXTU4A5YN')"  label="已发流程" name="third">
                 <sentProcess  v-if="activeName=='third'" :form="form"></sentProcess>
             </el-tab-pane>
-            <el-tab-pane label="监控流程" name="fourth">
+            <el-tab-pane v-if="controlNode('NXQ54Q9QP4')" label="监控流程" name="fourth">
                 <monitorProcesses  v-if="activeName=='fourth'" :form="form"></monitorProcesses>
             </el-tab-pane>
             <el-tab-pane label="草稿箱" name="five">
@@ -55,9 +55,19 @@ export default {
         this.form = JSON.parse(JSON.stringify(data))
         console.log(this.form,"hhh")
       })
-      this.activeName=this.$store.getters.activeTab ?this.$store.getters.activeTab:'first'
+      let name=this.controlNode('RXXTU4A5YN')?'first':'five'
+      this.activeName=this.$store.getters.activeTab ?this.$store.getters.activeTab:name
     },
     methods: {
+      controlNode(node) {
+        debugger
+        const permissionId = this.$store.getters.btnPerssion.map(item=>{
+          return item.id
+        })
+
+        let result = permissionId.includes(node)
+        return result
+      },
         handleClick(tab, event) {
           this.$store.commit('setActiveTabIndex',this.activeName)
           this.$emit('clearForm',this.activeName)