Parcourir la source

1.0.85 大华时增加报表归档

liuyanpeng il y a 2 ans
Parent
commit
e53f23562b

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "pc-component-v3",
-  "version": "1.0.84",
+  "version": "1.0.85",
   "description": "",
   "main": "dist/pc-component-v3.js",
   "scripts": {

+ 1 - 1
packages/process/src/ProcessReportArchive.vue

@@ -150,7 +150,7 @@ export default {
         this.title = this.processReportResult.processReportName;
       }
 
-      var loginInfoJson = localStorage.getItem('json_LoginInfo');
+      var loginInfoJson = localStorage.getItem('#LoginInfo');
       var loginInfo = JSON.parse(loginInfoJson);
       if (loginInfo != null) {
         _self.userName = loginInfo.userName;

+ 13 - 6
packages/process/src/ProcessReportResultPreview.vue

@@ -28,10 +28,10 @@
         Excel报表
       </a>
     </div>
-    <!-- <ProcessReportArchive
-      v-if="processReportResult.reportResults != undefined"
+    <ProcessReportArchive
+      v-if="processReportResult.reportResults != undefined && loginClientName == '浙江大华'"
       :process-report-result="processReportResult"
-    /> -->
+    />
 
     <template
       v-for="(reportResult, index) in processReportResult.reportResults"
@@ -169,13 +169,13 @@ import Common from '../../common/Common.js';
 import Uuid from '../../common/Uuid.js';
 import Notify from '../../common/Notify.js';
 import DownloadService from '../../common/DownloadService.js';
-// import ProcessReportArchive from './ProcessReportArchive.vue';
+import ProcessReportArchive from './ProcessReportArchive.vue';
 
 export default {
   name: 'ProcessReportResultPreview',
 
   components: {
-    // ProcessReportArchive,
+    ProcessReportArchive,
   },
 
   props: {
@@ -194,9 +194,9 @@ export default {
   data: function () {
     return {
       'uuid': Uuid.createUUID(),
+      loginClientName: '',
     };
   },
-
   computed: {
     // 是否文本区域显示流程结果
     isTextAreaShowProcessResult: function () {
@@ -219,6 +219,13 @@ export default {
     },
 
   },
+  mounted: function () {
+    const loginInfoJson = localStorage.getItem('#LoginInfo');
+    const loginInfo = JSON.parse(loginInfoJson);
+    if (loginInfo != null) {
+      this.loginClientName = loginInfo.loginClientName;
+    }
+  },
 
   methods: {
     /**