Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/makerActvityApplyMain.vue

@@ -84,7 +84,7 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 this.ajax.get(this.$store.state.api+"/GetAllProjectName",{
                     uid:this.$store.state.userInfo.userid,
                 }).then(res=>{
-                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload==2);
+                    this.makerActvityApplyData.project = res.data[0].filter(item=>item.isupload!=3 && item.isupload!=4 );
                 }).catch(err=>{
                     this.$message.error(err.message)
                 })

src/views/activityManage/makerActvityDetails.vue

@@ -572,7 +572,7 @@ export default {
             uid:this.$store.state.userInfo.userid,
         }).then(res=>{
           console.log(res)
-          this.selectInput.project = res.data[0].filter(item=>(item.courseId==this.tableData.pid||item.isupload==2));
+          this.selectInput.project = res.data[0].filter(item=>(item.courseId==this.tableData.pid||(item.isupload!=3 && item.isupload!=4 )));
           this.loading = false
         }).catch(err=>{
             this.$message.error(err.message)

src/views/fundManage/makerfundApply.vue

@@ -1021,9 +1021,9 @@ export default {
             for(let k in this.newIndirectFundBlock) return this.newIndirectFundBlock[k]=''
         },
         init(){
-                //重置
-                this.submitHint=false;
-                this.createFromDialog=false;
+            //重置
+            this.submitHint=false;
+            this.createFromDialog=false;
         },
         directFundDataSelectChange(){//直接经费全部下拉框
             

src/views/projectApply/components/projectApplication2.vue

@@ -7,25 +7,57 @@
               <div>
                 <p class="pTit2">一、项目研发背景</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.back">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">二、项目创新点</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.innovate">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">三、技术研发路线</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.path">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">四、项目应用场景</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.scene">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor> -->
                 </div>
               </div>
               <!-- <div class="editor">
@@ -37,7 +69,15 @@
               <div>
                 <p class="pTit2">一、项目商业模式/社会价值</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.worth"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.worth">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.worth"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -46,7 +86,15 @@
               <div>
                 <p class="pTit2">一、团队构成及优势</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.team"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.team">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.team"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -56,7 +104,15 @@
               <div>
                 <p class="pTit2">一、研发成本来源及构成</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.cost">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -65,26 +121,58 @@
               <div>
                 <p class="pTit2">一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.expectResults">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.expectResultsTeacher">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.expectConversion">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor> -->
                 </div>
               </div>
             </div>
             <div>
               <p class="pTit" style="margin-bottom: 0;">实施计划</p>
               <div class="editor">
-                <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor>
+                <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.plan">
+                  </el-input>
+                <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor> -->
               </div>
             </div>
       <div class="baseBtn">

src/views/projectApply/components/projectApplicationApply2.vue

@@ -31,25 +31,57 @@
               <div>
                 <p class="pTit2">一、项目研发背景</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.back"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.back">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.back"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">二、项目创新点</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.innovate"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.innovate">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.innovate"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">三、技术研发路线</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.path"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.path">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.path"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">四、项目应用场景</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.scene"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.scene">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.scene"></vue-editor> -->
                 </div>
               </div>
               <!-- <div class="editor">
@@ -61,7 +93,15 @@
               <div>
                 <p class="pTit2">一、项目商业模式/社会价值</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.worth"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.worth">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.worth"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -70,7 +110,15 @@
               <div>
                 <p class="pTit2">一、团队构成及优势</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.team"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.team">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.team"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -80,7 +128,15 @@
               <div>
                 <p class="pTit2">一、研发成本来源及构成</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.cost"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.cost">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.cost"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -89,26 +145,58 @@
               <div>
                 <p class="pTit2">一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.expectResults"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.expectResults">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.expectResults"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.expectResultsTeacher"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.expectResultsTeacher">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.expectResultsTeacher"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.expectConversion"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.expectConversion">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.expectConversion"></vue-editor> -->
                 </div>
               </div>
             </div>
             <div id="6">
               <p class="pTit">实施计划</p>
               <div class="editor">
-                <vue-editor  :editorToolbar="customToolbar" v-model="data.plan"></vue-editor>
+                <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.plan">
+                  </el-input>
+                <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.plan"></vue-editor> -->
               </div>
             </div>
             <div id="7" class="baseBtn">

src/views/projectApply/components/projectApplicationApplyMakerSpace2.vue

@@ -36,7 +36,15 @@
               <div>
                 <p class="pTit2">一、建设内容<span>（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span></p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.Construction">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -45,7 +53,15 @@
               <div>
                 <p class="pTit2">一、立项依据<span> （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span></p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.ProjectBasis"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.ProjectBasis">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.ProjectBasis"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -54,35 +70,75 @@
               <div>
                 <p class="pTit2">一、创客空间物理环境、制度建设及软件设施建设情况<span>（环境优化/制度完善/设施改造）</span></p>
                 <div class="editor">
-                  <vue-editor  v-model="data.development" :editorToolbar="customToolbar"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.customToolbar">
+                  </el-input>
+                  <!-- <vue-editor  v-model="data.development" :editorToolbar="customToolbar"></vue-editor> -->
                 </div>
               </div>
 
               <div>
                 <p class="pTit2">二、学生创客工作室建设情况<span>（工作室数量及活动开展情况）</span></p>
                 <div class="editor">
-                  <vue-editor :editorToolbar="customToolbar" v-model="data.studio"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.studio">
+                  </el-input>
+                  <!-- <vue-editor :editorToolbar="customToolbar" v-model="data.studio"></vue-editor> -->
                 </div>
               </div>
 
               <div>
                 <p class="pTit2">三、学生创客团队（人才）培养预期成果、数量</p>
                 <div class="editor">
-                  <vue-editor :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.studentTeam">
+                  </el-input>
+                  <!-- <vue-editor :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor> -->
                 </div>
               </div>
 
               <div>
                 <p class="pTit2">四、学生创客活动组织实施情况</p>
                 <div class="editor">
-                  <vue-editor :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.studentActivities">
+                  </el-input>
+                  <!-- <vue-editor :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor> -->
                 </div>
               </div>
 
               <div>
                 <p class="pTit2">五、学生创客团队孵化、转化创业项目情况</p>
                 <div class="editor">
-                  <vue-editor :editorToolbar="customToolbar" v-model="data.Transforming"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.Transforming">
+                  </el-input>
+                  <!-- <vue-editor :editorToolbar="customToolbar" v-model="data.Transforming"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -91,7 +147,15 @@
               <div>
                 <p class="pTit2">一、基础条件<span>（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span></p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="data.condition"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="data.condition">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.condition"></vue-editor> -->
                 </div>
               </div>
             </div>

src/views/projectApply/components/projectApplicationMakerSpaceDetails2.vue

@@ -9,48 +9,112 @@
       <div class="PA2mid">项目建设内容及目标</div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">一、建设内容<span>（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span></div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor>
+        <el-input
+          type="textarea"
+          :rows="6"
+          resize="none"
+          class="textArea"
+          placeholder="请输入内容"
+          v-model="data.Construction">
+        </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor> -->
       </div>
 
       <div class="PA2mid">预项目建设论证报告</div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">一、立项依据<span> （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span></div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.ProjectBasis"></vue-editor>
+        <el-input
+          type="textarea"
+          :rows="6"
+          resize="none"
+          class="textArea"
+          placeholder="请输入内容"
+          v-model="data.ProjectBasis">
+        </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.ProjectBasis"></vue-editor> -->
       </div>
 
       <div class="PA2mid">预期成果</div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">一、创客空间物理环境、制度建设及软件设施建设情况<span>（环境优化/制度完善/设施改造）</span></div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.development"></vue-editor>
+        <el-input
+          type="textarea"
+          :rows="6"
+          resize="none"
+          class="textArea"
+          placeholder="请输入内容"
+          v-model="data.development">
+        </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.development"></vue-editor> -->
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">二、学生创客工作室建设情况<span>（工作室数量及活动开展情况）</span></div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.studio"></vue-editor>
+        <el-input
+          type="textarea"
+          :rows="6"
+          resize="none"
+          class="textArea"
+          placeholder="请输入内容"
+          v-model="data.studio">
+        </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studio"></vue-editor> -->
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">三、学生创客团队（人才）培养预期成果、数量</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor>
+        <el-input
+          type="textarea"
+          :rows="6"
+          resize="none"
+          class="textArea"
+          placeholder="请输入内容"
+          v-model="data.studentTeam">
+        </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor> -->
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">四、学生创客活动组织实施情况</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor>
+        <el-input
+          type="textarea"
+          :rows="6"
+          resize="none"
+          class="textArea"
+          placeholder="请输入内容"
+          v-model="data.studentActivities">
+        </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor> -->
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">五、学生创客团队孵化、转化创业项目情况</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.Transforming"></vue-editor>
+        <el-input
+          type="textarea"
+          :rows="6"
+          resize="none"
+          class="textArea"
+          placeholder="请输入内容"
+          v-model="data.Transforming">
+        </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.Transforming"></vue-editor> -->
       </div>
 
       <div class="PA2mid">立项基础及条件</div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">一、基础条件<span>（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span></div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.condition"></vue-editor>
+        <el-input
+          type="textarea"
+          :rows="6"
+          resize="none"
+          class="textArea"
+          placeholder="请输入内容"
+          v-model="data.condition">
+        </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.condition"></vue-editor> -->
       </div>
 
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" v-show="isUpload==0"  @click="submitHint=true">立即修改</el-button>
-          <el-button type="primary" disabled v-show="isUpload==1" style="background: #ccc !important;border: none;">立即修改</el-button>
-          <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button>
+          <el-button type="primary" v-show="isUpload==2"  @click="submitHint=true">立即修改</el-button>
+          <el-button type="primary" disabled v-show="isUpload==3 || isUpload ==4" style="background: #ccc !important;border: none;">立即修改</el-button>
+          <!-- <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button> -->
 
         </div>
       </div>

src/views/projectApply/projectApplication.vue

@@ -153,7 +153,7 @@
 
                     <span v-if="scope.row.isupload==0">未审核</span>
                     <span v-if="scope.row.isupload==1">审核中</span>
-                    <span v-if="scope.row.isupload==2">已审核</span>
+                    <span v-if="scope.row.isupload==2">进行中</span>
                     <span v-if="scope.row.isupload==3">待结项</span>
                     <span v-if="scope.row.isupload==4">已结项</span>
 
@@ -365,7 +365,7 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
               },
               {
                 value:2,
-                label:'已审核'
+                label:'进行中'
               },
               {
                 value:3,
@@ -528,7 +528,6 @@ import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.
             tid:this.selectInp.sort,    //分类
             leader:this.selectInp.person,  //负责人
             st:this.selectInp.state,  //审核状态
-            endState:"",
             year:"",
             textInp:'',
             page:this.table.currentPage,  //当前页

src/views/projectManage/ProjectManagement.vue

@@ -101,9 +101,9 @@
       <div class="classBlock" v-for="(item,index) in items" :key="index">
         <div class="projectBlockPosition">
           <!-- {{ item.isupload }} -->
-          <span v-if="item.endProject==0">进行中</span>
-          <span v-if="item.endProject==1">待结题</span>
-          <span v-if="item.endProject==2">已结题</span>
+          <span v-if="item.isupload==2">进行中</span>
+          <span v-if="item.isupload==3">待结题</span>
+          <span v-if="item.isupload==4">已结题</span>
 
         </div>
         <img :src="item.image" alt="">
@@ -121,9 +121,9 @@
               <span @click="scheduleDetail(item.courseId,item.typeid)">进度详细</span>
               <span @click="fundStatus(item.courseId)">资金情况</span>
               <!-- <span v-show="item.isupload==0"  @click="$message.error('请先进行项目立项审核')">结项</span> -->
-              <span v-show="item.endProject==0"  @click="finish(item.courseId,item.title)">结项</span>
-              <span v-show="item.endProject==1"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
-              <span v-show="item.endProject==2" style="color: gray;cursor: no-drop;">已结项</span>
+              <span v-show="item.isupload==2"  @click="finish(item.courseId,item.title)">结项</span>
+              <span v-show="item.isupload==3"  @click="amendFinish(item.courseId,item.title)" >修改结项</span>
+              <span v-show="item.isupload==4" style="color: gray;cursor: no-drop;">已结项</span>
         
                           
             </div>
@@ -244,15 +244,15 @@ import { getNowDate } from '@/components/tool/Date';
                 label:'全部'
               },
               {
-                value:0,
+                value:2,
                 label:'进行中'
               },
               {
-                value:1,
+                value:3,
                 label:'待结题'
               },
               {
-                value:2,
+                value:4,
                 label:"已结题"
               },
             ],
@@ -320,8 +320,7 @@ import { getNowDate } from '@/components/tool/Date';
             uid:this.$store.state.userInfo.userid,
             cid:this.iid,
             file:JSON.stringify(this.file),
-            ep:1,//管理员的待结项
-            isp:3,//教师看到的待结项
+            state:3
           }).then(res=>{
             if(res.data==1){
               this.$message.success("待结项成功");

src/views/projectManage/components/ProjectManagement1.vue

@@ -352,8 +352,8 @@
             
     <div class="baseBtn">
       <div class="blockWidth">
-        <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
-        <el-button type="primary" v-show="isUpload==1 || isUpload==2" class="disa">立即修改</el-button>
+        <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button>
+        <el-button type="primary" v-show="isUpload==3 || isUpload==4" class="disa">立即修改</el-button>
         <!-- <el-button type="primary" v-show="apIsupload==2" class="disa">立即修改</el-button> -->
       </div>
     </div>
@@ -685,7 +685,7 @@
                         this.content.textarea=data.brief
                         this.content.dialogImageUrl=data.image
                         this.pageType=[data.typeid,data.typeName]
-                        this.isUpload=data.endProject
+                        this.isUpload=data.isupload
                         this.loading = false;
                         this.apIsupload=data.apIsupload
                         // console.log(this.content);

src/views/projectManage/components/ProjectManagement1_MakerSpace.vue

@@ -237,9 +237,9 @@
       <div class="blockWidth">
         <!-- <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
 
-        <el-button v-show="isUpload==0 || isUpload ==1" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
+        <el-button v-show="isUpload==2 || isUpload ==3" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
         <!-- <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
-        <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
+        <el-button v-show="isUpload==4" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
 
       </div>
     </div>
@@ -610,7 +610,7 @@
                     this.dialogImageUrl=data.image;
                     this.select.departmentData = data['classid']
                     this.select.sort = [data['typeid'],data['typeName']]
-                    this.isUpload=data['endProject']
+                    this.isUpload=data['isupload']
                     this.select.lead_leader = data['lead_leader']
                     this.teacherData = JSON.parse(data['course_teacher'])
                     this.studentData = JSON.parse(data['course_student'])

src/views/projectManage/components/ProjectManagement2.vue

@@ -7,25 +7,57 @@
               <div>
                 <p class="pTit2">一、项目研发背景</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.back">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">二、项目创新点</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.innovate">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">三、技术研发路线</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.path">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">四、项目应用场景</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.scene">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor> -->
                 </div>
               </div>
               <!-- <div class="editor">
@@ -37,7 +69,15 @@
               <div>
                 <p class="pTit2">一、项目商业模式/社会价值</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.worth"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.worth">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.worth"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -46,7 +86,15 @@
               <div>
                 <p class="pTit2">一、团队构成及优势</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.team"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.team">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.team"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -56,7 +104,15 @@
               <div>
                 <p class="pTit2">一、研发成本来源及构成</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.cost">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor> -->
                 </div>
               </div>
             </div>
@@ -65,32 +121,64 @@
               <div>
                 <p class="pTit2">一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.expectResults">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.expectResultsTeacher">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor> -->
                 </div>
               </div>
               <div>
                 <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor>
+                  <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.expectConversion">
+                  </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor> -->
                 </div>
               </div>
             </div>
             <div>
               <p class="pTit" style="margin-bottom: 0;">实施计划</p>
               <div class="editor">
-                <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor>
+                <el-input
+                    type="textarea"
+                    :rows="6"
+                    resize="none"
+                    class="textArea"
+                    placeholder="请输入内容"
+                    v-model="content.plan">
+                  </el-input>
+                <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor> -->
               </div>
             </div>
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
-          <el-button type="primary" v-show="isUpload==1 || isUpload ==2" class="disa">立即修改</el-button>
+          <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button>
+          <el-button type="primary" v-show="isUpload==3 || isUpload ==4" class="disa">立即修改</el-button>
 
         </div>
       </div>
@@ -187,7 +275,7 @@ import { VueEditor } from "vue2-editor";
                     .get(this.$store.state.api+'/SelectProjectApplyDetailStudent',param)
                     .then(res=>{
                         let data=res.data[0][0]
-                        this.isUpload=data.endProject
+                        this.isUpload=data.isupload
                         // console.log(data.chapters);
                         this.content=JSON.parse(data.chapters)
                         this.apIsupload=data.apIsupload

src/views/projectManage/components/ProjectManagement2_MakerSpace.vue

@@ -4,47 +4,111 @@
         <div class="PA2mid">项目建设内容及目标</div>
         <div class="PA2textArea">
           <div class="PA2textAreaTit PA2textAreaTit2">一、建设内容<span>（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span></div>
-          <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor>
+          <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.Construction">
+          </el-input>
+          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor> -->
         </div>
   
         <div class="PA2mid">预项目建设论证报告</div>
         <div class="PA2textArea">
           <div class="PA2textAreaTit PA2textAreaTit2">一、立项依据<span> （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span></div>
-          <vue-editor  :editorToolbar="customToolbar" v-model="data.ProjectBasis"></vue-editor>
+          <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.ProjectBasis">
+          </el-input>
+          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.ProjectBasis"></vue-editor> -->
         </div>
   
         <div class="PA2mid">预期成果</div>
         <div class="PA2textArea">
           <div class="PA2textAreaTit PA2textAreaTit2">一、创客空间物理环境、制度建设及软件设施建设情况<span>（环境优化/制度完善/设施改造）</span></div>
-          <vue-editor  :editorToolbar="customToolbar" v-model="data.development"></vue-editor>
+          <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.development">
+          </el-input>
+          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.development"></vue-editor> -->
         </div>
         <div class="PA2textArea">
           <div class="PA2textAreaTit PA2textAreaTit2">二、学生创客工作室建设情况<span>（工作室数量及活动开展情况）</span></div>
-          <vue-editor  :editorToolbar="customToolbar" v-model="data.studio"></vue-editor>
+          <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.studio">
+          </el-input>
+          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studio"></vue-editor> -->
         </div>
         <div class="PA2textArea">
           <div class="PA2textAreaTit PA2textAreaTit2">三、学生创客团队（人才）培养预期成果、数量</div>
-          <vue-editor  :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor>
+          <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.studentTeam">
+          </el-input>
+          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor> -->
         </div>
         <div class="PA2textArea">
           <div class="PA2textAreaTit PA2textAreaTit2">四、学生创客活动组织实施情况</div>
-          <vue-editor  :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor>
+          <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.studentActivities">
+          </el-input>
+          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor> -->
         </div>
         <div class="PA2textArea">
           <div class="PA2textAreaTit PA2textAreaTit2">五、学生创客团队孵化、转化创业项目情况</div>
-          <vue-editor  :editorToolbar="customToolbar" v-model="data.Transforming"></vue-editor>
+          <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.Transforming">
+          </el-input>
+          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.Transforming"></vue-editor> -->
         </div>
   
         <div class="PA2mid">立项基础及条件</div>
         <div class="PA2textArea">
           <div class="PA2textAreaTit PA2textAreaTit2">一、基础条件<span>（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span></div>
-          <vue-editor  :editorToolbar="customToolbar" v-model="data.condition"></vue-editor>
+          <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.condition">
+          </el-input>
+          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.condition"></vue-editor> -->
         </div>
   
         <div class="baseBtn">
           <div class="blockWidth">
-            <el-button type="primary" v-show="isUpload==0 || isUpload==1"  @click="submitHint=true">立即修改</el-button>
-            <el-button type="primary" disabled v-show="isUpload ==2" style="background: #ccc !important;border: none;">立即修改</el-button>
+            <el-button type="primary" v-show="isUpload==2 || isUpload==3"  @click="submitHint=true">立即修改</el-button>
+            <el-button type="primary" disabled v-show="isUpload ==4" style="background: #ccc !important;border: none;">立即修改</el-button>
             <!-- <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button> -->
   
           </div>
@@ -123,7 +187,7 @@
                 this.ajax
                       .get(this.$store.state.api+'/SelectProjectChapterMakerSpace',param)
                       .then(res=>{
-                        this.isUpload = res.data[0][0]['endProject']
+                        this.isUpload = res.data[0][0]['isupload']
                         this.data = JSON.parse(res.data[0][0]['chapters']);
                         console.log(this.data)
                         this.loading = false;

src/views/projectManage/components/ProjectManagement4.vue

@@ -4,9 +4,9 @@
 
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn"  size="mini">上传文件</el-button> -->
-          <beUpload @getFile="getFile" v-show="state==0 || state==1"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <beUpload @getFile="getFile" v-show="state==2 || state==3"  :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
           <!-- <beUpload @getFile="getFile"  v-show="state==1" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload> -->
-          <el-button v-show="state==2"  style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;height: 40px;">上传文件</el-button>
+          <el-button v-show="state==4"  style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;height: 40px;">上传文件</el-button>
         </div>
         <el-progress v-show="progress.show" :percentage="progress.value" :format="ProgressFormat"></el-progress>
 
@@ -228,7 +228,7 @@
                     .get(this.$store.state.api+'/SelectProjectFile',param)
                     .then(res=>{
                       console.log(res.data[0][0]);
-                      this.state=res.data[0][0].endProject;
+                      this.state=res.data[0][0].isupload;
                       let k=[]
                       res.data[0].forEach((e,i) => {
                         let { projectFile: l } = e;

src/views/projectManage/components/ProjectManagement5.vue

@@ -4,8 +4,8 @@
 
       <div class="pmInp">
           <!-- <el-button type="primary" class="btn" @click="addFile" size="mini">上传文件</el-button> -->
-          <beUpload  @getFile="getFile" v-show="state==0|| state==1" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
-          <el-button  v-show="state==2" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
+          <beUpload  @getFile="getFile" v-show="state==2|| state==3" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
+          <el-button  v-show="state==4" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button>
           <!-- <el-button v-show="state==1" style="background: #ccc !important;cursor: no-drop;color: #fff !important;border: 0;font-size: 16px;">上传文件</el-button> -->
 
         </div>
@@ -227,7 +227,7 @@
                     .get(this.$store.state.api+'/SelectProjectManageFile',param)
                     .then(res=>{
                       console.log(res.data[0][0]);
-                      this.state=res.data[0][0].endProject;
+                      this.state=res.data[0][0].isupload;
                       console.log(res.data[0][0])
                       let file = JSON.parse(res.data[0][0]['endFile']);
                       this.tableData=file

src/views/projectSettlement/components/projectSettlementDetail_MakerSpace.vue

@@ -6,35 +6,91 @@
     <div class="PA2mid">项目建设内容及目标</div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">一、建设内容<span>（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span></div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor>
+          <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.Construction">
+          </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.Construction"></vue-editor> -->
       </div>
 
       <div class="PA2mid">预项目建设论证报告</div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">一、立项依据<span> （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span></div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.ProjectBasis"></vue-editor>
+        <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.ProjectBasis">
+          </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.ProjectBasis"></vue-editor> -->
       </div>
 
       <div class="PA2mid">预期成果</div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">一、创客空间物理环境、制度建设及软件设施建设情况<span>（环境优化/制度完善/设施改造）</span></div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.development"></vue-editor>
+        <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.development">
+          </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.development"></vue-editor> -->
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">二、学生创客工作室建设情况<span>（工作室数量及活动开展情况）</span></div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.studio"></vue-editor>
+        <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.studio">
+          </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studio"></vue-editor> -->
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">三、学生创客团队（人才）培养预期成果、数量</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor>
+        <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.studentTeam">
+          </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentTeam"></vue-editor> -->
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">四、学生创客活动组织实施情况</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor>
+        <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.studentActivities">
+          </el-input>
+        <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.studentActivities"></vue-editor> -->
       </div>
       <div class="PA2textArea">
         <div class="PA2textAreaTit PA2textAreaTit2">五、学生创客团队孵化、转化创业项目情况</div>
-        <vue-editor  :editorToolbar="customToolbar" v-model="data.Transforming"></vue-editor>
+        <el-input
+            type="textarea"
+            :rows="6"
+            resize="none"
+            class="textArea"
+            placeholder="请输入内容"
+            v-model="data.Transforming">
+          </el-input>
+          <!-- <vue-editor  :editorToolbar="customToolbar" v-model="data.Transforming"></vue-editor> -->
       </div>
 
       <div class="PA2mid">立项基础及条件</div>

src/views/projectSettlement/components/projectSettlementDetail_Student.vue

@@ -7,25 +7,57 @@
                 <div>
                   <p class="pTit2">一、项目研发背景</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.back">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.back"></vue-editor> -->
                   </div>
                 </div>
                 <div>
                   <p class="pTit2">二、项目创新点</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.innovate">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.innovate"></vue-editor> -->
                   </div>
                 </div>
                 <div>
                   <p class="pTit2">三、技术研发路线</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.path">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.path"></vue-editor> -->
                   </div>
                 </div>
                 <div>
                   <p class="pTit2">四、项目应用场景</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.scene">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.scene"></vue-editor> -->
                   </div>
                 </div>
                 <!-- <div class="editor">
@@ -37,7 +69,15 @@
                 <div>
                   <p class="pTit2">一、项目商业模式/社会价值</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.worth"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.worth">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.worth"></vue-editor> -->
                   </div>
                 </div>
               </div>
@@ -46,7 +86,15 @@
                 <div>
                   <p class="pTit2">一、团队构成及优势</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.team"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.team">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.team"></vue-editor> -->
                   </div>
                 </div>
               </div>
@@ -56,7 +104,15 @@
                 <div>
                   <p class="pTit2">一、研发成本来源及构成</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.cost">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.cost"></vue-editor> -->
                   </div>
                 </div>
               </div>
@@ -65,26 +121,58 @@
                 <div>
                   <p class="pTit2">一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.expectResults">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResults"></vue-editor> -->
                   </div>
                 </div>
                 <div>
                   <p class="pTit2">二、学生创客人才培养预期成果、数量（教师填写）</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.expectResultsTeacher">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectResultsTeacher"></vue-editor> -->
                   </div>
                 </div>
                 <div>
                   <p class="pTit2">三、项目预期孵化、转化创业项目情况</p>
                   <div class="editor">
-                    <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor>
+                    <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.expectConversion">
+                    </el-input>
+                    <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.expectConversion"></vue-editor> -->
                   </div>
                 </div>
               </div>
               <div>
                 <p class="pTit" style="margin-bottom: 0;">实施计划</p>
                 <div class="editor">
-                  <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor>
+                  <el-input
+                      type="textarea"
+                      :rows="6"
+                      resize="none"
+                      class="textArea"
+                      placeholder="请输入内容"
+                      v-model="content.plan">
+                    </el-input>
+                  <!-- <vue-editor  :editorToolbar="customToolbar" v-model="content.plan"></vue-editor> -->
                 </div>
               </div>
         <div class="baseBtn">

src/views/projectSettlement/projectSettlement.vue

@@ -136,8 +136,8 @@
           min-width="8%">
           <template #default="scope">
             <div>
-              <span v-if="scope.row.endProject == 1">待审核</span>
-              <span v-if="scope.row.endProject == 2">已审核</span>
+              <span v-if="scope.row.isupload == 3">待审核</span>
+              <span v-if="scope.row.isupload == 4">已审核</span>
            </div>
           </template>
         </el-table-column>
@@ -151,8 +151,8 @@
               <div class="operations">
                         <el-button type="primary" size="mini" @click="details(scope.row)">查看详情</el-button>
                         
-                        <el-button type="primary"  v-if="scope.row.endProject==1" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button>
-                        <el-button type="info"  disabled v-if="scope.row.endProject==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核</el-button>
+                        <el-button type="primary"  v-if="scope.row.isupload==3" style="width: 73.3px;" @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button>
+                        <el-button type="info"  disabled v-if="scope.row.isupload==4" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核</el-button>
                         <!-- <el-button type="primary" disabled v-if="scope.row.isupload==0" style="width: 73.3px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button> -->
 
                         <el-button  type="primary" size="mini" @click="edit(scope.row.courseId,scope.row.typeid)">成果查看</el-button>
@@ -214,11 +214,11 @@
                 label:'全部'
               },
               {
-                value:1,
+                value:3,
                 label:'待审核'
               },
               {
-                value:2,
+                value:4,
                 label:'已审核'
               },
             ],
@@ -286,6 +286,7 @@
               .then(res=>{
                 let data=res.data;
                 let a=this.options;
+                console.log(data)
                 this.tableData=data[0];
                 a.projectFilter=data[1];
                 a.department=data[2];

src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -75,48 +75,6 @@
                         <span>{{ TitleMessage.EndTime }}</span>
                     </div>
                 </div>
-                <!-- <div class="brief">
-                    <div class="brief_title">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>项目内容</span>
-                    </div>
-                    <el-descriptions style="width: 100%;margin-top: 10px;" :column="3" border>
-                      <el-descriptions-item>
-                        <template slot="label">
-                          
-                        </template>
-                        {{ TitleMessage['beginTime'] }}
-                      </el-descriptions-item>
-                      <el-descriptions-item>
-                        <template slot="label">
-                          <i class="el-icon-mobile-phone"></i>
-                          手机号
-                        </template>
-                        18100000000
-                      </el-descriptions-item>
-                      <el-descriptions-item>
-                        <template slot="label">
-                          <i class="el-icon-location-outline"></i>
-                          居住地
-                        </template>
-                        苏州市
-                      </el-descriptions-item>
-                      <el-descriptions-item>
-                        <template slot="label">
-                          <i class="el-icon-tickets"></i>
-                          备注
-                        </template>
-                        <el-tag size="small">学校</el-tag>
-                      </el-descriptions-item>
-                      <el-descriptions-item>
-                        <template slot="label">
-                          <i class="el-icon-office-building"></i>
-                          联系地址
-                        </template>
-                        江苏省苏州市吴中区吴中大道 1188 号
-                      </el-descriptions-item>
-                    </el-descriptions>
-                </div> -->
                 <div class="brief">
                     <div class="brief_title">
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -201,8 +159,7 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>简介</span>
                     </div>
-                    <div class="TextView">
-                        {{ TitleMessage.brief }}
+                    <div class="TextView" v-text="TitleMessage.brief">
                     </div>
                 </div>
             </div>
@@ -221,8 +178,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、建设内容（空间优化/场馆规划方面拟解决的关键问题及主要建设指标）</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['Construction']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['Construction']">
+                        <!-- <VueEditor v-model="DetailMessage['Construction']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -234,8 +191,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span style="font-size: 16px;">一、立项依据 （说明本项目的目的、意义以及国内外高校现状、市场预测和发展趋势，预期达到的目标，研究的预期效果分析，成果受益面）</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['ProjectBasis']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['ProjectBasis']">
+                        <!-- <VueEditor v-model="DetailMessage['ProjectBasis']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -247,8 +204,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、创客空间物理环境、制度建设及软件设施建设情况（环境优化/制度完善/设施改造）</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['development']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['development']">
+                        <!-- <VueEditor v-model="DetailMessage['development']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -256,8 +213,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>二、学生创客工作室建设情况（工作室数量及活动开展情况）</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['studio']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['studio']">
+                        <!-- <VueEditor v-model="DetailMessage['studio']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -265,8 +222,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>三、学生创客团队（人才）培养预期成果、数量</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['studentTeam']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['studentTeam']">
+                        <!-- <VueEditor v-model="DetailMessage['studentTeam']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -274,8 +231,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>四、学生创客活动组织实施情况</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['studentActivities']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['studentActivities']">
+                        <!-- <VueEditor v-model="DetailMessage['studentActivities']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -283,8 +240,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>五、学生创客团队孵化、转化创业项目情况</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['Transforming']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['Transforming']">
+                        <!-- <VueEditor v-model="DetailMessage['Transforming']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -296,51 +253,10 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、基础条件（物理环境/设备设施/项目实施/活动开展/技术力量/社会资源）</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['condition']" :disabled="true"></VueEditor>
-                    </div>
-                </div>
-
-
-                <!-- <div class="BaseTitle" type="1">
-                    <span>预期取得成果</span>
-                </div> -->
-                <!-- <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>一、项目预期成果、数量及形式</span>
-                    </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage[1]" :disabled="true"></VueEditor>
-                    </div>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>二、创客人才培养预期成果、数量</span>
-                    </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage[2]" :disabled="true"></VueEditor>
-                    </div>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>三、项目预期孵化、转化创业项目情况</span>
-                    </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage[3]" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['condition']">
+                        <!-- <VueEditor v-model="DetailMessage['condition']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>项目实施计划</span>
-                    </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage[4]" :disabled="true"></VueEditor>
-                    </div>
-                </div> -->
             </div>
             <!-- 项目详细结束 -->
             <!-- 活动开展开始 -->
@@ -444,8 +360,8 @@
                                 <img src="@/assets/anliDetail/proOverTwo.png" alt="">
                                 <span>活动简介</span>
                             </div>
-                            <div class="TextView">
-                                {{ item.brief }}
+                            <div class="TextView" v-text="item.brief">
+                                <!-- {{ item.brief }} -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -453,8 +369,8 @@
                                 <i class="el-icon-edit-outline"></i>
                                 <span>活动计划</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[0]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -462,8 +378,8 @@
                                 <i class="el-icon-data-line"></i>
                                 <span>预期目标</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[1]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -471,8 +387,8 @@
                                 <i class="el-icon-pie-chart"></i>
                                 <span>活动受面</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[2]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -480,8 +396,8 @@
                                 <i class="el-icon-money"></i>
                                 <span>经费支出计划</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[3]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor> -->
                             </div>
                             <div class="brief_title MarginTop30px" v-if="ActivityLookFile[index].url!=''">
                                 <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -561,42 +477,6 @@
 
             <!-- 项目中期报告开始 -->
             <div class="BaseMessage" v-show="pageState==4">
-                <!-- <div class="BaseTitle">
-                    <span>结项评价</span>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>科研办</span>
-                    </div>
-                    <div class="TextView" >
-                        <div class="TextView">
-                            {{ endProjectRemark['kRem'] }}
-                        </div>
-                    </div>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>学术委员会</span>
-                    </div>
-                    <div class="TextView" >
-                        <div class="TextView">
-                            {{ endProjectRemark["bRem"] }}
-                        </div>
-                    </div>
-                </div>
-                <div class="brief">
-                    <div class="brief_title" type="1.1">
-                        <img src="@/assets/anliDetail/jdTitle.png" alt="">
-                        <span>部门审核评语</span>
-                    </div>
-                    <div class="TextView" >
-                        <div class="TextView">
-                            {{ endProjectRemark["xRem"] }}
-                        </div>
-                    </div>
-                </div> -->
                 
                 <div class="BaseTitle" type="5">
                     <span>项目结题报告</span>
@@ -904,6 +784,7 @@
         }
         .TextView{
             width: 100%;
+            min-height: 200px;
             box-sizing: border-box;
             padding: 10px;
             border-radius: 5px;

src/views/resultShow/components/resultDetail_student.vue

@@ -162,8 +162,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>简介</span>
                     </div>
-                    <div class="TextView">
-                        {{ TitleMessage.brief }}
+                    <div class="TextView" v-text="TitleMessage.brief">
+                        <!-- {{ TitleMessage.brief }} -->
                     </div>
                 </div>
             </div>
@@ -179,8 +179,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、项目研发背景</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['back']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['back']">
+                        <!-- <VueEditor v-model="DetailMessage['back']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -189,8 +189,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>二、项目创新点</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['innovate']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['innovate']">
+                        <!-- <VueEditor v-model="DetailMessage['innovate']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -199,8 +199,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>三、技术研发路线</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['path']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['path']">
+                        <!-- <VueEditor v-model="DetailMessage['path']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -209,8 +209,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>四、项目应用场景</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['scene']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['scene']">
+                        <!-- <VueEditor v-model="DetailMessage['scene']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -222,8 +222,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、项目商业模式/社会价值</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['worth']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['worth']">
+                        <!-- <VueEditor v-model="DetailMessage['worth']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -235,8 +235,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、团队构成及优势</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['team']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['team']">
+                        <!-- <VueEditor v-model="DetailMessage['team']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -248,8 +248,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、研发成本来源及构成</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['cost']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['cost']">
+                        <!-- <VueEditor v-model="DetailMessage['cost']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
 
@@ -261,8 +261,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>一、项目预期成果、数量及形式（产品原型/发明专利/双创竞赛/成果转化/社会效益）</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['expectResults']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['expectResults']">
+                        <!-- <VueEditor v-model="DetailMessage['expectResults']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -270,8 +270,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>二、学生创客人才培养预期成果、数量（教师填写）</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['expectResultsTeacher']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['expectResultsTeacher']">
+                        <!-- <VueEditor v-model="DetailMessage['expectResultsTeacher']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="brief">
@@ -279,8 +279,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>三、项目预期孵化、转化创业项目情况</span>
                     </div>
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['expectConversion']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['expectConversion']">
+                        <!-- <VueEditor v-model="DetailMessage['expectConversion']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
                 <div class="BaseTitle" type="1">
@@ -291,8 +291,8 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>三、项目预期孵化、转化创业项目情况</span>
                     </div> -->
-                    <div class="TextView" >
-                        <VueEditor v-model="DetailMessage['plan']" :disabled="true"></VueEditor>
+                    <div class="TextView" v-text="DetailMessage['plan']">
+                        <!-- <VueEditor v-model="DetailMessage['plan']" :disabled="true"></VueEditor> -->
                     </div>
                 </div>
             </div>
@@ -398,8 +398,8 @@
                                 <img src="@/assets/anliDetail/proOverTwo.png" alt="">
                                 <span>活动简介</span>
                             </div>
-                            <div class="TextView">
-                                {{ item.brief }}
+                            <div class="TextView" v-text="item.brief">
+                                <!-- {{ item.brief }} -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -407,8 +407,8 @@
                                 <i class="el-icon-edit-outline"></i>
                                 <span>活动计划</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[0]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[0]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -416,8 +416,8 @@
                                 <i class="el-icon-data-line"></i>
                                 <span>预期目标</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[1]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[1]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -425,8 +425,8 @@
                                 <i class="el-icon-pie-chart"></i>
                                 <span>活动受面</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[2]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[2]" :disabled="true"></VueEditor> -->
                             </div>
 
                             <div class="brief_title MarginTop30px">
@@ -434,8 +434,8 @@
                                 <i class="el-icon-money"></i>
                                 <span>经费支出计划</span>
                             </div>
-                            <div class="TextView" >
-                                <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor>
+                            <div class="TextView" v-text="JSON.parse(item.chapters)[3]">
+                                <!-- <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor> -->
                             </div>
                             <div class="brief_title MarginTop30px" v-if="ActivityLookFile[index].url!=''">
                                 <img src="@/assets/anliDetail/jdTitle.png" alt="">
@@ -861,6 +861,7 @@
         }
         .TextView{
             width: 100%;
+            min-height: 200px;
             box-sizing: border-box;
             padding: 10px;
             border-radius: 5px;

src/views/resultShow/resultsShow.vue

@@ -180,6 +180,8 @@
             .get(this.$store.state.api+'/GetProjectIsConclusion',param)
               .then(res=>{
                 let data = res.data;
+
+                console.log(data)
                 if (data[0].length==0 && data[5][0]['total'] != 0&&this.Page.currentPage!=1) {
                   this.Page.currentPage=1
                   return this.getData()