From 0b737708e696c45720499759b5c31aced87fdbb6 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期三, 07 七月 2021 14:10:03 +0800
Subject: [PATCH] merge master
---
src/pages/ai/index/App.vue | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/pages/ai/index/App.vue b/src/pages/ai/index/App.vue
index 187b5ef..acaffc7 100644
--- a/src/pages/ai/index/App.vue
+++ b/src/pages/ai/index/App.vue
@@ -33,7 +33,8 @@
:element-loading-text="item.progressMsg"
element-loading-background="rgba(0,0,0,.8)"
>
- <i class="iconfont iconupdate" v-if="item.isUpgrade"></i>
+ <!-- <i class="iconfont iconupdate" v-if="item.isUpgrade"></i> -->
+ <img class="update-icon" v-if="item.isUpgrade" src="../../../assets/img/鏇存柊鎻愮ず.png" alt="">
<div class="mask" v-if="!item.isDefault || item.isUpgrade">
<div class="left-top">
<div>褰撳墠鐗堟湰:{{ item.version }}</div>
@@ -158,7 +159,9 @@
:element-loading-text="item.progressMsg"
element-loading-background="rgba(0,0,0,.8)"
>
- <i class="iconfont iconupdate" v-if="item.isUpgrade"></i>
+ <!-- <i class="iconfont iconupdate" v-if="item.isUpgrade"></i> -->
+ <img class="update-icon" v-if="item.isUpgrade" src="../../../assets/img/鏇存柊鎻愮ず.png" alt="">
+
<div class="mask">
<div class="left-top">
<div>褰撳墠鐗堟湰:{{ item.version }}</div>
@@ -195,7 +198,7 @@
/>
<img v-else class="baseImg" :src="item.icon" alt />
</div>
- <div class="alg-name">
+ <div class="alg-name" style="color:grey;">
<div style="padding: 0px 10px 0px 10px">
<span v-if="!item.isEdit">{{ item.name }}</span>
<el-input
@@ -223,12 +226,19 @@
element-loading-background="rgba(0,0,0,.8)"
>
<div class="mask">
- <el-button
- size="small"
- type="primary"
- class="bot-btn"
+ <div class="left-top">
+ <div v-if="item.remoteVersion">鏈�鏂扮増鏈�:{{ item.remoteVersion }}</div>
+ </div>
+ <!-- v-if="!item.isDefault" -->
+ <div class="info-onmask" @click="checkDetail(item,'active')">鏌ョ湅璇︽儏</div>
+ <div class="mask-btn">
+ <el-button
@click="downloadApp(item)"
- >瀹夎</el-button>
+ type="primary"
+ size="small"
+ class="bot-btn"
+ >瀹夎</el-button>
+ </div>
</div>
<img
v-if="item.iconBlob"
@@ -444,7 +454,9 @@
:element-loading-text="item.progressMsg"
element-loading-background="rgba(0,0,0,.8)"
>
- <i class="iconfont iconupdate" v-if="item.isUpgrade"></i>
+ <!-- <i class="iconfont iconupdate" v-if="item.isUpgrade"></i> -->
+ <img class="update-icon" v-if="item.isUpgrade" src="../../../assets/img/鏇存柊鎻愮ず.png" alt="">
+
<div class="mask" v-if="!item.isDefault || item.isUpgrade">
<div class="left-top">
<div>褰撳墠鐗堟湰:{{ item.version }}</div>
@@ -510,7 +522,9 @@
:element-loading-text="item.progressMsg"
element-loading-background="rgba(0,0,0,.8)"
>
- <i class="iconfont iconupdate" v-if="item.isUpgrade"></i>
+ <!-- <i class="iconfont iconupdate" v-if="item.isUpgrade"></i> -->
+ <img class="update-icon" v-if="item.isUpgrade" src="../../../assets/img/鏇存柊鎻愮ず.png" alt="">
+
<div class="mask">
<div class="left-top">
<div>褰撳墠鐗堟湰:{{ item.version }}</div>
@@ -2026,7 +2040,7 @@
.el-tabs--border-card > .el-tabs__content {
padding: 0 !important;
overflow: auto !important;
- background-color: #1c364a;
+ background-color: #fff;
}
.el-tabs__content {
padding: 0 !important;
@@ -2070,7 +2084,8 @@
}
}
.task-list {
- background: #1c364a;
+ // background: #1c364a;
+ background: #fff;
padding: 20px;
box-sizing: border-box;
@@ -2464,7 +2479,7 @@
font-family: PingFangSC-Regular;
font-size: 14px;
letter-spacing: 0.05em;
- color: #fff;
+ color: #333;
// background-color: #ecf5ff;
.el-input {
position: relative;
@@ -2515,6 +2530,13 @@
}
}
.willUpGrade {
+ .update-icon {
+ position: absolute;
+ top: -8px;
+ right: -8px;
+ z-index: 999;
+
+ }
.iconupdate {
color: #01e667;
position: absolute;
@@ -2522,6 +2544,7 @@
right: 5px;
font-weight: 550;
font-size: 26px;
+ z-index: 999;
}
}
&.uninstall {
@@ -2529,7 +2552,7 @@
filter: grayscale(100%);
}
.alg-name {
- color: #ffffff;
+ color: grey;
}
}
}
--
Gitblit v1.8.0