diff --git a/.env.development b/.env.development
index bd41f8a..ffefc80 100644
--- a/.env.development
+++ b/.env.development
@@ -2,9 +2,9 @@
NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用)
-VITE_API_URL = 'http://192.168.34.155:6688'
+# 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://182.90.224.147:6688"
# 上传
# VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index 5525da6..47bfee1 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -112,6 +112,7 @@ onMounted(() => {
diff --git a/src/views/enterprise/progressManagement/subItemManagement/index.vue b/src/views/enterprise/progressManagement/subItemManagement/index.vue
index 22e13ea..75ee138 100644
--- a/src/views/enterprise/progressManagement/subItemManagement/index.vue
+++ b/src/views/enterprise/progressManagement/subItemManagement/index.vue
@@ -475,6 +475,7 @@ onMounted(() => {
display: flex;
flex-direction: column;
position: relative;
+ background-color: #fff;
}
.imgDialog {
.uploadBtn {
diff --git a/src/views/goverment/notice/myPosted/index.scss b/src/views/goverment/notice/myPosted/index.scss
index 570af15..93d4836 100644
--- a/src/views/goverment/notice/myPosted/index.scss
+++ b/src/views/goverment/notice/myPosted/index.scss
@@ -19,13 +19,28 @@
padding: 0 40px;
}
-.html-div:first-child {
- display: block !important;
+.html-div {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ line-height: 50px;
+ height: 50px;
width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
-}
-.html-div:not(:first-child) {
- display: none;
+ :deep() {
+ p:first-child {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ p:not(:first-child) {
+ display: none !important;
+ }
+ }
}
diff --git a/src/views/goverment/notice/myReceive/index.scss b/src/views/goverment/notice/myReceive/index.scss
index f7d96d6..e897a41 100644
--- a/src/views/goverment/notice/myReceive/index.scss
+++ b/src/views/goverment/notice/myReceive/index.scss
@@ -16,15 +16,28 @@
padding: 0 40px;
}
-.html-div:first-child {
- display: block !important;
+.html-div {
+ display: flex;
+ align-items: center;
+ justify-content: center;
line-height: 50px;
height: 50px;
width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
-}
-.html-div:not(:first-child) {
- display: none;
+ :deep() {
+ p:first-child {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ p:not(:first-child) {
+ display: none !important;
+ }
+ }
}
diff --git a/src/views/goverment/policyLows/myPosted/index.scss b/src/views/goverment/policyLows/myPosted/index.scss
index 1cca37f..fd28199 100644
--- a/src/views/goverment/policyLows/myPosted/index.scss
+++ b/src/views/goverment/policyLows/myPosted/index.scss
@@ -18,16 +18,34 @@
.content :deep(.ql-align-left) {
text-align: left;
}
-
-.html-div:first-child {
- display: block !important;
+.html-div {
+ display: flex;
+ align-items: center;
+ justify-content: center;
line-height: 50px;
height: 50px;
width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
+ :deep() {
+ p:first-child {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ p:not(:first-child) {
+ display: none !important;
+ }
+ }
}
-.html-div:not(:first-child) {
- display: none;
-}
+// .html-div:first-child {
+// display: block !important;
+// }
+// .html-div:not(:first-child) {
+// display: none;
+// }
diff --git a/src/views/goverment/policyLows/myReceive/index.scss b/src/views/goverment/policyLows/myReceive/index.scss
index 1cca37f..df2d60a 100644
--- a/src/views/goverment/policyLows/myReceive/index.scss
+++ b/src/views/goverment/policyLows/myReceive/index.scss
@@ -19,15 +19,28 @@
text-align: left;
}
-.html-div:first-child {
- display: block !important;
+.html-div {
+ display: flex;
+ align-items: center;
+ justify-content: center;
line-height: 50px;
height: 50px;
width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
-}
-.html-div:not(:first-child) {
- display: none;
+ :deep() {
+ p:first-child {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ p:not(:first-child) {
+ display: none !important;
+ }
+ }
}
diff --git a/src/views/goverment/progressManagement/planFinishSituation/index.scss b/src/views/goverment/progressManagement/planFinishSituation/index.scss
index 3c21241..d544dae 100644
--- a/src/views/goverment/progressManagement/planFinishSituation/index.scss
+++ b/src/views/goverment/progressManagement/planFinishSituation/index.scss
@@ -5,13 +5,15 @@
height: 100%;
.leftMenu {
width: 300px;
+ border-radius: 8px;
// width: 290px;
// 页面的项目工程
:deep(.item) {
height: 78px !important;
}
:deep(.content) {
- height: calc(100% - 160px) !important;
+ height: calc(100% - 150px) !important;
+ min-height: auto;
}
.leftProject {
// padding: 5px 8px;
@@ -23,51 +25,31 @@
// font-weight: 700;
font-family: "siyuan_Medium";
- font-size: 20px;
- color: #ffffff;
text-overflow: ellipsis;
white-space: nowrap;
}
.leftMenu_item {
display: flex;
justify-content: space-between;
- margin-top: 10px;
overflow: hidden;
.middleSize {
display: inline-block;
- font-size: 18px;
- color: #c4c4c4;
+ font-size: 16px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
- .video {
- display: flex;
- align-items: center;
- img {
- width: 14px;
- height: 14px;
- margin: 0 4px;
- }
- }
- }
- .bottom_item {
- .bottomSize {
- font-size: 18px !important;
- color: #666666;
- }
}
}
}
.table-box {
- width: calc(100% - 300px);
+ width: calc(100% - 320px);
height: 100%;
.table {
margin-left: 20px;
height: 100%;
:deep(.table-main) {
height: calc(100% - 82px);
- overflow-x: scroll;
}
}
}
@@ -75,35 +57,23 @@
:deep(.el-scrollbar__view) {
width: 100%;
height: 100%;
-
- // display: flex;
- // flex-wrap: wrap;
}
:deep() {
.el-form-item__content > :not(button) {
// width: 160px;
}
.el-input__wrapper {
- color: white;
- font-size: 20px;
- background-color: transparent;
- border: none;
- box-shadow: 0 0 0 1px var(--el-color-primary, var(--el-color-primary)) inset;
+ font-size: 16px;
}
.el-input__inner {
- color: white;
- font-size: 20px;
+ font-size: 16px;
}
.el-textarea__inner {
- color: white;
- font-size: 20px;
- background-color: transparent;
- border: none;
- box-shadow: 0 0 0 1px var(--el-color-primary, var(--el-color-primary)) inset;
+ font-size: 16px;
+ }
+}
+:deep() {
+ .el-form .el-form-item__content .el-range-editor {
+ width: 300px;
}
}
-
-// :deep(.el-dialog__body) {
-// padding: 0 0 0 0 !important;
-// background-color: pink;
-// }
diff --git a/src/views/goverment/progressManagement/planFinishSituation/index.vue b/src/views/goverment/progressManagement/planFinishSituation/index.vue
index 720a768..c520de2 100644
--- a/src/views/goverment/progressManagement/planFinishSituation/index.vue
+++ b/src/views/goverment/progressManagement/planFinishSituation/index.vue
@@ -18,10 +18,6 @@
{{ data.projectAddress || data.address }}
-