update

src/utils/env-config.js

@@ -8,8 +8,8 @@ export const envConfig = {
 
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
     //baseUrl: 'https://uat-sc.yunqueyi.com/',
-    // baseUrl: 'http://10.177.15.150:11905/',
-    baseUrl: 'https://dev-sc.yunqueyi.com/',
+    baseUrl: 'http://10.177.15.150:11905/',
+    // baseUrl: 'https://dev-sc.yunqueyi.com/',
     apiUrl: 'https://dev-api.yunqueyi.com/',
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",

src/utils/fetch.js

@@ -54,7 +54,8 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = '367F0B613A604751AC94CE12CD4E0E53';
+      // config.headers['token'] = '367F0B613A604751AC94CE12CD4E0E53';
+      config.headers['token'] = '16B877F215A84D528C285D4FA3081C37';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/filter.js

@@ -166,8 +166,8 @@ const vueFilter = {
   },
   reportStatus: (value) => {
     if(value == 1) {
-        return '进行中'
-    }else  {
+        return '已开始'
+    }else if(value == 2)  {
         return '已结束'
     }
   },

src/views/learning/report-list.vue

@@ -7,7 +7,7 @@
           <el-col :span="6">
             <el-form-item label="项目状态:">
               <el-select
-                v-model="formData.projectStatus"
+                v-model="formData.status"
                 size="small"
                 style="width: 100%;"
                 placeholder="请选择项目状态"
@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-input v-model="formData.projectName" size="small" placeholder="请输入项目名称">
+              <el-input v-model="formData.name" size="small" placeholder="请输入项目名称">
                 <i slot="suffix" class="el-icon-search"></i>
               </el-input>
             </el-form-item>
@@ -36,9 +36,9 @@
       </el-row>
       <el-table :data="tableData" style="width: 100%">
         <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">
+        <el-table-column prop="timeStatus" label="项目状态" min-width="80" align="center">
           <template slot-scope="scope">
-            {{ [scope.row.projectStatus , idType] | statusProject }}
+            {{ scope.row.timeStatus | reportStatus }}
           </template>
         </el-table-column>
         <el-table-column prop="projectBegintime" label="开始时间" min-width="160" align="center">
@@ -88,8 +88,8 @@ export default {
       curmbSecond: "项目列表",
       formData: {
         //搜索信息
-        projectStatus: "",
-        projectName: "",
+        status: "",
+        name: "",
         pageNo: 1, //当前是第几页
         pageSize: 10 //页面总数
       },
@@ -140,7 +140,7 @@ export default {
       let req = {};
       req = this.formData;
       openLoading(vm);
-      vm.GET("portal/portalInfo/getProjectList", req).then(res => {
+      vm.GET("portal/portalInfo/getPortalReportProject", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.data;