fix logics

src/modules/basic/view/campus.vue

@@ -177,6 +177,7 @@
                     <el-button size="small" slot="trigger" type="primary">
                       选择文件
                     </el-button>
+                    &nbsp;
                     <el-button
                       size="small"
                       type="success"

src/modules/basic/view/course.vue

@@ -200,6 +200,7 @@
                     <el-button size="small" slot="trigger" type="primary">
                       选择文件
                     </el-button>
+                    &nbsp;
                     <el-button
                       size="small"
                       type="success"
@@ -385,11 +386,19 @@
             <el-table-column prop="updateTime" label="更新时间" width="170" />
             <el-table-column label="操作">
               <div slot-scope="scope">
-                <el-button size="mini" type="primary" @click="relation(row);">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  @click="relation(scope.row);"
+                >
                   关联专业
                 </el-button>
                 <span>
-                  <el-button size="mini" type="info" @click="editCourse(row);">
+                  <el-button
+                    size="mini"
+                    type="info"
+                    @click="editCourse(scope.row);"
+                  >
                     <i class="el-icon-edit"></i> 修改
                   </el-button>
                 </span>
@@ -397,7 +406,7 @@
                   <el-button
                     size="mini"
                     type="success"
-                    @click="enableById(row);"
+                    @click="enableById(scope.row);"
                   >
                     <i class="fa fa-check" aria-hidden="true"></i>启用
                   </el-button>
@@ -406,7 +415,7 @@
                   <el-button
                     size="mini"
                     type="warning"
-                    @click="disableById(row);"
+                    @click="disableById(scope.row);"
                   >
                     <i class="fa fa-close" aria-hidden="true"></i>禁用
                   </el-button>

src/modules/basic/view/privilege_group_list.vue

@@ -53,7 +53,7 @@ export default {
       this.privilegeGroupList = response.data;
     },
     editPrivilege(row) {
-      this.$router.replace({ path: "/index/privilege_tree/" + row.id });
+      this.$router.push({ path: "/basic/privilege_tree/" + row.id });
     }
   },
   created() {

src/modules/basic/view/privilege_tree.vue

@@ -4,7 +4,7 @@
       <div class="box box-info">
         <div class="box-body">
           <!-- 权限树 -->
-          <div style="width: 50%;">
+          <div style="width: 80%;">
             <el-tree
               :data="treeData"
               :props="defaultProps"
@@ -532,14 +532,16 @@ export default {
         renderContent(h, {node, data, store}) {
             if (-1 == data.id) {
                 return (
-                    <span>
+                  <div>
                     <span>
                         <span>{node.label}</span>
                     </span>
-                    <span style="float: right; margin-right: 65px">
-                        <el-button size="mini" on-click={() => this.openAddingDialog(store, data)}>追加</el-button>
+                    <span style="float: right; margin-left: 20px; margin-right: 65px">
+                        <el-button type="primary" size="mini" on-click={() => this.openAddingDialog(store, data)}>追加</el-button>
                     </span>
-                </span>
+                    <br/>
+                    <br/>
+                  </div>
                 )
             }
             return (
@@ -547,11 +549,11 @@ export default {
                     <span>
                         <span>{node.label}</span>
                     </span>
-                    <span style="float: right; margin-right: 20px">
-                          <el-button size="mini" on-click={() => this.openShowDialog(store, data)}>查看</el-button>
-                          <el-button size="mini" on-click={() => this.openUpdateDialog(store, data)}>修改</el-button>
-                          <el-button size="mini" on-click={() => this.openAddingDialog(store, data)}>追加</el-button>
-                          <el-button size="mini" on-click={() => this.remove(store, data)}>删除</el-button>
+                    <span style="float: right; margin-left: 20px; margin-right: 20px">
+                          <el-button size="mini" type="text" on-click={() => this.openShowDialog(store, data)}>查看</el-button>
+                          <el-button size="mini" type="text" on-click={() => this.openUpdateDialog(store, data)}>修改</el-button>
+                          <el-button size="mini" type="text" on-click={() => this.openAddingDialog(store, data)}>追加</el-button>
+                          <el-button size="mini" type="text" on-click={() => this.remove(store, data)}>删除</el-button>
                     </span>
                 </span>
             );

src/modules/basic/view/role_privilege_settings.vue

@@ -61,12 +61,7 @@
           </el-form>
 
           <div style="margin-bottom:10px;margin-left: 50px;">
-            <el-button
-              :plain="true"
-              type="success"
-              :disabled="!treeChanged"
-              @click="save"
-            >
+            <el-button type="primary" :disabled="!treeChanged" @click="save">
               保 存
             </el-button>
           </div>
@@ -227,11 +222,11 @@ export default {
     },
     treeChange(node, checked) {
       console.log("[tree change] node:", node);
-      if (checked && !this.checkedKeys.contains(node.id)) {
+      if (checked && !this.checkedKeys.includes(node.id)) {
         this.checkedKeys.push(node.id);
       }
-      if (!checked && this.checkedKeys.contains(node.id)) {
-        this.checkedKeys.remove(node.id);
+      if (!checked && this.checkedKeys.includes(node.id)) {
+        this.checkedKeys = this.checkedKeys.filter(v => v != node.id);
       }
 
       var checkChildren = this.uncheckChildren_nodeId != node.id;

src/modules/basic/view/specially.vue

@@ -114,7 +114,7 @@
           </el-dialog>
 
           <!-- 关联课程弹出框 -->
-          <el-dialog :title="courseDialogTitle" v-model="courseDialog">
+          <el-dialog :title="courseDialogTitle" :visible.sync="courseDialog">
             <!-- 表单 -->
             <el-form
               :inline="true"
@@ -194,7 +194,7 @@
           </el-dialog>
 
           <!-- 添加关联 -->
-          <el-dialog title="添加关联课程" v-model="addRelationDialog">
+          <el-dialog title="添加关联课程" :visible.sync="addRelationDialog">
             <el-form
               :inline="true"
               :model="addRelationForm"

src/modules/portal/views/home/HomeMain.vue

@@ -60,8 +60,10 @@ export default {
   flex-direction: row;
   flex-wrap: wrap;
   justify-content: center;
+  align-items: center;
+  justify-items: center;
 
-  height: 100%;
+  /* height: 100%; */
 }
 
 .module-card {