SanHQin vor 1 Woche
Ursprung
Commit
c8bb1d713a

BIN
public/iconTitle.png


+ 1 - 1
public/index.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
+    <link rel="icon" href="<%= BASE_URL %>iconTitle.png">
     <title>双创学院管理系统</title>
 </head>
 

+ 6 - 5
src/App.vue

@@ -2,7 +2,7 @@
   <div class="page core_dialogue" :style="{ overflow: ($route.path == '/Closingstatement1' || $route.path =='/projectPrint') && 'unset !important' }">
 
     <el-header v-if="$route.meta.isAuth && $route.path != '/Closingstatement1' && $route.path!='/projectPrint'">
-      <img src="./assets/img/sclogo4.png" alt="" style="height: 60px" />
+      <img src="./assets/logo2.png" alt="" style="height: 60px" />
       <!-- <img src="@/assets/img/szjsxy.png" alt=""> -->
       <div class="homeExitContent">
         <!-- <el-button size="mini" @click="$store.commit('update',['userInfo',{userid:'2021400203',username:'yym',type:2}])">yym</el-button> -->
@@ -69,12 +69,12 @@
             </template>
           </el-table-column>
           <!-- selection-change批量选择功能后续可能用到 -->
-          <!-- 
+          <!--
             <el-table-column
               type="selection"
               width="25"
               >
-            
+
             </el-table-column> -->
           <!-- <el-table-column
               prop="ProjectNo"
@@ -97,7 +97,7 @@
               min-width="9%"
             >
             </el-table-column>
-          
+
             <el-table-column
               prop="name"
               align="center"
@@ -346,7 +346,8 @@ body {
   background: #e6eaf0;
   .el-header {
     //顶部退出区域
-    background-color: #3d67bc;
+    // background-color: #3d67bc;
+    background-color: #003BE4;
     color: #333;
     text-align: center;
     display: flex;

BIN
src/assets/iconTitle.png


BIN
src/assets/logo2.png


+ 40 - 40
src/views/projectApply/projectApplication.vue

@@ -1082,49 +1082,49 @@ export default {
                 _json["项目编号"] = item.ProjectNo;
                 _json["项目名称"] = item.title;
                 _json["项目负责人"] = item.pro_leader;
-                _json["项目预期成果、数量及形式(产品原型/发明专利/双创竞赛/成果转化/社会效益)"] = chapters.expectResults ? chapters.expectResults.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
-                _json["学生创客人才培养预期成果、数量(教师填写)"] = chapters.expectResultsTeacher ? chapters.expectResultsTeacher.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
-                _json["项目预期孵化、转化创业项目情况"] = chapters.expectConversion ? chapters.expectConversion.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
-                _json["=========="] = ""
-                _json["一、成果(名称、数量及形式,开发产品及取得的专利等)专利证书获得(提供专利申请或成果证书附件)"] = filetext(ClosingstatementData.resultAccessory);
+                // _json["项目预期成果、数量及形式(产品原型/发明专利/双创竞赛/成果转化/社会效益)"] = chapters.expectResults ? chapters.expectResults.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
+                // _json["学生创客人才培养预期成果、数量(教师填写)"] = chapters.expectResultsTeacher ? chapters.expectResultsTeacher.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
+                // _json["项目预期孵化、转化创业项目情况"] = chapters.expectConversion ? chapters.expectConversion.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
+                // _json["=========="] = ""
+                // _json["一、成果(名称、数量及形式,开发产品及取得的专利等)专利证书获得(提供专利申请或成果证书附件)"] = filetext(ClosingstatementData.resultAccessory);
                 // 辅助函数:将附件数组格式化为字符串
 
-                _json["企业应用实证(提供企业证明或合作协议证明等附件)"] = filetext(ClosingstatementData.firmAccessory);
-                _json["双创竞赛成绩(提供参加师生名单、比赛取得的成绩等附件)"] = filetext(ClosingstatementData.competitionAccessory);
-                _json["参展或交流活动(提供参加师生名单、活动方案及照片等附件)"] = filetext(ClosingstatementData.exchangeAccessory);
-                _json["创业公司转化(提供公司注册资料、营业执照等附件)"] = filetext(ClosingstatementData.conversionAccessory);
-                _json["二、创客人才培养(提供成果、数量、学生名单等附件)"] = filetext(ClosingstatementData.talentsAccessory);
-                _json["三、实际结果"] = ClosingstatementData.realityResult?ClosingstatementData.realityResult.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, ''):''
-                _json["四、社会价值(项目实践运用情况及效果评价)"] = ClosingstatementData.realityResult?ClosingstatementData.socialValue.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, ''):''
+                // _json["企业应用实证(提供企业证明或合作协议证明等附件)"] = filetext(ClosingstatementData.firmAccessory);
+                // _json["双创竞赛成绩(提供参加师生名单、比赛取得的成绩等附件)"] = filetext(ClosingstatementData.competitionAccessory);
+                // _json["参展或交流活动(提供参加师生名单、活动方案及照片等附件)"] = filetext(ClosingstatementData.exchangeAccessory);
+                // _json["创业公司转化(提供公司注册资料、营业执照等附件)"] = filetext(ClosingstatementData.conversionAccessory);
+                // _json["二、创客人才培养(提供成果、数量、学生名单等附件)"] = filetext(ClosingstatementData.talentsAccessory);
+                // _json["三、实际结果"] = ClosingstatementData.realityResult?ClosingstatementData.realityResult.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, ''):''
+                // _json["四、社会价值(项目实践运用情况及效果评价)"] = ClosingstatementData.realityResult?ClosingstatementData.socialValue.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, ''):''
                 //_json["项目状态"] = this.classType.find(i=>i.value==item.isupload).title
-							// 	 _json["学院"] = item.name;
+								 _json["学院"] = item.name;
               //   _json["项目简介"] = item.brief;
               //  _json["分类"] = item.sort;
 
                // _json["创建时间"] = item.createTime;
               //  _json["联系电话"] = item.phone;
-              //  let money = item.money ? JSON.parse(item.money) : {};
-              //  _json["小型工具与耗材费"] = money["device"]
-              //    ? money["device"]
-              //    : "0";
-              //  _json["创客交流与调研活动差旅费"] = money["Material"] ? money["Material"] : "0";
-              //  _json["成果鉴定与认证费"] = money["processing"]
-              //    ? money["processing"]
-              //    : "0";
-              //  _json["专家咨询与评审费"] = money["Collaboration"]
-              //    ? money["Collaboration"]
-              //    : "0";
-              //  _json["论文版面费"] = money["APPRAISAL"]
-              //    ? money["APPRAISAL"]
-              //    : "0";
-              //  _json["测试与外协加工费"] = money["entery"] ? money["entery"] : "0";
-              //  _json["创客交流与调研活动报名费"] = money["activities"]
-              //    ? money["activities"]
-              //    : "0";
-              //  _json["其他费用"] = money["Transaction"]
-              //    ? money["Transaction"]
-              //    : "0";
-              //   _json["总经费"] = item.fund;
+               let money = item.money ? JSON.parse(item.money) : {};
+               _json["小型工具与耗材费"] = money["device"]
+                 ? money["device"]
+                 : "0";
+               _json["创客交流与调研活动差旅费"] = money["Material"] ? money["Material"] : "0";
+               _json["成果鉴定与认证费"] = money["processing"]
+                 ? money["processing"]
+                 : "0";
+               _json["专家咨询与评审费"] = money["Collaboration"]
+                 ? money["Collaboration"]
+                 : "0";
+               _json["论文版面费"] = money["APPRAISAL"]
+                 ? money["APPRAISAL"]
+                 : "0";
+               _json["测试与外协加工费"] = money["entery"] ? money["entery"] : "0";
+               _json["创客交流与调研活动报名费"] = money["activities"]
+                 ? money["activities"]
+                 : "0";
+               _json["其他费用"] = money["Transaction"]
+                 ? money["Transaction"]
+                 : "0";
+                _json["总经费"] = item.fund;
 
               //   _json["项目预期成果、数量及形式(产品原型/发明专利/双创竞赛/成果转化/社会效益)"] = chapters.expectResults ? chapters.expectResults.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
               //   _json["学生创客人才培养预期成果、数量(教师填写)"] = chapters.expectResultsTeacher ? chapters.expectResultsTeacher.replace(/<[^>]+>/g, '').replace(/&nbsp;|&#160;/g, '') : ''
@@ -1151,11 +1151,11 @@ export default {
                	// _json["学生班级" + (i + 1)] = student[i].collage;
                 //  _json["角色分工" + (i + 1)] = student[i].work
               //  }
-              //  for (let i = 0; i < teacher.length; i++) {
-              //    _json["指导老师" + (i + 1)] = teacher[i].name;
-                //  _json["所在学院" + (i + 1)] = teacher[i].collage;
-                //  _json["角色分工" + (i + 1)] = student[i].work
-              //  }
+               for (let i = 0; i < 1; i++) {
+                 _json["指导老师" + (i + 1)] = teacher[i].name;
+                 _json["所在学院" + (i + 1)] = teacher[i].collage;
+                 _json["角色分工" + (i + 1)] = student[i].work
+               }