Merge branch 'master' of http://192.168.5.34:10101/r/YiYunJianZhuBeta

src/views/main_web/index.vue

@@ -60,8 +60,8 @@
       <section class="yiyun_warpContent mt-20">
         <div class="yiyun-rows" id="alone" v-infinite-scroll="scrollLoad">
           <div v-show="isEmpty" class="nullproduct">
-            <img src="static\img\nullimg.jpg" alt="" />
-            <span>您还没有项目呢</span>
+            <img src="static\img\nopro.png" alt="" />
+            <span class="noprotext">暂无项目</span>
           </div>
           <div class="yiyun-col-3 yiyun-col-md-4 yiyun-col-sm-6 yiyun-col-ty-12 mb-40" v-for="projItem in projPageList" :key="projItem.projID">
             <div class="yiyun_row">

src/views/main_web/workspace.vue

@@ -1125,9 +1125,11 @@
       </div>
     </div>
     <!-- 新建文件弹框 -->
+    <div class="dia_8" v-show="isShowNewFiledialog == true" @click="hideNewFiledialog"></div>
     <div class="newfiledialog" v-show="isShowNewFiledialog == true">
       <div class="dragareaBox">
-        <div class="dragarea_top">
+        <div class="dragarea_top uploadBtn">
+          <img src="static\img\upload.png" alt="" class="uploadBtnImg"/>
           <span class="dragarea_area" @click="showNewFiledialog">
             <file-Uploader
               :multiple="true"
@@ -1152,7 +1154,7 @@
               <b class="diaTitle">创建 云应用文件</b>
             </div>
             <div class="fr">
-              <i class="colosbtn" @click="hideNewFiledialog"></i>
+              <!-- <i class="colosbtn" @click="hideNewFiledialog"></i> -->
             </div>
           </div>
           <div class="yiyun_line2"></div>
@@ -1194,7 +1196,7 @@
               <b class="diaTitle">创建 云文件</b>
             </div>
             <div class="fr">
-              <i class="colosbtn" @click="hideNewFiledialog"></i>
+              <!-- <i class="colosbtn" @click="hideNewFiledialog"></i> -->
             </div>
           </div>
           <div class="yiyun_line2"></div>

static/css/main.css

@@ -3553,13 +3553,18 @@ button:focus {
 }
 
 .nullproduct {
-	width: 400px;
-	height: 400px;
-	margin: 50px auto;
-	text-align: center;
-	line-height: 50px;
+  margin: 10% auto;
+  text-align: center;
+  line-height: 50px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.noprotext{
+  color:#8f8f8f;
+  font-size: 16px
 }
-
 .newcreat {
 	color: #8b35f0;
 }
@@ -4392,13 +4397,23 @@ button:focus {
     top: -7px;
 }
 .newfiledialog{
-	width: 100%;
+  position: fixed;
+  top: 130px;
+  left: 50%;
+  width: 680px;
+  margin-left: -340px;
+	background-color: rgba(50, 50, 60, 0);
+  overflow-y: auto;
+  z-index: 11;
+}
+.dia_8{
+  width: 100%;
 	height:100%;
 	position:fixed;
 	left: 0px;
 	top: 0px;
 	background-color: rgba(50, 50, 60, 0.42);
-	z-index: 9;
+	z-index: 10;
 	overflow-y: auto;
 }
 .el-message-box__wrapper{
@@ -4406,7 +4421,6 @@ button:focus {
 }
 .dragareaBox{
 	width: 680px;
-	margin-top: 130px;
 	margin-right: auto;
 	margin-left: auto;
 	margin-bottom: 50px;
@@ -6514,8 +6528,13 @@ h4.biaoqianweizhi2{
     width: 680px;
     line-height: 100px;
     height: 100px;
-    background-color: transparent!important;
+    background-color: #fff!important;
     border: 0!important;
+    border-radius: 10px!important;
+    text-indent: 58px;
+}
+.addUpfile2 .webuploader-pick:hover{
+  color: #323232!important
 }
 .addUpfile2 .webuploader-pick~div{
 	content: '点击上传';
@@ -6528,6 +6547,16 @@ h4.biaoqianweizhi2{
     bottom: auto;
     right: auto;
 }
+.uploadBtn{
+ position: relative;
+}
+.uploadBtnImg{
+  position: absolute;
+  left: 37%;
+  top: 26%;
+  z-index: 1;
+
+}
 .dragbox .shangchuandinwei{
 	width: 400px;
     /* height: 120px; */