Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
90e3f601 by xiaomiao
Options

样式调整

1 parent 9d048f3e
Inline Side-by-side
Showing 9 changed files with 110 additions and 85 deletions
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
2 <div> 2 <div>
3 <i class="el-icon-s-management icon" :title="title" @click="openDialog" /> 3 <i class="el-icon-s-management icon" :title="title" @click="openDialog" />
4 <el-dialog 4 <el-dialog
5 class="configuration"
5 :key="key" 6 :key="key"
6 :title="title" 7 :title="title"
7 :inner-dialog="true" 8 :inner-dialog="true"
...@@ -9,8 +10,7 @@ ...@@ -9,8 +10,7 @@
9 width="600px" 10 width="600px"
10 :close-on-click-modal="false" 11 :close-on-click-modal="false"
11 append-to-body 12 append-to-body
12 @cancel="cancel" 13 @cancel="cancel">
13 >
14 <vue-json-editor 14 <vue-json-editor
15 id="minejson" 15 id="minejson"
16 v-model="resultInfo" 16 v-model="resultInfo"
...@@ -18,15 +18,13 @@ ...@@ -18,15 +18,13 @@
18 lang="zh" 18 lang="zh"
19 @json-change="onJsonChange" 19 @json-change="onJsonChange"
20 @json-save="onJsonSave" 20 @json-save="onJsonSave"
21 @has-error="onError" 21 @has-error="onError" />
22 />
23 <el-tooltip 22 <el-tooltip
24 content="全屏缩放" 23 content="全屏缩放"
25 effect="dark" 24 effect="dark"
26 placement="bottom" 25 placement="bottom"
27 fullscreen 26 fullscreen
28 class="fullScreen" 27 class="fullScreen">
29 >
30 <i class="el-icon-full-screen" @click="enLarge" /> 28 <i class="el-icon-full-screen" @click="enLarge" />
31 </el-tooltip> 29 </el-tooltip>
32 <template slot="footer"> 30 <template slot="footer">
...@@ -34,21 +32,19 @@ ...@@ -34,21 +32,19 @@
34 <el-button 32 <el-button
35 type="primary" 33 type="primary"
36 class="confirmBtn" 34 class="confirmBtn"
37 @click="onJsonSave" 35 @click="onJsonSave">保存</el-button>
38 >保存</el-button>
39 <el-button 36 <el-button
40 type="primary" 37 type="primary"
41 class="cancelBtn" 38 class="cancelBtn"
42 @click="cancel" 39 @click="cancel">关闭</el-button>
43 >关闭</el-button>
44 </div> 40 </div>
45 </template> 41 </template>
46 </el-dialog> 42 </el-dialog>
47 </div> 43 </div>
48 </template> 44 </template>
49 <script> 45 <script>
50 import vueJsonEditor from 'vue-json-editor' 46 import vueJsonEditor from 'vue-json-editor'
51 export default { 47 export default {
52 components: { 48 components: {
53 vueJsonEditor 49 vueJsonEditor
54 }, 50 },
...@@ -62,7 +58,7 @@ export default { ...@@ -62,7 +58,7 @@ export default {
62 default: '' 58 default: ''
63 } 59 }
64 }, 60 },
65 data() { 61 data () {
66 return { 62 return {
67 activeNames: [], 63 activeNames: [],
68 resultInfo: {}, 64 resultInfo: {},
...@@ -75,7 +71,7 @@ export default { ...@@ -75,7 +71,7 @@ export default {
75 }, 71 },
76 watch: { 72 watch: {
77 resultInfos: { 73 resultInfos: {
78 handler: function(val) { 74 handler: function (val) {
79 ++this.key 75 ++this.key
80 this.resultInfo = 76 this.resultInfo =
81 this.resultInfos === '' ? {} : JSON.parse(this.resultInfos) 77 this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
...@@ -86,17 +82,17 @@ export default { ...@@ -86,17 +82,17 @@ export default {
86 } 82 }
87 }, 83 },
88 84
89 mounted() { 85 mounted () {
90 this.resultInfo = 86 this.resultInfo =
91 this.resultInfos === '' ? {} : JSON.parse(this.resultInfos) 87 this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
92 }, 88 },
93 89
94 methods: { 90 methods: {
95 onJsonChange(value) { 91 onJsonChange (value) {
96 // 只有在格式正确的时候进入此事件 92 // 只有在格式正确的时候进入此事件
97 this.hasJsonFlag = true 93 this.hasJsonFlag = true
98 }, 94 },
99 onJsonSave() { 95 onJsonSave () {
100 const value = this.resultInfo 96 const value = this.resultInfo
101 console.log(this.resultInfo, 'resultInfo') 97 console.log(this.resultInfo, 'resultInfo')
102 if (this.hasJsonFlag === false) { 98 if (this.hasJsonFlag === false) {
...@@ -109,19 +105,19 @@ export default { ...@@ -109,19 +105,19 @@ export default {
109 return true 105 return true
110 } 106 }
111 }, 107 },
112 onError(value) { 108 onError (value) {
113 this.hasJsonFlag = false 109 this.hasJsonFlag = false
114 }, 110 },
115 openDialog() { 111 openDialog () {
116 this.dialogVisible = true 112 this.dialogVisible = true
117 }, 113 },
118 cancel() { 114 cancel () {
119 console.log(this.tmpResultInfo, 'tmpResultInfo') 115 console.log(this.tmpResultInfo, 'tmpResultInfo')
120 this.resultInfo = this.tmpResultInfo 116 this.resultInfo = this.tmpResultInfo
121 this.dialogVisible = false 117 this.dialogVisible = false
122 }, 118 },
123 // 放大 119 // 放大
124 enLarge() { 120 enLarge () {
125 const fullarea = document.getElementById('minejson') 121 const fullarea = document.getElementById('minejson')
126 if (fullarea.requestFullscreen) { 122 if (fullarea.requestFullscreen) {
127 fullarea.requestFullscreen() 123 fullarea.requestFullscreen()
...@@ -135,41 +131,57 @@ export default { ...@@ -135,41 +131,57 @@ export default {
135 this.isEnlarge = true 131 this.isEnlarge = true
136 } 132 }
137 } 133 }
138 } 134 }
139 </script> 135 </script>
140 136
141 <style scoped lang="scss"> 137 <style scoped lang="scss">
142 /* jsoneditor右上角默认有一个链接,加css去掉了 */ 138 /* jsoneditor右上角默认有一个链接,加css去掉了 */
143 .icon { 139 .icon {
144 color: #349af3; 140 color: #349af3;
145 } 141 }
146 /deep/ .jsoneditor-vue { 142 /deep/ .jsoneditor-vue {
147 height: 100%; 143 height: 100%;
148 } 144 }
149 .fullScreen { 145 .fullScreen {
150 position: absolute; 146 position: absolute;
151 right: 5%; 147 right: 5%;
152 top: 22%; 148 top: 20%;
153 cursor: pointer; 149 cursor: pointer;
154 color: #fff; 150 color: #fff;
155 } 151 }
156 /deep/ .jsoneditor-modes { 152 /deep/ .jsoneditor-modes {
157 display: none !important; 153 display: none !important;
158 } 154 }
159 .jsoneditor-poweredBy { 155 /deep/.jsoneditor-poweredBy {
160 display: none !important; 156 display: none !important;
161 } 157 }
162 .jsoneditor-menu { 158 .jsoneditor-menu {
163 background-color: #9c9e9f !important; 159 background-color: #9c9e9f !important;
164 border-bottom: 1px solid #9c9e9f !important; 160 border-bottom: 1px solid #9c9e9f !important;
165 } 161 }
166 .jsoneditor { 162 .jsoneditor {
167 border: 1px solid #9c9e9f !important; 163 border: 1px solid #9c9e9f !important;
168 } 164 }
169 .el-collapse { 165 .el-collapse {
170 border: 0; 166 border: 0;
171 } 167 }
172 .el-collapse-item__header { 168 .el-collapse-item__header {
173 height: 44px; 169 height: 44px;
174 } 170 }
171 .configuration {
172 color: white;
173 margin-top: 6vh;
174 /deep/.el-dialog {
175 background-color: #031a46 !important;
176 border: 1px solid #5f82c7;
177 .el-dialog__header {
178 .el-dialog__title {
179 color: white !important;
180 }
181 .el-dialog__headerbtn {
182 top: 20px;
183 }
184 }
185 }
186 }
175 </style> 187 </style>
......
...@@ -519,3 +519,31 @@ tr:hover { ...@@ -519,3 +519,31 @@ tr:hover {
519 color: white; 519 color: white;
520 } 520 }
521 } 521 }
522 // 上级菜单
523 .el-cascader__dropdown {
524 background-color: #031a46;
525 border: 1px solid #5f82c7;
526
527 }
528 .el-cascader-menu{
529 color: white;
530 }
531 .el-radio
532 {
533 .el-cascader-menu:hover{
534 color: white;
535 }
536 }
537 .el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus {
538 background: #F5F7FA;
539 background-image: initial;
540 background-position-x: initial;
541 background-position-y: initial;
542 background-size: initial;
543 background-repeat-x: initial;
544 background-repeat-y: initial;
545 background-attachment: initial;
546 background-origin: initial;
547 background-clip: initial;
548 background-color: rgb(80, 142, 235);
549 }
......
...@@ -99,17 +99,17 @@ ...@@ -99,17 +99,17 @@
99 </template> 99 </template>
100 100
101 <script> 101 <script>
102 // 接收报文查询 102 // 接收报文查询
103 // 引入表格头部数据 103 // 引入表格头部数据
104 import data from "./data"; 104 import data from "./data";
105 // 引入table混入方法 105 // 引入table混入方法
106 import tableMixin from "@/mixins/tableMixin.js"; 106 import tableMixin from "@/mixins/tableMixin.js";
107 import { getReceiveDataReportPage } from "@/api/dataReport.js"; 107 import { getReceiveDataReportPage } from "@/api/dataReport.js";
108 // 引入详情弹框 108 // 引入详情弹框
109 import dataDetails from "@/components/EditDialog"; 109 import dataDetails from "@/components/EditDialog";
110 //引入日期处理方法 110 //引入日期处理方法
111 import { timeFormat } from "@/utils/operation"; 111 import { timeFormat } from "@/utils/operation";
112 export default { 112 export default {
113 name: "jsbwcx", 113 name: "jsbwcx",
114 mixins: [tableMixin], 114 mixins: [tableMixin],
115 // 注册组件 115 // 注册组件
...@@ -224,6 +224,7 @@ export default { ...@@ -224,6 +224,7 @@ export default {
224 getReceiveDataReportPage({ ...this.form, ...this.formData }).then( 224 getReceiveDataReportPage({ ...this.form, ...this.formData }).then(
225 (res) => { 225 (res) => {
226 if (res.code === 200) { 226 if (res.code === 200) {
227 console.log("菜单列表", res);
227 let { total, records, current } = res.result; 228 let { total, records, current } = res.result;
228 this.tableData.total = total; 229 this.tableData.total = total;
229 this.tableData.data = records ? records : []; 230 this.tableData.data = records ? records : [];
...@@ -274,12 +275,12 @@ export default { ...@@ -274,12 +275,12 @@ export default {
274 } 275 }
275 }, 276 },
276 } 277 }
277 } 278 }
278 </script> 279 </script>
279 <style scoped lang="scss"> 280 <style scoped lang="scss">
280 // 引入表单整体样式 281 // 引入表单整体样式
281 @import "~@/styles/public.scss"; 282 @import "~@/styles/public.scss";
282 // 引入当前css 283 // 引入当前css
283 @import "./index.scss"; 284 @import "./index.scss";
284 </style> 285 </style>
285 286
......
...@@ -272,4 +272,5 @@ ...@@ -272,4 +272,5 @@
272 /deep/.el-input__inner { 272 /deep/.el-input__inner {
273 background-color: #07388b; 273 background-color: #07388b;
274 } 274 }
275
275 </style> 276 </style>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <template slot="content"> 8 <template slot="content">
9 <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px"> 9 <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px">
10 <el-row :gutter="24"> 10 <el-row :gutter="24">
11 <el-col :span="12"> 11 <el-col :span="15">
12 <el-form-item label="角色名称:" prop="roleName"> 12 <el-form-item label="角色名称:" prop="roleName">
13 <el-input 13 <el-input
14 v-model="dialogForm.roleName" 14 v-model="dialogForm.roleName"
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
16 placeholder="角色名称" /> 16 placeholder="角色名称" />
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="12"> 19 </el-row>
20 <el-row :gutter="24">
21 <el-col :span="24">
20 <el-form-item label="角色类型:" prop="roleType"> 22 <el-form-item label="角色类型:" prop="roleType">
21 <el-input 23 <el-input
22 v-model="dialogForm.roleType" 24 v-model="dialogForm.roleType"
...@@ -25,7 +27,6 @@ ...@@ -25,7 +27,6 @@
25 </el-form-item> 27 </el-form-item>
26 </el-col> 28 </el-col>
27 </el-row> 29 </el-row>
28 <br>
29 <el-row> 30 <el-row>
30 <el-col :span="24"> 31 <el-col :span="24">
31 <el-form-item label="备注:" class="form-item-mb0"> 32 <el-form-item label="备注:" class="form-item-mb0">
......
...@@ -14,9 +14,7 @@ ...@@ -14,9 +14,7 @@
14 </div> 14 </div>
15 <div class="from-clues-content"> 15 <div class="from-clues-content">
16 <lb-table 16 <lb-table
17 :page-size="pageData.size" 17 :pagination="false"
18 :current-page.sync="pageData.current"
19 :total="pageData.total"
20 @size-change="handleSizeChange" 18 @size-change="handleSizeChange"
21 @p-current-change="handleCurrentChange" 19 @p-current-change="handleCurrentChange"
22 :column="tableData.columns" 20 :column="tableData.columns"
...@@ -219,11 +217,6 @@ ...@@ -219,11 +217,6 @@
219 ]), 217 ]),
220 data: [], 218 data: [],
221 }, 219 },
222 pageData: {
223 total: 5,
224 pageSize: 15,
225 current: 1,
226 },
227 }; 220 };
228 }, 221 },
229 created () { 222 created () {
...@@ -242,6 +235,7 @@ ...@@ -242,6 +235,7 @@
242 Builtinrole = res.content; 235 Builtinrole = res.content;
243 getRolesById(2) 236 getRolesById(2)
244 .then((res) => { 237 .then((res) => {
238 console.log("角色列表", res);
245 Publicrole = res.content; 239 Publicrole = res.content;
246 240
247 this.listdata = Builtinrole.concat(Publicrole); 241 this.listdata = Builtinrole.concat(Publicrole);
......
...@@ -594,13 +594,8 @@ ...@@ -594,13 +594,8 @@
594 display: flex; 594 display: flex;
595 margin-bottom: 15px; 595 margin-bottom: 15px;
596 } 596 }
597 597 .el-dialog__footer {
598 .dialog_footer { 598 padding-right: 40px;
599 flex-direction: column;
600
601 .dialog_button {
602 margin-top: 8px;
603 }
604 } 599 }
605 600
606 .divider { 601 .divider {
......
...@@ -17,9 +17,7 @@ ...@@ -17,9 +17,7 @@
17 </div> 17 </div>
18 <div class="from-clues-content"> 18 <div class="from-clues-content">
19 <lb-table 19 <lb-table
20 :page-size="pageData.size" 20 :pagination="false"
21 :current-page.sync="pageData.current"
22 :total="pageData.total"
23 @size-change="handleSizeChange" 21 @size-change="handleSizeChange"
24 @p-current-change="handleCurrentChange" 22 @p-current-change="handleCurrentChange"
25 :column="tableData.columns" 23 :column="tableData.columns"
...@@ -182,11 +180,6 @@ ...@@ -182,11 +180,6 @@
182 ]), 180 ]),
183 data: [], 181 data: [],
184 }, 182 },
185 pageData: {
186 total: 5,
187 pageSize: 15,
188 current: 1,
189 },
190 }; 183 };
191 }, 184 },
192 created () { 185 created () {
...@@ -209,6 +202,7 @@ ...@@ -209,6 +202,7 @@
209 departmentId: this.departmentid.departmentId, 202 departmentId: this.departmentid.departmentId,
210 }; 203 };
211 getUserList(this.queryParam).then((res) => { 204 getUserList(this.queryParam).then((res) => {
205 console.log("人员列表", res);
212 if (res.status === 1) { 206 if (res.status === 1) {
213 this.loading = false; 207 this.loading = false;
214 this.tableData.data = res.content; 208 this.tableData.data = res.content;
...@@ -316,5 +310,4 @@ ...@@ -316,5 +310,4 @@
316 .btnColRight { 310 .btnColRight {
317 margin-top: 20px; 311 margin-top: 20px;
318 } 312 }
319
320 </style> 313 </style>
......