权限修改

src/permission.js

@@ -40,7 +40,7 @@ function getSystemState(to, callback) {
     }).then(res => {
         let state = res['data'][0][0]['state'];
         store.commit('update', ['systemState', state]);
-        if (state != 0 && store.state.userInfo.type != 0 && to.name != 'CloseWeb') return router.push('/CloseWeb');
+        if (state != 0 && store.state.userInfo.type != 0 && store.state.userInfo.type != 3 && to.name != 'CloseWeb') return router.push('/CloseWeb');
         if (state == 0 && to.name == 'CloseWeb') return router.push('/projectApplication');
         callback(state);
     }).catch(err => {

src/views/commission/components/projectLookstudnt.vue

@@ -92,7 +92,7 @@
             <td>参与教师人数</td><td v-text="downWordData.teacherS.length"></td>
           </tr>
           <tr id="studentS">
-            <td :rowspan="downWordData.studentS.length+1" ref="studentS">项目组学生成员（至少2个学院以上学生构成，团队5人以上）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+            <td :rowspan="downWordData.studentS.length+1" ref="studentS">项目组学生成员<br/>（至少2个学院以上学生构成，团队5人以上）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
           </tr>
           <tr style="position: relative;" v-for="(item,index) in downWordData.studentS" :key="index+'a'">
             <td v-text="item.name"></td>
@@ -100,7 +100,7 @@
             <td colspan="3" v-text="item.work"></td>
           </tr>
           <tr id="teacherS">
-            <td :rowspan="downWordData.teacherS.length+1" ref="teacherS">项目组指导教师（2个学院以上，团队2-3人）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
+            <td :rowspan="downWordData.teacherS.length+1" ref="teacherS">项目组指导教师<br/>（2个学院以上，团队2-3人）</td><td>姓名</td><td colspan="2">所在学院/部门/专业</td><td colspan="3">项目组角色分工</td>
           </tr>
           <tr style="position: relative !important;" v-for="(item,index) in downWordData.teacherS" :key="index+'b'">
             <td v-text="item.name"></td>
@@ -260,7 +260,7 @@
             <span>备注：</span>
             <span>1.表格可顺延或另附页。</span>
             <span>2.优先支持项目需提供与研发项目相关的实证材料并查看原件。</span>
-            <span>3.初创组已结题项目申请需提供结题验收证明、初创企业申请需提供入驻学校孵化基地协议书及公司营业执照。</span>
+            <!-- <span>3.初创组已结题项目申请需提供结题验收证明、初创企业申请需提供入驻学校孵化基地协议书及公司营业执照。</span> -->
           </div>
         </table>
           <!-- <el-button style="margin-top:20px" type="primary" @click="work">下载表格</el-button> 下载word文档 -->

src/views/home.vue

@@ -295,10 +295,10 @@ export default {
         this.$store.state.userInfo.type == 0
       ) {
         this.$router.push("/projectApplication");
+			}else if(this.$store.state.userInfo.type == 3){
+				this.$router.push("/projectApplication");
       } else if (
-        this.$store.state.userInfo.type == 3 ||
-        this.$store.state.userInfo.type == 4
-      ) {
+        this.$store.state.userInfo.type == 4) {
 
         // this.$router.push("/resultsShow");
 				this.$router.push("/commission")
@@ -314,7 +314,7 @@ export default {
       if (
         this.$store.state.userInfo.type == 1 ||
         this.$store.state.userInfo.type == 2
-      ) {
+      ) {//老师、学生
         this.navList.push(
           {
             id: 1,
@@ -397,7 +397,7 @@ export default {
           //   group: [],
           // },
         );
-      } else if (this.$store.state.userInfo.type == 0) {
+      } else if (this.$store.state.userInfo.type == 0) {//管理员
         this.navList.push(
           {
             id: 1,
@@ -511,11 +511,141 @@ export default {
             group: [],
           }
         );
-      } else if (
-        this.$store.state.userInfo.type == 3 ||
-        this.$store.state.userInfo.type == 4
-      ) {
+      }else if(this.$store.state.userInfo.type == 3){
+				this.navList.push(
+          {
+            id: 1,
+            label: "事前申请",
+            goto: "/projectApplication",
+            icon: "iconfont icon-shuben",
+            group: [
+              {
+                id: 1,
+                label: "项目立项管理",
+                goto: "/projectApplication",
+                group: [
+                  {
+                    label: "双创项目申请",
+                    goto: "/newStudentProjectApply",
+                  },
+                  { label: "创客空间申请", goto: "/MakerSpaceApply" },
+                ],
+              },
+              {
+                id: 1,
+                label: "创客活动管理",
+                goto: "/makerActvity",
+                group: [
+                  {
+                    label: "实践活动申请",
+                    goto: "/newMarkerActivity",
+                  },
+                  // {label:"个人创客申请",power:false,goto:"/newNomMarkerActivity"},
+                ],
+              },
+            ],
+          },
+          {
+            id: 2,
+            label: "事后汇总",
+            goto: "/makerfund",
+            icon: "iconfont icon-zijinguanli",
+            group: [
+              {
+                label: "创客资金申请",
+                goto: "/newMarkerfundApply",
+                group: [],
+              },
+              // {label:"创客活动资金申请",power:false,goto:"/newMarkerfundApply"},
+              // {label:"个人创客资金申请",power:false,goto:"/newNomMarkerFundApply"}
+            ],
+          },
+          // {
+          //   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"},
+          {
+            id: 7,
+            label: "成果展示",
+            goto: "/resultsShow",
+            icon: "iconfont icon-xiangmuguanli2",
+            group: [],
+          },
+          {
+            id: 8,
+            label: "创业公司登记",
+            goto: "/firm",
+            icon: "iconfont icon-zuzhijiegou",
+            group: [],
+          },
+          {
+            id: 9,
+            label: "消息通知",
+            goto: "/messageNotification",
+            icon: "iconfont icon-xiaoxitongzhi3",
+            group: [],
+          },
+          {
+            id: 10,
+            label: "数据监测",
+            goto: "/echarts",
+            icon: "iconfont icon-qushi",
+            group: [],
+          },
+          {
+            id: 11,
+            label: "待办公文",
+            goto: "/commission",
+            icon: "dbgw",
+            group: [],
+          },
+          {
+            id: 11,
+            label: "系统管理",
+            goto: "/system",
+            icon: "el-icon-setting",
+            group: [],
+          }
+        );
+			}else if (this.$store.state.userInfo.type == 4) {
         this.navList.push(
+					{
+            id: 1,
+            label: "事前申请",
+            goto: "/projectApplication",
+            icon: "iconfont icon-shuben",
+            group: [
+              {
+                id: 1,
+                label: "项目立项管理",
+                goto: "/projectApplication",
+                group: [
+                  {
+                    label: "双创项目申请",
+                    goto: "/newStudentProjectApply",
+                  },
+                ],
+              },
+            ],
+          },
           // {
           //   id: 7,
           //   label: "成果展示",

src/views/projectApply/projectApplication.vue

@@ -274,7 +274,7 @@
               <el-button
                 type="primary"
                 v-if="
-                  scope.row.isupload == 2 && $store.state.userInfo.type != 0
+                  scope.row.isupload == 2 && $store.state.userInfo.type != 0 && $store.state.userInfo.type != 3
                 "
                 class="disa btnClass"
                 size="mini"
@@ -283,7 +283,7 @@
               <el-button
                 type="primary"
                 v-if="
-                  scope.row.isupload == 3 && $store.state.userInfo.type != 0
+                  scope.row.isupload == 3 && $store.state.userInfo.type != 0 && $store.state.userInfo.type != 3
                 "
                 class="disa btnClass"
                 size="mini"
@@ -292,17 +292,17 @@
               <el-button
                 type="primary"
                 v-if="
-                  scope.row.isupload == 4 && $store.state.userInfo.type != 0
+                  scope.row.isupload == 4 && $store.state.userInfo.type != 0 && $store.state.userInfo.type != 3
                 "
                 class="disa btnClass"
                 size="mini"
                 >已结项</el-button
               >
 
-              <!--1管理员审核 -->
+              <!--1管理员审核与院长 -->
               <el-button
                 v-if="
-                  scope.row.isupload == 0 && $store.state.userInfo.type == 0
+                  scope.row.isupload == 0 && ($store.state.userInfo.type == 0 || $store.state.userInfo.type == 3)
                 "
                 type="primary"
                 class="disa btnClass"
@@ -312,7 +312,7 @@
 
               <el-button
                 v-if="
-                  scope.row.isupload == 1 && $store.state.userInfo.type == 0
+                  scope.row.isupload == 1 && ($store.state.userInfo.type == 0 || $store.state.userInfo.type == 3)
                 "
                 type="primary"
                 size="mini"
@@ -323,7 +323,7 @@
 
               <el-button
                 v-if="
-                  scope.row.isupload == 2 && $store.state.userInfo.type == 0
+                  scope.row.isupload == 2 && ($store.state.userInfo.type == 0 || $store.state.userInfo.type == 3)
                 "
                 type="primary"
                 class="disa btnClass"
@@ -332,7 +332,7 @@
               >
               <el-button
                 v-if="
-                  scope.row.isupload == 3 && $store.state.userInfo.type == 0
+                  scope.row.isupload == 3 && ($store.state.userInfo.type == 0 || $store.state.userInfo.type == 3)
                 "
                 type="primary"
                 class="disa btnClass"
@@ -341,7 +341,7 @@
               >
               <el-button
                 v-if="
-                  scope.row.isupload == 4 && $store.state.userInfo.type == 0
+                  scope.row.isupload == 4 && ($store.state.userInfo.type == 0 || $store.state.userInfo.type == 3)
                 "
                 type="primary"
                 class="disa btnClass"