master
lion 9 months ago
parent 62dacd901d
commit 339bafe908

@ -2,6 +2,6 @@
ENV = 'production' ENV = 'production'
# base api # base api
VUE_APP_BASE_API = http://sstt-dangan.ali251.langye.net VUE_APP_BASE_API = ''
VUE_APP_UPLOAD_API =http://sstt-dangan.ali251.langye.net/api/admin/upload-file VUE_APP_UPLOAD_API =/api/admin/upload-file
VUE_APP_PREVIEW_API=https://view.langye.net/preview/onlinePreview VUE_APP_PREVIEW_API=https://view.langye.net/preview/onlinePreview

@ -4,6 +4,6 @@ NODE_ENV = production
ENV = 'staging' ENV = 'staging'
# base api # base api
VUE_APP_BASE_API=http://sstt-dangan.ali251.langye.net VUE_APP_BASE_API=''
VUE_APP_UPLOAD_API=http://sstt-dangan.ali251.langye.net/api/admin/upload-file VUE_APP_UPLOAD_API=/api/admin/upload-file
VUE_APP_PREVIEW_API=https://view.langye.net/preview/onlinePreview VUE_APP_PREVIEW_API=https://view.langye.net/preview/onlinePreview

@ -187,8 +187,14 @@
this.$refs.viewFile.typeName = 'file' this.$refs.viewFile.typeName = 'file'
if (item.extension == 'doc' || item.extension == 'DOC') { if (item.extension == 'doc' || item.extension == 'DOC') {
this.$refs.viewFile.url = item.view_url this.$refs.viewFile.url = item.view_url
} else { } else {
this.$refs.viewFile.url = item.url if(item.extension == 'pdf' || item.extension == 'PDF'){
let mywindow = window.open(item.url,item.original_name)
mywindow.focus()
return
}else{
this.$refs.viewFile.url = item.url
}
} }
} }
this.$refs.viewFile.diaShow = true this.$refs.viewFile.diaShow = true

@ -13,8 +13,11 @@
<el-tag>{{form.catalog_name}}</el-tag> <el-tag>{{form.catalog_name}}</el-tag>
</div> </div>
<div v-if="form.area_ids"> <div v-if="form.area_ids">
<template v-if="form.area_ids_details && form.area_ids_details.length>0"> <template v-if="form.area_ids_details && form.area_ids_details.length>0">
<template v-for="(item,index) in form.area_ids_details"> <template v-if="form.area_ids_details.length===areaList.length">
<el-tag style="margin-right:5px">全部区域</el-tag>
</template>
<template v-else v-for="(item,index) in form.area_ids_details">
<el-tag style="margin-right:5px">{{item.name}}</el-tag> <el-tag style="margin-right:5px">{{item.name}}</el-tag>
</template> </template>
</template> </template>
@ -70,7 +73,8 @@
isShow: false, isShow: false,
id: '', id: '',
table_name: 'records', table_name: 'records',
form: {}, form: {},
areaList:[]
} }
}, },
created() { created() {
@ -95,11 +99,13 @@
}else{ }else{
this.$refs.viewFile.typeName = 'file' this.$refs.viewFile.typeName = 'file'
if(item.url.includes('doc')||item.url.includes('DOC')){ if(item.url.includes('doc')||item.url.includes('DOC')){
this.$refs.viewFile.url = item.view_url this.$refs.viewFile.url = item.view_url
}else{ }else{
if(item.url.includes('pdf') || item.url.includes('PDF')){
this.$refs.viewFile.url = item.url window.open(item.url,item.original_name)
}else{
this.$refs.viewFile.url = item.url
}
} }
} }
this.$refs.viewFile.diaShow = true this.$refs.viewFile.diaShow = true

@ -637,7 +637,8 @@
}, },
showIndex(type, id) { showIndex(type, id) {
this.$refs.showRecord.id = id this.$refs.showRecord.id = id
this.$refs.showRecord.type = type this.$refs.showRecord.type = type
this.$refs.showRecord.areaList = this.areaList
this.$refs.showRecord.isShow = true this.$refs.showRecord.isShow = true
}, },
resetSearch() { resetSearch() {

@ -25,7 +25,7 @@ module.exports = {
* Detail: https://cli.vuejs.org/config/#publicpath * Detail: https://cli.vuejs.org/config/#publicpath
*/ */
publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin', publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin_test', outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin',
assetsDir: 'static', assetsDir: 'static',
css: { css: {
loaderOptions: { // 向 CSS 相关的 loader 传递选项 loaderOptions: { // 向 CSS 相关的 loader 传递选项

Loading…
Cancel
Save