From 4b0f777c60dcf40c24c500611cf203a7c4cb1462 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 07 九月 2022 10:10:27 +0800
Subject: [PATCH] 修复摄像机导入.
---
src/components/CameraLeft.vue | 5 +++--
src/views/hashrate/CameraManage/index.vue | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/components/CameraLeft.vue b/src/components/CameraLeft.vue
index d601e66..a8898a1 100644
--- a/src/components/CameraLeft.vue
+++ b/src/components/CameraLeft.vue
@@ -297,7 +297,8 @@
import TreeMenu from "@/components/giantTree/index"
import LocalVedioList from "@/components/subComponents/LocalVedioList"
import FileUpload from "@/components/subComponents/FileUpload/index"
-import XLSX from "xlsx"
+// import XLSX from "xlsx"
+import * as XLSX from "xlsx/xlsx.mjs"
import { findCluster } from "@/api/clusterManage"
export default {
@@ -639,7 +640,7 @@
}
} catch (e) {
this.menuLoading = false
- this.$message.warning("鏂囦欢绫诲瀷涓嶆纭紒")
+ this.$message.warning("鏂囦欢绫诲瀷涓嶆纭紒" + e)
}
}
fileReader.readAsBinaryString(_file)
diff --git a/src/views/hashrate/CameraManage/index.vue b/src/views/hashrate/CameraManage/index.vue
index 3921bab..d5ca7ec 100644
--- a/src/views/hashrate/CameraManage/index.vue
+++ b/src/views/hashrate/CameraManage/index.vue
@@ -9,7 +9,7 @@
<div class="content">
<div class="column-left" ref="left">
<div class="resize-line" @mousedown="TextWidthChange"></div>
- <CameraLeft :appName="'Camera'" ref="left"></CameraLeft>
+ <CameraLeft :appName="'Camera'" ref="left" style="padding-right:10px"></CameraLeft>
</div>
<div class="right">
<div class="tabs">
--
Gitblit v1.8.0