Merge branch 'dev-lhk' into shenzhen-dev

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"
       >
         <div class="dialog_content">
           <el-form
             ref="riskEditForm"
-            label-width="100px"
             size="medium"
-            class="dialogFormBox"
+            label-width="120px"
             :rules="riskEditRules"
             :model="riskTipInfo"
           >
             <el-form-item label="危险点辨识" prop="dangerPointIdentification">
-              <el-input
+              <quill-editor
                 v-model="riskTipInfo.dangerPointIdentification"
-                placeholder="请输入"
+                ref="myQuillEditor"
-                :rows="3"
+                :options="editorOption"
-                type="textarea"
+                @blur="onEditorBlur($event)"
-              ></el-input>
+                @focus="onEditorFocus($event)"
+                @change="onEditorChange($event)"
+              >
+              </quill-editor>
             </el-form-item>
             <el-form-item label="风险控制措施" prop="riskControlMeasure">
-              <el-input
+              <quill-editor
                 v-model="riskTipInfo.riskControlMeasure"
-                placeholder="请输入"
+                ref="myQuillEditor"
-                :rows="3"
+                :options="editorOption"
-                type="textarea"
+                @blur="onEditorBlur($event)"
-              ></el-input>
+                @focus="onEditorFocus($event)"
+                @change="onEditorChange($event)"
+              >
+              </quill-editor>
             </el-form-item>
             <el-form-item label="施工要点" prop="constructionKeyPoint">
-              <el-input
+              <quill-editor
                 v-model="riskTipInfo.constructionKeyPoint"
-                placeholder="请输入"
+                ref="myQuillEditor"
-                :rows="3"
+                :options="editorOption"
-                type="textarea"
+                @blur="onEditorBlur($event)"
-              ></el-input>
+                @focus="onEditorFocus($event)"
+                @change="onEditorChange($event)"
+              >
+              </quill-editor>
             </el-form-item>
           </el-form>
         </div>
@@ -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: '',
+        dangerPointIdentification: "",
-        riskControlMeasure: '',
+        riskControlMeasure: "",
-        constructionKeyPoint: ''
+        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,
+            ...this.workerInfo,
-            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,
             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;
+}
 </style>