From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:22:41 +0800
Subject: [PATCH] 解决冲突
---
src/views/hashrate/AlgManage/index.vue | 74 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 22 deletions(-)
diff --git a/src/views/hashrate/AlgManage/index.vue b/src/views/hashrate/AlgManage/index.vue
index c09b0d0..3619277 100644
--- a/src/views/hashrate/AlgManage/index.vue
+++ b/src/views/hashrate/AlgManage/index.vue
@@ -10,7 +10,7 @@
<div class="algCard" v-for="(item, index) in payAlg" :key="index">
<img :src="item.logoUrl" alt="" draggable="false" />
<div class="name">{{ item.productName }}</div>
- <span class="button pay">璐拱</span>
+ <span class="button pay" @click="toDetail(item.id)">璐拱</span>
</div>
</div>
@@ -18,7 +18,7 @@
<div class="label freeLabel">
鍏嶈垂绠楁硶 <span class="des">浠庢澶勬嫋鎷界畻娉曞浘鏍囧畨瑁呭埌璁惧</span>
</div>
- <div class="freeList">
+ <div class="freeList scroll">
<div
class="algCard"
v-for="(item, index) in freeAlg"
@@ -32,7 +32,7 @@
@dragstart="dragStart(item)"
/>
<div class="name">{{ item.productName }}</div>
- <span class="button detail">鏌ョ湅璇︽儏</span>
+ <span class="button detail" @click="toDetail(item.id)">鏌ョ湅璇︽儏</span>
</div>
</div>
</div>
@@ -49,29 +49,29 @@
<div class="algList">
<!-- 绠楁硶card -->
<Card
- v-for="(alg, index) in item.sdkList"
+ v-for="(alg, index) in item.sdkList1"
:key="index"
:alg="alg"
:devId="item.devId"
- @unInstall="item.sdkList.splice(index, 1)"
+ @unInstall="item.sdkList1.splice(index, 1)"
></Card>
<!-- 鎷栨嫿瀛樻斁box -->
<div
class="dropBox"
v-if="dragAlg"
@dragover="dragover($event)"
- @drop="drop(item.sdkList, item.devId)"
+ @drop="drop(item.sdkList1, item.devId)"
>
璇锋嫋鍔ㄥ埌姝ゅ
</div>
<!-- 绌虹畻娉曟儏鍐� -->
<div
class="empty"
- v-if="item.sdkList && item.sdkList.length === 0 && !dragAlg"
+ v-if="item.sdkList1 && item.sdkList1.length === 0 && !dragAlg"
>
- <img src="/images/hashrate/绠楁硶绠＄悊绌洪〉闈�.png" alt="" />
+ <img src="/images/hashrate/sdkEmpty.png" alt="" />
<div class="des">
- 鏆傛湭瀹夎绠楁硶锛屼粠宸︿晶绠楁硶涓績鎷栧埌绠楁硶鍒版澶勶紝鍗冲彲瀹夎
+ 鏆傛湭瀹夎绠楁硶锛屼粠宸︿晶绠楁硶涓績绠楁硶鍒版澶勶紝鍗冲彲瀹夎
</div>
</div>
</div>
@@ -164,7 +164,12 @@
console.log(item);
}
- item.logoUrl = "/httpImage/" + item.logoUrl;
+ if (
+ item.logoUrl.indexOf("http://apps.smartai.com/httpImage/") === -1
+ ) {
+ item.logoUrl = "/httpImage/" + item.logoUrl;
+ }
+
if (item.priceBase === 0) {
this.freeAlg.push(item);
} else {
@@ -178,7 +183,19 @@
async getEquipment() {
const res = await findAllSdk();
if (res && res.success) {
- this.equipmentArr = res.data;
+ this.equipmentArr = [];
+ res.data.forEach((item, index) => {
+ if (item.sdkList) {
+ let sdkList1 = [];
+ item.sdkList.forEach((sdk) => {
+ if (sdk.installed) {
+ sdkList1.push(sdk);
+ }
+ });
+ item.sdkList1 = sdkList1;
+ this.equipmentArr.push(item);
+ }
+ });
}
},
//鎷栨嫿寮�濮�
@@ -196,16 +213,21 @@
sdk_name: this.dragAlg.productName,
});
- const res = await downloadOrUpgrade({
- nodeId: devId,
- path: this.dragAlg.productBaseId,
- userId: JSON.parse(sessionStorage.getItem("userInfo")).id,
- });
- if (res && res.success) {
- this.$notify({
- type: "success",
- message: "鎿嶄綔鎴愬姛,璇风◢鍚�",
+ try {
+ const res = await downloadOrUpgrade({
+ nodeId: devId,
+ path: this.dragAlg.productBaseId,
+ userId: JSON.parse(sessionStorage.getItem("userInfo")).id,
+ inputText: this.dragAlg.productName,
});
+ if (res && res.success) {
+ this.$notify({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛,璇风◢鍚�",
+ });
+ }
+ } catch (err) {
+ algArr.pop();
}
this.dragAlg = null;
@@ -236,7 +258,7 @@
let devObj = {};
let sdkIds = [];
devObj.devId = dev.devId;
- dev.sdkList.forEach((sdk) => {
+ dev.sdkList1.forEach((sdk) => {
if (sdk.isUpgrade) {
sdkIds.push(sdk.id);
}
@@ -252,10 +274,18 @@
if (res && res.success) {
this.$notify({
type: "success",
- message: "鎿嶄綔鎴愬姛",
+ message: res.msg,
});
}
},
+ toDetail(id) {
+ this.$router.push({
+ path: "/productDetail",
+ query: {
+ id: id,
+ },
+ });
+ },
},
};
</script>
--
Gitblit v1.8.0