From 339bafe908099191ea1be4ba5a25184b6534866a Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 19 Mar 2025 10:49:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                            |  4 ++--
 .env.staging                               |  4 ++--
 src/components/viewFile/viewDownload.vue   | 10 ++++++++--
 src/views/record/components/showRecord.vue | 18 ++++++++++++------
 src/views/record/index.vue                 |  3 ++-
 vue.config.js                              |  2 +-
 6 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.env.production b/.env.production
index 34edf29..317d74b 100644
--- a/.env.production
+++ b/.env.production
@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = http://sstt-dangan.ali251.langye.net
-VUE_APP_UPLOAD_API =http://sstt-dangan.ali251.langye.net/api/admin/upload-file
+VUE_APP_BASE_API = ''
+VUE_APP_UPLOAD_API =/api/admin/upload-file
 VUE_APP_PREVIEW_API=https://view.langye.net/preview/onlinePreview
diff --git a/.env.staging b/.env.staging
index e62d129..a1819cf 100644
--- a/.env.staging
+++ b/.env.staging
@@ -4,6 +4,6 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API=http://sstt-dangan.ali251.langye.net
-VUE_APP_UPLOAD_API=http://sstt-dangan.ali251.langye.net/api/admin/upload-file
+VUE_APP_BASE_API=''
+VUE_APP_UPLOAD_API=/api/admin/upload-file
 VUE_APP_PREVIEW_API=https://view.langye.net/preview/onlinePreview
diff --git a/src/components/viewFile/viewDownload.vue b/src/components/viewFile/viewDownload.vue
index 919160c..7feca5e 100644
--- a/src/components/viewFile/viewDownload.vue
+++ b/src/components/viewFile/viewDownload.vue
@@ -187,8 +187,14 @@
           this.$refs.viewFile.typeName = 'file'
           if (item.extension == 'doc' || item.extension == 'DOC') {
             this.$refs.viewFile.url = item.view_url
-          } else {
-            this.$refs.viewFile.url = item.url
+          } else {
+            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
diff --git a/src/views/record/components/showRecord.vue b/src/views/record/components/showRecord.vue
index f25a503..a81977a 100644
--- a/src/views/record/components/showRecord.vue
+++ b/src/views/record/components/showRecord.vue
@@ -13,8 +13,11 @@
               <el-tag>{{form.catalog_name}}</el-tag>
             </div>
             <div v-if="form.area_ids">所属区域：
-              <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 && form.area_ids_details.length>0">
+                <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>
                 </template>
               </template>
@@ -70,7 +73,8 @@
         isShow: false,
         id: '',
         table_name: 'records',
-        form: {},
+        form: {},
+        areaList:[]
       }
     },
     created() {
@@ -95,11 +99,13 @@
         }else{
           this.$refs.viewFile.typeName = 'file'
           if(item.url.includes('doc')||item.url.includes('DOC')){
-
             this.$refs.viewFile.url = item.view_url
           }else{
-
-            this.$refs.viewFile.url = item.url
+            if(item.url.includes('pdf') || item.url.includes('PDF')){
+              window.open(item.url,item.original_name)
+            }else{
+              this.$refs.viewFile.url = item.url
+            }
           }
         }
         this.$refs.viewFile.diaShow = true
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index 8c71b53..172012c 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -637,7 +637,8 @@
       },
       showIndex(type, 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
       },
       resetSearch() {
diff --git a/vue.config.js b/vue.config.js
index c82404e..5201527 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   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',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项