4 changed files with 82 additions and 142 deletions
--- a/src/renderer/src/views/prepare/container/file-list-item.vue
+++ b/src/renderer/src/views/prepare/container/file-list-item.vue
@ -6,19 +6,8 @@
    </div>
    <div class="prepare-body-main-item-info" @click="openFileWin(item)">
      <div class="prepare-item-info-title" :title="item.fileShowName">
-        <div></div>
-        <div
-          style="
-            flex: 1;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            width: 200px;
-          "
-        >
        {{ item.fileShowName }}
      </div>
-      </div>
      <div class="prepare-item-info-message">
        <div style="width: 60px">
          <template v-if="item.uniquekey">
@ -38,21 +27,15 @@
        </template>
        </div>
        <template v-if="item.fileSize">|</template>
-        <div v-if="item.fileSize" style="width: 70px">{{ formatFileSize(item.fileSize) }}</div>
+        <div style="width: 70px" v-if="item.fileSize">{{ formatFileSize(item.fileSize) }}</div>
        <template v-if="item.uploadTime">|</template>
-        <div v-if="item.uploadTime" style="width: 70px">
-          {{ toTimeText(item.uploadTime, true) }}
-        </div>
+        <div style="width: 70px" v-if="item.uploadTime">{{ toTimeText(item.uploadTime, true) }}</div>
        <template v-if="item.levelFirstName">|&nbsp;</template>
        <div
        v-if="item.levelFirstName"
          style="
            flex: 1;
            text-align: left;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            width: 200px;
          "
          :title="
            item.levelFirstName +
@ -162,7 +145,7 @@ export default {
  emits: { 'on-move': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null },
  data() {
    return {
-      listenList: []
+      listenList: [],
    }
  },
  methods: {
@ -245,7 +228,7 @@ export default {
        })
      })
    },
-    //布置
+    // 打开布置作业窗口
    setHomeWork(item){
      this.$emit('on-set', item)
    },
@ -282,7 +265,7 @@ export default {
    align-items: center;
    .icon-zuoye{
      font-size: 40px;
-      color: #707070;
+      color: #707070
    }
  }

@ -302,7 +285,9 @@ export default {
    .prepare-item-info-title {
      text-align: left;
      font-size: 16px;
-      display: flex;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
    }

    .prepare-item-info-message {
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@ -312,10 +312,9 @@ export default {
      this.uploadData.textbookId = data.textBook.curBookId
      await this.asyncAllFile()
      if (this.uploadData.levelSecondId) {
-        // 获取作业列表所需ID 可能存在没有
-        const { rows } = await this.getChapterId()
-        if(!rows.length) return
-        this.entpcourseid = rows[0].id
+        // 获取作业列表所需ID
+        const res = await this.getChapterId()
+        this.entpcourseid = res.rows[0].id
        // 查询作业
        this.getHomeWorkList()
      }
--- a/src/renderer/src/views/resource/container/resoure-list.vue
+++ b/src/renderer/src/views/resource/container/resoure-list.vue
@ -1,31 +1,13 @@
 <template>
-  <div v-loading="sourceStore.loading" class="resource-list">
-    <el-scrollbar>
-      <el-empty v-if="!sourceStore.result.list.length" description="暂无数据" />
+  <div class="resource-list" v-loading="sourceStore.loading">
+    <el-scrollbar height="400px">
+      <el-empty description="暂无数据" v-if="!sourceStore.result.list.length" />
      <ul>
-        <li
-          v-for="item in sourceStore.result.list"
-          :key="item.id"
-          class="list-item"
-          @click="handleRow"
-        >
+        <li class="list-item" v-for="item in sourceStore.result.list" :key="item.id" @click="handleRow">
          <div class="item-left flex">
-            <FileImage :file-name="item.fileShowName" :size="50" />
+            <FileImage :fileName="item.fileShowName" :size="50" />
            <div class="flex item-left-content">
-              <div class="name flex" :title="item.fileShowName">
-                <div></div>
-                <div
-                  style="
-                    flex: 1;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                    width: 200px;
-                  "
-                >
-                  {{ item.fileShowName }}
-                </div>
-              </div>
+              <div class="name flex">{{ item.fileShowName }}</div>
              <div class="item-tags flex">
                <el-tag type="info" class="mr-10">{{ item.fileFlag }}</el-tag>
                <el-tag type="info" class="mr-10">{{ getFileSuffix(item.fileShowName) }}</el-tag>
@ -36,16 +18,10 @@
            </div>
          </div>
          <div class="item-btns" @click.stop>
-            <el-popover
-              placement="bottom-end"
-              trigger="hover"
-              popper-class="custom-popover"
-              :visible="item.showPopover"
-            >
+            <el-popover placement="bottom-end" trigger="hover" popper-class="custom-popover"
+              :visible="item.showPopover">
              <template #reference>
-                <el-button link type="primary">
-                  <i class="iconfont icon-shenglvehao"></i
-                ></el-button>
+                <el-button link type="primary"> <i class="iconfont icon-shenglvehao"></i></el-button>
              </template>
              <template #default>
                <div class="item-popover">
@ -53,11 +29,7 @@
                    <i class="iconfont icon-bianji"></i>
                    <span>编辑</span>
                  </div>
-                  <div
-                    v-if="userInfo.userId == item.uploadUserId"
-                    class="item-popover-item"
-                    @click="delRow(item)"
-                  >
+                  <div class="item-popover-item" v-if="userInfo.userId == item.uploadUserId" @click="delRow(item)">
                    <i class="iconfont icon-shanchu"></i>
                    <span>删除</span>
                  </div>
@ -65,29 +37,24 @@
                    <i class="iconfont icon-xiazai"></i>
                    <span>下载</span>
                  </div>
+
                </div>
              </template>
            </el-popover>
            <el-button size="small" plain round type="primary" @click="addLesson(item)">
              <i class="iconfont icon-jiahao"></i>
-              备课</el-button
-            >
+              备课</el-button>
          </div>
        </li>
      </ul>
+
    </el-scrollbar>
    <div class="pagination-box">
-      <el-pagination
-        v-model:current-page="sourceStore.query.pageNum"
-        v-model:page-size="sourceStore.query.pageSize"
-        :page-sizes="[10, 20, 30, 50]"
-        background
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="sourceStore.result.total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination v-model:current-page="sourceStore.query.pageNum" v-model:page-size="sourceStore.query.pageSize"
+        :page-sizes="[10, 20, 30, 50]" background layout="total, sizes, prev, pager, next, jumper"
+        :total="sourceStore.result.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
    </div>
+
  </div>
 </template>

@ -161,7 +128,7 @@ const addLesson = ({ id }) => {
  let data = {
    id,
    fileRoot: '备课',
-    ...toRaw(sourceStore.nodeData)
+    ...(toRaw(sourceStore.nodeData)),
  }
  // 过滤空值
  for (let key in data) {
@ -175,7 +142,8 @@ const addLesson = ({ id }) => {
    addFileToPrepare(data).then(() => {
      ElMessage.success('操作成功')
    })
-  } finally {
+  }
+  finally {
    sourceStore.loading = false
  }
 }
@ -213,10 +181,6 @@ const handleRow = () => {
 }

 .resource-list {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  overflow: auto;
  .list-item {
    flex: 1;
    padding: 10px 20px;
@ -225,13 +189,10 @@ const handleRow = () => {
    justify-content: space-between;
    align-items: center;
    cursor: pointer;
-    &:hover {
-      background-color: rgba(144, 147, 153, 0.2);
-      cursor: pointer;
-    }
+
    .item-left {
      align-items: center;
-      flex: 1;
+
      .icon {
        font-size: 50px;
      }
@ -239,14 +200,12 @@ const handleRow = () => {
      .item-left-content {
        margin-left: 10px;
        flex-direction: column;
-        flex: 1;
-        text-align: left;
      }

      .name {
        font-size: 14px;
        color: #3b3b3b;
-        margin-bottom: 10px;
+        margin-bottom: 10px
      }

      .line {
@ -267,6 +226,7 @@ const handleRow = () => {
        color: #909399;
        font-size: 13px;
      }
+
    }

    &:last-child {
@ -298,13 +258,15 @@ const handleRow = () => {
        margin-right: 3px;
        font-weight: bold;
      }
+
    }
+
  }

  .pagination-box {
+    margin-top: 20px;
    display: flex;
    justify-content: center;
-    height: 65px;
  }
 }
 </style>
--- a/src/renderer/src/views/resource/index.vue
+++ b/src/renderer/src/views/resource/index.vue
@ -1,28 +1,21 @@
 <template>
  <div class="page-resource flex">
    <!--左侧 教材 目录-->
-    <ChooseTextbook @change-book="getData" @node-click="getData" />
+    <ChooseTextbook @changeBook="getData" @nodeClick="getData" />

    <div class="page-right">
      <!-- 搜索 -->
      <ResoureSearch #add>
-        <el-button
-          v-if="sourceStore.isCreate"
-          type="primary"
-          round
-          class="create-btn"
-          @click="openDialog"
-        >
+        <el-button v-if="sourceStore.isCreate" type="primary" round @click="openDialog" class="create-btn">
          <i class="iconfont icon-jiahao"></i>
-          新建资源</el-button
-        >
+          新建资源</el-button>
      </ResoureSearch>
      <!-- 列表 -->
      <ResoureList />
    </div>
  </div>
  <!-- 上传弹窗 -->
-  <uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
+  <uploadDialog v-model="isDialogOpen" @submitFile="submitFile" />
  <!-- <el-button @click="testClick">测试</el-button> -->
 </template>

@ -59,7 +52,8 @@ const getData = (data) => {
  let levelFirstId
  if(node.parentNode){
    levelFirstId =  node.parentNode.id
-  } else {
+  }
+  else{
    levelFirstId = node.id
    levelSecondId = ''
  }
@ -69,7 +63,7 @@ const getData = (data) => {
  sourceStore.nodeData = {
    textbookId,
    levelFirstId,
-    levelSecondId
+    levelSecondId,
  }
  sourceStore.handleQuery()
 }
@ -79,7 +73,7 @@ const submitFile = (data) => {
  let fileList = toRaw(data)
  const { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } = sourceStore.query
  // 给每个文件添加属性
-  fileList.forEach((item) => {
+  fileList.forEach(item => {
    let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot }
    fileData.fileShowName = item.fileData.fileShowName
    fileData.fileFlag = item.fileData.fileFlag
@ -89,6 +83,7 @@ const submitFile = (data) => {
  uploaderState().pushFile(fileList)
 }

+
 const fileCallBack = (res) => {
  if (res.code == 200) {
    sourceStore.handleQuery()
@ -98,6 +93,7 @@ const fileCallBack = (res) => {
 onMounted(()=>{
  sourceStore.getCreate()
 })
+
 </script>

 <style lang="scss" scoped>
@ -107,8 +103,6 @@ onMounted(() => {

  .page-right {
    min-width: 0;
-    display: flex;
-    flex-direction: column;
    flex: 1;
    margin-left: 20px;
    height: 100%;