Skip to content

bdc / bdcjg-web

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

Merge branch 'master' into dev

2 parents bd01f54b 4902817c
Inline Side-by-side
Showing 12 changed files with 172 additions and 137 deletions
1 <!--
2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-09 15:24:53
4 * @LastEditors: xiaomiao 1158771342@qq.com
5 * @LastEditTime: 2023-04-03 09:04:26
6 * @FilePath: \上报\bdcjg-web\src\components\Button.vue
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 -->
1 <template> 9 <template>
2 <el-button class="button" :class="nativeType" @click.prevent="handleClick" :type="nativeType"> 10 <el-button class="button" :disabled="disableds" :class="nativeType" @click.prevent="handleClick" :type="nativeType">
3 <slot></slot> 11 <slot></slot>
4 </el-button> 12 </el-button>
5 </template> 13 </template>
...@@ -11,6 +19,10 @@ ...@@ -11,6 +19,10 @@
11 type: String, 19 type: String,
12 default: 'cx' 20 default: 'cx'
13 }, 21 },
22 disableds: {
23 type: Boolean,
24 default: false
25 }
14 }, 26 },
15 methods: { 27 methods: {
16 handleClick (evt) { 28 handleClick (evt) {
...@@ -20,5 +32,4 @@ ...@@ -20,5 +32,4 @@
20 }; 32 };
21 </script> 33 </script>
22 <style scoped lang="scss"> 34 <style scoped lang="scss">
23
24 </style> 35 </style>
......
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
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: 7px; 202 padding-top: 7px;
203 margin-bottom: 7px; 203 margin-bottom: 10px;
204 border-radius: 4px; 204 border-radius: 4px;
205 205
206 .tags-view-wrapper { 206 .tags-view-wrapper {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-28 10:14:20 4 * @LastEditTime: 2023-04-03 10:12:39
5 --> 5 -->
6 <template> 6 <template>
7 <div class="app-wrapper"> 7 <div class="app-wrapper">
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,7 @@ export default {
74 } 74 }
75 75
76 .app-content { 76 .app-content {
77 overflow-x: hidden; 77 overflow: hidden;
78 box-sizing: border-box; 78 box-sizing: border-box;
79 flex: 1; 79 flex: 1;
80 width: 100%; 80 width: 100%;
......
...@@ -431,79 +431,6 @@ aside { ...@@ -431,79 +431,6 @@ aside {
431 border-radius: 16px; 431 border-radius: 16px;
432 color: #B06974; 432 color: #B06974;
433 } 433 }
434 // 通过 入库 样式
435 .adopt,
436 .success {
437 color: #00FAA8;
438 position: relative;
439 }
440
441 .warehousing {
442 color: #FFCA57;
443 position: relative;
444 }
445
446 .fail {
447 color: #F56C6C;
448 position: relative;
449 }
450
451
452 .adopt::before {
453 position: absolute;
454 content: '';
455 display: block;
456 width: 8px;
457 height: 8px;
458 left: -15px;
459 top: 5px;
460 background: #00FAA8;
461 border-radius: 50%;
462 border: 2px solid rgba(0, 0, 0, 0.2);
463 }
464
465 .warehousing::before {
466 position: absolute;
467 content: '';
468 display: block;
469 width: 8px;
470 height: 8px;
471 left: -15px;
472 top: 4px;
473 background: #FF9933;
474 border-radius: 50%;
475 border: 2px solid rgba(0, 0, 0, 0.2);
476 }
477
478 // 成功 失败
479 .success::before {
480 position: absolute;
481 content: '√';
482 display: block;
483 width: 0;
484 height: 8px;
485 left: -10px;
486 top: 2px;
487 background: #00FAA8;
488 color: #00FAA8;
489 }
490
491 .fail {
492 color: #FF7962;
493 position: relative;
494 }
495
496 .fail::before {
497 position: absolute;
498 content: '!';
499 display: block;
500 width: 0;
501 height: 8px;
502 left: -10px;
503 top: 2px;
504 background: #FF7962;
505 color: #FF7962;
506 }
507 434
508 // 引入字体 435 // 引入字体
509 @font-face { 436 @font-face {
......
...@@ -63,8 +63,6 @@ ...@@ -63,8 +63,6 @@
63 63
64 // 查询表单样式 64 // 查询表单样式
65 .from-clues { 65 .from-clues {
66
67
68 height: 100%; 66 height: 100%;
69 width: 100%; 67 width: 100%;
70 // min-width: 1280px; 68 // min-width: 1280px;
...@@ -95,7 +93,7 @@ ...@@ -95,7 +93,7 @@
95 .el-input__inner { 93 .el-input__inner {
96 background: #07388B; 94 background: #07388B;
97 border-radius: 2px; 95 border-radius: 2px;
98 color: #7A7A7A !important; 96 color: #E3F1FF !important;
99 border: 1px solid #6BC1FC; 97 border: 1px solid #6BC1FC;
100 } 98 }
101 99
...@@ -232,6 +230,80 @@ ...@@ -232,6 +230,80 @@
232 color: #FFFFFF; 230 color: #FFFFFF;
233 } 231 }
234 232
233 // 通过 入库 样式
234 .adopt,
235 .success {
236 color: #00FAA8;
237 position: relative;
238 }
239
240 .warehousing {
241 color: #FFCA57;
242 position: relative;
243 }
244
245 .fail {
246 color: #F56C6C;
247 position: relative;
248 }
249
250
251 .adopt::before {
252 position: absolute;
253 content: '';
254 display: block;
255 width: 8px;
256 height: 8px;
257 left: -15px;
258 top: 5px;
259 background: #00FAA8;
260 border-radius: 50%;
261 border: 2px solid rgba(0, 0, 0, 0.2);
262 }
263
264 .warehousing::before {
265 position: absolute;
266 content: '';
267 display: block;
268 width: 8px;
269 height: 8px;
270 left: -15px;
271 top: 4px;
272 background: #FF9933;
273 border-radius: 50%;
274 border: 2px solid rgba(0, 0, 0, 0.2);
275 }
276
277 // 成功 失败
278 .success::before {
279 position: absolute;
280 content: '√';
281 display: block;
282 width: 0;
283 height: 8px;
284 left: -10px;
285 top: 2px;
286 background: #00FAA8;
287 color: #00FAA8;
288 }
289
290 .fail {
291 color: #FF7962;
292 position: relative;
293 }
294
295 .fail::before {
296 position: absolute;
297 content: '!';
298 display: block;
299 width: 0;
300 height: 8px;
301 left: -10px;
302 top: 2px;
303 background: #FF7962;
304 color: #FF7962;
305 }
306
235 307
236 //*****end*通用表单查询条件，列表样式******// 308 //*****end*通用表单查询条件，列表样式******//
237 .el-range-separator { 309 .el-range-separator {
...@@ -262,6 +334,19 @@ ...@@ -262,6 +334,19 @@
262 .btnColRight { 334 .btnColRight {
263 box-sizing: border-box; 335 box-sizing: border-box;
264 text-align: right; 336 text-align: right;
337
338
339 .is-disabled,
340 .is-disabled:hover,
341 .is-disabled:focus {
342 cursor: wait;
343 background: url("../image/btn.png") no-repeat 0 0;
344 background-size: cover;
345
346 }
347
348
349
265 } 350 }
266 351
267 352
...@@ -441,6 +526,7 @@ ...@@ -441,6 +526,7 @@
441 } 526 }
442 527
443 // 按钮样式 528 // 按钮样式
529
444 .cx { 530 .cx {
445 background: url("../image/btn.png") no-repeat 0 -34px; 531 background: url("../image/btn.png") no-repeat 0 -34px;
446 background-size: cover; 532 background-size: cover;
......
...@@ -69,6 +69,23 @@ ...@@ -69,6 +69,23 @@
69 height: calc(100vh - 230px); 69 height: calc(100vh - 230px);
70 } 70 }
71 71
72 // 通过 入库 样式
73 .adopt,
74 .success {
75 color: #0A852A;
76 position: relative;
77 }
78
79 .warehousing {
80 color: #FFCA57;
81 position: relative;
82 }
83
84 .fail {
85 color: #AB0C0C;
86 position: relative;
87 }
88
72 /* --------------进度条美化---------------- */ 89 /* --------------进度条美化---------------- */
73 ::-webkit-scrollbar { 90 ::-webkit-scrollbar {
74 width: 7px; 91 width: 7px;
...@@ -191,25 +208,6 @@ ...@@ -191,25 +208,6 @@
191 208
192 } 209 }
193 210
194 // 面包屑
195 // .breadcrumb {
196 // width: 80%;
197 // text-indent: 10px;
198 // background: url("~@/image/breadcrumb.png") no-repeat;
199 // background-size: 100% 100%;
200 // line-height: 32px;
201 // height: 32px;
202 // padding-left: 35px;
203 // margin: 8px 0 10px 6px;
204 // color: #CEF8FF;
205 // }
206
207 .el-icon-arrow-right {
208 // width: 2px;
209 // position: relative;
210 // left: 10px;
211 }
212
213 .el-breadcrumb__inner { 211 .el-breadcrumb__inner {
214 color: #CEF8FF !important; 212 color: #CEF8FF !important;
215 } 213 }
...@@ -693,8 +691,6 @@ ...@@ -693,8 +691,6 @@
693 691
694 // 人员管理角色管理菜单管理修改新增弹框样式 692 // 人员管理角色管理菜单管理修改新增弹框样式
695 .PersonnelDialog { 693 .PersonnelDialog {
696
697
698 .el-dialog__headerbtn .el-dialog__close { 694 .el-dialog__headerbtn .el-dialog__close {
699 font-size: 20px; 695 font-size: 20px;
700 color: #4162D8 696 color: #4162D8
...@@ -789,13 +785,13 @@ ...@@ -789,13 +785,13 @@
789 height: calc(100% - 58px); 785 height: calc(100% - 58px);
790 display: flex; 786 display: flex;
791 flex-direction: column; 787 flex-direction: column;
788
792 .from-clues-content { 789 .from-clues-content {
793 flex: 1; 790 flex: 1;
794 height: 100%; 791 height: 100%;
795 } 792 }
796 } 793 }
797 794
798
799 // 修改基本信息界面样式 795 // 修改基本信息界面样式
800 .informationbase { 796 .informationbase {
801 margin: 0.1875rem 1.0417rem; 797 margin: 0.1875rem 1.0417rem;
......
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
113 @include font_color("submenuColor"); 113 @include font_color("submenuColor");
114 border-right: 5px solid #36CEB6; 114 border-right: 5px solid #36CEB6;
115 box-sizing: border-box; 115 box-sizing: border-box;
116
116 .svg-icon { 117 .svg-icon {
117 color: #1ea6f8 !important; 118 color: #1ea6f8 !important;
118 } 119 }
...@@ -366,7 +367,7 @@ ...@@ -366,7 +367,7 @@
366 } 367 }
367 368
368 .el-menu-item span { 369 .el-menu-item span {
369 white-space: nowrap !important; 370 // white-space: nowrap !important;
370 word-break: break-all; 371 word-break: break-all;
371 line-height: 20px; 372 line-height: 20px;
372 flex: 1; 373 flex: 1;
......
1 /* 1
2 * @Description: 2
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-31 09:57:20
5 */
6 import filter from '@/utils/filter.js' 3 import filter from '@/utils/filter.js'
7 class data extends filter { 4 class data extends filter {
8 constructor() { 5 constructor() {
...@@ -35,7 +32,7 @@ class data extends filter { ...@@ -35,7 +32,7 @@ class data extends filter {
35 { 32 {
36 label: "业务号", 33 label: "业务号",
37 prop: "ywh", 34 prop: "ywh",
38 minWidth: 150, 35 minWidth: 120,
39 }, 36 },
40 { 37 {
41 label: "不动产单元号", 38 label: "不动产单元号",
......
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
55 55
56 <script> 56 <script>
57 57
58 import columnar from "@/components/Echart/Columnar"; 58 import columnar from "@/components/Echart/Columnar";
59 import work from "@/api/work"; 59 import work from "@/api/work";
60 export default { 60 export default {
61 data () { 61 data () {
62 return { 62 return {
63 // 日均接入量 63 // 日均接入量
...@@ -113,11 +113,11 @@ export default { ...@@ -113,11 +113,11 @@ export default {
113 }); 113 });
114 }, 114 },
115 }, 115 },
116 }; 116 };
117 </script> 117 </script>
118 118
119 <style lang="scss" scoped> 119 <style lang="scss" scoped>
120 .leftcard { 120 .leftcard {
121 width: 30%; 121 width: 30%;
122 display: flex; 122 display: flex;
123 height: calc(100vh - 114px); 123 height: calc(100vh - 114px);
...@@ -216,10 +216,12 @@ export default { ...@@ -216,10 +216,12 @@ export default {
216 content: ""; 216 content: "";
217 width: 0.0052rem; 217 width: 0.0052rem;
218 height: 0.4688rem; 218 height: 0.4688rem;
219 background: linear-gradient(180deg, 219 background: linear-gradient(
220 180deg,
220 #091b4c 0%, 221 #091b4c 0%,
221 #47b5e0 56%, 222 #47b5e0 56%,
222 #091b4c 100%); 223 #091b4c 100%
224 );
223 } 225 }
224 226
225 .cardcontent-right { 227 .cardcontent-right {
...@@ -238,18 +240,26 @@ export default { ...@@ -238,18 +240,26 @@ export default {
238 } 240 }
239 241
240 p { 242 p {
243 width: 1.25rem;
241 margin-bottom: 0.0417rem; 244 margin-bottom: 0.0417rem;
242 245
243 span:nth-child(1) { 246 span:nth-child(1) {
247 text-align: right;
248 display: inline-block;
249
250 width: 45%;
244 margin-right: 0.0781rem; 251 margin-right: 0.0781rem;
245 } 252 }
246 253
247 span:nth-child(2) { 254 span:nth-child(2) {
255 text-align: left;
256 display: inline-block;
257 width: 45%;
248 font-size: 20px; 258 font-size: 20px;
249 font-weight: 900; 259 font-weight: 900;
250 } 260 }
251 } 261 }
252 } 262 }
253 } 263 }
254 } 264 }
255 </style> 265 </style>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
57 57
58 let res = await work.getdjywltotal(p); 58 let res = await work.getdjywltotal(p);
59 res.result.map((item, index) => { 59 res.result.map((item, index) => {
60 this.config.data.push([index, item.AREACODE, item.ywtotal]) 60 this.config.data.push([index + 1, item.AREACODE, item.ywtotal])
61 61
62 }); 62 });
63 63
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <el-form-item> 25 <el-form-item>
26 <btn nativeType="cz" @click="handleResetForm">重置</btn> 26 <btn nativeType="cz" @click="handleResetForm">重置</btn>
27 <btn nativeType="cx" @click="featchDataSelf">查询</btn> 27 <btn nativeType="cx" @click="featchDataSelf">查询</btn>
28 <btn nativeType="cx" @click="handlesetExport2Excel(downTitle)">导出</btn> 28 <btn nativeType="cx" :disableds="disableds" @click="handlesetExport2Excel(downTitle)">导出</btn>
29 </el-form-item> 29 </el-form-item>
30 </el-col> 30 </el-col>
31 </el-row> 31 </el-row>
...@@ -45,17 +45,17 @@ ...@@ -45,17 +45,17 @@
45 </template> 45 </template>
46 46
47 <script> 47 <script>
48 // 接入质量评价表 48 // 接入质量评价表
49 // 引入表格头部数据 49 // 引入表格头部数据
50 import data from "./data"; 50 import data from "./data";
51 // 引入table混入方法 51 // 引入table混入方法
52 import tableMixin from "@/mixins/tableMixin.js"; 52 import tableMixin from "@/mixins/tableMixin.js";
53 // 导出excel表格 53 // 导出excel表格
54 import downLbTable from '@/components/DownLbTable' 54 import downLbTable from '@/components/DownLbTable'
55 // 获取时间 55 // 获取时间
56 import { getCurrentDate, setExport2Excel } from "@/utils/tools"; 56 import { getCurrentDate, setExport2Excel } from "@/utils/tools";
57 import { dataReceiveQuality } from "@/api/statistics.js"; 57 import { dataReceiveQuality } from "@/api/statistics.js";
58 export default { 58 export default {
59 name: "jsbwcx", 59 name: "jsbwcx",
60 components: { 60 components: {
61 downLbTable 61 downLbTable
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
63 mixins: [tableMixin], 63 mixins: [tableMixin],
64 data () { 64 data () {
65 return { 65 return {
66
66 pickerOptionsStart: { 67 pickerOptionsStart: {
67 disabledDate: (time) => { 68 disabledDate: (time) => {
68 let endDateVal = this.form.endTime; 69 let endDateVal = this.form.endTime;
...@@ -114,7 +115,8 @@ export default { ...@@ -114,7 +115,8 @@ export default {
114 data: [] 115 data: []
115 }, 116 },
116 // 导出表格标题 117 // 导出表格标题
117 downTitle: '' 118 downTitle: '',
119 disableds: false,
118 } 120 }
119 }, 121 },
120 watch: { 122 watch: {
...@@ -151,6 +153,11 @@ export default { ...@@ -151,6 +153,11 @@ export default {
151 } 153 }
152 }, 154 },
153 handlesetExport2Excel (val) { 155 handlesetExport2Excel (val) {
156 this.disableds = true
157 setTimeout(() => {
158 this.disableds = false
159 }, 1000);
160
154 setExport2Excel(val) 161 setExport2Excel(val)
155 }, 162 },
156 // 初始化数据 163 // 初始化数据
...@@ -167,13 +174,13 @@ export default { ...@@ -167,13 +174,13 @@ export default {
167 this.featchDataSelf() 174 this.featchDataSelf()
168 } 175 }
169 } 176 }
170 } 177 }
171 </script> 178 </script>
172 <style scoped lang="scss"> 179 <style scoped lang="scss">
173 @import "../css/index.scss"; 180 @import "../css/index.scss";
174 181
175 /deep/th.el-table__cell { 182 /deep/th.el-table__cell {
176 height: 0 !important; 183 height: 0 !important;
177 } 184 }
178 </style> 185 </style>
179 186
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 </el-form-item> 7 </el-form-item>
8 <el-row class="mb-5"> 8 <el-row class="mb-5">
9 <el-col :span="4"> 9 <el-col :span="4">
10 <el-form-item label="菜单名称" prop="rolesName"> 10 <el-form-item label="角色名称" prop="rolesName">
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>
......