From d365829b14ca4256d39694b9cdcd43bad0ad8595 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 11 二月 2022 18:18:39 +0800
Subject: [PATCH] bug修复
---
public/images/settings/简约图标/1仰卧检测.png | 0
src/pages/settings/views/clusterManagement.vue | 2
vue.config.js | 4
src/pages/desktop/index/components/DFrame.vue | 24 +
public/images/settings/简约图标/2个体静止.png | 0
src/pages/settings/components/AuthorizationSetting.vue | 58 ++++
src/pages/settings/index/index.vue | 29 ++
public/images/settings/简约图标/6车辆检测.png | 0
src/pages/ai/index/App.vue | 11
src/pages/ai/index/detail.vue | 81 +++++--
public/images/settings/面性图标/4安全帽检测.png | 0
public/images/settings/简约图标/8人体结构化.png | 0
public/images/settings/面性图标/8人体结构化.png | 0
public/images/settings/面性图标/6车辆检测.png | 0
public/images/settings/简约图标/3安全警戒.png | 0
public/images/settings/面性图标/2个体静止.png | 0
public/images/settings/简约图标/7抽烟.png | 0
public/images/settings/简约图标/4安全帽检测.png | 0
public/images/settings/面性图标/7抽烟.png | 0
src/components/subComponents/FileUpload/file.vue | 321 +++++++++++++++-------------
/dev/null | 0
public/images/settings/面性图标/3安全警戒.png | 0
src/pages/vindicate/index/App.vue | 38 ++-
public/images/settings/面性图标/5奔跑.png | 0
src/api/system.ts | 15 +
src/pages/settings/views/generalSettings.vue | 65 ++++-
public/images/settings/简约图标/5奔跑.png | 0
public/images/settings/面性图标/1仰卧检测.png | 0
28 files changed, 421 insertions(+), 227 deletions(-)
diff --git "a/public/images/settings/\345\256\236\346\227\266\347\233\221\346\216\247.png" "b/public/images/settings/\345\256\236\346\227\266\347\233\221\346\216\247.png"
deleted file mode 100644
index a656caa..0000000
--- "a/public/images/settings/\345\256\236\346\227\266\347\233\221\346\216\247.png"
+++ /dev/null
Binary files differ
diff --git "a/public/images/settings/\346\225\260\346\215\256\345\217\257\350\247\206\345\214\226.png" "b/public/images/settings/\346\225\260\346\215\256\345\217\257\350\247\206\345\214\226.png"
deleted file mode 100644
index fd700f4..0000000
--- "a/public/images/settings/\346\225\260\346\215\256\345\217\257\350\247\206\345\214\226.png"
+++ /dev/null
Binary files differ
diff --git "a/public/images/settings/\346\225\260\346\215\256\346\216\250\351\200\201.png" "b/public/images/settings/\346\225\260\346\215\256\346\216\250\351\200\201.png"
deleted file mode 100644
index 20580ac..0000000
--- "a/public/images/settings/\346\225\260\346\215\256\346\216\250\351\200\201.png"
+++ /dev/null
Binary files differ
diff --git "a/public/images/settings/\346\225\260\346\215\256\346\240\210\351\205\215\347\275\256.png" "b/public/images/settings/\346\225\260\346\215\256\346\240\210\351\205\215\347\275\256.png"
deleted file mode 100644
index 814624f..0000000
--- "a/public/images/settings/\346\225\260\346\215\256\346\240\210\351\205\215\347\275\256.png"
+++ /dev/null
Binary files differ
diff --git "a/public/images/settings/\346\227\245\345\277\227\347\256\241\347\220\206.png" "b/public/images/settings/\346\227\245\345\277\227\347\256\241\347\220\206.png"
deleted file mode 100644
index 570f60a..0000000
--- "a/public/images/settings/\346\227\245\345\277\227\347\256\241\347\220\206.png"
+++ /dev/null
Binary files differ
diff --git "a/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/1\344\273\260\345\215\247\346\243\200\346\265\213.png" "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/1\344\273\260\345\215\247\346\243\200\346\265\213.png"
new file mode 100644
index 0000000..3a63bcf
--- /dev/null
+++ "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/1\344\273\260\345\215\247\346\243\200\346\265\213.png"
Binary files differ
diff --git "a/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/2\344\270\252\344\275\223\351\235\231\346\255\242.png" "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/2\344\270\252\344\275\223\351\235\231\346\255\242.png"
new file mode 100644
index 0000000..d197c2b
--- /dev/null
+++ "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/2\344\270\252\344\275\223\351\235\231\346\255\242.png"
Binary files differ
diff --git "a/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/3\345\256\211\345\205\250\350\255\246\346\210\222.png" "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/3\345\256\211\345\205\250\350\255\246\346\210\222.png"
new file mode 100644
index 0000000..19a63b2
--- /dev/null
+++ "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/3\345\256\211\345\205\250\350\255\246\346\210\222.png"
Binary files differ
diff --git "a/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/4\345\256\211\345\205\250\345\270\275\346\243\200\346\265\213.png" "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/4\345\256\211\345\205\250\345\270\275\346\243\200\346\265\213.png"
new file mode 100644
index 0000000..39e41fe
--- /dev/null
+++ "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/4\345\256\211\345\205\250\345\270\275\346\243\200\346\265\213.png"
Binary files differ
diff --git "a/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/5\345\245\224\350\267\221.png" "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/5\345\245\224\350\267\221.png"
new file mode 100644
index 0000000..70a9c8d
--- /dev/null
+++ "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/5\345\245\224\350\267\221.png"
Binary files differ
diff --git "a/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/6\350\275\246\350\276\206\346\243\200\346\265\213.png" "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/6\350\275\246\350\276\206\346\243\200\346\265\213.png"
new file mode 100644
index 0000000..98178e2
--- /dev/null
+++ "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/6\350\275\246\350\276\206\346\243\200\346\265\213.png"
Binary files differ
diff --git "a/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/7\346\212\275\347\203\237.png" "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/7\346\212\275\347\203\237.png"
new file mode 100644
index 0000000..4efb9ba
--- /dev/null
+++ "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/7\346\212\275\347\203\237.png"
Binary files differ
diff --git "a/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/8\344\272\272\344\275\223\347\273\223\346\236\204\345\214\226.png" "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/8\344\272\272\344\275\223\347\273\223\346\236\204\345\214\226.png"
new file mode 100644
index 0000000..12eea8a
--- /dev/null
+++ "b/public/images/settings/\347\256\200\347\272\246\345\233\276\346\240\207/8\344\272\272\344\275\223\347\273\223\346\236\204\345\214\226.png"
Binary files differ
diff --git "a/public/images/settings/\347\263\273\347\273\237\350\256\276\347\275\256.png" "b/public/images/settings/\347\263\273\347\273\237\350\256\276\347\275\256.png"
deleted file mode 100644
index e438c3f..0000000
--- "a/public/images/settings/\347\263\273\347\273\237\350\256\276\347\275\256.png"
+++ /dev/null
Binary files differ
diff --git "a/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/1\344\273\260\345\215\247\346\243\200\346\265\213.png" "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/1\344\273\260\345\215\247\346\243\200\346\265\213.png"
new file mode 100644
index 0000000..6d5973a
--- /dev/null
+++ "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/1\344\273\260\345\215\247\346\243\200\346\265\213.png"
Binary files differ
diff --git "a/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/2\344\270\252\344\275\223\351\235\231\346\255\242.png" "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/2\344\270\252\344\275\223\351\235\231\346\255\242.png"
new file mode 100644
index 0000000..52ce646
--- /dev/null
+++ "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/2\344\270\252\344\275\223\351\235\231\346\255\242.png"
Binary files differ
diff --git "a/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/3\345\256\211\345\205\250\350\255\246\346\210\222.png" "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/3\345\256\211\345\205\250\350\255\246\346\210\222.png"
new file mode 100644
index 0000000..25dfb36
--- /dev/null
+++ "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/3\345\256\211\345\205\250\350\255\246\346\210\222.png"
Binary files differ
diff --git "a/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/4\345\256\211\345\205\250\345\270\275\346\243\200\346\265\213.png" "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/4\345\256\211\345\205\250\345\270\275\346\243\200\346\265\213.png"
new file mode 100644
index 0000000..3e69be0
--- /dev/null
+++ "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/4\345\256\211\345\205\250\345\270\275\346\243\200\346\265\213.png"
Binary files differ
diff --git "a/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/5\345\245\224\350\267\221.png" "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/5\345\245\224\350\267\221.png"
new file mode 100644
index 0000000..3fab01e
--- /dev/null
+++ "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/5\345\245\224\350\267\221.png"
Binary files differ
diff --git "a/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/6\350\275\246\350\276\206\346\243\200\346\265\213.png" "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/6\350\275\246\350\276\206\346\243\200\346\265\213.png"
new file mode 100644
index 0000000..c15a210
--- /dev/null
+++ "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/6\350\275\246\350\276\206\346\243\200\346\265\213.png"
Binary files differ
diff --git "a/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/7\346\212\275\347\203\237.png" "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/7\346\212\275\347\203\237.png"
new file mode 100644
index 0000000..ed5750c
--- /dev/null
+++ "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/7\346\212\275\347\203\237.png"
Binary files differ
diff --git "a/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/8\344\272\272\344\275\223\347\273\223\346\236\204\345\214\226.png" "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/8\344\272\272\344\275\223\347\273\223\346\236\204\345\214\226.png"
new file mode 100644
index 0000000..7dd068e
--- /dev/null
+++ "b/public/images/settings/\351\235\242\346\200\247\345\233\276\346\240\207/8\344\272\272\344\275\223\347\273\223\346\236\204\345\214\226.png"
Binary files differ
diff --git a/src/api/system.ts b/src/api/system.ts
index 301d097..b7e5f90 100644
--- a/src/api/system.ts
+++ b/src/api/system.ts
@@ -517,3 +517,18 @@
})
}
+export const getAuthInfo = () => {
+ return request({
+ url: "/data/api-v/sysset/showAuthInfo",
+ method: "get"
+ })
+}
+
+export const setAuthInfo = (data: any) => {
+ return request({
+ url: "/data/api-v/sysset/setAuthInfo",
+ method: "post",
+ data
+ })
+}
+
diff --git a/src/components/subComponents/FileUpload/file.vue b/src/components/subComponents/FileUpload/file.vue
index 1d8c5c7..3b6bd00 100644
--- a/src/components/subComponents/FileUpload/file.vue
+++ b/src/components/subComponents/FileUpload/file.vue
@@ -24,28 +24,36 @@
:extension="extension"
:file-category="fileCategory"
>
- <div class="uploader-file-progress" :class="progressingClass" :style="progressStyle"></div>
+ <div
+ class="uploader-file-progress"
+ :class="progressingClass"
+ :style="progressStyle"
+ ></div>
<div class="uploader-file-info">
<div class="uploader-file-name">
<i class="uploader-file-icon" :icon="fileCategory"></i>
- {{file.name}}
+ {{ file.name }}
</div>
- <div class="uploader-file-size">{{formatedSize}}</div>
+ <div class="uploader-file-size">{{ formatedSize }}</div>
<div class="uploader-file-meta"></div>
<div class="uploader-file-status">
- <span v-show="status !== 'uploading'">{{statusText}}</span>
+ <span v-show="status !== 'uploading'">{{ statusText }}</span>
<span v-show="status === 'uploading'">
- <span>{{progressStyle.progress}}</span>
- <em>{{formatedAverageSpeed}}</em>
+ <span>{{ progressStyle.progress }}</span>
+ <em>{{ formatedAverageSpeed }}</em>
- <i> {{formatedTimeRemaining}}</i>
+ <i> {{ formatedTimeRemaining }}</i>
</span>
</div>
<div class="uploader-file-actions">
<span class="uploader-file-pause" @click="pause"></span>
<span class="uploader-file-resume" @click="resume">锔�</span>
- <span class="uploader-file-retry" @click="retry"></span>
- <span class="uploader-file-remove" @click="remove"></span>
+ <el-tooltip effect="dark" content="閲嶆柊涓婁紶" placement="bottom">
+ <span class="uploader-file-retry" @click="retry"></span>
+ </el-tooltip>
+ <el-tooltip effect="dark" content="鍒犻櫎" placement="bottom">
+ <span class="uploader-file-remove" @click="remove"></span>
+ </el-tooltip>
</div>
</div>
</slot>
@@ -53,11 +61,11 @@
</template>
<script>
-import Uploader from 'simple-uploader.js'
-import events from './common/file-events'
-import { secondsToStr } from './common/utils'
+import Uploader from "simple-uploader.js";
+import events from "./common/file-events";
+import { secondsToStr } from "./common/utils";
-const COMPONENT_NAME = 'uploader-file'
+const COMPONENT_NAME = "uploader-file";
export default {
name: COMPONENT_NAME,
@@ -65,13 +73,13 @@
file: {
type: Object,
default() {
- return {}
- }
+ return {};
+ },
},
list: {
type: Boolean,
- default: false
- }
+ default: false,
+ },
},
data() {
return {
@@ -83,231 +91,248 @@
isComplete: false,
isUploading: false,
size: 0,
- formatedSize: '',
+ formatedSize: "",
uploadedSize: 0,
progress: 0,
timeRemaining: 0,
- type: '',
- extension: '',
- progressingClass: ''
- }
+ type: "",
+ extension: "",
+ progressingClass: "",
+ };
},
computed: {
fileCategory() {
- const extension = this.extension
- const isFolder = this.file.isFolder
- let type = isFolder ? 'folder' : 'unknown'
- const categoryMap = this.file.uploader.opts.categoryMap
+ const extension = this.extension;
+ const isFolder = this.file.isFolder;
+ let type = isFolder ? "folder" : "unknown";
+ const categoryMap = this.file.uploader.opts.categoryMap;
const typeMap = categoryMap || {
- image: ['gif', 'jpg', 'jpeg', 'png', 'bmp', 'webp'],
- video: ['mp4', 'm3u8', 'rmvb', 'avi', 'swf', '3gp', 'mkv', 'flv'],
- audio: ['mp3', 'wav', 'wma', 'ogg', 'aac', 'flac'],
- document: ['doc', 'txt', 'docx', 'pages', 'epub', 'pdf', 'numbers', 'csv', 'xls', 'xlsx', 'keynote', 'ppt', 'pptx']
- }
+ image: ["gif", "jpg", "jpeg", "png", "bmp", "webp"],
+ video: ["mp4", "m3u8", "rmvb", "avi", "swf", "3gp", "mkv", "flv"],
+ audio: ["mp3", "wav", "wma", "ogg", "aac", "flac"],
+ document: [
+ "doc",
+ "txt",
+ "docx",
+ "pages",
+ "epub",
+ "pdf",
+ "numbers",
+ "csv",
+ "xls",
+ "xlsx",
+ "keynote",
+ "ppt",
+ "pptx",
+ ],
+ };
Object.keys(typeMap).forEach((_type) => {
- const extensions = typeMap[_type]
+ const extensions = typeMap[_type];
if (extensions.indexOf(extension) > -1) {
- type = _type
+ type = _type;
}
- })
- return type
+ });
+ return type;
},
progressStyle() {
- const progress = Math.floor(this.progress * 100)
- const style = `translateX(${Math.floor(progress - 100)}%)`
+ const progress = Math.floor(this.progress * 100);
+ const style = `translateX(${Math.floor(progress - 100)}%)`;
return {
progress: `${progress}%`,
webkitTransform: style,
mozTransform: style,
msTransform: style,
- transform: style
- }
+ transform: style,
+ };
},
formatedAverageSpeed() {
- return `${Uploader.utils.formatSize(this.averageSpeed)} / s`
+ return `${Uploader.utils.formatSize(this.averageSpeed)} / s`;
},
status() {
- const isUploading = this.isUploading
- const isComplete = this.isComplete
- const isError = this.error
- const paused = this.paused
+ const isUploading = this.isUploading;
+ const isComplete = this.isComplete;
+ const isError = this.error;
+ const paused = this.paused;
if (isComplete) {
- return 'success'
+ return "success";
} else if (isError) {
- return 'error'
+ return "error";
} else if (isUploading) {
- return 'uploading'
+ return "uploading";
} else if (paused) {
- return 'paused'
+ return "paused";
} else {
- return 'waiting'
+ return "waiting";
}
},
statusText() {
- const status = this.status
- const fileStatusText = this.file.uploader.fileStatusText
- let txt = status
- if (typeof fileStatusText === 'function') {
- txt = fileStatusText(status, this.response)
+ const status = this.status;
+ const fileStatusText = this.file.uploader.fileStatusText;
+ let txt = status;
+ if (typeof fileStatusText === "function") {
+ txt = fileStatusText(status, this.response);
} else {
- txt = fileStatusText[status]
+ txt = fileStatusText[status];
}
- return txt || status
+ return txt || status;
},
formatedTimeRemaining() {
- const timeRemaining = this.timeRemaining
- const file = this.file
+ const timeRemaining = this.timeRemaining;
+ const file = this.file;
if (timeRemaining === Number.POSITIVE_INFINITY || timeRemaining === 0) {
- return ''
+ return "";
}
- let parsedTimeRemaining = secondsToStr(timeRemaining)
- const parseTimeRemaining = file.uploader.opts.parseTimeRemaining
+ let parsedTimeRemaining = secondsToStr(timeRemaining);
+ const parseTimeRemaining = file.uploader.opts.parseTimeRemaining;
if (parseTimeRemaining) {
- parsedTimeRemaining = parseTimeRemaining(timeRemaining, parsedTimeRemaining)
+ parsedTimeRemaining = parseTimeRemaining(
+ timeRemaining,
+ parsedTimeRemaining
+ );
}
- return parsedTimeRemaining
- }
+ return parsedTimeRemaining;
+ },
},
watch: {
status(newStatus, oldStatus) {
- if (oldStatus && newStatus === 'uploading' && oldStatus !== 'uploading') {
+ if (oldStatus && newStatus === "uploading" && oldStatus !== "uploading") {
this.tid = setTimeout(() => {
- this.progressingClass = 'uploader-file-progressing'
- }, 200)
+ this.progressingClass = "uploader-file-progressing";
+ }, 200);
} else {
- clearTimeout(this.tid)
- this.progressingClass = ''
+ clearTimeout(this.tid);
+ this.progressingClass = "";
}
- }
+ },
},
methods: {
_actionCheck() {
- this.paused = this.file.paused
- this.error = this.file.error
- this.isUploading = this.file.isUploading()
+ this.paused = this.file.paused;
+ this.error = this.file.error;
+ this.isUploading = this.file.isUploading();
},
pause() {
- this.file.pause()
- this._actionCheck()
- this._fileProgress()
+ this.file.pause();
+ this._actionCheck();
+ this._fileProgress();
},
resume() {
- this.file.resume()
- this._actionCheck()
+ this.file.resume();
+ this._actionCheck();
},
remove() {
- this.file.cancel()
+ this.file.cancel();
},
retry() {
- this.file.retry()
- this._actionCheck()
+ this.file.retry();
+ this._actionCheck();
},
processResponse(message) {
- let res = message
+ let res = message;
try {
- res = JSON.parse(message)
- } catch (e) { }
- this.response = res
+ res = JSON.parse(message);
+ } catch (e) {}
+ this.response = res;
},
fileEventsHandler(event, args) {
- const rootFile = args[0]
- const file = args[1]
- const target = this.list ? rootFile : file
+ const rootFile = args[0];
+ const file = args[1];
+ const target = this.list ? rootFile : file;
if (this.file === target) {
- if (this.list && event === 'fileSuccess') {
- this.processResponse(args[2])
- return
+ if (this.list && event === "fileSuccess") {
+ this.processResponse(args[2]);
+ return;
}
- this[`_${event}`].apply(this, args)
+ this[`_${event}`].apply(this, args);
}
},
_fileProgress() {
- this.progress = this.file.progress()
- this.averageSpeed = this.file.averageSpeed
- this.currentSpeed = this.file.currentSpeed
- this.timeRemaining = this.file.timeRemaining()
- this.uploadedSize = this.file.sizeUploaded()
- this._actionCheck()
+ this.progress = this.file.progress();
+ this.averageSpeed = this.file.averageSpeed;
+ this.currentSpeed = this.file.currentSpeed;
+ this.timeRemaining = this.file.timeRemaining();
+ this.uploadedSize = this.file.sizeUploaded();
+ this._actionCheck();
},
_fileSuccess(rootFile, file, message) {
if (rootFile) {
- this.processResponse(message)
+ this.processResponse(message);
}
- this._fileProgress()
- this.error = false
- this.isComplete = true
- this.isUploading = false
- console.log('rootFile, file, message', rootFile, file, message)
+ this._fileProgress();
+ this.error = false;
+ this.isComplete = true;
+ this.isUploading = false;
+ console.log("rootFile, file, message", rootFile, file, message);
},
_fileComplete() {
- this._fileSuccess()
+ this._fileSuccess();
},
_fileError(rootFile, file, message) {
- this._fileProgress()
- console.log('rootFile, file, message', rootFile, file, message)
- this.processResponse(message)
- this.error = true
- this.isComplete = false
- this.isUploading = false
- }
+ this._fileProgress();
+ console.log("rootFile, file, message", rootFile, file, message);
+ this.processResponse(message);
+ this.error = true;
+ this.isComplete = false;
+ this.isUploading = false;
+ },
},
mounted() {
- const staticProps = ['paused', 'error', 'averageSpeed', 'currentSpeed']
+ const staticProps = ["paused", "error", "averageSpeed", "currentSpeed"];
const fnProps = [
- 'isComplete',
- 'isUploading',
+ "isComplete",
+ "isUploading",
{
- key: 'size',
- fn: 'getSize'
+ key: "size",
+ fn: "getSize",
},
{
- key: 'formatedSize',
- fn: 'getFormatSize'
+ key: "formatedSize",
+ fn: "getFormatSize",
},
{
- key: 'uploadedSize',
- fn: 'sizeUploaded'
+ key: "uploadedSize",
+ fn: "sizeUploaded",
},
- 'progress',
- 'timeRemaining',
+ "progress",
+ "timeRemaining",
{
- key: 'type',
- fn: 'getType'
+ key: "type",
+ fn: "getType",
},
{
- key: 'extension',
- fn: 'getExtension'
- }
- ]
- staticProps.forEach(prop => {
- this[prop] = this.file[prop]
- })
+ key: "extension",
+ fn: "getExtension",
+ },
+ ];
+ staticProps.forEach((prop) => {
+ this[prop] = this.file[prop];
+ });
fnProps.forEach((fnProp) => {
- if (typeof fnProp === 'string') {
- this[fnProp] = this.file[fnProp]()
+ if (typeof fnProp === "string") {
+ this[fnProp] = this.file[fnProp]();
} else {
- this[fnProp.key] = this.file[fnProp.fn]()
+ this[fnProp.key] = this.file[fnProp.fn]();
}
- })
+ });
- const handlers = this._handlers = {}
+ const handlers = (this._handlers = {});
const eventHandler = (event) => {
handlers[event] = (...args) => {
- this.fileEventsHandler(event, args)
- }
- return handlers[event]
- }
+ this.fileEventsHandler(event, args);
+ };
+ return handlers[event];
+ };
events.forEach((event) => {
- this.file.uploader.on(event, eventHandler(event))
- })
+ this.file.uploader.on(event, eventHandler(event));
+ });
},
destroyed() {
events.forEach((event) => {
- this.file.uploader.off(event, this._handlers[event])
- })
- this._handlers = null
- }
-}
+ this.file.uploader.off(event, this._handlers[event]);
+ });
+ this._handlers = null;
+ },
+};
</script>
<style>
diff --git a/src/pages/ai/index/App.vue b/src/pages/ai/index/App.vue
index 51304be..1ab5b8a 100644
--- a/src/pages/ai/index/App.vue
+++ b/src/pages/ai/index/App.vue
@@ -88,7 +88,9 @@
<div class="desc-2">鐗堟湰 {{ item.version }}</div>
</div>
<div class="right-icon">
- <span class="icon iconfont"></span>
+ <el-tooltip effect="dark" content="涓嬭浇" placement="bottom">
+ <span class="icon iconfont"></span>
+ </el-tooltip>
</div>
</div>
</div>
@@ -357,6 +359,7 @@
<detailPage
:detailProductID="detailProductID"
:detailType="detailType"
+ :detailPrice="detailPrice"
v-if="inDetail"
@flushSdk="getAllSdk"
@flushApp="getAllApps"
@@ -469,6 +472,7 @@
showUpload: false,
detailType: "",
detailProductID: "",
+ detailPrice: "",
buttonAuthority: sessionStorage.getItem("buttonAuthoritys") || [],
activeName: "搴旂敤涓績",
patchUpdateStatus: "",
@@ -617,6 +621,7 @@
checkDetail(item, typ) {
this.inDetail = true;
this.detailProductID = item.id;
+ this.detailPrice = item.price;
if (typ) {
this.detailType = typ;
} else {
@@ -844,7 +849,6 @@
version: res.data.apps[0].version,
productName: res.data.productName,
installContent: res.data.apps[0].installContent,
-
};
}
if (res.data.sdks.length > 0) {
@@ -1402,7 +1406,8 @@
min-width: 100px;
text-align: end;
position: absolute;
- right: 0; width: 120px;
+ right: 0;
+ width: 120px;
margin-top: 2px;
}
.rocket-icon {
diff --git a/src/pages/ai/index/detail.vue b/src/pages/ai/index/detail.vue
index 9dc456b..7a62b20 100644
--- a/src/pages/ai/index/detail.vue
+++ b/src/pages/ai/index/detail.vue
@@ -38,7 +38,7 @@
<el-button
size="mini"
round
- v-if="!isActive && showInstallNotActive"
+ v-if="!isActive && (!detailPrice || showInstallNotActive)"
@click="downloadSdkInSide"
>瀹夎</el-button
>
@@ -50,14 +50,14 @@
clearable
:autofocus="true"
v-model="activeCode"
- v-if="!isActive && !showInstallNotActive"
+ v-if="!isActive && !showInstallNotActive && detailPrice"
>
</el-input>
<el-button
size="mini"
round
class="act-btn"
- v-if="!isActive && !showInstallNotActive"
+ v-if="!isActive && !showInstallNotActive && detailPrice"
@click="actived"
>婵�娲�</el-button
>
@@ -69,14 +69,14 @@
> -->
</div>
</div>
- <div class="back-btn" @click="goback">
+ <!-- <div class="back-btn" @click="goback">
<span class="icon iconfont"></span>
<span class="back-text">杩斿洖</span>
- </div>
+ </div> -->
</div>
<div class="text-area">
<div class="text-line">
- <span class="icon iconfont" ></span>
+ <span class="icon iconfont"></span>
<span class="title">鐗堟湰锛�</span>
<span class="desc">{{ productDetail.productVersion }}</span>
</div>
@@ -144,7 +144,7 @@
class="rec-item"
v-for="(item, index) in otherProducts"
:key="index"
- @click="checkInWindow(item)"
+ @click="checkInWindow(item)"
>
<div class="icon-img">
<img
@@ -165,7 +165,6 @@
<el-button
size="small"
type="primary"
-
round
@click="checkInWindow(item)"
>鏌ョ湅</el-button
@@ -312,6 +311,7 @@
detailProductID: {
type: String,
},
+ detailPrice: {},
},
directives: {
focus: {
@@ -325,15 +325,20 @@
this.autoRefreshAppAndSdkState();
this.getUnActivedList();
this.getUnActivedAppList();
+ this.showBackBtn();
+ this.addBackListener();
},
beforeDestroy() {
this.autoRefresh = false;
+ this.hiddenBackBtn();
},
methods: {
getDetail(id) {
getAppDetail({ id: id || this.detailProductID })
.then((res) => {
if (res.success) {
+ console.log("----------");
+ console.log(res);
this.productDetail = res.data.detail;
this.otherProducts = res.data.randoms;
@@ -545,7 +550,7 @@
if (res && res.success) {
app.unloadLoading = false;
// _this.getAllApps();
- this.$emit("flushApp")
+ this.$emit("flushApp");
window.parent.postMessage(
{
msg: "AppUpdate",
@@ -557,7 +562,7 @@
message: "鍗歌浇搴旂敤鎴愬姛",
type: "success",
});
- this.goback()
+ this.goback();
}
})
.catch((e) => {
@@ -766,9 +771,9 @@
sdk.unloadLoading = false;
this.$notify.success("鍗歌浇瀹屾垚");
// _this.getAllSdk();
- this.$emit("flushSdk")
+ this.$emit("flushSdk");
window.parent.postMessage({ msg: "AppUpdate" }, "*");
- this.goback()
+ this.goback();
}
})
.catch((e) => {
@@ -857,7 +862,7 @@
inputBlur(item) {
this.$set(item, "isEdit", false);
},
- autoRefreshAppAndSdkState() {
+ autoRefreshAppAndSdkState() {
this.getAllApps();
this.getAllSdk();
if (!this.autoRefresh) {
@@ -871,6 +876,29 @@
this.getAllSdk();
}
}, 1000);
+ },
+ showBackBtn() {
+ window.parent.postMessage(
+ {
+ msg: "showBack",
+ },
+ "*"
+ );
+ },
+ hiddenBackBtn() {
+ window.parent.postMessage(
+ {
+ msg: "hiddenBack",
+ },
+ "*"
+ );
+ },
+ addBackListener() {
+ window.addEventListener("message", (e) => {
+ if (e.data.msg === "杩斿洖搴旂敤涓績") {
+ this.goback();
+ }
+ });
},
},
};
@@ -1009,8 +1037,7 @@
height: 25px;
.icon {
font-size: 14px;
- margin-right: 4px;
-
+ margin-right: 4px;
}
.title {
font-size: 12px;
@@ -1042,16 +1069,13 @@
margin-bottom: 10px;
.title {
- width: 80px;
- height: 20px;
+ display: inline-block;
+ line-height: 20px;
+ padding: 0px 10px;
letter-spacing: 0.5px;
font-size: 12px;
color: #828282;
- display: flex;
- align-items: center;
- justify-content: center;
font-weight: bold;
- border: 1px solid;
border: 1px solid #e0e0e0;
box-sizing: border-box;
border-radius: 22px;
@@ -1122,9 +1146,14 @@
font-size: 14px;
font-weight: bold;
line-height: 28px;
+ width: 116px;
height: 28px;
letter-spacing: 0.1px;
color: #4f4f4f;
+
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.desc-2 {
font-size: 12px;
@@ -1136,11 +1165,11 @@
.el-button {
padding: 3px 12px;
border-radius: 22px;
- background-color: #f2f2f7 !important;
- border-color: #f2f2f7 !important;
- color: #4f4f4f;
- font-size: 12px;
- font-weight: bold;
+ background-color: #f2f2f7 !important;
+ border-color: #f2f2f7 !important;
+ color: #4f4f4f;
+ font-size: 12px;
+ font-weight: bold;
}
// .el-button--primary:hover {
// background: #089fb3 !important;
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 0ce7c11..3d102d6 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -84,11 +84,7 @@
data: Object,
},
created() {
- window.addEventListener("message", (e) => {
- if (e.data.msg === "showBack") {
- this.isShowBack = true;
- }
- });
+ this.addBackListener();
},
data() {
return {
@@ -221,15 +217,31 @@
//return false;
},
+ // 鑿滃崟鏍忚繑鍥�
back() {
let active = this.$store.state.desktop.minDocks;
active = active.filter((item) => item.highlight);
- console.log(`杩斿洖${active.alt}`);
+ console.log(active);
const iframeArr = document.querySelectorAll("iframe");
iframeArr.forEach((item) => {
item.contentWindow.postMessage({ msg: `杩斿洖${active[0].alt}` }, "*");
});
},
+ // 娣诲姞杩斿洖鎸夐挳鐩稿叧鐩戝惉
+ addBackListener() {
+ //鏄剧ず杩斿洖鎸夐挳
+ window.addEventListener("message", (e) => {
+ if (e.data.msg === "showBack") {
+ this.isShowBack = true;
+ }
+ });
+ //闅愯棌杩斿洖鎸夐挳
+ window.addEventListener("message", (e) => {
+ if (e.data.msg === "hiddenBack") {
+ this.isShowBack = false;
+ }
+ });
+ },
},
directives: {
drag(el, binding) {
diff --git a/src/pages/settings/components/AuthorizationSetting.vue b/src/pages/settings/components/AuthorizationSetting.vue
index 336cf13..4161551 100644
--- a/src/pages/settings/components/AuthorizationSetting.vue
+++ b/src/pages/settings/components/AuthorizationSetting.vue
@@ -9,12 +9,13 @@
ref="joinForm"
class="join-form"
>
+ <!-- 鎺堟潈绠＄悊鏂瑰紡 -->
<el-form-item>
<div class="row">
<div class="item-title">璁惧鎺堟潈绠＄悊鏂瑰紡</div>
<div class="inputContain">
<el-select
- v-model="settingForm.authorizationType"
+ v-model="settingForm.need_auth_pwd"
placeholder="璇烽�夋嫨"
size="small"
:popper-append-to-body="false"
@@ -30,33 +31,40 @@
</div>
</el-form-item>
- <el-form-item prop="password" v-if="settingForm.authorizationType == 1">
+ <!-- 鎺堟潈瀵嗙爜 -->
+ <el-form-item prop="auth_pwd" v-if="settingForm.need_auth_pwd == 1">
<div class="row">
<div class="item-title">鎺堟潈瀵嗛挜</div>
<div class="inputContain">
<el-input
- v-model="settingForm.password"
+ v-model="settingForm.auth_pwd"
placeholder="璇疯緭鍏�6浣嶆巿鏉冨瘑閽�"
maxlength="6"
- show-password
+ show-auth_pwd
></el-input>
</div>
</div>
</el-form-item>
</el-form>
- <div class="save">淇濆瓨</div>
+ <div class="save" @click="submit">淇濆瓨</div>
</div>
</div>
</template>
<script>
+import { getAuthInfo, setAuthInfo } from "@/api/system";
+
export default {
+ created() {
+ this.getAuth();
+ },
data() {
return {
settingForm: {
- authorizationType: 0,
- password: "",
+ need_auth_pwd: 0, //鎺堟潈绠＄悊鏂瑰紡
+ auth_pwd: "", //鎺堟潈瀵嗛挜
+ id: "", //璁惧id
},
typeOptions: [
{
@@ -67,14 +75,44 @@
label: "瀵嗙爜鏍￠獙",
value: 1,
},
- ],
+ ], //鎺堟潈绠＄悊鏂瑰紡閫夐」
rules: {
- password: [
+ auth_pwd: [
{ min: 6, max: 6, message: "闀垮害涓�6涓瓧绗�", trigger: "blur" },
],
- },
+ }, //姝ｅ垯鏍￠獙
};
},
+ methods: {
+ //鑾峰彇鎺堟潈淇℃伅
+ async getAuth() {
+ const res = await getAuthInfo();
+ if (res.code === 200 && res.success) {
+ //鎺堟潈鏁版嵁鍥炲～
+ this.settingForm = res.data;
+ } else {
+ this.$notify.error({
+ title: "閿欒",
+ message: "鑾峰彇鎺堟潈淇℃伅澶辫触",
+ });
+ }
+ },
+ //鎻愪氦鎺堟潈閰嶇疆
+ async submit() {
+ const res = await setAuthInfo(this.settingForm);
+ if (res.code === 200 && res.success) {
+ this.$notify.success({
+ title: "鎴愬姛",
+ message: "淇敼鎴愬姛",
+ });
+ } else {
+ this.$notify.error({
+ title: "閿欒",
+ message: "淇敼澶辫触",
+ });
+ }
+ },
+ },
};
</script>
diff --git a/src/pages/settings/index/index.vue b/src/pages/settings/index/index.vue
index e388418..fc47c2b 100644
--- a/src/pages/settings/index/index.vue
+++ b/src/pages/settings/index/index.vue
@@ -899,13 +899,6 @@
};
},
created() {
- window.parent.postMessage(
- {
- msg: "showBack",
- },
- "*"
- );
-
let color = localStorage.getItem("--colorCard");
if (color) {
document.documentElement.style.setProperty("--colorCard", `${color}`);
@@ -916,6 +909,7 @@
clearInterval(this.browserTimer);
},
mounted() {
+ // 杩斿洖鎸夐挳鍥炶皟
window.addEventListener("message", (e) => {
if (e.data.msg === "杩斿洖绯荤粺璁剧疆") {
this.showWelcome = true;
@@ -1546,6 +1540,27 @@
}
},
},
+ watch: {
+ showWelcome(newVal) {
+ if (newVal) {
+ // 闅愯棌杩斿洖鎸夋寜閽�
+ window.parent.postMessage(
+ {
+ msg: "hiddenBack",
+ },
+ "*"
+ );
+ } else {
+ //鏄剧ず杩斿洖鎸夐挳
+ window.parent.postMessage(
+ {
+ msg: "showBack",
+ },
+ "*"
+ );
+ }
+ },
+ },
};
</script>
<style lang="scss">
diff --git a/src/pages/settings/views/clusterManagement.vue b/src/pages/settings/views/clusterManagement.vue
index 9db717a..3eed52f 100644
--- a/src/pages/settings/views/clusterManagement.vue
+++ b/src/pages/settings/views/clusterManagement.vue
@@ -259,7 +259,7 @@
};
const checkID = (rule, value, callback) => {
if (!value) {
- return callback(new Error("瀵嗙爜涓嶈兘涓虹┖"));
+ return callback(new Error("ID涓嶈兘涓虹┖"));
}
};
return {
diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index be4ad27..4e668a0 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -44,6 +44,17 @@
step-strictly
size="small"
></el-input-number
+ > s -->
+
+ <el-input-number
+ v-model="min_len"
+ @change="fakeObj.min = +(min_len / 1.2)"
+ :min="5"
+ :step="5"
+ :max="120"
+ step-strictly
+ size="small"
+ ></el-input-number
> s
</div>
</div>
@@ -102,6 +113,10 @@
style="cursor: pointer"
>{{ playSpan }}</span
>
+ <!-- <span class="iconfont" v-else style="cursor: pointer">{{
+ playSpan2
+ }}</span> -->
+
<img
v-else
src="/images/settings/鏆傚仠.png"
@@ -113,6 +128,13 @@
margin-top: 15px;
"
/>
+ <!--
+ <i
+ v-if="!item.isPlay"
+ class="el-icon-video-play"
+ style=""
+ ></i>
+ <i v-else class="el-icon-video-pause"></i> -->
</span>
<span
class="icon iconfont del"
@@ -185,7 +207,7 @@
<div class="top-title">鍥炬爣涓婚</div>
<div class="icon-bar" style="cursor: pointer" @click="selectIcons(0)">
<div class="bar-title">
- <span class="title">鎵佸钩鍐欏疄鍥炬爣</span>
+ <span class="title">闈㈡�ч鏍�</span>
<span
class="icon iconfont"
:class="activeIcons == 0 ? 'icon-active' : 'icon-normal'"
@@ -204,7 +226,7 @@
</div>
<div class="icon-bar" style="cursor: pointer" @click="selectIcons(1)">
<div class="bar-title">
- <span class="title">鎵佸钩鍖栧浘鏍�</span>
+ <span class="title">绠�绾﹂鏍�</span>
<span
class="icon iconfont"
:class="activeIcons == 1 ? 'icon-active' : 'icon-normal'"
@@ -285,14 +307,22 @@
},
isPlay: false,
realIconList: [
- { url: "/images/settings/鏃ュ織绠＄悊.png", color: "green" },
- { url: "/images/settings/瀹炴椂鐩戞帶.png", color: "yellow" },
- { url: "/images/settings/鏁版嵁鍙鍖�.png", color: "pink" },
+ { url: "/images/settings/闈㈡�у浘鏍�/1浠板崸妫�娴�.png" },
+ { url: "/images/settings/闈㈡�у浘鏍�/2涓綋闈欐.png" },
+ { url: "/images/settings/闈㈡�у浘鏍�/3瀹夊叏璀︽垝.png" },
+ { url: "/images/settings/闈㈡�у浘鏍�/4瀹夊叏甯芥娴�.png" },
+ { url: "/images/settings/闈㈡�у浘鏍�/5濂旇窇.png" },
+ { url: "/images/settings/闈㈡�у浘鏍�/6杞﹁締妫�娴�.png" },
+ { url: "/images/settings/闈㈡�у浘鏍�/7鎶界儫.png" },
],
flatIconList: [
- { url: "/images/settings/鏁版嵁鎺ㄩ��.png" },
- { url: "/images/settings/鏁版嵁鏍堥厤缃�.png" },
- { url: "/images/settings/绯荤粺璁剧疆.png" },
+ { url: "/images/settings/绠�绾﹀浘鏍�/1浠板崸妫�娴�.png" },
+ { url: "/images/settings/绠�绾﹀浘鏍�/2涓綋闈欐.png" },
+ { url: "/images/settings/绠�绾﹀浘鏍�/3瀹夊叏璀︽垝.png" },
+ { url: "/images/settings/绠�绾﹀浘鏍�/4瀹夊叏甯芥娴�.png" },
+ { url: "/images/settings/绠�绾﹀浘鏍�/5濂旇窇.png" },
+ { url: "/images/settings/绠�绾﹀浘鏍�/6杞﹁締妫�娴�.png" },
+ { url: "/images/settings/绠�绾﹀浘鏍�/7鎶界儫.png" },
],
tableBGList: [
{ name: "background", url: "/images/desktop/background.png" },
@@ -325,10 +355,16 @@
});
const url = this.curUser.backgroundpic;
this.activeIcons = this.curUser.useIconType - 1;
- this.universalColor = this.colorList.findIndex(
- (x) => x.color == localStorage.getItem("--colorCard")
- );
- this.activeBg = url ? this.tableBGList.findIndex((x) => x.url == url) : 0;
+ this.universalColor = this.colorList.findIndex((x) => {
+ return x.color == localStorage.getItem("--colorCard");
+ });
+ if (url) {
+ this.activeBg = this.tableBGList.findIndex((x) => {
+ return x.url == url;
+ });
+ } else {
+ this.activeBg = 0;
+ }
const e = this.$refs.curPage;
e.addEventListener("click", (e) => {
if (this.showUpload) {
@@ -364,6 +400,7 @@
}).then((res) => {
if (res.success) {
sessionStorage.setItem("userInfo", JSON.stringify(res.data));
+ debugger;
this.$message.success(res.msg);
}
});
@@ -796,7 +833,9 @@
font-weight: 700;
margin-top: 20px;
}
-
+ /* .icon-bar:hover {
+ background-color: rgba(233, 233, 233, 1);
+ } */
.color-bar {
display: flex;
justify-content: center;
diff --git a/src/pages/vindicate/index/App.vue b/src/pages/vindicate/index/App.vue
index baf9848..df6d8ed 100644
--- a/src/pages/vindicate/index/App.vue
+++ b/src/pages/vindicate/index/App.vue
@@ -107,7 +107,7 @@
components: {
systemClean,
updateSettings,
- BackUp,
+ BackUp,
restartSettings,
sysInfo,
},
@@ -126,7 +126,7 @@
img_white: "/images/vindicate/绯荤粺娓呯悊-鐧�.png",
img_welcome: "/images/vindicate/绯荤粺娓呯悊.png",
},
-
+
{
name: "閲嶅惎璁剧疆",
img_black: "/images/vindicate/閲嶅惎璁剧疆-榛�.png",
@@ -164,13 +164,6 @@
};
},
created() {
- window.parent.postMessage(
- {
- msg: "showBack",
- },
- "*"
- );
-
let color = localStorage.getItem("--colorCard");
if (color) {
document.documentElement.style.setProperty("--colorCard", `${color}`);
@@ -236,6 +229,27 @@
return this.searchArr.filter((item) => {
return item.name.indexOf(this.searchText.toUpperCase()) > -1;
});
+ }
+ },
+ },
+ watch: {
+ showWelcome(newVal) {
+ if (newVal) {
+ // 闅愯棌杩斿洖鎸夋寜閽�
+ window.parent.postMessage(
+ {
+ msg: "hiddenBack",
+ },
+ "*"
+ );
+ } else {
+ //鏄剧ず杩斿洖鎸夐挳
+ window.parent.postMessage(
+ {
+ msg: "showBack",
+ },
+ "*"
+ );
}
},
},
@@ -378,10 +392,10 @@
background-color: rgba(251, 251, 255, 0.1);
backdrop-filter: blur(4px);
float: left;
- width: 442px;
+ width: 288px;
height: 190px;
- margin: 0 15px;
- margin-bottom: 30px;
+ margin: 0 10px;
+ margin-bottom: 20px;
border-radius: 15px;
display: flex;
justify-content: center;
diff --git a/vue.config.js b/vue.config.js
index 11ddce7..39c518e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,8 +40,10 @@
// }
});
-const serverUrl = "http://192.168.20.189:7009"; // 缇婁簲//
+//const serverUrl = "http://192.168.20.189:7009"; // 缇婁簲//
// const serverUrl = "http://192.168.8.10:7009";
+const serverUrl = "http://192.168.8.118:7009";
+
const serverUrl2 = "http://192.168.8.10:9000";
// const serverUrl = "http://192.168.20.10:7009";
// const serverUrl2 = "http://192.168.20.10:9000";
--
Gitblit v1.8.0