From a2e6a743111ec156a1f3d56720cd5dd20165ae8a Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 18 Dec 2023 17:41:53 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(=E6=B3=95=E8=A7=84=E5=BA=93=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85):=20=E7=BB=9F=E4=B8=80=E9=A2=84=E8=A7=88=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherBussStandardDetails/index.vue  |  9 +++++++++
 src/pages/details/otherLawsStandDetails/index.vue     |  9 +++++++++
 src/pages/details/otherStandardDetails/index.vue      | 11 +++++++++++
 .../standardForComments/pags/consultationDetails.vue  |  5 +++++
 4 files changed, 34 insertions(+)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index cf1457fc6..8d3d622d3 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable -->
 <!--企标详情页-->
 <template>
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
@@ -1341,6 +1342,7 @@
   </div>
 </template>
 <script>
+/* eslint-disable */
 import PutQuestionButton from '@/components/PutQuestionButton'
 import {dateFormat} from '../../../common/date'
 import { getBusStandFileByAttId } from 'api/process'
@@ -2590,6 +2592,12 @@ export default {
       })
     },
     openFileInPdf (attId, oldFileName) {
+      if (this.$hasPermission('43ae63abc1b64e6bd5cf3bb75b423bc2')) {
+        this.$preview(attId)
+      } else {
+        this.$message.error('没有在线预览文档权限！')
+      }
+      /*
       // 判断是否是图片格式，图片格式不预览，直接下载
       let index1 = oldFileName.lastIndexOf('.')
       let index2 = oldFileName.length
@@ -2680,6 +2688,7 @@ export default {
       } else {
         this.$message.error('没有在线预览文档权限！')
       }
+       */
       this.$http.get('lawss/sarBussionessStand/logBuss', {
         standCode: this.sarStandardsInfoEO.standCode,
         standName: this.sarStandardsInfoEO.standName
diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue
index a6cb58560..7fcebf331 100644
--- a/src/pages/details/otherLawsStandDetails/index.vue
+++ b/src/pages/details/otherLawsStandDetails/index.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable -->
 <!--政策详情页-->
 <template>
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
@@ -906,6 +907,7 @@
   </div>
 </template>
 <script>
+/* eslint-disable */
 import PutQuestionButton from '@/components/PutQuestionButton'
 import {dateFormat} from '../../../common/date'
 import { getBusStandFileByAttId } from 'api/process'
@@ -1511,6 +1513,12 @@ export default {
       })
     },
     openFileInPdf (attId, oldFileName) {
+      if (this.$hasPermission('fd83032ae5f41a0021b00e93c88edbbg')) {
+        this.$preview(attId)
+      } else {
+        this.$message.error('没有在线预览文档权限！')
+      }
+      /*
       // 判断是否是图片格式，图片格式不预览，直接下载
       let index1 = oldFileName.lastIndexOf('.')
       let index2 = oldFileName.length
@@ -1601,6 +1609,7 @@ export default {
       } else {
         this.$message.error('没有在线预览文档权限！')
       }
+       */
     },
     showItemsModel (attField) {
       this.fileType = attField
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index c398480cd..115aac104 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable -->
 <!--国内标准法规详情页-->
 <template>
   <div :class="{'hidden': !isMoreAwayBtn}" class="other-standard-details v-class">
@@ -1820,6 +1821,7 @@
 </div>
 </template>
 <script>
+/* eslint-disable */
 import PutQuestionButton from '@/components/PutQuestionButton'
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
@@ -3269,6 +3271,14 @@ export default {
       })
     },
     openFileInPdf(attId, oldFileName) {
+      if (this.$route.params.pageType === 'INLAND_STAND' && this.$hasPermission('2d6ab9d465ab73d415194e1ca4313793')) {
+        this.$preview(attId)
+      } else if (this.$route.params.pageType === 'FOREIGN_STAND' && this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98')) {
+        this.$preview(attId)
+      } else {
+        this.$message.error('没有在线预览文档权限！')
+      }
+      /*
       // 判断是否是图片格式，图片格式不预览，直接下载
       let index1 = oldFileName.lastIndexOf('.')
       let index2 = oldFileName.length
@@ -3391,6 +3401,7 @@ export default {
           this.$message.error('没有在线预览文档权限！')
         }
       }
+       */
       if (this.$route.params.pageType === 'INLAND_STAND') {
         let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
         this.$http.get('sarStandardsInfo/sar-standards-info/logInvalid', {
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 7359714aa..74678fe3f 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable -->
 <!--征求意见详情-->
 <template>
   <div class="consultationDetails">
@@ -270,6 +271,7 @@
 </template>
 
 <script>
+/* eslint-disable */
 import { mapGetters } from "vuex";
 
 export default {
@@ -570,7 +572,10 @@ export default {
         })
       },
       handleQueryPdf(file){
+        this.$preview(file.attId)
+        /*
         window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId))
+         */
       },
       isVisible(e) {
         if (e.target.visibilityState === "visible") {

From 51a792c8ae20e084bbf24acf3436fe81f4c2dddf Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Mon, 18 Dec 2023 17:53:40 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feature:=20=E4=BF=AE=E6=94=B9eslint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0f0a4b516..fc3bc36a5 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -47,7 +47,7 @@ module.exports = {
     "padded-blocks": ["error", "never"], // 代码块内部前后不要有空行
     "semi-spacing": ["error", { "before": false, "after": true }], // 分号前面不能有空格，后面需要有空格 var foo   ;   var bar; => var foo; var bar;
     'no-multiple-empty-lines': [ 'error', { max: 1 }], // 最多只能有一行空行
-    'no-return-assign': ['error', 'except-parens'], // 禁止在 return 语句中使用赋值语句
+    'no-return-assign': ['off', 'except-parens'], // 禁止在 return 语句中使用赋值语句
     'no-self-assign': 'error', // 禁止自我赋值
     'no-self-compare': 'error', // 禁止自身比较
     // "newline-per-chained-call": ["error", { "ignoreChainWithDepth": 1 }], // 链式调用时，每个调用都需要换行

From 456875cc348feda810b6ccf6a421a0a4a561d2cd Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 19 Dec 2023 13:35:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/preview/index.js | 107 ++++++++++++++++++++++++++----------
 1 file changed, 79 insertions(+), 28 deletions(-)

diff --git a/src/common/preview/index.js b/src/common/preview/index.js
index 4176911a2..db62b2b1d 100644
--- a/src/common/preview/index.js
+++ b/src/common/preview/index.js
@@ -1,35 +1,86 @@
 /**
  *  文件预览
  */
-import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
+import { onlyOfficeUrl, kkFileViewUrl } from '@/sysConfig'
 import { getBusStandFileByAttId } from 'api/process'
-let Base64 = require('js-base64').Base64;
+const Base64 = require('js-base64').Base64;
 import store from '@/store'
-import { Loading  } from "element-ui";
+import { Loading  } from 'element-ui';
+import axios from '@/common/axiosV2'
 
-export default attId => {
-    const loading = Loading.service({
-        lock: true,
-        text: '正在加载文件',
-        spinner: 'el-icon-loading',
-    })
-    getBusStandFileByAttId({
-        attId
-    }).then(res => {
-        if(res){
-            const editFileInfo = res.data
-            if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
-                window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
-                window.open('./static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-                const nowTime = new Date().getTime()
-                // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                window.open(kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)) + '&watermarkTxt=' + encodeURIComponent(store.getters.userInfo.userName));
-
-            }
-        }
-    }).finally(() => {
-        loading.close()
-    })
+// 获取转换为pdf的文件
+function queryConvertAtt (data) {
+  return axios({
+    url: 'api/lawss/sarLawsFile/queryConvertAtt',
+    method: 'get',
+    params: data
+  })
 }
+
+async function preview (attId) {
+  const loading = Loading.service({
+    lock: true,
+    text: '正在加载文件',
+    spinner: 'el-icon-loading',
+  })
+  const res = await getBusStandFileByAttId({ attId })
+  if (res.ok && res.data) {
+    const file = res.data
+    if (file.fileSuffix.toLowerCase() === 'pdg') {
+      window.open('book://ssreader/e0?url=' + file.downLoadUrl)
+    } else if (file.fileSuffix.toLowerCase() === 'pdf') {
+      window.open('./static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.id))
+    } else {
+      // onlyoffice在线编辑文件转换为pdf预览 -> kkfileview预览乱码
+      if (file.onlined && file.onlined === 1) {
+        const res = await queryConvertAtt({ attId })
+        if (res.ok && res.data) {
+          window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
+        } else {
+          this.$message.error('文档未转换成功或本地读取不到该文档')
+        }
+      } else {
+        window.open(kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(file.downLoadUrl)) + '&watermarkTxt=' + encodeURIComponent(store.getters.userInfo.userName));
+      }
+    }
+  }
+  loading.close()
+}
+
+export default preview;
+// export default (attId) => {
+//   const loading = Loading.service({
+//     lock: true,
+//     text: '正在加载文件',
+//     spinner: 'el-icon-loading',
+//   })
+//   getBusStandFileByAttId({
+//     attId
+//   }).then(res => {
+//     if(res) {
+//       const editFileInfo = res.data
+//       if(editFileInfo.fileSuffix.toLowerCase() === 'pdg') {
+//         window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
+//       }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf') {
+//         window.open('./static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
+//       }else {
+//         // const nowTime = new Date().getTime()
+//         // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+//         if (res.data && res.data.onlined === 1) {
+//           queryConvertAtt({ attId }).then(res => {
+//             if (res.ok && res.data) {
+//               window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
+//             } else {
+//               this.$message.error('文档未转换成功或本地读取不到该文档')
+//             }
+//           }).catch(() => {
+//             this.$message.error('文档未转换成功或本地读取不到该文档')
+//           })
+//         }
+//         window.open(kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)) + '&watermarkTxt=' + encodeURIComponent(store.getters.userInfo.userName));
+//       }
+//     }
+//   }).finally(() => {
+//     loading.close()
+//   })
+// }

From 172f013ce978fa16575f0fd619130c691dbd5a1d Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Wed, 20 Dec 2023 10:34:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85):=20=E7=BB=9F=E4=B8=80=E9=A2=84=E8=A7=88=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/preview/index.js         | 7 ++++++-
 src/pages/phone/domesticDetails.vue | 3 +++
 src/pages/phone/zlzxDetails.vue     | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/common/preview/index.js b/src/common/preview/index.js
index db62b2b1d..44c37558d 100644
--- a/src/common/preview/index.js
+++ b/src/common/preview/index.js
@@ -7,6 +7,7 @@ const Base64 = require('js-base64').Base64;
 import store from '@/store'
 import { Loading  } from 'element-ui';
 import axios from '@/common/axiosV2'
+import isMobile from '@/store/isMobile'
 
 // 获取转换为pdf的文件
 function queryConvertAtt (data) {
@@ -27,7 +28,11 @@ async function preview (attId) {
   if (res.ok && res.data) {
     const file = res.data
     if (file.fileSuffix.toLowerCase() === 'pdg') {
-      window.open('book://ssreader/e0?url=' + file.downLoadUrl)
+      if (isMobile()) {
+        this.$message.warning('pdg文件,不支持手机端预览')
+      } else {
+        window.open('book://ssreader/e0?url=' + file.downLoadUrl)
+      }
     } else if (file.fileSuffix.toLowerCase() === 'pdf') {
       window.open('./static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.id))
     } else {
diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue
index fa6a8bef2..96215a644 100644
--- a/src/pages/phone/domesticDetails.vue
+++ b/src/pages/phone/domesticDetails.vue
@@ -2836,6 +2836,8 @@
                 })
             },
             openFileInPdf(attId, oldFileName) {
+              this.$preview(attId)
+                /*
                 // 判断是否是图片格式，图片格式不预览，直接下载
                 let index1 = oldFileName.lastIndexOf('.')
                 let index2 = oldFileName.length
@@ -2878,6 +2880,7 @@
                 } else {
                     this.$message.warning('PDG文件,不支持手机端预览')
                 }
+                */
             },
             getFileInfo(fileId) {
                 Axios({
diff --git a/src/pages/phone/zlzxDetails.vue b/src/pages/phone/zlzxDetails.vue
index 361446a2c..d14561c85 100644
--- a/src/pages/phone/zlzxDetails.vue
+++ b/src/pages/phone/zlzxDetails.vue
@@ -1269,6 +1269,8 @@
         })
       },
       openFileInPdf(attId, oldFileName) {
+        this.$preview(attId)
+        /*
         // 判断是否是图片格式，图片格式不预览，直接下载
         let index1 = oldFileName.lastIndexOf('.')
         let index2 = oldFileName.length
@@ -1298,6 +1300,7 @@
         }else {
           this.$message.warning('PDG文件,不支持手机端预览')
         }
+         */
       },
       showItemsModel(attField) {
         if (attField) {