From f54b1ddcfff42ab3af6bb5a273eb8c97347eb982 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 11 Dec 2020 09:36:41 +0800
Subject: [PATCH] =?UTF-8?q?1.0=E7=89=88=E6=9C=AC=E5=B0=81=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue               |  2 +-
 src/layouts/navbar/index.vue               |  6 +--
 src/pages/quesBank/list/globalQuesBank.vue |  2 +-
 src/pages/quesBank/list/myQuesBank.vue     | 61 +++-------------------
 src/pages/quesBank/list/quesDialog.vue     |  5 --
 src/setting.js                             |  2 +-
 6 files changed, 13 insertions(+), 65 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 433ef4e..c1dd7f6 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="header flex j-between">
+    <div class="header flex a-center j-between">
         <div v-if="showBack" class="goBack" v-throttle @click="back"><i class="el-icon-arrow-left"></i>返回</div>
         <div v-else class="logo">
             <img src="../../assets/img/logo-fill.png">
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index a5e9f4e..ad13a35 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -59,7 +59,7 @@ export default {
             collapse: false,
             defaultMenus: [
                 {
-                    icon: 'el-icon-lx-home',
+                    icon: 'el-icon-coordinate',
                     index: '/index',
                     title: '学校管理'
                 },
@@ -69,12 +69,12 @@ export default {
                     title: '用户管理'
                 },
                 {
-                    icon: 'el-icon-monitor',
+                    icon: 'el-icon-notebook-1',
                     index: '/quesBank',
                     title: '题库管理'
                 },
                 {
-                    icon: 'el-icon-takeaway-box',
+                    icon: 'el-icon-setting',
                     index: '/system',
                     title: '系统设置'
                 }
diff --git a/src/pages/quesBank/list/globalQuesBank.vue b/src/pages/quesBank/list/globalQuesBank.vue
index a74398f..d440407 100644
--- a/src/pages/quesBank/list/globalQuesBank.vue
+++ b/src/pages/quesBank/list/globalQuesBank.vue
@@ -36,7 +36,7 @@
             <div class="flex j-between m-b-20">
                 <div class="flex a-center">
                     <p class="hr_tag"></p>
-                    <span>分类管理</span>
+                    <span>题目列表</span>
                 </div>
                 <div>
                     <!-- <el-button type="primary" size="small" round @click="delAllData" v-auth>取消共享</el-button> -->
diff --git a/src/pages/quesBank/list/myQuesBank.vue b/src/pages/quesBank/list/myQuesBank.vue
index 58db88e..000197f 100644
--- a/src/pages/quesBank/list/myQuesBank.vue
+++ b/src/pages/quesBank/list/myQuesBank.vue
@@ -100,7 +100,7 @@
                         <el-table-column prop="knowledgePoints" label="知识点" width="140" align="center"></el-table-column>
                         <el-table-column prop="useNum" label="使用次数" width="100" align="center"></el-table-column>
                         <el-table-column prop="createTime" label="上传时间" width="140" align="center"></el-table-column>
-                        <el-table-column label="操作" width="170" align="center">
+                        <el-table-column label="操作" width="200" align="center">
                             <template slot-scope="scope">
                                 <el-button type="text" @click="show(scope.row)">查看</el-button>
                                 <el-button type="text" @click="edit(scope.row)">修改</el-button>
@@ -151,52 +151,6 @@
                 <el-button type="primary" @click="uploadSure">确 定</el-button>
             </span>
         </el-dialog>
-
-        <el-dialog title="批量取消共享" :visible.sync="cancelShareVisible" width="40%" @close="closeCancelShare" :close-on-click-modal="false">
-            <el-table
-                :data="globalData"
-                max-height="400"
-                ref="table"
-                row-key="id"
-                class="table"
-                stripe
-                header-align="center"
-                @selection-change="handleGlobalSelectionChange"
-            >
-                <el-table-column
-                    type="selection"
-                    width="55"
-                    align="center"
-                    :reserve-selection="true"
-                ></el-table-column>
-                <el-table-column type="index" width="100" label="序号" align="center">
-                    <template
-                        slot-scope="scope"
-                    >{{scope.$index + (page - 1) * pageSize + 1}}</template>
-                </el-table-column>
-                <el-table-column prop="questionStem" label="题干" align="center">
-                    <template slot-scope="scope">
-                        <div v-html="scope.row.questionStem"></div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="试题类型" width="100" align="center"></el-table-column>
-            </el-table>
-            <div class="pagination">
-                <el-pagination
-                    background
-                    @current-change="handleGlobalCurrentChange"
-                    :current-page="pageGlobal"
-                    :page-size="pageSizeGlobal"
-                    layout="total,prev, pager, next"
-                    :total="totalGlobal"
-                ></el-pagination>
-            </div>
-
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="cancelShareVisible = false">取消</el-button>
-                <el-button type="primary" @click="cancelShareSubmit">确定</el-button>
-            </span>
-        </el-dialog>
     </div>
 </template>
 <script>
@@ -334,10 +288,7 @@ export default {
                 type: 'info'
             })
             .then(() => {
-                let data = {
-                    ids: [row.id]
-                }
-                this.$post(this.api.cancelByMySharing,data).then(res => {
+                this.$post(`${this.api.cancelByMySharing}?ids=${row.id}`).then(res => {
                     this.$message.success('取消共享成功');
                     this.getData()
                 }).catch(res => {});
@@ -364,13 +315,15 @@ export default {
                     }
                     this.$post(this.api.batchSave,data).then(res => {
                         this.multipleSelection = [];
-                        this.$message.success('共享成功');
+                        this.$message.success('共享成功')
                         this.getData()
-                    }).catch(res => {});
+                    }).catch(res => {
+                        this.getData()
+                    })
                 })
                 .catch(() => {});
             }else{
-                this.$message.error('请先选择数据！');
+                this.$message.error('请先选择数据')
             }
         },
         cancelShareBatch() {
diff --git a/src/pages/quesBank/list/quesDialog.vue b/src/pages/quesBank/list/quesDialog.vue
index 83f8e23..053d719 100644
--- a/src/pages/quesBank/list/quesDialog.vue
+++ b/src/pages/quesBank/list/quesDialog.vue
@@ -170,11 +170,6 @@ export default {
     mounted() {
         this.getQuesBank()
     },
-    // watch: {
-    //     visible(val){
-    //         this.toTop()
-    //     }
-    // },
     methods: {
         getData(id) {
             this.$post(`${this.api.findById}?id=${id}`)
diff --git a/src/setting.js b/src/setting.js
index a5fe4c2..5db671b 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -16,7 +16,7 @@ const Setting = {
     showProgressBar: true,
     // 接口请求地址
     // apiBaseURL: env === 'development' ? 'http://192.168.31.152:8001' : 'http://39.108.250.202:8000',
-    apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000' : 'http://39.108.250.202:9000',
+    apiBaseURL: env === 'development' ? 'http://192.168.31.152:8001' : 'http://39.108.250.202:9000',
     // 接口请求返回错误时，弹窗的持续时间，单位：秒
     modalDuration: 3,
     // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice