Merge remote-tracking branch 'origin/master'

src/modules/basic/view/privilege_tree.vue

@@ -1,245 +1,251 @@
 <template>
-  <section class="content">
-    <div class="box box-info">
-      <div class="box-body">
-        <!-- 权限树 -->
-        <div style="width: 80%;">
-          <el-tree
-            :data="treeData"
-            :props="defaultProps"
-            node-key="id"
-            ref="tree"
-            highlight-current
-            :default-expanded-keys="[-1]"
-            :expand-on-click-node="false"
-            :render-content="renderContent"
-          />
-        </div>
+  <div>
+    <LinkTitlesCustom :currentPaths="['鉴权管理', '权限组列表', '权限配置']" />
+
+    <section class="content">
+      <div class="box box-info">
+        <div class="box-body">
+          <!-- 权限树 -->
+          <div style="width: 80%;">
+            <el-tree
+              :data="treeData"
+              :props="defaultProps"
+              node-key="id"
+              ref="tree"
+              highlight-current
+              :default-expanded-keys="[-1]"
+              :expand-on-click-node="false"
+              :render-content="renderContent"
+              style="padding: 10px"
+            />
+          </div>
 
-        <!-- 新增权限 -->
-        <el-dialog title="新增权限" :visible.sync="addingDialog.show">
-          <el-form
-            :model="addingDialog.privilege"
-            ref="addingForm"
-            label-width="100px"
-            :rules="rules"
-          >
-            <el-form-item label="父权限名称" prop="parentName">
-              <el-col>
-                <el-input
-                  v-model="addingDialog.parentName"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="权限名称" prop="name">
-              <el-col>
-                <el-input v-model="addingDialog.privilege.name"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="权限编码" prop="code">
-              <el-col>
-                <el-input v-model="addingDialog.privilege.code"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="描述" prop="description">
-              <el-col>
-                <el-input
-                  v-model="addingDialog.privilege.description"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="权重" prop="weight">
-              <el-col>
-                <el-input v-model="addingDialog.privilege.weight"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性1">
-              <el-col>
-                <el-input v-model="addingDialog.privilege.ext1"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性2">
-              <el-col>
-                <el-input v-model="addingDialog.privilege.ext2"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性3">
-              <el-col>
-                <el-input v-model="addingDialog.privilege.ext3"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性4">
-              <el-col>
-                <el-input v-model="addingDialog.privilege.ext4"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性5">
-              <el-col>
-                <el-input v-model="addingDialog.privilege.ext5"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="addPrivilege">确定</el-button>
-              <el-button @click="addingDialog.show = false">取消</el-button>
-            </el-form-item>
-          </el-form>
-        </el-dialog>
+          <!-- 新增权限 -->
+          <el-dialog title="新增权限" :visible.sync="addingDialog.show">
+            <el-form
+              :model="addingDialog.privilege"
+              ref="addingForm"
+              label-width="100px"
+              :rules="rules"
+            >
+              <el-form-item label="父权限名称" prop="parentName">
+                <el-col>
+                  <el-input
+                    v-model="addingDialog.parentName"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="权限名称" prop="name">
+                <el-col>
+                  <el-input v-model="addingDialog.privilege.name"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="权限编码" prop="code">
+                <el-col>
+                  <el-input v-model="addingDialog.privilege.code"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="描述" prop="description">
+                <el-col>
+                  <el-input
+                    v-model="addingDialog.privilege.description"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="权重" prop="weight">
+                <el-col>
+                  <el-input v-model="addingDialog.privilege.weight"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性1">
+                <el-col>
+                  <el-input v-model="addingDialog.privilege.ext1"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性2">
+                <el-col>
+                  <el-input v-model="addingDialog.privilege.ext2"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性3">
+                <el-col>
+                  <el-input v-model="addingDialog.privilege.ext3"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性4">
+                <el-col>
+                  <el-input v-model="addingDialog.privilege.ext4"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性5">
+                <el-col>
+                  <el-input v-model="addingDialog.privilege.ext5"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="addPrivilege">确定</el-button>
+                <el-button @click="addingDialog.show = false">取消</el-button>
+              </el-form-item>
+            </el-form>
+          </el-dialog>
 
-        <!-- 修改权限 -->
-        <el-dialog title="修改权限" :visible.sync="updateDialog.show">
-          <el-form
-            :model="updateDialog.privilege"
-            ref="updateForm"
-            label-width="100px"
-            :rules="rules"
-          >
-            <el-form-item label="权限名称" prop="name">
-              <el-col>
-                <el-input v-model="updateDialog.privilege.name"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="权限编码" prop="code">
-              <el-col>
-                <el-input
-                  v-model="updateDialog.privilege.code"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="描述" prop="description">
-              <el-col>
-                <el-input
-                  v-model="updateDialog.privilege.description"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="权重" prop="weight">
-              <el-col>
-                <el-input v-model="updateDialog.privilege.weight"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性1">
-              <el-col>
-                <el-input v-model="updateDialog.privilege.ext1"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性2">
-              <el-col>
-                <el-input v-model="updateDialog.privilege.ext2"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性3">
-              <el-col>
-                <el-input v-model="updateDialog.privilege.ext3"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性4">
-              <el-col>
-                <el-input v-model="updateDialog.privilege.ext4"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性5">
-              <el-col>
-                <el-input v-model="updateDialog.privilege.ext5"></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="updatePrivilege"
-                >确定</el-button
-              >
-              <el-button @click="updateDialog.show = false">取消</el-button>
-            </el-form-item>
-          </el-form>
-        </el-dialog>
+          <!-- 修改权限 -->
+          <el-dialog title="修改权限" :visible.sync="updateDialog.show">
+            <el-form
+              :model="updateDialog.privilege"
+              ref="updateForm"
+              label-width="100px"
+              :rules="rules"
+            >
+              <el-form-item label="权限名称" prop="name">
+                <el-col>
+                  <el-input v-model="updateDialog.privilege.name"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="权限编码" prop="code">
+                <el-col>
+                  <el-input
+                    v-model="updateDialog.privilege.code"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="描述" prop="description">
+                <el-col>
+                  <el-input
+                    v-model="updateDialog.privilege.description"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="权重" prop="weight">
+                <el-col>
+                  <el-input v-model="updateDialog.privilege.weight"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性1">
+                <el-col>
+                  <el-input v-model="updateDialog.privilege.ext1"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性2">
+                <el-col>
+                  <el-input v-model="updateDialog.privilege.ext2"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性3">
+                <el-col>
+                  <el-input v-model="updateDialog.privilege.ext3"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性4">
+                <el-col>
+                  <el-input v-model="updateDialog.privilege.ext4"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性5">
+                <el-col>
+                  <el-input v-model="updateDialog.privilege.ext5"></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="updatePrivilege"
+                  >确定</el-button
+                >
+                <el-button @click="updateDialog.show = false">取消</el-button>
+              </el-form-item>
+            </el-form>
+          </el-dialog>
 
-        <!-- 查看权限 -->
-        <el-dialog title="查看权限" :visible.sync="showDialog.show">
-          <el-form :model="showDialog.privilege" label-width="100px">
-            <el-form-item label="权限名称">
-              <el-col>
-                <el-input
-                  v-model="showDialog.privilege.name"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="权限编码">
-              <el-col>
-                <el-input
-                  v-model="showDialog.privilege.code"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="描述">
-              <el-col>
-                <el-input
-                  v-model="showDialog.privilege.description"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="权重">
-              <el-col>
-                <el-input
-                  v-model="showDialog.privilege.weight"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性1">
-              <el-col>
-                <el-input
-                  v-model="showDialog.privilege.ext1"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性2">
-              <el-col>
-                <el-input
-                  v-model="showDialog.privilege.ext2"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性3">
-              <el-col>
-                <el-input
-                  v-model="showDialog.privilege.ext3"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性4">
-              <el-col>
-                <el-input
-                  v-model="showDialog.privilege.ext4"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item label="属性5">
-              <el-col>
-                <el-input
-                  v-model="showDialog.privilege.ext5"
-                  :readonly="true"
-                ></el-input>
-              </el-col>
-            </el-form-item>
-            <el-form-item>
-              <el-button @click="showDialog.show = false">关闭</el-button>
-            </el-form-item>
-          </el-form>
-        </el-dialog>
+          <!-- 查看权限 -->
+          <el-dialog title="查看权限" :visible.sync="showDialog.show">
+            <el-form :model="showDialog.privilege" label-width="100px">
+              <el-form-item label="权限名称">
+                <el-col>
+                  <el-input
+                    v-model="showDialog.privilege.name"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="权限编码">
+                <el-col>
+                  <el-input
+                    v-model="showDialog.privilege.code"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="描述">
+                <el-col>
+                  <el-input
+                    v-model="showDialog.privilege.description"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="权重">
+                <el-col>
+                  <el-input
+                    v-model="showDialog.privilege.weight"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性1">
+                <el-col>
+                  <el-input
+                    v-model="showDialog.privilege.ext1"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性2">
+                <el-col>
+                  <el-input
+                    v-model="showDialog.privilege.ext2"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性3">
+                <el-col>
+                  <el-input
+                    v-model="showDialog.privilege.ext3"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性4">
+                <el-col>
+                  <el-input
+                    v-model="showDialog.privilege.ext4"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="属性5">
+                <el-col>
+                  <el-input
+                    v-model="showDialog.privilege.ext5"
+                    :readonly="true"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item>
+                <el-button @click="showDialog.show = false">关闭</el-button>
+              </el-form-item>
+            </el-form>
+          </el-dialog>
+        </div>
       </div>
-    </div>
-  </section>
+    </section>
+  </div>
 </template>
 
 <script type="text/jsx">
 import { CORE_API } from "@/constants/constants.js";
+import LinkTitlesCustom from '../../../components/LinkTitlesCustom'
 
 let checkWeight = (rule, value, callback) => {
     if (('0' != value) && (!value)) {
@@ -534,6 +540,9 @@ export default {
     created() {
         this.privilegeGroupId = this.$route.params.privilegeGroupId;
         this.initTree();
+    },
+    components: {
+      LinkTitlesCustom
     }
 };
 </script>

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

@@ -26,6 +26,7 @@
       background-color="#222c32"
       text-color="#fff"
       active-text-color="#409eff"
+      router
       :default-active="$route.path"
       :collapse="isCollapse"
     >

src/modules/print/routes/routes.js

@@ -18,22 +18,27 @@ export default [
       },
       {
         path: "/print/project/list" /* 项目列表 */,
+        meta: { privilegeCodes: "print_project_list" },
         component: Project
       },
       {
         path: "/print/project/statistic/:orgId/:examId" /* 项目统计 */,
+        meta: { privilegeCodes: "print_project_statistic" },
         component: ProjectStatistic
       },
       {
         path: "/print/course/statistic" /* 课程统计 */,
+        meta: { privilegeCodes: "print_course_statistic" },
         component: CourseStatistic
       },
       {
         path: "/print/project/template" /* 模板页面 */,
+        meta: { privilegeCodes: "print_project_template" },
         component: ProjectTemplate
       },
       {
         path: "/print/exam/structure" /* 考试结构 */,
+        meta: { privilegeCodes: "print_exam_structure" },
         component: ExamStructure
       }
     ]