学期报告静态页面

package-lock.json

@@ -2306,9 +2306,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.9.1",
-      "resolved": "http://192.168.110.93:4873/element-ui/-/element-ui-2.9.1.tgz",
-      "integrity": "sha1-oF8udgI9Upug36LQOuFuUTSyDE4=",
+      "version": "2.6.1",
+      "resolved": "http://192.168.110.93:4873/element-ui/-/element-ui-2.6.1.tgz",
+      "integrity": "sha1-htt5/13psbzDGHtls3crDFQHRxg=",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -3180,8 +3180,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3236,7 +3235,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3280,14 +3278,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

src/App.vue

@@ -57,7 +57,7 @@ export default {
 	created() {
 		vm = this
     if(vm.$route.name!='loginPage') {
-     vm.getToken()
+    //  vm.getToken()
     }
 	},
 	mounted() {

src/utils/fetch.js

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

src/utils/filter.js

@@ -164,6 +164,13 @@ const vueFilter = {
         return '否'
     }
   },
+  reportStatus: (value) => {
+    if(value == 1) {
+        return '进行中'
+    }else  {
+        return '已结束'
+    }
+  },
 
 }
 export default vueFilter
\ No newline at end of file

src/views/layout/slidebar.vue

@@ -124,6 +124,17 @@
             index: 'msg-push',
             isMessageSend: true,
             checkAuth: true,
+          },{
+            title: '学情报告',
+            icon: 'el-icon-tickets',
+            index: 'report-list',
+            subs: [
+              {
+                title: '项目列表',
+                icon: 'el-icon-document',
+                index: 'report-list'
+              }
+            ]
           },
         ]
       }

src/views/learning/item-list.vue

@@ -83,11 +83,11 @@
 </template>
 <script>
 import BreadCrumb from "../../components/breadcrumb.vue";
-import CourseAnalysis from "./course-analysis.vue";
-import CrowdAnalysis from "./crowd-analysis.vue";
-import PartIn   from './part-in.vue';
-import ExaminationAnalysisfrom from './examination-analysis.vue';
-import LearningEffect from './learning-effect.vue';
+import CourseAnalysis from "./item-course-analysis.vue";
+import CrowdAnalysis from "./item-crowd-analysis.vue";
+import PartIn   from './item-part-in.vue';
+import ExaminationAnalysisfrom from './item-examination-analysis.vue';
+import LearningEffect from './item-learning-effect.vue';
 import { create } from "domain";
 import { mapGetters } from "vuex";
 import { openLoading, closeLoading } from "../../utils/utils";

src/views/learning/report-list.vue

@@ -23,20 +23,32 @@
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-input v-model="selectProgress.name" size="small" placeholder="请输入项目名称"></el-input>
+              <el-input v-model="selectProgress.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="default" size="small" @click="resetMessage" style="margin-left:0;">重置</el-button>
             <el-button type="primary" size="small" @click="search(1)">查询</el-button>
+            <el-button type="default" size="small" @click="resetMessage" style="margin-left:0;">重置</el-button>
           </el-col>
         </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="100" align="center"></el-table-column>
-        <el-table-column prop="startTime" label="开始时间" min-width="80" align="center"></el-table-column>
-        <el-table-column prop="endTime" label="结束时间" min-width="80" 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>
+        <el-table-column prop="startTime" label="开始时间" min-width="160" align="center">
+          <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>
+        </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" min-width="200">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="go(scope.row)">查看学情报告</el-button>
@@ -49,19 +61,18 @@
           </div>
         </div>
       </el-table>
-    </div>
-    <!-- 分页 -->
-    <div class="pagination">
-      <el-pagination
-        background
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="searchParam.pageNo"
-        :page-sizes="[15, 30, 50, 100, 200, 500, 700, 1000, 1500, 2000]"
-        :page-size="searchParam.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="totalRows"
-      ></el-pagination>
+      <div class="pagination">
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="searchParam.pageNo"
+          :page-sizes="[15, 30, 50]"
+          :page-size="searchParam.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalRows"
+        ></el-pagination>
+      </div>
     </div>
   </div>
 </template>
@@ -84,6 +95,10 @@ export default {
       },
       statusSelect: [
         //项目状态
+        {
+          label: "全部",
+          value: '',
+        },
         {
           label: "进行中",
           value: "1"
@@ -97,9 +112,9 @@ export default {
         // table数据
         {
           name: "one",
-          status: "进行中",
-          startTime: "12-12-12",
-          endTime: "23-23-23"
+          status: 1,
+          startTime: 1561707289000,
+          endTime: 1561707567000,
         }
       ],
       totalRows: 0, //数据总数