From 652ec361c59ec59af364460d10ef34b9e8a221ed Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 25 十一月 2021 14:26:05 +0800
Subject: [PATCH] Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus
---
src/pages/ai/index/App.vue | 219 ++++++++++++++++++++++---------------------
src/pages/ai/index/detail.vue | 6
src/pages/desktop/index/components/ToolsEntry.vue | 29 ++---
3 files changed, 129 insertions(+), 125 deletions(-)
diff --git a/src/pages/ai/index/App.vue b/src/pages/ai/index/App.vue
index 6b21c96..6552cac 100644
--- a/src/pages/ai/index/App.vue
+++ b/src/pages/ai/index/App.vue
@@ -169,8 +169,17 @@
class="other-btn"
round
@click="checkDetail(item)"
- v-if="activeName == '搴旂敤涓績'"
+ v-if="activeName == '搴旂敤涓績'&&item.price>0"
>婵�娲�</el-button
+ >
+ <el-button
+ size="small"
+ type="primary"
+ class="update-btn"
+ round
+ @click.stop="actived(item)"
+ v-if="activeName == '搴旂敤涓績'&&item.price==0"
+ >瀹夎</el-button
>
<el-button
size="small"
@@ -186,8 +195,6 @@
"
>鏌ョ湅</el-button
>
- <!-- @click.stop="unLoadSdkOrApp(item)" -->
-
<el-button
size="small"
type="primary"
@@ -351,6 +358,8 @@
:detailProductID="detailProductID"
:detailType="detailType"
v-if="inDetail"
+ @flushSdk="getAllSdk"
+ @flushApp="getAllApps"
@goback="goback"
></detailPage>
</div>
@@ -537,11 +546,11 @@
goback() {
this.inDetail = false;
},
- isShow(authority) {
- return (
- this.isAdmin || this.buttonAuthority.indexOf("," + authority + ",") > -1
- );
- },
+ // isShow(authority) {
+ // return (
+ // this.isAdmin || this.buttonAuthority.indexOf("," + authority + ",") > -1
+ // );
+ // },
batchUpdate(s) {
if (s == "both") {
this.batchUpdateSDK();
@@ -588,7 +597,9 @@
}
},
pickTab(val) {
- this.activeTab = val;
+ if (val) {
+ this.activeTab = val;
+ }
if (this.activeName == "搴旂敤涓績") {
this.tempList =
this.activeTab == "sdk"
@@ -609,11 +620,11 @@
this.tempDarkList = [];
}
},
- closeDial() {
- this.productDetailVisible = false;
- this.productDetail = {};
- this.otherProducts = [];
- },
+ // closeDial() {
+ // this.productDetailVisible = false;
+ // this.productDetail = {};
+ // this.otherProducts = [];
+ // },
checkDetail(item, typ) {
this.inDetail = true;
this.detailProductID = item.id;
@@ -623,33 +634,33 @@
this.detailType = this.activeName == "搴旂敤涓績" ? "inactive" : "active";
}
},
- checkInWindow(item) {
- this.backStack.push([this.productDetail, this.otherProducts]);
- this.backDisable = false;
- this.checkIsDefOrNot(item.id);
+ // checkInWindow(item) {
+ // this.backStack.push([this.productDetail, this.otherProducts]);
+ // this.backDisable = false;
+ // this.checkIsDefOrNot(item.id);
- let _this = this;
- getAppDetail({ id: item.id }).then((res) => {
- _this.productDetail = res.data.detail;
- _this.productDetail.iconBlob = item.iconBlob;
- this.actId = _this.productDetail.productBaseId;
- let flag = false;
- const allNeedToNew = [
- ...this.hasNewVersionSdk,
- ...this.hasNewVersionApp,
- ];
- for (let i = 0; i < allNeedToNew.length; i++) {
- const item = allNeedToNew[i];
- if (item.id == _this.productDetail.productBaseId) {
- flag = true;
- }
- }
- this.needToUpgradeInWin = flag;
- _this.productDetail.isUpgrade = flag;
+ // let _this = this;
+ // getAppDetail({ id: item.id }).then((res) => {
+ // _this.productDetail = res.data.detail;
+ // _this.productDetail.iconBlob = item.iconBlob;
+ // this.actId = _this.productDetail.productBaseId;
+ // let flag = false;
+ // const allNeedToNew = [
+ // ...this.hasNewVersionSdk,
+ // ...this.hasNewVersionApp,
+ // ];
+ // for (let i = 0; i < allNeedToNew.length; i++) {
+ // const item = allNeedToNew[i];
+ // if (item.id == _this.productDetail.productBaseId) {
+ // flag = true;
+ // }
+ // }
+ // this.needToUpgradeInWin = flag;
+ // _this.productDetail.isUpgrade = flag;
- _this.otherProducts = res.data.randoms;
- });
- },
+ // _this.otherProducts = res.data.randoms;
+ // });
+ // },
checkIsDefOrNot(id) {
if (id.length > 10) {
this.isDefaultApp = false;
@@ -657,21 +668,21 @@
this.isDefaultApp = true;
}
},
- backwards() {
- if (this.backStack.length == 0) {
- this.backDisable = true;
- return;
- }
- this.forwardStack.push([this.productDetail, this.otherProducts]);
- let item = this.backStack.pop();
- this.productDetail = item[0];
- this.checkIsDefOrNot(this.productDetail.productBaseId);
- this.otherProducts = item[1];
- this.forwardDisable = false;
- if (this.backStack.length == 0) {
- this.backDisable = true;
- }
- },
+ // backwards() {
+ // if (this.backStack.length == 0) {
+ // this.backDisable = true;
+ // return;
+ // }
+ // this.forwardStack.push([this.productDetail, this.otherProducts]);
+ // let item = this.backStack.pop();
+ // this.productDetail = item[0];
+ // this.checkIsDefOrNot(this.productDetail.productBaseId);
+ // this.otherProducts = item[1];
+ // this.forwardDisable = false;
+ // if (this.backStack.length == 0) {
+ // this.backDisable = true;
+ // }
+ // },
forwards() {
if (this.forwardStack.length == 0) {
this.forwardDisable = true;
@@ -793,18 +804,18 @@
})
.catch((e) => {});
},
- toActivatePage(item) {
- this.checkDetail(item, "inactive");
- this.actType = this.activeTab;
- this.actId = item.id;
- this.actStep = 0;
- this.activeCode = "";
- this.activedSdkOrApp = this.newActInfo();
- },
- cancelActivate() {
- this.showInputCode = false;
- this.activeCode = "";
- },
+ // toActivatePage(item) {
+ // this.checkDetail(item, "inactive");
+ // this.actType = this.activeTab;
+ // this.actId = item.id;
+ // this.actStep = 0;
+ // this.activeCode = "";
+ // this.activedSdkOrApp = this.newActInfo();
+ // },
+ // cancelActivate() {
+ // this.showInputCode = false;
+ // this.activeCode = "";
+ // },
newActInfo() {
return {
activateCode: "",
@@ -842,25 +853,21 @@
getUnActivedApp().then((res) => {
if (res.code == 200) {
this.unActivedAppList = res.data;
+ this.pickTab()
}
});
},
- actived() {
+ actived(item) {
let _this = this;
- if (this.activeCode.trim() == "") {
- this.$notify.error("婵�娲荤爜涓嶈兘涓虹┖");
- return;
- }
- if (this.actType == "sdk") {
- //婵�娲荤畻娉�
- actPageAlg(this.actId, this.activeCode)
+ if (this.activeTab == "sdk") {
+ actPageAlg(item.id, "")
.then((res) => {
if (res.data.isSuccess) {
this.productDetailVisible = false;
_this.activedSdkOrApp = res.data.successMsg;
this.showActivateSuccess = true;
_this.actStep++;
- _this.getUnActivedList();
+ _this.getUnActivedList(1);
_this.getAllSdk();
} else {
_this.$notify.error(res.data.failMsg.failMsg);
@@ -869,9 +876,9 @@
.catch((e) => {
console.log(e);
});
- } else if (this.actType == "app") {
+ } else if (this.activeTab == "app") {
//婵�娲诲簲鐢�
- actApp(this.actId, this.activeCode)
+ actApp(item.id, "")
.then((res) => {
if (res.data.isSuccess) {
this.productDetailVisible = false;
@@ -889,10 +896,10 @@
});
}
},
- checkMyAlgorith() {
- this.showActivateSuccess = false;
- this.activeName = "宸叉縺娲�";
- },
+ // checkMyAlgorith() {
+ // this.showActivateSuccess = false;
+ // this.activeName = "宸叉縺娲�";
+ // },
onFileUpload(file) {
this.patchFile = { ...file };
this.fileAdded = true;
@@ -928,12 +935,12 @@
this.$message.error(e.msg);
});
},
- openApp() {
- window.parent.postMessage(
- { msg: "toOpenApp?" + this.productDetail.productBaseId },
- "*"
- );
- },
+ // openApp() {
+ // window.parent.postMessage(
+ // { msg: "toOpenApp?" + this.productDetail.productBaseId },
+ // "*"
+ // );
+ // },
onFileAdded(f) {
this.patchUpdateStatus = "";
},
@@ -968,25 +975,26 @@
this.notInstalledList = unInstalledList;
this.toUpdateArr1 = this.installedList.slice(0, 10);
this.hasNewVersionSdk = hasNewVersionList;
+ this.pickTab()
},
- unloadSDKinWin() {
- let appToUnload;
- let sdkToUnload;
- if (this.productDetail.productTypeName == "搴旂敤") {
- appToUnload = this.installedApps.find((item) => {
- return item.id == this.productDetail.productBaseId;
- });
- this.unloadApp(appToUnload);
- } else {
- sdkToUnload = this.installedList.find((item) => {
- return item.id == this.productDetail.productBaseId;
- });
- this.unloadSdk(sdkToUnload);
- }
- },
- unLoadSdkOrApp(item) {
- this.activeTab == "sdk" ? this.unloadSdk(item) : this.unloadApp(item);
- },
+ // unloadSDKinWin() {
+ // let appToUnload;
+ // let sdkToUnload;
+ // if (this.productDetail.productTypeName == "搴旂敤") {
+ // appToUnload = this.installedApps.find((item) => {
+ // return item.id == this.productDetail.productBaseId;
+ // });
+ // this.unloadApp(appToUnload);
+ // } else {
+ // sdkToUnload = this.installedList.find((item) => {
+ // return item.id == this.productDetail.productBaseId;
+ // });
+ // this.unloadSdk(sdkToUnload);
+ // }
+ // },
+ // unLoadSdkOrApp(item) {
+ // this.activeTab == "sdk" ? this.unloadSdk(item) : this.unloadApp(item);
+ // },
unloadSdk(sdk) {
let _this = this;
this.$confirm("纭畾瑕佸嵏杞借绠楁硶鍚�?", "鎻愮ず")
@@ -1021,6 +1029,7 @@
clearInterval(timer);
item.upgradeLoading = false;
this.downloadItem = "";
+
window.parent.postMessage({ msg: "AppUpdate" }, "*");
})
.catch((err) => {
diff --git a/src/pages/ai/index/detail.vue b/src/pages/ai/index/detail.vue
index a976d87..7107391 100644
--- a/src/pages/ai/index/detail.vue
+++ b/src/pages/ai/index/detail.vue
@@ -546,7 +546,8 @@
.then((res) => {
if (res && res.success) {
app.unloadLoading = false;
- _this.getAllApps();
+ // _this.getAllApps();
+ this.$emit("flushApp")
window.parent.postMessage(
{
msg: "AppUpdate",
@@ -766,7 +767,8 @@
if (res && res.success) {
sdk.unloadLoading = false;
this.$notify.success("鍗歌浇瀹屾垚");
- _this.getAllSdk();
+ // _this.getAllSdk();
+ this.$emit("flushSdk")
window.parent.postMessage({ msg: "AppUpdate" }, "*");
}
})
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index 266c4b7..369adf6 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -14,10 +14,7 @@
<div class="app" v-if="item.url" @click="dockClick(item)">
<div class="wrap">
<div class="app-icon">
- <div
- class="badge"
- v-if="item.name == 'algorithmManage' && badgeNum > 0"
- >
+ <div class="badge" v-if="item.name == 'algorithmManage' && badgeNum > 0">
{{ badgeNum }}
</div>
<img :src="item.src" :alt="item.alt" />
@@ -29,11 +26,7 @@
<div class="wrap">
<div class="app-icon">
<img
- :src="
- item.iconBlob.indexOf(',') > 0
- ? item.iconBlob
- : `data:image/png;base64,${item.iconBlob}`
- "
+ :src="item.iconBlob.indexOf(',') > 0 ? item.iconBlob : `data:image/png;base64,${item.iconBlob}`"
/>
</div>
<div class="app-name">{{ item.sdk_name }}</div>
@@ -61,7 +54,7 @@
return {
publicPath: process.env.BASE_URL,
loading: true,
- installedSdk: [],
+ installedSdk: []
// sdkList: [
// {
// src: 'data:image/png;base64,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',
@@ -105,7 +98,7 @@
} else {
return 3;
}
- },
+ }
},
mounted() {
this.getAllSdk();
@@ -194,7 +187,7 @@
id: dock.id,
icon: dock.src,
title: dock.title,
- url: dock.url,
+ url: dock.url
});
this.$store.commit("desktop/addMinDock", {
id: dock.id,
@@ -203,7 +196,7 @@
type: "3",
highlight: true,
url: dock.url,
- screenshot: "",
+ screenshot: ""
});
//鎵撳紑搴旂敤鍚庡紓姝ユ姄鎷�,涔嬪悗鐨勬姄鎷嶉噰鐢ㄨ繖寮犲浐瀹氱殑
//if(dock.name=='cameraVideo'||dock.name=='search'||dock.name=='library'||dock.name=='cameraAccess'||dock.name=='dataStack'){
@@ -240,7 +233,7 @@
id: dock.id,
icon: dock.src,
title: dock.title,
- url: dock.url + "?" + params,
+ url: dock.url + "?" + params
});
this.$store.commit("desktop/addMinDock", {
id: dock.id,
@@ -249,7 +242,7 @@
type: "3",
highlight: true,
url: dock.url,
- screenshot: "",
+ screenshot: ""
});
},
addFrameByID(id, params) {
@@ -264,8 +257,8 @@
}
});
this.dockClick(dock);
- },
- },
+ }
+ }
};
</script>
@@ -366,4 +359,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0