Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
f951f2f4 by renchao@pashanhoo.com
Options

Merge branch 'master' into dev

2 parents c2475abd 2129e5a8
Inline Side-by-side
Showing 11 changed files with 150 additions and 82 deletions
...@@ -79,6 +79,7 @@ export const roleAuthority = (id, permissionDtos) => { ...@@ -79,6 +79,7 @@ export const roleAuthority = (id, permissionDtos) => {
79 79
80 80
81 // 获取父级菜单 81 // 获取父级菜单
82 // id是系统id
82 export const getParentMenuListAction = (id) => { 83 export const getParentMenuListAction = (id) => {
83 let conditionGroup = {} 84 let conditionGroup = {}
84 if (id && id !== '') { 85 if (id && id !== '') {
......
...@@ -1265,3 +1265,61 @@ ...@@ -1265,3 +1265,61 @@
1265 } 1265 }
1266 } 1266 }
1267 } 1267 }
1268
1269 // 配置参数
1270 .configuration {
1271 color: white;
1272 margin-top: 6vh;
1273
1274 .el-dialog {
1275 background-color: #031a46 !important;
1276 border: 1px solid #5f82c7;
1277
1278 .el-dialog__header {
1279 .el-dialog__title {
1280 color: white !important;
1281 }
1282
1283 .el-dialog__headerbtn {
1284 top: 20px;
1285 }
1286 }
1287
1288 /deep/ .jsoneditor-vue {
1289 height: 100%;
1290 }
1291
1292 .fullScreen {
1293 position: absolute;
1294 right: 4%;
1295 top: 17%;
1296 cursor: pointer;
1297 color: #fff;
1298 }
1299
1300 /deep/ .jsoneditor-modes {
1301 display: none !important;
1302 }
1303
1304 /deep/.jsoneditor-poweredBy {
1305 display: none !important;
1306 }
1307
1308 .jsoneditor-menu {
1309 background-color: #031a46 !important;
1310 border-bottom: 1px solid #9c9e9f !important;
1311 }
1312
1313 .jsoneditor {
1314 border: 1px solid #9c9e9f !important;
1315 }
1316
1317 .el-collapse {
1318 border: 0;
1319 }
1320
1321 .el-collapse-item__header {
1322 height: 44px;
1323 }
1324 }
1325 }
......
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
172 172
173 .el-dialog__headerbtn .el-dialog__close { 173 .el-dialog__headerbtn .el-dialog__close {
174 font-size: 20px; 174 font-size: 20px;
175 color: white; 175 color: #4162D8
176 } 176 }
177 177
178 .el-dialog__header { 178 .el-dialog__header {
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
270 270
271 .el-dialog__headerbtn .el-dialog__close { 271 .el-dialog__headerbtn .el-dialog__close {
272 font-size: 20px; 272 font-size: 20px;
273 color: white; 273 color: #4162D8
274 } 274 }
275 275
276 .el-dialog__header { 276 .el-dialog__header {
...@@ -450,7 +450,7 @@ ...@@ -450,7 +450,7 @@
450 450
451 .el-dialog__headerbtn .el-dialog__close { 451 .el-dialog__headerbtn .el-dialog__close {
452 font-size: 20px; 452 font-size: 20px;
453 color: white; 453 color: #4162D8
454 } 454 }
455 455
456 .el-dialog__body { 456 .el-dialog__body {
...@@ -693,9 +693,11 @@ ...@@ -693,9 +693,11 @@
693 693
694 // 人员管理角色管理菜单管理修改新增弹框样式 694 // 人员管理角色管理菜单管理修改新增弹框样式
695 .PersonnelDialog { 695 .PersonnelDialog {
696
697
696 .el-dialog__headerbtn .el-dialog__close { 698 .el-dialog__headerbtn .el-dialog__close {
697 font-size: 20px; 699 font-size: 20px;
698 color: white; 700 color: #4162D8
699 } 701 }
700 702
701 .el-dialog__header { 703 .el-dialog__header {
...@@ -958,6 +960,69 @@ ...@@ -958,6 +960,69 @@
958 960
959 .el-dialog__headerbtn .el-dialog__close { 961 .el-dialog__headerbtn .el-dialog__close {
960 font-size: 20px; 962 font-size: 20px;
963 color: #4162D8
964 }
965 }
966
967 // 配置参数
968 .configuration {
961 color: white; 969 color: white;
970 margin-top: 6vh;
971
972 .el-dialog {
973 background-color: #ffffff !important;
974
975 .el-dialog__header {
976 @include background("navbg");
977
978 .el-dialog__title {
979 color: white !important;
980 }
981
982 .el-dialog__headerbtn {
983 top: 20px;
984
985 .el-dialog__close {
986 color: #4162D8
987 }
988 }
989 }
990
991 /deep/ .jsoneditor-vue {
992 height: 100%;
993 }
994
995 .fullScreen {
996 position: absolute;
997 right: 4%;
998 top: 17%;
999 cursor: pointer;
1000 color: #4162D8
1001 }
1002
1003 /deep/ .jsoneditor-modes {
1004 display: none !important;
1005 }
1006
1007 /deep/.jsoneditor-poweredBy {
1008 display: none !important;
1009 }
1010
1011 .jsoneditor-menu {
1012 @include background("navbg");
1013 border-bottom: 1px solid #9c9e9f !important;
1014 }
1015
1016 .jsoneditor {
1017 border: 1px solid #9c9e9f !important;
1018 }
1019
1020 .el-collapse {
1021 border: 0;
1022 }
1023
1024 .el-collapse-item__header {
1025 height: 44px;
1026 }
962 } 1027 }
963 } 1028 }
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <div class="Cfdj from-clues"> 2 <div class="Cfdj 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 <!-- 判断进入监管还是上报系统 -->
5 <el-form-item v-if="BASE_API.THEME=='jg'"> 6 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 7 <Breadcrumb />
7 </el-form-item> 8 </el-form-item>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <div class="dyaq from-clues"> 2 <div class="dyaq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="120px"> 4 <el-form ref="form" :model="form" label-width="120px">
5 <!-- 判断进入监管还是上报系统 -->
5 <el-form-item v-if="BASE_API.THEME=='jg'"> 6 <el-form-item v-if="BASE_API.THEME=='jg'">
6 7
7 <Breadcrumb /> 8 <Breadcrumb />
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="150px"> 4 <el-form ref="form" :model="form" label-width="150px">
5 <!-- 判断进入监管还是上报系统 -->
5 <el-form-item v-if="BASE_API.THEME=='jg'"> 6 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 7 <Breadcrumb />
7 </el-form-item> 8 </el-form-item>
...@@ -87,12 +88,12 @@ ...@@ -87,12 +88,12 @@
87 </template> 88 </template>
88 89
89 <script> 90 <script>
90 // 地役权登记 91 // 地役权登记
91 import data from "./data" 92 import data from "./data"
92 import qlfQlDyiq from '@/api/qlfQlDyiq' 93 import qlfQlDyiq from '@/api/qlfQlDyiq'
93 import tableMixin from '@/mixins/tableMixin.js' 94 import tableMixin from '@/mixins/tableMixin.js'
94 import treeSelect from '@/components/TreeSelect.vue' 95 import treeSelect from '@/components/TreeSelect.vue'
95 export default { 96 export default {
96 name: "dyiq", 97 name: "dyiq",
97 mixins: [tableMixin], 98 mixins: [tableMixin],
98 components: { 99 components: {
...@@ -164,5 +165,5 @@ export default { ...@@ -164,5 +165,5 @@ export default {
164 } 165 }
165 } 166 }
166 } 167 }
167 } 168 }
168 </script> 169 </script>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="80px"> 6 <el-form ref="ruleForm" :model="form" label-width="80px">
7 <el-form-item v-if="BASE_API.THEME=='jg'"> 7 <el-form-item v-if="BASE_API.THEME=='jg'">
8 <!-- 判断进入监管还是上报系统 -->
8 <Breadcrumb /> 9 <Breadcrumb />
9 </el-form-item> 10 </el-form-item>
10 <el-row> 11 <el-row>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="ruleForm" :model="form" label-width="100px"> 6 <el-form ref="ruleForm" :model="form" label-width="100px">
7 <!-- 判断进入监管还是上报系统 -->
7 <el-form-item v-if="BASE_API.THEME=='jg'"> 8 <el-form-item v-if="BASE_API.THEME=='jg'">
8 <Breadcrumb /> 9 <Breadcrumb />
9 </el-form-item> 10 </el-form-item>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <div class="from-clues"> 2 <div class="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 <!-- 判断进入监管还是上报系统 -->
5 <el-form-item v-if="BASE_API.THEME=='jg'"> 6 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb /> 7 <Breadcrumb />
7 </el-form-item> 8 </el-form-item>
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
38 </div> 39 </div>
39 <div class="from-clues-content"> 40 <div class="from-clues-content">
40 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="BASE_API.calcHeight" 41 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="BASE_API.calcHeight"
41 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" 42 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata"
42 row-key="dictid"> 43 row-key="dictid">
43 </lb-table> 44 </lb-table>
44 </div> 45 </div>
......
...@@ -29,14 +29,9 @@ ...@@ -29,14 +29,9 @@
29 </el-tooltip> 29 </el-tooltip>
30 <template slot="footer"> 30 <template slot="footer">
31 <div class="dialog-footer flex flex-pack-center"> 31 <div class="dialog-footer flex flex-pack-center">
32 <el-button 32 <btn nativeType="cx" @click="onJsonSave">保存</btn>
33 type="primary" 33 <btn nativeType="cx" @click="cancel">关闭</btn>
34 class="confirmBtn" 34
35 @click="onJsonSave">保存</el-button>
36 <el-button
37 type="primary"
38 class="cancelBtn"
39 @click="cancel">关闭</el-button>
40 </div> 35 </div>
41 </template> 36 </template>
42 </el-dialog> 37 </el-dialog>
...@@ -137,49 +132,4 @@ ...@@ -137,49 +132,4 @@
137 .icon { 132 .icon {
138 color: #349af3; 133 color: #349af3;
139 } 134 }
140 /deep/ .jsoneditor-vue {
141 height: 100%;
142 }
143 .fullScreen {
144 position: absolute;
145 right: 5%;
146 top: 20%;
147 cursor: pointer;
148 color: #fff;
149 }
150 /deep/ .jsoneditor-modes {
151 display: none !important;
152 }
153 /deep/.jsoneditor-poweredBy {
154 display: none !important;
155 }
156 .jsoneditor-menu {
157 background-color: #9c9e9f !important;
158 border-bottom: 1px solid #9c9e9f !important;
159 }
160 .jsoneditor {
161 border: 1px solid #9c9e9f !important;
162 }
163 .el-collapse {
164 border: 0;
165 }
166 .el-collapse-item__header {
167 height: 44px;
168 }
169 .configuration {
170 color: white;
171 margin-top: 6vh;
172 /deep/.el-dialog {
173 background-color: #031a46 !important;
174 border: 1px solid #5f82c7;
175 .el-dialog__header {
176 .el-dialog__title {
177 color: white !important;
178 }
179 .el-dialog__headerbtn {
180 top: 20px;
181 }
182 }
183 }
184 }
185 </style> 135 </style>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 </el-col> 11 </el-col>
12 <el-col :span="12"> 12 <el-col :span="12">
13 <el-form-item label="图标:" label-width="54px"> 13 <el-form-item label="图标:" label-width="54px">
14 <el-input v-model="form.icon" placeholder="请选择图标" :prefix-icon="form.icon" clearable @focus="getIconList" /> 14 <el-input v-model="form.icon" placeholder="请选择图标" :prefix-icon="form.icon" clearable />
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 </el-row> 17 </el-row>
...@@ -51,28 +51,26 @@ ...@@ -51,28 +51,26 @@
51 <el-col :span="24"> 51 <el-col :span="24">
52 <el-form-item label="配置参数:" label-width="124px" class="form-item-mb0"> 52 <el-form-item label="配置参数:" label-width="124px" class="form-item-mb0">
53 <!-- 配置参数 --> 53 <!-- 配置参数 -->
54 <JsonEditor :result-infos="form.metadata" @getJsonString="getJsonString" /> 54 <JsonEditor class="JsonEditors" :result-infos="form.metadata" @getJsonString="getJsonString" />
55 </el-form-item> 55 </el-form-item>
56 </el-col> 56 </el-col>
57 </el-row> 57 </el-row>
58 </el-form> 58 </el-form>
59 <!-- 图标列表 --> 59 <!-- 图标列表 -->
60 <IconList ref="iconList" @iconName="getIconName" /> 60 <!-- <IconList ref="iconList" @iconName="getIconName" /> -->
61 </div> 61 </div>
62 </dialogBox> 62 </dialogBox>
63 </template> 63 </template>
64 64
65 <script> 65 <script>
66 import { getParentMenuListAction } from '@/api/authorityManage' 66 import { getParentMenuListAction } from '@/api/authorityManage'
67 import IconList from '../../../components/IconList' 67 import JsonEditor from './JsonEditors/index.vue'
68 import JsonEditor from '@/components/JsonEditors'
69 import { validateCode } from '@/utils/validate'; 68 import { validateCode } from '@/utils/validate';
70 import { api, httpAction } from '@/api/manageApi' 69 import { api, httpAction } from '@/api/manageApi'
71 export default { 70 export default {
72 name: 'MenuModal', 71 name: 'MenuModal',
73 components: { 72 components: {
74 JsonEditor, 73 JsonEditor,
75 IconList,
76 }, 74 },
77 props: { 75 props: {
78 value: { type: Boolean, default: false }, 76 value: { type: Boolean, default: false },
...@@ -151,16 +149,6 @@ ...@@ -151,16 +149,6 @@
151 } 149 }
152 }) 150 })
153 }, 151 },
154 // 选择图标
155 getIconName (data) {
156 this.form.icon = data;
157 },
158 getIconList () {
159 this.$refs.iconList.show(true)
160 },
161 getIconName (data) {
162 this.form.icon = data
163 },
164 // 配置参数 152 // 配置参数
165 getJsonString (data) { 153 getJsonString (data) {
166 this.form.metadata = data 154 this.form.metadata = data
...@@ -208,7 +196,7 @@ ...@@ -208,7 +196,7 @@
208 message: res.message, 196 message: res.message,
209 showClose: true 197 showClose: true
210 }) 198 })
211 close() 199 this.close()
212 this.$emit('ok') 200 this.$emit('ok')
213 201
214 } else { 202 } else {
......