日志完善

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>

src/views/serve/backstage/modelType.vue

@@ -109,17 +109,24 @@ export default {
         getSingle() {
             this.$emit('initData')
         },
-        syncModel() {
+        syncModelData() {
-          this.$confirm('同步后当前的组织架构将会被删除，是否继续？', '提示', {
+            // 同步原始模型前删除原有数据
-            type: 'warning'
-          }).then(() => {
-          // 同步原始模型前删除原有数据
             this.$post(`${this.api.delModelInfoBySystemId}?systemId=${this.systemId}`).then(res => {
-              this.$post(`${this.api.synchronizationMdel}?systemId=${this.systemId}`).then(res => {
+                this.$post(`${this.api.synchronizationMdel}?systemId=${this.systemId}`).then(res => {
-                this.getType()
+                    this.getType()
-              })
+                })
             }).catch(() => {})
-          }).catch(() => {})
+        },
+        syncModel() {
+            if (this.orgList.length) {
+                this.$confirm('同步后当前的组织架构将会被删除，是否继续？', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    this.syncModelData()
+                }).catch(() => {})
+            } else {
+                this.syncModelData()
+            }
         },
         // 同步原始模型
         syncModel1() {

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;