Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents e204bc5c cca683d1
Inline Side-by-side
Showing 4 changed files with 82 additions and 65 deletions
...@@ -197,6 +197,7 @@ export default { ...@@ -197,6 +197,7 @@ export default {
197 color: #fff; 197 color: #fff;
198 text-indent: 6px; 198 text-indent: 6px;
199 letter-spacing: 2px; 199 letter-spacing: 2px;
200 font-family: albbsht;
200 } 201 }
201 } 202 }
202 203
......
No preview for this file type
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 @import './element-ui.scss'; 4 @import "./element-ui.scss";
5 @import './sidebar.scss'; 5 @import "./sidebar.scss";
6 @import './btn.scss'; 6 @import "./btn.scss";
7
8 // 字体
9 @font-face {
10 font-family: "albbsht";
11 font-weight: 200;
12 src: url("./AlimamaShuHeiTi-Bold.ttf");
13 /* src: url("//at.alicdn.com/wf/webfont/ZU6UneTxNcLy/v9AokMyfgvHu.woff2") format("woff2"),
14 url("//at.alicdn.com/wf/webfont/ZU6UneTxNcLy/paYiW177n7Bc.woff") format("woff"); */
15 font-display: swap;
16 }
7 17
8 /* CSS 初始化 */ 18 /* CSS 初始化 */
9 html, 19 html,
...@@ -85,7 +95,8 @@ body { ...@@ -85,7 +95,8 @@ body {
85 -moz-osx-font-smoothing: grayscale; 95 -moz-osx-font-smoothing: grayscale;
86 -webkit-font-smoothing: antialiased; 96 -webkit-font-smoothing: antialiased;
87 text-rendering: optimizeLegibility; 97 text-rendering: optimizeLegibility;
88 font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; 98 font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
99 Microsoft YaHei, Arial, sans-serif;
89 } 100 }
90 101
91 html { 102 html {
...@@ -161,7 +172,7 @@ div:focus { ...@@ -161,7 +172,7 @@ div:focus {
161 } 172 }
162 173
163 .move { 174 .move {
164 color: #409EFF; 175 color: #409eff;
165 font-size: 24px; 176 font-size: 24px;
166 } 177 }
167 178
...@@ -192,7 +203,8 @@ aside { ...@@ -192,7 +203,8 @@ aside {
192 display: block; 203 display: block;
193 line-height: 32px; 204 line-height: 32px;
194 font-size: 16px; 205 font-size: 16px;
195 font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; 206 font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
207 Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
196 color: #2c3e50; 208 color: #2c3e50;
197 -webkit-font-smoothing: antialiased; 209 -webkit-font-smoothing: antialiased;
198 -moz-osx-font-smoothing: grayscale; 210 -moz-osx-font-smoothing: grayscale;
...@@ -251,7 +263,7 @@ aside { ...@@ -251,7 +263,7 @@ aside {
251 } 263 }
252 264
253 .text-center { 265 .text-center {
254 text-align: center 266 text-align: center;
255 } 267 }
256 268
257 .width100 { 269 .width100 {
...@@ -266,7 +278,13 @@ aside { ...@@ -266,7 +278,13 @@ aside {
266 text-align: right; 278 text-align: right;
267 padding-right: 20px; 279 padding-right: 20px;
268 transition: 600ms ease position; 280 transition: 600ms ease position;
269 background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); 281 background: linear-gradient(
282 90deg,
283 rgba(32, 182, 249, 1) 0%,
284 rgba(32, 182, 249, 1) 0%,
285 rgba(33, 120, 241, 1) 100%,
286 rgba(33, 120, 241, 1) 100%
287 );
270 288
271 .subtitle { 289 .subtitle {
272 font-size: 20px; 290 font-size: 20px;
...@@ -314,17 +332,16 @@ aside { ...@@ -314,17 +332,16 @@ aside {
314 .delete-button { 332 .delete-button {
315 line-height: 32px; 333 line-height: 32px;
316 cursor: pointer; 334 cursor: pointer;
317 color: #FF7115; 335 color: #ff7115;
318 font-size: 20px; 336 font-size: 20px;
319 margin-right: 5px; 337 margin-right: 5px;
320
321 } 338 }
322 339
323 .add-button { 340 .add-button {
324 line-height: 32px; 341 line-height: 32px;
325 color: #2FA5FF; 342 color: #2fa5ff;
326 cursor: pointer; 343 cursor: pointer;
327 font-size: 20PX; 344 font-size: 20px;
328 } 345 }
329 346
330 .description { 347 .description {
...@@ -352,13 +369,13 @@ aside { ...@@ -352,13 +369,13 @@ aside {
352 .disabled { 369 .disabled {
353 color: #87adf3; 370 color: #87adf3;
354 background-color: #fff; 371 background-color: #fff;
355 cursor: not-allowed 372 cursor: not-allowed;
356 } 373 }
357 374
358 .bad { 375 .bad {
359 color: #f00; 376 color: #f00;
360 background-color: #fff; 377 background-color: #fff;
361 cursor: not-allowed 378 cursor: not-allowed;
362 } 379 }
363 380
364 .allow, 381 .allow,
...@@ -382,7 +399,7 @@ aside { ...@@ -382,7 +399,7 @@ aside {
382 } 399 }
383 400
384 .suspend::before { 401 .suspend::before {
385 content: ''; 402 content: "";
386 position: absolute; 403 position: absolute;
387 left: 5px; 404 left: 5px;
388 top: 45%; 405 top: 45%;
...@@ -424,7 +441,6 @@ aside { ...@@ -424,7 +441,6 @@ aside {
424 } 441 }
425 } 442 }
426 443
427
428 .linshiIcon { 444 .linshiIcon {
429 position: relative; 445 position: relative;
430 446
...@@ -474,7 +490,7 @@ aside { ...@@ -474,7 +490,7 @@ aside {
474 height: 0; 490 height: 0;
475 border-width: 0px 0px 55px 55px; 491 border-width: 0px 0px 55px 55px;
476 border-style: none solid solid; 492 border-style: none solid solid;
477 border-color: transparent transparent #67C23A; 493 border-color: transparent transparent #67c23a;
478 position: absolute; 494 position: absolute;
479 top: 0; 495 top: 0;
480 right: 0; 496 right: 0;
...@@ -508,4 +524,4 @@ aside { ...@@ -508,4 +524,4 @@ aside {
508 top: 0; 524 top: 0;
509 right: 0; 525 right: 0;
510 transform: rotate(-90deg); 526 transform: rotate(-90deg);
511 }
...\ No newline at end of file ...\ No newline at end of file
527 }
......
...@@ -107,59 +107,59 @@ class data extends filter { ...@@ -107,59 +107,59 @@ class data extends filter {
107 type: 'index' 107 type: 'index'
108 }, 108 },
109 { 109 {
110 prop: 'nodecode', 110 prop: 'djywbm',
111 label: '权利类型代码',
111 width: '105', 112 width: '105',
112 label: '登记情形编码', 113 // render: (h, scope) => {
113 render: (h, scope) => { 114 // return (
114 return ( 115 // <el-input placeholder="权利类型代码" value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val; orderNoChange() }}></el-input>
115 <el-input placeholder="登记情形编码" value={scope.row[scope.column.property]} 116 // )
116 onInput={(val) => { scope.row[scope.column.property] = val; vm.orderNoChange() }} maxlength="8"> 117 // }
117 </el-input>
118 )
119 }
120 }, 118 },
121 { 119 {
122 prop: 'nodename', 120 prop: 'djywmc',
123 label: '登记情形名称', 121 label: '权利类型名称',
124 render: (h, scope) => { 122 // render: (h, scope) => {
125 return ( 123 // return (
126 <el-input placeholder="登记情形名称" value={scope.row[scope.column.property]} 124 // <el-input placeholder="权利类型名称" value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val; orderNoChange() }}></el-input>
127 onInput={(val) => { scope.row[scope.column.property] = val; vm.orderNoChange() }}> 125 // )
128 </el-input> 126 // }
129 )
130 }
131 }, 127 },
132 { 128 {
133 prop: 'djywbm', 129 prop: 'nodecode',
134 label: '登记业务编码',
135 width: '105', 130 width: '105',
136 render: (h, scope) => { 131 label: '登记类型代码',
137 return ( 132 // render: (h, scope) => {
138 <el-input placeholder="登记业务编码" value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val; orderNoChange() }}></el-input> 133 // return (
139 ) 134 // <el-input placeholder="登记情形编码" value={scope.row[scope.column.property]}
140 } 135 // onInput={(val) => { scope.row[scope.column.property] = val; vm.orderNoChange() }} maxlength="8">
141 }, 136 // </el-input>
142 { 137 // )
143 prop: 'djywmc', 138 // }
144 label: '登记业务名称',
145 render: (h, scope) => {
146 return (
147 <el-input placeholder="登记业务名称" value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val; orderNoChange() }}></el-input>
148 )
149 }
150 }, 139 },
151 { 140 {
152 label: '移动', 141 prop: 'nodename',
153 width: '100', 142 label: '登记类型名称',
154 render: (h, scope) => { 143 // render: (h, scope) => {
155 return ( 144 // return (
156 <div> 145 // <el-input placeholder="登记情形名称" value={scope.row[scope.column.property]}
157 <el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row, 'djqx') }}>上移</el-button> 146 // onInput={(val) => { scope.row[scope.column.property] = val; vm.orderNoChange() }}>
158 <el-button type='text' disabled={(scope.$index + 1) == vm.form.djlx.length} onClick={() => { vm.moveDown(scope.$index, scope.row, 'djqx') }}>下移</el-button > 147 // </el-input>
159 </div> 148 // )
160 ) 149 // }
161 }
162 } 150 }
151 // {
152 // label: '移动',
153 // width: '100',
154 // render: (h, scope) => {
155 // return (
156 // <div>
157 // <el-button type='text' disabled={scope.$index == 0} onClick={() => { vm.moveUpward(scope.$index, scope.row, 'djqx') }}>上移</el-button>
158 // <el-button type='text' disabled={(scope.$index + 1) == vm.form.djlx.length} onClick={() => { vm.moveDown(scope.$index, scope.row, 'djqx') }}>下移</el-button >
159 // </div>
160 // )
161 // }
162 // }
163 ] 163 ]
164 } 164 }
165 clxxCol () { 165 clxxCol () {
......