From 64adf0faa3ee49de1d4ba3abe6c9de5bb565f44b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 12 九月 2024 11:37:21 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/dream_web

---
 src/views/development/index.vue |  254 +++++++++++++++++++++++++++++++++-----------------
 1 files changed, 166 insertions(+), 88 deletions(-)

diff --git a/src/views/development/index.vue b/src/views/development/index.vue
index c619222..26bd43e 100644
--- a/src/views/development/index.vue
+++ b/src/views/development/index.vue
@@ -1,124 +1,202 @@
 <template>
-    <div class="app-container">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="鍏ㄩ儴" name="first">
-          <div style="display: flex; flex-direction: row-reverse">
-            <div style="width: 300px">
-              <el-input
-                placeholder="鎸夋爣棰樻悳绱�"
-                v-model="input3"
-                class="input-with-select"
-                size="small"
-              >
-                <el-button slot="append" icon="el-icon-search"></el-button>
-              </el-input>
-            </div>
+  <div class="app-container">
+    <el-tabs v-model="activeName" @tab-click="fetchData">
+      <el-tab-pane label="鍏ㄩ儴" name="all">
+        <div style="display: flex; flex-direction: row-reverse">
+          <div style="width: 300px">
+            <el-input
+              placeholder="鎸夋爣棰樻悳绱�"
+              v-model="data.keyword"
+              class="input-with-select"
+              size="small"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="fetchData"
+              ></el-button>
+            </el-input>
           </div>
+        </div>
+        <div style="height: calc(100vh - 248px)">
           <el-table
             v-loading="listLoading"
             :data="list"
             element-loading-text="Loading"
             fit
+            height="100%"
           >
             <el-table-column label="鏍囬">
-              <template slot-scope=""> xxxxx </template>
+              <template slot-scope="scope">
+                <el-link type="primary" :underline="false">{{
+                  scope.row.name
+                }}</el-link>
+              </template>
             </el-table-column>
-            <el-table-column label="鍒嗙被" width="80">
-              <template slot-scope=""> 鐢� </template>
-            </el-table-column>
-            <el-table-column label="璋佸惁鍏紑" width="200">
-              <template slot-scope=""> 10086 </template>
-            </el-table-column>
-            <el-table-column label="鐝骇" width="200">
-              <template slot-scope=""> asfiaf </template>
-            </el-table-column>
-            <el-table-column label="瀛﹀憳" width="">
-              <template slot-scope=""> asfiaf </template>
+            <el-table-column label="鍒嗙被" width="" prop="category">
             </el-table-column>
             <el-table-column label="鏁欏笀" width="">
-              <template slot-scope=""> 鐐硅瘎 </template>
+              <template slot-scope="scope">{{
+                scope.row.publisher.name
+              }}</template>
             </el-table-column>
-            <el-table-column label="鍐呭" width="">
-              <template slot-scope=""> 鐐硅瘎 </template>
-            </el-table-column>
-            <el-table-column label="鎿嶄綔" width="">
-              <template slot-scope=""> 淇敼 </template>
+            <el-table-column label="鐐硅瘎鏃堕棿" width="" prop="createTime">
             </el-table-column>
           </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="璇剧▼" name="fourth">
-          <div style="display: flex; flex-direction: row-reverse">
-            <div style="width: 300px">
-              <el-input
-                placeholder="鎸夊鍛樺悕绉版悳绱�"
-                v-model="input3"
-                class="input-with-select"
-                size="small"
-              >
-                <el-button slot="append" icon="el-icon-search"></el-button>
-              </el-input>
-            </div>
+        </div>
+        <div>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="data.pageIn.index + 1"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="data.pageIn.size"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="璇剧▼" name="other">
+        <div style="display: flex; flex-direction: row-reverse">
+          <div style="width: 300px">
+            <el-input
+              placeholder="鎸夊鍛樺悕绉版悳绱�"
+              v-model="data.keyword"
+              class="input-with-select"
+              size="small"
+            >
+              <el-button slot="append" icon="el-icon-search" @click="fetchData"></el-button>
+            </el-input>
           </div>
+        </div>
+        <div style="height: calc(100vh - 248px)">
           <el-table
             v-loading="listLoading"
             :data="list"
             element-loading-text="Loading"
             fit
+            height="100%"
           >
             <el-table-column label="璇剧▼">
-              <template slot-scope=""> xxxxx </template>
+              <template slot-scope="scope">
+                <el-link type="primary" :underline="false">{{
+                  scope.row.courseName
+                }}</el-link>
+              </template>
             </el-table-column>
-            <el-table-column label="鏃堕棿" width="80">
-              <template slot-scope=""> 鐢� </template>
+            <el-table-column label="寮�濮嬫椂闂�" width="" prop="beginTime">
             </el-table-column>
-            <el-table-column label="瀛﹀憳鏁�" width="200">
-              <template slot-scope=""> 10086 </template>
+            <el-table-column label="缁撴潫鏃堕棿" width="" prop="endTime">
             </el-table-column>
-            <el-table-column label="宸茶褰曟暟" width="200">
-              <template slot-scope=""> asfiaf </template>
+            <el-table-column label="瀛﹀憳鏁�" width="" prop="playerCount">
             </el-table-column>
-            <el-table-column label="鎿嶄綔" width="">
-              <template slot-scope=""> 璁板綍 </template>
+            <el-table-column label="宸茶褰曟暟" width="" prop="commentCount">
             </el-table-column>
           </el-table>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-  </template>
-  
-  <script>
-  import { getList } from "@/api/table";
-  
-  export default {
-    filters: {
-      statusFilter(status) {
-        const statusMap = {
-          published: "success",
-          draft: "gray",
-          deleted: "danger",
-        };
-        return statusMap[status];
-      },
-    },
-    data() {
-      return {
-        list: null,
-        listLoading: true,
-        activeName: "first",
+        </div>
+        <div>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="data.pageIn.index + 1"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="data.pageIn.size"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getHomeworkByType, getSessionHomeworkDto } from "@/api/development";
+
+export default {
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: "success",
+        draft: "gray",
+        deleted: "danger",
       };
+      return statusMap[status];
     },
-    created() {
-      this.fetchData();
+  },
+  data() {
+    return {
+      list: null,
+      listLoading: true,
+      activeName: "all",
+      total: 0,
+      data: {
+        staffId: JSON.parse(localStorage.getItem("user")).staffs[0].id,
+        keyword: "",
+        pageIn: {
+          //鍙�夛紝濡傛灉鏄垎椤垫煡璇紝闇�瑕佸姞涓娿��
+          index: 0, //蹇呴��
+          size: 10, //姣忛〉鐨勫ぇ灏忋�傞粯璁�20
+          sorts: [
+            {
+              name: "name", //鎺掑簭瀛楁鍚嶇О
+              direction: "ASC", //鎺掑簭鏂瑰悜
+            },
+            {
+              name: "createTime",
+              direction: "DESC",
+            },
+          ],
+        },
+        homeworkType: "GROWTH",
+      },
+    };
+  },
+  created() {
+    this.fetchData();
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.data.pageIn.size = val;
+      this.fetchData("pageIn");
     },
-    methods: {
-      fetchData() {
+    handleCurrentChange(val) {
+      this.data.pageIn.index = val - 1;
+      this.fetchData("pageIn");
+    },
+    fetchData(_val) {
+      if (_val !== "pageIn") {
+        this.data.pageIn.index = 0;
+        this.data.pageIn.size = 10;
+      }
+      this.listLoading = true;
+      if (this.activeName == "all") {
         this.listLoading = true;
-        getList().then((response) => {
-          this.list = response.data.items;
+        getHomeworkByType(this.data).then((response) => {
+          this.list = response.data.findHomeworkByType.ls;
+          this.total = response.data.findHomeworkByType.pageOut.total;
           this.listLoading = false;
         });
-      },
+      } else if (this.activeName == "other") {
+        this.listLoading = true;
+        let data = {
+          staffId: JSON.parse(localStorage.getItem("user")).staffs[0].id,
+          keyword: this.data.keyword,
+          pageIn: { ...this.data.pageIn },
+        };
+        data.pageIn.sorts = {
+          direction: "DESC",
+          name: "beginTime",
+        };
+        getSessionHomeworkDto(data).then((response) => {
+          this.list = response.data.findSessionHomeworkDto.ls;
+          this.total = response.data.findSessionHomeworkDto.pageOut.total;
+          this.listLoading = false;
+        });
+      }
     },
-  };
-  </script>
-  
\ No newline at end of file
+  },
+};
+</script>

--
Gitblit v1.8.0