DZ/faw-report-library-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】修改bug

Browse Source
This commit is contained in:
zhoulingpo
2023-05-17 10:19:42 +08:00
parent 1c2ee5a4fc
commit 9c60d0ea96
10 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Header.vue
+1 -1
View File
@@ -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="/">
src/router/modules/report.js
+1 -1
View File
@@ -11,7 +11,7 @@ const routes = [
name: 'ReportList',
component: () => import('../../views/Report/ReportList.vue'),
meta: {
crumb: ['报告列表']
crumb: ['报告查询']
}
},
// 报告详情
src/views/Layout.vue
+1 -1
View File
@@ -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)
src/views/Login.vue
+1 -1
View File
@@ -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('暂无权限，请联系管理员授权')
src/views/Report/ReportDetail.vue
+1
View File
@@ -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 => {
src/views/Report/ReportList.vue
+6 -4
View File
@@ -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() {
src/views/Report/ReportManager.vue
+3 -2
View File
@@ -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) {
src/views/System/MenuManager.vue
+1 -1
View File
@@ -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
})
})
src/views/reportProcess/components/reportForm.vue
+1 -1
View File
@@ -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"
src/views/userCenter/processCenter/tabs.vue
+15 -5
View File
@@ -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)