#

src/views/activityManage/makerActvity.vue

@@ -14,6 +14,8 @@
           <div class="selectLabel">项目筛选</div>
           <el-select v-model="pavalues.value" @change="getData" placeholder="请选择">
             <el-option label="所有项目" value=""/>
+            <el-option label="所有分类" value=""/>
+            <el-option label="所有分类" value=""/>
             <el-option
               v-for="item in options"
               :key="item.courseId"
@@ -23,6 +25,22 @@
           </el-select>
         </div>
 
+        <div class="selectsBlock">
+          <div class="selectLabel">分类</div>
+          <el-select v-model="pavalues.value4" @change="getData" placeholder="请选择">
+            <el-option label="所有分类" value=""/>
+            <el-option label="创客活动" :value="0"/>
+            <el-option label="个人创客" :value="1"/>
+            <!-- <el-option label="所有部门" value=""/>
+            <el-option
+              v-for="item in options1"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option> -->
+          </el-select>
+        </div>
+
         <div class="selectsBlock">
           <div class="selectLabel">所在部门</div>
           <el-select v-model="pavalues.value1" @change="getData" placeholder="请选择">
@@ -398,6 +416,7 @@ import { ActivityWord } from '@/components/tool/getWord';
             value1:'',//部门ID
             value2:'',//负责人
             value3:'',//状态
+            value4:"",//分类
           },
           Page:{
             nowPage:1,
@@ -603,6 +622,7 @@ import { ActivityWord } from '@/components/tool/getWord';
             cid:this.pavalues.value1,
             leader:this.pavalues.value2,
             state:this.pavalues.value3,
+            type:this.pavalues.value4,
             inp:this.input,
             page:this.Page.nowPage,
             lim:this.Page.lim,

src/views/projectApply/newStudentProjectApply.vue

@@ -7,7 +7,7 @@
       <hr>
     
          <!-- 学生项目立项 -->
-        <studentProjectWord :wordData="wordData"/>   
+        <studentProjectWord :wordData="wordData" :reversedMessage="reversedMessage"/>   
         <div style="width: 300px;margin: 20px auto;display: flex;justify-content: space-between;">
             <el-button style="width: 120px;margin: 20px auto;" @click="test" type="primary">提交项目</el-button>
         </div>
@@ -31,14 +31,14 @@
   // import MakerSpaceWord from '../components/MakerSpaceWord.vue'
   import getProjectNo from '@/components/tool/getProjectNo';
   import {getNowDate} from '@/components/tool/Date.js'
-  import studentProjectWord from '@/components/studentProjectWord.vue'
-  import markerFundWord from '@/components/markerFundWord.vue';
-  import markeractivityWord from '@/components/markeractivityWord.vue';
+  import studentProjectWord from './components/studentProjectWord.vue'
+  // import markerFundWord from '@/components/markerFundWord.vue';
+  // import markeractivityWord from '@/components/markeractivityWord.vue';
   export default {
     components: {
       studentProjectWord,
-      markerFundWord,
-      markeractivityWord
+      // markerFundWord,
+      // markeractivityWord
     },
     data() {
       return {
@@ -97,6 +97,11 @@
         }
       };
     },
+    computed:{
+      reversedMessage: function () {
+        return (this.wordData.fund.facility*1 + this.wordData.fund.materials*1+this.wordData.fund.process*1+ this.wordData.fund.assist*1+this.wordData.fund.authenticate*1+ this.wordData.fund.match*1+this.wordData.fund.activity*1+this.wordData.fund.affair*1)
+      }
+    },
     methods:{
       test(){    //验证
         const cEmpty = /^\s*$/g;

src/views/projectManage/components/ProjectManagementActivity.vue

@@ -128,6 +128,7 @@
               cid:"",
               leader:'',
               state:"",
+              type:0,
               input:"",
               page:this.table.currentPage,
               lim:this.table.packageSize