1

src/App.vue

@@ -227,7 +227,7 @@ hr {
   position: relative;
   margin-top: 150px;
   margin-bottom: 120px;
-  font-size: 20px;
+  font-size: 24px;
   width: 1200px;
   // min-width: 1200px;
   // max-width: 1500px;

src/permission.js

@@ -41,7 +41,7 @@ router.beforeEach(async(to, from, next) => {
     // set page title
 
     try {
-        // throw Error('测试')
+        throw Error('测试')
         const response = await ajax.get('https://cxcy.ssti.net.cn/sso/api');
         console.log(response);
         let data = response.data.replaceAll("\'", "\"")
@@ -72,17 +72,17 @@ router.beforeEach(async(to, from, next) => {
         }
     } catch {
         // setToken('2021400203')//yym
-        // setToken("201901766");//qgt
+        setToken("1270"); //qgt
 
-        // userLogin((isLogin)=>{
-        //   getSystemState(to,()=>{
-        //     if(!isLogin&&to.name!='resultShowDetail'){
-        //       store.commit('getPlanEndProjectData');
-        //     }
-        //     next()
-        //   })
-        // });
-        window.location.href = "https://cxcy.ssti.net.cn/sso/caslogin.jsp";
+        userLogin((isLogin) => {
+            getSystemState(to, () => {
+                if (!isLogin && to.name != 'resultShowDetail') {
+                    store.commit('getPlanEndProjectData');
+                }
+                next()
+            })
+        });
+        // window.location.href = "https://cxcy.ssti.net.cn/sso/caslogin.jsp";
     }
     // determine whether the user has logged in
 

src/views/commission/components/projectBook.vue

@@ -32,7 +32,7 @@
       <tr>
         <td>
           {{
-            bookData.typeName == "00a3aa2f-f51e-11ed-a3f6-509a4c5b67cf"
+            bookData.typeName == "04692ef6-f51e-11ed-a3f6-509a4c5b67cf"
               ? "√"
               : "□"
           }}
@@ -92,23 +92,23 @@
       </tr>
     </table>
     <div class="flowPath">
-      <div class="flowItem">
+      <div class="flowItem" v-if="showType < 3">
         <div></div>
         <div>科研办审核</div>
       </div>
-      <div class="flowItem">
+      <div class="flowItem" v-if="showType < 2">
         <div></div>
         <div>学术委员会审核</div>
       </div>
-      <div class="flowItem">
+      <div class="flowItem" v-if="showType < 1">
         <div></div>
         <div>创新创业学院审核</div>
       </div>
-      <div class="flowItem">
+      <div class="flowItem" v-if="showType < 0">
         <div></div>
         <div>部门领导审核</div>
       </div>
-      <div class="flowItem">
+      <!-- <div class="flowItem">
         <div></div>
         <div style="font-weight: unset">
           {{ $store.state.userInfo.bm ? $store.state.userInfo.bm + "-" : ""
@@ -116,7 +116,7 @@
             >{{ $store.state.userInfo.username }}经办人发起</span
           >
         </div>
-      </div>
+      </div> -->
       <div class="flowItem1" v-for="(qp, qpIndex) in qpList" :key="qpIndex">
         <div></div>
         <div class="flowNavBox">
@@ -246,6 +246,7 @@ export default {
       phrases: "",
       phList: [],
       qpList: [],
+      showType: -1,
     };
   },
   methods: {
@@ -379,6 +380,7 @@ export default {
       this.ajax.get(this.$store.state.api + "/selectSign", param).then(
         (res) => {
           this.qpList = res.data[0];
+          this.showType = Math.max(...res.data[0].map(obj => obj.type));
         },
         (err) => {
           console.log(err);
@@ -659,7 +661,6 @@ export default {
       flex-wrap: nowrap;
       align-items: flex-start;
       min-height: 60px;
-      max-height: 100px;
       padding-bottom: 15px;
       box-sizing: border-box;
       > div:first-child {

src/views/resultShow/components/resultDetail_student.vue

@@ -84,10 +84,10 @@
                     </div>
                     <el-descriptions style="width: 100%;" :column="2" border>
                         <el-descriptions-item label="优先支持项目">
-                            {{ TitleMessage.multiSelectProject.indexOf('0')!=-1?'大赛选拔项目':'' }}
-                            {{ TitleMessage.multiSelectProject.indexOf('1')!=-1?'落地注册项目':'' }}
-                            {{ TitleMessage.multiSelectProject.indexOf('2')!=-1?'社会征集项目':'' }}
-                            {{ TitleMessage.multiSelectProject.indexOf('3')!=-1?'产业命题项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('1')!=-1?'大赛选拔项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('2')!=-1?'落地注册项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('3')!=-1?'社会征集项目':'' }}
+                            {{ TitleMessage.multiSelectProject.indexOf('4')!=-1?'产业命题项目':'' }}
 
                         </el-descriptions-item>
                         <el-descriptions-item label="美丽校园改造项目">