update

src/views/learning/report-list.vue

@@ -7,7 +7,7 @@
           <el-col :span="6">
             <el-form-item label="项目状态:">
               <el-select
-                v-model="formData.status"
+                v-model="formData.projectStatus"
                 size="small"
                 style="width: 100%;"
                 placeholder="请选择项目状态"
@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-input v-model="formData.name" size="small" placeholder="请输入项目名称">
+              <el-input v-model="formData.projectName" size="small" placeholder="请输入项目名称">
                 <i slot="suffix" class="el-icon-search"></i>
               </el-input>
             </el-form-item>
@@ -35,15 +35,17 @@
         </el-form>
       </el-row>
       <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>
+        <el-table-column prop="projectName" label="项目名称" min-width="200" align="center"></el-table-column>
+        <el-table-column prop="projectStatus" label="项目状态" min-width="80" align="center">
+          <template slot-scope="scope">
+            {{ [scope.row.projectStatus , idType] | statusProject }}
+          </template>
         </el-table-column>
-        <el-table-column prop="startTime" label="开始时间" min-width="160" align="center">
-          <template slot-scope="scope">{{ scope.row.startTime | liveDateFilter }}</template>
+        <el-table-column prop="projectBegintime" label="开始时间" min-width="160" align="center">
+          <template slot-scope="scope">{{ scope.row.projectBegintime }}</template>
         </el-table-column>
-        <el-table-column prop="endTime" label="结束时间" min-width="160" align="center">
-          <template slot-scope="scope">{{ scope.row.endTime | liveDateFilter }}</template>
+        <el-table-column prop="projectEndtime" label="结束时间" min-width="160" align="center">
+          <template slot-scope="scope">{{ scope.row.projectEndtime }}</template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" min-width="200">
           <template slot-scope="scope">
@@ -86,8 +88,8 @@ export default {
       curmbSecond: "项目列表",
       formData: {
         //搜索信息
-        status: "",
-        name: "",
+        projectStatus: "",
+        projectName: "",
         pageNo: 1, //当前是第几页
         pageSize: 10 //页面总数
       },
@@ -117,6 +119,7 @@ export default {
         }
       ],
       totalRows: 0, //数据总数
+      idType: '',
     };
   },
   components: {
@@ -124,6 +127,7 @@ export default {
   },
   created() {
     vm = this;
+    vm.idType = localStorage.getItem('storageIdType');
     vm.search();
   },
   // 挂载到Dom完成时
@@ -139,8 +143,8 @@ export default {
       vm.GET("portal/portalInfo/getProjectList", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
-          // vm.tableData = res.data.data;
-          // vm.totalRows = res.data.totalRows;
+          vm.tableData = res.data.data;
+          vm.totalRows = res.data.totalRows;
         }
       });
     },