From ec2091875f7c472617e45851bcf22fa583ad4037 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 2 Dec 2021 10:36:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=9B=BE=E7=89=87=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/linkManage/linkType/firstLink.vue   | 42 +++++----
 .../pages/linkManage/linkType/secondLink.vue  | 45 ++++++----
 .../home2/components/empennage/index.vue      | 88 ++++++++-----------
 3 files changed, 86 insertions(+), 89 deletions(-)

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="链接图标">
           <template slot-scope="scope">
             <img v-if="scope.row.icon !== ''" style="height: 50px;width: 50px" :src="scope.row.icon">
-            <span v-else>{{'-'}}</span>
+            <span v-else>{{ '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -154,7 +154,7 @@
 
 <script>
 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="链接图标">
           <template slot-scope="scope">
-            <img style="height: 50px;width: 50px" :src="scope.row.icon">
+            <img v-if="scope.row.icon !== ''" style="height: 50px;width: 50px" :src="scope.row.icon">
+            <span v-else>{{ '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -131,7 +132,6 @@
             :before-upload="beforeAvatarUpload">
             <img v-if="imageUrl" :src="imageUrl" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-
           </el-upload>
         </el-form-item>
         <el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
@@ -153,8 +153,9 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { getImg } from '@/api/linkApi.js'
+import {getImg} from '@/api/linkApi.js'
 import listOfCost from "../../../../regulatoryRepository/dataStatis/page/listOfCost";
+
 export default {
   name: "secondLink",
   data() {
@@ -414,20 +415,19 @@ 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=>{
-          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), "")
+            )
+          this.imageUrl = src
         })
       }
       this.dialogTitle = '修改链接'
@@ -444,17 +444,18 @@ export default {
         loading: 'Loading'
       }, res => {
         this.linkList = res.data
-        res.data.forEach(item=>{
+        res.data.forEach(item => {
           if (item.type === 2) {
             this.linkListSecond.push(item)
           }
         })
-        this.linkListSecond.forEach(item=>{
-          if (item.id !== '') {
+        this.linkListSecond.forEach(item => {
+          if (item.icon !== '') {
             let imgId = {
               id: item.id
             }
-            getImg(imgId).then(res=>{
+            // 图片转base64
+            getImg(imgId).then(res => {
               if (res.ok) {
                 const src =
                   "data:image/png;base64," +
@@ -525,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;
@@ -540,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/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue
index 23244528b..f030f13e2 100644
--- a/src/pages/home2/components/empennage/index.vue
+++ b/src/pages/home2/components/empennage/index.vue
@@ -57,7 +57,8 @@
 </template>
 
 <script>
-import { getImg } from '@/api/linkApi.js'
+import {getImg} from '@/api/linkApi.js'
+
 export default {
   name: 'Empennage',
   components: {},
@@ -105,78 +106,61 @@ export default {
         _this: this,
         loading: 'Loading'
       }, res => {
-      /*  let b = 0
-        let c = 0
-        for (let a = 0; a < res.data.length; a++) {
-          b += res.data[a].name.length * 14 + 100
-          if (b > width) {
-            c = a - 1
-          } else {
-            c = a
-          }
-        }*/
+        /*  let b = 0
+          let c = 0
+          for (let a = 0; a < res.data.length; a++) {
+            b += res.data[a].name.length * 14 + 100
+            if (b > width) {
+              c = a - 1
+            } else {
+              c = a
+            }
+          }*/
         /*let list
         list = res.data*/
-        res.data.forEach(item=>{
+        res.data.forEach(item => {
           if (item.type === 1) {
             this.linkListFirst.push(item)
-          } else if(item.type === 2) {
+          } else if (item.type === 2) {
             this.linkListSecond.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
             })
           }
         })
-        this.linkListSecond.forEach(item=>{
-          if (item.id !== '') {
+        this.linkListSecond.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
             })
           }
         })
       })
     },
-
-    getImgLink(row) {
-      let imgId = {
-        id: row.icon
-      }
-      getImg(imgId).then(res=>{
-        const src =
-          "data:image/png;base64," +
-          btoa(
-            new Uint8Array(res).reduce(
-              (data, byte) => data + String.fromCharCode(byte), "")
-          )
-        this.verifyImg = src;
-      })
-    }
   },
 
 }