diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue
index 33888fac8..025c33e0d 100644
--- a/src/pages/config/pages/linkManage/linkType/firstLink.vue
+++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue
@@ -57,7 +57,7 @@
label="链接图标">
- {{'-'}}
+ {{ '-' }}
import Sortable from 'sortablejs'
-import { getImg } from '@/api/linkApi.js'
+import {getImg} from '@/api/linkApi.js'
export default {
name: "firstLink",
@@ -415,11 +415,12 @@ export default {
this.sarStandardsInfoEO.url = row.url
this.sarStandardsInfoEO.sortId = row.sortId
this.sarStandardsInfoEO.icon = row.icon
- if (row.id !== '') {
+ if (row.icon !== '') {
let imgId = {
id: row.id
}
- getImg(imgId).then(res=>{
+ // 图片转base64
+ getImg(imgId).then(res => {
if (res.ok) {
const src =
"data:image/png;base64," +
@@ -445,26 +446,25 @@ export default {
loading: 'Loading'
}, res => {
this.linkList = res.data
- res.data.forEach(item=>{
+ res.data.forEach(item => {
if (item.type === 1) {
this.linkListFirst.push(item)
}
})
- this.linkListFirst.forEach(item=>{
- if (item.id !== '') {
+ this.linkListFirst.forEach(item => {
+ if (item.icon !== '') {
let imgId = {
id: item.id
}
- getImg(imgId).then(res=>{
- if (res.ok) {
- const src =
- "data:image/png;base64," +
- btoa(
- new Uint8Array(res).reduce(
- (data, byte) => data + String.fromCharCode(byte), "")
- )
- item.icon = src
- }
+ // 图片转base64
+ getImg(imgId).then(res => {
+ const src =
+ "data:image/png;base64," +
+ btoa(
+ new Uint8Array(res).reduce(
+ (data, byte) => data + String.fromCharCode(byte), "")
+ )
+ item.icon = src
})
}
})
@@ -526,13 +526,16 @@ export default {
position: relative;
overflow: hidden;
}
+
.avatar-uploader .el-upload:hover {
margin-top: 10px;
border-color: #409EFF;
}
+
.avatar-uploader {
margin-top: 10px;
}
+
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
@@ -541,15 +544,18 @@ export default {
line-height: 100px;
text-align: center;
}
+
.avatar {
width: 100px;
height: 100px;
display: block;
}
+
.filter-tree {
height: calc(~'100% - 50px')
}
- /deep/.el-input.is-disabled .el-input__inner {
+
+ /deep/ .el-input.is-disabled .el-input__inner {
background-color: #fff;
}
}
diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue
index 3d6f40b46..b785a6b94 100644
--- a/src/pages/config/pages/linkManage/linkType/secondLink.vue
+++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue
@@ -56,7 +56,8 @@
prop="icon"
label="链接图标">
-
+
+ {{ '-' }}
-
@@ -153,8 +153,9 @@