Commit a5a95384ec65e31918e6fa6af3577dd5342f301f

Authored by 陈鑫涛
1 parent 263cb5c1

Revert "修复packjson"

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