对接项目列表api

src/views/learning/course-training.vue

@@ -71,7 +71,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="formData.pageNo"
-          :page-sizes="[10, 30, 50, 100]"
+          :page-sizes="[10, 30, 50]"
           :page-size="formData.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalRows"

src/views/learning/data-alignment.vue

@@ -97,7 +97,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="pageNo"
-        :page-sizes="[15, 30, 50, 100, 200, 500, 700, 1000, 1500, 2000]"
+        :page-sizes="[10, 30, 50]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="totalRows"

src/views/learning/export-download.vue

@@ -28,7 +28,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="param.pageNo"
-          :page-sizes="[15, 30, 50]"
+          :page-sizes="[10, 30, 50]"
           :page-size="param.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalRows"

src/views/learning/item-course-analysis.vue

@@ -39,7 +39,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="formInline.pageNo"
-          :page-sizes="[10, 30, 50, 100]"
+          :page-sizes="[10, 30, 50]"
           :page-size="formInline.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalRows"

src/views/learning/item-examination-analysis.vue

@@ -38,7 +38,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="searchParam.pageNo"
-        :page-sizes="[15, 30, 50, 100, 200, 500, 700, 1000, 1500, 2000]"
+        :page-sizes="[10, 30, 50]"
         :page-size="searchParam.pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="totalRows"

src/views/learning/item-list.vue

@@ -306,7 +306,7 @@ export default {
       this.dialogVisible = true;
     },
     toDownload() {
-      vm.$router.push({ path: "data-alignment" });
+      vm.$router.push({ path: "export-download" });
     },
     update() {},
     release() {},

src/views/learning/item-part-in.vue

@@ -10,6 +10,7 @@
           {{ item.unit }}
         </div>
       </el-card>
+      <div class="line"></div>
     </div>
     <div class="charts" id="rankChart" ref="rankChart"></div>
     <!-- <div class="charts" id="age" ref="age"></div> -->
@@ -149,6 +150,19 @@ export default {
 
 <style lang='scss'>
 .part-in-wrap {
+  .el-card {
+    border-width: 0px;
+  }
+  .el-card.is-always-shadow {
+    box-shadow: 0 0 0 0 rgba(0,0,0,.1)
+  }
+  .line {
+    background: #E4E4E4;
+    height: 80px;
+    width: 1px;
+    float: left;
+    margin-top: 20px;
+  }
   .box-card {
     width: 15%;
     margin-right: 1%;

src/views/learning/name-list.vue

@@ -56,7 +56,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="searchParam.pageNo"
-          :page-sizes="[15, 30, 50, 100, 200, 500, 700, 1000, 1500, 2000]"
+          :page-sizes="[10, 30, 50]"
           :page-size="searchParam.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalRows"

src/views/learning/report-list.vue

@@ -3,11 +3,11 @@
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
     <div class="itemlist-content screenSet" id="screenSet">
       <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
-        <el-form ref="serchForm" :model="selectProgress" label-width="75px" style="width:100%;">
+        <el-form ref="serchForm" :model="formData" label-width="75px" style="width:100%;">
           <el-col :span="6">
             <el-form-item label="项目状态:">
               <el-select
-                v-model="selectProgress.status"
+                v-model="formData.status"
                 size="small"
                 style="width: 100%;"
                 placeholder="请选择项目状态"
@@ -23,11 +23,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-input v-model="selectProgress.name" size="small" placeholder="请输入项目名称"><i slot="suffix" class="el-icon-search"></i></el-input>
+              <el-input v-model="formData.name" size="small" placeholder="请输入项目名称">
+                <i slot="suffix" class="el-icon-search"></i>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" style="padding:0;text-align:right;padding-right:15px;">
-            <el-button type="primary" size="small" @click="search(1)">查询</el-button>
+            <el-button type="primary" size="small" @click="search()">查询</el-button>
             <el-button type="default" size="small" @click="resetMessage" style="margin-left:0;">重置</el-button>
           </el-col>
         </el-form>
@@ -35,19 +37,13 @@
       <el-table :data="tableData" style="width: 100%">
         <el-table-column prop="name" label="项目名称" min-width="200" align="center"></el-table-column>
         <el-table-column prop="status" label="项目状态" min-width="80" align="center">
-          <template slot-scope="scope">
-           {{ scope.row.status | reportStatus }}
-          </template>
+          <template slot-scope="scope">{{ scope.row.status | reportStatus }}</template>
         </el-table-column>
         <el-table-column prop="startTime" label="开始时间" min-width="160" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.startTime | liveDateFilter }}
-          </template>
+          <template slot-scope="scope">{{ scope.row.startTime | liveDateFilter }}</template>
         </el-table-column>
         <el-table-column prop="endTime" label="结束时间" min-width="160" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.endTime | liveDateFilter }}
-          </template>
+          <template slot-scope="scope">{{ scope.row.endTime | liveDateFilter }}</template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" min-width="200">
           <template slot-scope="scope">
@@ -56,7 +52,7 @@
         </el-table-column>
         <div slot="empty">
           <div class="table-empty">
-            <img src="../../assets/image/no-content1.png">
+            <img src="../../assets/image/no-content1.png" />
             <p>没有查询到相关结果</p>
           </div>
         </div>
@@ -66,9 +62,9 @@
           background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :current-page="searchParam.pageNo"
-          :page-sizes="[15, 30, 50]"
-          :page-size="searchParam.pageSize"
+          :current-page="formData.pageNo"
+          :page-sizes="[10, 30, 50]"
+          :page-size="formData.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="totalRows"
         ></el-pagination>
@@ -88,16 +84,18 @@ export default {
     return {
       curmbFirst: "学情报告",
       curmbSecond: "项目列表",
-      selectProgress: {
+      formData: {
         //搜索信息
         status: "",
-        name: ""
+        name: "",
+        pageNo: 1, //当前是第几页
+        pageSize: 10 //页面总数
       },
       statusSelect: [
         //项目状态
         {
           label: "全部",
-          value: '',
+          value: ""
         },
         {
           label: "进行中",
@@ -115,15 +113,10 @@ export default {
           name: "one",
           status: 1,
           startTime: 1561707289000,
-          endTime: 1561707567000,
+          endTime: 1561707567000
         }
       ],
       totalRows: 0, //数据总数
-      searchParam: {
-        pageNo: 1, //当前是第几页
-        pageSize: 20 //页面总数
-      }
-     
     };
   },
   components: {
@@ -131,6 +124,7 @@ export default {
   },
   created() {
     vm = this;
+    vm.search();
   },
   // 挂载到Dom完成时
   mounted: function() {
@@ -138,41 +132,41 @@ export default {
   },
   methods: {
     // 搜索列表
-    search(flag) {
-      if(flag) vm.searchParam.pageNo = 1
-      openLoading(vm)
-      let params = {}
-      vm.GET(url, params).then(res => {
+    search() {
+      let req = {};
+      req = this.formData;
+      openLoading(vm);
+      vm.GET("portal/portalInfo/getProjectList", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
-        } else {
-          vm.$message.info(res.message)
+          // vm.tableData = res.data.data;
+          // vm.totalRows = res.data.totalRows;
         }
-      })
+      });
     },
     // 重置搜索信息
     resetMessage() {
-      this.selectProgress = {
+      this.formData = {
         status: "",
         name: ""
       };
-      vm.search()
+      vm.search();
     },
     // 更改数据显示数量
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      vm.searchParam.pageSize = val
-      vm.search()
+      console.log(`每页 ${val} 条`);
+      vm.formData.pageSize = val;
+      vm.search();
     },
     // 换页
     handleCurrentChange(val) {
-      console.log(`当前页: ${val}`)
-      vm.searchParam.pageNo = value
-      vm.search()
+      console.log(`当前页: ${val}`);
+      vm.formData.pageNo = value;
+      vm.search();
     },
     //跳转到报告详情页
     go(row) {
-      vm.$router.push({path:"/item-list?id=" + row.id ,params: row})
+      vm.$router.push({ path: "/item-list?id=" + row.id, params: row });
     }
   }
 };