diff --git a/src/components/Brand/brand.vue b/src/components/Brand/brand.vue index 75d436b..b598cdc 100644 --- a/src/components/Brand/brand.vue +++ b/src/components/Brand/brand.vue @@ -20,12 +20,13 @@ /*logo遮罩*/ .mask{ position: fixed; + width:200px; padding-left:10px; padding-right:10px; bottom:0px; left:0px; - background-color:#000000; - color:#ffffff; + background-color:#0F3F8D; + color:#0F3F8D; line-height:2 } diff --git a/src/components/Brand/brand.vue b/src/components/Brand/brand.vue index 75d436b..b598cdc 100644 --- a/src/components/Brand/brand.vue +++ b/src/components/Brand/brand.vue @@ -20,12 +20,13 @@ /*logo遮罩*/ .mask{ position: fixed; + width:200px; padding-left:10px; padding-right:10px; bottom:0px; left:0px; - background-color:#000000; - color:#ffffff; + background-color:#0F3F8D; + color:#0F3F8D; line-height:2 } diff --git a/src/utils/structure.js b/src/utils/structure.js index 34a6672..6dad0fd 100644 --- a/src/utils/structure.js +++ b/src/utils/structure.js @@ -30,7 +30,7 @@ export function toTreeList(plainList, id = '0', isSelect = false) { const pid = findPid(plainList) if (pid.length > 1) { - return plainList + return plainList.filter(item => item.tips !== 'hidden') } else { const tree = cleanChildren(buildTree(plainList, pid[0], isSelect)) return tree diff --git a/src/components/Brand/brand.vue b/src/components/Brand/brand.vue index 75d436b..b598cdc 100644 --- a/src/components/Brand/brand.vue +++ b/src/components/Brand/brand.vue @@ -20,12 +20,13 @@ /*logo遮罩*/ .mask{ position: fixed; + width:200px; padding-left:10px; padding-right:10px; bottom:0px; left:0px; - background-color:#000000; - color:#ffffff; + background-color:#0F3F8D; + color:#0F3F8D; line-height:2 } diff --git a/src/utils/structure.js b/src/utils/structure.js index 34a6672..6dad0fd 100644 --- a/src/utils/structure.js +++ b/src/utils/structure.js @@ -30,7 +30,7 @@ export function toTreeList(plainList, id = '0', isSelect = false) { const pid = findPid(plainList) if (pid.length > 1) { - return plainList + return plainList.filter(item => item.tips !== 'hidden') } else { const tree = cleanChildren(buildTree(plainList, pid[0], isSelect)) return tree diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue index 0f79681..13826c0 100644 --- a/src/views/system/dept/mergeDept.vue +++ b/src/views/system/dept/mergeDept.vue @@ -150,20 +150,14 @@ .then(() => { mergeDept(this.deptForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'info' - }).then(() => { - this.btnLoading = false - this.resetForm() - this.$nextTick(() => { - this.$refs['dataForm'].clearValidate() - }) - }).catch(() => { - this.$emit('watchChild') - this.dialogFormVisible = false + this.$message.success('合并成功') + this.btnLoading = false + this.resetForm() + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() }) + this.dialogFormVisible = false + this.$emit('watchChild') } }).catch(_ => { // 异常情况，loading置为false this.btnLoading = false diff --git a/src/components/Brand/brand.vue b/src/components/Brand/brand.vue index 75d436b..b598cdc 100644 --- a/src/components/Brand/brand.vue +++ b/src/components/Brand/brand.vue @@ -20,12 +20,13 @@ /*logo遮罩*/ .mask{ position: fixed; + width:200px; padding-left:10px; padding-right:10px; bottom:0px; left:0px; - background-color:#000000; - color:#ffffff; + background-color:#0F3F8D; + color:#0F3F8D; line-height:2 } diff --git a/src/utils/structure.js b/src/utils/structure.js index 34a6672..6dad0fd 100644 --- a/src/utils/structure.js +++ b/src/utils/structure.js @@ -30,7 +30,7 @@ export function toTreeList(plainList, id = '0', isSelect = false) { const pid = findPid(plainList) if (pid.length > 1) { - return plainList + return plainList.filter(item => item.tips !== 'hidden') } else { const tree = cleanChildren(buildTree(plainList, pid[0], isSelect)) return tree diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue index 0f79681..13826c0 100644 --- a/src/views/system/dept/mergeDept.vue +++ b/src/views/system/dept/mergeDept.vue @@ -150,20 +150,14 @@ .then(() => { mergeDept(this.deptForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'info' - }).then(() => { - this.btnLoading = false - this.resetForm() - this.$nextTick(() => { - this.$refs['dataForm'].clearValidate() - }) - }).catch(() => { - this.$emit('watchChild') - this.dialogFormVisible = false + this.$message.success('合并成功') + this.btnLoading = false + this.resetForm() + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() }) + this.dialogFormVisible = false + this.$emit('watchChild') } }).catch(_ => { // 异常情况，loading置为false this.btnLoading = false diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue index 9a07109..b237448 100644 --- a/src/views/system/post/editPost.vue +++ b/src/views/system/post/editPost.vue @@ -118,20 +118,14 @@ this.btnLoading = true addPost(this.postForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'info' - }).then(() => { // 选是 - this.resetForm() - this.btnLoading = false - this.$nextTick(() => { - this.$refs['dataForm'].clearValidate() - }) - }).catch(() => { // 选否,关闭窗口，并刷新页面 - this.$emit('watchChild') - this.dialogFormVisible = false + this.$message.success('新增成功') + this.resetForm() + this.btnLoading = false + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() }) + this.$emit('watchChild') + this.dialogFormVisible = false } }).catch(_ => { // 异常情况，loading置为false this.btnLoading = false diff --git a/src/components/Brand/brand.vue b/src/components/Brand/brand.vue index 75d436b..b598cdc 100644 --- a/src/components/Brand/brand.vue +++ b/src/components/Brand/brand.vue @@ -20,12 +20,13 @@ /*logo遮罩*/ .mask{ position: fixed; + width:200px; padding-left:10px; padding-right:10px; bottom:0px; left:0px; - background-color:#000000; - color:#ffffff; + background-color:#0F3F8D; + color:#0F3F8D; line-height:2 } diff --git a/src/utils/structure.js b/src/utils/structure.js index 34a6672..6dad0fd 100644 --- a/src/utils/structure.js +++ b/src/utils/structure.js @@ -30,7 +30,7 @@ export function toTreeList(plainList, id = '0', isSelect = false) { const pid = findPid(plainList) if (pid.length > 1) { - return plainList + return plainList.filter(item => item.tips !== 'hidden') } else { const tree = cleanChildren(buildTree(plainList, pid[0], isSelect)) return tree diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue index 0f79681..13826c0 100644 --- a/src/views/system/dept/mergeDept.vue +++ b/src/views/system/dept/mergeDept.vue @@ -150,20 +150,14 @@ .then(() => { mergeDept(this.deptForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'info' - }).then(() => { - this.btnLoading = false - this.resetForm() - this.$nextTick(() => { - this.$refs['dataForm'].clearValidate() - }) - }).catch(() => { - this.$emit('watchChild') - this.dialogFormVisible = false + this.$message.success('合并成功') + this.btnLoading = false + this.resetForm() + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() }) + this.dialogFormVisible = false + this.$emit('watchChild') } }).catch(_ => { // 异常情况，loading置为false this.btnLoading = false diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue index 9a07109..b237448 100644 --- a/src/views/system/post/editPost.vue +++ b/src/views/system/post/editPost.vue @@ -118,20 +118,14 @@ this.btnLoading = true addPost(this.postForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'info' - }).then(() => { // 选是 - this.resetForm() - this.btnLoading = false - this.$nextTick(() => { - this.$refs['dataForm'].clearValidate() - }) - }).catch(() => { // 选否,关闭窗口，并刷新页面 - this.$emit('watchChild') - this.dialogFormVisible = false + this.$message.success('新增成功') + this.resetForm() + this.btnLoading = false + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() }) + this.$emit('watchChild') + this.dialogFormVisible = false } }).catch(_ => { // 异常情况，loading置为false this.btnLoading = false diff --git a/src/views/system/post/listPost.vue b/src/views/system/post/listPost.vue index 172e32f..ef1f50c 100644 --- a/src/views/system/post/listPost.vue +++ b/src/views/system/post/listPost.vue @@ -6,7 +6,7 @@ - + { this.postTypeList = response.data diff --git a/src/components/Brand/brand.vue b/src/components/Brand/brand.vue index 75d436b..b598cdc 100644 --- a/src/components/Brand/brand.vue +++ b/src/components/Brand/brand.vue @@ -20,12 +20,13 @@ /*logo遮罩*/ .mask{ position: fixed; + width:200px; padding-left:10px; padding-right:10px; bottom:0px; left:0px; - background-color:#000000; - color:#ffffff; + background-color:#0F3F8D; + color:#0F3F8D; line-height:2 } diff --git a/src/utils/structure.js b/src/utils/structure.js index 34a6672..6dad0fd 100644 --- a/src/utils/structure.js +++ b/src/utils/structure.js @@ -30,7 +30,7 @@ export function toTreeList(plainList, id = '0', isSelect = false) { const pid = findPid(plainList) if (pid.length > 1) { - return plainList + return plainList.filter(item => item.tips !== 'hidden') } else { const tree = cleanChildren(buildTree(plainList, pid[0], isSelect)) return tree diff --git a/src/views/system/dept/mergeDept.vue b/src/views/system/dept/mergeDept.vue index 0f79681..13826c0 100644 --- a/src/views/system/dept/mergeDept.vue +++ b/src/views/system/dept/mergeDept.vue @@ -150,20 +150,14 @@ .then(() => { mergeDept(this.deptForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'info' - }).then(() => { - this.btnLoading = false - this.resetForm() - this.$nextTick(() => { - this.$refs['dataForm'].clearValidate() - }) - }).catch(() => { - this.$emit('watchChild') - this.dialogFormVisible = false + this.$message.success('合并成功') + this.btnLoading = false + this.resetForm() + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() }) + this.dialogFormVisible = false + this.$emit('watchChild') } }).catch(_ => { // 异常情况，loading置为false this.btnLoading = false diff --git a/src/views/system/post/editPost.vue b/src/views/system/post/editPost.vue index 9a07109..b237448 100644 --- a/src/views/system/post/editPost.vue +++ b/src/views/system/post/editPost.vue @@ -118,20 +118,14 @@ this.btnLoading = true addPost(this.postForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', - type: 'info' - }).then(() => { // 选是 - this.resetForm() - this.btnLoading = false - this.$nextTick(() => { - this.$refs['dataForm'].clearValidate() - }) - }).catch(() => { // 选否,关闭窗口，并刷新页面 - this.$emit('watchChild') - this.dialogFormVisible = false + this.$message.success('新增成功') + this.resetForm() + this.btnLoading = false + this.$nextTick(() => { + this.$refs['dataForm'].clearValidate() }) + this.$emit('watchChild') + this.dialogFormVisible = false } }).catch(_ => { // 异常情况，loading置为false this.btnLoading = false diff --git a/src/views/system/post/listPost.vue b/src/views/system/post/listPost.vue index 172e32f..ef1f50c 100644 --- a/src/views/system/post/listPost.vue +++ b/src/views/system/post/listPost.vue @@ -6,7 +6,7 @@ - + { this.postTypeList = response.data diff --git a/src/views/system/staff/addPerson.vue b/src/views/system/staff/addPerson.vue index 18868d1..f6999dd 100644 --- a/src/views/system/staff/addPerson.vue +++ b/src/views/system/staff/addPerson.vue @@ -54,7 +54,7 @@ - + @@ -126,7 +126,7 @@ - + - + - +