diff --git a/.env b/.env index 47e37c9..fa793de 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VITE_BASE_URL=http://192.168.0.49:8099/ +VITE_BASE_URL=http://192.168.0.42:8099/ VITE_PROXY=/api/ VITE_FILE_URL=https://file.zcloudchina.com/YTHFile VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/ diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss index 32c94e5..9c727ad 100644 --- a/src/assets/css/common.scss +++ b/src/assets/css/common.scss @@ -184,6 +184,33 @@ a { display: none; } +@mixin table { + border-collapse: collapse; + width: 100%; + display: table; + font-size: 12px; + + tr { + page-break-inside: avoid; + } + + td, th { + border: 1px solid var(--el-border-color); + padding: 8px; + line-height: 1.6; + text-align: center; + } + + .title { + background: var(--el-fill-color-light); + width: 200px; + } +} + +.print_table { + @include table; +} + img.ml-10:first-child { margin-left: 0; } @@ -299,17 +326,7 @@ div::-webkit-scrollbar-track { } .print_use { - border-collapse: collapse; - width: 100%; - display: table; - font-size: 12px; - - td, th { - border: 1px solid var(--el-border-color); - padding: 8px; - line-height: 1.6; - text-align: center; - } + @include table; } .print_no_use { diff --git a/src/views/BI/components/dialog/camera_dialog.vue b/src/views/BI/components/dialog/camera_dialog.vue index ac7c784..6569c2f 100644 --- a/src/views/BI/components/dialog/camera_dialog.vue +++ b/src/views/BI/components/dialog/camera_dialog.vue @@ -1,27 +1,24 @@