#

src/views/activityManage/makerActivityWordDetail.vue

@@ -19,7 +19,7 @@
           :visible.sync="submitHint"
           width="600px"
           class="pageSubmitData">
-          <div class="addDialogLogo">LOGO</div>
+          
           <div class="deleteContent">确定修改“{{wordData['activityName']}}”活动？</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="changeActivity" class="AllDialogBtn">确认提交</el-button>

src/views/activityManage/makerActvity.vue

@@ -190,7 +190,7 @@
           :visible.sync="auditDialog"
           class="dialogWidth"
           :before-close="init">
-          <div class="addDialogLogo">LOGO</div>
+          
         
           <div class="diaTit">
               <div class="spans">项目名称:</div>
@@ -247,7 +247,7 @@
           class="dialogWidth"
           width="700px"
           :before-close="init">
-          <div class="addDialogLogo">LOGO</div>
+          
         
           <div class="diaTit">
               <div class="spans">项目名称:</div>
@@ -306,7 +306,7 @@
       width="600px"
       class="endDialog"
       :before-close="init">
-      <div class="addDialogLogo">LOGO</div>
+      
       <div class="deleteContent">"{{ endTable.title }}"项目活动，是否确定完结？</div>
       <div class="deleteContent1">活动完结报告</div>
       <div class="download" v-for="(item,index) in endTable.file" :key="index">
@@ -336,7 +336,7 @@
       width="600px"
       class="endDialog"
       :before-close="init">
-      <div class="addDialogLogo">LOGO</div>
+      
       <div class="deleteContent">"{{ endTable.title }}"项目活动还有资金未完结！</div>
       <div class="deleteContent1">未完结资金编号</div>
 
@@ -357,7 +357,7 @@
       width="65%"
       top="50px"
       class="endDialog">
-      <div class="addDialogLogo">LOGO</div>
+      
       <div class="core_dialogue">
         <makerActivityWord :data="wordData"/>
       </div>

src/views/activityManage/newMarkerActivity.vue

@@ -13,7 +13,7 @@
           :visible.sync="submitHint"
           width="600px"
           class="pageSubmitData">
-          <div class="addDialogLogo">LOGO</div>
+          
           <div class="deleteContent">确定提交“{{wordData['activityName']}}”创客活动？</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="applyActivity" class="AllDialogBtn">确认提交</el-button>

src/views/activityManage/newNomMarkerActivity.vue

@@ -13,7 +13,7 @@
         :visible.sync="submitHint"
         width="600px"
         class="pageSubmitData">
-        <div class="addDialogLogo">LOGO</div>
+        
         <div class="deleteContent">确定提交“{{wordData['activityName']}}”个人创客？</div>
         <span slot="footer" class="dialog-footer">
           <el-button type="primary" @click="applyActivity" class="AllDialogBtn">确认提交</el-button>

src/views/fundManage/makerfund.vue

@@ -2,7 +2,7 @@
   <!-- 创客资金管理 -->
   <div class="makerfund">
     <div class="pAHeader">
-      <div class="pAHeader1">创客资金管理</div>
+      <div class="pAHeader1">事后汇总</div>
     </div>
     <hr>
     <!-- 搜索框开始 -->
@@ -168,6 +168,11 @@
           align="center"
           label="申请时间"
           >
+          <template #default="scope">
+            <div>
+              {{ scope.row.time.split(' ')[0]}}<br/>{{ scope.row.time.split(' ')[1]}}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column
           prop="operation"
@@ -228,7 +233,7 @@
             <div class="spans">项目名称:</div><div style="margin-right: 30px;color: #adadad;">{{ ProjectFundData.title }}</div>
             <div class="spans">项目负责人:</div><div style="color:#adadad">{{ ProjectFundData.pro_leader }}</div>
         </div>
-        <div class="addDialogLogo">LOGO</div>
+        
 
         <div class="diaTit1">
           <div class="spans1">所在部门</div>
@@ -319,7 +324,7 @@
       :visible.sync="dialogVisible1"
       width="600px"
       class="pageSubmitData">
-      <div class="addDialogLogo">LOGO</div>
+      
       <div class="deleteContent">确定完结?</div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="confirmEnd" class="AllDialogBtn">确认完结</el-button>

src/views/fundManage/makerfundDetails.vue

@@ -262,7 +262,7 @@
           width="600px"
           class="pageSubmitData"
           :before-close="init">
-          <div class="addDialogLogo">LOGO</div>
+          
           <div class="deleteContent">确定完成保存？</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitAll" class="AllDialogBtn">确定保存</el-button>
@@ -278,7 +278,7 @@
           style="top: -150px;"
           class="createFromDialogSty"
           :before-close="init">
-          <div class="addDialogLogo">LOGO</div>
+          
           <div class="deleteContent">
             <table class="tableStyle" width="100%" border="1">
                 <caption style="height: 40px;font-size: 22px;">学校创客专项资金使用申请表（单位：元）</caption>
@@ -450,7 +450,7 @@
                 width="600px"
                 class="pageSubmitData"
                 :before-close="init">
-                <div class="addDialogLogo">LOGO</div>
+                
                 <div class="deleteContent">确定完成审核？</div>
                 <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitAudit" class="AllDialogBtn">确认审核</el-button>

src/views/fundManage/newMarkerfundApply.vue

@@ -1,9 +1,12 @@
 <template>
     <!-- 创客资金申请表单 -->
   <div>
-    <div class="vfpHeader">
+    <!-- <div class="vfpHeader">
         <div class="titleOne">创客活动资金申请</div>
-    </div>
+    </div> -->
+    <div class="pAHeader">
+        <div class="pAHeader1">创客活动资金申请</div>
+      </div>
     <hr>
     <!-- 项目名称、类型开始 -->
     <div class="Apply1">
@@ -88,7 +91,7 @@
       width="600px"
       class="pageSubmitData"
     >
-      <div class="addDialogLogo">LOGO</div>
+      
       <span class="deleteContent">确定生成Excel?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="downLoadExcel" class="AllDialogBtn">确认</el-button>
@@ -104,7 +107,7 @@
       width="600px"
       class="pageSubmitData"
     >
-      <div class="addDialogLogo">LOGO</div>
+      
       <span class="deleteContent">确定提交?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认</el-button>

src/views/fundManage/newMarkerfundDetails.vue

@@ -95,7 +95,7 @@
       width="600px"
       class="pageSubmitData"
     >
-      <div class="addDialogLogo">LOGO</div>
+      
       <span class="deleteContent">确定生成Excel?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="downLoadExcel" class="AllDialogBtn">确认</el-button>
@@ -111,7 +111,7 @@
       width="600px"
       class="pageSubmitData"
     >
-      <div class="addDialogLogo">LOGO</div>
+      
       <span class="deleteContent">确定提交?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认</el-button>

src/views/fundManage/newNomMarkerFundApply.vue

@@ -1,9 +1,12 @@
 <template>
     <!-- 创客资金申请表单 -->
   <div>
-    <div class="vfpHeader">
-        <div class="titleOne">创客活动资金申请</div>
-    </div>
+    <div class="pAHeader">
+        <div class="pAHeader1">个人创客资金申请</div>
+      </div>
+    <!-- <div class="vfpHeader">
+        <div class="titleOne">个人创客资金申请</div>
+    </div> -->
     <hr>
     <!-- 项目名称、类型开始 -->
     <div class="Apply1">
@@ -88,7 +91,7 @@
       width="600px"
       class="pageSubmitData"
     >
-      <div class="addDialogLogo">LOGO</div>
+      
       <span class="deleteContent">确定生成Excel?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="downLoadExcel" class="AllDialogBtn">确认</el-button>
@@ -104,7 +107,7 @@
       width="600px"
       class="pageSubmitData"
     >
-      <div class="addDialogLogo">LOGO</div>
+      
       <span class="deleteContent">确定提交?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认</el-button>

src/views/home.vue

@@ -71,13 +71,13 @@
       data() {
         return {
           navList:[
-            {id:1,label:"项目立项申请",goto:"/projectApplication",icon:"iconfont icon-shuben",group:[
+            {id:1,label:"项目立项管理",goto:"/projectApplication",icon:"iconfont icon-shuben",group:[
               {label:"创客空间申请",goto:"/MakerSpaceApply"},
               {label:"创客项目申请",goto:"/newStudentProjectApply"},
             ]},
             {id:2,label:"活动申请",icon:"el-icon-wind-power",goto:"/makerActvity",group:[
-                {label:"创客活动",goto:"/newMarkerActivity"},
-                {label:"个人创客",goto:"/newNomMarkerActivity"},
+                {label:"创客活动申请",goto:"/newMarkerActivity"},
+                {label:"个人创客申请",goto:"/newNomMarkerActivity"},
             ]},
             {id:2,label:"事后汇总",goto:"/makerfund",icon:"iconfont icon-zijinguanli",group:[
               {label:"创客活动资金申请",goto:"/newMarkerfundApply"},

src/views/projectApply/MakerSpaceApply.vue

@@ -6,13 +6,15 @@
       </div>
       <hr>
       <MakerSpaceWord :wordData="wordData"/>
-      <el-button type="primary" @click="test">提交项目</el-button>
+      <div style="position: fixed;bottom: 5%;margin-left: -1%;">
+            <el-button  @click="test" type="primary">提交项目</el-button>
+        </div>
       <el-dialog
           title="提示"
           :visible.sync="submitHint"
           width="600px"
           class="pageSubmitData">
-          <div class="addDialogLogo">LOGO</div>
+          
           <div class="deleteContent">确定提交“{{wordData['projectName']}}”项目立项？</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="applyProject" class="AllDialogBtn">确认提交</el-button>
@@ -331,6 +333,8 @@
     #MakerSpaceApply{
         display: flex;
         flex-direction: column;
-        align-items: center;
+        // align-items: flex-end;
+        // justify-content: flex-end;
+        position: relative;
     }
   </style>

src/views/projectApply/components/MakerSpaceWordDetail.vue

@@ -11,7 +11,7 @@
           :visible.sync="submitHint"
           width="600px"
           class="pageSubmitData">
-          <div class="addDialogLogo">LOGO</div>
+          
           <div class="deleteContent">确定修改“{{wordData['projectName']}}”项目？</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="changeWord" class="AllDialogBtn">确认修改</el-button>

src/views/projectApply/components/studentProjectWordDetail.vue

@@ -12,7 +12,7 @@
                     :visible.sync="updatedWordDig"
                     width="600px"
                     class="pageSubmitData">
-                    <div class="addDialogLogo">LOGO</div>
+                    
                     <div class="deleteContent">确定提交修改?</div>
                     <span slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="updatedWord" class="AllDialogBtn">确认</el-button>
@@ -27,7 +27,7 @@
                 :visible.sync="downloadDig"
                 width="600px"
                 class="pageSubmitData">
-                <div class="addDialogLogo">LOGO</div>
+                
                 <div class="deleteContent">确定下载文档?</div>
                 <span slot="footer" class="dialog-footer">
                     <el-button type="primary" @click="downloadWord" class="AllDialogBtn">确认</el-button>

src/views/projectApply/newStudentProjectApply.vue

@@ -8,8 +8,8 @@
     
          <!-- 学生项目立项 -->
         <studentProjectWord :wordData="wordData" :reversedMessage="reversedMessage"/>   
-        <div style="width: 300px;margin: 20px auto;display: flex;justify-content: space-between;">
-            <el-button style="width: 120px;margin: 20px auto;" @click="test" type="primary">提交项目</el-button>
+        <div style="position: fixed;bottom: 5%;margin-left: -1%;">
+            <el-button  @click="test" type="primary">提交项目</el-button>
         </div>
 
         <el-dialog
@@ -17,7 +17,7 @@
           :visible.sync="submitHint"
           width="600px"
           class="pageSubmitData">
-          <div class="addDialogLogo">LOGO</div>
+          
           <div class="deleteContent">确定提交“{{wordData['projectName']}}”项目立项？</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitWord" class="AllDialogBtn">确认提交</el-button>

src/views/projectApply/projectApplication.vue

@@ -2,7 +2,7 @@
   <!-- 项目立项申请 -->
   <div class="projectApplication" v-loading="loading">
     <div class="pAHeader">
-      <div class="pAHeader1">项目立项申请</div>
+      <div class="pAHeader1">项目立项管理</div>
       <!-- <el-button  style="font-size: 16px;" @click="apply">项目立项申请</el-button> -->
     </div>
     <hr>
@@ -148,10 +148,15 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="startTime"
+          prop="createTime"
           align="center"
-          label="开始时间"
+          label="创建时间"
           min-width="9%">
+          <template #default="scope">
+            <div>
+              {{ scope.row.createTime.split(' ')[0]}}<br/>{{ scope.row.createTime.split(' ')[1]}}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column
           prop="phone"
@@ -237,7 +242,7 @@
           :before-close="init">
         
           <div class="diaTit">
-              <div class="addDialogLogo">LOGO</div>
+              
               <div class="spans">项目名称：</div>
               <div class="spanCon">{{ auditDialog.projectName }}</div>
               <div class="spans">项目负责人：</div>
@@ -292,7 +297,7 @@
       :visible.sync="dialogVisible2"
       width="600px"
       class="pageSubmitData">
-      <div class="addDialogLogo">LOGO</div>
+      
       <div class="deleteContent">确定删除项目?</div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogDel" class="AllDialogBtn">确认删除</el-button>
@@ -305,11 +310,11 @@
 </template>
 
 <script>
-import {MakerSpaceWord,MakerStudentWord,getWord} from '@/components/tool/getWord.js'
-import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
-import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.vue'
+// import {MakerSpaceWord,MakerStudentWord,getWord} from '@/components/tool/getWord.js'
+// import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
+// import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.vue'
     export default {
-      components:{MakerSpaceWordPreview,studentMakerProjectPreview},
+      // components:{MakerSpaceWordPreview,studentMakerProjectPreview},
       data() {
         return {
           iid:'',

src/views/projectManage/ProjectManagement.vue

@@ -215,7 +215,7 @@
       width="600px"
       class="endDialog"
       :before-close="init">
-      <div class="addDialogLogo">LOGO</div>
+      
       <div class="deleteContent">"{{ tit }}"项目，是否确定完结？</div>
       <div class="download checkActivity" v-show="checkFundEndData.length>0">
             <span style="color: black;">剩余资金:</span>
@@ -249,7 +249,7 @@
       width="600px"
       class="endDialog"
       :before-close="init">
-      <div class="addDialogLogo">LOGO</div>
+      
       <div class="deleteContent">"{{ tit }}"项目</div>
       <div class="download checkActivity" v-show="checkActivityFinishData.length>0">
             <span style="color: black;">未完结活动:</span><span v-for="(item,index) in checkActivityFinishData" :key="index">{{ item.title }}</span>

src/views/projectManage/components/ProjectManagementEndProjectFile.vue

@@ -69,7 +69,7 @@
             width="80vw"
             class="addDialog showDialog"
           >
-      <div class="addDialogLogo">LOGO</div>
+      
       <div class="showFileArea">
         <!-- <vpdf v-if="/^\s*$/g.test(showFileUrl)&&showFileUrl.split('.')[showFileUrl.split('.').length-1]=='pdf'" :pdfUrl="showFileUrl"></vpdf> -->
         <vword

src/views/projectSettlement/components/projectSettlementDetailConclusion.vue

@@ -66,7 +66,7 @@
             width="80vw"
             class="addDialog showDialog"
           >
-      <div class="addDialogLogo">LOGO</div>
+      
       <div class="showFileArea">
         <!-- <vpdf v-if="/^\s*$/g.test(showFileUrl)&&showFileUrl.split('.')[showFileUrl.split('.').length-1]=='pdf'" :pdfUrl="showFileUrl"></vpdf> -->
         <vword

src/views/projectSettlement/projectSettlement.vue

@@ -194,7 +194,7 @@
           width="600px"
           class="projectApplicationfundAddDialog"
           :before-close="init">
-          <div class="addDialogLogo">LOGO</div>
+          
           <div class="deleteContent">确定“{{tit}}”完结？</div>
           <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="submitAll" class="AllDialogBtn">确认提交</el-button>