From 422498ecd4dd1485990781d31c2b449d8ad93523 Mon Sep 17 00:00:00 2001
From: Jo <479214531@qq.com>
Date: Fri, 18 Mar 2022 18:15:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/bug.png                  | Bin 0 -> 558 bytes
 src/assets/img/func.png                 | Bin 0 -> 708 bytes
 src/assets/img/optimize.png             | Bin 0 -> 527 bytes
 src/views/serve/addModel.vue            |   2 +-
 src/views/serve/backstage/modelType.vue |  25 +++++++++++++++---------
 src/views/system/manageLog.vue          |  22 ++++++++++++++++-----
 6 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 src/assets/img/bug.png
 create mode 100644 src/assets/img/func.png
 create mode 100644 src/assets/img/optimize.png

diff --git a/src/assets/img/bug.png b/src/assets/img/bug.png
new file mode 100644
index 0000000000000000000000000000000000000000..abdd648b65ce2bc853b0cf01af92b8d5362c006e
GIT binary patch
literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$=t)FDR5(w~ls#w^K@`XTZ`VR0yAdH4a##e(&Fn%<r3fj`PCKjA7ABQ~ou#qV
zMi48tu+}CBDXfx41RFtEXBJW(LJ)-P#1Du!PiDP6Z+El1SNfV|=KbIAeKAXz!Lok8
z?_^<`rd@Js6J$bMA)@C1;;}Aa=JinP_f2t)K<@QU9R|S=z?n+$w>e{aG#vgs4mts5
zLfj<Z{}3d}XD7_0yhVVku4W9Zhf2M04im=_k4Be5tzWwH1Zbq(0k8niTXRq&#Gq{)
zf!4bY25Vmd_!=m6wG8~{1ekAk4L|o2J<Y%4B1*ub{Bg!&30>S|8dd}5(7&yh+hxw%
z0g>}f+iuZnaar5){|Piwa_g{~TP}qKN>Sdj5n{sv=kkRST?BBWq-+2(^BV>}=5fH6
zK<j6<86HS^*8?8U1O)DdN<Es^)_{j`yu#MzStr(1p|z`Fn!alVW=l(gd|%B1bTg~Y
zzI0)hm(SwpXbZq;0J5t>0Ivh3){d=^2ZIye_xHCLxa?Vb{kQKgcy2k&8yL4tMB5B}
zV&EY&uXsfFtI$b>2SRK*0Wn{j)B0_Z^+yz)A6dKT&er#b^GUK-_)HYt0rL~f{9s<|
w&DzuZ6~`A&P6c#5WaqEOwEnSY0ai7C0LGBp6*Y*FPXGV_07*qoM6N<$f~m^-djJ3c

literal 0
HcmV?d00001

diff --git a/src/assets/img/func.png b/src/assets/img/func.png
new file mode 100644
index 0000000000000000000000000000000000000000..a502de1fad729b90c719f71608ee4cca577b2bbb
GIT binary patch
literal 708
zcmV;#0z3VQP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%en~_@R5(wqlubw#Q547jXGW++B*@IOq828&Xb~-{O&f!HU%KdP?t`LKa^<q1
za+R)%3^x%iGSUpHxdtuD_hu4&iy$!C2E`*>%8UpVEevN)-1m6n`xs53yPJE@`JMYe
z_dkcQjny`19a=dhzigI5Tjd#fF+v({bBNL9j6JeZUK7wLi0h<rF9J;Y89AvEtFSVJ
z@U3;N{ctJ!U^Ncf1T<Z19!%Yv$|BtKlJ>p-22>y>nnu9iE6}jGoS7+B1T-wu5hVbf
zu{R_xg6TlhIdRcX%9C}#_P6H`hAsLq2!oYgm6Lq{R`pvY8BXpJfuGkG<Y7N0@0Qa{
z+uDUzZ35sk0CrRZ{ghq4eWGApW};^R7X6gnVa(;aDB!Pkz%}0M_sFFR(6O!pG|?zg
z54Db^%*#c!Z#vd3fbO&gzjl_g`Bl>qD!IL}cqG|$gdIt%MiF}aq&;iqt$t-6qaf~+
z&TstF@<WpoLLR7EEP52v5$^zG*Li%yOUW_iK@IG98Trw0t!v9kIc_@QA%LM8RX?C{
zuPPP+jr@gf(zN*~h-lJJz8Xll)>&p6SN+>vu-bm6<%;3v28sD`Lz_P90cSP_GCuif
z`*>nD*U367E0rHbL7IwJ$kI>QVqLPEdkW_MnySCSe8f-7lIaMpT89H3C0*}}Vu>a}
z;S(jd&WBM_oes`(NDFEx#2K9!FTAvUvG#0TvLnWb_-Of%sSCiq*uSM_Gj8&1IKE6r
zC<!MvgKi6$c%M7RA-}GDbq<0lX!;%k_W?)~^A#^Gr(-3@-Nbao0vN{#JmjV1qkpxa
q?or}`)yQx8!~4DLjJp+>iuntk6B1l0kQBZE0000<MNUMnLSTa1Tt%n=

literal 0
HcmV?d00001

diff --git a/src/assets/img/optimize.png b/src/assets/img/optimize.png
new file mode 100644
index 0000000000000000000000000000000000000000..32be75f293a971515063cd9fab39850faff5801a
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$$w@>(R5(wql!0;LFc3xGiU#Q5RDwGQ9h}nv6~wp#d=-GxK)4D*I^a6+b)f5j
zD*!388<{hSF}ay&#xqE0|L*?(wZa!KxrLWDzCft#UZRycbW<^tfClE+5?L8Y{yhac
z4cPjQ$U^FHv;sGNj^iLzD6Um`0hl(vMEH)wlbGkAMyl|V0ZSZfI~R^b0*M!?!@f^&
z2278BMPfmu(Uwx{_e6F$mcU&O_|>0D70R^n9!G=F$wSz_<;g3xURzlV_Da5H)+BoQ
zXdJ>ba6fE2wZ7~3qkvi2gJ$nDpA%^(k%mMmbvPImgJOn&T6*9_hqKCdQiW!W{M33q
zUlJ*qQIPQc-G6{tL2FH0bQF_-(GshjJdvVz!dC#!ht|4OS^GPo+<ms?6*IHfd{kxS
zL`y%5B2-d^pF<watBxlk_qRlOZ<~;9Q<$o{W~@p421==dA6jh8Hfn`$Bz{O8f*Bj0
z%<O`i{;%zojzoPnwy;L{^Fd|v)1zOizm${wsr9#<j8m<!B-zW+|Mh(z5%%&Bb|0SJ
z6~B!RhoP$P<8F<wMIKpNwT`c6B6TmuSP`EYunPJ%4<p+tu#4evZNB~Q`75`|{uTbH
R5l8?4002ovPDHLkV1n0(@$LWs

literal 0
HcmV?d00001

diff --git a/src/views/serve/addModel.vue b/src/views/serve/addModel.vue
index 7f3983e..ec6b255 100644
--- a/src/views/serve/addModel.vue
+++ b/src/views/serve/addModel.vue
@@ -15,7 +15,7 @@
         </el-card>
         
         <el-card shadow="hover">
-            <el-form ref="form" label-width="120px" :disabled="isDetail">
+            <el-form label-width="80px" :disabled="isDetail">
                 <el-form-item label="模型名称">
                     <el-input placeholder="请输入模型名称" v-model="form.modelName" maxlength="25" style="width: 400px"></el-input>
                 </el-form-item>
diff --git a/src/views/serve/backstage/modelType.vue b/src/views/serve/backstage/modelType.vue
index 8d4490b..aeae4b1 100644
--- a/src/views/serve/backstage/modelType.vue
+++ b/src/views/serve/backstage/modelType.vue
@@ -109,17 +109,24 @@ export default {
         getSingle() {
             this.$emit('initData')
         },
-        syncModel() {
-          this.$confirm('同步后当前的组织架构将会被删除，是否继续？', '提示', {
-            type: 'warning'
-          }).then(() => {
-          // 同步原始模型前删除原有数据
+        syncModelData() {
+            // 同步原始模型前删除原有数据
             this.$post(`${this.api.delModelInfoBySystemId}?systemId=${this.systemId}`).then(res => {
-              this.$post(`${this.api.synchronizationMdel}?systemId=${this.systemId}`).then(res => {
-                this.getType()
-              })
+                this.$post(`${this.api.synchronizationMdel}?systemId=${this.systemId}`).then(res => {
+                    this.getType()
+                })
             }).catch(() => {})
-          }).catch(() => {})
+        },
+        syncModel() {
+            if (this.orgList.length) {
+                this.$confirm('同步后当前的组织架构将会被删除，是否继续？', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.syncModelData()
+                }).catch(() => {})
+            } else {
+                this.syncModelData()
+            }
         },
         // 同步原始模型
         syncModel1() {
diff --git a/src/views/system/manageLog.vue b/src/views/system/manageLog.vue
index cffb430..3170c19 100644
--- a/src/views/system/manageLog.vue
+++ b/src/views/system/manageLog.vue
@@ -45,7 +45,7 @@
                         </div>
                         <ul class="detail">
                             <li v-for="(item, i) in item.logContents" :key="i">
-                                <p class="name">{{ funcList.find(e => e.id === item.type).name }}</p>
+                                <p class="name"><img :src="require('@/assets/img/' + funcList.find(e => e.id === item.type).icon + '.png')" alt=""> {{ funcList.find(e => e.id === item.type).name }}</p>
                                 <div class="val">
                                     <p class="" v-for="(item, i) in item.content" :key="i">{{ item }}</p>
                                 </div>
@@ -71,15 +71,18 @@ export default {
             funcList: [
                 {
                     id: 0,
-                    name: '新功能'
+                    name: '新功能',
+                    icon: 'func'
                 },
                 {
                     id: 1,
-                    name: '修复'
+                    name: '修复',
+                    icon: 'bug'
                 },
                 {
                     id: 2,
-                    name: '优化'
+                    name: '优化',
+                    icon: 'optimize'
                 }
             ]
         };
@@ -174,8 +177,11 @@ export default {
         font-size: 18px;
     }
 }
-.timeline {
+/deep/.timeline {
     margin-left: 20%;
+    .el-timeline-item__wrapper {
+        padding-left: 40px;
+    }
     .sign {
         margin: -11px 0 0 -16%;
         font-size: 14px;
@@ -212,9 +218,15 @@ export default {
             margin-bottom: 20px;
         }
         .name {
+            display: flex;
+            align-items: center;
             margin-bottom: 5px;
             font-size: 14px;
             color: #9984f1;
+            img {
+                margin-right: 5px;
+                margin-left: -25px;
+            }
         }
         .val {
             font-size: 15px;