From 3e7eea349e4dfde171407ddb7388720ef4c12a25 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 11 Mar 2024 09:55:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../singleProgressManagement.vue | 105 ++++++++++++------ 1 file changed, 74 insertions(+), 31 deletions(-) diff --git a/src/views/projectFront/BIMBASECenter/singleProgressManagement.vue b/src/views/projectFront/BIMBASECenter/singleProgressManagement.vue index b935bbdc..cc3c780d 100644 --- a/src/views/projectFront/BIMBASECenter/singleProgressManagement.vue +++ b/src/views/projectFront/BIMBASECenter/singleProgressManagement.vue @@ -251,41 +251,49 @@ :modal-append-to-body="false" title="风险提示" :visible.sync="riskTipVisible" - width="667px" + width="70%" @close="closeRiskTipDialog" >
- + ref="myQuillEditor" + :options="editorOption" + @blur="onEditorBlur($event)" + @focus="onEditorFocus($event)" + @change="onEditorChange($event)" + > + - + ref="myQuillEditor" + :options="editorOption" + @blur="onEditorBlur($event)" + @focus="onEditorFocus($event)" + @change="onEditorChange($event)" + > + - + ref="myQuillEditor" + :options="editorOption" + @blur="onEditorBlur($event)" + @focus="onEditorFocus($event)" + @change="onEditorChange($event)" + > +
@@ -582,9 +590,38 @@ import { getBimBaseDetailsApi, projectBimBaseListApi, } from "@/assets/js/api/project"; +import VueQuillEditor from "vue-quill-editor"; export default { + components: { + VueQuillEditor, + }, data() { return { + editorOption: { + modules: { + toolbar: [ + ["bold", "italic", "underline", "strike"], //加粗，斜体，下划线，删除线 + ["blockquote", "code-block"], //引用，代码块 + + [{ header: 1 }, { header: 2 }], // 标题，键值对的形式；1、2表示字体大小 + [{ list: "ordered" }, { list: "bullet" }], //列表 + [{ script: "sub" }, { script: "super" }], // 上下标 + [{ indent: "-1" }, { indent: "+1" }], // 缩进 + [{ direction: "rtl" }], // 文本方向 + + [{ size: ["small", false, "large", "huge"] }], // 字体大小 + [{ header: [1, 2, 3, 4, 5, 6, false] }], //几级标题 + + [{ color: [] }, { background: [] }], // 字体颜色，字体背景颜色 + [{ font: [] }], //字体 + [{ align: [] }], //对齐方式 + + ["clean"], //清除字体样式 + ["image"], //上传图片、上传视频 + ], + }, + theme: "snow", + }, riskTipVisible: false, selectedHideList: [], selectedColorList: [], @@ -646,9 +683,9 @@ export default { fileUrl: "", dialogVisible: false, //新增弹窗 riskTipInfo: { - dangerPointIdentification: '', - riskControlMeasure: '', - constructionKeyPoint: '' + dangerPointIdentification: "", + riskControlMeasure: "", + constructionKeyPoint: "", }, workerInfo: { taskName: "", @@ -815,6 +852,15 @@ export default { this.getCrewListData(); }, methods: { + onEditorBlur() { + // 失去焦点事件 + }, + onEditorFocus() { + // 获得焦点事件 + }, + onEditorChange() { + // 内容改变事件 + }, //导入确定提交 handleUploadConfirm() { if (this.fileName == "") { @@ -956,7 +1002,7 @@ export default { }, // 风险提示 openRiskTipDialog(val) { - console.log(val) + console.log(val); this.riskTipInfo = JSON.parse(JSON.stringify(val)); this.riskTipVisible = true; }, @@ -1037,15 +1083,7 @@ export default { this.$refs.addEditForm.validate((valid) => { if (valid) { let data = { - taskName: this.workerInfo.taskName, - startDate: this.workerInfo.startDate, - finishDate: this.workerInfo.finishDate, - actualStartDate: this.workerInfo.actualStartDate, - actualFinishDate: this.workerInfo.actualFinishDate, - dutyUserId: this.workerInfo.dutyUserId, - progressRatio: this.workerInfo.progressRatio, - remark: this.workerInfo.remark, - parentId: this.workerInfo.parentId, + ...this.workerInfo, projectSn: this.projectSn, }; if (this.dialogType == 1) { @@ -1359,4 +1397,9 @@ export default { border: 1px solid #ccc; margin-top: 10px; } +::v-deep .ql-editor { + // 样式穿透 + + min-height: 180px !important; +} From 4d1f7825c07899941f1f0c10ca3dbd11d7cc7c82 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 11 Mar 2024 11:44:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81?= =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i18n/langs/cn/laborManage/personManage.js | 128 +++++++++--------- .../i18n/langs/en/laborManage/personManage.js | 128 +++++++++--------- .../personModule/laborComponent.vue | 24 ++-- 3 files changed, 140 insertions(+), 140 deletions(-) diff --git a/src/assets/i18n/langs/cn/laborManage/personManage.js b/src/assets/i18n/langs/cn/laborManage/personManage.js index c36fe43f..cab35c97 100644 --- a/src/assets/i18n/langs/cn/laborManage/personManage.js +++ b/src/assets/i18n/langs/cn/laborManage/personManage.js @@ -611,56 +611,56 @@ export default { trigger: "change", }, ], - nation: [ - { - required: true, - message: "请选择民族", - trigger: "change", - }, - { - required: true, - message: "请选择民族", - trigger: "submit", - }, - ], - nativePlace: [ - { - required: true, - message: "请输入籍贯", - trigger: "blur", - }, - ], - issuingAuthorityForIdcard: [ - { - required: true, - message: "请输入签发机关", - trigger: "blur", - }, - ], - idCardEndDate: [ - { - required: true, - message: "请选择有效日期", - trigger: "submit", - }, - { - required: true, - message: "请选择有效日期", - trigger: "change", - }, - ], - idCardUpPhotoUrl: [ - { - required: true, - message: "请选择上传身份证", - trigger: "submit", - }, - { - required: true, - message: "请选择上传身份证", - trigger: "change", - }, - ], + // nation: [ + // { + // required: true, + // message: "请选择民族", + // trigger: "change", + // }, + // { + // required: true, + // message: "请选择民族", + // trigger: "submit", + // }, + // ], + // nativePlace: [ + // { + // required: true, + // message: "请输入籍贯", + // trigger: "blur", + // }, + // ], + // issuingAuthorityForIdcard: [ + // { + // required: true, + // message: "请输入签发机关", + // trigger: "blur", + // }, + // ], + // idCardEndDate: [ + // { + // required: true, + // message: "请选择有效日期", + // trigger: "submit", + // }, + // { + // required: true, + // message: "请选择有效日期", + // trigger: "change", + // }, + // ], + // idCardUpPhotoUrl: [ + // { + // required: true, + // message: "请选择上传身份证", + // trigger: "submit", + // }, + // { + // required: true, + // message: "请选择上传身份证", + // trigger: "change", + // }, + // ], phoneNumber: [ { required: true, @@ -668,20 +668,20 @@ export default { trigger: "blur", }, ], - emergentPerson: [ - { - required: true, - message: "请输入紧急联系人", - trigger: "blur", - }, - ], - emergentPhone: [ - { - required: true, - message: "请输入紧急联系人电话", - trigger: "blur", - }, - ], + // emergentPerson: [ + // { + // required: true, + // message: "请输入紧急联系人", + // trigger: "blur", + // }, + // ], + // emergentPhone: [ + // { + // required: true, + // message: "请输入紧急联系人电话", + // trigger: "blur", + // }, + // ], }, queryFails: '查询失败', creditCode: '请输入正确的社会统一信用代码', diff --git a/src/assets/i18n/langs/en/laborManage/personManage.js b/src/assets/i18n/langs/en/laborManage/personManage.js index 4a9e1529..c00351e7 100644 --- a/src/assets/i18n/langs/en/laborManage/personManage.js +++ b/src/assets/i18n/langs/en/laborManage/personManage.js @@ -519,56 +519,56 @@ export default { trigger: "change", }, ], - nation: [ - { - required: true, - message: "Please select nationality", - trigger: "change", - }, - { - required: true, - message: "Please select nationality", - trigger: "submit", - }, - ], - nativePlace: [ - { - required: true, - message: "Please enter your native place", - trigger: "blur", - }, - ], - issuingAuthorityForIdcard: [ - { - required: true, - message: "Please enter the issuing authority", - trigger: "blur", - }, - ], - idCardEndDate: [ - { - required: true, - message: "Please select an effective date", - trigger: "submit", - }, - { - required: true, - message: "Please select an effective date", - trigger: "change", - }, - ], - idCardUpPhotoUrl: [ - { - required: true, - message: "Please choose to upload your ID card", - trigger: "submit", - }, - { - required: true, - message: "Please choose to upload your ID card", - trigger: "change", - }, - ], + // nation: [ + // { + // required: true, + // message: "Please select nationality", + // trigger: "change", + // }, + // { + // required: true, + // message: "Please select nationality", + // trigger: "submit", + // }, + // ], + // nativePlace: [ + // { + // required: true, + // message: "Please enter your native place", + // trigger: "blur", + // }, + // ], + // issuingAuthorityForIdcard: [ + // { + // required: true, + // message: "Please enter the issuing authority", + // trigger: "blur", + // }, + // ], + // idCardEndDate: [ + // { + // required: true, + // message: "Please select an effective date", + // trigger: "submit", + // }, + // { + // required: true, + // message: "Please select an effective date", + // trigger: "change", + // }, + // ], + // idCardUpPhotoUrl: [ + // { + // required: true, + // message: "Please choose to upload your ID card", + // trigger: "submit", + // }, + // { + // required: true, + // message: "Please choose to upload your ID card", + // trigger: "change", + // }, + // ], phoneNumber: [ { required: true, @@ -576,20 +576,20 @@ export default { trigger: "blur", }, ], - emergentPerson: [ - { - required: true, - message: "Please enter an emergency contact", - trigger: "blur", - }, - ], - emergentPhone: [ - { - required: true, - message: "Please enter your emergency contact number", - trigger: "blur", - }, - ], + // emergentPerson: [ + // { + // required: true, + // message: "Please enter an emergency contact", + // trigger: "blur", + // }, + // ], + // emergentPhone: [ + // { + // required: true, + // message: "Please enter your emergency contact number", + // trigger: "blur", + // }, + // ], }, queryFails: 'The query fails', creditCode: 'Please enter the correct social uniform credit code', diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 760aa38e..2e9b00bf 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -2999,18 +2999,18 @@ export default { ) return } - if (this.personForm.idCardUpPhotoUrl == '') { - this.$message.error( - this.$t('message.laborMange.pleaseUploadTheNationalEmblemOfIdCard') - ) - return - } - if (this.personForm.idCardDownPhotoUrl == '') { - this.$message.error( - this.$t('message.laborMange.pleaseUploadYourIDCardPortrait') - ) - return - } + // if (this.personForm.idCardUpPhotoUrl == '') { + // this.$message.error( + // this.$t('message.laborMange.pleaseUploadTheNationalEmblemOfIdCard') + // ) + // return + // } + // if (this.personForm.idCardDownPhotoUrl == '') { + // this.$message.error( + // this.$t('message.laborMange.pleaseUploadYourIDCardPortrait') + // ) + // return + // } this.$refs[formName].validate((valid) => { if (valid) {