Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/makerActvityDetails.vue

@@ -181,24 +181,43 @@
             <div class="tabTit">
                  <div><p>活动计划</p></div>
             </div>
-             
-              <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[0]"></vue-editor>
+            <el-input
+              type="textarea"
+              :rows="6"
+              placeholder="请输入内容"
+              v-model="tableData.chapters[0]">
+            </el-input>
+              <!-- <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[0]"></vue-editor> -->
             <div class="tabTit">
                  <div><p>预期目标</p></div>
             </div>
-            
-                <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[1]"></vue-editor>
-              
+            <el-input
+              type="textarea"
+              :rows="6"
+              placeholder="请输入内容"
+              v-model="tableData.chapters[1]">
+            </el-input>
+                <!-- <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[1]"></vue-editor> -->
             <div class="tabTit">
                  <div><p>活动受面</p></div>
             </div>
-            
-              <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[2]"></vue-editor>
+            <el-input
+              type="textarea"
+              :rows="6"
+              placeholder="请输入内容"
+              v-model="tableData.chapters[2]">
+            </el-input>
+              <!-- <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[2]"></vue-editor> -->
             <div class="tabTit">
                  <div><p>经费支出计划</p></div>
             </div>
-             
-              <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[3]"></vue-editor>
+            <el-input
+              type="textarea"
+              :rows="6"
+              placeholder="请输入内容"
+              v-model="tableData.chapters[3]">
+            </el-input>
+              <!-- <vue-editor  :editorToolbar="customToolbar" v-model="tableData.chapters[3]"></vue-editor> -->
             <!-- 多行文本框部分结束 -->
 
             <div class="baseBtn">

src/views/home.vue

@@ -24,7 +24,10 @@
                         {{ item.label }}
                       </template>
                       <el-menu-item-group v-if="item.group.length">
-                        <el-menu-item  v-for="(i,num) in item.group" :key="num" :index='ind+"-"+num' @click="goto(i.goto)">{{ i.label }}</el-menu-item>
+                        <el-menu-item  v-for="(i,num) in item.group" :key="num" :index='ind+"-"+num' @click="goto(i.goto)">
+                          <!-- <i :class="item.icon" style="margin-right: 15px;width: 15px;"></i> -->
+                          {{ i.label }}
+                        </el-menu-item>
                       </el-menu-item-group>
                     </el-submenu>
                     <el-menu-item :index="ind.toString()" v-else @click="goto(item.goto)">
@@ -35,20 +38,6 @@
                     </el-menu-item>
                   </div>
 
-                  
-
-                  <!-- <el-menu-item index="2">
-                    <i class="el-icon-menu"></i>
-                    <span slot="title">导航二</span>
-                  </el-menu-item>
-                  <el-menu-item index="3" disabled>
-                    <i class="el-icon-document"></i>
-                    <span slot="title">导航三</span>
-                  </el-menu-item>
-                  <el-menu-item index="4">
-                    <i class="el-icon-setting"></i>
-                    <span slot="title">导航四</span>
-                  </el-menu-item> -->
                 </el-menu>
               </el-col>
         </el-aside>
@@ -70,9 +59,10 @@
       data() {
         return {
           navList:[
-            {id:1,label:"事前申报",goto:"/projectApplication",icon:"iconfont icon-shuben",group:[{label:"项目立项申请",goto:"/projectApplication"}]},
-            {id:2,label:"活动管理",goto:"/makerActvity",icon:"el-icon-wind-power",group:[]},
-            {id:3,label:"资金使用管理",goto:"/makerfund",icon:"iconfont icon-zijinguanli",group:[]},
+            {id:1,label:"事前申报",icon:"iconfont icon-shuben",group:[{label:"项目立项申请",icon:"iconfont icon-shuben",goto:"/projectApplication"},{label:"活动申请",icon:"el-icon-wind-power",goto:"/makerActvity"}]},
+            // {id:2,label:"活动管理",goto:"/makerActvity",icon:"el-icon-wind-power",group:[]},
+            {id:1,label:"事后汇总",icon:"iconfont icon-zijinguanli",group:[{label:"创客活动资金申请",icon:"el-icon-wind-power",goto:"/makerfund"},{label:"非创客活动资金申请",icon:"el-icon-wind-power",goto:"/makerfund"}]},
+            // {id:3,label:"资金使用管理",goto:"/makerfund",icon:"iconfont icon-zijinguanli",group:[]},
             {id:4,label:"项目管理",goto:"/ProjectManagement",icon:"el-icon-receiving",group:[]},
             {id:5,label:"项目结项",goto:"/projectSettlement",icon:"iconfont icon-_yuanhuanchong",group:[]},
             // {id:6,label:"学分登记",goto:"/credit",icon:"iconfont icon-yonghu"},
@@ -171,4 +161,21 @@
         width: 100%;
       }
     }
+:deep(.el-submenu){
+  .el-submenu__title{
+      padding-left: 20% !important;
+  }
+  .el-menu{
+    .el-menu-item{
+      // background-color: blue;
+      padding-left: 20% !important;
+    }
+    // padding-left: 25% !important;
+  }
+}
+
+:deep(.el-menu-item){
+  padding-left: 20% !important;
+  // background-color: red;
+}
 </style>

src/views/projectApply/components/projectApplicationMakerSpaceDetails.vue

@@ -237,8 +237,8 @@
         <!-- <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
 
         <el-button v-show="isUpload==0" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
-        <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
-        <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
+        <!-- <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
+        <el-button v-show="isUpload!=0" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
 
       </div>
     </div>
@@ -426,7 +426,7 @@
             sortOptions: [],//分类
             department:[],
           },
-          textarea:'周四福利大放送',   //项目简介
+          textarea:'',   //项目简介
 
           teacherData:[],   //成员列表数据
           studentData:[],

src/views/projectApply/components/projectApplicationMakerSpaceDetails2.vue

@@ -112,8 +112,8 @@
 
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" v-show="isUpload==2"  @click="submitHint=true">立即修改</el-button>
-          <el-button type="primary" disabled v-show="isUpload==3 || isUpload ==4" style="background: #ccc !important;border: none;">立即修改</el-button>
+          <el-button type="primary" v-show="isUpload==0"  @click="submitHint=true">立即修改</el-button>
+          <el-button type="primary" disabled v-show="isUpload!=0" style="background: #ccc !important;border: none;">立即修改</el-button>
           <!-- <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button> -->
 
         </div>

src/views/projectManage/components/ProjectManagement1.vue

@@ -352,8 +352,8 @@
             
     <div class="baseBtn">
       <div class="blockWidth">
-        <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button>
-        <el-button type="primary" v-show="isUpload==3 || isUpload==4" class="disa">立即修改</el-button>
+        <!-- <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button> -->
+        <!-- <el-button type="primary" v-show="isUpload==3 || isUpload==4" class="disa">立即修改</el-button> -->
         <!-- <el-button type="primary" v-show="apIsupload==2" class="disa">立即修改</el-button> -->
       </div>
     </div>

src/views/projectManage/components/ProjectManagement1_MakerSpace.vue

@@ -237,9 +237,9 @@
       <div class="blockWidth">
         <!-- <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
 
-        <el-button v-show="isUpload==2 || isUpload ==3" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
+        <!-- <el-button v-show="isUpload==2 || isUpload ==3" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button> -->
         <!-- <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
-        <el-button v-show="isUpload==4" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
+        <!-- <el-button v-show="isUpload==4" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
 
       </div>
     </div>

src/views/projectManage/components/ProjectManagement2.vue

@@ -177,8 +177,8 @@
             </div>
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button>
-          <el-button type="primary" v-show="isUpload==3 || isUpload ==4" class="disa">立即修改</el-button>
+          <!-- <el-button type="primary" v-show="isUpload==2"  @click="audit">立即修改</el-button> -->
+          <!-- <el-button type="primary" v-show="isUpload==3 || isUpload ==4" class="disa">立即修改</el-button> -->
 
         </div>
       </div>

src/views/projectManage/components/ProjectManagement2_MakerSpace.vue

@@ -107,8 +107,8 @@
   
         <div class="baseBtn">
           <div class="blockWidth">
-            <el-button type="primary" v-show="isUpload==2 || isUpload==3"  @click="submitHint=true">立即修改</el-button>
-            <el-button type="primary" disabled v-show="isUpload ==4" style="background: #ccc !important;border: none;">立即修改</el-button>
+            <!-- <el-button type="primary" v-show="isUpload==2 || isUpload==3"  @click="submitHint=true">立即修改</el-button> -->
+            <!-- <el-button type="primary" disabled v-show="isUpload ==4" style="background: #ccc !important;border: none;">立即修改</el-button> -->
             <!-- <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button> -->
   
           </div>

src/views/projectManage/components/ProjectManagement3_1.vue

@@ -152,8 +152,7 @@
     <div class="baseBtn">
             <div class="blockWidth">
               <el-button v-show="state==0" type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
-              <el-button v-show="state==1" type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
-              <el-button v-show="state==2" disabled style="background: #ccc !important;border: 0;" type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
+              <el-button v-show="state!=0" disabled style="background: #ccc !important;border: 0;" type="primary" class="backBtn"  @click="updateActivityDialog" >上传修改</el-button>
             </div>
           </div>
 

src/views/projectSettlement/components/projectSettlementDetailBase_MakerSpace.vue

@@ -241,9 +241,9 @@
       <div class="blockWidth">
         <!-- <el-button type="primary" class="backBtn" @click="audit">立即修改</el-button> -->
 
-        <el-button v-show="isUpload==0" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
+        <!-- <el-button v-show="isUpload==0" type="primary" class="backBtn" @click="submitHint=true">立即修改</el-button>
         <el-button v-show="isUpload==1" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
-        <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button>
+        <el-button v-show="isUpload==2" type="primary" class="backBtn" disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
 
       </div>
     </div>

src/views/projectSettlement/components/projectSettlementDetailBase_Student.vue

@@ -352,9 +352,9 @@
               
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" class="backBtn" v-show="isUpload==0" @click="audit">立即修改</el-button>
+          <!-- <el-button type="primary" class="backBtn" v-show="isUpload==0" @click="audit">立即修改</el-button>
           <el-button type="primary" class="backBtn" v-show="isUpload==1" disabled style="background-color: #c8c9cc !important;border:none;">立即修改</el-button>
-          <el-button type="primary" class="backBtn" v-show="isUpload==2" disabled style="background-color: #c8c9cc !important;border:none;">立即修改</el-button>
+          <el-button type="primary" class="backBtn" v-show="isUpload==2" disabled style="background-color: #c8c9cc !important;border:none;">立即修改</el-button> -->
 
         </div>
       </div>

src/views/projectSettlement/components/projectSettlementDetailComment.vue

@@ -43,7 +43,7 @@
           >
           <template #default="scope">
               <div class="operations">
-                      <el-button type="primary"  size="mini" @click="checkFile(scope.row.url)" style="background: #477edd">明细查看</el-button>
+                  <el-button type="primary"  size="mini" @click="checkFile(scope.row.url)" style="background: #477edd">明细查看</el-button>
               </div>
           </template>
         </el-table-column>

src/views/projectSettlement/components/projectSettlementDetail_MakerSpace.vue

@@ -101,9 +101,9 @@
 
       <div class="baseBtn">
         <div class="blockWidth">
-          <el-button type="primary" v-show="isUpload==0"  @click="submitHint=true">立即修改</el-button>
-          <el-button type="primary" disabled v-show="isUpload==1" style="background: #ccc !important;border: none;">立即修改</el-button>
-          <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button>
+          <!-- <el-button type="primary" v-show="isUpload==0"  @click="submitHint=true">立即修改</el-button> -->
+          <!-- <el-button type="primary" disabled v-show="isUpload==1" style="background: #ccc !important;border: none;">立即修改</el-button> -->
+          <!-- <el-button type="primary" disabled style="background: #ccc !important;border: none;" v-show="isUpload==2">立即修改</el-button> -->
 
         </div>
       </div>

src/views/projectSettlement/components/projectSettlementDetail_Student.vue

@@ -177,9 +177,9 @@
               </div>
         <div class="baseBtn">
           <div class="blockWidth">
-            <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
+            <!-- <el-button type="primary" v-show="isUpload==0"  @click="audit">立即修改</el-button>
             <el-button type="primary" v-show="isUpload==1" disabled style="background: #ccc !important;border: none;" >立即修改</el-button>
-            <el-button type="primary"  v-show="isUpload==2"  disabled style="background: #ccc !important;border: none;">立即修改</el-button>
+            <el-button type="primary"  v-show="isUpload==2"  disabled style="background: #ccc !important;border: none;">立即修改</el-button> -->
   
           </div>
         </div>