From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/monitor/log/localLog.vue | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
index 057a888..54b02e2 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
@@ -25,7 +25,7 @@
type="text"
:loading="downloadLoading"
@click="downLoadLogFile(scope.row)"
- v-if="permissionList.downLoadBtn"
+ v-if="permissionList.downLoadBtn && scope.row.hasChildren!=1"
>涓嬭浇
</el-button>
</template>
@@ -90,21 +90,22 @@
{
label: "鏃ュ織鍚嶇О",
prop: "logName",
- width:'80',
+ width:'160',
},
{
label: "鏃ュ織绫诲瀷",
- prop: "logType"
+ prop: "logType",
+ width:'160'
},
- {
+ /*{
label: "鍒涘缓鏃堕棿",
prop: "createTime",
- width:'180'
- },
+ width:'160'
+ },*/
{
label: "鏈�鍚庝慨鏀规椂闂�",
prop: "lastModifier",
- width:'180'
+ width:'160'
}
]
},
@@ -117,22 +118,15 @@
permissionList() {
return {
delBtn: this.vaildData(this.permission.localLog.localLog_delete, false),
- downLoadBtn: this.vaildData(this.permission.localLog.localLog_dwonload, false)
+ downLoadBtn: this.vaildData(this.permission.localLog.localLog_download, false)
};
}
},
- methods: {
- // 鍒ゆ柇瀹㈡埛绔墍鍦ㄧ殑鎿嶄綔绯荤粺骞冲彴
- isWindows() {
- return navigator.platform.indexOf('Win') !== -1
- },
- // 鏍规嵁鎿嶄綔绯荤粺骞冲彴杩斿洖鐩稿簲鐨勮矾寰勫垎闅旂
- getPathSeparator() {
- return this.isWindows() ? '\\' : '/'
- },
+ methods: {
+
downLoadLogFile(row){
this.downloadLoading = true;
- let logPath = row.hasChildren ? row.logPath:row.logPath+this.getPathSeparator()+row.logName;
+ let logPath = row.hasChildren ? row.logPath:row.logPath+"\\"+row.logName;
downLoadLog(Object.assign({},row,{logFullPaths:logPath})).then(res=>{
func.downloadFileByBlobHandler(res);
this.downloadLoading = false;
--
Gitblit v1.9.3