markdown修复

src/components/quill/index.vue

@@ -2,13 +2,13 @@
   <div>
     <el-radio-group v-if="!readonly"
                     class="type-radio"
-                    v-model="type"
+                    v-model="editorType"
                     @change="typeChange">
-      <el-radio :label="0">富文本</el-radio>
+      <el-radio label="0">富文本</el-radio>
-      <el-radio :label="1">markdown</el-radio>
+      <el-radio label="1">markdown</el-radio>
     </el-radio-group>
 
-    <div v-show="!type"
+    <div v-show="editorType == 0"
          class="quill"
          ref="quill"
          :class="classes">
@@ -26,7 +26,7 @@
     </div>
     <mavon-editor class="md"
                   v-model="mdVal"
-                  v-show="type"
+                  v-show="editorType == 1"
                   ref="md"
                   :ishljs="true"
                   :subfield="false"
@@ -79,14 +79,19 @@ export default {
      */
     elseRead: {
       type: String, default: 'false'
-    }
+    },
+    // 编辑器切换
+    type: {
+      type: String,
+      default: '0'
+    },
   },
   data () {
     return {
       headers: {
         token: sessionStorage.getItem('token')
       },
-      type: 0,
+      editorType: '0',
       mdVal: '',
       Quill: null,
       currentValue: '',
@@ -136,17 +141,23 @@ export default {
 
   },
   watch: {
+    type: {
+      handler (val) {
+        this.editorType = val
+      },
+      immediate: true
+    },
     value: {
       handler (val) {
-        if (!this.type) {
+        if (this.type == 0) {
           if (val !== this.currentValue) {
             this.currentValue = val;
             if (this.Quill) {
               this.Quill.pasteHTML(this.value);
             }
           }
-          if (!this.mdVal) this.mdVal = val
         }
+        if (!this.mdVal) this.mdVal = val
       },
       immediate: true
     }
@@ -169,6 +180,7 @@ export default {
   methods: {
     // 富文本切换
     typeChange (val) {
+      this.$emit('update:type', val)
       if (!this.mdVal) this.mdVal = this.value
     },
 

src/setting.js

@@ -12,7 +12,7 @@ if (isDev) {
   host = 'http://121.37.12.51/'
   // host = 'https://huorantech.cn/'
   // host = 'http://192.168.31.217:9000/'// 榕
-  // host = 'http://192.168.31.51:9000/'// 赓
+  host = 'http://192.168.31.51:9000/'// 赓
 } else if (isPro) {
   jumpPath = 'https://www.huorantech.cn/judgmentPoint/'
 }

src/views/customer/AddCustomer.vue

@@ -992,8 +992,7 @@ export default {
         this.customerVisible = false
         this.submiting = false
         this.$message.success('添加成功')
-        this.form.schoolId = res.schoolId
+        this.getSchoolData(res.schoolId)
-        this.getSchoolData()
       }).catch((res) => {
         this.submiting = false
       })
@@ -1136,14 +1135,24 @@ export default {
         this.form.customerName = ''
     },
     // 获取学校/客户名称
-    getSchoolData () {
+    getSchoolData (schoolId) {
       let data = {
         schoolName: '',
         provinceId: '',
         cityId: ''
       }
-      this.$get(this.api.querySchoolData).then(res => {
+      this.$get(this.api.querySchoolData).then(({ list }) => {
-        this.schoolList = res.list
+        this.schoolList = list
+        // 有传schoolId，则需要找到这个学校然后赋值表单
+        if (schoolId) {
+          const item = list.find(e => e.schoolId == schoolId)
+          if (item) {
+            this.form.schoolId = schoolId
+            this.form.provinceId = item.provinceId
+            this.getCityData()
+            this.form.cityId = item.cityId
+          }
+        }
       }).catch(res => { });
     },
     // 查询客户是否存在

src/views/serve/projectAdd.vue

@@ -70,6 +70,7 @@
                 <quill :border="true"
                        :readonly="isDetail"
                        v-model="projectManage.experimentTarget"
+                       :type.sync="projectManage.experimentTargetType"
                        :minHeight="150"
                        :height="150" />
               </el-form-item>
@@ -90,6 +91,7 @@
                 <quill :border="true"
                        :readonly="isDetail"
                        v-model="projectManage.experimentDescription"
+                       :type.sync="projectManage.experimentDescriptionType"
                        :minHeight="150"
                        :height="150" />
               </el-form-item>
@@ -241,6 +243,7 @@
                 <quill :border="true"
                        :readonly="isDetail"
                        v-model="projectManage.experimentHint"
+                       :type.sync="projectManage.experimentHintType"
                        :minHeight="150"
                        :height="150" />
               </el-form-item>
@@ -337,7 +340,10 @@ export default {
         state: 0, // 状态(0、草稿箱 1、已发布)
         isOpen: 0, // 是否开启(0开启 1未开启 默认0)
         ztOpen: 0, // 是否开启(0开启 1未开启 默认0)
-        isDel: 0 // 是否删除(0、未删除 1、已删除 默认0)
+        isDel: 0, // 是否删除(0、未删除 1、已删除 默认0)
+        experimentTargetType: '0',
+        experimentDescriptionType: '0',
+        experimentHintType: '0',
       },
       projectJudgmentData: [], //实验任务(项目判分点)
       oriPer: '', // 原始项目用途，用于保存的时候对比是否有修改该值，如果有，要调另一个接口查询提示
@@ -431,6 +437,9 @@ export default {
         this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => {
           let { projectManage, projectJudgmentVos } = res;
           if (!projectManage.remark) projectManage.remark = projectManage.projectName // 如果没有备注，则直接显示项目名称
+          if (!projectManage.experimentDescriptionType) projectManage.experimentDescriptionType = '0'
+          if (!projectManage.experimentHintType) projectManage.experimentHintType = '0'
+          if (!projectManage.experimentTargetType) projectManage.experimentTargetType = '0'
           this.projectManage = projectManage;
           this.projectJudgmentData = projectJudgmentVos;
           this.oriPer = projectManage.permissions
@@ -529,6 +538,7 @@ export default {
       this.submiting = true
       this.$store.dispatch("setSystemId", this.projectManage.systemId);
       this.projectManage.state = state;
+      console.log("🚀 ~ file: projectAdd.vue:537 ~ handleSubmit ~ this.projectManage:", this.projectManage)
       this.projectManage.ztOpen = state ? 0 : 1
       let { systemId } = this.projectManage;
       if (this.projectId) {