稽查文件记录及路由跳转查看bug修复
parent
db1d2cc4e1
commit
425782e015
|
@ -21,6 +21,7 @@ router.beforeEach(async(to, from, next) => {
|
||||||
const hasToken = getToken()
|
const hasToken = getToken()
|
||||||
Vue.prototype.toPath = to.path
|
Vue.prototype.toPath = to.path
|
||||||
Vue.prototype.$path = []
|
Vue.prototype.$path = []
|
||||||
|
console.log(11222)
|
||||||
if (hasToken) {
|
if (hasToken) {
|
||||||
if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
|
if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
|
||||||
if (to.path === '/ReviewersResearch') {
|
if (to.path === '/ReviewersResearch') {
|
||||||
|
@ -56,6 +57,9 @@ router.beforeEach(async(to, from, next) => {
|
||||||
/* has no token*/
|
/* has no token*/
|
||||||
if (whiteList.indexOf(to.path) !== -1) {
|
if (whiteList.indexOf(to.path) !== -1) {
|
||||||
// 在免登录whiteList中,直接进入
|
// 在免登录whiteList中,直接进入
|
||||||
|
if (to.path === '/readingDicoms'){
|
||||||
|
OSSclient()
|
||||||
|
}
|
||||||
next()
|
next()
|
||||||
} else {
|
} else {
|
||||||
if (to.path === '/researchForm') {
|
if (to.path === '/researchForm') {
|
||||||
|
|
|
@ -311,6 +311,7 @@
|
||||||
border
|
border
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
size="small"
|
size="small"
|
||||||
|
max-height="400"
|
||||||
>
|
>
|
||||||
<!-- 字段名 -->
|
<!-- 字段名 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -328,10 +329,10 @@
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>
|
<span>
|
||||||
<!-- 查看详情 -->
|
<!-- 查看详情 -->
|
||||||
<a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue">
|
<a v-if="scope.row.DataType === 'OSS' && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue" style="color:#409eff;">
|
||||||
{{$t('common:button:download')}}
|
{{$t('common:button:download')}}
|
||||||
</a>
|
</a>
|
||||||
<a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">
|
<a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue" style="color:#409eff;">
|
||||||
{{$t('trials:auditRecord:title:viewDetail')}}
|
{{$t('trials:auditRecord:title:viewDetail')}}
|
||||||
</a>
|
</a>
|
||||||
<viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
|
<viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
|
||||||
|
@ -357,10 +358,10 @@
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
|
<span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
|
||||||
<!-- 查看详情 -->
|
<!-- 查看详情 -->
|
||||||
<a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue">
|
<a v-if="scope.row.DataType === 'OSS' && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue" style="color:#409eff;">
|
||||||
{{$t('common:button:download')}}
|
{{$t('common:button:download')}}
|
||||||
</a>
|
</a>
|
||||||
<a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">
|
<a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
|
||||||
{{$t('trials:auditRecord:title:viewDetail')}}
|
{{$t('trials:auditRecord:title:viewDetail')}}
|
||||||
</a>
|
</a>
|
||||||
<viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
|
<viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
|
||||||
|
@ -396,7 +397,7 @@
|
||||||
<viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[item.ColumnValue]">
|
<viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[item.ColumnValue]">
|
||||||
<!-- 查看图片 -->
|
<!-- 查看图片 -->
|
||||||
<span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
|
<span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
|
||||||
<img :src="scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
|
<img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
|
||||||
</viewer>
|
</viewer>
|
||||||
<span v-else>{{scope.row[item.ColumnValue]}}</span>
|
<span v-else>{{scope.row[item.ColumnValue]}}</span>
|
||||||
</template>
|
</template>
|
||||||
|
@ -415,7 +416,7 @@
|
||||||
<span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
|
<span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
|
||||||
{{$t('trials:auditRecord:title:viewImage')}}
|
{{$t('trials:auditRecord:title:viewImage')}}
|
||||||
</span>
|
</span>
|
||||||
<img :src="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
|
<img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
|
||||||
</viewer>
|
</viewer>
|
||||||
<span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
|
<span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
|
||||||
</template>
|
</template>
|
||||||
|
@ -619,6 +620,7 @@
|
||||||
border
|
border
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
size="small"
|
size="small"
|
||||||
|
max-height="400"
|
||||||
>
|
>
|
||||||
<!-- 字段名 -->
|
<!-- 字段名 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -644,10 +646,10 @@
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>
|
<span>
|
||||||
<!-- 查看详情 -->
|
<!-- 查看详情 -->
|
||||||
<a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue">
|
<a v-if="scope.row.DataType === 'OSS' && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue" style="color:#409eff;">
|
||||||
{{$t('common:button:download')}}
|
{{$t('common:button:download')}}
|
||||||
</a>
|
</a>
|
||||||
<a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">
|
<a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue" style="color:#409eff;">
|
||||||
{{$t('trials:auditRecord:title:viewDetail')}}
|
{{$t('trials:auditRecord:title:viewDetail')}}
|
||||||
</a>
|
</a>
|
||||||
<viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
|
<viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
|
||||||
|
@ -679,10 +681,10 @@
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
|
<span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
|
||||||
<!-- 查看详情 -->
|
<!-- 查看详情 -->
|
||||||
<a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue">
|
<a v-if="scope.row.DataType === 'OSS' && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue" style="color:#409eff;">
|
||||||
{{$t('common:button:download')}}
|
{{$t('common:button:download')}}
|
||||||
</a>
|
</a>
|
||||||
<a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">
|
<a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
|
||||||
{{$t('trials:auditRecord:title:viewDetail')}}
|
{{$t('trials:auditRecord:title:viewDetail')}}
|
||||||
</a>
|
</a>
|
||||||
<viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
|
<viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
|
||||||
|
@ -725,17 +727,27 @@
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<!-- 查看图片 -->
|
<!-- 查看图片 -->
|
||||||
<span v-if="ite.IsPicture" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
|
<!-- <span v-if="ite.IsPicture" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
|
||||||
{{$t('trials:auditRecord:title:viewImage')}}
|
{{$t('trials:auditRecord:title:viewImage')}}
|
||||||
</span>
|
</span> -->
|
||||||
|
<viewer v-if="ite.IsPicture && ite.IsPicture !== '--'" :ref="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" :images="imagesList">
|
||||||
|
<!-- 查看图片 -->
|
||||||
|
<span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
|
||||||
|
<img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
|
||||||
|
</viewer>
|
||||||
<span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
|
<span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<template v-else slot-scope="scope">
|
<template v-else slot-scope="scope">
|
||||||
<!-- 查看图片 -->
|
<!-- 查看图片 -->
|
||||||
<span v-if="item.IsPicture" @click="openImage(scope.row[item.ColumnValue])" :key="'ChildrenList' + index">
|
<!-- <span v-if="item.IsPicture" @click="openImage(scope.row[item.ColumnValue])" :key="'ChildrenList' + index">
|
||||||
{{$t('trials:auditRecord:title:viewImage')}}
|
{{$t('trials:auditRecord:title:viewImage')}}
|
||||||
</span>
|
</span> -->
|
||||||
|
<viewer v-if="item.IsPicture && item.IsPicture !== '--'" :ref="scope.row[item.ColumnValue]" :images="imagesList" :key="'ChildrenList' + index">
|
||||||
|
<!-- 查看图片 -->
|
||||||
|
<span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
|
||||||
|
<img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
|
||||||
|
</viewer>
|
||||||
<span v-else :key="'ChildrenList' + index">{{scope.row[item.ColumnValue]}}</span>
|
<span v-else :key="'ChildrenList' + index">{{scope.row[item.ColumnValue]}}</span>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
|
@ -1181,7 +1193,7 @@ export default {
|
||||||
item.Enum = this.$i18n.locale === 'zh' ? v.ValueCN : v.Value
|
item.Enum = this.$i18n.locale === 'zh' ? v.ValueCN : v.Value
|
||||||
this[auditData].push(item)
|
this[auditData].push(item)
|
||||||
})
|
})
|
||||||
console.log(this[auditData])
|
console.log(this[auditData],this.tableListData,this.tableList)
|
||||||
},
|
},
|
||||||
getJSON(row) {
|
getJSON(row) {
|
||||||
return new Promise(resolve => {
|
return new Promise(resolve => {
|
||||||
|
|
Loading…
Reference in New Issue