Commit 263cb5c1baab15e0def7361045122147d1821944

Authored by 陈鑫涛
1 parent 15ba059d

修复packjson

Showing 33 changed files with 334 additions and 209 deletions
package.json
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 "loading-view-vue": "^1.0.3", 28 "loading-view-vue": "^1.0.3",
29 "miment": "^0.0.9", 29 "miment": "^0.0.9",
30 "moment": "^2.29.1", 30 "moment": "^2.29.1",
31 - "monaco-editor": "^0.20.0", 31 + "monaco-editor": "0.28.1",
32 "normalize.css": "7.0.0", 32 "normalize.css": "7.0.0",
33 "nprogress": "0.2.0", 33 "nprogress": "0.2.0",
34 "qrcodejs2": "0.0.2", 34 "qrcodejs2": "0.0.2",
@@ -66,13 +66,12 @@ @@ -66,13 +66,12 @@
66 "eventsource-polyfill": "0.9.6", 66 "eventsource-polyfill": "0.9.6",
67 "file-loader": "1.1.11", 67 "file-loader": "1.1.11",
68 "friendly-errors-webpack-plugin": "1.7.0", 68 "friendly-errors-webpack-plugin": "1.7.0",
69 - "html-webpack-plugin": "4.0.0-alpha", 69 + "html-webpack-plugin": "3.2.0",
70 "iframe-resizer": "^4.3.6", 70 "iframe-resizer": "^4.3.6",
71 "js-md5": "^0.7.3", 71 "js-md5": "^0.7.3",
72 "mini-css-extract-plugin": "0.4.1", 72 "mini-css-extract-plugin": "0.4.1",
73 "monaco-editor-webpack-plugin": "^4.1.1", 73 "monaco-editor-webpack-plugin": "^4.1.1",
74 "node-notifier": "5.2.1", 74 "node-notifier": "5.2.1",
75 - "node-sass": "^4.7.2",  
76 "optimize-css-assets-webpack-plugin": "5.0.0", 75 "optimize-css-assets-webpack-plugin": "5.0.0",
77 "ora": "3.0.0", 76 "ora": "3.0.0",
78 "path-to-regexp": "2.4.0", 77 "path-to-regexp": "2.4.0",
@@ -81,7 +80,8 @@ @@ -81,7 +80,8 @@
81 "postcss-loader": "2.1.6", 80 "postcss-loader": "2.1.6",
82 "postcss-url": "7.3.2", 81 "postcss-url": "7.3.2",
83 "rimraf": "2.6.2", 82 "rimraf": "2.6.2",
84 - "sass-loader": "7.0.3", 83 + "sass": "^1.77.0",
  84 + "sass-loader": "^7.3.0",
85 "script-ext-html-webpack-plugin": "2.0.1", 85 "script-ext-html-webpack-plugin": "2.0.1",
86 "semver": "5.5.0", 86 "semver": "5.5.0",
87 "shelljs": "0.8.2", 87 "shelljs": "0.8.2",
src/assets/styles/screen.scss
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 height: 100%; 226 height: 100%;
227 } 227 }
228 228
229 - /deep/ .el-tabs--border-card { 229 + :deep(el-tabs--border-card) {
230 border: 0; 230 border: 0;
231 231
232 .el-tabs__header { 232 .el-tabs__header {
@@ -416,11 +416,11 @@ li { @@ -416,11 +416,11 @@ li {
416 padding: 5px; 416 padding: 5px;
417 } 417 }
418 418
419 -/deep/ .vue-ruler-h { 419 +:deep(vue-ruler-h) {
420 opacity: 0.3; 420 opacity: 0.3;
421 } 421 }
422 422
423 -/deep/ .vue-ruler-v { 423 +:deep(vue-ruler-v) {
424 opacity: 0.3; 424 opacity: 0.3;
425 } 425 }
426 426
@@ -440,7 +440,7 @@ li { @@ -440,7 +440,7 @@ li {
440 height: calc(100vh - 80px); 440 height: calc(100vh - 80px);
441 text-align: center; 441 text-align: center;
442 442
443 - /deep/.el-tabs__header { 443 + :deep(el-tabs__header) {
444 width: 30%; 444 width: 30%;
445 margin-right: 0; 445 margin-right: 0;
446 446
@@ -459,7 +459,7 @@ li { @@ -459,7 +459,7 @@ li {
459 } 459 }
460 } 460 }
461 461
462 - /deep/.el-tabs__content { 462 + :deep(el-tabs__content) {
463 width: 70%; 463 width: 70%;
464 } 464 }
465 } 465 }
@@ -495,7 +495,7 @@ li { @@ -495,7 +495,7 @@ li {
495 } 495 }
496 } 496 }
497 497
498 - /deep/.el-tabs__content { 498 + :deep(el-tabs__content) {
499 padding: 0; 499 padding: 0;
500 } 500 }
501 } 501 }
src/assets/styles/screenDesigner.scss
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 width: 300px; 28 width: 300px;
29 } 29 }
30 30
31 - /deep/ .el-tabs--border-card { 31 + :deep(el-tabs--border-card) {
32 border: 0; 32 border: 0;
33 .el-tabs__header { 33 .el-tabs__header {
34 background: transparent; 34 background: transparent;
src/components/AnjiPlus/anji-crud/anji-crud.vue
@@ -923,6 +923,7 @@ export default { @@ -923,6 +923,7 @@ export default {
923 display: flex; 923 display: flex;
924 flex: 1; 924 flex: 1;
925 flex-direction: column; 925 flex-direction: column;
  926 +
926 .main_part { 927 .main_part {
927 display: flex; 928 display: flex;
928 flex-direction: column; 929 flex-direction: column;
@@ -935,49 +936,63 @@ export default { @@ -935,49 +936,63 @@ export default {
935 position: relative; 936 position: relative;
936 } 937 }
937 } 938 }
938 -/deep/.button { 939 +
  940 +// 使用 :deep() 替代 /deep/
  941 +:deep(.button) {
939 box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.08); 942 box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.08);
940 border-radius: 6px; 943 border-radius: 6px;
941 } 944 }
942 -/deep/.el-table th > .cell { 945 +
  946 +:deep(.el-table th > .cell) {
943 text-align: center; 947 text-align: center;
944 } 948 }
945 -/deep/.el-table .cell { 949 +
  950 +:deep(.el-table .cell) {
946 text-align: center; 951 text-align: center;
947 } 952 }
948 -/deep/.elTable { 953 +
  954 +:deep(.elTable) {
949 margin: 10px 0 50px; 955 margin: 10px 0 50px;
950 } 956 }
  957 +
951 .el-table { 958 .el-table {
952 // 看这里!!! 959 // 看这里!!!
953 // 深度选择器,去除默认的padding 960 // 深度选择器,去除默认的padding
954 - /deep/ th { 961 + :deep(th) {
955 padding: 0; 962 padding: 0;
956 height: 36px; 963 height: 36px;
957 } 964 }
958 - /deep/ td { 965 +
  966 + :deep(td) {
959 padding: 0; 967 padding: 0;
960 height: 36px; 968 height: 36px;
961 } 969 }
962 } 970 }
963 -/deep/.el-table--striped .el-table__body tr.el-table__row--striped td { 971 +
  972 +:deep(.el-table--striped .el-table__body tr.el-table__row--striped td) {
964 background: #f9fbfd; 973 background: #f9fbfd;
965 } 974 }
  975 +
966 .screenFlex { 976 .screenFlex {
967 display: flex; 977 display: flex;
968 } 978 }
  979 +
969 .searchFormFlex { 980 .searchFormFlex {
970 flex: 1; 981 flex: 1;
971 } 982 }
  983 +
972 .screenButtons { 984 .screenButtons {
973 padding-left: 20px; 985 padding-left: 20px;
974 } 986 }
  987 +
975 .style-btn { 988 .style-btn {
976 pointer-events: none; 989 pointer-events: none;
977 } 990 }
  991 +
978 .page-container { 992 .page-container {
979 height: 100%; 993 height: 100%;
980 position: relative; 994 position: relative;
  995 +
981 .left-container { 996 .left-container {
982 width: 20%; 997 width: 20%;
983 position: absolute; 998 position: absolute;
@@ -990,6 +1005,7 @@ export default { @@ -990,6 +1005,7 @@ export default {
990 overflow-y: auto; 1005 overflow-y: auto;
991 height: 100%; 1006 height: 100%;
992 } 1007 }
  1008 +
993 .right-container { 1009 .right-container {
994 width: calc(80% - 5px); 1010 width: calc(80% - 5px);
995 position: absolute; 1011 position: absolute;
@@ -1001,49 +1017,59 @@ export default { @@ -1001,49 +1017,59 @@ export default {
1001 height: 100%; 1017 height: 100%;
1002 } 1018 }
1003 } 1019 }
  1020 +
1004 .el-table .cell, 1021 .el-table .cell,
1005 .el-table td div { 1022 .el-table td div {
1006 overflow: hidden; 1023 overflow: hidden;
1007 text-overflow: ellipsis; 1024 text-overflow: ellipsis;
1008 } 1025 }
  1026 +
1009 .el-dropdown { 1027 .el-dropdown {
1010 font-size: 12px; 1028 font-size: 12px;
1011 display: inline; 1029 display: inline;
1012 color: #5887fb; 1030 color: #5887fb;
1013 cursor: pointer; 1031 cursor: pointer;
1014 } 1032 }
  1033 +
1015 .el-dropdown-menu--mini .el-dropdown-menu__item { 1034 .el-dropdown-menu--mini .el-dropdown-menu__item {
1016 min-width: 80px; 1035 min-width: 80px;
1017 max-width: 110px; 1036 max-width: 110px;
1018 float: right; 1037 float: right;
  1038 +
1019 .el-button--text { 1039 .el-button--text {
1020 float: right; 1040 float: right;
1021 } 1041 }
  1042 +
1022 &:hover { 1043 &:hover {
1023 background: none !important; 1044 background: none !important;
1024 } 1045 }
1025 - /deep/.el-button--text:hover,  
1026 - .el-button--text:focus { 1046 +
  1047 + :deep(.el-button--text:hover),
  1048 + :deep(.el-button--text:focus) {
1027 color: #799ffc !important; 1049 color: #799ffc !important;
1028 background-color: #ecf5ff !important; 1050 background-color: #ecf5ff !important;
1029 border-color: transparent; 1051 border-color: transparent;
1030 } 1052 }
  1053 +
1031 .el-button--mini { 1054 .el-button--mini {
1032 float: right; 1055 float: right;
1033 } 1056 }
  1057 +
1034 .el-button--text:hover, 1058 .el-button--text:hover,
1035 .el-button--text:focus { 1059 .el-button--text:focus {
1036 color: #799ffc; 1060 color: #799ffc;
1037 border-color: transparent; 1061 border-color: transparent;
1038 } 1062 }
  1063 +
1039 .el-button + .el-button { 1064 .el-button + .el-button {
1040 margin-left: 0 !important; 1065 margin-left: 0 !important;
1041 float: right; 1066 float: right;
1042 } 1067 }
1043 } 1068 }
1044 -/deep/.el-pagination.is-background .btn-prev,  
1045 -.el-pagination.is-background .btn-next,  
1046 -.el-pagination.is-background .el-pager li { 1069 +
  1070 +:deep(.el-pagination.is-background .btn-prev),
  1071 +:deep(.el-pagination.is-background .btn-next),
  1072 +:deep(.el-pagination.is-background .el-pager li) {
1047 margin: 0 5px; 1073 margin: 0 5px;
1048 border-radius: 2px; 1074 border-radius: 2px;
1049 background-color: #f4f4f5; 1075 background-color: #f4f4f5;
@@ -1051,16 +1077,19 @@ export default { @@ -1051,16 +1077,19 @@ export default {
1051 min-width: 30px; 1077 min-width: 30px;
1052 border-radius: 2px; 1078 border-radius: 2px;
1053 } 1079 }
1054 -/deep/.el-pagination.is-background .el-pager li:not(.disabled).active { 1080 +
  1081 +:deep(.el-pagination.is-background .el-pager li:not(.disabled).active) {
1055 background-color: #5887fb; 1082 background-color: #5887fb;
1056 color: #ffffff; 1083 color: #ffffff;
1057 border-radius: 4px; 1084 border-radius: 4px;
1058 } 1085 }
  1086 +
1059 .page_bottom { 1087 .page_bottom {
1060 width: 100%; 1088 width: 100%;
1061 position: absolute; 1089 position: absolute;
1062 bottom: 0; 1090 bottom: 0;
1063 } 1091 }
  1092 +
1064 .pagination { 1093 .pagination {
1065 display: flex; 1094 display: flex;
1066 flex-direction: row; 1095 flex-direction: row;
@@ -1068,37 +1097,45 @@ export default { @@ -1068,37 +1097,45 @@ export default {
1068 margin-bottom: 14px; 1097 margin-bottom: 14px;
1069 margin-right: 20px; 1098 margin-right: 20px;
1070 } 1099 }
1071 -.el-table /deep/ .warning-row { 1100 +
  1101 +:deep(.el-table .warning-row) {
1072 color: red !important; 1102 color: red !important;
1073 } 1103 }
1074 -.el-table /deep/ .bgColor { 1104 +
  1105 +:deep(.el-table .bgColor) {
1075 background: #d9ecff; 1106 background: #d9ecff;
1076 } 1107 }
1077 -/deep/.edit_button { 1108 +
  1109 +.edit_button {
1078 width: 22px; 1110 width: 22px;
1079 height: 22px; 1111 height: 22px;
1080 padding: 0; 1112 padding: 0;
1081 margin: 0; 1113 margin: 0;
1082 margin-right: 5px; 1114 margin-right: 5px;
1083 - /deep/ i { 1115 +
  1116 + :deep(i) {
1084 font-size: 30px; 1117 font-size: 30px;
1085 } 1118 }
1086 } 1119 }
  1120 +
1087 .el-form-item--mini.el-form-item { 1121 .el-form-item--mini.el-form-item {
1088 margin-bottom: 12px; 1122 margin-bottom: 12px;
1089 } 1123 }
1090 -.el-table /deep/ .success-row { 1124 +
  1125 +:deep(.el-table .success-row) {
1091 background: #f9fbfd !important; 1126 background: #f9fbfd !important;
1092 } 1127 }
1093 1128
1094 .contextMenu { 1129 .contextMenu {
1095 width: 100px; 1130 width: 100px;
  1131 +
1096 .contextMenuItem { 1132 .contextMenuItem {
1097 width: 100%; 1133 width: 100%;
1098 font-size: 12px; 1134 font-size: 12px;
1099 line-height: 20px; 1135 line-height: 20px;
1100 padding: 5px; 1136 padding: 5px;
1101 } 1137 }
  1138 +
1102 &:hover { 1139 &:hover {
1103 background: #f9fbfd; 1140 background: #f9fbfd;
1104 } 1141 }
src/components/AnjiPlus/anji-crud/edit.vue
@@ -386,7 +386,7 @@ export default { @@ -386,7 +386,7 @@ export default {
386 386
387 <style scoped lang="scss"> 387 <style scoped lang="scss">
388 .notfull-screen { 388 .notfull-screen {
389 - /deep/.el-dialog__body { 389 + :deep(el-dialog__body) {
390 background-color: rgb(240, 242, 245); 390 background-color: rgb(240, 242, 245);
391 padding: 5px; 391 padding: 5px;
392 max-height: 60vh; 392 max-height: 60vh;
@@ -394,7 +394,7 @@ export default { @@ -394,7 +394,7 @@ export default {
394 } 394 }
395 } 395 }
396 .full-screen { 396 .full-screen {
397 - /deep/.el-dialog__body { 397 + :deep(el-dialog__body) {
398 background-color: rgb(240, 242, 245); 398 background-color: rgb(240, 242, 245);
399 padding: 5px; 399 padding: 5px;
400 height: calc(100vh - 110px); 400 height: calc(100vh - 110px);
src/components/AnjiPlus/anji-dialog.vue
@@ -151,7 +151,7 @@ export default { @@ -151,7 +151,7 @@ export default {
151 151
152 <style scoped lang="scss"> 152 <style scoped lang="scss">
153 .notfull-screen { 153 .notfull-screen {
154 - /deep/.el-dialog__body { 154 + :deep(el-dialog__body) {
155 background-color: rgb(240, 242, 245); 155 background-color: rgb(240, 242, 245);
156 padding: 5px; 156 padding: 5px;
157 max-height: 60vh; 157 max-height: 60vh;
@@ -159,7 +159,7 @@ export default { @@ -159,7 +159,7 @@ export default {
159 } 159 }
160 } 160 }
161 .full-screen { 161 .full-screen {
162 - /deep/.el-dialog__body { 162 + :deep(el-dialog__body) {
163 background-color: rgb(240, 242, 245); 163 background-color: rgb(240, 242, 245);
164 padding: 5px; 164 padding: 5px;
165 height: calc(100vh - 110px); 165 height: calc(100vh - 110px);
@@ -203,7 +203,7 @@ export default { @@ -203,7 +203,7 @@ export default {
203 .addForm { 203 .addForm {
204 text-align: center; 204 text-align: center;
205 } 205 }
206 -.activeColor /deep/.el-form-item__label { 206 +.activeColor :deep(el-form-item__label) {
207 color: #5887fb; 207 color: #5887fb;
208 } 208 }
209 </style> 209 </style>
src/components/AnjiPlus/anji-input.vue
@@ -168,10 +168,10 @@ export default { @@ -168,10 +168,10 @@ export default {
168 } 168 }
169 </script> 169 </script>
170 <style lang="less" scoped> 170 <style lang="less" scoped>
171 -/deep/.el-input__suffix { 171 +:deep(el-input__suffix) {
172 padding: 0 6px; 172 padding: 0 6px;
173 } 173 }
174 -.anji-input /deep/ .el-input__inner { 174 +.anji-input :deep(el-input__inner ){
175 padding-right: 0 !important; 175 padding-right: 0 !important;
176 } 176 }
177 </style> 177 </style>
src/components/AnjiPlus/anji-upload.vue
@@ -170,7 +170,7 @@ export default { @@ -170,7 +170,7 @@ export default {
170 width: 60px; 170 width: 60px;
171 height: 60px; 171 height: 60px;
172 } 172 }
173 -.hide_box /deep/.el-upload--picture-card { 173 +.hide_box :deep(el-upload--picture-card) {
174 display: none; 174 display: none;
175 } 175 }
176 .el-upload-list__item { 176 .el-upload-list__item {
src/components/eachForm.vue
@@ -179,16 +179,16 @@ export default { @@ -179,16 +179,16 @@ export default {
179 } 179 }
180 </script> 180 </script>
181 <style lang="scss" scoped> 181 <style lang="scss" scoped>
182 -.elForm /deep/ .el-upload--picture-card{ 182 +.elForm :deep(el-upload--picture-card){
183 width: 80px; 183 width: 80px;
184 height: 80px; 184 height: 80px;
185 line-height: 83px; 185 line-height: 83px;
186 } 186 }
187 -.elForm /deep/ .el-upload-list__item { 187 +.elForm :deep(el-upload-list__item) {
188 width: 80px; 188 width: 80px;
189 height: 80px; 189 height: 80px;
190 } 190 }
191 -.hide_box /deep/ .el-upload--picture-card{ 191 +.hide_box :deep(el-upload--picture-card){
192 display: none; 192 display: none;
193 } 193 }
194 </style> 194 </style>
195 \ No newline at end of file 195 \ No newline at end of file
src/views/accessRole/components/RoleAuthority.vue
@@ -85,7 +85,7 @@ export default { @@ -85,7 +85,7 @@ export default {
85 }; 85 };
86 </script> 86 </script>
87 <style lang="scss" scoped> 87 <style lang="scss" scoped>
88 -/deep/.el-dialog__body { 88 +:deep(el-dialog__body) {
89 height: 400px; 89 height: 400px;
90 overflow-y: scroll; 90 overflow-y: scroll;
91 } 91 }
src/views/bigscreenDesigner/designer/components/colorPicker.vue
@@ -63,8 +63,8 @@ export default { @@ -63,8 +63,8 @@ export default {
63 }; 63 };
64 </script> 64 </script>
65 <style lang="scss" scoped> 65 <style lang="scss" scoped>
66 -/deep/.el-color-picker--mini,  
67 -/deep/.el-color-picker--mini .el-color-picker__trigger { 66 +:deep(el-color-picker--mini),
  67 +:deep(el-color-picker--mini) .el-color-picker__trigger {
68 width: 23px; 68 width: 23px;
69 height: 23px; 69 height: 23px;
70 } 70 }
src/views/bigscreenDesigner/designer/components/customColorComponents.vue
@@ -172,31 +172,38 @@ export default { @@ -172,31 +172,38 @@ export default {
172 flex-direction: row; 172 flex-direction: row;
173 } 173 }
174 } 174 }
175 -/deep/.el-table,  
176 -/deep/.el-table__expanded-cell,  
177 -/deep/.el-table th,  
178 -/deep/.el-table tr { 175 +// 使用 :deep() 替代 /deep/
  176 +:deep(.el-table),
  177 +:deep(.el-table__expanded-cell),
  178 +:deep(.el-table th),
  179 +:deep(.el-table tr) {
179 background-color: transparent !important; 180 background-color: transparent !important;
180 color: #859094 !important; 181 color: #859094 !important;
181 } 182 }
182 -/deep/.el-table td,  
183 -/deep/.el-table th.is-leaf { 183 +
  184 +:deep(.el-table td),
  185 +:deep(.el-table th.is-leaf) {
184 border-bottom: none; 186 border-bottom: none;
185 line-height: 26px; 187 line-height: 26px;
186 } 188 }
187 -/deep/.el-table tbody tr:hover > td { 189 +
  190 +:deep(.el-table tbody tr:hover > td) {
188 background-color: #263445 !important; 191 background-color: #263445 !important;
189 } 192 }
190 -/deep/.el-table::before { 193 +
  194 +:deep(.el-table::before) {
191 height: 0; 195 height: 0;
192 } 196 }
193 -/deep/.el-color-picker--mini,  
194 -/deep/.el-color-picker--mini .el-color-picker__trigger { 197 +
  198 +:deep(.el-color-picker--mini),
  199 +:deep(.el-color-picker--mini .el-color-picker__trigger) {
195 width: 23px; 200 width: 23px;
196 height: 23px; 201 height: 23px;
197 } 202 }
198 -/deep/.el-dialog { 203 +
  204 +:deep(.el-dialog) {
199 background: #1b1e25; 205 background: #1b1e25;
  206 +
200 .el-dialog__title { 207 .el-dialog__title {
201 color: #fff; 208 color: #fff;
202 } 209 }
src/views/bigscreenDesigner/designer/components/customUpload.vue
@@ -90,8 +90,8 @@ export default { @@ -90,8 +90,8 @@ export default {
90 top: 0; 90 top: 0;
91 opacity: 0; 91 opacity: 0;
92 } 92 }
93 -/deep/.el-input-group__append,  
94 -/deep/.el-input-group__prepend { 93 +:deep(el-input-group__append),
  94 +:deep(el-input-group__prepend) {
95 padding: 0 10px !important; 95 padding: 0 10px !important;
96 overflow: hidden; 96 overflow: hidden;
97 } 97 }
src/views/bigscreenDesigner/designer/components/customUploadMulti.vue
@@ -142,8 +142,8 @@ export default { @@ -142,8 +142,8 @@ export default {
142 display: none; 142 display: none;
143 } 143 }
144 144
145 -/deep/.el-input-group__append,  
146 -/deep/.el-input-group__prepend { 145 +:deep(el-input-group__append),
  146 +:deep(el-input-group__prepend) {
147 padding: 0 10px !important; 147 padding: 0 10px !important;
148 overflow: hidden; 148 overflow: hidden;
149 } 149 }
@@ -154,9 +154,9 @@ export default { @@ -154,9 +154,9 @@ export default {
154 } 154 }
155 155
156 156
157 -/deep/ .el-dialog .el-dialog__header,  
158 -/deep/ .el-dialog__body,  
159 -/deep/.el-dialog__footer { 157 +:deep(.el-dialog .el-dialog__header),
  158 +:deep(.el-dialog__body),
  159 +:deep(.el-dialog__footer) {
160 background: #1b1e25; 160 background: #1b1e25;
161 } 161 }
162 162
@@ -189,7 +189,7 @@ export default { @@ -189,7 +189,7 @@ export default {
189 padding: 0 0.5px 0 0.5px; 189 padding: 0 0.5px 0 0.5px;
190 min-height: 90px; 190 min-height: 90px;
191 191
192 - /deep/ .el-image__error { 192 + :deep(el-image__error) {
193 width: 100%; 193 width: 100%;
194 height: 100%; 194 height: 100%;
195 min-height: 90px; 195 min-height: 90px;
src/views/bigscreenDesigner/designer/components/customUploadNew.vue
@@ -115,8 +115,9 @@ export default { @@ -115,8 +115,9 @@ export default {
115 display: none; 115 display: none;
116 } 116 }
117 117
118 -/deep/.el-input-group__append,  
119 -/deep/.el-input-group__prepend { 118 +// 修复输入框前后缀样式
  119 +:deep(.el-input-group__append),
  120 +:deep(.el-input-group__prepend) {
120 padding: 0 10px !important; 121 padding: 0 10px !important;
121 overflow: hidden; 122 overflow: hidden;
122 } 123 }
@@ -126,10 +127,13 @@ export default { @@ -126,10 +127,13 @@ export default {
126 font-size: 12px; 127 font-size: 12px;
127 } 128 }
128 129
129 -  
130 -/deep/ .el-dialog .el-dialog__header,  
131 -/deep/ .el-dialog__body {  
132 - background: #1b1e25; 130 +// 修复 el-dialog 的背景色
  131 +:deep(.el-dialog) {
  132 + .el-dialog__header,
  133 + .el-dialog__body {
  134 + background: #1b1e25;
  135 + color: #fff; // 可选:确保文字可见
  136 + }
133 } 137 }
134 138
135 .image-list { 139 .image-list {
@@ -161,7 +165,7 @@ export default { @@ -161,7 +165,7 @@ export default {
161 padding: 0 0.5px 0 0.5px; 165 padding: 0 0.5px 0 0.5px;
162 min-height: 90px; 166 min-height: 90px;
163 167
164 - /deep/ .el-image__error { 168 + :deep(el-image__error) {
165 width: 100%; 169 width: 100%;
166 height: 100%; 170 height: 100%;
167 min-height: 90px; 171 min-height: 90px;
src/views/bigscreenDesigner/designer/components/dynamicAddPicAdress.vue
@@ -137,40 +137,52 @@ export default { @@ -137,40 +137,52 @@ export default {
137 }; 137 };
138 </script> 138 </script>
139 <style lang="scss" scoped> 139 <style lang="scss" scoped>
140 -/deep/::-webkit-scrollbar-track-piece { 140 +// 滚动条样式 - 轨道(透明背景)
  141 +:deep(::-webkit-scrollbar-track-piece) {
141 background-color: transparent; 142 background-color: transparent;
142 } 143 }
143 -/deep/ .el-table__body-wrapper::-webkit-scrollbar {  
144 - width: 0; // 横向滚动条  
145 - height: 8px; // 纵向滚动条 必写 144 +
  145 +// 滚动条整体(宽度/高度)
  146 +:deep(.el-table__body-wrapper::-webkit-scrollbar) {
  147 + width: 0; // 横向滚动条宽度
  148 + height: 8px; // 纵向滚动条高度(必须设置)
146 } 149 }
147 -// 滚动条的滑块  
148 -/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb { 150 +
  151 +// 滚动条滑块
  152 +:deep(.el-table__body-wrapper::-webkit-scrollbar-thumb) {
149 border-radius: 5px; 153 border-radius: 5px;
150 background-color: rgba(144, 146, 152, 0.3); 154 background-color: rgba(144, 146, 152, 0.3);
151 } 155 }
152 -/deep/.el-table,  
153 -/deep/.el-table__expanded-cell,  
154 -/deep/.el-table th,  
155 -/deep/.el-table tr { 156 +
  157 +// 表格整体样式:背景、文字颜色、字体大小
  158 +:deep(.el-table),
  159 +:deep(.el-table__expanded-cell),
  160 +:deep(.el-table th),
  161 +:deep(.el-table tr) {
156 background-color: transparent !important; 162 background-color: transparent !important;
157 color: #859094 !important; 163 color: #859094 !important;
158 font-size: 12px !important; 164 font-size: 12px !important;
159 } 165 }
160 -/deep/.el-table td,  
161 -/deep/.el-table th.is-leaf { 166 +
  167 +// 表格单元格:去除下边框,调整行高
  168 +:deep(.el-table td),
  169 +:deep(.el-table th.is-leaf) {
162 border-bottom: none; 170 border-bottom: none;
163 line-height: 26px; 171 line-height: 26px;
164 } 172 }
165 -/deep/.el-table tbody tr:hover {  
166 - background-color: #263445 !important;  
167 -}  
168 -/deep/.el-table tbody tr:hover > td { 173 +
  174 +// 表格行 hover 效果
  175 +:deep(.el-table tbody tr:hover),
  176 +:deep(.el-table tbody tr:hover > td) {
169 background-color: #263445 !important; 177 background-color: #263445 !important;
170 } 178 }
171 -/deep/.el-table::before { 179 +
  180 +// 去除 el-table 底部默认的横线(伪元素)
  181 +:deep(.el-table::before) {
172 height: 0; 182 height: 0;
173 } 183 }
  184 +
  185 +// 按钮组内按钮内边距
174 .button-group .el-button { 186 .button-group .el-button {
175 padding: 0; 187 padding: 0;
176 } 188 }
src/views/bigscreenDesigner/designer/components/dynamicAddRadar.vue
@@ -138,40 +138,52 @@ export default { @@ -138,40 +138,52 @@ export default {
138 }; 138 };
139 </script> 139 </script>
140 <style lang="scss" scoped> 140 <style lang="scss" scoped>
141 -/deep/::-webkit-scrollbar-track-piece { 141 +// 滚动条轨道背景(透明)
  142 +:deep(::-webkit-scrollbar-track-piece) {
142 background-color: transparent; 143 background-color: transparent;
143 } 144 }
144 -/deep/ .el-table__body-wrapper::-webkit-scrollbar {  
145 - width: 0; // 横向滚动条  
146 - height: 8px; // 纵向滚动条 必写 145 +
  146 +// 表格滚动条:隐藏横向,设置纵向高度
  147 +:deep(.el-table__body-wrapper::-webkit-scrollbar) {
  148 + width: 0; // 隐藏横向滚动条
  149 + height: 8px; // 纵向滚动条高度(必须设置才显示)
147 } 150 }
148 -// 滚动条的滑块  
149 -/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb { 151 +
  152 +// 滚动条滑块样式
  153 +:deep(.el-table__body-wrapper::-webkit-scrollbar-thumb) {
150 border-radius: 5px; 154 border-radius: 5px;
151 background-color: rgba(144, 146, 152, 0.3); 155 background-color: rgba(144, 146, 152, 0.3);
152 } 156 }
153 -/deep/.el-table,  
154 -/deep/.el-table__expanded-cell,  
155 -/deep/.el-table th,  
156 -/deep/.el-table tr { 157 +
  158 +// 表格整体样式:背景、文字颜色、字体大小
  159 +:deep(.el-table),
  160 +:deep(.el-table__expanded-cell),
  161 +:deep(.el-table th),
  162 +:deep(.el-table tr) {
157 background-color: transparent !important; 163 background-color: transparent !important;
158 color: #859094 !important; 164 color: #859094 !important;
159 font-size: 12px !important; 165 font-size: 12px !important;
160 } 166 }
161 -/deep/.el-table td,  
162 -/deep/.el-table th.is-leaf { 167 +
  168 +// 表格单元格:去除下边框,调整行高
  169 +:deep(.el-table td),
  170 +:deep(.el-table th.is-leaf) {
163 border-bottom: none; 171 border-bottom: none;
164 line-height: 26px; 172 line-height: 26px;
165 } 173 }
166 -/deep/.el-table tbody tr:hover {  
167 - background-color: #263445 !important;  
168 -}  
169 -/deep/.el-table tbody tr:hover > td { 174 +
  175 +// 表格行 hover 背景色
  176 +:deep(.el-table tbody tr:hover),
  177 +:deep(.el-table tbody tr:hover > td) {
170 background-color: #263445 !important; 178 background-color: #263445 !important;
171 } 179 }
172 -/deep/.el-table::before { 180 +
  181 +// 去除 el-table 底部默认的横线(伪元素)
  182 +:deep(.el-table::before) {
173 height: 0; 183 height: 0;
174 } 184 }
  185 +
  186 +// 按钮组内按钮内边距
175 .button-group .el-button { 187 .button-group .el-button {
176 padding: 0; 188 padding: 0;
177 } 189 }
src/views/bigscreenDesigner/designer/components/dynamicAddSvg.vue
@@ -137,40 +137,52 @@ export default { @@ -137,40 +137,52 @@ export default {
137 }; 137 };
138 </script> 138 </script>
139 <style lang="scss" scoped> 139 <style lang="scss" scoped>
140 -/deep/::-webkit-scrollbar-track-piece { 140 +// 滚动条轨道背景(透明)
  141 +:deep(::-webkit-scrollbar-track-piece) {
141 background-color: transparent; 142 background-color: transparent;
142 } 143 }
143 -/deep/ .el-table__body-wrapper::-webkit-scrollbar {  
144 - width: 0; // 横向滚动条  
145 - height: 8px; // 纵向滚动条 必写 144 +
  145 +// 表格滚动条:隐藏横向,设置纵向高度
  146 +:deep(.el-table__body-wrapper::-webkit-scrollbar) {
  147 + width: 0; // 隐藏横向滚动条
  148 + height: 8px; // 纵向滚动条高度(必须设置才显示)
146 } 149 }
147 -// 滚动条的滑块  
148 -/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb { 150 +
  151 +// 滚动条滑块样式
  152 +:deep(.el-table__body-wrapper::-webkit-scrollbar-thumb) {
149 border-radius: 5px; 153 border-radius: 5px;
150 background-color: rgba(144, 146, 152, 0.3); 154 background-color: rgba(144, 146, 152, 0.3);
151 } 155 }
152 -/deep/.el-table,  
153 -/deep/.el-table__expanded-cell,  
154 -/deep/.el-table th,  
155 -/deep/.el-table tr { 156 +
  157 +// 表格整体样式:背景、文字颜色、字体大小
  158 +:deep(.el-table),
  159 +:deep(.el-table__expanded-cell),
  160 +:deep(.el-table th),
  161 +:deep(.el-table tr) {
156 background-color: transparent !important; 162 background-color: transparent !important;
157 color: #859094 !important; 163 color: #859094 !important;
158 font-size: 12px !important; 164 font-size: 12px !important;
159 } 165 }
160 -/deep/.el-table td,  
161 -/deep/.el-table th.is-leaf { 166 +
  167 +// 表格单元格:去除下边框,调整行高
  168 +:deep(.el-table td),
  169 +:deep(.el-table th.is-leaf) {
162 border-bottom: none; 170 border-bottom: none;
163 line-height: 26px; 171 line-height: 26px;
164 } 172 }
165 -/deep/.el-table tbody tr:hover {  
166 - background-color: #263445 !important;  
167 -}  
168 -/deep/.el-table tbody tr:hover > td { 173 +
  174 +// 表格行 hover 背景色(合并两条规则)
  175 +:deep(.el-table tbody tr:hover),
  176 +:deep(.el-table tbody tr:hover > td) {
169 background-color: #263445 !important; 177 background-color: #263445 !important;
170 } 178 }
171 -/deep/.el-table::before { 179 +
  180 +// 去除 el-table 底部默认的横线(伪元素)
  181 +:deep(.el-table::before) {
172 height: 0; 182 height: 0;
173 } 183 }
  184 +
  185 +// 按钮组内按钮内边距
174 .button-group .el-button { 186 .button-group .el-button {
175 padding: 0; 187 padding: 0;
176 } 188 }
src/views/bigscreenDesigner/designer/components/dynamicAddTable.vue
@@ -181,40 +181,44 @@ export default { @@ -181,40 +181,44 @@ export default {
181 }; 181 };
182 </script> 182 </script>
183 <style lang="scss" scoped> 183 <style lang="scss" scoped>
184 -/deep/::-webkit-scrollbar-track-piece { 184 +:deep(::-webkit-scrollbar-track-piece) {
185 background-color: transparent; 185 background-color: transparent;
186 } 186 }
187 -/deep/ .el-table__body-wrapper::-webkit-scrollbar {  
188 - width: 0; // 横向滚动条  
189 - height: 8px; // 纵向滚动条 必写 187 +
  188 +:deep(.el-table__body-wrapper::-webkit-scrollbar) {
  189 + width: 0;
  190 + height: 8px;
190 } 191 }
191 -// 滚动条的滑块  
192 -/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb { 192 +
  193 +:deep(.el-table__body-wrapper::-webkit-scrollbar-thumb) {
193 border-radius: 5px; 194 border-radius: 5px;
194 background-color: rgba(144, 146, 152, 0.3); 195 background-color: rgba(144, 146, 152, 0.3);
195 } 196 }
196 -/deep/.el-table,  
197 -/deep/.el-table__expanded-cell,  
198 -/deep/.el-table th,  
199 -/deep/.el-table tr { 197 +
  198 +:deep(.el-table),
  199 +:deep(.el-table__expanded-cell),
  200 +:deep(.el-table th),
  201 +:deep(.el-table tr) {
200 background-color: transparent !important; 202 background-color: transparent !important;
201 color: #859094 !important; 203 color: #859094 !important;
202 font-size: 12px !important; 204 font-size: 12px !important;
203 } 205 }
204 -/deep/.el-table td,  
205 -/deep/.el-table th.is-leaf { 206 +
  207 +:deep(.el-table td),
  208 +:deep(.el-table th.is-leaf) {
206 border-bottom: none; 209 border-bottom: none;
207 line-height: 26px; 210 line-height: 26px;
208 } 211 }
209 -/deep/.el-table tbody tr:hover {  
210 - background-color: #263445 !important;  
211 -}  
212 -/deep/.el-table tbody tr:hover > td { 212 +
  213 +:deep(.el-table tbody tr:hover),
  214 +:deep(.el-table tbody tr:hover > td) {
213 background-color: #263445 !important; 215 background-color: #263445 !important;
214 } 216 }
215 -/deep/.el-table::before { 217 +
  218 +:deep(.el-table::before) {
216 height: 0; 219 height: 0;
217 } 220 }
  221 +
218 .button-group .el-button { 222 .button-group .el-button {
219 padding: 0; 223 padding: 0;
220 } 224 }
src/views/bigscreenDesigner/designer/components/dynamicForm.vue
@@ -525,22 +525,26 @@ export default { @@ -525,22 +525,26 @@ export default {
525 </script> 525 </script>
526 526
527 <style scoped lang="scss"> 527 <style scoped lang="scss">
528 -/deep/ .el-form-item { 528 +:deep(.el-form-item) {
529 margin-bottom: 5px; 529 margin-bottom: 5px;
530 } 530 }
531 -/deep/ .el-form-item__label { 531 +
  532 +:deep(.el-form-item__label) {
532 font-size: 12px; 533 font-size: 12px;
533 color: #fff; 534 color: #fff;
534 } 535 }
  536 +
535 .code-mirror { 537 .code-mirror {
536 width: 100%; 538 width: 100%;
537 height: 100% !important; 539 height: 100% !important;
538 } 540 }
  541 +
539 .el-collapse { 542 .el-collapse {
540 border-top: none; 543 border-top: none;
541 border-bottom: none; 544 border-bottom: none;
542 } 545 }
543 -/deep/.el-collapse-item__header { 546 +
  547 +:deep(.el-collapse-item__header) {
544 height: 40px; 548 height: 40px;
545 line-height: 40px; 549 line-height: 40px;
546 background: transparent; 550 background: transparent;
@@ -549,11 +553,13 @@ export default { @@ -549,11 +553,13 @@ export default {
549 font-size: 12px; 553 font-size: 12px;
550 border-color: #282e3a; 554 border-color: #282e3a;
551 } 555 }
552 -/deep/.el-collapse-item__wrap { 556 +
  557 +:deep(.el-collapse-item__wrap) {
553 background: transparent; 558 background: transparent;
554 border: none; 559 border: none;
555 } 560 }
556 -/deep/.el-collapse-item__content { 561 +
  562 +:deep(.el-collapse-item__content) {
557 padding-bottom: 0; 563 padding-bottom: 0;
558 } 564 }
559 </style> 565 </style>
src/views/bigscreenDesigner/designer/components/dynamicHtmlSlider.vue
@@ -150,40 +150,45 @@ export default { @@ -150,40 +150,45 @@ export default {
150 }; 150 };
151 </script> 151 </script>
152 <style lang="scss" scoped> 152 <style lang="scss" scoped>
153 -/deep/::-webkit-scrollbar-track-piece { 153 +:deep(::-webkit-scrollbar-track-piece) {
154 background-color: transparent; 154 background-color: transparent;
155 } 155 }
156 -/deep/ .el-table__body-wrapper::-webkit-scrollbar { 156 +
  157 +:deep(.el-table__body-wrapper::-webkit-scrollbar) {
157 width: 0; // 横向滚动条 158 width: 0; // 横向滚动条
158 height: 8px; // 纵向滚动条 必写 159 height: 8px; // 纵向滚动条 必写
159 } 160 }
  161 +
160 // 滚动条的滑块 162 // 滚动条的滑块
161 -/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb { 163 +:deep(.el-table__body-wrapper::-webkit-scrollbar-thumb) {
162 border-radius: 5px; 164 border-radius: 5px;
163 background-color: rgba(144, 146, 152, 0.3); 165 background-color: rgba(144, 146, 152, 0.3);
164 } 166 }
165 -/deep/.el-table,  
166 -/deep/.el-table__expanded-cell,  
167 -/deep/.el-table th,  
168 -/deep/.el-table tr { 167 +
  168 +:deep(.el-table),
  169 +:deep(.el-table__expanded-cell),
  170 +:deep(.el-table th),
  171 +:deep(.el-table tr) {
169 background-color: transparent !important; 172 background-color: transparent !important;
170 color: #859094 !important; 173 color: #859094 !important;
171 font-size: 12px !important; 174 font-size: 12px !important;
172 } 175 }
173 -/deep/.el-table td,  
174 -/deep/.el-table th.is-leaf { 176 +
  177 +:deep(.el-table td),
  178 +:deep(.el-table th.is-leaf) {
175 border-bottom: none; 179 border-bottom: none;
176 line-height: 26px; 180 line-height: 26px;
177 } 181 }
178 -/deep/.el-table tbody tr:hover {  
179 - background-color: #263445 !important;  
180 -}  
181 -/deep/.el-table tbody tr:hover > td { 182 +
  183 +:deep(.el-table tbody tr:hover),
  184 +:deep(.el-table tbody tr:hover > td) {
182 background-color: #263445 !important; 185 background-color: #263445 !important;
183 } 186 }
184 -/deep/.el-table::before { 187 +
  188 +:deep(.el-table::before) {
185 height: 0; 189 height: 0;
186 } 190 }
  191 +
187 .button-group .el-button { 192 .button-group .el-button {
188 padding: 0; 193 padding: 0;
189 } 194 }
src/views/bigscreenDesigner/designer/widget/div/widgetSlider.vue
@@ -86,7 +86,7 @@ export default { @@ -86,7 +86,7 @@ export default {
86 object-fit: contain; 86 object-fit: contain;
87 } 87 }
88 88
89 -/deep/ .el-carousel__mask { 89 +:deep(el-carousel__mask) {
90 background: transparent; 90 background: transparent;
91 } 91 }
92 </style> 92 </style>
src/views/bigscreenDesigner/designer/widget/percent/widgetProgress.vue
@@ -160,18 +160,18 @@ export default { @@ -160,18 +160,18 @@ export default {
160 align-items: center; 160 align-items: center;
161 width: 100%; 161 width: 100%;
162 162
163 - /deep/ .el-progress-bar__outer { 163 + :deep(.el-progress-bar__outer) {
164 background-color: var(--under-color, #EBEEF5); 164 background-color: var(--under-color, #EBEEF5);
165 } 165 }
166 166
167 - /deep/ .el-progress-bar__inner {  
168 - background: var(--line-gradient, initial); 167 + :deep(.el-progress-bar__inner) {
  168 + background: var(--line-gradient, linear-gradient(90deg, #409EFF, #66b1ff));
169 } 169 }
170 170
171 - /deep/ .el-progress-bar__innerText,  
172 - /deep/ .el-progress__text {  
173 - font-size: var(--percent-font-size, initial) !important;  
174 - color: var(--percent-color, initial); 171 + :deep(.el-progress-bar__innerText),
  172 + :deep(.el-progress__text) {
  173 + font-size: var(--percent-font-size, 14px) !important;
  174 + color: var(--percent-color, #333);
175 } 175 }
176 } 176 }
177 } 177 }
src/views/excelreport/components/colorPicker.vue
@@ -63,8 +63,8 @@ export default { @@ -63,8 +63,8 @@ export default {
63 }; 63 };
64 </script> 64 </script>
65 <style lang="scss" scoped> 65 <style lang="scss" scoped>
66 -/deep/.el-color-picker--mini,  
67 -/deep/.el-color-picker--mini .el-color-picker__trigger { 66 +:deep(.el-color-picker--mini),
  67 +:deep(.el-color-picker--mini .el-color-picker__trigger) {
68 width: 23px; 68 width: 23px;
69 height: 23px; 69 height: 23px;
70 } 70 }
src/views/resultset/components/EditDataSet.vue
@@ -966,7 +966,7 @@ public class DemoGroovyHandler implements IGroovyHandler { @@ -966,7 +966,7 @@ public class DemoGroovyHandler implements IGroovyHandler {
966 </script> 966 </script>
967 <style lang="scss" scoped> 967 <style lang="scss" scoped>
968 .code-mirror-form { 968 .code-mirror-form {
969 - /deep/ .el-form-item__content { 969 + :deep(.el-form-item__content) {
970 height: 200px; 970 height: 200px;
971 overflow: hidden; 971 overflow: hidden;
972 } 972 }
@@ -1094,7 +1094,7 @@ public class DemoGroovyHandler implements IGroovyHandler { @@ -1094,7 +1094,7 @@ public class DemoGroovyHandler implements IGroovyHandler {
1094 top: 15px; 1094 top: 15px;
1095 } 1095 }
1096 1096
1097 -.filterTextarea /deep/ .el-textarea__inner { 1097 +.filterTextarea :deep(.el-textarea__inner) {
1098 min-height: 300px !important; 1098 min-height: 300px !important;
1099 } 1099 }
1100 1100
@@ -1103,7 +1103,7 @@ public class DemoGroovyHandler implements IGroovyHandler { @@ -1103,7 +1103,7 @@ public class DemoGroovyHandler implements IGroovyHandler {
1103 margin-top: 4px; 1103 margin-top: 4px;
1104 } 1104 }
1105 1105
1106 -.filterBox /deep/ .el-input--suffix .el-input__inner { 1106 +.filterBox :deep(.el-input--suffix .el-input__inner) {
1107 background: #f4f7ff; 1107 background: #f4f7ff;
1108 border-radius: 3px; 1108 border-radius: 3px;
1109 border: 1px solid #b8caff; 1109 border: 1px solid #b8caff;
src/views/resultset/components/MonacoEditor.vue
@@ -126,7 +126,7 @@ export default { @@ -126,7 +126,7 @@ export default {
126 </script> 126 </script>
127 127
128 <style scoped> 128 <style scoped>
129 -.main /deep/ .view-lines * { 129 +.main :deep(.view-lines *) {
130 font-family: Consolas, "Courier New", monospace !important; 130 font-family: Consolas, "Courier New", monospace !important;
131 } 131 }
132 </style> 132 </style>
src/views/resultset/index.vue
@@ -308,7 +308,7 @@ export default { @@ -308,7 +308,7 @@ export default {
308 }; 308 };
309 </script> 309 </script>
310 <style lang="scss" scoped> 310 <style lang="scss" scoped>
311 -/deep/.el-dropdown { 311 +:deep(.el-dropdown) {
312 margin-right: 20px; 312 margin-right: 20px;
313 } 313 }
314 </style> 314 </style>
src/views/screenDesigner/components/colorPicker.vue
@@ -63,8 +63,8 @@ export default { @@ -63,8 +63,8 @@ export default {
63 }; 63 };
64 </script> 64 </script>
65 <style lang="scss" scoped> 65 <style lang="scss" scoped>
66 -/deep/.el-color-picker--mini,  
67 -/deep/.el-color-picker--mini .el-color-picker__trigger { 66 +:deep(.el-color-picker--mini),
  67 +:deep(.el-color-picker--mini .el-color-picker__trigger) {
68 width: 23px; 68 width: 23px;
69 height: 23px; 69 height: 23px;
70 } 70 }
src/views/screenDesigner/components/customColorComponents.vue
@@ -149,31 +149,37 @@ export default { @@ -149,31 +149,37 @@ export default {
149 flex-direction: row; 149 flex-direction: row;
150 } 150 }
151 } 151 }
152 -/deep/.el-table,  
153 -/deep/.el-table__expanded-cell,  
154 -/deep/.el-table th,  
155 -/deep/.el-table tr { 152 +:deep(.el-table),
  153 +:deep(.el-table__expanded-cell),
  154 +:deep(.el-table th),
  155 +:deep(.el-table tr) {
156 background-color: transparent !important; 156 background-color: transparent !important;
157 color: #859094 !important; 157 color: #859094 !important;
158 } 158 }
159 -/deep/.el-table td,  
160 -/deep/.el-table th.is-leaf { 159 +
  160 +:deep(.el-table td),
  161 +:deep(.el-table th.is-leaf) {
161 border-bottom: none; 162 border-bottom: none;
162 line-height: 26px; 163 line-height: 26px;
163 } 164 }
164 -/deep/.el-table tbody tr:hover > td { 165 +
  166 +:deep(.el-table tbody tr:hover > td) {
165 background-color: #263445 !important; 167 background-color: #263445 !important;
166 } 168 }
167 -/deep/.el-table::before { 169 +
  170 +:deep(.el-table::before) {
168 height: 0; 171 height: 0;
169 } 172 }
170 -/deep/.el-color-picker--mini,  
171 -/deep/.el-color-picker--mini .el-color-picker__trigger { 173 +
  174 +:deep(.el-color-picker--mini),
  175 +:deep(.el-color-picker--mini .el-color-picker__trigger) {
172 width: 23px; 176 width: 23px;
173 height: 23px; 177 height: 23px;
174 } 178 }
175 -/deep/.el-dialog { 179 +
  180 +:deep(.el-dialog) {
176 background: #1b1e25; 181 background: #1b1e25;
  182 +
177 .el-dialog__title { 183 .el-dialog__title {
178 color: #fff; 184 color: #fff;
179 } 185 }
src/views/screenDesigner/components/customUpload.vue
@@ -90,8 +90,8 @@ export default { @@ -90,8 +90,8 @@ export default {
90 top: 0; 90 top: 0;
91 opacity: 0; 91 opacity: 0;
92 } 92 }
93 -/deep/.el-input-group__append,  
94 -/deep/.el-input-group__prepend { 93 +:deep(.el-input-group__append),
  94 +:deep(.el-input-group__prepend) {
95 padding: 0 10px !important; 95 padding: 0 10px !important;
96 overflow: hidden; 96 overflow: hidden;
97 } 97 }
src/views/screenDesigner/components/dynamicAddTable.vue
@@ -152,38 +152,42 @@ export default { @@ -152,38 +152,42 @@ export default {
152 }; 152 };
153 </script> 153 </script>
154 <style lang="scss" scoped> 154 <style lang="scss" scoped>
155 -/deep/::-webkit-scrollbar-track-piece { 155 +:deep(::-webkit-scrollbar-track-piece) {
156 background-color: transparent; 156 background-color: transparent;
157 } 157 }
158 -/deep/ .el-table__body-wrapper::-webkit-scrollbar { 158 +
  159 +:deep(.el-table__body-wrapper::-webkit-scrollbar) {
159 width: 0; // 横向滚动条 160 width: 0; // 横向滚动条
160 height: 8px; // 纵向滚动条 必写 161 height: 8px; // 纵向滚动条 必写
161 } 162 }
  163 +
162 // 滚动条的滑块 164 // 滚动条的滑块
163 -/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb { 165 +:deep(.el-table__body-wrapper::-webkit-scrollbar-thumb) {
164 border-radius: 5px; 166 border-radius: 5px;
165 background-color: rgba(144, 146, 152, 0.3); 167 background-color: rgba(144, 146, 152, 0.3);
166 } 168 }
167 -/deep/.el-table,  
168 -/deep/.el-table__expanded-cell,  
169 -/deep/.el-table th,  
170 -/deep/.el-table tr { 169 +
  170 +:deep(.el-table),
  171 +:deep(.el-table__expanded-cell),
  172 +:deep(.el-table th),
  173 +:deep(.el-table tr) {
171 background-color: transparent !important; 174 background-color: transparent !important;
172 color: #859094 !important; 175 color: #859094 !important;
173 font-size: 12px !important; 176 font-size: 12px !important;
174 } 177 }
175 -/deep/.el-table td,  
176 -/deep/.el-table th.is-leaf { 178 +
  179 +:deep(.el-table td),
  180 +:deep(.el-table th.is-leaf) {
177 border-bottom: none; 181 border-bottom: none;
178 line-height: 26px; 182 line-height: 26px;
179 } 183 }
180 -/deep/.el-table tbody tr:hover {  
181 - background-color: #263445 !important;  
182 -}  
183 -/deep/.el-table tbody tr:hover > td { 184 +
  185 +:deep(.el-table tbody tr:hover),
  186 +:deep(.el-table tbody tr:hover > td) {
184 background-color: #263445 !important; 187 background-color: #263445 !important;
185 } 188 }
186 -/deep/.el-table::before { 189 +
  190 +:deep(.el-table::before) {
187 height: 0; 191 height: 0;
188 } 192 }
189 .button-group .el-button { 193 .button-group .el-button {
src/views/screenDesigner/components/dynamicForm.vue
@@ -408,22 +408,26 @@ export default { @@ -408,22 +408,26 @@ export default {
408 </script> 408 </script>
409 409
410 <style scoped lang="scss"> 410 <style scoped lang="scss">
411 -/deep/ .el-form-item { 411 +:deep(.el-form-item) {
412 margin-bottom: 5px; 412 margin-bottom: 5px;
413 } 413 }
414 -/deep/ .el-form-item__label { 414 +
  415 +:deep(.el-form-item__label) {
415 font-size: 12px; 416 font-size: 12px;
416 color: #fff; 417 color: #fff;
417 } 418 }
  419 +
418 .code-mirror { 420 .code-mirror {
419 width: 100%; 421 width: 100%;
420 height: 100% !important; 422 height: 100% !important;
421 } 423 }
  424 +
422 .el-collapse { 425 .el-collapse {
423 border-top: none; 426 border-top: none;
424 border-bottom: none; 427 border-bottom: none;
425 } 428 }
426 -/deep/.el-collapse-item__header { 429 +
  430 +:deep(.el-collapse-item__header) {
427 height: 40px; 431 height: 40px;
428 line-height: 40px; 432 line-height: 40px;
429 background: transparent; 433 background: transparent;
@@ -432,11 +436,13 @@ export default { @@ -432,11 +436,13 @@ export default {
432 font-size: 12px; 436 font-size: 12px;
433 border-color: #282e3a; 437 border-color: #282e3a;
434 } 438 }
435 -/deep/.el-collapse-item__wrap { 439 +
  440 +:deep(.el-collapse-item__wrap) {
436 background: transparent; 441 background: transparent;
437 border: none; 442 border: none;
438 } 443 }
439 -/deep/.el-collapse-item__content { 444 +
  445 +:deep(.el-collapse-item__content) {
440 padding-bottom: 0; 446 padding-bottom: 0;
441 } 447 }
442 </style> 448 </style>
src/views/screenDesigner/layout/leftMenu.vue
@@ -74,29 +74,35 @@ export default { @@ -74,29 +74,35 @@ export default {
74 }; 74 };
75 </script> 75 </script>
76 <style lang="scss" scoped> 76 <style lang="scss" scoped>
77 -/deep/.el-dropdown-menu__item { 77 +:deep(.el-dropdown-menu__item) {
78 max-width: none; 78 max-width: none;
79 } 79 }
  80 +
80 .layout-left { 81 .layout-left {
81 width: 200px; 82 width: 200px;
82 background: #242a30; 83 background: #242a30;
83 overflow-x: hidden; 84 overflow-x: hidden;
84 overflow-y: auto; 85 overflow-y: auto;
  86 +
85 .chart-type { 87 .chart-type {
86 display: flex; 88 display: flex;
87 flex-direction: row; 89 flex-direction: row;
88 overflow: hidden; 90 overflow: hidden;
  91 +
89 .type-left { 92 .type-left {
90 width: 100%; 93 width: 100%;
91 height: calc(100vh - 80px); 94 height: calc(100vh - 80px);
92 text-align: center; 95 text-align: center;
93 - /deep/.el-tabs__header { 96 +
  97 + :deep(.el-tabs__header) {
94 width: 30%; 98 width: 30%;
95 margin-right: 0; 99 margin-right: 0;
  100 +
96 .el-tabs__nav-wrap { 101 .el-tabs__nav-wrap {
97 &::after { 102 &::after {
98 background: transparent; 103 background: transparent;
99 } 104 }
  105 +
100 .el-tabs__item { 106 .el-tabs__item {
101 text-align: center; 107 text-align: center;
102 width: 100% !important; 108 width: 100% !important;
@@ -105,11 +111,13 @@ export default { @@ -105,11 +111,13 @@ export default {
105 } 111 }
106 } 112 }
107 } 113 }
108 - /deep/.el-tabs__content { 114 +
  115 + :deep(.el-tabs__content) {
109 width: 70%; 116 width: 70%;
110 } 117 }
111 } 118 }
112 } 119 }
  120 +
113 //工具栏一个元素 121 //工具栏一个元素
114 .tools-item { 122 .tools-item {
115 display: flex; 123 display: flex;
@@ -134,10 +142,12 @@ export default { @@ -134,10 +142,12 @@ export default {
134 border: 1px solid #3a4659; 142 border: 1px solid #3a4659;
135 background: #282a30; 143 background: #282a30;
136 } 144 }
  145 +
137 .tools-item-text { 146 .tools-item-text {
138 } 147 }
139 } 148 }
140 - /deep/.el-tabs__content { 149 +
  150 + :deep(.el-tabs__content) {
141 padding: 0; 151 padding: 0;
142 } 152 }
143 } 153 }