diff --git a/public/static/css/main.css b/public/static/css/main.css
index 944967a4..b1258a9f 100644
--- a/public/static/css/main.css
+++ b/public/static/css/main.css
@@ -4568,10 +4568,15 @@ button:focus {
background-color: rgba(50, 50, 60, 0.42);
}
.dragareaBox{
+ display: flex;
+ align-items: center;
width: 680px;
- margin-right: auto;
- margin-left: auto;
- margin-bottom: 50px;
+ height: 100px;
+ margin : 0 auto 50px;
+
+ border-radius: 10px;
+ background-color: rgba(252, 252, 252, 1);
+ box-shadow: 0px 4px 10px 1px rgba(0, 0, 0, 0.1), 0px 1px 3px 0px rgba(0, 0, 0, 0.1);
}
.dragarea_top{
width: 100%;
@@ -6715,10 +6720,10 @@ h4.biaoqianweizhi2{
}
.uploadBtnImg{
position: absolute;
- left: 37%;
+ left: 26%;
top: 26%;
z-index: 1;
-
+ height: 48px;
}
.dragbox .shangchuandinwei{
width: 400px;
@@ -7788,9 +7793,6 @@ li.secondMenu ul li:hover {
overflow-y: auto;
flex-direction: row;
}
-.linkcenter{
- justify-content: center;
-}
.linkstart{
justify-content: start;
}
@@ -7989,14 +7991,14 @@ li.secondMenu ul li:hover {
}
.yijianxietong{
display: block;
- width: 20px;
+ /* width: 20px;
height: 20px;
background-color: #CCCDD7;
color: #fff;
- border-radius: 10px;
+ border-radius: 10px; */
position: absolute;
- left: 4px;
- top: 4px;
+ left: 5px;
+ top: 5px;
}
.yijianIcon{
font-size: 24px;
@@ -8541,14 +8543,10 @@ h5.dulilabel{
}
.yuandian{
position: relative;
- height: 0;
- left: 0;
- top: 0;
/* width: 158px; */
- text-align: left;
- /* display: flex;
- align-items: baseline;
- justify-content: center; */
+}
+.yuandian:last-child .conterpoint {
+ width: 108px !important;
}
.upList{
top: 0;
@@ -9046,6 +9044,37 @@ h5.dulilabel{
top: 12px;
width: 26px;
height: 26px;
- background-color: gold;
+ background: url('/static/img/搜索.svg') center/100%;
cursor: pointer;
- }
\ No newline at end of file
+ }
+
+ /* 文件左上角图标 */
+ .green-icon, .gray-icon {
+ display: block;
+ width: 24px;
+ height: 24px;
+ }
+ /* 绿色协同图标 */
+ .green-icon {
+ background: url('/static/img/FileStatus/已协同协同.svg') center/100%;
+ }
+ /* 灰色图标 未启用协同*/
+ .gray-icon {
+ background: url('/static/img/FileStatus/未启用协同.svg') center/100%;
+ }
+ /* 蓝色图标 待更新协同 */
+ .blue-icon {
+ background: url('/static/img/FileStatus/待更新协同.svg') center/100%;
+ }
+
+ /* 新版项目概况 工作指派微调样式 */
+ .header-wrap .app-header-back-btn {
+ left: 24px !important;
+ }
+ .header-wrap .app-header-content {
+ padding: 0 48px !important;
+ }
+ .adjust-top-radius {
+ border-top-left-radius: 8px;
+ border-top-right-radius: 8px;
+ }
\ No newline at end of file
diff --git a/public/static/img/FileStatus/已协同协同.svg b/public/static/img/FileStatus/已协同协同.svg
new file mode 100644
index 00000000..a9db36e3
--- /dev/null
+++ b/public/static/img/FileStatus/已协同协同.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/public/static/img/FileStatus/待更新协同.svg b/public/static/img/FileStatus/待更新协同.svg
new file mode 100644
index 00000000..3a93019e
--- /dev/null
+++ b/public/static/img/FileStatus/待更新协同.svg
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/public/static/img/FileStatus/未启用协同.svg b/public/static/img/FileStatus/未启用协同.svg
new file mode 100644
index 00000000..8c10e06d
--- /dev/null
+++ b/public/static/img/FileStatus/未启用协同.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/public/static/img/搜索.svg b/public/static/img/搜索.svg
new file mode 100644
index 00000000..402fc5c0
--- /dev/null
+++ b/public/static/img/搜索.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/public/static/img/文件夹.svg b/public/static/img/文件夹.svg
new file mode 100644
index 00000000..c093d38a
--- /dev/null
+++ b/public/static/img/文件夹.svg
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/src/components/app-header/app-header.vue b/src/components/app-header/app-header.vue
index 33bcec80..5b4dcb63 100644
--- a/src/components/app-header/app-header.vue
+++ b/src/components/app-header/app-header.vue
@@ -101,7 +101,7 @@ export default {
font-size: $font-level-7;
&-right {
> span, > div {
- margin-left: 24px;
+ margin-left: 18px;
}
}
}
diff --git a/src/components/search-bar/search-bar.vue b/src/components/search-bar/search-bar.vue
index ca096ff2..5f6088b8 100644
--- a/src/components/search-bar/search-bar.vue
+++ b/src/components/search-bar/search-bar.vue
@@ -1,11 +1,9 @@
@@ -51,6 +49,7 @@
\ No newline at end of file
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index 2d26f127..5e100b27 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -7,14 +7,14 @@
class="app-header-style"
v-if="!showWorkline"
>
-
+
@@ -405,7 +405,7 @@