From eff92aec207a73c94bddafe4c8eaf3fa96f17dc2 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 18 九月 2020 15:11:53 +0800
Subject: [PATCH] 直接访问桌面未登陆默认跳转登录页, 底库上传图片提示语
---
src/pages/search/index/Searching.vue | 29 ++++++--------
src/pages/library/components/upload.vue | 51 -------------------------
src/pages/visual/index/home.vue | 1
src/pages/desktop/index/App.vue | 5 ++
src/pages/library/components/personList.vue | 4 +-
5 files changed, 22 insertions(+), 68 deletions(-)
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index fc70133..fb60cbd 100644
--- a/src/pages/desktop/index/App.vue
+++ b/src/pages/desktop/index/App.vue
@@ -18,6 +18,7 @@
import axios from 'axios'
import { getApps } from '@/api/app'
+import { findAllSdk } from '@/api/taskMange'
export default {
name: 'app',
@@ -51,6 +52,10 @@
time: new Date()
}, true);
}, 1000);
+
+ findAllSdk().then(() => {
+
+ });
},
methods: {
showApps() {
diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue
index 4c72a70..c91f58e 100644
--- a/src/pages/library/components/personList.vue
+++ b/src/pages/library/components/personList.vue
@@ -543,7 +543,7 @@
export default {
data() {
return {
- timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23,59,59))],
+ timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23, 59, 59))],
memberInfo: {
personName: '',
sex: '',
@@ -705,7 +705,7 @@
console.log("hello");
},
getUploadResult(result) {
- console.log(result, "涓婁紶鐨勮繑鍥�");
+ // console.log(result, "涓婁紶鐨勮繑鍥�");
this.uploadResult = result.data;
this.dialogVisible = true;
this.getPersonList();
diff --git a/src/pages/library/components/upload.vue b/src/pages/library/components/upload.vue
index 58585ed..e137709 100644
--- a/src/pages/library/components/upload.vue
+++ b/src/pages/library/components/upload.vue
@@ -295,59 +295,10 @@
this.progressValue = 0
this.showProgress = false
this.$emit('successFN', result)
- // let errorArr = []
- // // 鏍规嵁涓庡悗鍙扮害瀹歞ata鏁扮粍杩斿洖鐨勯兘鏄瓨鍦ㄤ笟鍔℃剰涔夐敊璇殑瀵硅薄
- // if (result.data && result.data.length) {
- // errorArr = result.data.map(file => {
- // // 閬嶅巻鍓嶅彴鎶涚粰鍚庡彴鐨刦ileList 杩涜姣斿璧嬪�糵ile鏂囦欢鍙妋essage
- // for (var i = 0; i < this.suFileList.length; i++) {
- // const iteam = this.suFileList[i]
- // if (
- // file.upload.fileName &&
- // iteam.name === file.upload.fileName
- // ) {
- // return {
- // uuId: guid(),
- // file: iteam,
- // photos: file.upload.path,
- // baseList: file.baseList ? file.baseList : null,
- // errorMsg: {
- // type: 'error',
- // errorType: '涓婁紶寮傚父',
- // message: file.reason ? file.reason : result.msg
- // }
- // }
- // }
- // }
- // })
- // }
- /* 鍥炶皟浼犲�� */
- // 澶勭悊閿欒鏂囦欢鍒楄〃 濡傛灉涓�0璇存槑鍏ㄩ儴鎴愬姛锛岋紙閫氳繃鏍￠獙锛屽苟鍦ㄥ悗鍙版垚鍔熷畬鎴愭敞鍐屾坊鍔狅級
- // let erFileList =
- // result && result.success
- // ? this.erFileList
- // : [...this.erFileList, ...errorArr]
- // // 鍏ㄩ儴鎴愬姛鏃犻渶鎵撳紑涓氬姟寮圭獥
- // if (erFileList.length > 0) {
- // this.$emit('addFilesBaBackFN', {
- // suFileList: result && result.success ? this.suFileList : [],
- // erFileList: erFileList,
- // fileList: this.fileList,
- // result: res
- // })
- // }
- // if (erFileList.length === 0) {
- // this.$emit('successFN')
- // }
}
} catch (error) {
- // this.$notify({
- // type: 'error',
- // message: '鏈嶅姟鍣ㄩ敊璇紒璇疯仈绯荤鐞嗗憳' // + error.message
- // })
this.progressValue = 0
this.showProgress = false
- console.log('catch---', error)
const errorArr = this.suFileList.map(file => {
return {
uuId: guid(),
@@ -355,7 +306,7 @@
errorMsg: {
type: 'error',
errorType: '涓婁紶鏈嶅姟鍣ㄩ敊璇�',
- message: '鍥剧墖涓嶆槸鍗曚汉鑴哥収鐗囷紝璇烽噸鏂颁笂浼�'
+ message: '涓婁紶鏈嶅姟鍣ㄩ敊璇�'
}
}
})
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 115d529..7cd82d6 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -32,6 +32,7 @@
size="mini"
style="width:calc(100% - 40px);min-width: 120px;"
placeholder="璇烽�夋嫨"
+ @change="tagChange"
>
<el-option
v-for="item in VideoPhotoData.tabs"
@@ -274,9 +275,6 @@
this.TreeDataPool.fetchTreeData();
},
mounted() {
- debugger
- //this.isShowUpload();
- console.log('search mounted')
this.$nextTick(() => {
let scrollContain = this.$refs.scrollContain
this.VideoPhotoData.scrollContainDom = scrollContain
@@ -420,20 +418,7 @@
"VideoPhotoData.selectWhites": function (value) {
this.blackAngWhite()
},
- tagValues: function (newValue, oldValue) {
- if (newValue.length > 0) {
- this.showType = "compare";
- } else {
- this.showType = "search";
- }
- if (newValue.length !== oldValue.length) {
- console.log("tagValue涓殑鍒锋柊鏂规硶");
- // this.VideoPhotoData.querySearchList();
- this.setLoadSearch(this.VideoPhotoData.querySearchList());
- }
- },
"VideoPhotoData.uploadDiaplay": function (value) {
- debugger
this.getHeight();
console.log("upload鐨勫�兼槸锛�", value)
if (value) {
@@ -738,6 +723,18 @@
},
getUrlKey(name) {
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
+ },
+ tagChange(obj) {
+ console.log(obj)
+ if (obj.length > 0) {
+ this.showType = "compare";
+ } else {
+ this.showType = "search";
+ }
+
+ this.VideoPhotoData.queryTabs = obj;
+
+ this.setLoadSearch(this.VideoPhotoData.querySearchList());
}
}
};
diff --git a/src/pages/visual/index/home.vue b/src/pages/visual/index/home.vue
index d63d80b..8394bf6 100644
--- a/src/pages/visual/index/home.vue
+++ b/src/pages/visual/index/home.vue
@@ -236,6 +236,7 @@
document.addEventListener("visibilitychange", this.visibilitychange, false);
window.addEventListener('resize', this.windowSizeChange)
+ this.VideoPhotoData.capture();
this.timer = setInterval(() => {
this.VideoPhotoData.capture()
this.CategoryData.realTimeCapture();
--
Gitblit v1.8.0