From 8d5c6b938095131fa0b530b9a3a4d7133c823ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Wed, 25 Oct 2023 17:32:18 +0800 Subject: [PATCH] =?UTF-8?q?update=20$message.error=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E6=94=B9=E6=88=90$message.warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/documentToolApi.js | 11 ++++++++++- src/common/lang/businessSupport/zh.js | 6 ++++++ src/common/lang/zh-cn.js | 18 +++++++++++++++++- src/components/UploadFile.vue | 16 ++++++++-------- src/components/jero/JCategorySelect.vue | 4 ++-- src/components/jero/JImageUpload.vue | 2 +- src/components/jero/JPopup.vue | 4 ++-- src/components/jero/JTreeDict.vue | 2 +- src/components/jero/JTreeSelect.vue | 4 ++-- src/components/jero/JUpload.vue | 2 +- src/components/jero/README_JEditableTable.md | 2 +- src/components/jero/minipop/JFilePop.vue | 2 +- .../splitUpload/SplitAddClauseUploadImage.vue | 8 ++++---- src/components/splitUpload/SplitUpload.vue | 6 +++--- src/components/tools/UserMenu.vue | 2 +- src/mixins/ConfigurableTableMixin.js | 10 +++++----- src/mixins/JeroListMixin.js | 10 +++++----- src/mixins/SimpleListMixin.js | 6 +++--- src/views/account/settings/Security.vue | 2 +- .../documentComparison/DocumentComparison.vue | 1 + .../documentSplit/DocumentSplitDetail.vue | 2 +- .../documentTool/modules/ImportResult.vue | 2 +- src/views/modules/oss/OSSFileList.vue | 4 ++-- src/views/system/DepartList.vue | 2 +- src/views/system/DepartListSync.vue | 2 +- src/views/system/RoleUserList.vue | 12 ++++++------ src/views/system/UserAnnouncementList.vue | 2 +- src/views/system/modules/DepartAuthModal.vue | 2 +- .../system/modules/DepartDataruleModal.vue | 2 +- src/views/system/modules/DeptUserInfo.vue | 16 ++++++++-------- src/views/system/modules/PermissionModal.vue | 2 +- src/views/system/modules/RoleDataruleModal.vue | 2 +- src/views/system/modules/UserRoleModal.vue | 2 +- .../system/tags/modules/AreaFormModal.vue | 2 +- src/views/system/tags/modules/AreaModal.vue | 4 ++-- .../tags/modules/ClauseSplittingDrawer.vue | 2 +- src/views/system/tags/modules/ModalDemo.vue | 2 +- .../system/tags/modules/StandardDrawer.vue | 2 +- .../tags/modules/TagContentDictItemModal.vue | 2 +- .../system/tags/modules/TagContentModal.vue | 2 +- src/views/system/tags/pages/TagListMixin.js | 6 +++--- src/views/user/Login.vue | 2 +- src/views/user/alteration/Step1.vue | 4 ++-- .../modules/OnlyTableForm.vue | 4 ++-- .../modules/EngineerInitBaseInfo.vue | 4 ++-- 45 files changed, 119 insertions(+), 87 deletions(-) diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js index 7391cd99..ba328faf 100644 --- a/src/api/documentToolApi.js +++ b/src/api/documentToolApi.js @@ -74,6 +74,11 @@ const addComment = (params) => postAction('/compare/sarFileCompareResComment/add // 文档对比-对比结果-评论-评论列表 const getCommentList = (params) => getAction('/compare/sarFileCompareResComment/queryListByInfoId', params) +// 自定义比对-标准列表 +const getCustomComparisonStandardList = (params) => getAction('', params) +// 自定义比对-标准列表-删除 +const deleteCustomComparisonStandard = (params) => postAction('', params) + export { // 文档拆分 releaseSplitStandard, @@ -114,5 +119,9 @@ export { getComparisonResultDetail, editComparisonComment, addComment, - getCommentList + getCommentList, + + // 自定义比对 + getCustomComparisonStandardList, + deleteCustomComparisonStandard } diff --git a/src/common/lang/businessSupport/zh.js b/src/common/lang/businessSupport/zh.js index 06a38ded..50edbff0 100644 --- a/src/common/lang/businessSupport/zh.js +++ b/src/common/lang/businessSupport/zh.js @@ -20,5 +20,11 @@ module.exports = { answerQuestion: '回复问题', word: '字', pleaseEnterAnswerDesc: '请输入回答描述' + }, + + // 征求意见 + askForAdvice: { + standardNameNumber: '标准名称/编号', + consultationCycle: '征求意见周期' } } diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 0bf152a3..2f7eca94 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -424,7 +424,6 @@ module.exports = { changePermissions: '更改权限', pleaseSelectUser: '请选择一个用户', longTermEffectiveness: '是否长期有效', - selectFileType: '请选择文件类型', onlyWord: '只能导入word文件', fileType: '文件类型', @@ -488,6 +487,23 @@ module.exports = { publishComment: '发表评论', noComment: '暂无评论', replyToComments: '回复评论' + }, + // 自定义比对 + customComparison: { + listName: '清单名称', + countriesInvolved: '涉及国家', + operator: '操作人', + whetherToMakePublic: '是否公开', + referenceStandard: '涉及标准', + comparisonTime: '比对时间', + onlineComparison: '在线对比', + standardList: '标准列表', + comparisonMaintain: '对比维护', + listDetails: '清单详情', + comparativeAnalysisResult: '对比分析结果', + exitEdit: '退出编辑', + specialty: '特点', + comparisonItem: '比对项' } }, // 业务支持 diff --git a/src/components/UploadFile.vue b/src/components/UploadFile.vue index 06964e78..b2f3f308 100644 --- a/src/components/UploadFile.vue +++ b/src/components/UploadFile.vue @@ -257,11 +257,11 @@ export default { return file }) } else { - this.$message.error(info.file.response.message) + this.$message.warning(info.file.response.message) } // this.$message.success(`${info.file.name} 上传成功!`); } else if (info.file.status === 'error') { - this.$message.error(`${info.file.name} ${this.$t('uploadFile.uploadFailed')}.`) + this.$message.warning(`${info.file.name} ${this.$t('uploadFile.uploadFailed')}.`) } else if (info.file.status === 'removed') { this.handleDelete(info.file) } @@ -342,19 +342,19 @@ export default { file.uploadGoOn = true const fileSize = file.size // 上传的文件大小 if (fileSize === 0) { - this.$message.error(this.$t('uploadFile.cannotUploadEmpty')) + this.$message.warning(this.$t('uploadFile.cannotUploadEmpty')) this.uploadGoOn = false file.uploadGoOn = false return false } if (this.fileMaxSize && fileSize > 1024 * 1024 * this.fileMaxSize) { - this.$message.error(this.$t('uploadFile.pleaseUpload') + this.fileMaxSize + this.$t('uploadFile.theFollowingDocuments')) + this.$message.warning(this.$t('uploadFile.pleaseUpload') + this.fileMaxSize + this.$t('uploadFile.theFollowingDocuments')) this.uploadGoOn = false file.uploadGoOn = false return false } if (fileSize > 1024 * 1024 * 500) { - this.$message.error(this.$t('uploadFile.maxSize')) + this.$message.warning(this.$t('uploadFile.maxSize')) this.uploadGoOn = false file.uploadGoOn = false return false @@ -369,7 +369,7 @@ export default { // 截取文件后缀名 const fileSuffix = (file.name ? file.name.split('.')[file.name.split('.').length - 1] : '').toLowerCase() if (this.fileType === FILE_TYPE_IMG && fileType.indexOf('image') < 0) { - this.$message.error(this.$t('uploadFile.onlyUploadPic')) + this.$message.warning(this.$t('uploadFile.onlyUploadPic')) this.uploadGoOn = false file.uploadGoOn = false return false @@ -378,13 +378,13 @@ export default { return true } if (this.fileType === FILE_TYPE_IMG && fileSuffix !== 'png' && fileSuffix !== 'jpg') { - this.$message.error(this.$t('uploadFile.pleaseUpload') + 'png、jpg' + this.$t('uploadFile.file')) + this.$message.warning(this.$t('uploadFile.pleaseUpload') + 'png、jpg' + this.$t('uploadFile.file')) this.uploadGoOn = false file.uploadGoOn = false return false } if (this.fileType.indexOf(fileSuffix) === -1) { - this.$message.error(this.$t('uploadFile.pleaseUpload') + `${this.fileType}` + this.$t('uploadFile.file')) + this.$message.warning(this.$t('uploadFile.pleaseUpload') + `${this.fileType}` + this.$t('uploadFile.file')) this.uploadGoOn = false file.uploadGoOn = false return false diff --git a/src/components/jero/JCategorySelect.vue b/src/components/jero/JCategorySelect.vue index 8c6aec8f..f1ed5c0d 100644 --- a/src/components/jero/JCategorySelect.vue +++ b/src/components/jero/JCategorySelect.vue @@ -246,11 +246,11 @@ export default { if (typeof test === 'object' && test) { resolve() } else { - this.$message.error('组件JTreeSelect-condition传值有误，需要一个json字符串!') + this.$message.warning('组件JTreeSelect-condition传值有误，需要一个json字符串!') reject() } } catch (e) { - this.$message.error('组件JTreeSelect-condition传值有误，需要一个json字符串!') + this.$message.warning('组件JTreeSelect-condition传值有误，需要一个json字符串!') reject() } } diff --git a/src/components/jero/JImageUpload.vue b/src/components/jero/JImageUpload.vue index 352bd148..ad78dc81 100644 --- a/src/components/jero/JImageUpload.vue +++ b/src/components/jero/JImageUpload.vue @@ -175,7 +175,7 @@ export default { } // this.$message.success(`${info.file.name} 上传成功!`); } else if (info.file.status === 'error') { - this.$message.error(`${info.file.name} 上传失败.`) + this.$message.warning(`${info.file.name} 上传失败.`) } else if (info.file.status === 'removed') { this.handleDelete(info.file) } diff --git a/src/components/jero/JPopup.vue b/src/components/jero/JPopup.vue index 39e1360d..3a2d0488 100644 --- a/src/components/jero/JPopup.vue +++ b/src/components/jero/JPopup.vue @@ -129,11 +129,11 @@ export default { }, mounted () { if (!this.orgFields || !this.destFields || !this.code) { - this.$message.error('popup参数未正确配置!') + this.$message.warning('popup参数未正确配置!') this.avalid = false } if (this.destFields.split(',').length !== this.orgFields.split(',').length) { - this.$message.error('popup参数未正确配置,原始值和目标值数量不一致!') + this.$message.warning('popup参数未正确配置,原始值和目标值数量不一致!') this.avalid = false } }, diff --git a/src/components/jero/JTreeDict.vue b/src/components/jero/JTreeDict.vue index 7d5a4b9c..7c88ee1d 100644 --- a/src/components/jero/JTreeDict.vue +++ b/src/components/jero/JTreeDict.vue @@ -138,7 +138,7 @@ export default { this.handleTreeNodeValue(res.result) this.treeData = [...res.result] } else { - this.$message.error(res.message) + this.$message.warning(res.message) } }) }, diff --git a/src/components/jero/JTreeSelect.vue b/src/components/jero/JTreeSelect.vue index cc2f1a98..f798e418 100644 --- a/src/components/jero/JTreeSelect.vue +++ b/src/components/jero/JTreeSelect.vue @@ -299,11 +299,11 @@ export default { if (typeof test === 'object' && test) { resolve() } else { - this.$message.error('组件JTreeSelect-condition传值有误，需要一个json字符串!') + this.$message.warning('组件JTreeSelect-condition传值有误，需要一个json字符串!') reject() } } catch (e) { - this.$message.error('组件JTreeSelect-condition传值有误，需要一个json字符串!') + this.$message.warning('组件JTreeSelect-condition传值有误，需要一个json字符串!') reject() } } diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue index d7d5fd5c..75c00654 100644 --- a/src/components/jero/JUpload.vue +++ b/src/components/jero/JUpload.vue @@ -361,7 +361,7 @@ export default { } // this.$message.success(`${info.file.name} 上传成功!`); } else if (info.file.status === 'error') { - this.$message.error(`${info.file.name} 上传失败.`) + this.$message.warning(`${info.file.name} 上传失败.`) } else if (info.file.status === 'removed') { this.handleDelete(info.file) } diff --git a/src/components/jero/README_JEditableTable.md b/src/components/jero/README_JEditableTable.md index 4bfa5966..ff1d9ac2 100644 --- a/src/components/jero/README_JEditableTable.md +++ b/src/components/jero/README_JEditableTable.md @@ -467,7 +467,7 @@ this.$refs.editableTable.getValues((error, values) => { // 将通过后的数组提交到后台或自行进行其他处理 console.log(deleteIds, values) } else { - this.$message.error('验证未通过') + this.$message.warning('验证未通过') } }) ``` diff --git a/src/components/jero/minipop/JFilePop.vue b/src/components/jero/minipop/JFilePop.vue index c27527e3..d7091d59 100644 --- a/src/components/jero/minipop/JFilePop.vue +++ b/src/components/jero/minipop/JFilePop.vue @@ -90,7 +90,7 @@ export default { }, ok () { if (!this.filePath) { - this.$message.error('未上传任何文件') + this.$message.warning('未上传任何文件') return false } const arr = this.filePath.split(',') diff --git a/src/components/splitUpload/SplitAddClauseUploadImage.vue b/src/components/splitUpload/SplitAddClauseUploadImage.vue index 3eef7544..9834d1d6 100644 --- a/src/components/splitUpload/SplitAddClauseUploadImage.vue +++ b/src/components/splitUpload/SplitAddClauseUploadImage.vue @@ -102,19 +102,19 @@ export default { const status = info.file.status info.fileList.forEach((val, index) => { if (val.response && !val.response.result) { - this.$message.error(val.response.message) + this.$message.warning(val.response.message) info.fileList.splice(index, 1) } }) if (this.fileTypeSatus) { if (file.size > 1000000000) { - this.$message.error(this.errorMessage) + this.$message.warning(this.errorMessage) } else { if (status === 'error') { this.uploadFileFlag-- this.$emit('uploadSuccess', this.fileList) this.$message.destroy() - this.$message.error(`${info.file.name} ` + this.$t('fileUploadFailed')) + this.$message.warning(`${info.file.name} ` + this.$t('fileUploadFailed')) } else if (status === 'removed') { this.uploadFileFlag-- this.myFileList = info.fileList @@ -141,7 +141,7 @@ export default { console.log('listLength11111', info.fileList.length) if (info.fileList.length > 20) { this.$message.destroy() - this.$message.error(this.$t('uploadMaximumATime')) + this.$message.warning(this.$t('uploadMaximumATime')) info.fileList.splice(20) this.myFileList = info.fileList this.myFileList.forEach((res) => { diff --git a/src/components/splitUpload/SplitUpload.vue b/src/components/splitUpload/SplitUpload.vue index ebfec971..bbbe199b 100644 --- a/src/components/splitUpload/SplitUpload.vue +++ b/src/components/splitUpload/SplitUpload.vue @@ -69,18 +69,18 @@ export default { const status = info.file.status info.fileList.forEach((val, index) => { if (val.response && !val.response.result) { - this.$message.error(val.response.message) + this.$message.warning(val.response.message) info.fileList.splice(index, 1) } }) if (this.fileTypeSatus) { if (file.size > 100000000) { - this.$message.error(this.errorMessage) + this.$message.warning(this.errorMessage) } else { if (status === 'error') { this.$emit('uploadSuccess', this.fileList) this.$message.destroy() - this.$message.error(`${info.file.name}` + this.$t('fileUploadFailed')) + this.$message.warning(`${info.file.name}` + this.$t('fileUploadFailed')) } else if (status === 'removed') { this.myFileList = info.fileList this.fileList = [] diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue index d8ea113b..a5d304e0 100644 --- a/src/components/tools/UserMenu.vue +++ b/src/components/tools/UserMenu.vue @@ -217,7 +217,7 @@ export default { return that.Logout({}).then(() => { window.location.replace('/user/login') }).catch(err => { - that.$message.error({ + that.$message.warning({ title: '错误', description: err.message }) diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js index c4bcdfd1..4be1c3de 100644 --- a/src/mixins/ConfigurableTableMixin.js +++ b/src/mixins/ConfigurableTableMixin.js @@ -183,7 +183,7 @@ export const ConfigurableTableMixin = { }, loadData (arg) { if (!this.url.list) { - this.$message.error('请设置url.list属性!') + this.$message.warning('请设置url.list属性!') return } // 加载数据 若传入参数1则加载第一页的内容 @@ -265,7 +265,7 @@ export const ConfigurableTableMixin = { if (Array.isArray(info.file.response.result) && info.file.response.result.length > 0) { this.messageLineFeed(this.$t('fileImportError'), info.file.response.result) } else { - this.$message.error(`${info.file.name} ${info.file.response.message}.`) + this.$message.warning(`${info.file.name} ${info.file.response.message}.`) } } } else if (info.file.status === 'error') { @@ -290,7 +290,7 @@ export const ConfigurableTableMixin = { }) } } else { - this.$message.error(`文件上传失败: ${info.file.msg} `) + this.$message.warning(`文件上传失败: ${info.file.msg} `) } } }, @@ -385,7 +385,7 @@ export const ConfigurableTableMixin = { */ batchDel () { if (!this.url.delete) { - this.$message.error('请设置url.deleteBatch属性!') + this.$message.warning('请设置url.deleteBatch属性!') return } if (this.selectedRowKeys.length <= 0) { @@ -431,7 +431,7 @@ export const ConfigurableTableMixin = { */ handleDelete (id) { if (!this.url.delete) { - this.$message.error('请设置url.delete属性!') + this.$message.warning('请设置url.delete属性!') return } const that = this diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index 35e8c4a6..7398a2aa 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -94,7 +94,7 @@ export const JeroListMixin = { methods: { loadData (arg) { if (!this.url.list) { - this.$message.error('请设置url.list属性!') + this.$message.warning('请设置url.list属性!') return } // 加载数据 若传入参数1则加载第一页的内容 @@ -180,7 +180,7 @@ export const JeroListMixin = { }, batchDel: function () { if (!this.url.deleteBatch) { - this.$message.error('请设置url.deleteBatch属性!') + this.$message.warning('请设置url.deleteBatch属性!') return } if (this.selectedRowKeys.length <= 0) { @@ -212,7 +212,7 @@ export const JeroListMixin = { }, handleDelete: function (id) { if (!this.url.delete) { - this.$message.error('请设置url.delete属性!') + this.$message.warning('请设置url.delete属性!') return } const that = this @@ -413,7 +413,7 @@ export const JeroListMixin = { } this.loadData() } else { - this.$message.error(`${info.file.name} ${info.file.response.message}.`) + this.$message.warning(`${info.file.name} ${info.file.response.message}.`) } } else if (info.file.status === 'error') { // 销毁这个提示 @@ -437,7 +437,7 @@ export const JeroListMixin = { }) } } else { - this.$message.error(`文件上传失败: ${info.file.msg} `) + this.$message.warning(`文件上传失败: ${info.file.msg} `) } } }, diff --git a/src/mixins/SimpleListMixin.js b/src/mixins/SimpleListMixin.js index f1e49f1a..568fbcac 100644 --- a/src/mixins/SimpleListMixin.js +++ b/src/mixins/SimpleListMixin.js @@ -58,7 +58,7 @@ export const SimpleListMixin = { methods: { loadData (arg) { if (!this.url.list) { - this.$message.error('请设置url.list属性!') + this.$message.warning('请设置url.list属性!') return } // 加载数据 若传入参数1则加载第一页的内容 @@ -144,7 +144,7 @@ export const SimpleListMixin = { }, batchDel () { if (!this.url.deleteBatch) { - this.$message.error('请设置url.deleteBatch属性!') + this.$message.warning('请设置url.deleteBatch属性!') return } if (this.selectedRowKeys.length <= 0) { @@ -177,7 +177,7 @@ export const SimpleListMixin = { }, handleDelete: function (id) { if (!this.url.delete) { - this.$message.error('请设置url.delete属性!') + this.$message.warning('请设置url.delete属性!') return } const that = this diff --git a/src/views/account/settings/Security.vue b/src/views/account/settings/Security.vue index e8069181..83b76510 100644 --- a/src/views/account/settings/Security.vue +++ b/src/views/account/settings/Security.vue @@ -27,7 +27,7 @@ export default { data: [ { title: '账户密码', description: '当前密码强度', value: '强', actions: { title: '修改', callback: () => { this.$message.info('This is a normal message') } } }, { title: '密保手机', description: '已绑定手机', value: '138****8293', actions: { title: '修改', callback: () => { this.$message.success('This is a message of success') } } }, - { title: '密保问题', description: '未设置密保问题，密保问题可有效保护账户安全', value: '', actions: { title: '设置', callback: () => { this.$message.error('This is a message of error') } } }, + { title: '密保问题', description: '未设置密保问题，密保问题可有效保护账户安全', value: '', actions: { title: '设置', callback: () => { this.$message.warning('This is a message of error') } } }, { title: '备用邮箱', description: '已绑定邮箱', value: 'ant***sign.com', actions: { title: '修改', callback: () => { this.$message.warning('This is message of warning') } } }, { title: 'MFA 设备', description: '未绑定 MFA 设备，绑定后，可以进行二次确认', value: '', actions: { title: '绑定', callback: () => { this.$message.info('This is a normal message') } } } ] diff --git a/src/views/documentTool/documentComparison/DocumentComparison.vue b/src/views/documentTool/documentComparison/DocumentComparison.vue index b269b606..788c7ccb 100644 --- a/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -378,4 +378,5 @@ export default { diff --git a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue index 9ca63675..f26a1d4b 100644 --- a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue +++ b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue @@ -551,7 +551,7 @@ export default { */ handleDelete (id) { if (!this.url.delete) { - this.$message.error('请设置url.delete属性!') + this.$message.warning('请设置url.delete属性!') return } const that = this diff --git a/src/views/documentTool/modules/ImportResult.vue b/src/views/documentTool/modules/ImportResult.vue index d6604cf9..237ae941 100644 --- a/src/views/documentTool/modules/ImportResult.vue +++ b/src/views/documentTool/modules/ImportResult.vue @@ -139,7 +139,7 @@ export default { this.$emit('visible', false, 1) } else { if (res.data.code === 1) { - this.$message.error(res.data.message) + this.$message.warning(res.data.message) } else { Modal.info({ title: '失败', diff --git a/src/views/modules/oss/OSSFileList.vue b/src/views/modules/oss/OSSFileList.vue index 8d190bff..4b6cccc3 100644 --- a/src/views/modules/oss/OSSFileList.vue +++ b/src/views/modules/oss/OSSFileList.vue @@ -150,10 +150,10 @@ export default { this.loadData() this.$message.success(`${info.file.name} 上传成功!`) } else { - this.$message.error(`${info.file.response.message}`) + this.$message.warning(`${info.file.response.message}`) } } else if (info.file.status === 'error') { - this.$message.error(`${info.file.response.message}`) + this.$message.warning(`${info.file.response.message}`) } }, ossDelete (id) { diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue index e6503204..399fa4ea 100644 --- a/src/views/system/DepartList.vue +++ b/src/views/system/DepartList.vue @@ -430,7 +430,7 @@ export default { this.$message.success(this.$t('savedSuccessfully')) this.loadTree() } else { - this.$message.error(res.message) + this.$message.warning(res.message) } }) } diff --git a/src/views/system/DepartListSync.vue b/src/views/system/DepartListSync.vue index 45170032..146a1e29 100644 --- a/src/views/system/DepartListSync.vue +++ b/src/views/system/DepartListSync.vue @@ -472,7 +472,7 @@ export default { this.$message.success('保存成功!') this.loadTree() } else { - this.$message.error(res.message) + this.$message.warning(res.message) } }) } diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue index fc1924e4..1283bcdf 100644 --- a/src/views/system/RoleUserList.vue +++ b/src/views/system/RoleUserList.vue @@ -384,7 +384,7 @@ export default { }, handleAdd2: function () { if (!this.currentRoleId) { - this.$message.error(this.$t('roleManage.pleaseSelectARole')) + this.$message.warning(this.$t('roleManage.pleaseSelectARole')) } else { this.$refs.modalForm2.roleDisabled = true this.$refs.modalForm2.title = this.$t('newlyAdded') @@ -397,7 +397,7 @@ export default { }, loadData2 (arg) { if (!this.url.list2) { - this.$message.error('请设置url.list2属性!') + this.$message.warning('请设置url.list2属性!') return } // 加载数据 若传入参数1则加载第一页的内容 @@ -423,7 +423,7 @@ export default { }, handleDelete2: function (id) { if (!this.url.delete2) { - this.$message.error('请设置url.delete2属性!') + this.$message.warning('请设置url.delete2属性!') return } const that = this @@ -438,7 +438,7 @@ export default { }, batchDel2: function () { if (!this.url.deleteBatch2) { - this.$message.error('请设置url.deleteBatch2属性!') + this.$message.warning('请设置url.deleteBatch2属性!') return } if (this.selectedRowKeys2.length <= 0) { @@ -487,7 +487,7 @@ export default { handleAddUserRole () { if (!this.currentRoleId) { - this.$message.error(this.$t('roleManage.pleaseSelectARole')) + this.$message.warning(this.$t('roleManage.pleaseSelectARole')) } else { this.$refs.selectUserModal.visible = true this.$refs.selectUserModal.searchQuery() @@ -503,7 +503,7 @@ export default { }, /* handleEdit: function(record) { if (this.currentRoleId == '') { - this.$message.error('请选择一个角色!') + this.$message.warning('请选择一个角色!') } else { this.$refs.modalForm.edit(record) this.$refs.modalForm.title = '编辑' diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue index a26a6684..1bb99151 100644 --- a/src/views/system/UserAnnouncementList.vue +++ b/src/views/system/UserAnnouncementList.vue @@ -194,7 +194,7 @@ export default { }, loadData (arg) { if (!this.url.list) { - this.$message.error('请设置url.list属性!') + this.$message.warning('请设置url.list属性!') return } // 加载数据 若传入参数1则加载第一页的内容 diff --git a/src/views/system/modules/DepartAuthModal.vue b/src/views/system/modules/DepartAuthModal.vue index f4b58233..28f13fe1 100644 --- a/src/views/system/modules/DepartAuthModal.vue +++ b/src/views/system/modules/DepartAuthModal.vue @@ -140,7 +140,7 @@ export default { that.loading = false that.loadData() } else { - that.$message.error(res.message) + that.$message.warning(res.message) that.loading = false } }) diff --git a/src/views/system/modules/DepartDataruleModal.vue b/src/views/system/modules/DepartDataruleModal.vue index 37ec9146..ba759f8b 100644 --- a/src/views/system/modules/DepartDataruleModal.vue +++ b/src/views/system/modules/DepartDataruleModal.vue @@ -83,7 +83,7 @@ export default { if (res.success) { this.$message.success(res.message) } else { - this.$message.error(res.message) + this.$message.warning(res.message) } }) }, diff --git a/src/views/system/modules/DeptUserInfo.vue b/src/views/system/modules/DeptUserInfo.vue index aafed7c3..a415016d 100644 --- a/src/views/system/modules/DeptUserInfo.vue +++ b/src/views/system/modules/DeptUserInfo.vue @@ -161,7 +161,7 @@ export default { }, loadData (arg) { if (!this.url.list) { - this.$message.error('请设置url.list属性!') + this.$message.warning('请设置url.list属性!') return } // 加载数据 若传入参数1则加载第一页的内容 @@ -180,11 +180,11 @@ export default { }, batchDel: function () { if (!this.url.deleteBatch) { - this.$message.error('请设置url.deleteBatch属性!') + this.$message.warning('请设置url.deleteBatch属性!') return } if (!this.currentDeptId) { - this.$message.error('未选中任何部门，无法取消部门与用户的关联!') + this.$message.warning('未选中任何部门，无法取消部门与用户的关联!') return } @@ -216,11 +216,11 @@ export default { }, handleDelete: function (id) { if (!this.url.delete) { - this.$message.error('请设置url.delete属性!') + this.$message.warning('请设置url.delete属性!') return } if (!this.currentDeptId) { - this.$message.error('未选中任何部门，无法取消部门与用户的关联!') + this.$message.warning('未选中任何部门，无法取消部门与用户的关联!') return } @@ -253,14 +253,14 @@ export default { }, hasSelectDept () { if (!this.currentDeptId) { - this.$message.error('请选择一个部门!') + this.$message.warning('请选择一个部门!') return false } return true }, handleAddUserDepart () { if (!this.currentDeptId) { - this.$message.error('请选择一个部门!') + this.$message.warning('请选择一个部门!') } else { this.$refs.selectUserModal.visible = true } @@ -273,7 +273,7 @@ export default { }, handleAdd: function () { if (!this.currentDeptId) { - this.$message.error('请选择一个部门!') + this.$message.warning('请选择一个部门!') } else { this.$refs.modalForm.departDisabled = true // 初始化负责部门 diff --git a/src/views/system/modules/PermissionModal.vue b/src/views/system/modules/PermissionModal.vue index 974f13d2..3d61cbfd 100644 --- a/src/views/system/modules/PermissionModal.vue +++ b/src/views/system/modules/PermissionModal.vue @@ -271,7 +271,7 @@ export default { if (valid) { if (((this.model.menuType + '') === '1' || (this.model.menuType + '') === '2') && !this.model.parentId) { that.validateStatus = 'error' - that.$message.error('请检查你填的类型以及信息是否正确！') + that.$message.warning('请检查你填的类型以及信息是否正确！') return } else { that.validateStatus = 'success' diff --git a/src/views/system/modules/RoleDataruleModal.vue b/src/views/system/modules/RoleDataruleModal.vue index 31e72792..b516fa90 100644 --- a/src/views/system/modules/RoleDataruleModal.vue +++ b/src/views/system/modules/RoleDataruleModal.vue @@ -87,7 +87,7 @@ export default { if (res.success) { this.$message.success(res.message) } else { - this.$message.error(res.message) + this.$message.warning(res.message) } }) }, diff --git a/src/views/system/modules/UserRoleModal.vue b/src/views/system/modules/UserRoleModal.vue index a1d912dd..4ce152eb 100644 --- a/src/views/system/modules/UserRoleModal.vue +++ b/src/views/system/modules/UserRoleModal.vue @@ -152,7 +152,7 @@ export default { that.close() } } else { - that.$message.error(res.message) + that.$message.warning(res.message) that.loading = false if (exit) { that.close() diff --git a/src/views/system/tags/modules/AreaFormModal.vue b/src/views/system/tags/modules/AreaFormModal.vue index eb8043b3..b59e646e 100644 --- a/src/views/system/tags/modules/AreaFormModal.vue +++ b/src/views/system/tags/modules/AreaFormModal.vue @@ -142,7 +142,7 @@ export default { this.$emit('ok') this.close() } else { - this.$message.error(res.message) + this.$message.warning(res.message) } }).finally(() => { this.confirmLoading = false diff --git a/src/views/system/tags/modules/AreaModal.vue b/src/views/system/tags/modules/AreaModal.vue index 375adc29..3241d172 100644 --- a/src/views/system/tags/modules/AreaModal.vue +++ b/src/views/system/tags/modules/AreaModal.vue @@ -160,7 +160,7 @@ export default { }, handleDelete: function (id) { if (!this.url.delete) { - this.$message.error('请设置url.delete属性!') + this.$message.warning('请设置url.delete属性!') return } const that = this @@ -187,7 +187,7 @@ export default { }, batchDel () { if (!this.url.deleteBatch) { - this.$message.error('请设置url.deleteBatch属性!') + this.$message.warning('请设置url.deleteBatch属性!') return } if (this.selectedRowKeys.length <= 0) { diff --git a/src/views/system/tags/modules/ClauseSplittingDrawer.vue b/src/views/system/tags/modules/ClauseSplittingDrawer.vue index ed5df15b..f843ed7e 100644 --- a/src/views/system/tags/modules/ClauseSplittingDrawer.vue +++ b/src/views/system/tags/modules/ClauseSplittingDrawer.vue @@ -306,7 +306,7 @@ export default { this.$emit('ok') this.onClose() } else { - this.$message.error(res.message) + this.$message.warning(res.message) } }).finally(() => { this.confirmLoading = false diff --git a/src/views/system/tags/modules/ModalDemo.vue b/src/views/system/tags/modules/ModalDemo.vue index b5c0e879..c0154a40 100644 --- a/src/views/system/tags/modules/ModalDemo.vue +++ b/src/views/system/tags/modules/ModalDemo.vue @@ -64,7 +64,7 @@ export default { // this.$emit('ok') // this.close() // } else { - // this.$message.error(res.message) + // this.$message.warning(res.message) // } // }).finally(() => { // this.confirmLoading = false diff --git a/src/views/system/tags/modules/StandardDrawer.vue b/src/views/system/tags/modules/StandardDrawer.vue index 65cd3257..73f1af72 100644 --- a/src/views/system/tags/modules/StandardDrawer.vue +++ b/src/views/system/tags/modules/StandardDrawer.vue @@ -363,7 +363,7 @@ export default { this.$emit('ok') this.onClose() } else { - this.$message.error(res.message) + this.$message.warning(res.message) } }).finally(() => { this.confirmLoading = false diff --git a/src/views/system/tags/modules/TagContentDictItemModal.vue b/src/views/system/tags/modules/TagContentDictItemModal.vue index 9f68d72d..61dca963 100644 --- a/src/views/system/tags/modules/TagContentDictItemModal.vue +++ b/src/views/system/tags/modules/TagContentDictItemModal.vue @@ -176,7 +176,7 @@ export default { that.$emit('ok') that.close() } else { - that.$message.error(res.message) + that.$message.warning(res.message) } }).finally(() => { that.confirmLoading = false diff --git a/src/views/system/tags/modules/TagContentModal.vue b/src/views/system/tags/modules/TagContentModal.vue index 1e63c97b..a7ed353d 100644 --- a/src/views/system/tags/modules/TagContentModal.vue +++ b/src/views/system/tags/modules/TagContentModal.vue @@ -139,7 +139,7 @@ export default { this.$emit('ok') this.close() } else { - this.$message.error(res.message) + this.$message.warning(res.message) } }).finally(() => { this.confirmLoading = false diff --git a/src/views/system/tags/pages/TagListMixin.js b/src/views/system/tags/pages/TagListMixin.js index 3a358bd9..ad34ca54 100644 --- a/src/views/system/tags/pages/TagListMixin.js +++ b/src/views/system/tags/pages/TagListMixin.js @@ -58,7 +58,7 @@ export const TagListMixin = { methods: { loadData (arg) { if (!this.url.list) { - this.$message.error('请设置url.list属性!') + this.$message.warning('请设置url.list属性!') return } // 加载数据 若传入参数1则加载第一页的内容 @@ -144,7 +144,7 @@ export const TagListMixin = { }, batchDel () { if (!this.url.deleteBatch) { - this.$message.error('请设置url.deleteBatch属性!') + this.$message.warning('请设置url.deleteBatch属性!') return } if (this.selectedRowKeys.length <= 0) { @@ -179,7 +179,7 @@ export const TagListMixin = { }, handleDelete: function (id) { if (!this.url.delete) { - this.$message.error('请设置url.delete属性!') + this.$message.warning('请设置url.delete属性!') return } const that = this diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 7cefa4d7..290164f2 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -317,7 +317,7 @@ export default { this.randCodeImage = res.result this.requestCodeSuccess = true } else { - this.$message.error(res.message) + this.$message.warning(res.message) this.requestCodeSuccess = false } }).catch(() => { diff --git a/src/views/user/alteration/Step1.vue b/src/views/user/alteration/Step1.vue index c59fe43f..7bc81c18 100644 --- a/src/views/user/alteration/Step1.vue +++ b/src/views/user/alteration/Step1.vue @@ -73,7 +73,7 @@ export default { this.randCodeImage = res.result this.requestCodeSuccess = true } else { - this.$message.error(res.message) + this.$message.warning(res.message) this.requestCodeSuccess = false } }).catch(() => { @@ -108,7 +108,7 @@ export default { } }) }).catch(err => { - this.$message.error(err.message) + this.$message.warning(err.message) }) } }) diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue index 0ed9ac89..29b85789 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue @@ -362,7 +362,7 @@ export default { // 推入表格中 this.dataSource = this.dataSource.concat(info.file.response.result) } else { - this.$message.error(`${info.file.name} ${info.file.response.message}.`) + this.$message.warning(`${info.file.name} ${info.file.response.message}.`) } } else if (info.file.status === 'error') { // 销毁这个提示 @@ -386,7 +386,7 @@ export default { }) } } else { - this.$message.error(`文件上传失败: ${info.file.msg} `) + this.$message.warning(`文件上传失败: ${info.file.msg} `) } } }, diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue index 50ce9416..0ad05944 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue @@ -406,7 +406,7 @@ export default { // 推入表格中 this.dataSource = this.dataSource.concat(info.file.response.result) } else { - this.$message.error(`${info.file.name} ${info.file.response.message}.`) + this.$message.warning(`${info.file.name} ${info.file.response.message}.`) } } else if (info.file.status === 'error') { // 销毁这个提示 @@ -430,7 +430,7 @@ export default { }) } } else { - this.$message.error(`文件上传失败: ${info.file.msg} `) + this.$message.warning(`文件上传失败: ${info.file.msg} `) } } },