Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
d85cf35a by xiaomiao
Options

运维中心菜单样式调整

1 parent 94ebb381
Inline Side-by-side
Showing 13 changed files with 301 additions and 173 deletions
...@@ -360,7 +360,27 @@ aside { ...@@ -360,7 +360,27 @@ aside {
360 border-radius: 16px; 360 border-radius: 16px;
361 color: #0097FF; 361 color: #0097FF;
362 } 362 }
363 363 .configurationbtnColor {
364 width: 64px;
365 height: 28px;
366 background: rgba(255, 255, 255, 0.1);
367 border-radius: 16px;
368 color: #04c0a7;
369 }
370 .resetbtnColor {
371 width: 64px;
372 height: 28px;
373 background: rgba(255, 255, 255, 0.1);
374 border-radius: 16px;
375 color: #04c0a7;
376 }
377 .movebtnColor {
378 width: 64px;
379 height: 28px;
380 background: rgba(255, 255, 255, 0.1);
381 border-radius: 16px;
382 color: #0097FF;
383 }
364 .successColor:hover { 384 .successColor:hover {
365 width: 64px; 385 width: 64px;
366 height: 28px; 386 height: 28px;
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
40 mounted () { 40 mounted () {
41 this.getdjywltotal(); 41 this.getdjywltotal();
42 window.addEventListener("resize", () => { 42 window.addEventListener("resize", () => {
43 this.cdata.seriesData = [];
44 this.getdjywltotal(); 43 this.getdjywltotal();
45 }); 44 });
46 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动 45 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 </el-form-item> 35 </el-form-item>
36 </el-form> 36 </el-form>
37 <div class="bottom-wrapper"> 37 <div class="bottom-wrapper">
38 <el-button type="primary" @click="updateInfo">更新信息</el-button> 38 <btn nativeType="cx" type="primary" @click="updateInfo">更新信息</btn>
39 </div> 39 </div>
40 </div> 40 </div>
41 </div> 41 </div>
......
1 <!-- 1 <!--
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-08 15:30:43 3 * @Date: 2023-03-09 20:54:28
4 * @LastEditors: yangwei 4 * @LastEditors: xiaomiao 1158771342@qq.com
5 * @LastEditTime: 2023-03-13 17:19:46 5 * @LastEditTime: 2023-03-15 15:45:01
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 -->
9 <template> 9 <template>
...@@ -14,19 +14,13 @@ ...@@ -14,19 +14,13 @@
14 <Breadcrumb /> 14 <Breadcrumb />
15 </el-form-item> 15 </el-form-item>
16 <el-row class="mb-5"> 16 <el-row class="mb-5">
17 <el-col :span="3" class="btnColRight"> 17 <el-col :span="4" class="btnColRight">
18 <!-- <btn nativeType="cx" @click="information" 18 <btn nativeType="cx" type="primary" @click="information">
19 >基本信息</btn
20 >
21 <btn nativeType="cx" :class="isshow ? '' : ''" @click="password"
22 >修改密码</btn
23 > -->
24 <button @click="information" :class="isshow ? 'button choosed' : 'button'">
25 基本信息 19 基本信息
26 </button> 20 </btn>
27 <button @click="password" :class="isshow ? 'button' : 'button choosed'"> 21 <btn nativeType="cz" @click="password">
28 修改密码 22 修改密码
29 </button> 23 </btn>
30 </el-col> 24 </el-col>
31 </el-row> 25 </el-row>
32 </el-form> 26 </el-form>
...@@ -40,57 +34,56 @@ ...@@ -40,57 +34,56 @@
40 </div> 34 </div>
41 </template> 35 </template>
42 <script> 36 <script>
43 import "@/utils/flexible.js"; 37 import "@/utils/flexible.js";
44 import BaseSet from "./base-set.vue"; 38 import BaseSet from "./base-set.vue";
45 import PasswordEdit from "./password-edit.vue"; 39 import PasswordEdit from "./password-edit.vue";
46 export default { 40 export default {
47 components: { 41 components: {
48 BaseSet, 42 BaseSet,
49 PasswordEdit, 43 PasswordEdit,
50 }, 44 },
51 data() { 45 data () {
52 return { 46 return {
53 isshow: true, 47 isshow: true,
54 }; 48 };
55 }, 49 },
56 computed: { 50 computed: {
57 userData() { 51 userData () {
58 return this.$store.state.user.userInfo; 52 return this.$store.state.user.userInfo;
59 }, 53 },
60 }, 54 },
61 watch: {}, 55 watch: {},
62 created() {}, 56 created () { },
63 mounted() {}, 57 mounted () { },
64 methods: { 58 methods: {
65 information() { 59 information () {
66 this.isshow = true; 60 this.isshow = true;
67 }, 61 },
68 password() { 62 password () {
69 this.isshow = false; 63 this.isshow = false;
70 }, 64 },
71 }, 65 },
72 }; 66 };
73 </script> 67 </script>
74 68
75 <style scoped lang="scss"> 69 <style scoped lang="scss">
76 @import "~@/styles/mixin.scss"; 70 @import "~@/styles/mixin.scss";
77 @import "~@/styles/public.scss"; 71 @import "~@/styles/public.scss";
78 .information { 72 .information {
79 display: flex; 73 display: flex;
80 flex-direction: column; 74 flex-direction: column;
81 .btnColRight { 75 .btnColRight {
82 .button { 76 // background-color: cadetblue;
83 width: 76px; 77 height: 60px;
84 height: 32px; 78 .button:nth-child(1) {
85 color: #ffffff; 79 position: absolute;
86 margin: 0 5px; 80 left: 30px;
87 cursor: pointer; 81 top: 20px;
88 border: 0;
89 background: url('../../../image/btn.png') no-repeat 0 0;
90 background-size: cover;
91 } 82 }
92 .choosed{ 83 .button:nth-child(2) {
93 background: url('../../../image/btn.png') no-repeat 0 -34px; 84 position: absolute;
85 top: 20px;
86 left: 120px;
94 } 87 }
95 } 88 }
96 /deep/.content { 89 /deep/.content {
...@@ -104,5 +97,5 @@ export default { ...@@ -104,5 +97,5 @@ export default {
104 .boxin { 97 .boxin {
105 flex: 1; 98 flex: 1;
106 } 99 }
107 } 100 }
108 </style> 101 </style>
......
...@@ -6,50 +6,46 @@ ...@@ -6,50 +6,46 @@
6 label-width="100px" 6 label-width="100px"
7 :model="form" 7 :model="form"
8 class="form-wrapper" 8 class="form-wrapper"
9 :rules="rules" 9 :rules="rules">
10 >
11 <el-form-item label="旧密码:" prop="oldPassword"> 10 <el-form-item label="旧密码:" prop="oldPassword">
12 <el-input 11 <el-input
13 v-model="form.oldPassword" 12 v-model="form.oldPassword"
14 clearable 13 clearable
15 type="password" 14 type="password"
16 show-password 15 show-password />
17 />
18 </el-form-item> 16 </el-form-item>
19 <el-form-item label="新密码:" prop="newPassword"> 17 <el-form-item label="新密码:" prop="newPassword">
20 <el-input 18 <el-input
21 v-model="form.newPassword" 19 v-model="form.newPassword"
22 clearable 20 clearable
23 type="password" 21 type="password"
24 show-password 22 show-password />
25 />
26 </el-form-item> 23 </el-form-item>
27 <el-form-item label="确认密码:" prop="confirmPassword"> 24 <el-form-item label="确认密码:" prop="confirmPassword">
28 <el-input 25 <el-input
29 v-model="form.confirmPassword" 26 v-model="form.confirmPassword"
30 clearable 27 clearable
31 type="password" 28 type="password"
32 show-password 29 show-password />
33 />
34 </el-form-item> 30 </el-form-item>
35 </el-form> 31 </el-form>
36 <div class="bottom-wrapper"> 32 <div class="bottom-wrapper">
37 <el-button type="primary" @click="updatePassword">确认修改</el-button> 33 <btn nativeType="cx" type="primary" @click="updatePassword">确认修改</btn>
38 </div> 34 </div>
39 </div> 35 </div>
40 </div> 36 </div>
41 </template> 37 </template>
42 38
43 <script> 39 <script>
44 import { updateUserPassword } from "@/api/personnelManage"; 40 import { updateUserPassword } from "@/api/personnelManage";
45 export default { 41 export default {
46 props: { 42 props: {
47 userInfo: { 43 userInfo: {
48 type: Object, 44 type: Object,
49 default: null, 45 default: null,
50 }, 46 },
51 }, 47 },
52 data() { 48 data () {
53 return { 49 return {
54 form: {}, 50 form: {},
55 sexList: [], 51 sexList: [],
...@@ -78,16 +74,16 @@ export default { ...@@ -78,16 +74,16 @@ export default {
78 }, 74 },
79 }, 75 },
80 }, 76 },
81 mounted() { 77 mounted () {
82 if (this.userInfo) { 78 if (this.userInfo) {
83 this.getid(this.userInfo); 79 this.getid(this.userInfo);
84 } 80 }
85 }, 81 },
86 methods: { 82 methods: {
87 getid(val) { 83 getid (val) {
88 this.userId = val.id; 84 this.userId = val.id;
89 }, 85 },
90 validatorConfirmPassword(rule, value, callback) { 86 validatorConfirmPassword (rule, value, callback) {
91 const { newPassword } = this.form; 87 const { newPassword } = this.form;
92 if (value !== newPassword) { 88 if (value !== newPassword) {
93 callback("两次输入密码不一致"); 89 callback("两次输入密码不一致");
...@@ -95,7 +91,7 @@ export default { ...@@ -95,7 +91,7 @@ export default {
95 callback(); 91 callback();
96 } 92 }
97 }, 93 },
98 updatePassword() { 94 updatePassword () {
99 this.$refs.form.validate((valid) => { 95 this.$refs.form.validate((valid) => {
100 if (valid) { 96 if (valid) {
101 const params = Object.assign({}, this.form, { id: this.userId }); 97 const params = Object.assign({}, this.form, { id: this.userId });
...@@ -110,11 +106,11 @@ export default { ...@@ -110,11 +106,11 @@ export default {
110 }); 106 });
111 }, 107 },
112 }, 108 },
113 }; 109 };
114 </script> 110 </script>
115 111
116 <style scoped lang="scss"> 112 <style scoped lang="scss">
117 .user-info { 113 .user-info {
118 margin: 36px 200px; 114 margin: 36px 200px;
119 overflow-y: auto; 115 overflow-y: auto;
120 .form-wrapper { 116 .form-wrapper {
...@@ -136,5 +132,5 @@ export default { ...@@ -136,5 +132,5 @@ export default {
136 padding: 32px 120px 24px; 132 padding: 32px 120px 24px;
137 text-align: center; 133 text-align: center;
138 } 134 }
139 } 135 }
140 </style> 136 </style>
......
1 <template> 1 <template>
2 <dialogBox class="modifydialog" :isMain="true" :title="2222" @closeDialog="close" @submitForm="submitForm" 2 <dialogBox class="modifydialog" :isMain="true" width="40%" :title="title" @closeDialog="close" @submitForm="submitForm"
3 v-model="myValue"> 3 v-model="myValue">
4 <div class="modifydialog-con"> 4 <div class="modifydialog-con">
5 <el-form ref="form" :model="form" :rules="rules"> 5 <el-form ref="form" :model="form" :rules="rules">
...@@ -19,15 +19,15 @@ ...@@ -19,15 +19,15 @@
19 </el-col> 19 </el-col>
20 20
21 </el-row> 21 </el-row>
22 <el-row :gutter="24"> 22 <el-row :gutter="23">
23 <el-col :span="24"> 23 <el-col :span="23">
24 <el-form-item label="代码:" prop="code" label-width="124px"> 24 <el-form-item label="代码:" prop="code" label-width="124px">
25 <el-input v-model="codeComputed" placeholder="请输入菜单代码" :disabled="type === 1" /> 25 <el-input v-model="codeComputed" placeholder="请输入菜单代码" :disabled="type === 1" />
26 </el-form-item> 26 </el-form-item>
27 </el-col> 27 </el-col>
28 </el-row> 28 </el-row>
29 <el-row :gutter="24"> 29 <el-row :gutter="23">
30 <el-col :span="24"> 30 <el-col :span="23">
31 <el-form-item label="链接路径:" label-width="124px"> 31 <el-form-item label="链接路径:" label-width="124px">
32 <el-input v-model="form.uri" placeholder="请输入链接路径" /> 32 <el-input v-model="form.uri" placeholder="请输入链接路径" />
33 </el-form-item> 33 </el-form-item>
...@@ -56,11 +56,11 @@ ...@@ -56,11 +56,11 @@
56 </template> 56 </template>
57 57
58 <script> 58 <script>
59 import { getParentMenuListAction } from '@/api/authorityManage' 59 import { getParentMenuListAction } from '@/api/authorityManage'
60 import JsonEditor from '@/components/JsonEditors' 60 import JsonEditor from '@/components/JsonEditors'
61 import { validateCode } from '@/utils/validate'; 61 import { validateCode } from '@/utils/validate';
62 import { api, httpAction } from '@/api/manageApi' 62 import { api, httpAction } from '@/api/manageApi'
63 export default { 63 export default {
64 name: 'MenuModal', 64 name: 'MenuModal',
65 components: { 65 components: {
66 JsonEditor, 66 JsonEditor,
...@@ -221,12 +221,32 @@ export default { ...@@ -221,12 +221,32 @@ export default {
221 this.$emit('input', false) 221 this.$emit('input', false)
222 } 222 }
223 } 223 }
224 } 224 }
225 </script> 225 </script>
226 <style scoped lang="scss"> 226 <style scoped lang="scss">
227 .modifydialog { 227 .modifydialog {
228 &-con { 228 &-con {
229 background: #031A46; 229 background: #031a46;
230 }
231 /deep/.el-dialog__header {
232 .dialog_title {
233 display: -webkit-box;
234 display: -ms-flexbox;
235 display: flex;
236 position: relative;
237 top: -8px;
238 width: 28%;
239 height: 40px;
240 margin-left: 28px;
241 -webkit-box-pack: center;
242 -ms-flex-pack: center;
243 justify-content: center;
244 white-space: nowrap;
245 b {
246 font-size: 16px;
247 font-weight: 600;
248 }
249 }
250 }
230 } 251 }
231 }
232 </style> 252 </style>
......
...@@ -13,30 +13,31 @@ ...@@ -13,30 +13,31 @@
13 </el-form> 13 </el-form>
14 </div> 14 </div>
15 <div class="from-clues-content"> 15 <div class="from-clues-content">
16 <lb-table :pagination="false" :column="tableData.columns" :data="tablelistData" row-key="id" default-expand-all 16 <lb-table :pagination="false" :column="tableData.
17 columns" :calcHeight="200"
18 :data="tablelistData" row-key="id" default-expand-all
17 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"> 19 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
18 </lb-table> 20 </lb-table>
19 </div> 21 </div>
20 <edit-dialog ref="dialogForm" v-model="isDialog" :product-id="productId" :resource-category-id="resourceCategoryId" 22 <edit-dialog ref="dialogForm" v-model="isDialog" :product-id="productId" :resource-category-id="resourceCategoryId"
21 @ok="reloadTableData" /> 23 @ok="reloadTableData" />
22 <!-- <authorizationdiglog ref="rolesForm" /> -->
23 </div> 24 </div>
24 </template> 25 </template>
25 <script> 26 <script>
26 // 定时任务 27 // 定时任务
27 import data from "./data"; 28 import data from "./data";
28 import { deleteAction, getAction, api } from "@/api/manageApi"; 29 import { deleteAction, getAction, api } from "@/api/manageApi";
29 import EditDialog from "./edit-dialog.vue"; 30 import EditDialog from "./edit-dialog.vue";
30 import { mapGetters } from "vuex"; 31 import { mapGetters } from "vuex";
31 import { getMenuInfo } from "@/api/user"; 32 import { getMenuInfo } from "@/api/user";
32 import { 33 import {
33 getUuid, 34 getUuid,
34 judgeSort, 35 judgeSort,
35 realMove, 36 realMove,
36 findParents, 37 findParents,
37 removeTreeListItem, 38 removeTreeListItem,
38 } from "@/utils/operation"; 39 } from "@/utils/operation";
39 export default { 40 export default {
40 name: "menus", 41 name: "menus",
41 components: { 42 components: {
42 EditDialog, 43 EditDialog,
...@@ -128,7 +129,7 @@ export default { ...@@ -128,7 +129,7 @@ export default {
128 conditions: [ 129 conditions: [
129 { 130 {
130 property: "code", 131 property: "code",
131 value: this.products, 132 value: sessionStorage.getItem("products"),
132 operator: "EQ", 133 operator: "EQ",
133 }, 134 },
134 ], 135 ],
...@@ -153,7 +154,7 @@ export default { ...@@ -153,7 +154,7 @@ export default {
153 handleAdd () { 154 handleAdd () {
154 this.isDialog = true 155 this.isDialog = true
155 this.$refs.dialogForm.add(); 156 this.$refs.dialogForm.add();
156 this.$refs.dialogForm.title = "添加"; 157 this.$refs.dialogForm.title = "新增";
157 }, 158 },
158 159
159 // 修改 160 // 修改
...@@ -207,17 +208,21 @@ export default { ...@@ -207,17 +208,21 @@ export default {
207 this.getTableList() 208 this.getTableList()
208 }, 209 },
209 }, 210 },
210 }; 211 };
211 </script> 212 </script>
212 <style scoped lang="scss"> 213 <style scoped lang="scss">
213 @import "~@/styles/mixin.scss"; 214 @import "~@/styles/mixin.scss";
214
215 // @import "~@/styles/public.scss";
216 .btnColRight {
217 margin-top: 20px;
218 }
219 215
220 /deep/.el-table__expand-icon { 216 // @import "~@/styles/public.scss";
217 .btnColRight {
218 height: 60px;
219 .button {
220 position: absolute;
221 left: 30px;
222 top: 20px;
223 }
224 }
225 /deep/.el-table__expand-icon {
221 color: #fff; 226 color: #fff;
222 } 227 }
223 </style> 228 </style>
......
1 <!-- 新增 & 修改角色 --> 1 <!-- 新增 & 修改角色 -->
2 <template> 2 <template>
3 <Dialog 3 <dialogBox
4 class="modifydialog" 4 class="modifydialog"
5 :title="dialogTitle" 5 :title="title"
6 :show.sync="showAddEditDialog" 6 :width="'567px'"
7 :width="'767px'" 7 :isMain="true"
8 @close="handleCloseDialog()"> 8 @closeDialog="close"
9 <template slot="content"> 9 @submitForm="submitForm"
10 v-model="myValue">
11 <div class="dialogCon">
10 <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px"> 12 <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px">
11 <el-row :gutter="24"> 13 <el-row :gutter="24">
12 <el-col :span="15"> 14 <el-col :span="23">
13 <el-form-item label="角色名称:" prop="roleName"> 15 <el-form-item label="角色名称:" prop="roleName">
14 <el-input 16 <el-input
15 v-model="dialogForm.roleName" 17 v-model="dialogForm.roleName"
...@@ -19,18 +21,20 @@ ...@@ -19,18 +21,20 @@
19 </el-col> 21 </el-col>
20 </el-row> 22 </el-row>
21 <el-row> 23 <el-row>
22 <el-col :span="24"> 24 <el-col :span="23">
23 <el-form-item label="备注:" class="form-item-mb0"> 25 <el-form-item label="备注:" class="form-item-mb0">
24 <el-input 26 <el-input
25 v-model="dialogForm.roleTextArea" 27 v-model="dialogForm.roleTextArea"
28 clearable
29 :rows="10"
26 type="textarea" 30 type="textarea"
27 placeholder="备注" /> 31 placeholder="备注" />
28 </el-form-item> 32 </el-form-item>
29 </el-col> 33 </el-col>
30 </el-row> 34 </el-row>
31 </el-form> 35 </el-form>
32 </template> 36 </div>
33 <template slot="footer"> 37 <!-- <template slot="footer">
34 <el-button 38 <el-button
35 class="cancel-button" 39 class="cancel-button"
36 @click="handleCloseDialog">取消</el-button> 40 @click="handleCloseDialog">取消</el-button>
...@@ -38,8 +42,8 @@ ...@@ -38,8 +42,8 @@
38 <el-button 42 <el-button
39 type="primary" 43 type="primary"
40 @click="handleSaveRole()">保存</el-button> 44 @click="handleSaveRole()">保存</el-button>
41 </template> 45 </template> -->
42 </Dialog> 46 </dialogBox>
43 </template> 47 </template>
44 48
45 <script> 49 <script>
...@@ -49,9 +53,13 @@ ...@@ -49,9 +53,13 @@
49 components: { 53 components: {
50 Dialog 54 Dialog
51 }, 55 },
56 props: {
57 value: { type: Boolean, default: false },
58 },
52 data () { 59 data () {
53 return { 60 return {
54 dialogTitle: '', 61 myValue: this.value,
62 title: '',
55 showAddEditDialog: false, 63 showAddEditDialog: false,
56 menuType: '', 64 menuType: '',
57 roleId: '', 65 roleId: '',
...@@ -72,9 +80,14 @@ ...@@ -72,9 +80,14 @@
72 ] 80 ]
73 } 81 }
74 }, 82 },
83 watch: {
84 value (val) {
85 this.myValue = val
86 }
87 },
75 methods: { 88 methods: {
76 // 保存新增或关闭事件 89 // 保存新增或关闭事件
77 handleSaveRole (val) { 90 submitForm () {
78 this.$refs.form.validate((valid) => { 91 this.$refs.form.validate((valid) => {
79 if (valid) { 92 if (valid) {
80 try { 93 try {
...@@ -97,8 +110,8 @@ ...@@ -97,8 +110,8 @@
97 this.dialogForm = { 110 this.dialogForm = {
98 roleName: '', 111 roleName: '',
99 } 112 }
100 this.showAddEditDialog = val 113 // this.showAddEditDialog = val
101 this.$emit('ok', this.menuType) 114 this.$emit('ok')
102 } else { 115 } else {
103 this.$message.error({ 116 this.$message.error({
104 message: res.message, 117 message: res.message,
...@@ -114,10 +127,10 @@ ...@@ -114,10 +127,10 @@
114 message: '新增成功', 127 message: '新增成功',
115 showClose: true 128 showClose: true
116 }) 129 })
117 this.dialogForm = { 130 this.close()
118 roleName: '', 131
119 } 132 this.$emit('ok')
120 this.showAddEditDialog = val 133 // this.showAddEditDialog = val
121 this.$emit('ok', this.menuType) 134 this.$emit('ok', this.menuType)
122 } else { 135 } else {
123 this.$message.error({ 136 this.$message.error({
...@@ -133,16 +146,40 @@ ...@@ -133,16 +146,40 @@
133 } 146 }
134 }) 147 })
135 }, 148 },
136 // 取消事件 149 resetForm () {
137 handleCloseDialog () {
138 this.$refs.form.resetFields()
139 this.dialogForm = { 150 this.dialogForm = {
140 roleName: '', 151 roleName: '',
141 } 152 }
142 this.showAddEditDialog = false 153 this.$refs.form.resetFields()
154 },
155 close () {
156 this.resetForm()
157 this.$emit('input', false)
143 } 158 }
144 } 159 }
145 } 160 }
146 </script> 161 </script>
147 <style scoped lang="scss"> 162 <style scoped lang="scss">
163 .modifydialog {
164 /deep/.el-dialog__header {
165 .dialog_title {
166 display: -webkit-box;
167 display: -ms-flexbox;
168 display: flex;
169 position: relative;
170 top: -8px;
171 width: 24%;
172 height: 40px;
173 margin-left: 28px;
174 -webkit-box-pack: center;
175 -ms-flex-pack: center;
176 justify-content: center;
177 white-space: nowrap;
178 b {
179 font-size: 16px;
180 font-weight: 600;
181 }
182 }
183 }
184 }
148 </style> 185 </style>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" row-key="dictid"> 17 :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" row-key="dictid">
18 </lb-table> 18 </lb-table>
19 </div> 19 </div>
20 <EditDialog ref="addEditDialog" @ok="reloadTableData" /> 20 <EditDialog ref="addEditDialog" v-model="isDialog" @ok="reloadTableData" />
21 <Roleslistdiglog ref="rolesForm" /> 21 <Roleslistdiglog ref="rolesForm" />
22 </div> 22 </div>
23 </template> 23 </template>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 import EditDialog from "./edit-dialog.vue"; 38 import EditDialog from "./edit-dialog.vue";
39 import Roleslistdiglog from "./roleslistdiglog.vue"; 39 import Roleslistdiglog from "./roleslistdiglog.vue";
40 import { mapGetters } from "vuex"; 40 import { mapGetters } from "vuex";
41 import {updateOrder} from "@/api/orders" 41 import { updateOrder } from "@/api/orders"
42 export default { 42 export default {
43 name: "menus", 43 name: "menus",
44 mixins: [tableMixin], 44 mixins: [tableMixin],
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
48 }, 48 },
49 data () { 49 data () {
50 return { 50 return {
51 isDialog: false,
51 personlist: null, 52 personlist: null,
52 waitMemberList: [], 53 waitMemberList: [],
53 keyList: [], 54 keyList: [],
...@@ -108,42 +109,46 @@ ...@@ -108,42 +109,46 @@
108 .concat([ 109 .concat([
109 { 110 {
110 label: "排序", 111 label: "排序",
111 width: 200, 112 width: 300,
112 render: (h, scope) => { 113 render: (h, scope) => {
113 return ( 114 return (
114 <div> 115 <div>
115 <el-button 116 <el-button
116 type="text" 117 type="text"
118 class='movebtnColor'
117 disabled={scope.row.isTop} 119 disabled={scope.row.isTop}
118 onClick={() => { 120 onClick={() => {
119 this.updateOrder(scope.row,'TOP'); 121 this.updateOrder(scope.row, 'TOP');
120 }} 122 }}
121 > 123 >
122 置顶 124 置顶
123 </el-button> 125 </el-button>
124 <el-button 126 <el-button
125 type="text" 127 type="text"
128 class='movebtnColor'
126 disabled={scope.row.isTop} 129 disabled={scope.row.isTop}
127 onClick={() => { 130 onClick={() => {
128 this.updateOrder(scope.row,'UP'); 131 this.updateOrder(scope.row, 'UP');
129 }} 132 }}
130 > 133 >
131 上移 134 上移
132 </el-button> 135 </el-button>
133 <el-button 136 <el-button
134 type="text" 137 type="text"
138 class='movebtnColor'
135 disabled={scope.row.isBottom} 139 disabled={scope.row.isBottom}
136 onClick={() => { 140 onClick={() => {
137 this.updateOrder(scope.row,'DOWN'); 141 this.updateOrder(scope.row, 'DOWN');
138 }} 142 }}
139 > 143 >
140 下移 144 下移
141 </el-button> 145 </el-button>
142 <el-button 146 <el-button
143 type="text" 147 type="text"
148 class='movebtnColor'
144 disabled={scope.row.isBottom} 149 disabled={scope.row.isBottom}
145 onClick={() => { 150 onClick={() => {
146 this.updateOrder(scope.row,'BOTTOM'); 151 this.updateOrder(scope.row, 'BOTTOM');
147 }} 152 }}
148 > 153 >
149 置底 154 置底
...@@ -172,6 +177,7 @@ ...@@ -172,6 +177,7 @@
172 disabled={scope.row.type === "Everyone"} 177 disabled={scope.row.type === "Everyone"}
173 type="text" 178 type="text"
174 size="mini" 179 size="mini"
180 class="configurationbtnColor"
175 icon="el-icon-video-pause" 181 icon="el-icon-video-pause"
176 onClick={() => { 182 onClick={() => {
177 this.getUserList(scope.row); 183 this.getUserList(scope.row);
...@@ -193,6 +199,7 @@ ...@@ -193,6 +199,7 @@
193 disabled={scope.row.category === 1} 199 disabled={scope.row.category === 1}
194 type="text" 200 type="text"
195 size="mini" 201 size="mini"
202 class='successColor'
196 icon="el-icon-edit" 203 icon="el-icon-edit"
197 onClick={() => { 204 onClick={() => {
198 this.handleAddEdit(scope.row); 205 this.handleAddEdit(scope.row);
...@@ -214,6 +221,7 @@ ...@@ -214,6 +221,7 @@
214 type="text" 221 type="text"
215 disabled={scope.row.category === 1} 222 disabled={scope.row.category === 1}
216 size="mini" 223 size="mini"
224 class='delColor'
217 icon="el-icon-delete" 225 icon="el-icon-delete"
218 // style="color:#F56C6C" 226 // style="color:#F56C6C"
219 onClick={() => { 227 onClick={() => {
...@@ -244,7 +252,7 @@ ...@@ -244,7 +252,7 @@
244 methods: { 252 methods: {
245 // 获取角色列表 253 // 获取角色列表
246 getTableData () { 254 getTableData () {
247 getRolesById([1,2]) 255 getRolesById([1, 2])
248 .then((res) => { 256 .then((res) => {
249 this.listdata = res.content; 257 this.listdata = res.content;
250 this.listdata = judgeSort(this.listdata); 258 this.listdata = judgeSort(this.listdata);
...@@ -394,6 +402,7 @@ ...@@ -394,6 +402,7 @@
394 }, 402 },
395 // 新增、修改角色 403 // 新增、修改角色
396 handleAddEdit (value) { 404 handleAddEdit (value) {
405 this.isDialog = true
397 this.$refs.addEditDialog.menuType = this.menuType; 406 this.$refs.addEditDialog.menuType = this.menuType;
398 this.$refs.addEditDialog.roleId = value.id; 407 this.$refs.addEditDialog.roleId = value.id;
399 this.roleSort = value.sort ? value.sort : 0; 408 this.roleSort = value.sort ? value.sort : 0;
...@@ -404,10 +413,10 @@ ...@@ -404,10 +413,10 @@
404 this.$refs.addEditDialog.dialogForm.roleTextArea = value.description; 413 this.$refs.addEditDialog.dialogForm.roleTextArea = value.description;
405 } 414 }
406 this.$refs.addEditDialog.showAddEditDialog = true; 415 this.$refs.addEditDialog.showAddEditDialog = true;
407 this.$refs.addEditDialog.dialogTitle = value.id ? "修改" : "新增"; 416 this.$refs.addEditDialog.title = value.id ? "修改" : "新增";
408 }, 417 },
409 //排序 418 //排序
410 updateOrder(record, operate){ 419 updateOrder (record, operate) {
411 const findIndex = this.listdata.findIndex(item => item.id === record.id) 420 const findIndex = this.listdata.findIndex(item => item.id === record.id)
412 let swapId = '' 421 let swapId = ''
413 if (operate === 'UP') { 422 if (operate === 'UP') {
...@@ -476,7 +485,17 @@ ...@@ -476,7 +485,17 @@
476 485
477 // @import "~@/styles/public.scss"; 486 // @import "~@/styles/public.scss";
478 .btnColRight { 487 .btnColRight {
479 margin-left: -30px; 488 height: 60px;
480 margin-top: 20px; 489 .button {
490 position: absolute;
491 left: 30px;
492 top: 20px;
493 }
494 }
495 /deep/.el-button.is-disabled.el-button--text {
496 width: 64px;
497 height: 28px;
498 background: rgba(255, 255, 255, 0.1);
499 border-radius: 16px;
481 } 500 }
482 </style> 501 </style>
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
37 </lb-table> 37 </lb-table>
38 </div> 38 </div>
39 <template slot="footer"> 39 <template slot="footer">
40 <el-button type="primary" class="save" @click="handleSaveMember()">保存</el-button> 40 <btn nativeType="cx" type="primary" @click="handleSaveMember()">保存</btn>
41 <el-button class="cancel-button" @click="close()">取消</el-button> 41 <btn nativeType="cz" @click="close()">取消</btn>
42 </template> 42 </template>
43 </el-dialog> 43 </el-dialog>
44 </template> 44 </template>
......
1 <template> 1 <template>
2 <dialogBox :title="title" class="modifydialog" @closeDialog="close" :isMain="true" @submitForm="submitForm" 2 <dialogBox :title="title" :width="'867px'" class="modifydialog" @closeDialog="close" :isMain="true" @submitForm="submitForm"
3 v-model="myValue"> 3 v-model="myValue">
4 <div class="dialogCon"> 4 <div class="dialogCon">
5 <el-form ref="form" :model="form" :rules="rules"> 5 <el-form ref="form" :model="form" :rules="rules">
6 <el-row :gutter="24"> 6 <el-row :gutter="24">
7 <el-col :span="11"> 7 <el-col :span="12">
8 <el-form-item label="姓名:" prop="name" label-width="100px"> 8 <el-form-item label="姓名:" prop="name" label-width="100px">
9 <el-input v-model="form.name" placeholder="姓名" /> 9 <el-input v-model="form.name" placeholder="姓名" />
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 <el-col :span="13"> 12 <el-col :span="23">
13 <el-col :span="18" class="col-pd0"> 13 <el-col :span="18" class="col-pd0">
14 <el-form-item label="性别:" label-width="72px"> 14 <el-form-item label="性别:" label-width="88px">
15 <el-radio v-for="(item, index) in sexList" :key="index" v-model="form.sex" :label="item.value">{{ 15 <el-radio v-for="(item, index) in sexList" :key="index" v-model="form.sex" :label="item.value">{{
16 item.name }}</el-radio> 16 item.name }}</el-radio>
17 </el-form-item> 17 </el-form-item>
...@@ -22,38 +22,38 @@ ...@@ -22,38 +22,38 @@
22 </el-col> 22 </el-col>
23 </el-row> 23 </el-row>
24 <el-row :gutter="24"> 24 <el-row :gutter="24">
25 <el-col :span="11"> 25 <el-col :span="12">
26 <el-form-item label="工号:" prop="code" label-width="100px"> 26 <el-form-item label="工号:" prop="code" label-width="100px">
27 <el-input v-model="form.code" placeholder="工号" /> 27 <el-input v-model="form.code" placeholder="工号" />
28 </el-form-item> 28 </el-form-item>
29 </el-col> 29 </el-col>
30 <el-col :span="13"> 30 <el-col :span="12">
31 <el-form-item label="用户名:" prop="loginName" label-width="72px"> 31 <el-form-item label="用户名:" prop="loginName" label-width="72px">
32 <el-input v-model="form.loginName" :disabled="showLoginName" placeholder="用户名" /> 32 <el-input v-model="form.loginName" :disabled="showLoginName" placeholder="用户名" />
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
36 <el-row :gutter="24"> 36 <el-row :gutter="24">
37 <el-col :span="11"> 37 <el-col :span="12">
38 <el-form-item label="身份证号码:" label-width="100px"> 38 <el-form-item label="身份证号码:" label-width="100px">
39 <el-input v-model="form.idCard" placeholder="身份证号码" /> 39 <el-input v-model="form.idCard" placeholder="身份证号码" />
40 </el-form-item> 40 </el-form-item>
41 </el-col> 41 </el-col>
42 <el-col :span="13"> 42 <el-col :span="12">
43 <el-form-item label="手机号码:" prop="mobilePhone" label-width="72px"> 43 <el-form-item label="手机号码:" prop="mobilePhone" label-width="72px">
44 <el-input v-model="form.mobilePhone" placeholder="手机号码" /> 44 <el-input v-model="form.mobilePhone" placeholder="手机号码" />
45 </el-form-item> 45 </el-form-item>
46 </el-col> 46 </el-col>
47 </el-row> 47 </el-row>
48 <el-row :gutter="24"> 48 <el-row :gutter="24">
49 <el-col :span="11"> 49 <el-col :span="12">
50 <el-form-item label="最高职务级别:" label-width="100px"> 50 <el-form-item label="最高职务级别:" label-width="100px">
51 <el-select v-model="form.jobLevel" placeholder="最高职务级别"> 51 <el-select v-model="form.jobLevel" placeholder="最高职务级别">
52 <el-option v-for="item in levelList" :key="item.value" :label="item.name" :value="item.value" /> 52 <el-option v-for="item in levelList" :key="item.value" :label="item.name" :value="item.value" />
53 </el-select> 53 </el-select>
54 </el-form-item> 54 </el-form-item>
55 </el-col> 55 </el-col>
56 <el-col :span="13"> 56 <el-col :span="12">
57 <el-form-item label="办公电话:" prop="telephone" label-width="72px"> 57 <el-form-item label="办公电话:" prop="telephone" label-width="72px">
58 <el-input v-model="form.telephone" placeholder="办公电话" /> 58 <el-input v-model="form.telephone" placeholder="办公电话" />
59 </el-form-item> 59 </el-form-item>
...@@ -72,8 +72,8 @@ ...@@ -72,8 +72,8 @@
72 </template> 72 </template>
73 73
74 <script> 74 <script>
75 import { api, httpAction } from '@/api/manageApi' 75 import { api, httpAction } from '@/api/manageApi'
76 export default { 76 export default {
77 name: "", 77 name: "",
78 props: { 78 props: {
79 value: { type: Boolean, default: false }, 79 value: { type: Boolean, default: false },
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
92 { required: true, message: "请输入用户名", trigger: "blur" }, 92 { required: true, message: "请输入用户名", trigger: "blur" },
93 ], 93 ],
94 }, 94 },
95 title: "修改", 95 title: "",
96 showLoginName: false, 96 showLoginName: false,
97 sexList: [{ lable: "0", value: "0", name: "男" }, { lable: "1", value: "1", name: "女" }], 97 sexList: [{ lable: "0", value: "0", name: "男" }, { lable: "1", value: "1", name: "女" }],
98 levelList: [{ lable: "0", value: "0", name: "干事" }, { lable: "1", value: "1", name: "经理" }], 98 levelList: [{ lable: "0", value: "0", name: "干事" }, { lable: "1", value: "1", name: "经理" }],
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
128 this.form.departmentId = value; 128 this.form.departmentId = value;
129 }, 129 },
130 // 保存 130 // 保存
131 submitForm (submitType) { 131 submitForm () {
132 this.$refs.form.validate((valid) => { 132 this.$refs.form.validate((valid) => {
133 if (valid) { 133 if (valid) {
134 let method = '' 134 let method = ''
...@@ -148,8 +148,6 @@ export default { ...@@ -148,8 +148,6 @@ export default {
148 if (res.status === 1) { 148 if (res.status === 1) {
149 this.$message.success({ message: res.message, showClose: true }) 149 this.$message.success({ message: res.message, showClose: true })
150 150
151 this.resetForm()
152
153 this.close() 151 this.close()
154 152
155 this.$emit('ok') 153 this.$emit('ok')
...@@ -173,6 +171,29 @@ export default { ...@@ -173,6 +171,29 @@ export default {
173 this.$emit('input', false) 171 this.$emit('input', false)
174 } 172 }
175 } 173 }
176 } 174 }
177 </script> 175 </script>
178 <style scoped lang="scss"></style> 176 <style scoped lang="scss">
177 .modifydialog {
178 /deep/.el-dialog__header {
179 .dialog_title {
180 display: -webkit-box;
181 display: -ms-flexbox;
182 display: flex;
183 position: relative;
184 top: -7px;
185 width: 29%;
186 height: 40px;
187 margin-left: 28px;
188 -webkit-box-pack: center;
189 -ms-flex-pack: center;
190 justify-content: center;
191 white-space: nowrap;
192 b {
193 font-size: 16px;
194 font-weight: 600;
195 }
196 }
197 }
198 }
199 </style>
......
...@@ -17,31 +17,31 @@ ...@@ -17,31 +17,31 @@
17 </div> 17 </div>
18 <div class="from-clues-content"> 18 <div class="from-clues-content">
19 <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 19 <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
20 :column="tableData.columns" :data="tableData.data" :expand-row-keys="keyList" row-key="dictid"> 20 :column="tableData.columns" :calcHeight="200" :data="tableData.data" :expand-row-keys="keyList" row-key="dictid">
21 </lb-table> 21 </lb-table>
22 </div> 22 </div>
23 <EditDialog ref="dialogForm" v-model="isDialog" @ok="reloadTableData" /> 23 <EditDialog ref="dialogForm" v-model="isDialog" @ok="reloadTableData" />
24 </div> 24 </div>
25 </template> 25 </template>
26 <script> 26 <script>
27 import { 27 import {
28 getUuid, 28 getUuid,
29 judgeSort, 29 judgeSort,
30 realMove, 30 realMove,
31 findParents, 31 findParents,
32 removeTreeListItem, 32 removeTreeListItem,
33 } from "@/utils/operation"; 33 } from "@/utils/operation";
34 import { 34 import {
35 resetPassword, 35 resetPassword,
36 getUserList, 36 getUserList,
37 } from "@/api/personnelManage"; 37 } from "@/api/personnelManage";
38 import { api, deleteAction } from '@/api/manageApi' 38 import { api, deleteAction } from '@/api/manageApi'
39 import data from "./data"; 39 import data from "./data";
40 import { deleteDomStr } from '@/utils/proDomStr' 40 import { deleteDomStr } from '@/utils/proDomStr'
41 import tableMixin from "@/mixins/tableMixin.js"; 41 import tableMixin from "@/mixins/tableMixin.js";
42 import EditDialog from "./edit-dialog.vue"; 42 import EditDialog from "./edit-dialog.vue";
43 import { updateOrder } from "@/api/orders" 43 import { updateOrder } from "@/api/orders"
44 export default { 44 export default {
45 name: "menus", 45 name: "menus",
46 mixins: [tableMixin], 46 mixins: [tableMixin],
47 components: { 47 components: {
...@@ -105,12 +105,13 @@ export default { ...@@ -105,12 +105,13 @@ export default {
105 }, 105 },
106 { 106 {
107 label: "排序", 107 label: "排序",
108 width: 200, 108 width: 300,
109 render: (h, scope) => { 109 render: (h, scope) => {
110 return ( 110 return (
111 <div> 111 <div>
112 <el-button 112 <el-button
113 type="text" 113 type="text"
114 class='movebtnColor'
114 disabled={scope.row.isTop} 115 disabled={scope.row.isTop}
115 onClick={() => { 116 onClick={() => {
116 this.updateOrder(scope.row, 'TOP'); 117 this.updateOrder(scope.row, 'TOP');
...@@ -120,6 +121,7 @@ export default { ...@@ -120,6 +121,7 @@ export default {
120 </el-button> 121 </el-button>
121 <el-button 122 <el-button
122 type="text" 123 type="text"
124 class='movebtnColor'
123 disabled={scope.row.isTop} 125 disabled={scope.row.isTop}
124 onClick={() => { 126 onClick={() => {
125 this.updateOrder(scope.row, 'UP'); 127 this.updateOrder(scope.row, 'UP');
...@@ -129,6 +131,7 @@ export default { ...@@ -129,6 +131,7 @@ export default {
129 </el-button> 131 </el-button>
130 <el-button 132 <el-button
131 type="text" 133 type="text"
134 class='movebtnColor'
132 disabled={scope.row.isBottom} 135 disabled={scope.row.isBottom}
133 onClick={() => { 136 onClick={() => {
134 this.updateOrder(scope.row, 'DOWN'); 137 this.updateOrder(scope.row, 'DOWN');
...@@ -138,6 +141,7 @@ export default { ...@@ -138,6 +141,7 @@ export default {
138 </el-button> 141 </el-button>
139 <el-button 142 <el-button
140 type="text" 143 type="text"
144 class='movebtnColor'
141 disabled={scope.row.isBottom} 145 disabled={scope.row.isBottom}
142 onClick={() => { 146 onClick={() => {
143 this.updateOrder(scope.row, 'BOTTOM'); 147 this.updateOrder(scope.row, 'BOTTOM');
...@@ -158,6 +162,7 @@ export default { ...@@ -158,6 +162,7 @@ export default {
158 <el-button 162 <el-button
159 type="text" 163 type="text"
160 size="mini" 164 size="mini"
165 class='resetbtnColor'
161 icon="el-icon-video-pause" 166 icon="el-icon-video-pause"
162 onClick={() => { 167 onClick={() => {
163 this.resetPassword(scope.row.id); 168 this.resetPassword(scope.row.id);
...@@ -168,6 +173,7 @@ export default { ...@@ -168,6 +173,7 @@ export default {
168 <el-button 173 <el-button
169 type="text" 174 type="text"
170 size="mini" 175 size="mini"
176 class='successColor'
171 icon="el-icon-edit" 177 icon="el-icon-edit"
172 onClick={() => { 178 onClick={() => {
173 this.handleEdit(scope.row); 179 this.handleEdit(scope.row);
...@@ -178,8 +184,8 @@ export default { ...@@ -178,8 +184,8 @@ export default {
178 <el-button 184 <el-button
179 type="text" 185 type="text"
180 size="mini" 186 size="mini"
187 class='delColor'
181 icon="el-icon-delete" 188 icon="el-icon-delete"
182 style="color:#F56C6C"
183 onClick={() => { 189 onClick={() => {
184 this.handleDelete(scope.row.id, scope.row.name); 190 this.handleDelete(scope.row.id, scope.row.name);
185 }} 191 }}
...@@ -321,10 +327,22 @@ export default { ...@@ -321,10 +327,22 @@ export default {
321 this.getTableList() 327 this.getTableList()
322 }, 328 },
323 }, 329 },
324 }; 330 };
325 </script> 331 </script>
326 <style scoped lang="scss"> 332 <style scoped lang="scss">
327 @import "~@/styles/mixin.scss"; 333 @import "~@/styles/mixin.scss";
328 @import "~@/styles/public.scss"; 334 .btnColRight {
329 @import "./index.scss"; 335 height: 60px;
336 .button {
337 position: absolute;
338 left: 30px;
339 top: 20px;
340 }
341 }
342 /deep/.el-button.is-disabled.el-button--text {
343 width: 64px;
344 height: 28px;
345 background: rgba(255, 255, 255, 0.1);
346 border-radius: 16px;
347 }
330 </style> 348 </style>
......