Merge remote-tracking branch 'origin/master'

src/views/layout/_common_top.vue

@@ -17,7 +17,7 @@
       </h1>
     </div>
     <div class="jp-navbar__body clearfix" style="overflow:hidden">
-      
+
       <el-menu
         class="jp-navbar__menu"
         mode="horizontal">
@@ -25,7 +25,7 @@
              <i  :class="sidebarFold ? 'fa fa-indent':'fa fa-outdent'"></i>
         </el-menu-item>
       </el-menu>
-    
+
       <el-menu class="jp-navbar__menu " :default-active="topMenuActiveIndex" ref="topMenu"  mode="horizontal">
         <el-menu-item  class="el_menu_item" v-for="menu in topMenuList"
           :index="menu.id"
@@ -50,15 +50,15 @@
           </el-menu-item>
         </el-submenu>
         </el-menu>
-      
+
       <el-menu
         class="jp-navbar__menu jp-navbar__menu--right"
         mode="horizontal">
-         <el-menu-item class="hide-sm">
+         <!--<el-menu-item class="hide-sm">
           <template slot="title">
                 <color-picker></color-picker>
           </template>
-        </el-menu-item>
+        </el-menu-item>-->
         <el-menu-item class="hide-sm">
           <template slot="title">
                 <notice-icon
@@ -78,11 +78,11 @@
             </el-dropdown-menu>
           </el-dropdown>
         </el-menu-item>
-        <el-menu-item class="hide-sm"  @click="showRight">
+        <!--<el-menu-item class="hide-sm"  @click="showRight">
           <template slot="title">
                <i class="el-icon-more rotate-90" @click="showRight"></i>
           </template>
-        </el-menu-item>
+        </el-menu-item>-->
       </el-menu>
     </div>
     <!-- 弹窗, 修改密码 -->

src/views/modules/program/registered/ProjectArchiveForm.vue

@@ -801,6 +801,7 @@
           this.inputForm.auditDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         }
         this.$refs['inputForm'].validate((valid) => {
+          console.log('')
           if (valid) {
             this.loading = true
             this.inputForm.reportFileList = this.$refs.uploadComponentReport.getDataList()