Skip to content

bdc / bdcjg-web

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

style:样式修改

2 parents 24c6ad37 bb6ca1ce
Expand all
Inline Side-by-side
Showing 35 changed files with 280 additions and 306 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-27 13:25:25 4 * @LastEditTime: 2023-03-27 15:43:24
5 --> 5 -->
6 # 安装依赖 6 # 安装依赖
7 npm install 7 npm install
...@@ -22,3 +22,14 @@ npm install --registry=https://registry.npm.taobao.org ...@@ -22,3 +22,14 @@ npm install --registry=https://registry.npm.taobao.org
22 22
23 ## 项目换肤 23 ## 项目换肤
24 给html根标签设置一个data-theme属性，然后通过js切换data-theme的属性值，Scss根据此属性来判断使用对应主题变量 24 给html根标签设置一个data-theme属性，然后通过js切换data-theme的属性值，Scss根据此属性来判断使用对应主题变量
25
26 ## config说明
27
28 {
29 "TITLE": "汉中市数据上报系统",
30 "THEME": "sb",
31 "CODE": "BDCJGPT", {"BDCSBPT":上报: "BDCJGPT":监管}
32 "SERVERAPI": "/bdcsjsb",
33 "calcHeight": 200, {上报:160 监管:200}
34 "MANAGEMENTAPI": "http://192.168.2.38:8090/management"
35 }
...\ No newline at end of file ...\ No newline at end of file
......
1 { 1 {
2 "TITLE": "汉中市数据上报系统", 2 "TITLE": "汉中市数据上报系统",
3 "THEME": "sb", 3 "THEME": "sb",
4 "CODE": "BDCJGPT", 4 "CODE": "BDCSBPT",
5 "SERVERAPI": "/bdcsjsb", 5 "SERVERAPI": "/bdcsjsb",
6 "calcHeight": 160,
6 "MANAGEMENTAPI": "http://192.168.2.38:8090/management" 7 "MANAGEMENTAPI": "http://192.168.2.38:8090/management"
7 } 8 }
......
...@@ -139,11 +139,25 @@ export default { ...@@ -139,11 +139,25 @@ export default {
139 let _this = this 139 let _this = this
140 if (this.heightNum) { 140 if (this.heightNum) {
141 _this.$nextTick(() => { 141 _this.$nextTick(() => {
142 142 if (document.querySelector(".tags-view-container")) {
143 window.addEventListener('resize', () => {
144 if (_this.calcHeight == 230) {
145 _this.tableHeight = _this.calcHeightx(192)
146 } else {
147 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
148 }
149 });
150 if (_this.calcHeight == 230) {
151 _this.tableHeight = _this.calcHeightx(192)
152 } else {
153 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
154 }
155 } else {
143 window.addEventListener('resize', () => { 156 window.addEventListener('resize', () => {
144 _this.tableHeight = _this.calcHeightx(_this.calcHeight) 157 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
145 }); 158 });
146 _this.tableHeight = _this.calcHeightx(_this.calcHeight) 159 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
160 }
147 }) 161 })
148 } else { 162 } else {
149 _this.tableHeight = window.innerHeight - _this.heightNum 163 _this.tableHeight = window.innerHeight - _this.heightNum
...@@ -158,9 +172,15 @@ export default { ...@@ -158,9 +172,15 @@ export default {
158 calcHeightx (value, wappered = true) { 172 calcHeightx (value, wappered = true) {
159 //项目自定义的公共header部分的高度，可忽略 173 //项目自定义的公共header部分的高度，可忽略
160 let header = document.querySelector(".from-clues-header").offsetHeight; 174 let header = document.querySelector(".from-clues-header").offsetHeight;
175
161 //value为动态计算table界面高度时，减去的其他空白部分，需自行在调试找到临界值，剩下的就是table表格的高度（包含header+body部分） 176 //value为动态计算table界面高度时，减去的其他空白部分，需自行在调试找到临界值，剩下的就是table表格的高度（包含header+body部分）
162 value = value == undefined ? 100 : value; 177 value = value == undefined ? 100 : value;
163 let res = window.innerHeight - parseInt(header) - value; 178 if (document.querySelector(".tags-view-container")) {
179 let tagsView = document.querySelector(".tags-view-container").offsetHeight;
180 var res = window.innerHeight - parseInt(header) - value - parseInt(tagsView);
181 } else {
182 var res = window.innerHeight - parseInt(header) - value;
183 }
164 if (wappered) { 184 if (wappered) {
165 //通过原生方法，获取dom节点的高度------获取element-ui table表格body的元素 185 //通过原生方法，获取dom节点的高度------获取element-ui table表格body的元素
166 let wapper = window.document.getElementsByClassName('el-table__body-wrapper'); 186 let wapper = window.document.getElementsByClassName('el-table__body-wrapper');
......
...@@ -6,14 +6,12 @@ ...@@ -6,14 +6,12 @@
6 <h4>不动产登记上报系统</h4> 6 <h4>不动产登记上报系统</h4>
7 </div> 7 </div>
8 <div class="right-menu"> 8 <div class="right-menu">
9 <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
10 <div class="user"> 9 <div class="user">
11 {{ userName }} 10 {{ userName }}
12 <span @click="onCancel"> 11 <span @click="onCancel">
13 <i class="el-icon-switch-button"></i> 12 <i class="el-icon-switch-button"></i>
14 </span> 13 </span>
15 </div> 14 </div>
16 </el-dropdown>
17 </div> 15 </div>
18 </div> 16 </div>
19 </div> 17 </div>
......
...@@ -194,12 +194,12 @@ export default { ...@@ -194,12 +194,12 @@ export default {
194 @import "~@/styles/_handle.scss"; 194 @import "~@/styles/_handle.scss";
195 195
196 .tags-view-container { 196 .tags-view-container {
197 height: 40px; 197 height: 50px;
198 width: 100%; 198 width: 100%;
199 background: #fff; 199 background: #fff;
200 border-bottom: 1px solid #d8dce5; 200 border-bottom: 1px solid #d8dce5;
201 box-sizing: border-box; 201 box-sizing: border-box;
202 padding-top: 2px; 202 padding-top: 7px;
203 margin-bottom: 7px; 203 margin-bottom: 7px;
204 border-radius: 4px; 204 border-radius: 4px;
205 205
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-01-16 09:10:12 3 * @Date: 2023-01-16 09:10:12
4 * @LastEditors: Please set LastEditors 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-23 15:15:02 5 * @LastEditTime: 2023-03-27 16:54:34
6 * @FilePath: \bdcjg-web\src\main.js 6 * @FilePath: \bdcjg-web\src\main.js
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -19,7 +19,6 @@ import mixin from '@/utils/mixin/theme.js' ...@@ -19,7 +19,6 @@ import mixin from '@/utils/mixin/theme.js'
19 import axios from 'axios' 19 import axios from 'axios'
20 import dataV from '@jiaminghi/data-view'; 20 import dataV from '@jiaminghi/data-view';
21 import * as echarts from "echarts" 21 import * as echarts from "echarts"
22
23 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading' 22 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
24 Vue.mixin(mixin) 23 Vue.mixin(mixin)
25 import './directive/vxe-table' 24 import './directive/vxe-table'
...@@ -68,4 +67,5 @@ axios.get("./config.json") ...@@ -68,4 +67,5 @@ axios.get("./config.json")
68 store, 67 store,
69 render: h => h(App) 68 render: h => h(App)
70 }) 69 })
70 window.document.documentElement.setAttribute("data-theme", 'blue');
71 }) 71 })
...\ No newline at end of file ...\ No newline at end of file
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-27 14:16:28 4 * @LastEditTime: 2023-03-27 17:26:19
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import router from "./router"; 7 import router from "./router";
...@@ -24,7 +24,6 @@ router.beforeEach(async (to, from, next) => { ...@@ -24,7 +24,6 @@ router.beforeEach(async (to, from, next) => {
24 localStorage.removeItem("token"); 24 localStorage.removeItem("token");
25 next(); 25 next();
26 } else { 26 } else {
27 window.document.documentElement.setAttribute("data-theme", 'blue');
28 let code = Vue.prototype.BASE_API.CODE 27 let code = Vue.prototype.BASE_API.CODE
29 //判断token是否存在 28 //判断token是否存在
30 const hasToken = localStorage.getItem("token"); 29 const hasToken = localStorage.getItem("token");
......
1 1 // .dialogCon {
2 // background: #031A46;
3 // -webkit-box-shadow: inset 0px 0px 12px 0px #02d9fd;
4 // box-shadow: inset 0px 0px 12px 0px #02d9fd;
5 // border-radius: 0px 2px 2px 2px;
6 // border: 1px solid #6BC1FC;
7 // padding: 15px;
8 // }
......
1 @import './variables.scss'; 1 @import './variables.scss';
2 @import './mixin.scss'; 2 @import './mixin.scss';
3 @import './transition.scss'; 3 @import './transition.scss';
4
4 // @import './element-ui.scss'; 5 // @import './element-ui.scss';
5 /* CSS 初始化 */ 6 /* CSS 初始化 */
6 html, 7 html,
...@@ -430,16 +431,6 @@ aside { ...@@ -430,16 +431,6 @@ aside {
430 border-radius: 16px; 431 border-radius: 16px;
431 color: #B06974; 432 color: #B06974;
432 } 433 }
433
434 // 弹框中间区域样式
435 .dialogCon {
436 background: #031A46;
437 box-shadow: inset 0px 0px 12px 0px #02D9FD;
438 border-radius: 0px 2px 2px 2px;
439 border: 1px solid #6BC1FC;
440 padding: 15px;
441 }
442
443 // 通过 入库 样式 434 // 通过 入库 样式
444 .adopt, 435 .adopt,
445 .success { 436 .success {
......
...@@ -535,8 +535,12 @@ table td { ...@@ -535,8 +535,12 @@ table td {
535 535
536 // 提示框 536 // 提示框
537 .el-message-box { 537 .el-message-box {
538 background-color: #031a46; 538 background: #031A46;
539 border: 1px solid #5f82c7; 539 -webkit-box-shadow: inset 0px 0px 12px 0px #02d9fd;
540 box-shadow: inset 0px 0px 12px 0px #02d9fd;
541 border-radius: 0px 2px 2px 2px;
542 border: 1px solid #6BC1FC;
543 padding: 15px;
540 544
541 .el-message-box__title { 545 .el-message-box__title {
542 color: white; 546 color: white;
......
...@@ -190,6 +190,21 @@ ...@@ -190,6 +190,21 @@
190 } 190 }
191 } 191 }
192 192
193 .complex-header {
194 .el-table--border th.el-table__cell {
195 border-bottom: 1px solid #458ACF !important;
196 }
197
198 .el-table--border .el-table__cell {
199 border-right: 1px solid #458ACF !important;
200 }
201
202 .el-table--group,
203 .el-table--border {
204 border: 1px solid #458ACF !important;
205 }
206 }
207
193 .el-pagination.is-background .btn-prev, 208 .el-pagination.is-background .btn-prev,
194 .el-pagination.is-background .btn-next { 209 .el-pagination.is-background .btn-next {
195 @extend .bgc; 210 @extend .bgc;
...@@ -228,49 +243,6 @@ ...@@ -228,49 +243,6 @@
228 text-align: right; 243 text-align: right;
229 } 244 }
230 245
231 // 修改弹框样式
232 .modifydialog {
233 .el-dialog__header {
234 text-align: center;
235 margin-bottom: 10px;
236
237 .el-dialog__title {
238 color: white;
239 }
240 }
241
242 .el-form-item__label {
243 color: white;
244 }
245
246 .el-input__inner {
247 background-color: #07388b;
248 }
249
250 .el-input__inner {
251 background: #07388b;
252 border-radius: 2px;
253 border: 1px solid #6bc1fc;
254 }
255
256 .el-textarea__inner {
257 background: #07388b;
258 color: #fff;
259 }
260
261 .el-form-item__label {
262 color: #fff;
263 }
264
265 .el-dialog__header {
266 text-align: center;
267 margin-bottom: 10px;
268
269 .el-dialog__title {
270 color: white;
271 }
272 }
273 }
274 246
275 // 角色管理人员菜单配置弹框样式 247 // 角色管理人员菜单配置弹框样式
276 .roleconfiguration { 248 .roleconfiguration {
...@@ -1000,6 +972,39 @@ ...@@ -1000,6 +972,39 @@
1000 972
1001 // 人员管理角色管理菜单管理修改新增弹框样式 973 // 人员管理角色管理菜单管理修改新增弹框样式
1002 .PersonnelDialog { 974 .PersonnelDialog {
975
976 .el-dialog__header {
977 text-align: center;
978 margin-bottom: 10px;
979
980 .el-dialog__title {
981 color: white;
982 }
983 }
984
985 .el-form-item__label {
986 color: white;
987 }
988
989 .el-input__inner {
990 background-color: #07388b;
991 }
992
993 .el-input__inner {
994 background: #07388b;
995 border-radius: 2px;
996 border: 1px solid #6bc1fc;
997 }
998
999 .el-textarea__inner {
1000 background: #07388b;
1001 color: #fff;
1002 }
1003
1004 .el-form-item__label {
1005 color: #fff;
1006 }
1007
1003 .el-dialog__header { 1008 .el-dialog__header {
1004 .dialog_title { 1009 .dialog_title {
1005 display: -webkit-box; 1010 display: -webkit-box;
...@@ -1029,4 +1034,72 @@ ...@@ -1029,4 +1034,72 @@
1029 .selbig { 1034 .selbig {
1030 width: 500px; 1035 width: 500px;
1031 } 1036 }
1037
1038 }
1039
1040 // 弹框中间区域样式
1041 .dialogCon {
1042 background: #031A46;
1043 box-shadow: inset 0px 0px 12px 0px #02D9FD;
1044 border-radius: 0px 2px 2px 2px;
1045 border: 1px solid #6BC1FC;
1046 padding: 15px;
1047 }
1048
1049 // 修改密码界面样式
1050 .informationpassword {
1051 margin: 36px 200px;
1052 overflow-y: auto;
1053
1054 .form-wrapper {
1055 padding: 24px 120px 0px;
1056
1057 .el-form-item {
1058 margin-bottom: 24px;
1059
1060 .el-form-item__label {
1061 color: #ffffff;
1062 }
1063
1064 .el-input .el-input__inner {
1065 padding: 0 8px;
1066 height: 40px;
1067 line-height: 40px;
1068 border: 1px solid #6bc1fc;
1069 }
1070 }
1071 }
1072
1073 .bottom-wrapper {
1074 padding: 32px 120px 24px;
1075 text-align: center;
1076 }
1032 } 1077 }
1078
1079 // 修改基本信息界面样式
1080 .informationbase {
1081 margin: 0.1875rem 1.0417rem;
1082 overflow-y: auto;
1083 .form-wrapper {
1084 padding: 0px 120px 0px;
1085 .el-form-item {
1086 /deep/.el-form-item__label {
1087 color: #ffffff;
1088 }
1089 ::v-deep .el-input .el-input__inner {
1090 padding: 0 8px;
1091 height: 40px;
1092 line-height: 40px;
1093 border: 1px solid #6bc1fc;
1094 }
1095 }
1096 .el-form-item--small.el-form-item {
1097 margin-bottom: 16px;
1098 }
1099 }
1100 .bottom-wrapper {
1101 padding: 0px 120px 0px;
1102 text-align: center;
1103 }
1104 }
1105
......
...@@ -4,19 +4,19 @@ ...@@ -4,19 +4,19 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="form" :model="form" label-width="100px"> 6 <el-form ref="form" :model="form" label-width="100px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row> 10 <el-row>
11 <el-col :span="4"> 11 <el-col :span="4">
12 <el-form-item label="开始日期" prop="startTime"> 12 <el-form-item label="开始日期" prop="startTime" class="d-flex">
13 <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期" 13 <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期"
14 :picker-options="pickerOptionsStart" v-model="form.startTime" 14 :picker-options="pickerOptionsStart" v-model="form.startTime"
15 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> 15 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 <el-col :span="4"> 18 <el-col :span="4">
19 <el-form-item label="结束日期" prop="endTime"> 19 <el-form-item label="结束日期" prop="endTime" class="d-flex">
20 <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期" 20 <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期"
21 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" 21 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
22 @change="endTimeChange"></el-date-picker> 22 @change="endTimeChange"></el-date-picker>
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
39 </div> 39 </div>
40 </template> 40 </template>
41 <script> 41 <script>
42 import { mapGetters } from "vuex"; 42 import { mapGetters } from "vuex";
43 import efficient from "@/api/efficient"; 43 import efficient from "@/api/efficient";
44 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; 44 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
45 export default { 45 export default {
46 name: "jktj", 46 name: "jktj",
47 data () { 47 data () {
48 return { 48 return {
...@@ -318,10 +318,10 @@ ...@@ -318,10 +318,10 @@
318 }); 318 });
319 }, 319 },
320 }, 320 },
321 }; 321 };
322 </script> 322 </script>
323 <style scoped lang="scss"> 323 <style scoped lang="scss">
324 .jktjDetail { 324 .jktjDetail {
325 height: 100%; 325 height: 100%;
326 display: flex; 326 display: flex;
327 flex-direction: column; 327 flex-direction: column;
...@@ -355,6 +355,6 @@ ...@@ -355,6 +355,6 @@
355 height: 100%; 355 height: 100%;
356 color: #b6b5b5; 356 color: #b6b5b5;
357 } 357 }
358 } 358 }
359 </style> 359 </style>
360 360
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 <div class="jktjDetail form-clues"> 3 <div class="jktjDetail form-clues">
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="form" :model="form" label-width="100px"> 6 <el-form ref="form" :model="form" label-width="80px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME=='jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row> 10 <el-row>
11 <el-col :span="4"> 11 <el-col :span="4">
12 <el-form-item label="行政区"> 12 <el-form-item label="行政区" class="d-flex">
13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区"> 13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 15 </el-option>
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="4"> 19 <el-col :span="4">
20 <el-form-item label="开始日期" prop="startTime"> 20 <el-form-item label="开始日期" prop="startTime" class="d-flex">
21 <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期" 21 <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期"
22 :picker-options="pickerOptionsStart" v-model="form.startTime" 22 :picker-options="pickerOptionsStart" v-model="form.startTime"
23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> 23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 <el-col :span="4"> 26 <el-col :span="4">
27 <el-form-item label="结束日期" prop="endTime"> 27 <el-form-item label="结束日期" prop="endTime" class="d-flex">
28 <el-date-picker type="date" :clearable="false" class="width100" placeholder="结束日期" 28 <el-date-picker type="date" :clearable="false" class="width100" placeholder="结束日期"
29 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" 29 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
30 @change="endTimeChange"></el-date-picker> 30 @change="endTimeChange"></el-date-picker>
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
47 </template> 47 </template>
48 48
49 <script> 49 <script>
50 import { mapGetters } from "vuex"; 50 import { mapGetters } from "vuex";
51 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; 51 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
52 import business from "@/api/business"; 52 import business from "@/api/business";
53 export default { 53 export default {
54 name: "jktj", 54 name: "jktj",
55 data () { 55 data () {
56 return { 56 return {
...@@ -283,10 +283,10 @@ ...@@ -283,10 +283,10 @@
283 }); 283 });
284 }, 284 },
285 }, 285 },
286 }; 286 };
287 </script> 287 </script>
288 <style scoped lang="scss"> 288 <style scoped lang="scss">
289 .jktjDetail { 289 .jktjDetail {
290 height: 100%; 290 height: 100%;
291 display: flex; 291 display: flex;
292 flex-direction: column; 292 flex-direction: column;
...@@ -316,5 +316,5 @@ ...@@ -316,5 +316,5 @@
316 flex: 1; 316 flex: 1;
317 height: 100%; 317 height: 100%;
318 } 318 }
319 } 319 }
320 </style> 320 </style>
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <div class="from-clues-header"> 5 <div class="from-clues-header">
6 <el-form ref="form" :model="form" label-width="100px"> 6 <el-form ref="form" :model="form" label-width="100px">
7 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row> 10 <el-row>
11 <el-col :span="4"> 11 <el-col :span="4">
12 <el-form-item label="行政区"> 12 <el-form-item label="行政区" class="d-flex">
13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区"> 13 <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 15 </el-option>
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="4"> 19 <el-col :span="4">
20 <el-form-item label="开始日期"> 20 <el-form-item label="开始日期" class="d-flex">
21 <el-date-picker class="width100" :clearable="false" type="date" placeholder="开始日期" 21 <el-date-picker class="width100" :clearable="false" type="date" placeholder="开始日期"
22 :picker-options="pickerOptionsStart" v-model="form.startTime" 22 :picker-options="pickerOptionsStart" v-model="form.startTime"
23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> 23 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 <el-col :span="4"> 26 <el-col :span="4">
27 <el-form-item label="结束日期"> 27 <el-form-item label="结束日期" class="d-flex">
28 <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期" 28 <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期"
29 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" 29 :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
30 @change="endTimeChange"></el-date-picker> 30 @change="endTimeChange"></el-date-picker>
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
47 </template> 47 </template>
48 48
49 <script> 49 <script>
50 import { mapGetters } from "vuex"; 50 import { mapGetters } from "vuex";
51 import efficient from "@/api/efficient"; 51 import efficient from "@/api/efficient";
52 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; 52 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
53 export default { 53 export default {
54 name: "jktj", 54 name: "jktj",
55 data () { 55 data () {
56 return { 56 return {
...@@ -211,10 +211,10 @@ ...@@ -211,10 +211,10 @@
211 }); 211 });
212 }, 212 },
213 }, 213 },
214 }; 214 };
215 </script> 215 </script>
216 <style scoped lang="scss"> 216 <style scoped lang="scss">
217 .jktjDetail { 217 .jktjDetail {
218 height: 100%; 218 height: 100%;
219 display: flex; 219 display: flex;
220 flex-direction: column; 220 flex-direction: column;
...@@ -244,5 +244,5 @@ ...@@ -244,5 +244,5 @@
244 flex: 1; 244 flex: 1;
245 height: 100%; 245 height: 100%;
246 } 246 }
247 } 247 }
248 </style> 248 </style>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +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 <el-form-item v-if="BASE_API.THEME=='jg'"> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
......
1 /deep/.el-table--border th.el-table__cell {
2 border-bottom: 1px solid #458ACF !important;
3 }
4
5 /deep/.el-table--border .el-table__cell {
6 border-right: 1px solid #458ACF !important;
7 }
8
9 /deep/.el-table thead.is-group th.el-table__cell { 1 /deep/.el-table thead.is-group th.el-table__cell {
10 background-color: transparent !important; 2 background-color: transparent !important;
11 } 3 }
...@@ -18,8 +10,3 @@ ...@@ -18,8 +10,3 @@
18 .export-excel-wrapper { 10 .export-excel-wrapper {
19 display: inline-block; 11 display: inline-block;
20 } 12 }
...\ No newline at end of file ...\ No newline at end of file
21
22 /deep/.el-table--group,
23 .el-table--border {
24 border: 1px solid #458ACF !important;
25 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +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 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 </el-form> 32 </el-form>
33 </div> 33 </div>
34 <!-- 列表区域 --> 34 <!-- 列表区域 -->
35 <div class="from-clues-content"> 35 <div class="from-clues-content complex-header">
36 <lb-table ref="table" :header-cell-style="headerStyle1" :calcHeight="200" :pagination="false" 36 <lb-table ref="table" :header-cell-style="headerStyle1" :calcHeight="200" :pagination="false"
37 :column="tableData.columns" :data="tableData.data"> 37 :column="tableData.columns" :data="tableData.data">
38 </lb-table> 38 </lb-table>
...@@ -171,6 +171,7 @@ export default { ...@@ -171,6 +171,7 @@ export default {
171 </script> 171 </script>
172 <style scoped lang="scss"> 172 <style scoped lang="scss">
173 @import "../css/index.scss"; 173 @import "../css/index.scss";
174
174 /deep/th.el-table__cell { 175 /deep/th.el-table__cell {
175 height: 0 !important; 176 height: 0 !important;
176 } 177 }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +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 <el-form-item> 7 <el-form-item v-if="BASE_API.THEME == 'jg'">
8 <Breadcrumb /> 8 <Breadcrumb />
9 </el-form-item> 9 </el-form-item>
10 <el-row class="mb-5"> 10 <el-row class="mb-5">
...@@ -33,10 +33,9 @@ ...@@ -33,10 +33,9 @@
33 </el-form> 33 </el-form>
34 </div> 34 </div>
35 <!-- 列表区域 --> 35 <!-- 列表区域 -->
36 <div class="from-clues-content"> 36 <div class="from-clues-content complex-header">
37 <lb-table ref="table" :pagination="false" :calcHeight="200" :column="tableData.columns" :data="tableData.data"> 37 <lb-table ref="table" :pagination="false" :calcHeight="200" :column="tableData.columns" :data="tableData.data">
38 </lb-table> 38 </lb-table>
39
40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false" 39 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false"
41 :column="tableData.columns" :data="tableData.data" :downTitle="downTitle"> 40 :column="tableData.columns" :data="tableData.data" :downTitle="downTitle">
42 </down-lb-table> 41 </down-lb-table>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-17 16:32:50 3 * @Date: 2023-02-17 16:32:50
4 * @LastEditors: Please set LastEditors 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-15 10:42:21 5 * @LastEditTime: 2023-03-27 14:58:51
6 * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue 6 * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <!-- 头部搜索 --> 14 <!-- 头部搜索 -->
15 <div class="from-clues-header"> 15 <div class="from-clues-header">
16 <el-form ref="ruleForm" :model="form" label-width="100px"> 16 <el-form ref="ruleForm" :model="form" label-width="100px">
17 <el-form-item> 17 <el-form-item v-if="BASE_API.THEME == 'jg'">
18 <Breadcrumb /> 18 <Breadcrumb />
19 </el-form-item> 19 </el-form-item>
20 <el-row class="mb-5"> 20 <el-row class="mb-5">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </el-form> 42 </el-form>
43 </div> 43 </div>
44 <!-- 列表区域 --> 44 <!-- 列表区域 -->
45 <div class="from-clues-content"> 45 <div class="from-clues-content complex-header">
46 <lb-table ref="table" :pagination="false" :border="true" :calcHeight="200" :header-cell-style="headerStyle" 46 <lb-table ref="table" :pagination="false" :border="true" :calcHeight="200" :header-cell-style="headerStyle"
47 :column="tableData.columns" :data="tableData.data"> 47 :column="tableData.columns" :data="tableData.data">
48 </lb-table> 48 </lb-table>
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
42 </template> 42 </template>
43 43
44 <script> 44 <script>
45 import sjsbTask from '@/api/sjsbTask.js' 45 import sjsbTask from '@/api/sjsbTask.js'
46 export default { 46 export default {
47 props: { 47 props: {
48 value: { type: Boolean, default: false }, 48 value: { type: Boolean, default: false },
49 taskData: { 49 taskData: {
...@@ -145,33 +145,33 @@ export default { ...@@ -145,33 +145,33 @@ export default {
145 } 145 }
146 } 146 }
147 } 147 }
148 } 148 }
149 </script> 149 </script>
150 <style rel="stylesheet/scss" lang="scss" scoped> 150 <style rel="stylesheet/scss" lang="scss" scoped>
151 /deep/.dialogBox .dialog_title { 151 // /deep/.dialogBox .dialog_title {
152 margin-left: 5px !important; 152 // margin-left: 5px !important;
153 } 153 // }
154 154
155 /deep/.el-dialog__headerbtn { 155 // /deep/.el-dialog__headerbtn {
156 margin-top: -12px; 156 // margin-top: -12px;
157 } 157 // }
158 158
159 .editDialogBox-box { 159 // .editDialogBox-box {
160 margin: 14px 18px 30px 18px !important 160 // margin: 14px 18px 30px 18px !important
161 } 161 // }
162 162
163 /deep/.el-form-item__label { 163 // /deep/.el-form-item__label {
164 color: #fff; 164 // color: #fff;
165 } 165 // }
166 166
167 /deep/.el-form-item { 167 // /deep/.el-form-item {
168 color: #fff; 168 // color: #fff;
169 margin-bottom: 10px; 169 // margin-bottom: 10px;
170 } 170 // }
171 171
172 /deep/ .el-input__inner { 172 // /deep/ .el-input__inner {
173 background-color: transparent; 173 // background-color: transparent;
174 border: 1px solid #458ACF; 174 // border: 1px solid #458ACF;
175 } 175 // }
176 </style> 176 </style>
177 177
......
...@@ -25,15 +25,15 @@ ...@@ -25,15 +25,15 @@
25 </template> 25 </template>
26 26
27 <script> 27 <script>
28 import { 28 import {
29 getUuid, 29 getUuid,
30 judgeSort, 30 judgeSort,
31 realMove, 31 realMove,
32 findParents, 32 findParents,
33 removeTreeListItem, 33 removeTreeListItem,
34 } from "@/utils/operation"; 34 } from "@/utils/operation";
35 import { editDictNode, getChildDictList } from "@/api/dict"; 35 import { editDictNode, getChildDictList } from "@/api/dict";
36 export default { 36 export default {
37 props: { 37 props: {
38 value: { type: Boolean, default: false }, 38 value: { type: Boolean, default: false },
39 details: { 39 details: {
...@@ -355,42 +355,7 @@ export default { ...@@ -355,42 +355,7 @@ export default {
355 this.key++; 355 this.key++;
356 }, 356 },
357 }, 357 },
358 }; 358 };
359 </script> 359 </script>
360 <style rel="stylesheet/scss" lang="scss" scoped> 360 <style rel="stylesheet/scss" lang="scss" scoped>
361
362 /deep/.el-radio {
363 margin-right: 5px !important;
364 display: flex;
365 }
366
367 /deep/.el-radio__label {
368 display: block;
369 }
370
371 /deep/.el-form-item__label {
372 color: #fff;
373 }
374
375 /deep/.el-form-item {
376 color: #fff;
377 margin-bottom: 10px;
378 }
379
380 /deep/.el-radio-group {
381 display: flex;
382 align-items: center;
383 justify-content: center;
384 }
385
386 .editDialogBox-box {
387 margin: 14px 18px 30px 18px !important
388 }
389
390 .opacity-input {
391 /deep/ .el-input__inner {
392 background-color: transparent;
393 border: 1px solid #458ACF;
394 }
395 }
396 </style> 361 </style>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <el-form-item v-if="BASE_API.THEME == 'jg'"> 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" class="mb-5">
10 <el-col :span="6"> 10 <el-col :span="6">
11 <el-form-item label="字典类型编码"> 11 <el-form-item label="字典类型编码">
12 <el-input v-model="ruleForm.dcode" @clear="queryClick" clearable placeholder="字典类型编码"></el-input> 12 <el-input v-model="ruleForm.dcode" @clear="queryClick" clearable placeholder="字典类型编码"></el-input>
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
36 </div> 36 </div>
37 </template> 37 </template>
38 <script> 38 <script>
39 import table from "@/utils/mixin/table" 39 import table from "@/utils/mixin/table"
40 import { getQlxxDictList, refreshDictCache } from "@/api/dict.js" 40 import { getQlxxDictList, refreshDictCache } from "@/api/dict.js"
41 import { datas, sendThis } from "./dictionaries" 41 import { datas, sendThis } from "./dictionaries"
42 import editDialog from "./components/editDialog.vue" 42 import editDialog from "./components/editDialog.vue"
43 export default { 43 export default {
44 name: "djbcx", 44 name: "djbcx",
45 components: { 45 components: {
46 editDialog 46 editDialog
...@@ -126,11 +126,11 @@ export default { ...@@ -126,11 +126,11 @@ export default {
126 this.isDialog = true 126 this.isDialog = true
127 } 127 }
128 } 128 }
129 }; 129 };
130 </script> 130 </script>
131 <style scoped lang="scss"> 131 <style scoped lang="scss">
132 /deep/.dialogBox .dialog_title { 132 /deep/.dialogBox .dialog_title {
133 top: 0; 133 top: 0;
134 margin-left: 5px; 134 margin-left: 5px;
135 } 135 }
136 </style> 136 </style>
......
1 <template> 1 <template>
2 <div class="content"> 2 <div class="informationbase">
3 <div class="user-info">
4 <el-form 3 <el-form
5 ref="form" 4 ref="form"
6 label-width="100px" 5 label-width="100px"
...@@ -38,7 +37,6 @@ ...@@ -38,7 +37,6 @@
38 <btn nativeType="cx" type="primary" @click="updateInfo">更新信息</btn> 37 <btn nativeType="cx" type="primary" @click="updateInfo">更新信息</btn>
39 </div> 38 </div>
40 </div> 39 </div>
41 </div>
42 </template> 40 </template>
43 41
44 <script> 42 <script>
......
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: Please set LastEditors 4 * @LastEditors: xiaomiao 1158771342@qq.com
5 * @LastEditTime: 2023-03-27 09:13:22 5 * @LastEditTime: 2023-03-27 14:26:49
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 v-if="BASE_API.THEME == 'jg'"> 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,35 +63,9 @@ export default { ...@@ -63,35 +63,9 @@ export default {
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 71 </style>
72 .information {
73 display: flex;
74 flex-direction: column;
75
76 .btnColRight {
77 margin-top: 10px;
78 display: flex;
79 justify-content: center;
80 // background-color: cadetblue;
81 height: 30px;
82 }
83
84 /deep/.content {
85 .el-input__inner {
86 background: none;
87 }
88
89 .user-info {
90 background: none;
91 }
92 }
93
94 .boxin {
95 flex: 1;
96 }
97 }</style>
......
1 <template> 1 <template>
2 <div class="content"> 2 <div class="informationpassword">
3 <div class="user-info">
4 <el-form 3 <el-form
5 ref="form" 4 ref="form"
6 label-width="100px" 5 label-width="100px"
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
33 <btn nativeType="cx" type="primary" @click="updatePassword">确认修改</btn> 32 <btn nativeType="cx" type="primary" @click="updatePassword">确认修改</btn>
34 </div> 33 </div>
35 </div> 34 </div>
36 </div>
37 </template> 35 </template>
38 36
39 <script> 37 <script>
...@@ -110,27 +108,4 @@ ...@@ -110,27 +108,4 @@
110 </script> 108 </script>
111 109
112 <style scoped lang="scss"> 110 <style scoped lang="scss">
113 .user-info {
114 margin: 36px 200px;
115 overflow-y: auto;
116 .form-wrapper {
117 padding: 24px 120px 0px;
118 /deep/.el-form-item {
119 margin-bottom: 24px;
120 .el-form-item__label {
121 color: #ffffff;
122 }
123 .el-input .el-input__inner {
124 padding: 0 8px;
125 height: 40px;
126 line-height: 40px;
127 border: 1px solid #6bc1fc;
128 }
129 }
130 }
131 .bottom-wrapper {
132 padding: 32px 120px 24px;
133 text-align: center;
134 }
135 }
136 </style> 111 </style>
......
1 <template> 1 <template>
2 <dialogBox class="modifydialog PersonnelDialog" :isMain="true" width="40%" :title="title" @closeDialog="close" @submitForm="submitForm" 2 <dialogBox class="PersonnelDialog" :isMain="true" width="40%" :title="title" @closeDialog="close" @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">
...@@ -236,35 +236,4 @@ ...@@ -236,35 +236,4 @@
236 } 236 }
237 </script> 237 </script>
238 <style scoped lang="scss"> 238 <style scoped lang="scss">
239 // .modifydialog {
240 // &-con {
241 // background: #031a46;
242 // }
243
244 // /deep/.el-dialog__header {
245 // .dialog_title {
246 // display: -webkit-box;
247 // display: -ms-flexbox;
248 // display: flex;
249 // position: relative;
250 // top: -8px;
251 // width: 28%;
252 // height: 40px;
253 // margin-left: 28px;
254 // -webkit-box-pack: center;
255 // -ms-flex-pack: center;
256 // justify-content: center;
257 // white-space: nowrap;
258
259 // b {
260 // font-size: 16px;
261 // }
262 // }
263
264 // .el-dialog__headerbtn {
265 // right: 20px !important;
266 // top: 23px !important;
267 // }
268 // }
269 // }
270 </style> 239 </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 v-if="BASE_API.THEME == 'jg'"> 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">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <el-input v-model.trim="form.menuName" class="width100" clearable placeholder="菜单名称"></el-input> 11 <el-input v-model.trim="form.menuName" class="width100" clearable placeholder="菜单名称"></el-input>
12 </el-form-item> 12 </el-form-item>
13 </el-col> 13 </el-col>
14 <el-col :span="3" class="btnColRight"> 14 <el-col :span="20" class="btnColRight">
15 <btn nativeType="cx" @click="searchQuery">查询</btn> 15 <btn nativeType="cx" @click="searchQuery">查询</btn>
16 <btn nativeType="cx" @click="handleAdd()">新增菜单</btn> 16 <btn nativeType="cx" @click="handleAdd()">新增菜单</btn>
17 </el-col> 17 </el-col>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 </el-form> 19 </el-form>
20 </div> 20 </div>
21 <div class="from-clues-content"> 21 <div class="from-clues-content">
22 <lb-table :pagination="false" :column="tableData.columns" :calcHeight="200" :data="tablelistData" row-key="id" 22 <lb-table :pagination="false" :column="tableData.columns" :calcHeight="BASE_API.calcHeight" :data="tablelistData" row-key="id"
23 default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"> 23 default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
24 24
25 </lb-table> 25 </lb-table>
......
1 <!-- 新增 & 修改角色 --> 1 <!-- 新增 & 修改角色 -->
2 <template> 2 <template>
3 <dialogBox 3 <dialogBox
4 class="modifydialog PersonnelDialog" 4 class="PersonnelDialog"
5 :title="title" 5 :title="title"
6 :width="'567px'" 6 :width="'567px'"
7 :isMain="true" 7 :isMain="true"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <el-input v-model.trim="form.rolesName" class="width100" clearable placeholder="角色名称"></el-input> 11 <el-input v-model.trim="form.rolesName" class="width100" clearable placeholder="角色名称"></el-input>
12 </el-form-item> 12 </el-form-item>
13 </el-col> 13 </el-col>
14 <el-col :span="3" class="btnColRight"> 14 <el-col :span="20" class="btnColRight">
15 <btn nativeType="cx" @click="searchQuery">查询</btn> 15 <btn nativeType="cx" @click="searchQuery">查询</btn>
16 <btn nativeType="cx" @click="handleAddEdit">增加角色</btn> 16 <btn nativeType="cx" @click="handleAddEdit">增加角色</btn>
17 </el-col> 17 </el-col>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 </el-form> 19 </el-form>
20 </div> 20 </div>
21 <div class="from-clues-content"> 21 <div class="from-clues-content">
22 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200" 22 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="BASE_API.calcHeight"
23 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" 23 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList"
24 row-key="dictid"> 24 row-key="dictid">
25 </lb-table> 25 </lb-table>
......
...@@ -412,6 +412,7 @@ ...@@ -412,6 +412,7 @@
412 }; 412 };
413 </script> 413 </script>
414 <style scoped lang="scss"> 414 <style scoped lang="scss">
415 // @import "~@/styles/mixin.scss"; 415 /deep/.dialogBox .el-dialog__header {
416 // @import "~@/styles/dialogBox.scss"; 416 height: 59px !important;
417 }
417 </style> 418 </style>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item v-if="BASE_API.THEME == 'jg'"> 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 class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="搜索标题"> 10 <el-form-item label="搜索标题">
11 <el-input v-model="form.jobName" placeholder="标题"></el-input> 11 <el-input v-model="form.jobName" placeholder="标题"></el-input>
...@@ -251,5 +251,5 @@ export default { ...@@ -251,5 +251,5 @@ export default {
251 } 251 }
252 </script> 252 </script>
253 <style scoped lang="scss"> 253 <style scoped lang="scss">
254 @import "~@/styles/mixin.scss"; 254 // @import "~@/styles/mixin.scss";
255 </style> 255 </style>
......
1 <template> 1 <template>
2 <dialogBox :title="title" :width="'867px'" class="modifydialog PersonnelDialog" @closeDialog="close" :isMain="true" @submitForm="submitForm" 2 <dialogBox :title="title" :width="'867px'" class="PersonnelDialog" @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">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item v-if="BASE_API.THEME == 'jg'"> 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="mb-5">
9 <el-col :span="4"> 9 <el-col :span="4">
10 <el-form-item label="用户名" prop="loginName"> 10 <el-form-item label="用户名" prop="loginName">
11 <el-input v-model.trim="form.loginName" class="width100" clearable placeholder="用户名"></el-input> 11 <el-input v-model.trim="form.loginName" class="width100" clearable placeholder="用户名"></el-input>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 <!-- 操作按钮 --> 24 <!-- 操作按钮 -->
25 <el-col :span="3" class="btnColRight"> 25 <el-col :span="12" class="btnColRight">
26 <btn nativeType="cx" @click="getTableList">查询</btn> 26 <btn nativeType="cx" @click="getTableList">查询</btn>
27 <btn nativeType="cx" @click="handleAdd">添加人员</btn> 27 <btn nativeType="cx" @click="handleAdd">添加人员</btn>
28 </el-col> 28 </el-col>
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
31 </div> 31 </div>
32 <div class="from-clues-content"> 32 <div class="from-clues-content">
33 <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 33 <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
34 :column="tableData.columns" :calcHeight="200" :data="tableData.data" :expand-row-keys="keyList" row-key="dictid"> 34 :column="tableData.columns" :calcHeight="BASE_API.calcHeight" :data="tableData.data" :expand-row-keys="keyList"
35 row-key="dictid">
35 </lb-table> 36 </lb-table>
36 </div> 37 </div>
37 <EditDialog ref="dialogForm" v-model="isDialog" @ok="reloadTableData" /> 38 <EditDialog ref="dialogForm" v-model="isDialog" @ok="reloadTableData" />
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="dictionary-config from-clues"> 2 <div class="dictionary-config from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="90px"> 4 <el-form ref="form" :model="form" label-width="90px">
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>
......