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

src/views/resultShow/resultsShow.vue

@@ -48,18 +48,6 @@
         </el-select>
       </div>
 
-      <!-- <div class="selectsBlock">
-        <span class="selectLabel">结题状态</span>
-        <el-select v-model="pavalues.value4" placeholder="请选择">
-          <el-option
-            v-for="item in options4"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </div> -->
-
       <div class="selectsBlock">
         <span class="selectLabel">负责人</span>
         <el-select v-model="pavalues.value3" @change="getData" placeholder="请选择">
@@ -72,6 +60,18 @@
           </el-option>
         </el-select>
       </div>
+      <div class="selectsBlock">
+        <span class="selectLabel">年份</span>
+        <el-select v-model="pavalues.value4" @change="getData" placeholder="请选择">
+          <el-option label="所有年份" value=""/>
+          <el-option
+            v-for="item in options4"
+            :key="item.time"
+            :label="item.time+'年'"
+            :value="item.time">
+          </el-option>
+        </el-select>
+      </div>
       </div>
       <div class="ProjectManagementQuery">
         <el-input v-model="input" @change="getData" style="width:240px" placeholder="请输入内容"></el-input>
@@ -144,6 +144,7 @@
             value1:0,
             value2:0,
             value3:'',
+            value4:'',
           },
           Page:{
             currentPage:1,
@@ -170,6 +171,7 @@
             tid:this.pavalues.value2,    //分类
             leader:this.pavalues.value3,  //负责人
             st:2,  //审核状态
+            year:this.pavalues.value4,
             textInp:this.input,
             page:this.Page.currentPage,  //当前页
             lim:this.Page.lim,  //限制获取几条数据
@@ -183,7 +185,9 @@
                 this.options1 = data[2];
                 this.options2 = data[3];
                 this.options3 = data[4];
+                this.options4 = data[6];
                 this.Page.total = data[5][0]['total']
+
                 this.loading = false;
               },err=>{
                 console.log(err);