From e08a59d6cfabd7c89fd8fa653e32862fcccab82b Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Tue, 9 May 2023 17:46:31 +0800
Subject: [PATCH] =?UTF-8?q?CN-983=20fix:=20=E6=A0=B7=E5=BC=8F=E6=8A=BD?=
 =?UTF-8?q?=E5=87=BA=E5=88=B0scss=E6=96=87=E4=BB=B6=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/components/index.scss          |   7 +-
 .../views/charts2/entityDetailBasicInfo.scss  | 185 +++++++++++++++++
 .../entityDetail/EntityDetailBasicInfo.vue    | 187 ------------------
 src/views/setting/KnowledgeBaseForm.vue       |   4 +-
 4 files changed, 191 insertions(+), 192 deletions(-)
 create mode 100644 src/assets/css/components/views/charts2/entityDetailBasicInfo.scss

diff --git a/src/assets/css/components/index.scss b/src/assets/css/components/index.scss
index 3c1f7d1b..53836a53 100644
--- a/src/assets/css/components/index.scss
+++ b/src/assets/css/components/index.scss
@@ -80,6 +80,7 @@
 @import 'views/administration/Appearance.scss';
 
 @import 'views/setting/knowledgeBase';
-@import "@/assets/css/components/views/charts2/entityDetailLine";
-@import "@/assets/css/components/views/charts2/entityDetailTabs";
-@import "@/assets/css/components/views/charts2/digitalCertificate";
+@import 'views/charts2/entityDetailLine';
+@import 'views/charts2/entityDetailTabs';
+@import 'views/charts2/digitalCertificate';
+@import 'views/charts2/entityDetailBasicInfo';
diff --git a/src/assets/css/components/views/charts2/entityDetailBasicInfo.scss b/src/assets/css/components/views/charts2/entityDetailBasicInfo.scss
new file mode 100644
index 00000000..7f1d6624
--- /dev/null
+++ b/src/assets/css/components/views/charts2/entityDetailBasicInfo.scss
@@ -0,0 +1,185 @@
+.theme-light .el-popper.analysis-popper {
+  top: -5px !important;
+  padding: 0;
+  border: 1px solid #C5C5C5;
+  border-radius: 4px;
+  box-shadow: -1px 1px 10px -1px rgba(205,205,205,0.85);
+
+  .el-popper__arrow {
+    display: none;
+  }
+  .analysis-entry {
+    display: flex;
+    flex-direction: column;
+
+    .analysis-entry__header {
+      height: 42px;
+      line-height: 42px;
+      background-color: #F7F7F7;
+      padding-left: 20px;
+      color: #353636;
+      border-radius: 4px 4px 0 0;
+    }
+    .analysis-entry__body {
+      display: flex;
+      height: 134px;
+      align-items: center;
+      justify-content: space-around;
+
+      .analysis-entry-item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        cursor: pointer;
+
+        &:hover {
+          div i, span {
+            color: #046ECA;
+          }
+        }
+        div {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-bottom: 9px;
+          height: 46px;
+          width: 46px;
+          border-radius: 50%;
+          background-color: #F5F6F8;
+
+          i {
+            color: #353636;
+            font-size: 22px;
+          }
+        }
+        span {
+          font-size: 12px;
+          color: #353636;
+        }
+      }
+    }
+  }
+}
+.entity-detail-basic-info {
+  position: relative;
+  padding: 35px 30px 0 30px;
+  height: 100%;
+  border: 1px solid #E2E5EC;
+  border-radius: 4px;
+
+  .dividing-line {
+    position: absolute;
+    top: 159px;
+    left: 30px;
+    height: 1px;
+    width: calc(100% - 60px);
+    background-color: #EFF2F5;
+  }
+  .entity-type {
+    color: #717171;
+  }
+  .entity-basic-info {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .entity-basic-info__name {
+      display: flex;
+      align-items: center;
+
+      span {
+        padding-right: 12px;
+        font-family: Helvetica-Bold;
+        font-size: 32px;
+        color: #353636;
+        font-weight: bold;
+      }
+      div {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 28px;
+        width: 28px;
+        border-radius: 50%;
+        background-color: #EFF1F4;
+        cursor: pointer;
+
+        i {
+          color: #717171;
+          font-size: 12px;
+        }
+      }
+    }
+    .analysis-btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 24px;
+      padding: 0 10px;
+      font-size: 12px;
+      color: #046ECA;
+      cursor: pointer;
+      background-color: #FFF;
+      transition: background-color linear .2s;
+
+      &.analysis-btn--active {
+        background-color: #EBF7FA;
+        border-radius: 2px;
+      }
+      i {
+        padding-right: 4px;
+        font-size: 14px;
+      }
+    }
+  }
+  .entity-tags {
+    display: flex;
+    align-items: center;
+    height: 60px;
+
+    .entity-tag {
+      margin-right: 10px;
+
+      &:last-of-type {
+        margin-right: 0;
+      }
+    }
+  }
+  .entity-detail-info {
+    display: flex;
+    flex-flow: row wrap;
+    align-content: space-around;
+    padding: 10px 0;
+    margin-top: 5px;
+
+    .detail-card {
+      display: flex;
+      padding: 0 12px;
+      width: 298px;
+      height: 83px;
+      align-items: center;
+
+      i {
+        font-size: 22px;
+        color: #353636;
+        margin-right: 14px;
+      }
+      .detail-card__text {
+        .detail-card__label {
+          margin-bottom: 6px;
+          font-size: 12px;
+          color: #717171;
+        }
+        .detail-card__value {
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 3;
+          overflow: hidden;
+          color: #222;
+          line-height: 18px;
+          font-size: 14px;
+        }
+      }
+    }
+  }
+}
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue b/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue
index 8494ac1a..c485f4ed 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailBasicInfo.vue
@@ -46,193 +46,6 @@
     </div>
   </div>
 </template>
-<style lang="scss">
-.theme-light .el-popper.analysis-popper {
-  top: -5px !important;
-  padding: 0;
-  border: 1px solid #C5C5C5;
-  border-radius: 4px;
-  box-shadow: -1px 1px 10px -1px rgba(205,205,205,0.85);
-
-  .el-popper__arrow {
-    display: none;
-  }
-  .analysis-entry {
-    display: flex;
-    flex-direction: column;
-
-    .analysis-entry__header {
-      height: 42px;
-      line-height: 42px;
-      background-color: #F7F7F7;
-      padding-left: 20px;
-      color: #353636;
-      border-radius: 4px 4px 0 0;
-    }
-    .analysis-entry__body {
-      display: flex;
-      height: 134px;
-      align-items: center;
-      justify-content: space-around;
-
-      .analysis-entry-item {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        cursor: pointer;
-
-        &:hover {
-          div i, span {
-            color: #046ECA;
-          }
-        }
-        div {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          margin-bottom: 9px;
-          height: 46px;
-          width: 46px;
-          border-radius: 50%;
-          background-color: #F5F6F8;
-
-          i {
-            color: #353636;
-            font-size: 22px;
-          }
-        }
-        span {
-          font-size: 12px;
-          color: #353636;
-        }
-      }
-    }
-  }
-}
-.entity-detail-basic-info {
-  position: relative;
-  padding: 35px 30px 0 30px;
-  height: 100%;
-  border: 1px solid #E2E5EC;
-  border-radius: 4px;
-
-  .dividing-line {
-    position: absolute;
-    top: 159px;
-    left: 30px;
-    height: 1px;
-    width: calc(100% - 60px);
-    background-color: #EFF2F5;
-  }
-  .entity-type {
-    color: #717171;
-  }
-  .entity-basic-info {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .entity-basic-info__name {
-      display: flex;
-      align-items: center;
-
-      span {
-        padding-right: 12px;
-        font-family: Helvetica-Bold;
-        font-size: 32px;
-        color: #353636;
-        font-weight: bold;
-      }
-      div {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 28px;
-        width: 28px;
-        border-radius: 50%;
-        background-color: #EFF1F4;
-        cursor: pointer;
-
-        i {
-          color: #717171;
-          font-size: 12px;
-        }
-      }
-    }
-    .analysis-btn {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 24px;
-      padding: 0 10px;
-      font-size: 12px;
-      color: #046ECA;
-      cursor: pointer;
-      background-color: #FFF;
-      transition: background-color linear .2s;
-
-      &.analysis-btn--active {
-        background-color: #EBF7FA;
-        border-radius: 2px;
-      }
-      i {
-        padding-right: 4px;
-        font-size: 14px;
-      }
-    }
-  }
-  .entity-tags {
-    display: flex;
-    align-items: center;
-    height: 60px;
-
-    .entity-tag {
-      margin-right: 10px;
-
-      &:last-of-type {
-        margin-right: 0;
-      }
-    }
-  }
-  .entity-detail-info {
-    display: flex;
-    flex-flow: row wrap;
-    align-content: space-around;
-    padding: 10px 0;
-    margin-top: 5px;
-
-    .detail-card {
-      display: flex;
-      padding: 0 12px;
-      width: 298px;
-      height: 83px;
-      align-items: center;
-
-      i {
-        font-size: 22px;
-        color: #353636;
-        margin-right: 14px;
-      }
-      .detail-card__text {
-        .detail-card__label {
-          margin-bottom: 6px;
-          font-size: 12px;
-          color: #717171;
-        }
-        .detail-card__value {
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 3;
-          overflow: hidden;
-          color: #222;
-          line-height: 18px;
-          font-size: 14px;
-        }
-      }
-    }
-  }
-}
-</style>
 <script>
 import chartMixin from '@/views/charts2/chart-mixin'
 import { drillDownPanelTypeMapping, entityType } from '@/utils/constants'
diff --git a/src/views/setting/KnowledgeBaseForm.vue b/src/views/setting/KnowledgeBaseForm.vue
index a23d1b44..6c1ac5da 100644
--- a/src/views/setting/KnowledgeBaseForm.vue
+++ b/src/views/setting/KnowledgeBaseForm.vue
@@ -879,11 +879,11 @@ export default {
           this.importedType = this.editObject.tagType
           this.initLoading = false
         } else {
-          this.errorMsgHandler(response)
+          this.$message.error(this.errorMsgHandler(response))
         }
       }).catch(e => {
         console.error(e)
-        this.errorMsgHandler(e)
+        this.$message.error(this.errorMsgHandler(e))
         this.$router.push({
           path: '/knowledgeBase',
           t: +new Date()