SanHQin 1 år sedan
förälder
incheckning
dfb2a20707
59 ändrade filer med 242 tillägg och 198 borttagningar
  1. 1 0
      dist/css/177.88ee7b55.css
  2. 1 0
      dist/css/327.816b8641.css
  3. 0 1
      dist/css/392.b5bc35f8.css
  4. 0 0
      dist/css/414.a570de87.css
  5. 0 0
      dist/css/543.e11d485b.css
  6. 0 1
      dist/css/558.f8e80ca7.css
  7. 1 0
      dist/css/694.da65730a.css
  8. 0 1
      dist/css/857.2eeb80a5.css
  9. 0 1
      dist/css/88.040426ae.css
  10. 1 0
      dist/css/886.d9931581.css
  11. 0 0
      dist/css/938.03109508.css
  12. 0 1
      dist/css/971.50a1be0b.css
  13. 1 0
      dist/css/980.56b80e80.css
  14. 1 1
      dist/index.html
  15. 0 0
      dist/js/177.cec8292c.js
  16. 0 0
      dist/js/177.cec8292c.js.map
  17. 0 0
      dist/js/270.d5016127.js
  18. 0 0
      dist/js/270.d5016127.js.map
  19. 0 0
      dist/js/327.294ad971.js
  20. 0 0
      dist/js/327.294ad971.js.map
  21. 0 0
      dist/js/392.57d05676.js
  22. 0 0
      dist/js/392.57d05676.js.map
  23. 0 0
      dist/js/414.e2c11166.js
  24. 0 0
      dist/js/414.e2c11166.js.map
  25. 0 0
      dist/js/536.dd2227e7.js
  26. 0 0
      dist/js/536.dd2227e7.js.map
  27. 0 0
      dist/js/543.76e6d42f.js
  28. 0 0
      dist/js/543.76e6d42f.js.map
  29. 0 0
      dist/js/558.ad668e67.js
  30. 0 0
      dist/js/558.ad668e67.js.map
  31. 0 0
      dist/js/694.2092a434.js
  32. 0 0
      dist/js/694.2092a434.js.map
  33. 0 0
      dist/js/840.3e5ed738.js
  34. 0 0
      dist/js/840.3e5ed738.js.map
  35. 0 0
      dist/js/852.c90ae8da.js
  36. 0 0
      dist/js/852.c90ae8da.js.map
  37. 0 0
      dist/js/857.4fb591c6.js
  38. 0 0
      dist/js/857.4fb591c6.js.map
  39. 0 0
      dist/js/88.f659c034.js
  40. 0 0
      dist/js/88.f659c034.js.map
  41. 0 0
      dist/js/886.44d054bb.js
  42. 0 0
      dist/js/886.44d054bb.js.map
  43. 0 0
      dist/js/938.d05d54ea.js
  44. 0 0
      dist/js/938.d05d54ea.js.map
  45. 0 0
      dist/js/971.b67b374d.js
  46. 0 0
      dist/js/971.b67b374d.js.map
  47. 0 0
      dist/js/980.c3e24d98.js
  48. 0 0
      dist/js/980.c3e24d98.js.map
  49. 0 0
      dist/js/app.259c69cd.js
  50. 0 0
      dist/js/app.259c69cd.js.map
  51. 0 0
      dist/js/app.59b08aec.js
  52. 1 0
      src/views/activityManage/makerActvity.vue
  53. 1 0
      src/views/commission/commission.vue
  54. 1 0
      src/views/fundManage/makerfund.vue
  55. 1 0
      src/views/messageNotification.vue
  56. 229 192
      src/views/projectApply/projectApplication.vue
  57. 1 0
      src/views/projectManage/ProjectManagement.vue
  58. 1 0
      src/views/projectSettlement/projectSettlement.vue
  59. 1 0
      src/views/resultShow/resultsShow.vue

+ 1 - 0
dist/css/177.88ee7b55.css

@@ -0,0 +1 @@
+.projectSettlement[data-v-35f7baaf] .el-table__row .el-table__cell{cursor:pointer}.projectSettlement[data-v-35f7baaf] .el-table__row .el-table__cell:last-child{cursor:default}.projectSettlement .pagination[data-v-35f7baaf]{float:right;margin:20px 35px 10px}.projectSettlement .projectApplicationfundAddDialog .el-dialog__header[data-v-35f7baaf]{border-radius:10px 10px 0 0}.projectSettlement .projectApplicationfundAddDialog .el-dialog[data-v-35f7baaf]{border-radius:10px;top:10%}.projectSettlement .projectApplicationfundAddDialog .deleteContent[data-v-35f7baaf]{width:100%;text-align:center;font-size:22px;color:#000}.projectSettlement .projectApplicationfundAddDialog .addDialogLogo[data-v-35f7baaf]{width:60px;height:30px;display:flex;justify-content:center;line-height:30px;border-radius:5px;background:#f2f2f2;position:absolute;left:20px;top:15px}.projectSettlement .projectApplicationfundAddDialog .el-dialog__header[data-v-35f7baaf]{background:#32455b}.projectSettlement .projectApplicationfundAddDialog .el-dialog__title[data-v-35f7baaf]{position:relative;top:-2px;margin-left:250px;font-size:18px;color:#f6f7f6}.projectSettlement .projectApplicationfundAddDialog .dialog-footer[data-v-35f7baaf]{display:flex;justify-content:center}.projectSettlement label[data-v-35f7baaf]{color:#000}

+ 1 - 0
dist/css/327.816b8641.css

@@ -0,0 +1 @@
+[data-v-55e6d2fc] .el-table__row .el-table__cell{cursor:pointer}[data-v-55e6d2fc] .el-table__row .el-table__cell:last-child{cursor:default}

+ 0 - 1
dist/css/392.b5bc35f8.css

@@ -1 +0,0 @@
-.projectSettlement[data-v-e061a880] .el-table__row .el-table__cell{cursor:pointer}.projectSettlement[data-v-e061a880] .el-table__row .el-table__cell:last-child{cursor:default}.projectSettlement .pagination[data-v-e061a880]{float:right;margin:20px 35px 10px}.projectSettlement .projectApplicationfundAddDialog .el-dialog__header[data-v-e061a880]{border-radius:10px 10px 0 0}.projectSettlement .projectApplicationfundAddDialog .el-dialog[data-v-e061a880]{border-radius:10px;top:10%}.projectSettlement .projectApplicationfundAddDialog .deleteContent[data-v-e061a880]{width:100%;text-align:center;font-size:22px;color:#000}.projectSettlement .projectApplicationfundAddDialog .addDialogLogo[data-v-e061a880]{width:60px;height:30px;display:flex;justify-content:center;line-height:30px;border-radius:5px;background:#f2f2f2;position:absolute;left:20px;top:15px}.projectSettlement .projectApplicationfundAddDialog .el-dialog__header[data-v-e061a880]{background:#32455b}.projectSettlement .projectApplicationfundAddDialog .el-dialog__title[data-v-e061a880]{position:relative;top:-2px;margin-left:250px;font-size:18px;color:#f6f7f6}.projectSettlement .projectApplicationfundAddDialog .dialog-footer[data-v-e061a880]{display:flex;justify-content:center}.projectSettlement label[data-v-e061a880]{color:#000}

+ 0 - 0
dist/css/270.a570de87.css → dist/css/414.a570de87.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/css/543.e11d485b.css


+ 0 - 1
dist/css/558.f8e80ca7.css

@@ -1 +0,0 @@
-.makerfund .dialog-footer[data-v-12265186]{width:100%;display:flex;justify-content:center}.makerfund .dialog .el-dialog__header[data-v-12265186]{background:#32455b}.makerfund .dialog .addDialogLogo[data-v-12265186]{width:60px;height:30px;border-radius:5px;display:flex;justify-content:center;line-height:30px;background:#f2f2f2;position:absolute;left:20px;top:15px}.makerfund .dialog .el-dialog__title[data-v-12265186]{color:#fff;display:flex;justify-content:center;font-size:18px;position:relative;top:-2px}.makerfund .dialog .diaBtn[data-v-12265186]{font-size:16px}.makerfund .dialog .el-dialog__body[data-v-12265186]{padding:30px 0 30px 50px}.makerfund .dialog .diaTit[data-v-12265186]{width:100%;display:flex;font-size:16px;justify-content:flex-start}.makerfund .dialog .diaTit1[data-v-12265186]{display:flex;margin-top:20px;font-size:16px;width:91%}.makerfund .dialog .diaTit1 .spans[data-v-12265186]{font-size:16px;color:#000;box-sizing:border-box;padding-right:10px}.makerfund .dialog .spans1[data-v-12265186]{color:#000;min-width:70px;margin-right:5px;display:inline-block;text-align:justify;text-justify:distribute-all-lines;-moz-text-align-last:justify;text-align-last:justify;transform:translateY(22%);padding-right:15px}.makerfund .dialog .diaTit5[data-v-12265186]{display:flex;margin-right:15px}.makerfund .dialog .diaTit5 .el-input__inner[data-v-12265186]{width:100px}

+ 1 - 0
dist/css/694.da65730a.css

@@ -0,0 +1 @@
+[data-v-2590267c] .el-table__row .el-table__cell{cursor:pointer}[data-v-2590267c] .el-table__row .el-table__cell:last-child{cursor:default}

+ 0 - 1
dist/css/857.2eeb80a5.css

@@ -1 +0,0 @@
-[data-v-bd1fd828] .el-table__row .el-table__cell{cursor:pointer}[data-v-bd1fd828] .el-table__row .el-table__cell:last-child{cursor:default}

+ 0 - 1
dist/css/88.040426ae.css

@@ -1 +0,0 @@
-[data-v-27519c60] .el-table__row .el-table__cell{cursor:pointer}[data-v-27519c60] .el-table__row .el-table__cell:last-child{cursor:default}

+ 1 - 0
dist/css/886.d9931581.css

@@ -0,0 +1 @@
+.projectApplication .btnClass[data-v-460cc5c2]{width:70px!important;max-width:70px;min-width:70px}.projectApplication[data-v-460cc5c2] .el-table__row .el-table__cell{cursor:pointer}.projectApplication[data-v-460cc5c2] .el-table__row .el-table__cell:last-child{cursor:default}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/css/938.03109508.css


+ 0 - 1
dist/css/971.50a1be0b.css

@@ -1 +0,0 @@
-.projectApplication .btnClass[data-v-0bfcaf4d]{width:70px!important;max-width:70px;min-width:70px}.projectApplication[data-v-0bfcaf4d] .el-table__row .el-table__cell{cursor:pointer}.projectApplication[data-v-0bfcaf4d] .el-table__row .el-table__cell:last-child{cursor:default}

+ 1 - 0
dist/css/980.56b80e80.css

@@ -0,0 +1 @@
+.makerfund .dialog-footer[data-v-28f4ef6c]{width:100%;display:flex;justify-content:center}.makerfund .dialog .el-dialog__header[data-v-28f4ef6c]{background:#32455b}.makerfund .dialog .addDialogLogo[data-v-28f4ef6c]{width:60px;height:30px;border-radius:5px;display:flex;justify-content:center;line-height:30px;background:#f2f2f2;position:absolute;left:20px;top:15px}.makerfund .dialog .el-dialog__title[data-v-28f4ef6c]{color:#fff;display:flex;justify-content:center;font-size:18px;position:relative;top:-2px}.makerfund .dialog .diaBtn[data-v-28f4ef6c]{font-size:16px}.makerfund .dialog .el-dialog__body[data-v-28f4ef6c]{padding:30px 0 30px 50px}.makerfund .dialog .diaTit[data-v-28f4ef6c]{width:100%;display:flex;font-size:16px;justify-content:flex-start}.makerfund .dialog .diaTit1[data-v-28f4ef6c]{display:flex;margin-top:20px;font-size:16px;width:91%}.makerfund .dialog .diaTit1 .spans[data-v-28f4ef6c]{font-size:16px;color:#000;box-sizing:border-box;padding-right:10px}.makerfund .dialog .spans1[data-v-28f4ef6c]{color:#000;min-width:70px;margin-right:5px;display:inline-block;text-align:justify;text-justify:distribute-all-lines;-moz-text-align-last:justify;text-align-last:justify;transform:translateY(22%);padding-right:15px}.makerfund .dialog .diaTit5[data-v-28f4ef6c]{display:flex;margin-right:15px}.makerfund .dialog .diaTit5 .el-input__inner[data-v-28f4ef6c]{width:100px}

+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.45150633.js"></script><script defer="defer" src="/js/app.59b08aec.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.b3459279.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.45150633.js"></script><script defer="defer" src="/js/app.259c69cd.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.b3459279.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/177.cec8292c.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/177.cec8292c.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/270.d5016127.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/270.d5016127.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/327.294ad971.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/327.294ad971.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/392.57d05676.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/392.57d05676.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/414.e2c11166.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/414.e2c11166.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/536.dd2227e7.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/536.dd2227e7.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/543.76e6d42f.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/543.76e6d42f.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/558.ad668e67.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/558.ad668e67.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/694.2092a434.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/694.2092a434.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/840.3e5ed738.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/840.3e5ed738.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/852.c90ae8da.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/852.c90ae8da.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/857.4fb591c6.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/857.4fb591c6.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/88.f659c034.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/88.f659c034.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/886.44d054bb.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/886.44d054bb.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/938.d05d54ea.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/938.d05d54ea.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/971.b67b374d.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/971.b67b374d.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/980.c3e24d98.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/980.c3e24d98.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/app.259c69cd.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/app.259c69cd.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/app.59b08aec.js


+ 1 - 0
src/views/activityManage/makerActvity.vue

@@ -85,6 +85,7 @@
 <!-- 搜索框结束 -->
 
 <!-- 表格开始 -->
+		<span style="font-size: 12px;">共  {{ Page.total }} 条</span>	
       <el-table
         ref="multipleTable"
         :data="tableData"

+ 1 - 0
src/views/commission/commission.vue

@@ -121,6 +121,7 @@
 
     <!-- 表格开始 -->
     <div>
+			<span style="font-size: 12px;">共  {{ Page.total }} 条</span>
       <el-table
         ref="multipleTable"
         :data="items"

+ 1 - 0
src/views/fundManage/makerfund.vue

@@ -109,6 +109,7 @@
 
     <!-- 表格开始 -->
     <div>
+			<span style="font-size: 12px;">共  {{ table.total }} 条</span>
       <el-table
         ref="multipleTable"
         :data="tableData"

+ 1 - 0
src/views/messageNotification.vue

@@ -19,6 +19,7 @@
 
 <!-- 通知表格开始 -->
     <div class="projectBlock">
+			<span style="font-size: 12px;">共  {{ table.total }} 条</span>
       <el-table
       :data="tableData"
       tooltip-effect="dark"

+ 229 - 192
src/views/projectApply/projectApplication.vue

@@ -87,9 +87,9 @@
             @change="getData"
             placeholder="请选择"
           >
-					<el-option label="所有状态" value=""/>
+            <el-option label="所有状态" value="" />
             <el-option
-              v-for="(item,index) in classType"
+              v-for="(item, index) in classType"
               :key="item.index"
               :label="item.title"
               :value="item.value"
@@ -97,7 +97,7 @@
             </el-option>
           </el-select>
         </div>
-				<div class="selectsBlock">
+        <div class="selectsBlock">
           <span class="selectLabel">年份</span>
           <el-select
             v-model="selectInp.year"
@@ -116,19 +116,26 @@
         </div>
       </div>
       <div class="ProjectManagementQuery">
-        <el-input v-model="input" placeholder="请输入项目名称/编号"></el-input>
+        <el-input v-model="input" placeholder="输入项目名称/负责人/老师"></el-input>
         <el-button type="primary" class="btn" size="mini" @click="getData"
           >查询</el-button
         >
       </div>
-			<div class="ProjectManagementQuery" style="margin-top: 60px;" v-if="$store.state.userInfo.type == 0">
-        <el-button type="primary" class="btn" @click.stop="exportExcel">导出EXCEL</el-button>
+      <div
+        class="ProjectManagementQuery"
+        style="margin-top: 60px"
+        v-if="$store.state.userInfo.type == 0"
+      >
+        <el-button type="primary" class="btn" @click.stop="exportExcel"
+          >导出EXCEL</el-button
+        >
       </div>
     </div>
 
     <!-- 搜索框结束 -->
     <!-- 表格开始 -->
     <div>
+			<span style="font-size: 12px;">共  {{ table.total }} 条</span>
       <el-table
         ref="multipleTable"
         :data="tableData"
@@ -137,7 +144,7 @@
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2', color: '#000' }"
         @selection-change="handleSelectionChange"
-				@cell-click="cellProjectClick"
+        @cell-click="cellProjectClick"
       >
         <!-- selection-change批量选择功能后续可能用到 -->
         <!-- 
@@ -158,7 +165,7 @@
           prop="title"
           label="项目名称"
           align="center"
-					min-width="35%"
+          min-width="35%"
         >
         </el-table-column>
         <el-table-column
@@ -233,11 +240,15 @@
         >
           <template #default="scope">
             <div>
-							<!-- {{ scope.row.isupload+"-"+scope.row.isReturn }} -->
-							<span v-if="scope.row.isReturn!=0">{{ isReturnType[scope.row.isReturn] }}</span>
+              <!-- {{ scope.row.isupload+"-"+scope.row.isReturn }} -->
+              <span v-if="scope.row.isReturn != 0">{{
+                isReturnType[scope.row.isReturn]
+              }}</span>
               <!-- {{scope.row.name + (scope.row.status==0?"":"(已屏蔽)")}} -->
               <!-- {{ (scope.row.isupload==0?"未审核": scope.row.data==1?"正在审核":"已审核")  }} -->
-							<span v-else>{{ classType.find(i=>i.value==scope.row.isupload)["title"] }}</span>
+              <span v-else>{{
+                classType.find((i) => i.value == scope.row.isupload)["title"]
+              }}</span>
 
               <!-- <span v-if="scope.row.isupload == 0">未审核</span>
               <span v-if="scope.row.isupload == 1">审核中</span>
@@ -281,34 +292,38 @@
               <el-button
                 type="primary"
                 v-if="
-                  [5,6,7].includes(scope.row.isupload) && ![0,3].includes($store.state.userInfo.type)
+                  [5, 6, 7].includes(scope.row.isupload) &&
+                  ![0, 3].includes($store.state.userInfo.type)
                 "
                 class="disa btnClass"
                 size="mini"
                 >审核中</el-button
               >
-							<el-button
+              <el-button
                 type="primary"
                 v-if="
-                  scope.row.isupload == 2 && ![0,3].includes($store.state.userInfo.type)
+                  scope.row.isupload == 2 &&
+                  ![0, 3].includes($store.state.userInfo.type)
                 "
                 class="disa btnClass"
                 size="mini"
                 >待结项</el-button
               >
-							<el-button
+              <el-button
                 type="primary"
                 v-if="
-                  scope.row.isupload == 3 && ![0,3].includes($store.state.userInfo.type)
+                  scope.row.isupload == 3 &&
+                  ![0, 3].includes($store.state.userInfo.type)
                 "
                 class="disa btnClass"
                 size="mini"
                 >结项中</el-button
               >
-							<el-button
+              <el-button
                 type="primary"
                 v-if="
-                  scope.row.isupload == 4 && ![0,3].includes($store.state.userInfo.type)
+                  scope.row.isupload == 4 &&
+                  ![0, 3].includes($store.state.userInfo.type)
                 "
                 class="disa btnClass"
                 size="mini"
@@ -316,15 +331,19 @@
               >
 
               <!--1管理员审核与院长 -->
-							<el-button
+              <el-button
                 type="primary"
-                v-if="scope.row.isupload > 1 && [0,3].includes($store.state.userInfo.type)"
+                v-if="
+                  scope.row.isupload > 1 &&
+                  [0, 3].includes($store.state.userInfo.type)
+                "
                 class="disa btnClass"
                 >已提交</el-button
               >
               <el-button
                 v-if="
-                  scope.row.isupload == 0 && [0,3].includes($store.state.userInfo.type)
+                  scope.row.isupload == 0 &&
+                  [0, 3].includes($store.state.userInfo.type)
                 "
                 type="primary"
                 class="disa btnClass"
@@ -334,7 +353,8 @@
 
               <el-button
                 v-if="
-                  scope.row.isupload == 1 && [0,3].includes($store.state.userInfo.type)
+                  scope.row.isupload == 1 &&
+                  [0, 3].includes($store.state.userInfo.type)
                 "
                 type="primary"
                 size="mini"
@@ -345,25 +365,28 @@
 
               <el-button
                 v-if="
-                  [3,5,6,7].includes(scope.row.isupload) && [0,3].includes($store.state.userInfo.type)
+                  [3, 5, 6, 7].includes(scope.row.isupload) &&
+                  [0, 3].includes($store.state.userInfo.type)
                 "
                 type="primary"
                 class="disa btnClass"
                 size="mini"
                 >审核中</el-button
               >
-							<el-button
+              <el-button
                 v-if="
-                  scope.row.isupload == 2 && [0,3].includes($store.state.userInfo.type)
+                  scope.row.isupload == 2 &&
+                  [0, 3].includes($store.state.userInfo.type)
                 "
                 type="primary"
                 class="disa btnClass"
                 size="mini"
                 >待结项</el-button
               >
-							<el-button
+              <el-button
                 v-if="
-                  [4].includes(scope.row.isupload) && [0,3].includes($store.state.userInfo.type)
+                  [4].includes(scope.row.isupload) &&
+                  [0, 3].includes($store.state.userInfo.type)
                 "
                 type="primary"
                 class="disa btnClass"
@@ -478,18 +501,20 @@
           >立项通过</el-button
         >
 
-
-					<el-tooltip v-if="isManager == 1"  effect="light" content="(直接进入学校终审状态)" placement="top">
-					<el-button
-        	  type="primary"
-        	  
-        	  @click="ManagerCommit2"
-        	  class="AllDialogBtn"
-        	  >
-						二次审核通过
-						</el-button>
-    			</el-tooltip>
-				
+        <el-tooltip
+          v-if="isManager == 1"
+          effect="light"
+          content="(直接进入学校终审状态)"
+          placement="top"
+        >
+          <el-button
+            type="primary"
+            @click="ManagerCommit2"
+            class="AllDialogBtn"
+          >
+            二次审核通过
+          </el-button>
+        </el-tooltip>
 
         <el-button
           type="primary"
@@ -528,7 +553,6 @@
 // import MakerSpaceWordPreview from '@/components/MakerSpaceWordPreview.vue';
 // import studentMakerProjectPreview from '@/components/studentMakerProjectPreview.vue'
 export default {
-
   // components:{MakerSpaceWordPreview,studentMakerProjectPreview},
   data() {
     return {
@@ -552,29 +576,29 @@ export default {
         currentPage: 1,
       },
       tableData: [], //列表数据
-			classType:[
-				{index:0,value:'0',title:"未提交"},
-				{index:1,value:'1',title:"已提交"},
-				{index:2,value:'5',title:"所在学院/部门审核中"},
-				{index:3,value:'6',title:"双创学院审核中"},
-				{index:4,value:'7',title:"学校终审中"},
-				{index:5,value:'2',title:"待结项"},
-				{index:6,value:'3',title:"提交结项中"},
-				{index:7,value:'4',title:"已结项"},
-			],
-				// "0":'未提交',
-				// '1':"已提交",
-				// '5':'所在学院/部门审核中',
-				// '6':'双创学院审核中',
-				// '7':'学校终审中',
-				// '2':"待结项",
-				// '3':"提交结项中",
-				// '4':'已结项',
-			isReturnType:{
-				'5':'所在学院/部门审核驳回',
-				'6':'双创学院审核驳回',
-				'7':'学校终审驳回',
-			},
+      classType: [
+        { index: 0, value: "0", title: "未提交" },
+        { index: 1, value: "1", title: "已提交" },
+        { index: 2, value: "5", title: "所在学院/部门审核中" },
+        { index: 3, value: "6", title: "双创学院审核中" },
+        { index: 4, value: "7", title: "学校终审中" },
+        { index: 5, value: "2", title: "待结项" },
+        { index: 6, value: "3", title: "提交结项中" },
+        { index: 7, value: "4", title: "已结项" },
+      ],
+      // "0":'未提交',
+      // '1':"已提交",
+      // '5':'所在学院/部门审核中',
+      // '6':'双创学院审核中',
+      // '7':'学校终审中',
+      // '2':"待结项",
+      // '3':"提交结项中",
+      // '4':'已结项',
+      isReturnType: {
+        5: "所在学院/部门审核驳回",
+        6: "双创学院审核驳回",
+        7: "学校终审驳回",
+      },
 
       selectInp: {
         // 头部搜索框的内容
@@ -583,7 +607,7 @@ export default {
         sort: "",
         person: "",
         state: "",
-				year:"",
+        year: "",
       },
       options: {
         //头部搜索框下拉框数据
@@ -618,7 +642,7 @@ export default {
           //   label: "已结项",
           // },
         ],
-				year:[],
+        year: [],
       },
       auditDialog: {
         //审核对话框数据
@@ -753,9 +777,9 @@ export default {
         }
       );
     },
-		ManagerCommit2(){
-			//先判断项目有没有被驳回
-			// let param = {
+    ManagerCommit2() {
+      //先判断项目有没有被驳回
+      // let param = {
       //   pid: this.iid.courseId,
       // };
       // return console.log(param);
@@ -776,34 +800,34 @@ export default {
       //       this.$message.warning(text);
       //       return;
       //     } else {
-            //立项审核对话框里面的管理员通过按钮
-            // console.log(this.iid);
-            let param = {
-              uid: this.$store.state.userInfo.userid,
-              pid: this.iid.courseId,
-              num: 7,
-            };
-            this.ajax
-              // .post(this.$store.state.api+"/ApproveProject",param)
-              .post(this.$store.state.api + "/updateIsupload", param)
-              .then(
-                (res) => {
-                  // console.log(res);
-                  this.dialogVisible = false;
-                  this.$message.success("已通过");
-                  this.getData();
-                },
-                (err) => {
-                  console.log(err);
-                }
-              );
-          // }
+      //立项审核对话框里面的管理员通过按钮
+      // console.log(this.iid);
+      let param = {
+        uid: this.$store.state.userInfo.userid,
+        pid: this.iid.courseId,
+        num: 7,
+      };
+      this.ajax
+        // .post(this.$store.state.api+"/ApproveProject",param)
+        .post(this.$store.state.api + "/updateIsupload", param)
+        .then(
+          (res) => {
+            // console.log(res);
+            this.dialogVisible = false;
+            this.$message.success("已通过");
+            this.getData();
+          },
+          (err) => {
+            console.log(err);
+          }
+        );
+      // }
       //   },
       //   (err) => {
       //     console.log(err);
       //   }
       // );
-		},
+    },
     ApplyPersonCommit() {
       //先判断项目有没有被驳回
       let param = {
@@ -874,12 +898,12 @@ export default {
       // console.log(val);
       this.multipleSelection = val;
     },
-		// 单元格被点击
-		cellProjectClick(row, column, cell, event){
-			if(column.property!="operation"){
-				this.lookDetail(row.courseId,row.typeid)
-			}
-		},
+    // 单元格被点击
+    cellProjectClick(row, column, cell, event) {
+      if (column.property != "operation") {
+        this.lookDetail(row.courseId, row.typeid);
+      }
+    },
 
     lookDetail(val, tid) {
       this.$router.push(`/projectApplicationDetailMain?tid=${tid}&pid=${val}`);
@@ -888,7 +912,7 @@ export default {
     //   this.$router.push('/projectApplicationApplyMain')
     // },
     getData() {
-			if(this.loading)return;
+      if (this.loading) return;
       //获取表格数据
       this.loading = true;
       let param = {
@@ -905,14 +929,14 @@ export default {
       };
       // return console.log(param);
       // console.log(param)
-			this.tableData = [];
+      this.tableData = [];
       this.ajax.get(this.$store.state.api + "/SelectAllProject", param).then(
         (res) => {
           let data = res.data;
           console.log(data);
           if (data[0].length == 0 && data[5][0]["total"] != 0) {
             this.table.currentPage = 1;
-						this.loading =false;
+            this.loading = false;
             return this.getData();
           }
           let a = this.options;
@@ -921,10 +945,14 @@ export default {
           a.department = data[2];
           a.sort = data[3];
           a.person = data[4];
-					a.year = data[6]
-					if(a.year.filter(item=>item['time']==new Date().getFullYear().toString()).length==0){
-						a.year.push({time:new Date().getFullYear().toString()});
-					}
+          a.year = data[6];
+          if (
+            a.year.filter(
+              (item) => item["time"] == new Date().getFullYear().toString()
+            ).length == 0
+          ) {
+            a.year.push({ time: new Date().getFullYear().toString() });
+          }
           this.table.total = data[5][0].total;
           // this.tableData.forEach(item=>{
           //   if(item['time']!=null&&item['time']!=''){
@@ -979,89 +1007,98 @@ export default {
       this.table.currentPage = val;
       this.getData();
     },
-		// 导出Excel表格
-		exportExcel(){
-			this.$confirm("是否导出Excel?", "提示", {
+    // 导出Excel表格
+    exportExcel() {
+      this.$confirm("是否导出Excel?", "提示", {
         confirmButtonText: "确定",
-        cancelButtonText: "取消"
+        cancelButtonText: "取消",
       })
         .then(() => {
           this.loading = true;
-      		let param = {
-      		  uid: this.$store.state.userInfo.userid,
-      		  pid: this.selectInp.filter, //筛选
-      		  did: this.selectInp.department, //部门
-      		  tid: this.selectInp.sort, //分类
-      		  leader: this.selectInp.person, //负责人
-      		  st: this.selectInp.state, //审核状态
-      		  year: this.selectInp.year,
-      		  textInp: encodeURIComponent(this.input),
-      		  page: 1, //当前页
-      		  lim: 99999999, //限制获取几条数据
-      		};
-					this.ajax.get(this.$store.state.api + "/SelectAllProject", param).then(res=>{
-						let _data = res.data[0];
-						let _array = [];
+          let param = {
+            uid: this.$store.state.userInfo.userid,
+            pid: this.selectInp.filter, //筛选
+            did: this.selectInp.department, //部门
+            tid: this.selectInp.sort, //分类
+            leader: this.selectInp.person, //负责人
+            st: this.selectInp.state, //审核状态
+            year: this.selectInp.year,
+            textInp: encodeURIComponent(this.input),
+            page: 1, //当前页
+            lim: 99999999, //限制获取几条数据
+          };
+          this.ajax
+            .get(this.$store.state.api + "/SelectAllProject", param)
+            .then((res) => {
+              let _data = res.data[0];
+              let _array = [];
+
+              _data.forEach((item, index) => {
+                let _json = {};
+                let teacher = item.course_teacher
+                  ? JSON.parse(item.course_teacher)
+                  : [];
+                _json["项目编号"] = item.ProjectNo;
+                _json["项目名称"] = item.title;
+                _json["项目负责人"] = item.pro_leader;
+                _json["所在部门"] = item.name;
+                _json["分类"] = item.sort;
+                _json["预算(万)"] = item.fund / 10000;
+                _json["创建时间"] = item.createTime;
+                _json["联系电话"] = item.phone;
+                _json["项目状态"] =
+                  item.isReturn == 0
+                    ? this.classType.find((i) => i.value == item.isupload)[
+                        "title"
+                      ]
+                    : this.isReturnType[item.isReturn];
+                for (let i = 0; i < teacher.length; i++) {
+                  _json["指导老师" + (i + 1)] = teacher[i].name;
+                }
 
-						_data.forEach((item, index)=>{
-							let _json = {};
-							let teacher = item.course_teacher?JSON.parse(item.course_teacher):[]
-							_json["项目编号"] = item.ProjectNo;
-        			_json["项目名称"] = item.title;
-        			_json["项目负责人"] = item.pro_leader;
-        			_json["所在部门"] = item.name;
-        			_json["分类"] = item.sort;
-        			_json["预算(万)"] = item.fund / 10000;
-        			_json["创建时间"] = item.createTime;
-        			_json["联系电话"] = item.phone;
-        			_json["项目状态"] = item.isReturn==0?this.classType.find(i=>i.value==item.isupload)['title']:this.isReturnType[item.isReturn];
-							for(let i =0;i<teacher.length;i++){
-								_json["指导老师"+(i+1)] = teacher[i].name;
-							}
+                _array.push(_json);
+              });
 
-							_array.push(_json)
-						})
+              let XLSX = require("xlsx");
+              const workbook = XLSX.utils.book_new(); //创建一个新的工作簿对象
+              let ws = XLSX.utils.json_to_sheet(_array); //将json对象数组转化成工作表
+              ws["!cols"] = [
+                //设置每一列的宽度
+                { wch: 15 },
+                { wch: 50 },
+                { wch: 15 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 10 },
+                +{ wch: 30 },
+                { wch: 20 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+                { wch: 10 },
+              ];
+              XLSX.utils.book_append_sheet(workbook, ws, "sheet1"); //把sheet添加到workbook里,第三个参数是sheet名
+              XLSX.writeFile(workbook, "项目列表.xlsx");
 
-						let XLSX = require("xlsx");
-						const workbook = XLSX.utils.book_new(); //创建一个新的工作簿对象
-      			let ws = XLSX.utils.json_to_sheet(_array); //将json对象数组转化成工作表
-      			ws["!cols"] = [
-      			  //设置每一列的宽度
-      			  { wch: 15 },
-      			  { wch: 50 },
-      			  { wch: 15 },
-      			  { wch: 20 },
-      			  { wch: 20 },
-      			  { wch: 10 },
-     + 			  { wch: 30 },
-      			  { wch: 20 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-							{ wch: 10 },
-      			];
-						XLSX.utils.book_append_sheet(workbook, ws, "sheet1"); //把sheet添加到workbook里,第三个参数是sheet名
-      			XLSX.writeFile(workbook,"项目列表.xlsx");
-						
-						this.loading = false;
-						console.log(_data)
-					});
+              this.loading = false;
+              console.log(_data);
+            });
         })
         .catch(() => {});
-		}
+    },
     // getUser() {
     //   var request = new XMLHttpRequest();
     //   request.open("get", "http://10.16.30.130/sso/api", true);
@@ -1084,16 +1121,16 @@ export default {
     // }
   },
   mounted() {
-		// 默认选择当前年份
-		this.selectInp.year = new Date().getFullYear().toString();
+    // 默认选择当前年份
+    this.selectInp.year = new Date().getFullYear().toString();
     //跳转到此页面立刻获取数据
     // this.getData(); //获取表格数据
     // this.getUser();
     // console.log(this.$store.state.userInfo.type);
   },
-	activated(){
-		this.getData()
-	}
+  activated() {
+    this.getData();
+  },
 };
 </script>
 
@@ -1108,13 +1145,13 @@ export default {
     max-width: 70px;
     min-width: 70px;
   }
-	/deep/.el-table__row{
-		.el-table__cell{
-			cursor: pointer;
-		}
-		.el-table__cell:nth-last-child(1){
-			cursor: default;
-		}
-	}
+  /deep/.el-table__row {
+    .el-table__cell {
+      cursor: pointer;
+    }
+    .el-table__cell:nth-last-child(1) {
+      cursor: default;
+    }
+  }
 }
-</style>
+</style>

+ 1 - 0
src/views/projectManage/ProjectManagement.vue

@@ -135,6 +135,7 @@
 
     <!-- 表格开始 -->
     <div>
+			<span style="font-size: 12px;">共  {{ table.total }} 条</span>
       <el-table
         ref="multipleTable"
         :data="items"

+ 1 - 0
src/views/projectSettlement/projectSettlement.vue

@@ -83,6 +83,7 @@
 
 <!-- 表格开始 -->
     <div>
+			<span style="font-size: 12px;">共  {{ table.total }} 条</span>
       <el-table
         ref="multipleTable"
         :data="tableData"

+ 1 - 0
src/views/resultShow/resultsShow.vue

@@ -113,6 +113,7 @@
 
     <!-- 表格开始 -->
     <div>
+			<span style="font-size: 12px;">共  {{ Page.total }} 条</span>
       <el-table
         ref="multipleTable"
         :data="items"

Vissa filer visades inte eftersom för många filer har ändrats