更新进度

VSSCMP_WEB/src/api/schoolBasedResourcesApi.js

@@ -45,8 +45,24 @@ export default {
     deleteFolder (params) {
         return http.get('/api/Education/SchoolResource/PersonalFolderInfo/Delete', { params: params })
     },
+    // 删除文件
+    deleteFile (params) {
+        return http.get('/api/Education/SchoolResource/FileInfo/DeleteFile', { params: params })
+    },
+    // 修改文件名称
+    updateFileName (params) {
+        return http.post('/api/Education/SchoolResource/FileInfo/UpdateFileName', { params: params })
+    },
     // 获取学校文件夹List
     GetSchoolFolderList () {
         return http.post('/api/Education/SchoolResource/SchoolFolderInfo/GetSchoolFolderList')
+    },
+    // 新增编辑学校文件夹
+    createOrUpdateSchool (params) {
+        return http.post('/api/Education/SchoolResource/SchoolFolderInfo/CreateOrUpdate', { params: params })
+    },
+    // 获取校内资源文件夹List
+    getSchoolResourceFolderList () {
+        return http.post('/api/Education/SchoolResource/GetFolderList')
     }
 }

VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/MyuploadCtxMenu.vue

@@ -210,33 +210,55 @@ export default {
             let data = {
                 // b_id: this.rightMenuData.b_id,
                 parent_id: this.rightMenuData.b_id,
-                folder_name: folderName
+                folder_name: folderName,
+                step_number: this.rightMenuData.step_number + 1 || undefined
             }
-            this.$emit('updateOrCreateFolder', data, '创建文件夹成功')
+            this.$emit('updateOrCreateFolder', false, data, '创建文件夹成功')
             this.newFolderName = ''
         },
         clickRenameBtn () {
             /* 点击重命名按钮 */
-            this.rename = this.rightMenuData.folder_name
+            this.rename = this.rightMenuData.folder_name || this.rightMenuData.file_name
             this.renameVisible = true
         },
         handleUpdate () {
             /* 修改个人文件夹名称 */
-            let folderName = this.rename
-            let data = {
-                b_id: this.rightMenuData.b_id,
-                parent_id: this.rightMenuData.parent_id,
-                folder_name: folderName
+            let data = {}
+            if (this.currentIsFiLe) {
+                /* 修改文件名称 */
+                data = {
+                    b_id: this.rightMenuData.file_info_id,
+                    file_name: this.rename
+                }
+                this.$emit('updateOrCreateFolder', true, data, '修改文件名称成功')
+            } else {
+                /* 修改文件名称 */
+                data = {
+                    b_id: this.rightMenuData.b_id,
+                    parent_id: this.rightMenuData.parent_id,
+                    folder_name: this.rename,
+                    step_number: this.rightMenuData.step_number
+                }
+                this.$emit('updateOrCreateFolder', false, data, '修改文件夹名称成功')
             }
-            this.$emit('updateOrCreateFolder', data, '修改文件夹名称成功')
             this.rename = ''
         },
         handleDelete () {
             /* 删除个人文件夹 */
-            let data = {
-                b_id: this.rightMenuData.b_id
+            let data = {}
+            if (this.currentIsFiLe) {
+                /* 删除文件 */
+                data = {
+                    b_id: this.rightMenuData.file_info_id
+                }
+                this.$emit('handleDeleteFolder', true, data)
+            } else {
+                /* 删除文件夹 */
+                data = {
+                    b_id: this.rightMenuData.b_id
+                }
+                this.$emit('handleDeleteFolder', false, data)
             }
-            this.$emit('handleDeleteFolder', data)
         }
     }
 }

VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/SmallFolder.vue

@@ -33,13 +33,15 @@
         </el-table-column>
         <el-table-column
           v-if="manageMode"
-          prop="private"
           label="公开/不公开"
           width="180">
+          <template slot-scope="scope">
+            {{ scope.row.is_public == 1 ? '不公开': (scope.row.is_public == 2 ? '对所有教师公开': '对部分教师公开')}}
+          </template>
         </el-table-column>
         <el-table-column
           v-if="manageMode"
-          prop="documentCount"
+          prop="file_count"
           label="文档数量"
           width="150">
         </el-table-column>
@@ -54,8 +56,14 @@
           min-width="220">
         </el-table-column>
     </el-table>
-    <div class="pagination" v-if="!(fileList[0] && fileList[0].isFolder)">
-      <pagination :amount="50"></pagination>
+    <div class="pagination" v-if="currentIsFiLe">
+      <pagination
+        :amount="paginationQuery.amount"
+        :page-size="paginationQuery.pageSize"
+        :page-index="paginationQuery.pageIndex"
+        @getCurrentPage="handleCurrentChange"
+        @getSizeChange="handleSizeChange"
+      />
     </div>
   </div>
 </template>
@@ -84,12 +92,19 @@ export default {
         manageMode: { // 是否为我管理的页面使用
             type: Boolean,
             default: false
+        },
+        paginationQuery: {
+            type: Object,
+            default: () => {
+                return { amount: 0, pageSize: 50, pageIndex: 1 }
+            }
         }
     },
     computed: {
         folderTypeOptions () {
             /* 根据foderType来判断显示哪种options */
             const uploadType = { 1: '学校文件夹', 2: '个人文件夹' }
+            const school = { 1: '常规文件夹', 2: '任务文件夹' }
             const favorType = { 1: '我收藏的', 2: '我分享的', 3: '分享给我的' }
             let folderTypeOptions = {}
             switch (this.mode) {
@@ -99,6 +114,9 @@ export default {
             case 'favor':
                 folderTypeOptions = favorType
                 break
+            case 'school':
+                folderTypeOptions = school
+                break
             }
             return folderTypeOptions
         }
@@ -117,10 +135,10 @@ export default {
             this.$emit('tableIntoFile', row)
         },
         handleSizeChange (val) {
-            console.log(`每页 ${val} 条`)
+            this.$emit('getSizeChange', val)
         },
         handleCurrentChange (val) {
-            console.log(`当前页: ${val}`)
+            this.$emit('getCurrentPage', val)
         }
     }
 }

VSSCMP_WEB/src/pages/education/schoolBasedResources/schoolResources/Index.vue

@@ -16,7 +16,7 @@ export default {
     },
     data () {
         return {
-            isShowPrevPage: true,
+            isShowPrevPage: false,
             menus: [
                 {
                     name: '校内资源',
@@ -28,24 +28,8 @@ export default {
         }
     },
     methods: {
-        initDataFromRoute (route) {
-            /* 根据路由参数来显示对应数据 */
-            if (route.query.folderName) { // 有参数说明不是首页，显示返回上一页
-                this.isShowPrevPage = true
-            } else {
-                this.isShowPrevPage = false
-            }
-        }
     },
     mounted () {
-    },
-    created () {
-        this.initDataFromRoute(this.$route)
-    },
-    watch: {
-        $route (to, from) {
-            this.initDataFromRoute(to)
-        }
     }
 
 }