Merge remote-tracking branch 'origin/master'

src/components/CropperImage/index.vue

@@ -194,10 +194,10 @@ export default {
         const user = _.cloneDeep(this.$store.state.user)
         user.head = res.filePath
         this.$store.commit('setUser', user)
-        this.$message.success('修改头像成功！')
+        this.$message.success('修改头像成功')
         this.$emit('close')
       } catch (error) {
-        this.$message.error('修改头像失败！')
+        this.$message.error('修改头像失败')
       }
     }
   }

src/components/ImageUpload/index.vue

@@ -176,7 +176,7 @@ export default {
       var img = file.name.substring(file.name.lastIndexOf('.') + 1)
       const suffix = img === 'jpg' || img === 'png' || img === 'jpeg'
       if (!suffix) {
-        this.$message.error('文件格式不正确, 请上传png/jpg/jpeg图片格式文件！')
+        this.$message.error('文件格式不正确, 请上传png/jpg/jpeg图片格式文件')
         return false
       }
       if (this.fileSize) {

src/layout/components/Navbar.vue

@@ -96,7 +96,7 @@ export default {
       this.$store.dispatch('app/toggleSideBar')
     },
     async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
+      this.$confirm('确定注销并退出系统吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/article-management/article-edit.vue

@@ -162,7 +162,7 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
-          this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+          this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             customClass: 'box-logout',

src/views/banner_management/banner_edit.vue

@@ -199,7 +199,7 @@ export default {
         if (valid) {
           console.log('校验通过')
 
-          this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+          this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             customClass: 'box-logout',

src/views/document-management/about-us/about-us.vue

@@ -79,7 +79,7 @@ export default {
       //   this.$modal.msgError('内容不能为空')
       //   return
       // }
-      this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+      this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         customClass: 'box-logout',

src/views/document-management/privacy-policy/privacy-policy.vue

@@ -79,7 +79,7 @@ export default {
       //   this.$modal.msgError('内容不能为空')
       //   return
       // }
-      this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+      this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         customClass: 'box-logout',

src/views/document-management/user-protocol/user-protocol.vue

@@ -79,7 +79,7 @@ export default {
       //   this.$modal.msgError('内容不能为空')
       //   return
       // }
-      this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+      this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         customClass: 'box-logout',

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -1152,7 +1152,7 @@ export default {
 
       this.$refs['form'].validate(valid => {
         if (valid) {
-          this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+          this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             customClass: 'box-logout',

src/views/medical-record-management/medical-edit.vue

@@ -1633,7 +1633,7 @@ export default {
             'followStatus': this.detailInfo.followStatus
           }
           console.log('病例编辑页的提交字段大集合!!!', temp)
-          this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+          this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             customClass: 'box-logout',

src/views/service-management/hospitalization-management/components/handle-discharge.vue

@@ -102,7 +102,7 @@ export default {
     },
     // 返回按钮
     goBack() {
-      this.$confirm('是否确认立即返回，返回后系统不再保存已填写内容！', '提示', {
+      this.$confirm('是否确认立即返回，返回后系统不再保存已填写内容', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',

src/views/service-management/medical-record-management/check-subscribe.vue

@@ -382,7 +382,7 @@ export default {
     },
     // 点击立即预约
     handleBookNow(row) {
-      this.$confirm('立即预约此设备,是否确定?', '提示', {
+      this.$confirm('立即预约此设备,是否确定', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         customClass: 'box-logout',

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -758,7 +758,7 @@ export default {
     /** 对话框立即预约设备 */
     handleSubscribeDevice(row) {
       console.log('点击里面的立即预约', row)
-      this.$confirm('立即预约此设备,是否确定?', '提示', {
+      this.$confirm('立即预约此设备,是否确定', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         customClass: 'box-logout',

src/views/tool/build/index.vue

@@ -288,7 +288,7 @@ export default {
       document.getElementById('copyNode').click()
     },
     empty() {
-      this.$confirm('确定要清空所有组件吗？', '提示', { type: 'warning' }).then(
+      this.$confirm('确定要清空所有组件吗', '提示', { type: 'warning' }).then(
         () => {
           this.drawingList = []
         }