8712b1bd by 任超

style:菜单

1 parent c961dd90
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-24 17:24:52 4 * @LastEditTime: 2023-03-24 17:28:37
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import router from "./router"; 7 import router from "./router";
...@@ -33,7 +33,6 @@ router.beforeEach(async (to, from, next) => { ...@@ -33,7 +33,6 @@ router.beforeEach(async (to, from, next) => {
33 if (!hasUser) { 33 if (!hasUser) {
34 store.dispatch("user/getUserInfo"); 34 store.dispatch("user/getUserInfo");
35 } 35 }
36 debugger
37 if (hasAddRoute) { 36 if (hasAddRoute) {
38 next(); 37 next();
39 } else { 38 } else {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <!-- 表单部分 --> 3 <!-- 表单部分 -->
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form @submit.native.prevent :model="ruleForm" label-width="120px"> 5 <el-form @submit.native.prevent :model="ruleForm" label-width="120px">
6 <el-form-item> 6 <el-form-item v-if="BASE_API.THEME == 'jg'">
7 <Breadcrumb /> 7 <Breadcrumb />
8 </el-form-item> 8 </el-form-item>
9 <el-row :gutter="20"> 9 <el-row :gutter="20">
......
1 <!-- 1 <!--
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-09 20:54:28 3 * @Date: 2023-03-09 20:54:28
4 * @LastEditors: xiaomiao 1158771342@qq.com 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-16 19:40:40 5 * @LastEditTime: 2023-03-27 09:13:22
6 * @FilePath: \上报\bdcjg-web\src\views\system\information\index.vue 6 * @FilePath: \上报\bdcjg-web\src\views\system\information\index.vue
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE 7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 --> 8 -->
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <div class="information from-clues"> 10 <div class="information from-clues">
11 <div class="from-clues-header"> 11 <div class="from-clues-header">
12 <el-form ref="ruleForm" label-width="100px"> 12 <el-form ref="ruleForm" label-width="100px">
13 <el-form-item> 13 <el-form-item v-if="BASE_API.THEME == 'jg'">
14 <Breadcrumb /> 14 <Breadcrumb />
15 </el-form-item> 15 </el-form-item>
16 <el-row class="mb-5"> 16 <el-row class="mb-5">
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
34 </div> 34 </div>
35 </template> 35 </template>
36 <script> 36 <script>
37 import "@/utils/flexible.js"; 37 import "@/utils/flexible.js";
38 import BaseSet from "./base-set.vue"; 38 import BaseSet from "./base-set.vue";
39 import PasswordEdit from "./password-edit.vue"; 39 import PasswordEdit from "./password-edit.vue";
40 export default { 40 export default {
41 components: { 41 components: {
42 BaseSet, 42 BaseSet,
43 PasswordEdit, 43 PasswordEdit,
...@@ -63,14 +63,16 @@ ...@@ -63,14 +63,16 @@
63 this.isshow = false; 63 this.isshow = false;
64 }, 64 },
65 }, 65 },
66 }; 66 };
67 </script> 67 </script>
68 68
69 <style scoped lang="scss"> 69 <style scoped lang="scss">
70 @import "~@/styles/mixin.scss"; 70 @import "~@/styles/mixin.scss";
71 .information { 71
72 .information {
72 display: flex; 73 display: flex;
73 flex-direction: column; 74 flex-direction: column;
75
74 .btnColRight { 76 .btnColRight {
75 margin-top: 10px; 77 margin-top: 10px;
76 display: flex; 78 display: flex;
...@@ -78,16 +80,18 @@ ...@@ -78,16 +80,18 @@
78 // background-color: cadetblue; 80 // background-color: cadetblue;
79 height: 30px; 81 height: 30px;
80 } 82 }
83
81 /deep/.content { 84 /deep/.content {
82 .el-input__inner { 85 .el-input__inner {
83 background: none; 86 background: none;
84 } 87 }
88
85 .user-info { 89 .user-info {
86 background: none; 90 background: none;
87 } 91 }
88 } 92 }
93
89 .boxin { 94 .boxin {
90 flex: 1; 95 flex: 1;
91 } 96 }
92 } 97 }</style>
93 </style>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="timedTask from-clues"> 2 <div class="timedTask from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="ruleForm" :model="form" label-width="100px"> 4 <el-form ref="ruleForm" :model="form" label-width="100px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME == 'jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="timedTask from-clues"> 2 <div class="timedTask from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="ruleForm" :model="form" label-width="100px"> 4 <el-form ref="ruleForm" :model="form" label-width="100px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME == 'jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="timedTask from-clues"> 2 <div class="timedTask from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="80px"> 4 <el-form ref="form" :model="form" label-width="80px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME == 'jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="timedTask from-clues"> 2 <div class="timedTask from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="ruleForm" :model="form" label-width="100px"> 4 <el-form ref="ruleForm" :model="form" label-width="100px">
5 <el-form-item> 5 <el-form-item v-if="BASE_API.THEME == 'jg'">
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mt-10"> 8 <el-row class="mt-10">
...@@ -38,24 +38,24 @@ ...@@ -38,24 +38,24 @@
38 </div> 38 </div>
39 </template> 39 </template>
40 <script> 40 <script>
41 import { 41 import {
42 getUuid, 42 getUuid,
43 judgeSort, 43 judgeSort,
44 realMove, 44 realMove,
45 findParents, 45 findParents,
46 removeTreeListItem, 46 removeTreeListItem,
47 } from "@/utils/operation"; 47 } from "@/utils/operation";
48 import { 48 import {
49 resetPassword, 49 resetPassword,
50 getUserList, getUserLists 50 getUserList, getUserLists
51 } from "@/api/personnelManage"; 51 } from "@/api/personnelManage";
52 import { api, deleteAction, getAction } from '@/api/manageApi' 52 import { api, deleteAction, getAction } from '@/api/manageApi'
53 import data from "./data"; 53 import data from "./data";
54 import { deleteDomStr } from '@/utils/proDomStr' 54 import { deleteDomStr } from '@/utils/proDomStr'
55 import tableMixin from "@/mixins/tableMixin.js"; 55 import tableMixin from "@/mixins/tableMixin.js";
56 import EditDialog from "./edit-dialog.vue"; 56 import EditDialog from "./edit-dialog.vue";
57 import { updateOrder } from "@/api/orders" 57 import { updateOrder } from "@/api/orders"
58 export default { 58 export default {
59 name: "menus", 59 name: "menus",
60 mixins: [tableMixin], 60 mixins: [tableMixin],
61 components: { 61 components: {
...@@ -405,21 +405,22 @@ ...@@ -405,21 +405,22 @@
405 this.getTableList() 405 this.getTableList()
406 }, 406 },
407 }, 407 },
408 }; 408 };
409 </script> 409 </script>
410 <style scoped lang="scss"> 410 <style scoped lang="scss">
411 @import "~@/styles/mixin.scss"; 411 @import "~@/styles/mixin.scss";
412 // .btnColRight { 412
413 // height: 30px; 413 // .btnColRight {
414 // .button { 414 // height: 30px;
415 // position: absolute; 415 // .button {
416 // left: 30px; 416 // position: absolute;
417 // } 417 // left: 30px;
418 // } 418 // }
419 /deep/.el-button.is-disabled.el-button--text { 419 // }
420 /deep/.el-button.is-disabled.el-button--text {
420 width: 64px; 421 width: 64px;
421 height: 28px; 422 height: 28px;
422 background: rgba(255, 255, 255, 0.1); 423 background: rgba(255, 255, 255, 0.1);
423 border-radius: 16px; 424 border-radius: 16px;
424 } 425 }
425 </style> 426 </style>
......