diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index e5e5d95..a5e9f4e 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -60,32 +60,38 @@ export default {
defaultMenus: [
{
icon: 'el-icon-lx-home',
- index: '/index/list',
+ index: '/index',
title: '学校管理'
},
{
icon: 'el-icon-user',
- index: '/user/list',
+ index: '/user',
title: '用户管理'
},
{
icon: 'el-icon-monitor',
- index: '/quesBank/list',
+ index: '/quesBank',
title: '题库管理'
},
{
icon: 'el-icon-takeaway-box',
- index: '/system/list',
+ index: '/system',
title: '系统设置'
}
],
- menus: []
+ menus: [],
+ actives: {
+ index: ['index-add'],
+ }
};
},
computed: {
onRoutes() {
- console.log(33,this.$route)
- return this.$route.path
+ let actives = this.actives
+ for(let i in this.actives){
+ if(actives[i].includes(this.$route.name)) return `/${i}`
+ }
+ return '/' + this.$route.name.replace(/-\w+/,'')
}
},
created() {
diff --git a/src/pages/client/add/index.vue b/src/pages/client/add/index.vue
index f716435..08cfce8 100644
--- a/src/pages/client/add/index.vue
+++ b/src/pages/client/add/index.vue
@@ -16,12 +16,12 @@
-
+
diff --git a/src/pages/quesBank/list/globalQuesBank.vue b/src/pages/quesBank/list/globalQuesBank.vue
index 340d993..a74398f 100644
--- a/src/pages/quesBank/list/globalQuesBank.vue
+++ b/src/pages/quesBank/list/globalQuesBank.vue
@@ -45,23 +45,22 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
查看
- 取消共享
删除
@@ -146,24 +145,12 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val;
},
- cancelShare(row) {
- this.$confirm('确定要取消共享吗？', '提示', {
- type: 'info'
- })
- .then(() => {
- this.$post(`${this.api.cancelByMySharing}?ids=${row.sid}`).then(res => {
- this.$message.success('取消共享成功');
- this.getData()
- }).catch(res => {});
- })
- .catch(() => {});
- },
delData(row) {
this.$confirm('确定要删除吗？', '提示', {
type: 'warning'
})
.then(() => {
- this.$post(`${this.api.deleteByMeSubject}?ids=${row.sid}`).then(res => {
+ this.$post(`${this.api.deleteByMeSubjectBySharing}?identification=1&ids=${row.sid}`).then(res => {
this.$message.success('删除成功')
this.getData()
}).catch(res => {});
@@ -181,7 +168,7 @@ export default {
type: 'warning'
})
.then(() => {
- this.$post(`${this.api.deleteByMeSubject}?ids=${delList.join()}`).then(res => {
+ this.$post(`${this.api.deleteByMeSubjectBySharing}?identification=1&ids=${delList.join()}`).then(res => {
this.multipleSelection = [];
this.$message.success('删除成功')
this.getData()
diff --git a/src/pages/quesBank/list/myQuesBank.vue b/src/pages/quesBank/list/myQuesBank.vue
index 197197a..58db88e 100644
--- a/src/pages/quesBank/list/myQuesBank.vue
+++ b/src/pages/quesBank/list/myQuesBank.vue
@@ -84,7 +84,7 @@
align="center"
:reserve-selection="true"
>
-
+
{{scope.$index + (page - 1) * pageSize + 1}}
@@ -94,19 +94,19 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
查看
修改
- 共享
删除
-
+ 共享
+ 取消共享
@@ -151,6 +151,52 @@
确 定
+
+
+
+
+
+ {{scope.$index + (page - 1) * pageSize + 1}}
+
+
+
+
+
+
+
+
+
+
+
+