Начало Каталог Помощ
Вход
CocoRoboLabs
/
ssti-CollegeManage
3
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

build

zengyicheng преди 2 години
родител
50ee4d22f9
ревизия
837c30af86
променени са 73 файла, в които са добавени 1048 реда и са изтрити 517 реда
Обединен изглед Покажи статистика за разликите
  1. 0 0
      dist/css/0.4f034e44.css
  2. 0 0
      dist/css/178.afd2c006.css
  3. 0 0
      dist/css/215.ca40a7d7.css
  4. 0 0
      dist/css/299.1398f48d.css
  5. 0 0
      dist/css/520.d9e4efce.css
  6. 0 0
      dist/css/720.8057289a.css
  7. 0 0
      dist/css/729.6370bec4.css
  8. 0 0
      dist/css/939.97e61cd7.css
  9. 0 0
      dist/css/946.dc8ba039.css
  10. 0 0
      dist/css/955.0b4353f1.css
  11. 0 0
      dist/css/968.b862a0ef.css
  12. 0 0
      dist/css/app.878f2d55.css
  13. 1 1
      dist/index.html
  14. 0 0
      dist/js/0.5a887cd2.js
  15. 0 0
      dist/js/0.5a887cd2.js.map
  16. 0 0
      dist/js/178.f6a6b7de.js
  17. 0 0
      dist/js/178.f6a6b7de.js.map
  18. 0 0
      dist/js/19.ddf0c45e.js
  19. 0 0
      dist/js/19.ddf0c45e.js.map
  20. 0 0
      dist/js/215.422486ec.js
  21. 0 0
      dist/js/215.422486ec.js.map
  22. 0 0
      dist/js/260.f35f8be2.js
  23. 0 0
      dist/js/260.f35f8be2.js.map
  24. 0 0
      dist/js/293.15b4745e.js
  25. 0 0
      dist/js/293.15b4745e.js.map
  26. 0 0
      dist/js/299.f9e0eff0.js
  27. 0 0
      dist/js/299.f9e0eff0.js.map
  28. 0 0
      dist/js/37.5c96d00e.js
  29. 0 0
      dist/js/37.5c96d00e.js.map
  30. 0 0
      dist/js/402.73bc8fdc.js.map
  31. 0 0
      dist/js/488.12987717.js
  32. 0 0
      dist/js/488.12987717.js.map
  33. 0 0
      dist/js/520.a198e12b.js
  34. 0 0
      dist/js/520.a198e12b.js.map
  35. 0 0
      dist/js/523.3058f728.js
  36. 0 0
      dist/js/523.3058f728.js.map
  37. 0 0
      dist/js/65.7487d001.js
  38. 0 0
      dist/js/65.7487d001.js.map
  39. 0 0
      dist/js/718.76ccbff3.js
  40. 0 0
      dist/js/718.76ccbff3.js.map
  41. 0 0
      dist/js/729.fbe93dd7.js
  42. 0 0
      dist/js/729.fbe93dd7.js.map
  43. 0 0
      dist/js/774.b65d3321.js
  44. 0 0
      dist/js/774.b65d3321.js.map
  45. 0 0
      dist/js/854.16e044b2.js
  46. 0 0
      dist/js/854.16e044b2.js.map
  47. 0 0
      dist/js/939.d61777f2.js
  48. 0 0
      dist/js/939.d61777f2.js.map
  49. 0 0
      dist/js/942.656a1e95.js
  50. 0 0
      dist/js/942.656a1e95.js.map
  51. 0 0
      dist/js/946.ca6bb6ba.js
  52. 0 0
      dist/js/946.ca6bb6ba.js.map
  53. 0 0
      dist/js/95.548051d0.js
  54. 0 0
      dist/js/95.548051d0.js.map
  55. 0 0
      dist/js/955.a86038b6.js
  56. 0 0
      dist/js/955.a86038b6.js.map
  57. 0 0
      dist/js/968.ad9052d3.js
  58. 0 0
      dist/js/968.ad9052d3.js.map
  59. 0 0
      dist/js/app.8d1ccdf3.js
  60. 0 0
      dist/js/app.8d1ccdf3.js.map
  61. 0 0
      dist/js/app.eb19cd48.js
  62. 0 0
      dist/js/app.eb19cd48.js.map
  63. 1 1
      src/App.vue
  64. 1 1
      src/permission.js
  65. 133 109
      src/router/index.js
  66. 1 0
      src/views/activityManage/components/markeractivityWord.vue
  67. 271 221
      src/views/commission/commission.vue
  68. 518 158
      src/views/home.vue
  69. 2 2
      src/views/projectApply/components/MakerSpaceWord.vue
  70. 7 7
      src/views/projectManage/components/Closingstatement.vue
  71. 1 1
      src/views/projectManage/components/ProjectManagementEndProjectFile.vue
  72. 111 15
      src/views/projectSettlement/components/projectSettlementBook.vue
  73. 1 1
      src/views/projectSettlement/components/projectSettlementDetailConclusion.vue

+ 0 - 0
dist/css/774.4f034e44.css → dist/css/0.4f034e44.css
Целия файл


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/178.afd2c006.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/215.ca40a7d7.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/299.1398f48d.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/520.d9e4efce.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/720.8057289a.css


+ 0 - 0
dist/css/769.6370bec4.css → dist/css/729.6370bec4.css
Целия файл


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/939.97e61cd7.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/946.dc8ba039.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/955.0b4353f1.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/968.b862a0ef.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/css/app.878f2d55.css


+ 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.6fb7b4fe.js"></script><script defer="defer" src="/js/app.eb19cd48.js"></script><link href="/css/chunk-vendors.ab49d789.css" rel="stylesheet"><link href="/css/app.831bb61e.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.6fb7b4fe.js"></script><script defer="defer" src="/js/app.8d1ccdf3.js"></script><link href="/css/chunk-vendors.ab49d789.css" rel="stylesheet"><link href="/css/app.878f2d55.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/0.5a887cd2.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/0.5a887cd2.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/178.f6a6b7de.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/178.f6a6b7de.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/19.ddf0c45e.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/19.ddf0c45e.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/215.422486ec.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/215.422486ec.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/260.f35f8be2.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/260.f35f8be2.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/293.15b4745e.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/293.15b4745e.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/299.f9e0eff0.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/299.f9e0eff0.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/37.5c96d00e.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/37.5c96d00e.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/402.73bc8fdc.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/488.12987717.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/488.12987717.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/520.a198e12b.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/520.a198e12b.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/523.3058f728.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/523.3058f728.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/65.7487d001.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/65.7487d001.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/718.76ccbff3.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/718.76ccbff3.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/729.fbe93dd7.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/729.fbe93dd7.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/774.b65d3321.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/774.b65d3321.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/854.16e044b2.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/854.16e044b2.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/939.d61777f2.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/939.d61777f2.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/942.656a1e95.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/942.656a1e95.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/946.ca6bb6ba.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/946.ca6bb6ba.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/95.548051d0.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/95.548051d0.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/955.a86038b6.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/955.a86038b6.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/968.ad9052d3.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/968.ad9052d3.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/app.8d1ccdf3.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/app.8d1ccdf3.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/app.eb19cd48.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/js/app.eb19cd48.js.map


+ 1 - 1
src/App.vue
Целия файл 

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

+ 1 - 1
src/permission.js
Целия файл 

@@ -30,7 +30,7 @@ function getSystemState(to, callback) {
 
         let state = res['data'][0][0]['state'];
 
         let state = res['data'][0][0]['state'];
 
         store.commit('update', ['systemState', state]);
 
         store.commit('update', ['systemState', state]);
 
         if (state != 0 && store.state.userInfo.type != 0 && to.name != 'CloseWeb') return router.push('/CloseWeb');
 
         if (state != 0 && store.state.userInfo.type != 0 && to.name != 'CloseWeb') return router.push('/CloseWeb');
 
-        if (state == 0 && to.name == 'CloseWeb') return router.push('/projectApplication');
 
+        if (state == 0 && to.name == 'CloseWeb') return router.push('/home');
 
         callback(state);
 
         callback(state);
 
     }).catch(err => {
 
     }).catch(err => {
 
         console.log(err)
 
         console.log(err)

+ 133 - 109
src/router/index.js
Целия файл 

@@ -5,7 +5,7 @@ import store from '@/config/config'
 
 Vue.use(VueRouter)
 
 Vue.use(VueRouter)
 
 const originalPush = VueRouter.prototype.push
 
 const originalPush = VueRouter.prototype.push
 
 VueRouter.prototype.push = function push(location) {
 
 VueRouter.prototype.push = function push(location) {
 
-  return originalPush.call(this, location).catch(err => err)
 
+    return originalPush.call(this, location).catch(err => err)
 
 }
 
 }
 
 
 
 
 
@@ -18,7 +18,7 @@ const routes = [{
 
         path: '/login',
 
         path: '/login',
 
         component: () =>
 
         component: () =>
 
             import ('@/views/login.vue'),
 
             import ('@/views/login.vue'),
 
-        meta: { isAuth: false,checkPower:true }
 
+        meta: { isAuth: false, checkPower: true }
 
     },
 
     },
 
 
 
     { //成果展示
 
     { //成果展示
 
@@ -26,7 +26,7 @@ const routes = [{
 
         path: '/resultShowDetail',
 
         path: '/resultShowDetail',
 
         component: () =>
 
         component: () =>
 
             import ('@/views/resultShow/resultShowDetail.vue'),
 
             import ('@/views/resultShow/resultShowDetail.vue'),
 
-        meta: { isAuth: true,checkPower:false }
 
+        meta: { isAuth: true, checkPower: false }
 
 
 
     },
 
     },
 
     { //测试
 
     { //测试
 
@@ -34,7 +34,7 @@ const routes = [{
 
         path: '/test',
 
         path: '/test',
 
         component: () =>
 
         component: () =>
 
             import ('@/views/test.vue'),
 
             import ('@/views/test.vue'),
 
-        meta: { isAuth: true,checkPower:true }
 
+        meta: { isAuth: true, checkPower: true }
 
 
 
     },
 
     },
 
     { //测试2
 
     { //测试2
 
@@ -42,109 +42,123 @@ const routes = [{
 
         path: '/Word',
 
         path: '/Word',
 
         component: () =>
 
         component: () =>
 
             import ('@/views/Word.vue'),
 
             import ('@/views/Word.vue'),
 
-        meta: { isAuth: true,checkPower:true }
 
+        meta: { isAuth: true, checkPower: true }
 
 
 
     },
 
     },
 
-    {//管理员关闭页面
 
-        name:"CloseWeb",
 
-        path:"/CloseWeb",
 
-        component:()=>import('@/views/closeWeb.vue'),
 
-        meta: { isAuth: true,checkPower:false }
 
+    { //管理员关闭页面
 
+        name: "CloseWeb",
 
+        path: "/CloseWeb",
 
+        component: () =>
 
+            import ('@/views/closeWeb.vue'),
 
+        meta: { isAuth: true, checkPower: false }
 
     },
 
     },
 
     {
 
     {
 
         name: 'home',
 
         name: 'home',
 
         path: '/home',
 
         path: '/home',
 
         component: () =>
 
         component: () =>
 
-        import ('@/views/home.vue'),
 
-        meta: { isAuth: true,checkPower:false },
 
+            import ('@/views/home.vue'),
 
+        meta: { isAuth: true, checkPower: false },
 
 
 
         children: [{ //创客活动
 
         children: [{ //创客活动
 
                 name: 'makerActvity',
 
                 name: 'makerActvity',
 
                 path: '/makerActvity',
 
                 path: '/makerActvity',
 
-                component: () =>import ('@/views/activityManage/makerActvity.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/activityManage/makerActvity.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
 
 
             },
 
             },
 
             { //创客活动详情
 
             { //创客活动详情
 
                 name: 'makerActivityWordDetail',
 
                 name: 'makerActivityWordDetail',
 
                 path: '/makerActvityWordDetail',
 
                 path: '/makerActvityWordDetail',
 
-                component: () =>import ('@/views/activityManage/makerActivityWordDetail.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/activityManage/makerActivityWordDetail.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
             },
 
             },
 
             { //项目立项申请
 
             { //项目立项申请
 
                 name: 'projectApplication',
 
                 name: 'projectApplication',
 
                 path: '/projectApplication',
 
                 path: '/projectApplication',
 
-                component: () =>import ('@/views/projectApply/projectApplication.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/projectApply/projectApplication.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
 
 
             },
 
             },
 
             { //新学生项目立项申请
 
             { //新学生项目立项申请
 
                 name: 'newStudentProjectApply',
 
                 name: 'newStudentProjectApply',
 
                 path: '/newStudentProjectApply',
 
                 path: '/newStudentProjectApply',
 
-                component: () =>import ('@/views/projectApply/newStudentProjectApply.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/projectApply/newStudentProjectApply.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
 
 
             },
 
             },
 
             { //新创客活动
 
             { //新创客活动
 
                 name: 'newMarkerActivity',
 
                 name: 'newMarkerActivity',
 
                 path: '/newMarkerActivity',
 
                 path: '/newMarkerActivity',
 
-                component: () =>import ('@/views/activityManage/newMarkerActivity'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/activityManage/newMarkerActivity'),
 
+                meta: { isAuth: true, checkPower: false }
 
 
 
             },
 
             },
 
             { //新个人创客
 
             { //新个人创客
 
                 name: 'newNomMarkerActivity',
 
                 name: 'newNomMarkerActivity',
 
                 path: '/newNomMarkerActivity',
 
                 path: '/newNomMarkerActivity',
 
-                component: () =>import ('@/views/activityManage/newNomMarkerActivity.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/activityManage/newNomMarkerActivity.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
 
 
             },
 
             },
 
-            {   //项目查看详细
 
+            { //项目查看详细
 
                 name: 'projectApplicationDetailMain',
 
                 name: 'projectApplicationDetailMain',
 
                 path: '/projectApplicationDetailMain',
 
                 path: '/projectApplicationDetailMain',
 
-                component: () =>import ('@/views/projectApply/projectApplicationDetailMain.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/projectApply/projectApplicationDetailMain.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
 
 
             },
 
             },
 
 
 
             { //创业公司登记
 
             { //创业公司登记
 
                 name: 'firm',
 
                 name: 'firm',
 
                 path: '/firm',
 
                 path: '/firm',
 
-                component: () =>import ('@/views/firm.vue'),
 
-                meta: { isAuth: true,checkPower:true }
 
+                component: () =>
 
+                    import ('@/views/firm.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
 
 
             },
 
             },
 
             { //创客资金主页面
 
             { //创客资金主页面
 
                 name: 'makerfund',
 
                 name: 'makerfund',
 
                 path: '/makerfund',
 
                 path: '/makerfund',
 
-                component: () =>import ('@/views/fundManage/makerfund.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/fundManage/makerfund.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
 
 
             },
 
             },
 
             { //新创客活动资金申请
 
             { //新创客活动资金申请
 
                 name: 'newMarkerfundApply',
 
                 name: 'newMarkerfundApply',
 
                 path: '/newMarkerfundApply',
 
                 path: '/newMarkerfundApply',
 
-                component: () =>import ('@/views/fundManage/newMarkerfundApply.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/fundManage/newMarkerfundApply.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
             },
 
             },
 
             { //新个人创客资金申请
 
             { //新个人创客资金申请
 
                 name: 'newNomMarkerFundApply',
 
                 name: 'newNomMarkerFundApply',
 
                 path: '/newNomMarkerFundApply',
 
                 path: '/newNomMarkerFundApply',
 
-                component: () =>import ('@/views/fundManage/newNomMarkerFundApply.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/fundManage/newNomMarkerFundApply.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
 
 
             },
 
             },
 
             { //创客资金详情
 
             { //创客资金详情
 
                 name: 'makerfundDetails',
 
                 name: 'makerfundDetails',
 
                 path: '/makerfundDetails',
 
                 path: '/makerfundDetails',
 
-                component: () =>import ('@/views/fundManage/makerfundDetails.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/fundManage/makerfundDetails.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
             },
 
             },
 
             { //消息通知
 
             { //消息通知
 
                 name: 'messageNotification',
 
                 name: 'messageNotification',
 
                 path: '/messageNotification',
 
                 path: '/messageNotification',
 
-                component: () =>import ('@/views/messageNotification.vue'),
 
-                meta: { isAuth: true,checkPower:false }
 
+                component: () =>
 
+                    import ('@/views/messageNotification.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
 
 
             },
 
             },
 
 
 
@@ -152,23 +166,26 @@ const routes = [{
 
             { //项目管理
 
             { //项目管理
 
                 name: 'ProjectManagement',
 
                 name: 'ProjectManagement',
 
                 path: '/ProjectManagement',
 
                 path: '/ProjectManagement',
 
-                component: () =>import ('@/views/projectManage/ProjectManagement.vue'),
 
-                meta: { isAuth: true,checkPower:true }
 
+                component: () =>
 
+                    import ('@/views/projectManage/ProjectManagement.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
 
 
             },
 
             },
 
-            {   //项目管理父查看详情
 
+            { //项目管理父查看详情
 
                 name: 'ProjectManagementMain',
 
                 name: 'ProjectManagementMain',
 
                 path: '/ProjectManagementMain',
 
                 path: '/ProjectManagementMain',
 
-                component: () =>import ('@/views/projectManage/ProjectManagementMain.vue'),
 
-                meta: { isAuth: true,checkPower:true }
 
+                component: () =>
 
+                    import ('@/views/projectManage/ProjectManagementMain.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
             },
 
             },
 
- 
-            
+
 
+
 
             { //项目资金管理
 
             { //项目资金管理
 
                 name: 'ProjectManagementFundDetail',
 
                 name: 'ProjectManagementFundDetail',
 
                 path: '/ProjectManagementFundDetail',
 
                 path: '/ProjectManagementFundDetail',
 
-                component: () =>import ('@/views/projectManage/ProjectManagementFundDetail.vue'),
 
-                meta: { isAuth: true,checkPower:true }
 
+                component: () =>
 
+                    import ('@/views/projectManage/ProjectManagementFundDetail.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
 
 
             },
 
             },
 
             // { //项目资金管理
 
             // { //项目资金管理
 
@@ -181,52 +198,60 @@ const routes = [{
 
             { //项目结项
 
             { //项目结项
 
                 name: 'projectSettlement',
 
                 name: 'projectSettlement',
 
                 path: '/projectSettlement',
 
                 path: '/projectSettlement',
 
-                component: () =>import ('@/views/projectSettlement/projectSettlement.vue'),
 
-                meta: { isAuth: true,checkPower:true }
 
+                component: () =>
 
+                    import ('@/views/projectSettlement/projectSettlement.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
 
 
             },
 
             },
 
-            {   //项目结项查看详细
 
-                name:"projectSettlementDetailMain",
 
-                path:"/projectSettlementDetailMain",
 
-                component:()=>import('@/views/projectSettlement/projectSettlementDetailMain.vue'),
 
-                meta:{isAuth:true,checkPower:true}
 
+            { //项目结项查看详细
 
+                name: "projectSettlementDetailMain",
 
+                path: "/projectSettlementDetailMain",
 
+                component: () =>
 
+                    import ('@/views/projectSettlement/projectSettlementDetailMain.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
             },
 
             },
 
-            
+
 
             { //成果展示
 
             { //成果展示
 
                 name: 'resultsShow',
 
                 name: 'resultsShow',
 
                 path: '/resultsShow',
 
                 path: '/resultsShow',
 
-                component: () =>import ('@/views/resultShow/resultsShow.vue'),
 
-                meta: { isAuth: true,checkPower:true }
 
+                component: () =>
 
+                    import ('@/views/resultShow/resultsShow.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
             },
 
             },
 
             { //数据检测
 
             { //数据检测
 
                 name: 'echarts',
 
                 name: 'echarts',
 
                 path: '/echarts',
 
                 path: '/echarts',
 
-                component: () =>import ('@/views/echarts/echarts.vue'),
 
-                meta: { isAuth: true,checkPower:true }
 
+                component: () =>
 
+                    import ('@/views/echarts/echarts.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
             },
 
             },
 
-            {//创客空间项目申请
 
-                name:"/MakerSpaceApply",
 
-                path:"/MakerSpaceApply",
 
-                component:()=>import('@/views/projectApply/MakerSpaceApply.vue'),
 
-                meta:{isAuth:true,checkPower:false}
 
+            { //创客空间项目申请
 
+                name: "/MakerSpaceApply",
 
+                path: "/MakerSpaceApply",
 
+                component: () =>
 
+                    import ('@/views/projectApply/MakerSpaceApply.vue'),
 
+                meta: { isAuth: true, checkPower: false }
 
             },
 
             },
 
-            {//系统管理
 
-                name:"system",
 
-                path:"/system",
 
-                component:()=>import('@/views/system'),
 
-                meta:{isAuth:true,checkPower:true}
 
+            { //系统管理
 
+                name: "system",
 
+                path: "/system",
 
+                component: () =>
 
+                    import ('@/views/system'),
 
+                meta: { isAuth: true, checkPower: true }
 
             },
 
             },
 
-             {//代办公文
 
-                name:"commission",
 
-                path:"/commission",
 
-                component:()=>import('@/views/commission/commission.vue'),
 
-                meta:{isAuth:true,checkPower:true}
 
+            { //代办公文
 
+                name: "commission",
 
+                path: "/commission",
 
+                component: () =>
 
+                    import ('@/views/commission/commission.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
             },
 
             },
 
-            {//代办公文查看详情
 
-                name:"commissionDetailMain",
 
-                path:"/commissionDetailMain",
 
-                component:()=>import('@/views/commission/commissionDetailMain.vue'),
 
-                meta:{isAuth:true,checkPower:true}
 
+            { //代办公文查看详情
 
+                name: "commissionDetailMain",
 
+                path: "/commissionDetailMain",
 
+                component: () =>
 
+                    import ('@/views/commission/commissionDetailMain.vue'),
 
+                meta: { isAuth: true, checkPower: true }
 
             },
 
             },
 
         ]
 
         ]
 
     }
 
     }
 
@@ -238,35 +263,34 @@ const router = new VueRouter({
 
     routes,
 
     routes,
 
 })
 
 })
 
 
 
-router.beforeEach((to,from,next)=>{
 
-    // if(store.state.userInfo.type!=0&&store.state.systemState!=0&&to.name!='CloseWeb')router.push('/CloseWeb');
 
-    if(to.meta.checkPower){
 
-        if(store.state.userInfo.type==0){
 
-            next();
 
-        }else{
 
-            router.push('/projectApplication')
 
-        }
 
-    }else{
 
+router.beforeEach((to, from, next) => {
 
+        // if(store.state.userInfo.type!=0&&store.state.systemState!=0&&to.name!='CloseWeb')router.push('/CloseWeb');
 
+        // if(to.meta.checkPower){
 
+        //     if(store.state.userInfo.type==0){
 
+        //         next();
 
+        //     }else{
 
+        //         router.push('/projectApplication')
 
+        //     }
 
+        // }else{
 
         next();
 
         next();
 
-    }
 
-  }
 
-)
 
-// router.beforeEach(function(to, from, next) {
 
-//   if (to.meta.isAuth) {
 
-//     //页面是否登录
 
-//     if (localStorage.getItem("token")) {
 
-//       //本地存储中是否有token(uid)数据
 
-//       next(); //表示已经登录
 
-//     } else {
 
-//       //next可以传递一个路由对象作为参数 表示需要跳转到的页面
 
-//       next({
 
-//         name: "login"
 
-//       });
 
-//     }
 
-//   } else {
 
-//     //表示不需要登录
 
-//     next(); //继续往后走
 
-//   }
 
-// });
 
+        // }
 
+    })
 
+    // router.beforeEach(function(to, from, next) {
 
+    //   if (to.meta.isAuth) {
 
+    //     //页面是否登录
 
+    //     if (localStorage.getItem("token")) {
 
+    //       //本地存储中是否有token(uid)数据
 
+    //       next(); //表示已经登录
 
+    //     } else {
 
+    //       //next可以传递一个路由对象作为参数 表示需要跳转到的页面
 
+    //       next({
 
+    //         name: "login"
 
+    //       });
 
+    //     }
 
+    //   } else {
 
+    //     //表示不需要登录
 
+    //     next(); //继续往后走
 
+    //   }
 
+    // });
 
 
 
 export default router
 
 export default router

+ 1 - 0
src/views/activityManage/components/markeractivityWord.vue
Целия файл 

@@ -11,6 +11,7 @@
 
               <td colspan="4" class="bold">关联项目</td>
 
               <td colspan="4" class="bold">关联项目</td>
 
               <td colspan="12">
 
               <td colspan="12">
 
                 <el-select v-model="wordData['associatedProjects']" @change="getProjectFund()" style="width: 100%;" placeholder="请选择关联项目（无关联项目可不选）">
 
                 <el-select v-model="wordData['associatedProjects']" @change="getProjectFund()" style="width: 100%;" placeholder="请选择关联项目（无关联项目可不选）">
 
+                  <el-option label="无" value="">无</el-option>
 
                   <el-option
 
                   <el-option
 
                     v-for="item in ProjectData"
 
                     v-for="item in ProjectData"
 
                     :key="item.courseId"
 
                     :key="item.courseId"

+ 271 - 221
src/views/commission/commission.vue
Целия файл 

@@ -1,165 +1,200 @@
 
 <template>
 
 <template>
 
-    <!-- 代办公文 -->
 
-    <div v-loading="loading">
 
-      <div class="pAHeader">
 
-        <div class="pAHeader1">代办公文</div>
 
-      </div>
 
-      <hr>
 
-      
-      <!-- 搜索栏开始 -->
 
-      <div class="selectInp">
 
-        <div class="manageSelects" style="width: 100%;">
 
+  <!-- 待办公文 -->
 
+  <div v-loading="loading">
 
+    <div class="pAHeader">
 
+      <div class="pAHeader1">待办公文</div>
 
+    </div>
 
+    <hr />
 
+
 
+    <!-- 搜索栏开始 -->
 
+    <div class="selectInp">
 
+      <div class="manageSelects" style="width: 100%">
 
         <div class="selectsBlock">
 
         <div class="selectsBlock">
 
           <span class="selectLabel">项目筛选</span>
 
           <span class="selectLabel">项目筛选</span>
 
-          <el-select v-model="pavalues.value" @change="getData" placeholder="我的项目">
 
-            <el-option label="所有项目" value=""/>
 
+          <el-select
 
+            v-model="pavalues.value"
 
+            @change="getData"
 
+            placeholder="我的项目"
 
+          >
 
+            <el-option label="所有项目" value="" />
 
             <el-option
 
             <el-option
 
               v-for="item in options"
 
               v-for="item in options"
 
               :key="item.courseId"
 
               :key="item.courseId"
 
               :label="item.title"
 
               :label="item.title"
 
-              :value="item.courseId">
 
+              :value="item.courseId"
 
+            >
 
             </el-option>
 
             </el-option>
 
           </el-select>
 
           </el-select>
 
         </div>
 
         </div>
 
-  
+
 
         <div class="selectsBlock">
 
         <div class="selectsBlock">
 
           <span class="selectLabel">部门</span>
 
           <span class="selectLabel">部门</span>
 
-          <el-select v-model="pavalues.value1" @change="getData" placeholder="请选择">
 
-            <el-option label="所有部门" value=""/>
 
+          <el-select
 
+            v-model="pavalues.value1"
 
+            @change="getData"
 
+            placeholder="请选择"
 
+          >
 
+            <el-option label="所有部门" value="" />
 
             <el-option
 
             <el-option
 
               v-for="item in options1"
 
               v-for="item in options1"
 
               :key="item.classid"
 
               :key="item.classid"
 
               :label="item.name"
 
               :label="item.name"
 
-              :value="item.classid">
 
+              :value="item.classid"
 
+            >
 
             </el-option>
 
             </el-option>
 
           </el-select>
 
           </el-select>
 
         </div>
 
         </div>
 
-  
+
 
         <div class="selectsBlock">
 
         <div class="selectsBlock">
 
           <span class="selectLabel">分类</span>
 
           <span class="selectLabel">分类</span>
 
-          <el-select v-model="pavalues.value2" @change="getData" placeholder="请选择">
 
-            <el-option label="所有分类" value=""/>
 
+          <el-select
 
+            v-model="pavalues.value2"
 
+            @change="getData"
 
+            placeholder="请选择"
 
+          >
 
+            <el-option label="所有分类" value="" />
 
             <el-option
 
             <el-option
 
               v-for="item in options2"
 
               v-for="item in options2"
 
               :key="item.typeid"
 
               :key="item.typeid"
 
               :label="item.name"
 
               :label="item.name"
 
-              :value="item.typeid">
 
+              :value="item.typeid"
 
+            >
 
             </el-option>
 
             </el-option>
 
           </el-select>
 
           </el-select>
 
         </div>
 
         </div>
 
-  
+
 
         <div class="selectsBlock">
 
         <div class="selectsBlock">
 
           <span class="selectLabel">负责人</span>
 
           <span class="selectLabel">负责人</span>
 
-          <el-select v-model="pavalues.value3" @change="getData" placeholder="请选择">
 
-            <el-option label="所有负责人" value=""/>
 
+          <el-select
 
+            v-model="pavalues.value3"
 
+            @change="getData"
 
+            placeholder="请选择"
 
+          >
 
+            <el-option label="所有负责人" value="" />
 
             <el-option
 
             <el-option
 
               v-for="item in options3"
 
               v-for="item in options3"
 
               :key="item.pro_leader"
 
               :key="item.pro_leader"
 
               :label="item.pro_leader"
 
               :label="item.pro_leader"
 
-              :value="item.pro_leader">
 
+              :value="item.pro_leader"
 
+            >
 
             </el-option>
 
             </el-option>
 
           </el-select>
 
           </el-select>
 
         </div>
 
         </div>
 
 
 
         <div class="selectsBlock">
 
         <div class="selectsBlock">
 
           <span class="selectLabel">状态</span>
 
           <span class="selectLabel">状态</span>
 
-          <el-select v-model="pavalues.value2" @change="getData" placeholder="请选择">
 
-            <el-option label="所有分类" value=""/>
 
+          <el-select
 
+            v-model="pavalues.value2"
 
+            @change="getData"
 
+            placeholder="请选择"
 
+          >
 
+            <el-option label="所有分类" value="" />
 
             <el-option
 
             <el-option
 
               v-for="item in options2"
 
               v-for="item in options2"
 
               :key="item.typeid"
 
               :key="item.typeid"
 
               :label="item.name"
 
               :label="item.name"
 
-              :value="item.typeid">
 
+              :value="item.typeid"
 
+            >
 
             </el-option>
 
             </el-option>
 
           </el-select>
 
           </el-select>
 
         </div>
 
         </div>
 
 
 
         <div class="selectsBlock">
 
         <div class="selectsBlock">
 
           <span class="selectLabel">送件时间</span>
 
           <span class="selectLabel">送件时间</span>
 
-          <el-select v-model="pavalues.value4" @change="getData" placeholder="请选择">
 
-            <el-option label="所有年份" value=""/>
 
+          <el-select
 
+            v-model="pavalues.value4"
 
+            @change="getData"
 
+            placeholder="请选择"
 
+          >
 
+            <el-option label="所有年份" value="" />
 
             <el-option
 
             <el-option
 
               v-for="item in options4"
 
               v-for="item in options4"
 
               :key="item.time"
 
               :key="item.time"
 
-              :label="item.time+'年'"
 
-              :value="item.time">
 
+              :label="item.time + '年'"
 
+              :value="item.time"
 
+            >
 
             </el-option>
 
             </el-option>
 
           </el-select>
 
           </el-select>
 
         </div>
 
         </div>
 
-        </div>
 
-        <!-- <div class="ProjectManagementQuery">
 
+      </div>
 
+      <!-- <div class="ProjectManagementQuery">
 
           <el-input v-model="input" style="width:240px" placeholder="请输入项目名称/编号"></el-input>
 
           <el-input v-model="input" style="width:240px" placeholder="请输入项目名称/编号"></el-input>
 
           <el-button type="primary" class="btn" @click="getData" size="mini">查询</el-button>
 
           <el-button type="primary" class="btn" @click="getData" size="mini">查询</el-button>
 
         </div> -->
 
         </div> -->
 
-      </div>
 
-      <!-- 搜索栏结束 -->
 
-      
-      <!-- 表格开始 -->
 
-      <div>
 
-        <el-table
 
-          ref="multipleTable"
 
-          :data="items"
 
-          tooltip-effect="dark"
 
-          stripe
 
-          class="fontSize"
 
-          @selection-change="handleSelectionChange"
 
-          :header-cell-style="{ background: '#f2f2f2',color:'#000' }">
 
-          <el-table-column
 
-          type="selection"
 
-            prop="ProjectNo"
 
-            label="项目编号"
 
-            align="center"
 
-            min-width="9%">
 
-          </el-table-column>
 
-          <el-table-column
 
-            prop="title"
 
-            label="项目名称"
 
-            align="center"
 
-            min-width="10%">
 
-          </el-table-column>
 
-          <el-table-column
 
-            prop="pro_leader"
 
-            align="center"
 
-            label="项目负责人"
 
-            min-width="9%">
 
-          </el-table-column>
 
-  
-          
+    </div>
 
+    <!-- 搜索栏结束 -->
 
 
 
-          <el-table-column
 
-            prop="dName"
 
-            align="center"
 
-            label="所在学院"
 
-            min-width="10%">
 
-          </el-table-column>
 
+    <!-- 表格开始 -->
 
+    <div>
 
+      <el-table
 
+        ref="multipleTable"
 
+        :data="items"
 
+        tooltip-effect="dark"
 
+        stripe
 
+        class="fontSize"
 
+        @selection-change="handleSelectionChange"
 
+        :header-cell-style="{ background: '#f2f2f2', color: '#000' }"
 
+      >
 
+        <el-table-column
 
+          type="selection"
 
+          prop="ProjectNo"
 
+          label="项目编号"
 
+          align="center"
 
+          min-width="9%"
 
+        >
 
+        </el-table-column>
 
+        <el-table-column
 
+          prop="title"
 
+          label="项目名称"
 
+          align="center"
 
+          min-width="10%"
 
+        >
 
+        </el-table-column>
 
+        <el-table-column
 
+          prop="pro_leader"
 
+          align="center"
 
+          label="项目负责人"
 
+          min-width="9%"
 
+        >
 
+        </el-table-column>
 
 
 
-          <el-table-column
 
-            prop="tName"
 
-            align="center"
 
-            label="分类"
 
-            min-width="10%">
 
-          </el-table-column>
 
+        <el-table-column
 
+          prop="dName"
 
+          align="center"
 
+          label="所在学院"
 
+          min-width="10%"
 
+        >
 
+        </el-table-column>
 
 
 
-          <el-table-column
 
-            prop="startTime"
 
-            align="center"
 
-            label="开始时间"
 
-            min-width="9%">
 
-            <template #default="scope">
 
-              <div>
 
-                {{ scope.row.startTime }}
 
-              </div>
 
-            </template>
 
-          </el-table-column>
 
+        <el-table-column
 
+          prop="tName"
 
+          align="center"
 
+          label="分类"
 
+          min-width="10%"
 
+        >
 
+        </el-table-column>
 
 
 
+        <el-table-column
 
+          prop="startTime"
 
+          align="center"
 
+          label="开始时间"
 
+          min-width="9%"
 
+        >
 
+          <template #default="scope">
 
+            <div>
 
+              {{ scope.row.startTime }}
 
+            </div>
 
+          </template>
 
+        </el-table-column>
 
 
 
-          <el-table-column
 
-            prop="tName"
 
-            align="center"
 
-            label="状态"
 
-            min-width="10%">
 
-          </el-table-column>
 
-          <!-- <el-table-column
 
+        <el-table-column
 
+          prop="tName"
 
+          align="center"
 
+          label="状态"
 
+          min-width="10%"
 
+        >
 
+        </el-table-column>
 
+        <!-- <el-table-column
 
             prop="fund"
 
             prop="fund"
 
             label="预算(万)"
 
             label="预算(万)"
 
             align="center"
 
             align="center"
 
@@ -170,8 +205,8 @@
 
               </div>
 
               </div>
 
             </template>
 
             </template>
 
           </el-table-column> -->
 
           </el-table-column> -->
 
-          
-          <!-- <el-table-column
 
+
 
+        <!-- <el-table-column
 
             prop="endTime"
 
             prop="endTime"
 
             label="结项时间"
 
             label="结项时间"
 
             align="center"
 
             align="center"
 
@@ -182,7 +217,7 @@
 
                   </div>
 
                   </div>
 
               </template>
 
               </template>
 
           </el-table-column> -->
 
           </el-table-column> -->
 
-          <!-- <el-table-column
 
+        <!-- <el-table-column
 
             prop="phone"
 
             prop="phone"
 
             align="center"
 
             align="center"
 
             label="联系电话"
 
             label="联系电话"
 
@@ -193,139 +228,154 @@
 
               </div>
 
               </div>
 
             </template>
 
             </template>
 
           </el-table-column> -->
 
           </el-table-column> -->
 
-          <el-table-column
 
-            prop="operation"
 
-            width="200"
 
-            align="center"
 
-            label="操作"
 
-            >
 
-            <template #default="scope">
 
-                <div class="operations" style="justify-content: center;">
 
-                  <el-button type="primary" @click="rsBtn(scope.row['courseId'],scope.row['typeid'])">查看详情</el-button>
 
-                </div>
 
-            </template>
 
-          </el-table-column>
 
-        </el-table>
 
-      </div>  
-  
-        <!-- 分页 -->
 
-        <el-pagination
 
-            @current-change="handleCurrentChange"
 
-            :current-page="Page.currentPage"
 
-            :page-size="Page.lim"
 
-            layout=" prev, pager, next"
 
-            background
 
-            class="paginations"
 
-            :total="Page.total">
 
-          </el-pagination>
 
-        <!-- 分页结束 -->
 
-      
-  
+        <el-table-column
 
+          prop="operation"
 
+          width="200"
 
+          align="center"
 
+          label="操作"
 
+        >
 
+          <template #default="scope">
 
+            <div class="operations" style="justify-content: center">
 
+              <el-button
 
+                type="primary"
 
+                @click="rsBtn(scope.row['courseId'], scope.row['typeid'])"
 
+                >查看详情</el-button
 
+              >
 
+            </div>
 
+          </template>
 
+        </el-table-column>
 
+      </el-table>
 
     </div>
 
     </div>
 
-  </template>
 
+
 
+    <!-- 分页 -->
 
+    <el-pagination
 
+      @current-change="handleCurrentChange"
 
+      :current-page="Page.currentPage"
 
+      :page-size="Page.lim"
 
+      layout=" prev, pager, next"
 
+      background
 
+      class="paginations"
 
+      :total="Page.total"
 
+    >
 
+    </el-pagination>
 
+    <!-- 分页结束 -->
 
+  </div>
 
+</template>
 
   
   
   <script>
 
   <script>
 
-      export default {
 
-        data() {
 
-          return {
 
-            input:'',
 
-            items:[], //项目展示小方块
 
-            options:[],
 
-            options1:[],
 
-            options2:[],
 
-            options3:[],
 
-            options4:[],
 
-            loading:false,
 
-            pavalues:{
 
-              value:'',
 
-              value1:'',
 
-              value2:'',
 
-              value3:'',
 
-              value4:new Date().getFullYear().toString(),
 
-            },
 
-            Page:{
 
-              currentPage:1,
 
-              total:0,
 
-              lim:8
 
-            },
 
-            multipleSelection: []//批量选择存放的数组
 
-          }
 
-        },
 
-        methods:{
 
-          handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
 
-            // console.log(`当前页: ${val}`);
 
-            this.Page.currentPage=val
 
-            this.getData()
 
-          },
 
-          rsBtn(pid,tid){
 
-            this.$router.push(`/commissionDetailMain?pid=${pid}&tid=${tid}`)
 
-          },
 
-          getData(){        //获取渲染数据
 
-            this.loading = true;
 
-            let param={
 
-              uid:this.$store.state.userInfo.userid,  //当前账号id
 
-              pid:this.pavalues.value,  //项目筛选
 
-              did:this.pavalues.value1,  //部门
 
-              tid:this.pavalues.value2,    //分类
 
-              leader:this.pavalues.value3,  //负责人
 
-              year:this.pavalues.value4,
 
-              textInp:this.input,
 
-              page:this.Page.currentPage,  //当前页
 
-              lim:this.Page.lim,  //限制获取几条数据
 
+export default {
 
+  data() {
 
+    return {
 
+      input: "",
 
+      items: [], //项目展示小方块
 
+      options: [],
 
+      options1: [],
 
+      options2: [],
 
+      options3: [],
 
+      options4: [],
 
+      loading: false,
 
+      pavalues: {
 
+        value: "",
 
+        value1: "",
 
+        value2: "",
 
+        value3: "",
 
+        value4: new Date().getFullYear().toString(),
 
+      },
 
+      Page: {
 
+        currentPage: 1,
 
+        total: 0,
 
+        lim: 8,
 
+      },
 
+      multipleSelection: [], //批量选择存放的数组
 
+    };
 
+  },
 
+  methods: {
 
+    handleCurrentChange(val) {
 
+      //当页数发生改变的时候调用获取列表数据请求
 
+      // console.log(`当前页: ${val}`);
 
+      this.Page.currentPage = val;
 
+      this.getData();
 
+    },
 
+    rsBtn(pid, tid) {
 
+      this.$router.push(`/commissionDetailMain?pid=${pid}&tid=${tid}`);
 
+    },
 
+    getData() {
 
+      //获取渲染数据
 
+      this.loading = true;
 
+      let param = {
 
+        uid: this.$store.state.userInfo.userid, //当前账号id
 
+        pid: this.pavalues.value, //项目筛选
 
+        did: this.pavalues.value1, //部门
 
+        tid: this.pavalues.value2, //分类
 
+        leader: this.pavalues.value3, //负责人
 
+        year: this.pavalues.value4,
 
+        textInp: this.input,
 
+        page: this.Page.currentPage, //当前页
 
+        lim: this.Page.lim, //限制获取几条数据
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "/GetProjectIsConclusion", param)
 
+        .then(
 
+          (res) => {
 
+            let data = res.data;
 
+
 
+            console.log(data);
 
+            if (
 
+              data[0].length == 0 &&
 
+              data[5][0]["total"] != 0 &&
 
+              this.Page.currentPage != 1
 
+            ) {
 
+              this.Page.currentPage = 1;
 
+              return this.getData();
 
             }
 
             }
 
-            this.ajax    
-              .get(this.$store.state.api+'/GetProjectIsConclusion',param)
 
-                .then(res=>{
 
-                  let data = res.data;
 
-  
-                  console.log(data)
 
-                  if (data[0].length==0 && data[5][0]['total'] != 0&&this.Page.currentPage!=1) {
 
-                    this.Page.currentPage=1
 
-                    return this.getData()
 
-                  }
 
-                  this.items = data[0];
 
-                  this.options = data[1];
 
-                  this.options1 = data[2];
 
-                  this.options2 = data[3];
 
-                  this.options3 = data[4];
 
-                  this.options4 = data[6];
 
-                  if(this.options4.filter(item=>item['time']==new Date().getFullYear().toString()).length==0){
 
-                    this.options4.push({time:new Date().getFullYear().toString()})
 
-                  }
 
-                  this.Page.total = data[5][0]['total']
 
-  
-                  this.loading = false;
 
-                },err=>{
 
-                  console.log(err);
 
-                })  
-          },
 
+            this.items = data[0];
 
+            this.options = data[1];
 
+            this.options1 = data[2];
 
+            this.options2 = data[3];
 
+            this.options3 = data[4];
 
+            this.options4 = data[6];
 
+            if (
 
+              this.options4.filter(
 
+                (item) => item["time"] == new Date().getFullYear().toString()
 
+              ).length == 0
 
+            ) {
 
+              this.options4.push({ time: new Date().getFullYear().toString() });
 
+            }
 
+            this.Page.total = data[5][0]["total"];
 
 
 
-          handleSelectionChange(val) {
 
-            this.multipleSelection = val.courseId;
 
-            console.log( this.multipleSelection);
 
+            this.loading = false;
 
           },
 
           },
 
-    
-        },
 
-        mounted(){
 
-          this.getData();
 
-        }
 
-      }
 
-  </script>
 
+          (err) => {
 
+            console.log(err);
 
+          }
 
+        );
 
+    },
 
+
 
+    handleSelectionChange(val) {
 
+      this.multipleSelection = val.courseId;
 
+      console.log(this.multipleSelection);
 
+    },
 
+  },
 
+  mounted() {
 
+    this.getData();
 
+  },
 
+};
 
+</script>
 
   
   
   <style lang="less">
 
   <style lang="less">
 
 //   .resultsShow{
 
 //   .resultsShow{
 
-  
+
 
 //     // .pagination{
 
 //     // .pagination{
 
 //     //   float: right;
 
 //     //   float: right;
 
 //     //   margin: 0px 85px 10px;
 
 //     //   margin: 0px 85px 10px;
 
 //     // }
 
 //     // }
 
-  
+
 
 //     // .classBlocks{   //循环列表大框
 
 //     // .classBlocks{   //循环列表大框
 
 //     //   width: 100%;
 
 //     //   width: 100%;
 
 //     //   display: flex;
 
 //     //   display: flex;
 
 //     //   flex-wrap: wrap;
 
 //     //   flex-wrap: wrap;
 
 //     //   overflow:auto;
 
 //     //   overflow:auto;
 
-  
+
 
 //     //   .classBlock{   //独立小框
 
 //     //   .classBlock{   //独立小框
 
 //     //         flex-shrink: 0;
 
 //     //         flex-shrink: 0;
 
 //     //         overflow: hidden;
 
 //     //         overflow: hidden;
 
@@ -358,13 +408,13 @@
 
 //     //       width: 100%;height: 120px;
 
 //     //       width: 100%;height: 120px;
 
 //     //       object-fit: cover;
 
 //     //       object-fit: cover;
 
 //     //     }
 
 //     //     }
 
-  
+
 
 //     //     .classBlock1{   //中间栏
 
 //     //     .classBlock1{   //中间栏
 
 //     //       margin-bottom: 10px;
 
 //     //       margin-bottom: 10px;
 
 //     //       box-sizing: border-box;
 
 //     //       box-sizing: border-box;
 
 //     //       padding: 0 5px;
 
 //     //       padding: 0 5px;
 
 //     //       margin-top: 5px;
 
 //     //       margin-top: 5px;
 
-  
+
 
 //     //       .classBlock2{   //项目名称
 
 //     //       .classBlock2{   //项目名称
 
 //     //             margin-left: 5px;
 
 //     //             margin-left: 5px;
 
 //     //             margin-bottom: 4px;
 
 //     //             margin-bottom: 4px;
 
@@ -376,7 +426,7 @@
 
 //     //             text-overflow: ellipsis;
 
 //     //             text-overflow: ellipsis;
 
 //     //       }
 
 //     //       }
 
 //     //       .classBlock3{   //名字、学院
 
 //     //       .classBlock3{   //名字、学院
 
-        
+
 
 //     //         box-sizing: border-box;
 
 //     //         box-sizing: border-box;
 
 //     //             padding: 0 5px;
 
 //     //             padding: 0 5px;
 
 //     //             font-size: 16px;
 
 //     //             font-size: 16px;
 
@@ -398,6 +448,6 @@
 
 //     //     }
 
 //     //     }
 
 //     //   }
 
 //     //   }
 
 //     // }
 
 //     // }
 
- 
+
 
 //     }
 
 //     }
 
-  </style>
 
+</style>

+ 518 - 158
src/views/home.vue
Целия файл 

@@ -1,172 +1,535 @@
 
 <template>
 
 <template>
 
   <!-- 左边导航栏 -->
 
   <!-- 左边导航栏 -->
 
-    <el-container class="homePage">
 
-      <el-container class="homeBody">
 
-        <el-aside width="12%" class="aside core_dialogue">
 
-              <el-col :span="12">
 
-                <el-menu
 
-                  class="el-menu-vertical-demo"
 
-                  @open="handleOpen"
 
-                  @close="handleClose"
 
-                  :unique-opened="false"> 
-                  <div class="submenu" v-for="(item,ind) in navList" :key="ind">
 
-                    <el-submenu v-if="item['group'].length" :index='ind.toString()' >
 
-                      <template slot="title">
 
-                        <div class="subTitle" @click="goto(item.goto)" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''">
 
-                          <i :class="item.icon" style="margin-right: 15px;width: 15px;" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''"></i>
 
-                          {{ item.label }}
 
-                        </div>
 
-                      </template>
 
-                      <div class="submenu" v-for="(item2,ind2) in item['group']" :key="ind2">
 
-                        <el-menu-item :index="ind2.toString()" @click="goto(item2.goto)">
 
-                          <template slot="title">
 
-                            <div class="subTitle subItem" :style="$route.path.indexOf(item2.goto)!=-1?'color:#40aaff':''">
 
-                              <i :class="item2.icon" style="margin-right: 15px;width: 15px;"></i>
 
-                              {{ item2.label }}
 
-                            </div>
 
-                          </template>
 
-                        </el-menu-item>
 
+  <el-container class="homePage">
 
+    <el-container class="homeBody">
 
+      <el-aside width="12%" class="aside core_dialogue">
 
+        <el-col :span="12">
 
+          <el-menu
 
+            class="el-menu-vertical-demo"
 
+            @open="handleOpen"
 
+            @close="handleClose"
 
+            :unique-opened="false"
 
+          >
 
+            <div class="submenu" v-for="(item, ind) in navList" :key="ind">
 
+              <el-submenu v-if="item['group'].length" :index="ind.toString()">
 
+                <template slot="title">
 
+                  <div
 
+                    class="subTitle"
 
+                    @click="goto(item.goto)"
 
+                    :style="
 
+                      $route.path.indexOf(item.goto) != -1
 
+                        ? 'color:#40aaff'
 
+                        : ''
 
+                    "
 
+                  >
 
+                    <i
 
+                      :class="item.icon"
 
+                      style="margin-right: 15px; width: 15px"
 
+                      :style="
 
+                        $route.path.indexOf(item.goto) != -1
 
+                          ? 'color:#40aaff'
 
+                          : ''
 
+                      "
 
+                    ></i>
 
+                    {{ item.label }}
 
+                  </div>
 
+                </template>
 
+                <div
 
+                  class="submenu"
 
+                  v-for="(item2, ind2) in item['group']"
 
+                  :key="ind2"
 
+                >
 
+                  <el-menu-item
 
+                    :index="ind2.toString()"
 
+                    @click="goto(item2.goto)"
 
+                  >
 
+                    <template slot="title">
 
+                      <div
 
+                        class="subTitle subItem"
 
+                        :style="
 
+                          $route.path.indexOf(item2.goto) != -1
 
+                            ? 'color:#40aaff'
 
+                            : ''
 
+                        "
 
+                      >
 
+                        <i
 
+                          :class="item2.icon"
 
+                          style="margin-right: 15px; width: 15px"
 
+                        ></i>
 
+                        {{ item2.label }}
 
                       </div>
 
                       </div>
 
-                    </el-submenu>
 
-                    <el-menu-item :index="ind.toString()" v-else-if="$store.state.userInfo.type==0 || !item['power']" @click="goto(item.goto)">
 
-                      <template slot="title">
 
-                        <div class="subTitle" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''">
 
-                          <i :class="item.icon" style="margin-right: 15px;width: 15px;" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''"></i>
 
-                          {{ item.label }}
 
-                        </div>
 
-                      </template>
 
-                    </el-menu-item>
 
+                    </template>
 
+                  </el-menu-item>
 
+                </div>
 
+              </el-submenu>
 
+              <el-menu-item
 
+                :index="ind.toString()"
 
+                v-else
 
+                @click="goto(item.goto)"
 
+              >
 
+                <template slot="title">
 
+                  <div
 
+                    class="subTitle"
 
+                    :style="
 
+                      $route.path.indexOf(item.goto) != -1
 
+                        ? 'color:#40aaff'
 
+                        : ''
 
+                    "
 
+                  >
 
+                    <i
 
+                      :class="item.icon"
 
+                      style="margin-right: 15px; width: 15px"
 
+                      :style="
 
+                        $route.path.indexOf(item.goto) != -1
 
+                          ? 'color:#40aaff'
 
+                          : ''
 
+                      "
 
+                    ></i>
 
+                    {{ item.label }}
 
                   </div>
 
                   </div>
 
-                </el-menu>
 
-              </el-col>
 
-        </el-aside>
 
-        <el-main class="main  core_dialogue">
 
-          <router-view></router-view>
 
-        </el-main>
 
-      </el-container>
 
+                </template>
 
+              </el-menu-item>
 
+            </div>
 
+          </el-menu>
 
+        </el-col>
 
+      </el-aside>
 
+      <el-main class="main core_dialogue">
 
+        <router-view></router-view>
 
+      </el-main>
 
     </el-container>
 
     </el-container>
 
+  </el-container>
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
-    export default {
 
-      data() {
 
-        return {
 
-          navList:[
 
-            {id:1,label:"项目立项管理",power:false,goto:"/projectApplication",icon:"iconfont icon-shuben",group:[
 
-              {label:"创客空间申请",power:false,goto:"/MakerSpaceApply"},
 
-              {label:"创客项目申请",power:false,goto:"/newStudentProjectApply"},
 
-            ]},
 
-            {id:2,label:"活动申请",power:false,icon:"el-icon-wind-power",goto:"/makerActvity",group:[
 
-                {label:"创客活动申请",power:false,goto:"/newMarkerActivity"},
 
-                // {label:"个人创客申请",power:false,goto:"/newNomMarkerActivity"},
 
-            ]},
 
-            {id:2,label:"事后汇总",power:false,goto:"/makerfund",icon:"iconfont icon-zijinguanli",group:[
 
-            {label:"创客资金申请",power:false,goto:"/newMarkerfundApply"},
 
+export default {
 
+  data() {
 
+    return {
 
+      navList: [
 
+        // {
 
+        //   id: 1,
 
+        //   label: "项目立项管理",
 
+        //   power: false,
 
+        //   goto: "/projectApplication",
 
+        //   icon: "iconfont icon-shuben",
 
+        //   group: [
 
+        //     { label: "创客空间申请", power: false, goto: "/MakerSpaceApply" },
 
+        //     {
 
+        //       label: "创客项目申请",
 
+        //       power: false,
 
+        //       goto: "/newStudentProjectApply",
 
+        //     },
 
+        //   ],
 
+        // },
 
+        // {
 
+        //   id: 2,
 
+        //   label: "活动申请",
 
+        //   power: false,
 
+        //   icon: "el-icon-wind-power",
 
+        //   goto: "/makerActvity",
 
+        //   group: [
 
+        //     { label: "创客活动申请", power: false, goto: "/newMarkerActivity" },
 
+        //   ],
 
+        // },
 
+        // {
 
+        //   id: 2,
 
+        //   label: "事后汇总",
 
+        //   power: false,
 
+        //   goto: "/makerfund",
 
+        //   icon: "iconfont icon-zijinguanli",
 
+        //   group: [
 
+        //     {
 
+        //       label: "创客资金申请",
 
+        //       power: false,
 
+        //       goto: "/newMarkerfundApply",
 
+        //     },
 
+        //   ],
 
+        // },
 
+        // {
 
+        //   id: 4,
 
+        //   label: "项目管理",
 
+        //   power: true,
 
+        //   goto: "/ProjectManagement",
 
+        //   icon: "el-icon-receiving",
 
+        //   group: [],
 
+        // },
 
+        // {
 
+        //   id: 5,
 
+        //   label: "项目结项",
 
+        //   power: true,
 
+        //   goto: "/projectSettlement",
 
+        //   icon: "iconfont icon-_yuanhuanchong",
 
+        //   group: [],
 
+        // },
 
+        // {
 
+        //   id: 7,
 
+        //   label: "成果展示",
 
+        //   power: true,
 
+        //   goto: "/resultsShow",
 
+        //   icon: "iconfont icon-xiangmuguanli2",
 
+        //   group: [],
 
+        // },
 
+        // {
 
+        //   id: 8,
 
+        //   label: "创业公司登记",
 
+        //   power: true,
 
+        //   goto: "/firm",
 
+        //   icon: "iconfont icon-zuzhijiegou",
 
+        //   group: [],
 
+        // },
 
+        // {
 
+        //   id: 9,
 
+        //   label: "消息通知",
 
+        //   power: false,
 
+        //   goto: "/messageNotification",
 
+        //   icon: "iconfont icon-xiaoxitongzhi3",
 
+        //   group: [],
 
+        // },
 
+        // {
 
+        //   id: 10,
 
+        //   label: "数据监测",
 
+        //   power: true,
 
+        //   goto: "/echarts",
 
+        //   icon: "iconfont icon-qushi",
 
+        //   group: [],
 
+        // },
 
+        // {
 
+        //   id: 11,
 
+        //   label: "待办公文",
 
+        //   power: true,
 
+        //   goto: "/commission",
 
+        //   icon: "dbgw",
 
+        //   group: [],
 
+        // },
 
+        // {
 
+        //   id: 11,
 
+        //   label: "系统管理",
 
+        //   power: true,
 
+        //   goto: "/system",
 
+        //   icon: "el-icon-setting",
 
+        //   group: [],
 
+        // },
 
+      ],
 
+    };
 
+  },
 
+  methods: {
 
+    goto(url) {
 
+      // console.log(this.$route.path);
 
+      this.$router.push(url);
 
+      // console.log('1111')
 
+    },
 
+    homeExit() {
 
+      // console.log(this.$route.path)
 
+      this.$router.push("/login");
 
+    },
 
+    handleOpen(key, keyPath) {
 
+      console.log(key, keyPath);
 
+    },
 
+    handleClose(key, keyPath) {
 
+      console.log(key, keyPath);
 
+    },
 
+    isLogin() {
 
+      this.setNavList();
 
+      this.$forceUpdate();
 
+      if (
 
+        this.$store.state.userInfo.type == 1 ||
 
+        this.$store.state.userInfo.type == 2 ||
 
+        this.$store.state.userInfo.type == 0
 
+      ) {
 
+        this.$router.push("/projectApplication");
 
+      } else if (
 
+        this.$store.state.userInfo.type == 3 ||
 
+        this.$store.state.userInfo.type == 4
 
+      ) {
 
+        this.$router.push("/resultsShow");
 
+      } else if (
 
+        this.$store.state.userInfo.type == 5 ||
 
+        this.$store.state.userInfo.type == 6
 
+      ) {
 
+        this.$router.push("/messageNotification");
 
+      }
 
+    },
 
+    setNavList() {
 
+      if (
 
+        this.$store.state.userInfo.type == 1 ||
 
+        this.$store.state.userInfo.type == 2
 
+      ) {
 
+        this.navList.push(
 
+          {
 
+            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:"个人创客申请",power:false,goto:"/newNomMarkerActivity"},
 
+            ],
 
+          },
 
+          {
 
+            id: 2,
 
+            label: "事后汇总",
 
+            goto: "/makerfund",
 
+            icon: "iconfont icon-zijinguanli",
 
+            group: [
 
+              {
 
+                label: "创客资金申请",
 
+                goto: "/newMarkerfundApply",
 
+              },
 
               // {label:"创客活动资金申请",power:false,goto:"/newMarkerfundApply"},
 
               // {label:"创客活动资金申请",power:false,goto:"/newMarkerfundApply"},
 
               // {label:"个人创客资金申请",power:false,goto:"/newNomMarkerFundApply"}
 
               // {label:"个人创客资金申请",power:false,goto:"/newNomMarkerFundApply"}
 
-            ]},
 
-            // {id:3,label:"资金使用管理",goto:"/makerfund",icon:"iconfont icon-zijinguanli",group:[]},
 
-            {id:4,label:"项目管理",power:true,goto:"/ProjectManagement",icon:"el-icon-receiving",group:[]},
 
-            {id:5,label:"项目结项",power:true,goto:"/projectSettlement",icon:"iconfont icon-_yuanhuanchong",group:[]},
 
-            // {id:6,label:"学分登记",goto:"/credit",icon:"iconfont icon-yonghu"},
 
-            {id:7,label:"成果展示",power:true,goto:"/resultsShow",icon:"iconfont icon-xiangmuguanli2",group:[]},
 
-            {id:8,label:"创业公司登记",power:true,goto:"/firm",icon:"iconfont icon-zuzhijiegou",group:[]},
 
-            {id:9,label:"消息通知",power:false,goto:"/messageNotification",icon:"iconfont icon-xiaoxitongzhi3",group:[]},
 
-            {id:10,label:"数据监测",power:true,goto:"/echarts",icon:"iconfont icon-qushi",group:[]},
 
-            {id:11,label:"代办公文",power:true,goto:"/commission",icon:"dbgw",group:[]},
 
-            {id:11,label:"系统管理",power:true,goto:"/system",icon:"el-icon-setting",group:[]},
 
-          ]
 
-        }
 
-      },
 
-      methods:{
 
-        goto(url){
 
-          // console.log(this.$route.path);
 
-          this.$router.push(url)
 
-          // console.log('1111')
 
-        },
 
-        homeExit(){
 
-        // console.log(this.$route.path)
 
-          this.$router.push('/login')
 
-        },
 
-        handleOpen(key, keyPath) {
 
-          console.log(key, keyPath);
 
-        },
 
-        handleClose(key, keyPath) {
 
-          console.log(key, keyPath);
 
-        }
 
-      },
 
-      mounted(){
 
+            ],
 
+          }
 
+        );
 
+      } else if (this.$store.state.userInfo.type == 0) {
 
+        this.navList.push(
 
+          {
 
+            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:"个人创客申请",power:false,goto:"/newNomMarkerActivity"},
 
+            ],
 
+          },
 
+          {
 
+            id: 2,
 
+            label: "事后汇总",
 
+            goto: "/makerfund",
 
+            icon: "iconfont icon-zijinguanli",
 
+            group: [
 
+              {
 
+                label: "创客资金申请",
 
+                goto: "/newMarkerfundApply",
 
+              },
 
+              // {label:"创客活动资金申请",power:false,goto:"/newMarkerfundApply"},
 
+              // {label:"个人创客资金申请",power:false,goto:"/newNomMarkerFundApply"}
 
+            ],
 
+          },
 
+          // {
 
+          //   id: 3,
 
+          //   label: "资金使用管理",
 
+          //   goto: "/makerfund",
 
+          //   icon: "iconfont icon-zijinguanli",
 
+          //   group: [],
 
+          // },
 
+          {
 
+            id: 4,
 
+            label: "项目管理",
 
+            goto: "/ProjectManagement",
 
+            icon: "el-icon-receiving",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 5,
 
+            label: "项目结项",
 
+            goto: "/projectSettlement",
 
+            icon: "iconfont icon-_yuanhuanchong",
 
+            group: [],
 
+          },
 
+          // {id:6,label:"学分登记",goto:"/credit",icon:"iconfont icon-yonghu"},
 
+          {
 
+            id: 7,
 
+            label: "成果展示",
 
+            goto: "/resultsShow",
 
+            icon: "iconfont icon-xiangmuguanli2",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 8,
 
+            label: "创业公司登记",
 
+            goto: "/firm",
 
+            icon: "iconfont icon-zuzhijiegou",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 9,
 
+            label: "消息通知",
 
+            goto: "/messageNotification",
 
+            icon: "iconfont icon-xiaoxitongzhi3",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 10,
 
+            label: "数据监测",
 
+            goto: "/echarts",
 
+            icon: "iconfont icon-qushi",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 11,
 
+            label: "待办公文",
 
+            goto: "/commission",
 
+            icon: "dbgw",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 11,
 
+            label: "系统管理",
 
+            goto: "/system",
 
+            icon: "el-icon-setting",
 
+            group: [],
 
+          }
 
+        );
 
+      } else if (
 
+        this.$store.state.userInfo.type == 3 ||
 
+        this.$store.state.userInfo.type == 4
 
+      ) {
 
+        this.navList.push(
 
+          {
 
+            id: 7,
 
+            label: "成果展示",
 
+            goto: "/resultsShow",
 
+            icon: "iconfont icon-xiangmuguanli2",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 9,
 
+            label: "消息通知",
 
+            goto: "/messageNotification",
 
+            icon: "iconfont icon-xiaoxitongzhi3",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 10,
 
+            label: "数据监测",
 
+            goto: "/echarts",
 
+            icon: "iconfont icon-qushi",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 11,
 
+            label: "待办公文",
 
+            goto: "/commission",
 
+            icon: "dbgw",
 
+            group: [],
 
+          }
 
+        );
 
+      } else if (
 
+        this.$store.state.userInfo.type == 5 ||
 
+        this.$store.state.userInfo.type == 6
 
+      ) {
 
+        this.navList.push(
 
+          {
 
+            id: 9,
 
+            label: "消息通知",
 
+            goto: "/messageNotification",
 
+            icon: "iconfont icon-xiaoxitongzhi3",
 
+            group: [],
 
+          },
 
+          {
 
+            id: 11,
 
+            label: "待办公文",
 
+            goto: "/commission",
 
+            icon: "dbgw",
 
+            group: [],
 
+          }
 
+        );
 
       }
 
       }
 
-    }
 
+    },
 
+  },
 
+  mounted() {},
 
+  watch: {},
 
+  created() {
 
+    this.isLogin();
 
+  },
 
+};
 
 </script>
 
 </script>
 
 
 
 <style lang="less" scoped>
 
 <style lang="less" scoped>
 
-
 
-
 
-
 
-
 
-.homePage{
 
-        // 减去公共部分使页面铺满浏览器
 
-        height:  calc(100% - 70px);
 
+.homePage {
 
+  // 减去公共部分使页面铺满浏览器
 
+  height: calc(100% - 70px);
 
+  width: 100%;
 
+  .homeBody {
 
+    margin: 20px 20px 30px 20px;
 
+    .aside {
 
+      background-color: #fff;
 
+      color: #909399;
 
+      height: 100%;
 
+      border-radius: 5px;
 
+      display: flex;
 
+      align-items: center;
 
+      flex-direction: column;
 
+      min-width: 220px;
 
+      .btns {
 
+        display: flex;
 
         width: 100%;
 
         width: 100%;
 
-      .homeBody{
 
-          margin: 20px 20px 30px 20px;
 
-          .aside{
 
-              background-color: #fff;
 
-              color: #909399;
 
-              height: 100%;
 
-              border-radius: 5px;
 
-              display: flex;
 
-              align-items: center;
 
-              flex-direction: column;
 
-              min-width: 220px;
 
-              .btns{
 
-                display: flex;
 
-                width: 100%;
 
-                height: 70px;
 
-                align-items: center;  
-                font-size: 16px;
 
-                cursor: pointer;
 
-                box-sizing: border-box;
 
-                padding-left: 20%;
 
-                &:hover{
 
-                  background-color: #cccccc;
 
-                }
 
+        height: 70px;
 
+        align-items: center;
 
+        font-size: 16px;
 
+        cursor: pointer;
 
+        box-sizing: border-box;
 
+        padding-left: 20%;
 
+        &:hover {
 
+          background-color: #cccccc;
 
+        }
 
 
 
-                span{
 
-                  align-items: center;
 
-                  width: 80%;
 
-                  white-space: nowrap;
 
-                  overflow: hidden;
 
-                  text-overflow:ellipsis;
 
-                  i{
 
-                    position: relative;
 
-                    top: 1px;
 
-                    font-size: 17px;
 
-                    margin-right: 3px;
 
-                  }
 
-                }
 
-              }
 
-            }
 
-            .main {
 
-              background-color: #fff;
 
-              color: #333;
 
-              // text-align: center;
 
-              // overflow: hidden ;
 
-              margin-left: 20px;
 
-              box-sizing: border-box;
 
-              padding: 20px 30px;
 
-              border-radius: 5px;
 
-            }
 
+        span {
 
+          align-items: center;
 
+          width: 80%;
 
+          white-space: nowrap;
 
+          overflow: hidden;
 
+          text-overflow: ellipsis;
 
+          i {
 
+            position: relative;
 
+            top: 1px;
 
+            font-size: 17px;
 
+            margin-right: 3px;
 
+          }
 
         }
 
         }
 
-      .el-menu{
 
-        border-right:none;
 
-      }
 
-      .el-col-12{
 
-        width: 100%;
 
       }
 
       }
 
     }
 
     }
 
-.subTitle{
 
+    .main {
 
+      background-color: #fff;
 
+      color: #333;
 
+      // text-align: center;
 
+      // overflow: hidden ;
 
+      margin-left: 20px;
 
+      box-sizing: border-box;
 
+      padding: 20px 30px;
 
+      border-radius: 5px;
 
+    }
 
+  }
 
+  .el-menu {
 
+    border-right: none;
 
+  }
 
+  .el-col-12 {
 
+    width: 100%;
 
+  }
 
+}
 
+.subTitle {
 
   width: 100%;
 
   width: 100%;
 
   height: 100%;
 
   height: 100%;
 
   display: flex;
 
   display: flex;
 
@@ -175,21 +538,18 @@
 
   padding-left: 20%;
 
   padding-left: 20%;
 
   // background-color: red;
 
   // background-color: red;
 
 }
 
 }
 
-.subItem{
 
+.subItem {
 
   padding-left: 13%;
 
   padding-left: 13%;
 
 }
 
 }
 
-:deep(.el-menu-item.is-active){
 
+:deep(.el-menu-item.is-active) {
 
   color: #333 !important;
 
   color: #333 !important;
 
-  i{
 
+  i {
 
     color: #909399;
 
     color: #909399;
 
   }
 
   }
 
 }
 
 }
 
 
 
-.dbgw{
 
-  background:url("../assets/img/dbgw.png");
 
+.dbgw {
 
+  background: url("../assets/img/dbgw.png");
 
   height: 15px;
 
   height: 15px;
 
 }
 
 }
 
-
 
-
 
-
 
 </style>
 
 </style>

+ 2 - 2
src/views/projectApply/components/MakerSpaceWord.vue
Целия файл 

@@ -499,7 +499,7 @@
 
         <div class="fundTable">
 
         <div class="fundTable">
 
           <div class="fundTotal">
 
           <div class="fundTotal">
 
             <div class="fundLabel">总经费</div>
 
             <div class="fundLabel">总经费</div>
 
-            <div class="fundValue">{{ wordData["fund"]["totle"] }}元</div>
 
+            <div class="fundValue">{{ reversedMessage == 0 ? "" : reversedMessage }}元</div>
 
           </div>
 
           </div>
 
           <div class="fundHeader">
 
           <div class="fundHeader">
 
             <div class="HeaderLabel">支出类别</div>
 
             <div class="HeaderLabel">支出类别</div>
 
@@ -698,7 +698,7 @@
 
   
   
 <script>
 
 <script>
 
 export default {
 
 export default {
 
-  props: ["wordData"],
 
+  props: ["wordData", "reversedMessage"],
 
   data() {
 
   data() {
 
     return {
 
     return {
 
       DepartmentData: [],
 
       DepartmentData: [],

+ 7 - 7
src/views/projectManage/components/Closingstatement.vue
Целия файл 

@@ -189,7 +189,7 @@
 
             <td colspan="7">
 
             <td colspan="7">
 
                 <p>一、成果（名称、数量及形式,开发产品及取得的专利等）</p>
 
                 <p>一、成果（名称、数量及形式,开发产品及取得的专利等）</p>
 
                 <p>专利证书获得（提供专利申请或成果证书附件）：</p>
 
                 <p>专利证书获得（提供专利申请或成果证书附件）：</p>
 
-                <beUpload style="position: absolute;left:450px;top:0px;"  @getFile="getFile" :navName="'上传文件'" :accept="accept" :progress="progress7"></beUpload>
 
+                <beUpload style="position: absolute;right: 10px;top: 5px;"  @getFile="getFile" :navName="'上传文件'" :accept="accept" :progress="progress7"></beUpload>
 
                 <el-progress v-show="progress7.show" :percentage="progress7.value" :format="ProgressFormatresultAccessory"></el-progress>
 
                 <el-progress v-show="progress7.show" :percentage="progress7.value" :format="ProgressFormatresultAccessory"></el-progress>
 
 
 
                 <div class="bigBlock">
 
                 <div class="bigBlock">
 
@@ -213,7 +213,7 @@
 
         <tr>
 
         <tr>
 
             <td colspan="7" style="height: 200px;">
 
             <td colspan="7" style="height: 200px;">
 
                 <p>企业应用实证（提供企业证明或合作协议证明等附件）：</p>
 
                 <p>企业应用实证（提供企业证明或合作协议证明等附件）：</p>
 
-                <beUpload style="position: absolute;left:450px;top:0px;"  @getFile="getfirmAccessory" :navName="'上传文件'" :accept="accept" :progress="progress1"></beUpload>
 
+                <beUpload style="position: absolute;right: 10px;top: 5px;"  @getFile="getfirmAccessory" :navName="'上传文件'" :accept="accept" :progress="progress1"></beUpload>
 
                 <el-progress v-show="progress1.show" :percentage="progress1.value" :format="ProgressFormatfirmAccessory"></el-progress>
 
                 <el-progress v-show="progress1.show" :percentage="progress1.value" :format="ProgressFormatfirmAccessory"></el-progress>
 
 
 
                 <div class="bigBlock">
 
                 <div class="bigBlock">
 
@@ -236,7 +236,7 @@
 
         <tr>
 
         <tr>
 
             <td colspan="7" style="height: 200px;">
 
             <td colspan="7" style="height: 200px;">
 
                 <p>双创竞赛成绩（提供参加师生名单、比赛取得的成绩等附件）：</p>
 
                 <p>双创竞赛成绩（提供参加师生名单、比赛取得的成绩等附件）：</p>
 
-                <beUpload style="position: absolute;left:450px;top:0px;"  @getFile="getcompetitionAccessory" :navName="'上传文件'" :accept="accept" :progress="progress2"></beUpload>
 
+                <beUpload style="position: absolute;right: 10px;top: 5px;"  @getFile="getcompetitionAccessory" :navName="'上传文件'" :accept="accept" :progress="progress2"></beUpload>
 
                 <el-progress v-show="progress2.show" :percentage="progress2.value" :format="ProgressFormatcompetitionAccessory"></el-progress>
 
                 <el-progress v-show="progress2.show" :percentage="progress2.value" :format="ProgressFormatcompetitionAccessory"></el-progress>
 
 
 
                 <div class="bigBlock">
 
                 <div class="bigBlock">
 
@@ -254,7 +254,7 @@
 
         <tr>
 
         <tr>
 
             <td colspan="7" style="height: 200px;">
 
             <td colspan="7" style="height: 200px;">
 
                 <p>参展或交流活动（提供参加师生名单、活动方案及照片等附件）：</p>
 
                 <p>参展或交流活动（提供参加师生名单、活动方案及照片等附件）：</p>
 
-                <beUpload style="position: absolute;left:450px;top:0px;"  @getFile="getexchangeAccessory" :navName="'上传文件'" :accept="accept" :progress="progress3"></beUpload>
 
+                <beUpload style="position: absolute;right: 10px;top: 5px;"  @getFile="getexchangeAccessory" :navName="'上传文件'" :accept="accept" :progress="progress3"></beUpload>
 
                 <el-progress v-show="progress3.show" :percentage="progress3.value" :format="ProgressFormatexchangeAccessory"></el-progress>
 
                 <el-progress v-show="progress3.show" :percentage="progress3.value" :format="ProgressFormatexchangeAccessory"></el-progress>
 
 
 
                 <div class="bigBlock">
 
                 <div class="bigBlock">
 
@@ -271,7 +271,7 @@
 
         <tr>
 
         <tr>
 
             <td colspan="7" style="height: 200px;">
 
             <td colspan="7" style="height: 200px;">
 
                 <p>创业公司转化（提供公司注册资料、营业执照等附件）：</p>
 
                 <p>创业公司转化（提供公司注册资料、营业执照等附件）：</p>
 
-                <beUpload style="position: absolute;left:450px;top:0px;"  @getFile="getconversionAccessory" :navName="'上传文件'" :accept="accept" :progress="progress4"></beUpload>
 
+                <beUpload style="position: absolute;right: 10px;top: 5px;"  @getFile="getconversionAccessory" :navName="'上传文件'" :accept="accept" :progress="progress4"></beUpload>
 
                 <el-progress v-show="progress4.show" :percentage="progress4.value" :format="ProgressFormatconversionAccessory"></el-progress>
 
                 <el-progress v-show="progress4.show" :percentage="progress4.value" :format="ProgressFormatconversionAccessory"></el-progress>
 
 
 
                 <div class="bigBlock">
 
                 <div class="bigBlock">
 
@@ -288,7 +288,7 @@
 
         <tr>
 
         <tr>
 
             <td colspan="7" style="height: 200px;">
 
             <td colspan="7" style="height: 200px;">
 
                 <p>二、创客人才培养（提供成果、数量、学生名单等附件）</p>
 
                 <p>二、创客人才培养（提供成果、数量、学生名单等附件）</p>
 
-                <beUpload style="position: absolute;left:450px;top:0px;"  @getFile="gettalentsAccessory" :navName="'上传文件'" :accept="accept" :progress="progress5"></beUpload>
 
+                <beUpload style="position: absolute;right: 10px;top: 5px;"  @getFile="gettalentsAccessory" :navName="'上传文件'" :accept="accept" :progress="progress5"></beUpload>
 
                 <el-progress v-show="progress5.show" :percentage="progress5.value" :format="ProgressFormattalentsAccessory"></el-progress>
 
                 <el-progress v-show="progress5.show" :percentage="progress5.value" :format="ProgressFormattalentsAccessory"></el-progress>
 
 
 
                 <div class="bigBlock">
 
                 <div class="bigBlock">
 
@@ -340,7 +340,7 @@
 
             <td>附件</td>
 
             <td>附件</td>
 
             <td colspan="7" style="height: 200px;">
 
             <td colspan="7" style="height: 200px;">
 
                 <p>附：课题研究报告、用户评价意见或专家鉴定意见等</p>
 
                 <p>附：课题研究报告、用户评价意见或专家鉴定意见等</p>
 
-                <beUpload style="position: absolute;left:450px;top:0px;"  @getFile="gettaskAccessory" :navName="'上传文件'" :accept="accept" :progress="progress6"></beUpload>
 
+                <beUpload style="position: absolute;right: 10px;top: 5px;"  @getFile="gettaskAccessory" :navName="'上传文件'" :accept="accept" :progress="progress6"></beUpload>
 
                 <el-progress v-show="progress6.show" :percentage="progress6.value" :format="ProgressFormattaskAccessory"></el-progress>
 
                 <el-progress v-show="progress6.show" :percentage="progress6.value" :format="ProgressFormattaskAccessory"></el-progress>
 
 
 
                 <div class="bigBlock">
 
                 <div class="bigBlock">

+ 1 - 1
src/views/projectManage/components/ProjectManagementEndProjectFile.vue
Целия файл 

@@ -29,7 +29,7 @@
 
 
 
         <el-table-column
 
         <el-table-column
 
           prop="fileName"
 
           prop="fileName"
 
-          label="项目中期报告"
 
+          label="项目结题附件"
 
           align="center"
 
           align="center"
 
          >
 
          >
 
         </el-table-column>
 
         </el-table-column>

+ 111 - 15
src/views/projectSettlement/components/projectSettlementBook.vue
Целия файл 

@@ -308,6 +308,7 @@
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
                 .resultAccessory"
 
                 .resultAccessory"
 
               :key="index + 'a'"
 
               :key="index + 'a'"
 
+              class="titItem"
 
             >
 
             >
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="delete" @click="deleteFile(index)">×</div> -->
 
               <!-- <div class="delete" @click="deleteFile(index)">×</div> -->
 
@@ -316,6 +317,17 @@
 
               <div class="titName" @click="lookFile(item.url)">
 
               <div class="titName" @click="lookFile(item.url)">
 
                 {{ index + 1 + "、" + item.fileName }}
 
                 {{ index + 1 + "、" + item.fileName }}
 
               </div>
 
               </div>
 
+              <div
 
+                class="titDelete"
 
+                @click="
 
+                  deleteFile(
 
+                    myArrayProp[0]['ClosingstatementData'].resultAccessory,
 
+                    index
 
+                  )
 
+                "
 
+              >
 
+                删除
 
+              </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
           <!-- <el-input
 
           <!-- <el-input
 
@@ -327,7 +339,7 @@
 
         </td>
 
         </td>
 
       </tr>
 
       </tr>
 
       <tr>
 
       <tr>
 
-        <td colspan="7" style="height: 200px">
 
+        <td colspan="7">
 
           <p>企业应用实证（提供企业证明或合作协议证明等附件）：</p>
 
           <p>企业应用实证（提供企业证明或合作协议证明等附件）：</p>
 
           <beUpload
 
           <beUpload
 
             style="position: absolute; right: 10px; top: 5px"
 
             style="position: absolute; right: 10px; top: 5px"
 
@@ -347,6 +359,7 @@
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
                 .firmAccessory"
 
                 .firmAccessory"
 
               :key="index + 'a'"
 
               :key="index + 'a'"
 
+              class="titItem"
 
             >
 
             >
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="delete" @click="deletefirmAccessory(index)">×</div> -->
 
               <!-- <div class="delete" @click="deletefirmAccessory(index)">×</div> -->
 
@@ -363,6 +376,17 @@
 
               <div class="titName" @click="lookFile(item.url)">
 
               <div class="titName" @click="lookFile(item.url)">
 
                 {{ index + 1 + "、" + item.fileName }}
 
                 {{ index + 1 + "、" + item.fileName }}
 
               </div>
 
               </div>
 
+              <div
 
+                class="titDelete"
 
+                @click="
 
+                  deleteFile(
 
+                    myArrayProp[0]['ClosingstatementData'].firmAccessory,
 
+                    index
 
+                  )
 
+                "
 
+              >
 
+                删除
 
+              </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
           <!-- <el-input
 
           <!-- <el-input
 
@@ -374,7 +398,7 @@
 
         </td>
 
         </td>
 
       </tr>
 
       </tr>
 
       <tr>
 
       <tr>
 
-        <td colspan="7" style="height: 200px">
 
+        <td colspan="7">
 
           <p>双创竞赛成绩（提供参加师生名单、比赛取得的成绩等附件）：</p>
 
           <p>双创竞赛成绩（提供参加师生名单、比赛取得的成绩等附件）：</p>
 
           <beUpload
 
           <beUpload
 
             style="position: absolute; right: 10px; top: 5px"
 
             style="position: absolute; right: 10px; top: 5px"
 
@@ -394,6 +418,7 @@
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
                 .competitionAccessory"
 
                 .competitionAccessory"
 
               :key="index + 'a'"
 
               :key="index + 'a'"
 
+              class="titItem"
 
             >
 
             >
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="delete" @click="deletecompetitionAccessory(index)">×</div> -->
 
               <!-- <div class="delete" @click="deletecompetitionAccessory(index)">×</div> -->
 
@@ -410,12 +435,23 @@
 
               <div class="titName" @click="lookFile(item.url)">
 
               <div class="titName" @click="lookFile(item.url)">
 
                 {{ index + 1 + "、" + item.fileName }}
 
                 {{ index + 1 + "、" + item.fileName }}
 
               </div>
 
               </div>
 
+              <div
 
+                class="titDelete"
 
+                @click="
 
+                  deleteFile(
 
+                    myArrayProp[0]['ClosingstatementData'].competitionAccessory,
 
+                    index
 
+                  )
 
+                "
 
+              >
 
+                删除
 
+              </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
         </td>
 
         </td>
 
       </tr>
 
       </tr>
 
       <tr>
 
       <tr>
 
-        <td colspan="7" style="height: 200px">
 
+        <td colspan="7">
 
           <p>参展或交流活动（提供参加师生名单、活动方案及照片等附件）：</p>
 
           <p>参展或交流活动（提供参加师生名单、活动方案及照片等附件）：</p>
 
           <beUpload
 
           <beUpload
 
             style="position: absolute; right: 10px; top: 5px"
 
             style="position: absolute; right: 10px; top: 5px"
 
@@ -435,6 +471,7 @@
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
                 .exchangeAccessory"
 
                 .exchangeAccessory"
 
               :key="index + 'a'"
 
               :key="index + 'a'"
 
+              class="titItem"
 
             >
 
             >
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="delete" @click="deleteexchangeAccessory(index)">×</div> -->
 
               <!-- <div class="delete" @click="deleteexchangeAccessory(index)">×</div> -->
 
@@ -451,12 +488,23 @@
 
               <div class="titName" @click="lookFile(item.url)">
 
               <div class="titName" @click="lookFile(item.url)">
 
                 {{ index + 1 + "、" + item.fileName }}
 
                 {{ index + 1 + "、" + item.fileName }}
 
               </div>
 
               </div>
 
+              <div
 
+                class="titDelete"
 
+                @click="
 
+                  deleteFile(
 
+                    myArrayProp[0]['ClosingstatementData'].exchangeAccessory,
 
+                    index
 
+                  )
 
+                "
 
+              >
 
+                删除
 
+              </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
         </td>
 
         </td>
 
       </tr>
 
       </tr>
 
       <tr>
 
       <tr>
 
-        <td colspan="7" style="height: 200px">
 
+        <td colspan="7">
 
           <p>创业公司转化（提供公司注册资料、营业执照等附件）：</p>
 
           <p>创业公司转化（提供公司注册资料、营业执照等附件）：</p>
 
           <beUpload
 
           <beUpload
 
             style="position: absolute; right: 10px; top: 5px"
 
             style="position: absolute; right: 10px; top: 5px"
 
@@ -476,6 +524,7 @@
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
                 .conversionAccessory"
 
                 .conversionAccessory"
 
               :key="index + 'a'"
 
               :key="index + 'a'"
 
+              class="titItem"
 
             >
 
             >
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="delete" @click="deleteconversionAccessory(index)">×</div> -->
 
               <!-- <div class="delete" @click="deleteconversionAccessory(index)">×</div> -->
 
@@ -492,12 +541,23 @@
 
               <div class="titName" @click="lookFile(item.url)">
 
               <div class="titName" @click="lookFile(item.url)">
 
                 {{ index + 1 + "、" + item.fileName }}
 
                 {{ index + 1 + "、" + item.fileName }}
 
               </div>
 
               </div>
 
+              <div
 
+                class="titDelete"
 
+                @click="
 
+                  deleteFile(
 
+                    myArrayProp[0]['ClosingstatementData'].conversionAccessory,
 
+                    index
 
+                  )
 
+                "
 
+              >
 
+                删除
 
+              </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
         </td>
 
         </td>
 
       </tr>
 
       </tr>
 
       <tr>
 
       <tr>
 
-        <td colspan="7" style="height: 200px">
 
+        <td colspan="7">
 
           <p>二、创客人才培养（提供成果、数量、学生名单等附件）</p>
 
           <p>二、创客人才培养（提供成果、数量、学生名单等附件）</p>
 
           <beUpload
 
           <beUpload
 
             style="position: absolute; right: 10px; top: 5px"
 
             style="position: absolute; right: 10px; top: 5px"
 
@@ -517,6 +577,7 @@
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
                 .talentsAccessory"
 
                 .talentsAccessory"
 
               :key="index + 'a'"
 
               :key="index + 'a'"
 
+              class="titItem"
 
             >
 
             >
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="delete" @click="deletetalentsAccessory(index)">×</div> -->
 
               <!-- <div class="delete" @click="deletetalentsAccessory(index)">×</div> -->
 
@@ -533,6 +594,17 @@
 
               <div class="titName" @click="lookFile(item.url)">
 
               <div class="titName" @click="lookFile(item.url)">
 
                 {{ index + 1 + "、" + item.fileName }}
 
                 {{ index + 1 + "、" + item.fileName }}
 
               </div>
 
               </div>
 
+              <div
 
+                class="titDelete"
 
+                @click="
 
+                  deleteFile(
 
+                    myArrayProp[0]['ClosingstatementData'].talentsAccessory,
 
+                    index
 
+                  )
 
+                "
 
+              >
 
+                删除
 
+              </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
         </td>
 
         </td>
 
@@ -576,7 +648,7 @@
 
 
 
       <tr>
 
       <tr>
 
         <td>附件</td>
 
         <td>附件</td>
 
-        <td colspan="7" style="height: 200px">
 
+        <td colspan="7">
 
           <p>附：课题研究报告、用户评价意见或专家鉴定意见等</p>
 
           <p>附：课题研究报告、用户评价意见或专家鉴定意见等</p>
 
           <beUpload
 
           <beUpload
 
             style="position: absolute; right: 10px; top: 5px"
 
             style="position: absolute; right: 10px; top: 5px"
 
@@ -596,6 +668,7 @@
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
               v-for="(item, index) in myArrayProp[0]['ClosingstatementData']
 
                 .taskAccessory"
 
                 .taskAccessory"
 
               :key="index + 'a'"
 
               :key="index + 'a'"
 
+              class="titItem"
 
             >
 
             >
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="masking-out"> -->
 
               <!-- <div class="delete" @click="deletetaskAccessory(index)">×</div> -->
 
               <!-- <div class="delete" @click="deletetaskAccessory(index)">×</div> -->
 
@@ -612,6 +685,17 @@
 
               <div class="titName" @click="lookFile(item.url)">
 
               <div class="titName" @click="lookFile(item.url)">
 
                 {{ index + 1 + "、" + item.fileName }}
 
                 {{ index + 1 + "、" + item.fileName }}
 
               </div>
 
               </div>
 
+              <div
 
+                class="titDelete"
 
+                @click="
 
+                  deleteFile(
 
+                    myArrayProp[0]['ClosingstatementData'].taskAccessory,
 
+                    index
 
+                  )
 
+                "
 
+              >
 
+                删除
 
+              </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
         </td>
 
         </td>
 
@@ -938,12 +1022,8 @@ export default {
 
       this.progress7.show = false;
 
       this.progress7.show = false;
 
       this.myArrayProp[0]["ClosingstatementData"].resultAccessory.push(val);
 
       this.myArrayProp[0]["ClosingstatementData"].resultAccessory.push(val);
 
     },
 
     },
 
-    deleteFile(val) {
 
-      console.log(val);
 
-      this.myArrayProp[0]["ClosingstatementData"].resultAccessory.splice(
 
-        val,
 
-        1
 
-      );
 
+    deleteFile(w, i) {
 
+      w.splice(i, 1);
 
     },
 
     },
 
     getfirmAccessory(val) {
 
     getfirmAccessory(val) {
 
       //上传企业应用实证
 
       //上传企业应用实证
 
@@ -1169,6 +1249,9 @@ table {
 
     .bigBlock {
 
     .bigBlock {
 
       width: 100%;
 
       width: 100%;
 
       display: flex;
 
       display: flex;
 
+      flex-direction: column;
 
+      flex-wrap: wrap;
 
+      align-items: flex-start;
 
       .fileBlock {
 
       .fileBlock {
 
         width: 100px;
 
         width: 100px;
 
         height: 100px;
 
         height: 100px;
 
@@ -1181,10 +1264,23 @@ table {
 
           bottom: -90px;
 
           bottom: -90px;
 
         }
 
         }
 
       }
 
       }
 
-      .titName {
 
-        margin: 10px 10px 10px 0;
 
-        cursor: pointer;
 
+      .titItem{
 
+        display: flex;
 
+        flex-direction: row;
 
+        flex-wrap: nowrap;
 
+        align-items: center;
 
+        .titName {
 
+          margin: 10px 10px 10px 0;
 
+          cursor: pointer;
 
+        }
 
+        .titDelete{
 
+          cursor: pointer;
 
+          font-size: 14px;
 
+          color: #939393;
 
+          margin: 10px 10px 10px 0;
 
+        }
 
       }
 
       }
 
+      
       .masking-out {
 
       .masking-out {
 
         width: 100px;
 
         width: 100px;
 
         height: 100px;
 
         height: 100px;

+ 1 - 1
src/views/projectSettlement/components/projectSettlementDetailConclusion.vue
Целия файл 

@@ -28,7 +28,7 @@
 
 
 
         <el-table-column
 
         <el-table-column
 
           prop="fileName"
 
           prop="fileName"
 
-          label="项目中期报告"
 
+          label="项目结题附件"
 
           align="center"
 
           align="center"
 
          >
 
          >
 
         </el-table-column>
 
         </el-table-column>

Някои файлове не бяха показани, защото твърде много файлове са промени