Skip to content

V
VS_OUTSOURCE
Commit 9b20f7e3 authored by 赵炳峰's avatar 赵炳峰
Browse files
Options

Merge branch 'master' of http://git.xu.mk:3000/VSchool/vs_outsource

parents ef8430a0 279bf40a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1093 additions and 627 deletions
VSSCMP_WEB/package-lock.json
View file @ 9b20f7e3
...@@ -5106,8 +5106,7 @@ ...@@ -5106,8 +5106,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -5128,14 +5127,12 @@ ...@@ -5128,14 +5127,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -5150,20 +5147,17 @@ ...@@ -5150,20 +5147,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -5280,8 +5274,7 @@ ...@@ -5280,8 +5274,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -5293,7 +5286,6 @@ ...@@ -5293,7 +5286,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -5308,7 +5300,6 @@ ...@@ -5308,7 +5300,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -5316,14 +5307,12 @@ ...@@ -5316,14 +5307,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -5342,7 +5331,6 @@ ...@@ -5342,7 +5331,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -5423,8 +5411,7 @@ ...@@ -5423,8 +5411,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -5436,7 +5423,6 @@ ...@@ -5436,7 +5423,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -5522,8 +5508,7 @@ ...@@ -5522,8 +5508,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -5559,7 +5544,6 @@ ...@@ -5559,7 +5544,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -5579,7 +5563,6 @@ ...@@ -5579,7 +5563,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -5623,14 +5606,12 @@ ...@@ -5623,14 +5606,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -7340,7 +7321,7 @@ ...@@ -7340,7 +7321,7 @@
"integrity": "sha1-WhLAEUed76vvVzXeVckTBg7SGfI=", "integrity": "sha1-WhLAEUed76vvVzXeVckTBg7SGfI=",
"requires": { "requires": {
"canvg": "1.5.3", "canvg": "1.5.3",
"file-saver": "github:eligrey/FileSaver.js#1.3.8", "file-saver": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
"html2canvas": "1.0.0-alpha.12", "html2canvas": "1.0.0-alpha.12",
"omggif": "1.0.7", "omggif": "1.0.7",
"promise-polyfill": "8.1.0", "promise-polyfill": "8.1.0",
......
VSSCMP_WEB/src/pages/education/schoolBasedResources/folderManage/Index.vue
View file @ 9b20f7e3
<template> <template>
<div class="container"> <div class="container">
<h4 class="title">校本资源设置</h4> <v-header :title="'校本资源设置'" :is-show-prev-page="false"></v-header>
<div class="headerNav"> <div class="headerNav">
<div class="leftNav"> <div class="leftNav">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
...@@ -50,7 +50,8 @@ export default { ...@@ -50,7 +50,8 @@ export default {
name: 'Index', name: 'Index',
components: { components: {
SmallFolder: () => import('./../myResources/components/SmallFolder'), SmallFolder: () => import('./../myResources/components/SmallFolder'),
ManageCtxMenu: () => import('./components/ManageCtxMenu') ManageCtxMenu: () => import('./components/ManageCtxMenu'),
VHeader: () => import('@/common/header/VHeader')
}, },
data () { data () {
return { return {
...@@ -244,17 +245,11 @@ export default { ...@@ -244,17 +245,11 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.container { .container {
.title {
padding: 15px 20px;
color: #585858;
font-size: 18px;
border-bottom:1px #D7D7D7 solid;
}
.headerNav { .headerNav {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 55px; height: 45px;
line-height: 55px; line-height: 45px;
background: #e7e7e7; background: #e7e7e7;
/deep/ .leftNav { /deep/ .leftNav {
...@@ -263,7 +258,7 @@ export default { ...@@ -263,7 +258,7 @@ export default {
.el-breadcrumb { .el-breadcrumb {
font-size: 18px; font-size: 18px;
line-height: 55px; line-height: 45px;
.el-breadcrumb__item { .el-breadcrumb__item {
&:not(:last-child) .el-breadcrumb__inner{ &:not(:last-child) .el-breadcrumb__inner{
cursor: pointer; cursor: pointer;
......
VSSCMP_WEB/src/pages/education/schoolBasedResources/folderManage/components/ManageCtxMenu.vue
View file @ 9b20f7e3
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</el-form-item> </el-form-item>
<el-form-item label="管理者" prop="manager"> <el-form-item label="管理者" prop="manager">
<div class="header-ctn"> <div class="header-ctn">
<el-button class="person-btn" icon="el-icon-plus">添加教师</el-button> <el-button class="person-btn" icon="el-icon-plus" @click="teacherSelectorOptions.isBlock = true">添加教师</el-button>
<span class="person-count">已选择 <span style="color:blue">2</span> 人</span> <span class="person-count">已选择 <span style="color:blue">2</span> 人</span>
</div> </div>
<div class="tag-ctn"> <div class="tag-ctn">
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="ruleForm.folderType === 'task'" label="教师" prop="uploadTeacher"> <el-form-item v-if="ruleForm.folderType === 'task'" label="教师" prop="uploadTeacher">
<div class="header-ctn"> <div class="header-ctn">
<el-button class="person-btn" icon="el-icon-plus">添加教师</el-button> <el-button class="person-btn" icon="el-icon-plus" @click="teacherSelectorOptions.isBlock = true">添加教师</el-button>
<span class="person-count">已选择 <span style="color:blue">2</span> 人</span> <span class="person-count">已选择 <span style="color:blue">2</span> 人</span>
</div> </div>
<div class="tag-ctn"> <div class="tag-ctn">
...@@ -86,6 +86,10 @@ ...@@ -86,6 +86,10 @@
<el-button size="medium" type="primary" @click="newFolderVisible = false">保存</el-button> <el-button size="medium" type="primary" @click="newFolderVisible = false">保存</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<teacher-selector
:teacherSelectorOptions="teacherSelectorOptions"
@closeTeacherSelector="teacherSelectorOptions.isBlock = false">
</teacher-selector>
</el-dialog> </el-dialog>
<!-- 删除文件窗口 --> <!-- 删除文件窗口 -->
...@@ -104,35 +108,42 @@ ...@@ -104,35 +108,42 @@
export default { export default {
name: 'ContextMenu', name: 'ContextMenu',
props: { props: {
menuVisible: { menuVisible: { // 右键菜单栏显示
type: Boolean, type: Boolean,
default: false default: false
}, },
rightMenuData: { rightMenuData: { // 右键文件的数据
type: Object, type: Object,
default: () => { default: () => {
return {} return {}
} }
}, },
rightMenuFolder: { rightMenuFolder: { // 右键空白所在层的文件夹数据
type: Array, type: Array,
default: () => { default: () => {
return [] return []
} }
}, },
coordinate: { coordinate: { // 右键菜单栏坐标
type: Object, type: Object,
default: () => { default: () => {
return {} return {}
} }
}, },
menuMode: { menuMode: { // 右键的文件属于那种类型（ blank: 右键空白 ）
type: String, type: String,
default: '' default: ''
} }
}, },
components: {
TeacherSelector: () => import('@/common/TeacherSelector')
},
data () { data () {
return { return {
teacherSelectorOptions: {
isBlock: false,
isShow: true
},
newFolderVisible: false, newFolderVisible: false,
newFolderName: '', newFolderName: '',
deleteVisible: false, deleteVisible: false,
......
VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/FavorShare.vue → VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/FavorShare.vue
View file @ 9b20f7e3
<template> <template>
<div class="container"> <div class="container">
<div class="headerNav" style="margin-bottom:20px;"> <v-header :title="'我的资源'" :is-show-prev-page="true"></v-header>
<div class="leftNav"> <nav-menu :menus="menus"></nav-menu>
<span class="type-title">类型:</span> <div class="main">
<el-radio-group v-model="folderType" size="small" @change="folderTypeChange"> <div class="headerNav">
<el-radio-button label="all">全部</el-radio-button> <div class="leftNav">
<el-radio-button label="myFavor">我收藏的</el-radio-button> <span class="type-title">类型:</span>
<el-radio-button label="myShare">我分享的</el-radio-button> <el-radio-group v-model="folderType" size="small" @change="folderTypeChange">
<el-radio-button label="shareMe">分享给我的</el-radio-button> <el-radio-button label="all">全部</el-radio-button>
</el-radio-group> <el-radio-button label="myFavor">我收藏的</el-radio-button>
<el-radio-button label="myShare">我分享的</el-radio-button>
<el-radio-button label="shareMe">分享给我的</el-radio-button>
</el-radio-group>
</div>
<div class="rightNav">
<el-select class="timer-select" v-model="timeSelect" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<search></search>
</div>
</div> </div>
<div class="rightNav">
<el-select class="timer-select" v-model="timeSelect" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<search></search>
</div>
</div>
<div class="folderCtn"> <div class="folderCtn">
<div class="smallCtn"> <div class="smallCtn">
<small-folder <small-folder
:file-list="currentFileList" :file-list="currentFileList"
@showMenu="showMenu" @showMenu="showMenu"
@tableIntoFile="intoFolder"> @tableIntoFile="intoFolder">
</small-folder> </small-folder>
</div>
</div> </div>
</div>
<favorshare-ctx-menu <favorshare-ctx-menu
:menuVisible="menuVisible" :menuVisible="menuVisible"
:rightMenuData="rightMenuData" :rightMenuData="rightMenuData"
:coordinate="coordinate" :coordinate="coordinate"
:menuMode="menuMode" :menuMode="menuMode"
@menuOpenFile="intoFolder"> @menuOpenFile="intoFolder">
</favorshare-ctx-menu> </favorshare-ctx-menu>
<!-- 侧滑块查看普通文档 --> <!-- 侧滑块查看普通文档 -->
<el-drawer <el-drawer
title="查看" title="查看"
:visible.sync="documentDrawer" :visible.sync="documentDrawer"
:size="'60%'"> :size="'60%'">
<span>文档内容</span> <span>文档内容</span>
</el-drawer> </el-drawer>
</div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'FavorShare', name: 'FavorShare',
components: { components: {
Search: () => import('./Search'), VHeader: () => import('@/common/header/VHeader'),
SmallFolder: () => import('./SmallFolder'), NavMenu: () => import('@/common/navMenu/NavMenu'),
FavorshareCtxMenu: () => import('./FavorshareCtxMenu') Search: () => import('./components/Search'),
SmallFolder: () => import('./components/SmallFolder'),
FavorshareCtxMenu: () => import('./components/FavorshareCtxMenu')
}, },
data () { data () {
return { return {
folderType: 'all', menus: [
timeSelect: 'allItem', {
name: '我上次的',
id: 'tab_1',
permission: true,
path: '/education/myResources/index'
},
{
name: '收藏/分享',
id: 'tab_2',
permission: true,
path: '/education/myResources/favorShare'
},
{
name: '我管理的',
id: 'tab_3',
permission: true,
path: '/education/myResources/myManage'
}
],
folderType: 'all', // 文件类型（文件类型（all: 全部，myFavor: 我收藏的，myShare: 我分享的, shareMe: 分享给我的 ））
timeSelect: 'allItem', // 学期选择框数据
menuMode: '', // 菜单根据模式显示对于内容 menuMode: '', // 菜单根据模式显示对于内容
menuVisible: false, // 右键菜单栏 menuVisible: false, // 右键菜单栏
rightMenuData: {}, // 右键选中文件夹或文件数据 rightMenuData: {}, // 右键选中文件夹或文件数据
...@@ -120,6 +147,7 @@ export default { ...@@ -120,6 +147,7 @@ export default {
updateTime: '2020-08-22 12:00' updateTime: '2020-08-22 12:00'
} }
] ]
} }
}, },
mounted () { mounted () {
...@@ -167,47 +195,50 @@ export default { ...@@ -167,47 +195,50 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.container { .container {
height: 100%;
min-height: 100%; min-height: 100%;
.main {
min-height: 100%;
.headerNav { .headerNav {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 55px; height: 45px;
line-height: 55px; line-height: 45px;
background: #e7e7e7; background: #e7e7e7;
/deep/ .leftNav { /deep/ .leftNav {
padding: 0 20px; padding: 0 20px;
font-size: 18px; font-size: 18px;
.type-title { .type-title {
color: rgb(48, 48, 48); color: rgb(48, 48, 48);
} }
.el-radio-group { .el-radio-group {
vertical-align: middle;
margin-bottom: 3px;
.el-radio-button { .el-radio-button {
margin: 0 5px; margin: 0 5px;
.el-radio-button__inner { .el-radio-button__inner {
border-radius: 25px; border-radius: 25px;
}
} }
} }
} }
}
/deep/ .rightNav {
padding: 0 30px;
display: flex;
.timer-select{
padding-top: 1px;
.el-input__inner { /deep/ .rightNav {
height: 35px; padding: 0 30px;
font-size: 14px; display: flex;
.timer-select{
padding-top: 1px;
margin-right: 15px;
} }
} }
} }
} }
} }
</style> </style>
VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/MyManage.vue → VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/MyManage.vue
View file @ 9b20f7e3
<template> <template>
<div class="container"> <div class="container">
<div class="headerNav"> <v-header :title="'我的资源'" :is-show-prev-page="true"></v-header>
<div class="leftNav"> <nav-menu :menus="menus"></nav-menu>
<el-breadcrumb separator-class="el-icon-arrow-right"> <div class="main">
<el-breadcrumb-item <div class="headerNav">
v-for="(breadcrumbItem, index) of breadcrumb" <div class="leftNav">
:key="index" <el-breadcrumb separator-class="el-icon-arrow-right">
@click.native="backCrumb(index)"> <el-breadcrumb-item
{{ breadcrumbItem.name }} v-for="(breadcrumbItem, index) of breadcrumb"
</el-breadcrumb-item> :key="index"
</el-breadcrumb> @click.native="backCrumb(index)">
{{ breadcrumbItem.name }}
</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="rightNav" v-show="isFileMode">
<el-select class="timer-select" v-model="timeSelect" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</div> </div>
<div class="rightNav" v-show="isFileMode">
<el-select class="timer-select" v-model="timeSelect" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</div>
<!-- 文件夹选择显示页面 --> <!-- 文件夹选择显示页面 -->
<div class="folder-mode folderCtn" v-show="!isFileMode"> <div class="folder-mode folderCtn" v-show="!isFileMode">
<big-folder <big-folder
v-for="file of currentFileList" v-for="file of currentFileList"
:key="file.id" :file-data="file" :key="file.id" :file-data="file"
@intoFolder="intoFolder(file)"> @intoFolder="intoFolder(file)">
</big-folder> </big-folder>
</div> </div>
<!-- 资料列表显示页面 --> <!-- 资料列表显示页面 -->
<div class="file-mode" v-if="isFileMode"> <div class="file-mode" v-if="isFileMode">
<material :taskMode="taskMode"></material> <material :taskMode="taskMode"></material>
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'MyManage', name: 'MyManage',
props: {},
components: { components: {
BigFolder: () => import('./BigFolder'), VHeader: () => import('@/common/header/VHeader'),
Material: () => import('./Material') NavMenu: () => import('@/common/navMenu/NavMenu'),
BigFolder: () => import('./components/BigFolder'),
Material: () => import('./components/Material')
}, },
mixins: [],
data () { data () {
return { return {
menus: [
{
name: '我上次的',
id: 'tab_1',
permission: true,
path: '/education/myResources/index'
},
{
name: '收藏/分享',
id: 'tab_2',
permission: true,
path: '/education/myResources/favorShare'
},
{
name: '我管理的',
id: 'tab_3',
permission: true,
path: '/education/myResources/myManage'
}
],
breadcrumb: [ // 面包屑 breadcrumb: [ // 面包屑
{ {
name: '首页', name: '首页',
...@@ -58,7 +83,7 @@ export default { ...@@ -58,7 +83,7 @@ export default {
} }
], ],
isFileMode: false, // 是否资料列表页面 isFileMode: false, // 是否资料列表页面
timeSelect: 'allItem', timeSelect: 'allItem', // 学期选择框数据
options: [{ options: [{
value: 'allItem', value: 'allItem',
label: '全部学期' label: '全部学期'
...@@ -159,61 +184,63 @@ export default { ...@@ -159,61 +184,63 @@ export default {
} }
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.container { .container {
height: 100%;
min-height: 100%; min-height: 100%;
.main {
min-height: 100%;
.headerNav { .headerNav {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 55px; height: 45px;
line-height: 55px; line-height: 45px;
background: #e7e7e7; background: #e7e7e7;
/deep/ .leftNav {
padding: 0 20px;
font-size: 18px;
.el-breadcrumb { /deep/ .leftNav {
padding: 0 20px;
font-size: 18px; font-size: 18px;
line-height: 55px;
.el-breadcrumb__item { .el-breadcrumb {
&:not(:last-child) .el-breadcrumb__inner{ font-size: 18px;
cursor: pointer; line-height: 45px;
&:hover { .el-breadcrumb__item {
color: #1890FF; &:not(:last-child) .el-breadcrumb__inner{
cursor: pointer;
&:hover {
color: #1890FF;
}
} }
}
&:last-child .el-breadcrumb__inner{ &:last-child .el-breadcrumb__inner{
color: black; color: black;
}
} }
}
}
} }
}
/deep/ .rightNav { /deep/ .rightNav {
padding: 0 30px; padding: 0 30px;
display: flex; display: flex;
.timer-select{ .timer-select{
padding-top: 1px; padding-top: 1px;
margin-right: 15px;
.el-input__inner {
height: 35px;
font-size: 14px;
} }
} }
} }
}
.folderCtn{ .folderCtn{
padding: 15px; padding: 15px;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
}
} }
} }
</style> </style>
VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/FavorshareCtxMenu.vue
View file @ 9b20f7e3
...@@ -54,29 +54,29 @@ ...@@ -54,29 +54,29 @@
export default { export default {
name: 'ContextMenu', name: 'ContextMenu',
props: { props: {
menuVisible: { menuVisible: { // 右键菜单栏显示
type: Boolean, type: Boolean,
default: false default: false
}, },
rightMenuData: { rightMenuData: { // 右键文件的数据
type: Object, type: Object,
default: () => { default: () => {
return {} return {}
} }
}, },
rightMenuFolder: { rightMenuFolder: { // 右键空白所在层的文件夹数据
type: Array, type: Array,
default: () => { default: () => {
return [] return []
} }
}, },
coordinate: { coordinate: { // 右键菜单栏坐标
type: Object, type: Object,
default: () => { default: () => {
return {} return {}
} }
}, },
menuMode: { menuMode: { // 右键的文件属于那种类型（myFavor: 我收藏的，myShare: 我分享的, shareMe: 分享给我的 ）
type: String, type: String,
default: '' default: ''
} }
......
VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/Material.vue
View file @ 9b20f7e3
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
export default { export default {
name: 'Material', name: 'Material',
props: { props: {
taskMode: { taskMode: { // 是否为任务文件夹
type: Boolean, type: Boolean,
default: false default: false
} }
...@@ -72,7 +72,7 @@ export default { ...@@ -72,7 +72,7 @@ export default {
return { return {
searchData: '', searchData: '',
menuVisible: false, // 右键菜单栏 menuVisible: false, // 右键菜单栏
deleteVisible: false, deleteVisible: false, // 删除确认弹框
coordinate: { // 菜单栏坐标 coordinate: { // 菜单栏坐标
menuX: '0px', menuX: '0px',
menuY: '0px' menuY: '0px'
......
VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/MyuploadCtxMenu.vue
View file @ 9b20f7e3
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<el-dialog class='share-ctn' title="分享" :visible.sync="shareVisible" width="500px"> <el-dialog class='share-ctn' title="分享" :visible.sync="shareVisible" width="500px">
<div class="header-ctn"> <div class="header-ctn">
<span>分享给：</span> <span>分享给：</span>
<el-button class="person-btn" icon="el-icon-plus">选择教师</el-button> <el-button class="person-btn" icon="el-icon-plus" @click="teacherSelectorOptions.isBlock = true">选择教师</el-button>
<span class="person-count">已选择 <span style="color:blue">6</span> 人</span> <span class="person-count">已选择 <span style="color:blue">6</span> 人</span>
</div> </div>
<div class="tag-ctn"> <div class="tag-ctn">
...@@ -78,7 +78,12 @@ ...@@ -78,7 +78,12 @@
<el-button @click="shareVisible = false">取 消</el-button> <el-button @click="shareVisible = false">取 消</el-button>
<el-button type="primary" @click="shareVisible = false">确 定</el-button> <el-button type="primary" @click="shareVisible = false">确 定</el-button>
</div> </div>
<teacher-selector
:teacherSelectorOptions="teacherSelectorOptions"
@closeTeacherSelector="teacherSelectorOptions.isBlock = false">
</teacher-selector>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -86,45 +91,52 @@ ...@@ -86,45 +91,52 @@
export default { export default {
name: 'ContextMenu', name: 'ContextMenu',
props: { props: {
menuVisible: { menuVisible: { // 右键菜单栏显示
type: Boolean, type: Boolean,
default: false default: false
}, },
uploadVisible: { uploadVisible: { // 上传菜单栏显示
type: Boolean, type: Boolean,
default: false default: false
}, },
rightMenuData: { rightMenuData: { // 右键文件的数据
type: Object, type: Object,
default: () => { default: () => {
return {} return {}
} }
}, },
rightMenuFolder: { rightMenuFolder: { // 右键空白所在层的文件夹数据
type: Array, type: Array,
default: () => { default: () => {
return [] return []
} }
}, },
coordinate: { coordinate: { // 右键菜单栏坐标
type: Object, type: Object,
default: () => { default: () => {
return {} return {}
} }
}, },
menuMode: { menuMode: { // 右键的文件属于那种类型（file: 文件，personal: 个人文件夹, blank: 右键空白 ）
type: String, type: String,
default: '' default: ''
} }
}, },
components: {
TeacherSelector: () => import('@/common/TeacherSelector')
},
data () { data () {
return { return {
renameVisible: false, teacherSelectorOptions: {
isBlock: false,
isShow: true
},
renameVisible: false, // 重命名窗口
rename: '', rename: '',
newFolderVisible: false, newFolderVisible: false, // 新建文件夹窗口
newFolderName: '', newFolderName: '',
deleteVisible: false, deleteVisible: false, // 删除文件窗口
shareVisible: false, shareVisible: false, // 分享文件窗口
tags: [ tags: [
{ name: '标某某' }, { name: '标某某' },
{ name: '某某某' }, { name: '某某某' },
......
VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/Search.vue
View file @ 9b20f7e3
<template> <template>
<div class="show header-search"> <div class="header-search">
<el-select <el-input placeholder="请输入内容" v-model="search" class="input-with-select">
ref="headerSearchSelect" <el-button slot="append" icon="el-icon-search"></el-button>
v-model="search" </el-input>
filterable
default-first-option
remote
placeholder="输入关键字搜索..."
class="header-search-select"
>
<option></option>
</el-select>
<span class="search-icon">
<i class="el-icon-search"></i>
</span>
</div> </div>
</template> </template>
...@@ -22,7 +11,6 @@ export default { ...@@ -22,7 +11,6 @@ export default {
name: 'Search', name: 'Search',
data () { data () {
return { return {
show: true,
search: '' search: ''
} }
} }
...@@ -31,46 +19,8 @@ export default { ...@@ -31,46 +19,8 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.header-search { .header-search {
font-size: 0 !important; .input-with-select {
position: relative;
.search-icon {
cursor: pointer;
font-size: 18px;
vertical-align: middle; vertical-align: middle;
position: absolute;
right:6px;
top:10px;
height:35px;
line-height: 35px;
border-left: 1px solid #ccc;
padding: 0 15px;
}
/deep/ .header-search-select {
font-size: 18px;
transition: width 0.2s;
width: 0;
height: 55px;
overflow: hidden;
background: transparent;
border-radius: 0;
display: inline-block;
vertical-align: middle;
.el-input__inner {
font-size: 14px;
height: 35px;
padding-right: 55px;
}
}
&.show {
.header-search-select {
width: 250px;
margin-left: 10px;
}
} }
} }
</style> </style>
VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/SmallFolder.vue
View file @ 9b20f7e3
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="fileList[0] && fileList[0].isFolder"
prop="typeName" prop="typeName"
label="类型" label="类型"
width="170"> width="170">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="!manageMode" v-if="!manageMode && (fileList[0] && fileList[0].isFolder)"
prop="uploadCount" prop="uploadCount"
label="我上传的数量" label="我上传的数量"
width="170"> width="170">
...@@ -51,16 +52,8 @@ ...@@ -51,16 +52,8 @@
min-width="220"> min-width="220">
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination" v-show="!fileList[0].isFolder"> <div class="pagination" v-if="!(fileList[0] && fileList[0].isFolder)">
<el-pagination <pagination :amount="50"></pagination>
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="1"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
layout="total, sizes, prev, pager, next, jumper"
:total="400">
</el-pagination>
</div> </div>
</div> </div>
</template> </template>
...@@ -68,6 +61,9 @@ ...@@ -68,6 +61,9 @@
<script> <script>
export default { export default {
name: 'SmallFolder', name: 'SmallFolder',
components: {
Pagination: () => import('@/common/Pagination')
},
props: { props: {
fileList: { fileList: {
type: Array, type: Array,
...@@ -75,7 +71,7 @@ export default { ...@@ -75,7 +71,7 @@ export default {
return [] return []
} }
}, },
manageMode: { manageMode: { // 是否为我管理的页面使用
type: Boolean, type: Boolean,
default: false default: false
} }
......
VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/UploadFile.vue
View file @ 9b20f7e3
...@@ -37,7 +37,6 @@ export default { ...@@ -37,7 +37,6 @@ export default {
}, },
data () { data () {
return { return {
dialogVisible: true
} }
}, },
methods: { methods: {
......
VSSCMP_WEB/src/pages/education/schoolBasedResources/schoolResources/Index.vue
View file @ 9b20f7e3
<template>
<div class="container">
<v-header :title="'学校资源库'" :is-show-prev-page="true"></v-header>
<nav-menu :menus="menus"></nav-menu>
<div class="main">
<div class="headerNav">
<div class="leftNav">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item
v-for="(breadcrumbItem, index) of breadcrumb"
:key="index"
@click.native="backCrumb(index)">
{{ breadcrumbItem.name }}
</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="rightNav">
<el-select v-if="!(currentFileList[0] && currentFileList[0].isFolder)" class="timer-select" v-model="timeSelect" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<search></search>
</div>
</div>
<div class="folderCtn">
<div class="smallCtn">
<small-folder
:file-list="currentFileList"
@tableIntoFile="intoFolder"
>
</small-folder>
</div>
</div>
<!-- 侧滑块查看普通文档 -->
<el-drawer
title="查看"
:visible.sync="documentDrawer"
:size="'60%'">
<span>文档内容</span>
</el-drawer>
</div>
</div>
</template>
<script>
export default {
name: 'Index',
components: {
VHeader: () => import('@/common/header/VHeader'),
NavMenu: () => import('@/common/navMenu/NavMenu'),
Search: () => import('./../myResources/components/Search'),
SmallFolder: () => import('./../myResources/components/SmallFolder')
},
data () {
return {
menus: [
{
name: '校内资源',
id: 'tab_1',
permission: true,
path: '/education/schoolResources/index'
}
],
timeSelect: 'allItem', // 学期选择框数据
options: [{
value: 'allItem',
label: '全部学期'
}],
documentDrawer: false, // 查看文档抽屉
currentFileList: [],
selectFolderVisible: false, // 查看文件侧滑框
breadcrumb: [ // 面包屑
{
name: '首页',
isFolder: true,
folderName: 'firstLevelData'
}
],
fileListData: {
firstLevelData: [
{
id: 991,
name: '第一级文件夹',
typeName: '学校文件夹',
type: 'school',
icon: 'el-icon-folder',
descript: '我上传了10个文档',
isFocus: false,
isFolder: true,
folderData: 'secondLevelData',
nextIsFolder: true,
uploadCount: '10',
author: '张三',
updateTime: '2020-08-22 12:00'
},
{
id: 992,
name: '第一级文件夹',
typeName: '个人文件夹',
type: 'personal',
icon: 'el-icon-folder',
descript: '我上传了10个文档',
isFocus: false,
isFolder: true,
folderData: 'secondLevelData',
nextIsFolder: true,
uploadCount: '10',
author: '张三',
updateTime: '2020-08-22 12:00'
},
{
id: 993,
name: '第一级文件夹',
typeName: '个人文件夹',
type: 'personal',
icon: 'el-icon-folder',
descript: '我上传了10个文档',
isFocus: false,
isFolder: true,
folderData: 'secondLevelData',
nextIsFolder: true,
uploadCount: '10',
author: '张三',
updateTime: '2020-08-22 12:00'
}
],
secondLevelData: [
{
id: 1001,
name: '第二级文件夹',
typeName: '学校文件夹',
type: 'school',
icon: 'el-icon-folder',
descript: '我上传了10个文档',
isFocus: false,
isFolder: true,
folderData: 'thirdLevelData',
nextIsFolder: false,
uploadCount: '10',
author: '张三',
updateTime: '2020-08-22 12:00'
},
{
id: 1002,
name: '第二级文件夹',
typeName: '学校文件夹',
type: 'school',
icon: 'el-icon-folder',
descript: '我上传了10个文档',
isFocus: false,
isFolder: true,
folderData: 'thirdLevelData',
nextIsFolder: false,
uploadCount: '10',
author: '张三',
updateTime: '2020-08-22 12:00'
}
],
thirdLevelData: [
{
id: 1101,
name: '第三级文件.txt',
typeName: '文件',
type: 'file',
icon: 'el-icon-document',
descript: '我上传了10个文档',
isFocus: false,
isFolder: false,
nextIsFolder: false,
uploadCount: '10',
author: '张三',
updateTime: '2020-08-22 12:00'
}
]
}
}
},
mounted () {
this.currentFileList = this.fileListData.firstLevelData
},
methods: {
backCrumb (index) {
/* 点击面包屑返回前几级 */
let breadcrumb = this.breadcrumb
if (index < breadcrumb.length - 1) {
let folderName = breadcrumb[index].folderName
this.currentFileList = this.fileListData[folderName]
this.breadcrumb = breadcrumb.slice(0, index + 1)
}
},
intoFolder (file) {
/* 进入下一级文件夹 */
if (file.isFolder) {
// 双击文件夹
let breadcrumbData = {
name: file.name,
isFolder: file.isFolder,
folderName: file.folderData
}
this.breadcrumb.push(breadcrumbData)
this.currentFileList = this.fileListData[file.folderData]
} else {
// 双击文件
this.documentDrawer = true
}
}
}
}
</script>
<style lang="less" scoped>
.container {
height: 100%;
min-height: 100%;
.main {
min-height: 100%;
.headerNav {
display: flex;
justify-content: space-between;
height: 45px;
line-height: 45px;
background: #e7e7e7;
/deep/ .leftNav {
padding: 0 20px;
font-size: 18px;
.el-breadcrumb {
font-size: 18px;
line-height: 45px;
.el-breadcrumb__item {
&:not(:last-child) .el-breadcrumb__inner{
cursor: pointer;
&:hover {
color: #1890FF;
}
}
&:last-child .el-breadcrumb__inner{
color: black;
}
}
}
}
/deep/ .rightNav {
padding: 0 30px;
display: flex;
.timer-select{
padding-top: 1px;
margin-right: 15px;
}
}
}
.folderCtn{
min-height: 500px;
.smallCtn {
width: 100%;
}
}
}
}
</style>
VSSCMP_WEB/src/routers/education/schoolBasedResourcesRouter.js
View file @ 9b20f7e3
...@@ -13,6 +13,24 @@ const MY_RESOURCES = [ ...@@ -13,6 +13,24 @@ const MY_RESOURCES = [
} }
] ]
// 我的资源-收藏分享
const MY_RESOURCES_FAVORSHARE = [
{
path: '/education/myResources/favorShare',
name: 'SchoolBasedMyResources',
component: resolve => require(['pages/education/schoolBasedResources/myResources/FavorShare'], resolve)
}
]
// 我的资源-我管理的
const MY_RESOURCES_MYMANAGE = [
{
path: '/education/myResources/myManage',
name: 'SchoolBasedMyResources',
component: resolve => require(['pages/education/schoolBasedResources/myResources/MyManage'], resolve)
}
]
// 学校资源 // 学校资源
const SCHOOL_RESOURCES = [ const SCHOOL_RESOURCES = [
{ {
...@@ -33,6 +51,8 @@ const FOLDER_MANAGE = [ ...@@ -33,6 +51,8 @@ const FOLDER_MANAGE = [
export default [ export default [
...MY_RESOURCES, ...MY_RESOURCES,
...MY_RESOURCES_FAVORSHARE,
...MY_RESOURCES_MYMANAGE,
...SCHOOL_RESOURCES, ...SCHOOL_RESOURCES,
...FOLDER_MANAGE ...FOLDER_MANAGE
] ]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment