提交

src/config/config.js

@@ -24,9 +24,9 @@ const store = new Vuex.Store({
         // socket: "https://poll.cocorobo.cn",
         // socket: "http://localhost:1473",
         // api: 'http://10.3.16.226:7003/api',//qgt后端
-        // api: 'https://cxcy.ssti.net.cn/api', //服务器
+        api: 'https://cxcy.ssti.net.cn/api', //服务器
         // api: 'http://127.0.0.1:7003/api',
-        api: 'http://10.3.16.59:7003/api',
+        // api: 'http://10.3.16.59:7003/api',
 
     },
 

src/permission.js

@@ -53,15 +53,14 @@ router.beforeEach(async(to, from, next) => {
 
     try {
         // throw Error('测试')
-        // const response = await ajax.get('https://cxcy.ssti.net.cn/sso/api');
-        // console.log(response);
-        // let data = response.data.replaceAll("\'", "\"")
-        // if (data && JSON.parse(data).uid) {
-            // uid = JSON.parse(data).uid;
-            uid = "1270";//本地
-						// uid = "201901766";//本地
-            // setToken(btoa(md5(JSON.parse(data).uid)));
-            setToken(btoa(md5(uid)));
+        const response = await ajax.get('https://cxcy.ssti.net.cn/sso/api');
+        console.log(response);
+        let data = response.data.replaceAll("\'", "\"")
+        if (data && JSON.parse(data).uid) {
+            uid = JSON.parse(data).uid;
+            // uid = "1270";//本地
+            setToken(btoa(md5(JSON.parse(data).uid)));
+            // setToken(btoa(md5("1270")));
             // testApi();
             userLogin((isLogin) => {
                 getSystemState(to, () => {
@@ -72,35 +71,33 @@ router.beforeEach(async(to, from, next) => {
                 })
             });
 
-        // } else {
-        //     // setToken('2021400203')//yym
-        //     // setToken("201901766");//qgt    
+        } else {
+            // setToken('2021400203')//yym
+            // setToken("201901766");//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";
+        }
     } catch {
-			uid = "1270";//本地
-			// uid = "201901766";//本地
         // setToken('2021400203')//yym
-        setToken(btoa(md5(uid))); //wyt
+        // setToken(btoa(md5("1270"))); //wyt
 
-        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/projectSettlement/components/projectSettlementBook.vue

@@ -14,7 +14,7 @@
         <div class="title">校级创客项目结题申请书</div>
         <div class="basicInformation">
           <span>项目名称</span>
-          <div class="line">{{ myArrayProp[0].title }}</div>
+          <div class="line">{{ myArrayProp[0].title?myArrayProp[0].title:'' }}</div>
         </div>
         <div class="basicInformation">
           <span>负责人</span>
@@ -65,7 +65,7 @@
       <tr>
         <td colspan="2">项目名称</td>
         <td colspan="6">
-          {{ myArrayProp[0].title }}
+          {{ myArrayProp[0].title?myArrayProp[0].title:'' }}
         </td>
       </tr>
       <tr>
@@ -279,7 +279,7 @@
       >
         <td><span v-text="item.name"></span></td>
         <td ><span v-html="item.speciality"></span></td>
-        <td ><span v-html="item.title"></span></td>
+        <td ><span v-html="item.title?item.title:''"></span></td>
         <td ><span v-html="item.education"></span></td>
         <td ><span v-html="item.section"></span></td>
         <td colspan="5"><span v-text="item.work"></span></td>

src/views/projectSettlement/projectSettlement.vue

@@ -196,7 +196,7 @@
           class="projectApplicationfundAddDialog"
           :before-close="init">
           
-          <div class="deleteContent">确定提交“{{tit}}”结项吗？提交后将不能修改内容，等待管理员审核结项结果。 </div>
+          <div class="deleteContent">确定提交“{{tit?tit:''}}”结项吗？提交后将不能修改内容，等待管理员审核结项结果。 </div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认</el-button>
             <el-button @click="init" size="small" class="AllDialogBtn">取消</el-button>