diff --git a/.env.development b/.env.development index 5a691aa..6103ff5 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # VITE_API_URL = 'http://192.168.34.155:6688' VITE_WPAPI_URL = "http://182.90.224.147:8081" -# VITE_API_URL = "http://182.90.224.147:6688" -VITE_API_URL = "http://47.104.132.250:9000" +VITE_API_URL = "http://182.90.224.147:6688" +# VITE_API_URL = "http://47.104.132.250:9000" # 上传 # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.scss b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.scss index 418afce..6ad4f2e 100644 --- a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.scss +++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.scss @@ -48,9 +48,8 @@ .table { margin-left: 20px; height: 100%; - :deep(.table-main) { - height: calc(100% - 82px); - } + display: flex; + flex-direction: column; } } } diff --git a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.scss b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.scss index 788232b..37d8676 100644 --- a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.scss +++ b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.scss @@ -67,9 +67,8 @@ .table { margin-left: 20px; height: 100%; - :deep(.table-main) { - height: calc(100% - 82px); - } + display: flex; + flex-direction: column; } } } diff --git a/src/views/goverment/monthlyReport/index.scss b/src/views/goverment/monthlyReport/index.scss index c05e958..fc85801 100644 --- a/src/views/goverment/monthlyReport/index.scss +++ b/src/views/goverment/monthlyReport/index.scss @@ -48,9 +48,8 @@ .table { margin-left: 20px; height: 100%; - :deep(.table-main) { - height: calc(100% - 82px); - } + display: flex; + flex-direction: column; } } } diff --git a/src/views/goverment/progressManagement/divisionsAndISubItems/index.scss b/src/views/goverment/progressManagement/divisionsAndISubItems/index.scss index 3a3903a..1ae6d8a 100644 --- a/src/views/goverment/progressManagement/divisionsAndISubItems/index.scss +++ b/src/views/goverment/progressManagement/divisionsAndISubItems/index.scss @@ -49,7 +49,6 @@ position: relative; margin-left: 20px; .search-select { - min-width: 1470px; box-shadow: none; :deep() { .el-card { @@ -72,7 +71,6 @@ } } .statistics-table { - min-width: 1430px; height: calc(100% - 100px); background-color: var(--el-menu-bg-color); box-shadow: none; diff --git a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue index 5051c14..f8ee9eb 100644 --- a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue +++ b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue @@ -32,13 +32,13 @@
- 工程名称 + 工程名称 - 状态 + 状态 - 实际完成日期 + 实际完成日期