Browse Source

学生人数统计列表去掉学期字段,变更为生成日期

WINDOWS-7IFQK7E\EDY 1 year ago
parent
commit
0fb511d2fd
4 changed files with 124 additions and 59 deletions
  1. 14 15
      src/utils/index.js
  2. 53 0
      src/utils/utils.js
  3. 30 21
      src/views/xsxjk/xsrstjlb/index.vue
  4. 27 23
      src/views/xsxjk/xsrstjlb/xsrstjlbxq/index.vue

+ 14 - 15
src/utils/index.js

@@ -118,19 +118,18 @@ export function param2Obj(url) {
 
 
 export function dealWithDate(_param) {
-  if (_param === '' || _param === null || _param === undefined) {
-    return '';
-  }
-  let date = new Date(_param);
-  let year = date.getFullYear();
-  let month = date.getMonth();
-  month = month + 1;
-  if (month < 10) {
-    month = '0' + month;
-  }
-  let day = date.getDate();
-  if (day < 10) {
-    day = '0' + day;
-  }
-  return year + '-' + month + '-' + day;
+ if (_param === '' || _param === null || _param === undefined) {
+ return '';
+ }
+ let date = new Date(_param);
+ let year = date.getFullYear();
+ let month = date.getMonth();
+ month = month + 1;
+ if (month < 10) {
+ month = '0' + month;
+ } let day = date.getDate();
+if (day < 10) {
+ day = '0' + day;
+ }
+ return year + '-' + month + '-' + day;
 }

+ 53 - 0
src/utils/utils.js

@@ -0,0 +1,53 @@
+export function deepClone(obj) {
+  if (typeof obj !== 'object' || obj == null)
+    return obj
+
+  let res
+  if (Array.isArray(obj))
+    res = []
+
+  else
+    res = {}
+
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key))
+      res[key] = deepClone(obj[key])
+  }
+  return res
+}
+export function formatTime(time = Date.parse(new Date())) {
+  const date = new Date(Number(time))
+  const Y = `${date.getFullYear()}-`
+  const M
+    = `${date.getMonth() + 1 < 10
+      ? `0${date.getMonth() + 1}`
+      : date.getMonth() + 1}-`
+  const D
+    = date.getDate() < 10 ? `0${date.getDate()} ` : `${date.getDate()} `
+  const h
+    = date.getHours() < 10
+      ? `0${date.getHours()}:`
+      : `${date.getHours()}:`
+  const m
+    = date.getMinutes() < 10
+      ? `0${date.getMinutes()}:`
+      : `${date.getMinutes()}:`
+  const s
+    = date.getSeconds() < 10 ? `0${date.getSeconds()}` : date.getSeconds()
+  return Y + M + D + h + m + s
+}
+
+export function formatTimeToYMD(time) {
+  if (time === 'null000' || time === 'undefined000' || time === '000')
+    return ''
+
+  const date = new Date(Number(time))
+  const Y = `${date.getFullYear()}-`
+  const M
+    = `${date.getMonth() + 1 < 10
+      ? `0${date.getMonth() + 1}`
+      : date.getMonth() + 1}-`
+  const D
+    = date.getDate() < 10 ? `0${date.getDate()} ` : `${date.getDate()}`
+  return Y + M + D
+}

+ 30 - 21
src/views/xsxjk/xsrstjlb/index.vue

@@ -39,7 +39,7 @@
         >
       </div>
       <el-form class="mt20" :inline="true">
-        <el-form-item label="">
+        <!-- <el-form-item label="">
           <el-select
             v-model="firstForm.team"
             placeholder="请选择学年学期"
@@ -53,7 +53,7 @@
               :key="item.team_id"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="">
           <el-select
             v-model="firstForm.grade"
@@ -103,7 +103,10 @@
       <el-table-column type="selection" align="center" width="55">
       </el-table-column>
 
-      <el-table-column label="学期学年" prop="team_name" width="400">
+      <el-table-column label="生成日期" prop="create_dateline" width="400">
+        <template slot-scope="scope">
+          {{ scope.row.create_dateline }}
+        </template>
       </el-table-column>
       <el-table-column label="年级" prop="grade_name" width="400">
       </el-table-column>
@@ -139,6 +142,7 @@ import { request } from "@/utils/request";
 import { rstj_list, rstj_del, grade_search, team_search } from "./api";
 import { useUserStore } from "@/stores/user";
 const { token, user_org } = useUserStore();
+import { formatTimeToYMD } from "@/utils/utils.js";
 export default {
   name: "index",
   data() {
@@ -158,24 +162,24 @@ export default {
         grade: "",
         team: "",
       },
-      numList: [
-        {
-          label: "50",
-          value: "1",
-        },
-        {
-          label: "60",
-          value: "2",
-        },
-        {
-          label: "70",
-          value: "3",
-        },
-        {
-          label: "80",
-          value: "4",
-        },
-      ],
+      // numList: [
+      //   {
+      //     label: "50",
+      //     value: "1",
+      //   },
+      //   {
+      //     label: "60",
+      //     value: "2",
+      //   },
+      //   {
+      //     label: "70",
+      //     value: "3",
+      //   },
+      //   {
+      //     label: "80",
+      //     value: "4",
+      //   },
+      // ],
       title: "",
       id: "",
       loading: false,
@@ -327,6 +331,11 @@ export default {
               rstj_list(data).then((res) => {
                 this.loading = false;
                 this.tableData = res.data.page_data;
+                this.tableData.map((item) => {
+                  item.create_dateline = formatTimeToYMD(
+                    `${item.create_dateline}000`
+                  );
+                });
                 // let leftData = res.data.chats.left;
                 // this.lineData = [];
                 // this.lineXData = [];

+ 27 - 23
src/views/xsxjk/xsrstjlb/xsrstjlbxq/index.vue

@@ -60,7 +60,7 @@
       <el-table-column type="selection" align="center" width="55">
       </el-table-column>
 
-      <el-table-column label="学期学年" prop="team_name" width="450">
+      <el-table-column label="生成日期" prop="create_dateline" width="450">
       </el-table-column>
       <el-table-column label="年级" prop="grade_name" width="">
       </el-table-column>
@@ -89,6 +89,7 @@
 import { rstjck_list, rstjck_del, class_search } from "./api";
 import { useUserStore } from "@/stores/user";
 const { token } = useUserStore();
+import { formatTimeToYMD } from "@/utils/utils.js";
 export default {
   name: "index",
   data() {
@@ -106,28 +107,28 @@ export default {
       classList: [],
       tableData: [],
 
-      numList: [
-        {
-          label: "20",
-          value: "1",
-        },
-        {
-          label: "50",
-          value: "2",
-        },
-        {
-          label: "60",
-          value: "3",
-        },
-        {
-          label: "70",
-          value: "4",
-        },
-        {
-          label: "80",
-          value: "5",
-        },
-      ],
+      // numList: [
+      //   {
+      //     label: "20",
+      //     value: "1",
+      //   },
+      //   {
+      //     label: "50",
+      //     value: "2",
+      //   },
+      //   {
+      //     label: "60",
+      //     value: "3",
+      //   },
+      //   {
+      //     label: "70",
+      //     value: "4",
+      //   },
+      //   {
+      //     label: "80",
+      //     value: "5",
+      //   },
+      // ],
       title: "",
       team_id: "",
       grade_id: "",
@@ -158,6 +159,9 @@ export default {
       rstjck_list(data).then((res) => {
         this.loading = false;
         this.tableData = res.data.page_data;
+        this.tableData.map((item) => {
+          item.create_dateline = formatTimeToYMD(`${item.create_dateline}000`);
+        });
         this.cur_page = Number(res.data.page_now);
         this.total = Number(res.data.total_rows);
       });