diff --git a/src/assets/img/bug.png b/src/assets/img/bug.png new file mode 100644 index 0000000..abdd648 Binary files /dev/null and b/src/assets/img/bug.png differ diff --git a/src/assets/img/func.png b/src/assets/img/func.png new file mode 100644 index 0000000..a502de1 Binary files /dev/null and b/src/assets/img/func.png differ diff --git a/src/assets/img/optimize.png b/src/assets/img/optimize.png new file mode 100644 index 0000000..32be75f Binary files /dev/null and b/src/assets/img/optimize.png differ 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 @@ - + 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 @@
  • -

    {{ funcList.find(e => e.id === item.type).name }}

    +

    {{ funcList.find(e => e.id === item.type).name }}

    {{ item }}

    @@ -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;