865f9050 by 任超

style:menu

1 parent f264811e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 overflow: hidden; 2 overflow: hidden;
3 background: url("~@/image/dialogBg.png") no-repeat !important; 3 background: url("~@/image/dialogBg.png") no-repeat !important;
4 background-size: 100% 100% !important; 4 background-size: 100% 100% !important;
5 min-height: 90vh; 5 // min-height: 90vh;
6 6
7 .dialog_title { 7 .dialog_title {
8 display: flex; 8 display: flex;
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
98 color: #B5D6DC; 98 color: #B5D6DC;
99 border-radius: 2px; 99 border-radius: 2px;
100 border: 1px solid #224C7C; 100 border: 1px solid #224C7C;
101
101 span { 102 span {
102 display: inline-block; 103 display: inline-block;
103 padding: 3px; 104 padding: 3px;
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
155 .el-dialog__body { 156 .el-dialog__body {
156 padding-top: 0; 157 padding-top: 0;
157 padding-bottom: 0; 158 padding-bottom: 0;
158 height: 95vh; 159 // height: 95vh;
159 } 160 }
160 161
161 .el-dialog__headerbtn { 162 .el-dialog__headerbtn {
......
...@@ -43,19 +43,23 @@ class data extends filter { ...@@ -43,19 +43,23 @@ class data extends filter {
43 // }, 43 // },
44 { 44 {
45 label: "查封机关", 45 label: "查封机关",
46 prop: "cfjg" 46 prop: "cfjg",
47 minWidth: 150,
47 }, 48 },
48 { 49 {
49 label: "查封文号", 50 label: "查封文号",
50 prop: "cfwh" 51 prop: "cfwh",
52 minWidth: 130,
51 }, 53 },
52 { 54 {
53 label: "解封机关", 55 label: "解封机关",
54 prop: "jfjg" 56 prop: "jfjg",
57 width: 150,
55 }, 58 },
56 { 59 {
57 label: "解封文号", 60 label: "解封文号",
58 prop: "jfwh" 61 prop: "jfwh",
62 minWidth: 130,
59 }, 63 },
60 64
61 { 65 {
......
1 <template> 1 <template>
2 <div> 2 <dialogBox class="modifydialog" :isMain="true" :title="2222" @closeDialog="close" @submitForm="submitForm" v-model="myValue">
3 <Dialog class="modifydialog" :title="title" :show.sync="visible" :width="'767px'" @close="close()"> 3 <div class="modifydialog-con">
4 <template slot="content">
5 <el-form ref="form" :model="form" :rules="rules"> 4 <el-form ref="form" :model="form" :rules="rules">
6 <el-row :gutter="24"> 5 <el-row :gutter="24">
7 <el-col :span="12"> 6 <el-col :span="12">
...@@ -51,33 +50,22 @@ ...@@ -51,33 +50,22 @@
51 </el-col> 50 </el-col>
52 </el-row> 51 </el-row>
53 </el-form> 52 </el-form>
54 </template>
55 <template slot="footer">
56 <el-button class="cancel-button" @click="close()">取消</el-button>
57
58 <el-button type="primary" @click="submitForm()">保存</el-button>
59 </template>
60 </Dialog>
61 <!-- 图标列表 -->
62 <IconList ref="iconList" @iconName="getIconName" />
63 </div> 53 </div>
54 </dialogBox>
64 </template> 55 </template>
65 56
66 <script> 57 <script>
67 import Dialog from "@/components/Dialog/"; 58 import { getParentMenuListAction } from '@/api/authorityManage'
68 import { getParentMenuListAction } from '@/api/authorityManage' 59 import JsonEditor from '@/components/JsonEditors'
69 import JsonEditor from '@/components/JsonEditors' 60 import { validateCode } from '@/utils/validate';
70 import IconList from '@/components/IconList' 61 import { api, httpAction } from '@/api/manageApi'
71 import { validateCode } from '@/utils/validate'; 62 export default {
72 import { api, httpAction } from '@/api/manageApi'
73 export default {
74 name: 'MenuModal', 63 name: 'MenuModal',
75 components: { 64 components: {
76 IconList,
77 JsonEditor, 65 JsonEditor,
78 Dialog
79 }, 66 },
80 props: { 67 props: {
68 value: { type: Boolean, default: false },
81 productId: { 69 productId: {
82 type: String, 70 type: String,
83 default: '' 71 default: ''
...@@ -85,6 +73,7 @@ ...@@ -85,6 +73,7 @@
85 }, 73 },
86 data () { 74 data () {
87 return { 75 return {
76 myValue: this.value,
88 form: { 77 form: {
89 icon: '', 78 icon: '',
90 code: '' 79 code: ''
...@@ -126,8 +115,11 @@ ...@@ -126,8 +115,11 @@
126 } 115 }
127 } 116 }
128 }, 117 },
129 created () { }, 118 watch: {
130 mounted () { }, 119 value (val) {
120 this.myValue = val
121 }
122 },
131 methods: { 123 methods: {
132 // 获取父级菜单 124 // 获取父级菜单
133 getParentMenuList (id) { 125 getParentMenuList (id) {
...@@ -162,7 +154,6 @@ ...@@ -162,7 +154,6 @@
162 // 新增菜单 154 // 新增菜单
163 add () { 155 add () {
164 this.getParentMenuList(this.productId) 156 this.getParentMenuList(this.productId)
165 this.visible = true
166 this.type = 0 157 this.type = 0
167 this.form.jumpMode = 1 158 this.form.jumpMode = 1
168 }, 159 },
...@@ -176,7 +167,6 @@ ...@@ -176,7 +167,6 @@
176 this.getParentMenuList(this.productId) 167 this.getParentMenuList(this.productId)
177 }) 168 })
178 } 169 }
179 this.visible = true
180 }, 170 },
181 // 选择上级菜单 171 // 选择上级菜单
182 handleChange (value) { 172 handleChange (value) {
...@@ -230,8 +220,12 @@ ...@@ -230,8 +220,12 @@
230 this.visible = false 220 this.visible = false
231 } 221 }
232 } 222 }
233 } 223 }
234 </script> 224 </script>
235 <style scoped lang="scss"> 225 <style scoped lang="scss">
236 // @import "~@/styles/public.scss"; 226 .modifydialog {
227 &-con {
228 background: #031A46;
229 }
230 }
237 </style> 231 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -17,27 +17,27 @@ ...@@ -17,27 +17,27 @@
17 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"> 17 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
18 </lb-table> 18 </lb-table>
19 </div> 19 </div>
20 <edit-dialog ref="dialogForm" :product-id="productId" :resource-category-id="resourceCategoryId" 20 <edit-dialog ref="dialogForm" v-model="isDialog" :product-id="productId" :resource-category-id="resourceCategoryId"
21 @ok="reloadTableData" /> 21 @ok="reloadTableData" />
22 <!-- <authorizationdiglog ref="rolesForm" /> --> 22 <!-- <authorizationdiglog ref="rolesForm" /> -->
23 </div> 23 </div>
24 </template> 24 </template>
25 <script> 25 <script>
26 // 定时任务 26 // 定时任务
27 import data from "./data"; 27 import data from "./data";
28 import { deleteAction, getAction, api } from "@/api/manageApi"; 28 import { deleteAction, getAction, api } from "@/api/manageApi";
29 import EditDialog from "./edit-dialog.vue"; 29 import EditDialog from "./edit-dialog.vue";
30 import { mapGetters } from "vuex"; 30 import { mapGetters } from "vuex";
31 import { getMenuInfo } from "@/api/user"; 31 import { getMenuInfo } from "@/api/user";
32 import { 32 import {
33 getUuid, 33 getUuid,
34 judgeSort, 34 judgeSort,
35 realMove, 35 realMove,
36 findParents, 36 findParents,
37 removeTreeListItem, 37 removeTreeListItem,
38 } from "@/utils/operation"; 38 } from "@/utils/operation";
39 // import authorizationdiglog from "./authorizationdiglog.vue"; 39 // import authorizationdiglog from "./authorizationdiglog.vue";
40 export default { 40 export default {
41 name: "menus", 41 name: "menus",
42 components: { 42 components: {
43 EditDialog, 43 EditDialog,
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
45 }, 45 },
46 data () { 46 data () {
47 return { 47 return {
48 isDialog: false,
48 tablelistData: [], 49 tablelistData: [],
49 resourceCategoryId: "", 50 resourceCategoryId: "",
50 taskData: null, 51 taskData: null,
...@@ -147,113 +148,22 @@ ...@@ -147,113 +148,22 @@
147 this.productId = res.content[0].id; 148 this.productId = res.content[0].id;
148 this.getAuthorityList(res.content[0].id, res.content[0].code) 149 this.getAuthorityList(res.content[0].id, res.content[0].code)
149 this.selectedSubsystemCode = res.content[0].code 150 this.selectedSubsystemCode = res.content[0].code
150 // let queryOptions = { 151
151 // conditionGroup: {
152 // conditions: [
153 // {
154 // property: "productId",
155 // value: this.productId,
156 // operator: "EQ",
157 // },
158 // ],
159 // queryRelation: "AND",
160 // },
161 // orderBys: [{ property: "sort", direction: "desc" }],
162 // };
163 // if (!this.tableUrl) {
164 // console.log("请设置tableUrl属性为接口地址!");
165 // return;
166 // }
167 // if (this.queryOptions !== "") {
168 // this.queryParam.queryOptions = JSON.stringify(queryOptions);
169 // }
170 // 查询系统菜单
171 // getAction(this.tableUrl, this.queryParam)
172 // .then((res) => {
173 // if (res.status === 1) {
174 // this.loading = false;
175 // // this.menutablelistData = res.content;
176 // console.log("res.content菜单", res.content);
177 // } else {
178 // this.$message.error({ message: res.message, showClose: true });
179 // this.loading = false;
180 // }
181 // })
182 // .catch((error) => {
183 // console.log("er", error);
184 // this.loading = false;
185 // });
186 }) 152 })
187 .catch((error) => { 153 .catch((error) => {
188 console.log("er", error); 154 console.log("er", error);
189 }); 155 })
190 // const queryOptionsid = {
191 // conditionGroup: {
192 // queryRelation: "AND",
193 // conditions: [
194 // {
195 // property: "code",
196 // value: sessionStorage.getItem("products"),
197 // operator: "EQ",
198 // },
199 // ],
200 // },
201 // };
202 // const params = {
203 // queryOptions: queryOptionsid,
204 // };
205 // // 获取系统id
206 // getAction(this.meumurlid, params)
207 // .then((res) => {
208 // this.productId = res.content[0].id;
209 // let queryOptions = {
210 // conditionGroup: {
211 // conditions: [
212 // {
213 // property: "productId",
214 // value: this.productId,
215 // operator: "EQ",
216 // },
217 // ],
218 // queryRelation: "AND",
219 // },
220 // orderBys: [{ property: "sort", direction: "desc" }],
221 // };
222 // if (!this.tableUrl) {
223 // console.log("请设置tableUrl属性为接口地址!");
224 // return;
225 // }
226 // if (this.queryOptions !== "") {
227 // this.queryParam.queryOptions = JSON.stringify(queryOptions);
228 // }
229 // // 查询系统菜单
230 // getAction(this.tableUrl, this.queryParam)
231 // .then((res) => {
232 // if (res.status === 1) {
233 // this.loading = false;
234 // this.tablelistData = res.content;
235 // } else {
236 // this.$message.error({ message: res.message, showClose: true });
237 // this.loading = false;
238 // }
239 // })
240 // .catch((error) => {
241 // console.log("er", error);
242 // this.loading = false;
243 // });
244 // })
245 // .catch((error) => {
246 // console.log("er", error);
247 // });
248 }, 156 },
249 // 新增菜单 157 // 新增菜单
250 handleAdd () { 158 handleAdd () {
159 this.isDialog = true
251 this.$refs.dialogForm.add(); 160 this.$refs.dialogForm.add();
252 this.$refs.dialogForm.title = "添加"; 161 this.$refs.dialogForm.title = "添加";
253 }, 162 },
254 163
255 // 修改 164 // 修改
256 handleEdit (record) { 165 handleEdit (record) {
166 this.isDialog = true
257 this.$refs.dialogForm.edit(record); 167 this.$refs.dialogForm.edit(record);
258 this.$refs.dialogForm.title = "修改"; 168 this.$refs.dialogForm.title = "修改";
259 }, 169 },
...@@ -302,17 +212,17 @@ ...@@ -302,17 +212,17 @@
302 this.getTableList() 212 this.getTableList()
303 }, 213 },
304 }, 214 },
305 }; 215 };
306 </script> 216 </script>
307 <style scoped lang="scss"> 217 <style scoped lang="scss">
308 @import "~@/styles/mixin.scss"; 218 @import "~@/styles/mixin.scss";
309 219
310 // @import "~@/styles/public.scss"; 220 // @import "~@/styles/public.scss";
311 .btnColRight { 221 .btnColRight {
312 margin-top: 20px; 222 margin-top: 20px;
313 } 223 }
314 224
315 /deep/.el-table__expand-icon { 225 /deep/.el-table__expand-icon {
316 color: #fff; 226 color: #fff;
317 } 227 }
318 </style> 228 </style>
......