Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/views/core/reportForms/intrusionTestReport.vue

@@ -227,7 +227,7 @@ export default {
     handleExport() {
   this.download('core/resumptionReport/intrusionTestExport', {
     ...this.queryParams
-  }, `${'【'+this.orgName+'】'+'-报警测试报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-报警测试报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
 

src/views/core/reportForms/monitorAccessReport.vue

@@ -260,7 +260,7 @@ getDefaultOrg(node) {
     handleExport() {
   this.download('core/monitorAccessReport/export', {
     ...this.queryParams
-  }, `${'【'+this.orgName+'】'+'-监控调阅统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-监控调阅统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
     getList() {

src/views/core/reportForms/resumptionReport.vue

@@ -253,7 +253,7 @@ export default {
     handleExport() {
   this.download('core/resumptionReport/export', {
     ...this.queryParams
-  }, `${'【'+this.orgName+'】'+'-履职报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-履职报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
 

src/views/core/reportForms/selfInspectReport.vue

@@ -242,7 +242,7 @@ export default {
     handleExport() {
       this.download('core/safetyInspectReport/selfInspectExport', {
         ...this.queryParams
-      }, `${'【' + this.orgName + '】' + '-网点负责人自查统计报表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
+      }, `${ this.orgName+'-网点负责人自查统计报表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
     },
 
 

src/views/core/reportForms/serviceBankReport.vue

@@ -235,7 +235,7 @@ export default {
     handleExport() {
   this.download('core/resumptionReport/serviceBankExport', {
     ...this.queryParams
-  }, `${'【'+this.orgName+'】'+'-离行式自助银行巡检报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-离行式自助银行巡检报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
 

src/views/core/reportForms/standbyPowerReport.vue

@@ -262,7 +262,7 @@ getDeptTree() {
     handleExport() {
   this.download('core/resumptionReport/standbyPowerExport', {
     ...this.queryParams
-  }, `${'【'+this.orgName+'】'+'-备用电源维护报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-备用电源维护报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
 

src/views/system/user/index.vue

@@ -296,7 +296,7 @@
                   <el-button
                     size="mini"
                     type="text"
-                    v-show="scope.row.isManage == 'Y'"
+                    v-if="scope.row.isManage == 'Y'"
                     icon="el-icon-plus"
                     @click="handleExtend(scope.row)"
                     v-hasPermi="['system:information:edit']"