Domovská stránka Prehľadávať Pomoc
Prihlásiť sa
CocoRoboLabs
/
ssti-CollegeManage
3
0
Fork 0
Súbory Issues 0 Pull requesty 0 Wiki
Prechádzať zdrojové kódy

修改流程问题和大数据并且build打包

zengyicheng 1 rok pred
rodič
d904334eb0
commit
abfda407b5
77 zmenil súbory, kde vykonal 827 pridanie a 746 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 0 0
      dist/css/164.5c519e01.css
  2. 0 0
      dist/css/168.a0ad4f5d.css
  3. 0 0
      dist/css/18.2ec274f4.css
  4. 0 0
      dist/css/219.726a72e4.css
  5. 0 0
      dist/css/37.72a54e50.css
  6. 0 0
      dist/css/688.04d941fa.css
  7. 0 0
      dist/css/70.83369f8a.css
  8. 0 0
      dist/css/720.8057289a.css
  9. 0 0
      dist/css/78.42a0e45c.css
  10. 0 0
      dist/css/791.4f034e44.css
  11. 0 0
      dist/css/837.5f070657.css
  12. 0 0
      dist/css/app.878f2d55.css
  13. 1 1
      dist/index.html
  14. 0 0
      dist/js/164.5b39d3ff.js
  15. 0 0
      dist/js/164.5b39d3ff.js.map
  16. 0 0
      dist/js/164.db379a83.js.map
  17. 0 0
      dist/js/168.1de1b808.js
  18. 0 0
      dist/js/168.1de1b808.js.map
  19. 0 0
      dist/js/18.7da14e04.js.map
  20. 0 0
      dist/js/18.ca69de78.js
  21. 0 0
      dist/js/18.ca69de78.js.map
  22. 0 0
      dist/js/214.5bcebc1e.js
  23. 0 0
      dist/js/214.5bcebc1e.js.map
  24. 0 0
      dist/js/219.68eb9b6e.js
  25. 0 0
      dist/js/219.68eb9b6e.js.map
  26. 0 0
      dist/js/3.949b75fd.js
  27. 0 0
      dist/js/3.949b75fd.js.map
  28. 0 0
      dist/js/328.4b729b04.js
  29. 0 0
      dist/js/328.4b729b04.js.map
  30. 0 0
      dist/js/37.8fe5a085.js
  31. 0 0
      dist/js/37.8fe5a085.js.map
  32. 0 0
      dist/js/372.b75e9a24.js
  33. 0 0
      dist/js/372.b75e9a24.js.map
  34. 18 0
      dist/js/404.b94fef6a.js
  35. 0 0
      dist/js/404.b94fef6a.js.map
  36. 0 0
      dist/js/528.5a9722b6.js
  37. 0 0
      dist/js/528.5a9722b6.js.map
  38. 0 0
      dist/js/553.028caaa7.js
  39. 0 0
      dist/js/553.028caaa7.js.map
  40. 0 0
      dist/js/654.a0854a28.js
  41. 0 0
      dist/js/654.a0854a28.js.map
  42. 0 0
      dist/js/688.0ed3b573.js.map
  43. 0 0
      dist/js/688.d1797e1e.js
  44. 0 0
      dist/js/688.d1797e1e.js.map
  45. 0 0
      dist/js/70.2da14cd9.js.map
  46. 0 0
      dist/js/70.89ceb7af.js
  47. 0 0
      dist/js/70.89ceb7af.js.map
  48. 0 0
      dist/js/720.f2add962.js
  49. 0 0
      dist/js/720.f2add962.js.map
  50. 0 0
      dist/js/734.34d89d57.js
  51. 0 0
      dist/js/734.34d89d57.js.map
  52. 0 0
      dist/js/763.4348a7f4.js
  53. 0 0
      dist/js/763.4348a7f4.js.map
  54. 0 0
      dist/js/78.b0c1e323.js
  55. 0 0
      dist/js/78.b0c1e323.js.map
  56. 0 0
      dist/js/791.0f76fac7.js
  57. 0 0
      dist/js/791.0f76fac7.js.map
  58. 0 0
      dist/js/791.7e231570.js
  59. 0 0
      dist/js/791.7e231570.js.map
  60. 0 0
      dist/js/837.7805deb8.js
  61. 0 0
      dist/js/837.7805deb8.js.map
  62. 0 0
      dist/js/982.0aea5c45.js
  63. 0 0
      dist/js/982.0aea5c45.js.map
  64. 0 0
      dist/js/app.75b70571.js
  65. 0 0
      dist/js/app.75b70571.js.map
  66. 0 0
      dist/js/app.b0fc3249.js
  67. 0 0
      dist/js/app.b0fc3249.js.map
  68. 428 402
      src/App.vue
  69. 1 1
      src/views/activityManage/newMarkerActivity.vue
  70. 1 1
      src/views/activityManage/newNomMarkerActivity.vue
  71. 37 35
      src/views/echarts/components/CircularChart.vue
  72. 59 57
      src/views/echarts/components/ColumnarChart.vue
  73. 81 78
      src/views/echarts/components/HorizontalChart.vue
  74. 196 166
      src/views/echarts/echarts.vue
  75. 1 1
      src/views/projectApply/MakerSpaceApply.vue
  76. 1 1
      src/views/projectApply/newStudentProjectApply.vue
  77. 3 3
      src/views/projectApply/projectApplication.vue

+ 0 - 0
dist/css/164.156aea74.css → dist/css/164.5c519e01.css
Zobraziť súbor


+ 0 - 0
dist/css/328.a0ad4f5d.css → dist/css/168.a0ad4f5d.css
Zobraziť súbor


+ 0 - 0
dist/css/18.727c48ce.css → dist/css/18.2ec274f4.css
Zobraziť súbor


+ 0 - 0
dist/css/982.726a72e4.css → dist/css/219.726a72e4.css
Zobraziť súbor


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/css/37.72a54e50.css


+ 0 - 0
dist/css/688.2ca453f2.css → dist/css/688.04d941fa.css
Zobraziť súbor


+ 0 - 0
dist/css/70.e0487630.css → dist/css/70.83369f8a.css
Zobraziť súbor


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/css/720.8057289a.css


+ 0 - 0
dist/css/791.42a0e45c.css → dist/css/78.42a0e45c.css
Zobraziť súbor


+ 0 - 0
dist/css/734.4f034e44.css → dist/css/791.4f034e44.css
Zobraziť súbor


+ 0 - 0
dist/css/654.5f070657.css → dist/css/837.5f070657.css
Zobraziť súbor


+ 0 - 0
dist/css/app.97d30bdf.css → dist/css/app.878f2d55.css
Zobraziť súbor


+ 1 - 1
dist/index.html
Zobraziť súbor 

@@ -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.75b70571.js"></script><link href="/css/chunk-vendors.ab49d789.css" rel="stylesheet"><link href="/css/app.97d30bdf.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.b0fc3249.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>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/164.5b39d3ff.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/164.5b39d3ff.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/164.db379a83.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/168.1de1b808.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/168.1de1b808.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/18.7da14e04.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/18.ca69de78.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/18.ca69de78.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/214.5bcebc1e.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/214.5bcebc1e.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/219.68eb9b6e.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/219.68eb9b6e.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/3.949b75fd.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/3.949b75fd.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/328.4b729b04.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/328.4b729b04.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/37.8fe5a085.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/37.8fe5a085.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/372.b75e9a24.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/372.b75e9a24.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 18 - 0
dist/js/404.b94fef6a.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/404.b94fef6a.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/528.5a9722b6.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/528.5a9722b6.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/553.028caaa7.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/553.028caaa7.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/654.a0854a28.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/654.a0854a28.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/688.0ed3b573.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/688.d1797e1e.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/688.d1797e1e.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/70.2da14cd9.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/70.89ceb7af.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/70.89ceb7af.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/720.f2add962.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/720.f2add962.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/734.34d89d57.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/734.34d89d57.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/763.4348a7f4.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/763.4348a7f4.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/78.b0c1e323.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/78.b0c1e323.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/791.0f76fac7.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/791.0f76fac7.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/791.7e231570.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/791.7e231570.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/837.7805deb8.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/837.7805deb8.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/982.0aea5c45.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/982.0aea5c45.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/app.75b70571.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/app.75b70571.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/app.b0fc3249.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/js/app.b0fc3249.js.map


+ 428 - 402
src/App.vue
Zobraziť súbor 

@@ -6,8 +6,11 @@
 
       <div class="homeExitContent">
 
         <!-- <el-button size="mini" @click="$store.commit('update',['userInfo',{userid:'2021400203',username:'yym',type:2}])">yym</el-button> -->
 
         <!-- <el-button size="mini" @click="$store.commit('update',['userInfo',{userid:'201901766',username:'qgt',type:0}])">qgt</el-button> -->
 
-        <div class="Notify" @click="$store.commit('update',['NotifyDig',true])">
 
-          <el-badge :is-dot="$store.state.Notify.length>0" class="item">
 
+        <div
 
+          class="Notify"
 
+          @click="$store.commit('update', ['NotifyDig', true])"
 
+        >
 
+          <el-badge :is-dot="$store.state.Notify.length > 0" class="item">
 
             <span class="el-icon-s-opportunity"></span>
 
           </el-badge>
 
         </div>
 
@@ -17,68 +20,64 @@
 
     </el-header>
 
     <router-view></router-view>
 
     <el-dialog
 
-        title="计划完成项目时间提醒"
 
-        :visible.sync="$store.state.NotifyDig"
 
-        width="60%"
 
-        class="pageSubmitData">
 
-        <!-- 表格开始 -->
 
-        <div style="width: 100%;">
 
-          <el-table
 
-            ref="multipleTable"
 
-            :data="$store.state.Notify"
 
-            tooltip-effect="dark"
 
-            width="100%"
 
-            stripe
 
-            class="fontSize"
 
-            :header-cell-style="{ background: '#f2f2f2', color: '#000' }"
 
-          >
 
-          <el-table-column
 
-            prop="ProjectNo"
 
-            label="项目编号"
 
-            align="center"
 
-            
-            >
 
+      title="计划完成项目时间提醒"
 
+      :visible.sync="$store.state.NotifyDig"
 
+      width="60%"
 
+      class="pageSubmitData"
 
+    >
 
+      <!-- 表格开始 -->
 
+      <div style="width: 100%">
 
+        <el-table
 
+          ref="multipleTable"
 
+          :data="$store.state.Notify"
 
+          tooltip-effect="dark"
 
+          width="100%"
 
+          stripe
 
+          class="fontSize"
 
+          :header-cell-style="{ background: '#f2f2f2', color: '#000' }"
 
+        >
 
+          <el-table-column prop="ProjectNo" label="项目编号" align="center">
 
           </el-table-column>
 
-          <el-table-column
 
-            prop="title"
 
-            label="项目名称"
 
-            align="center"
 
-            >
 
+          <el-table-column prop="title" label="项目名称" align="center">
 
           </el-table-column>
 
-          <el-table-column
 
-            prop="name"
 
-            label="分类"
 
-            align="center"
 
-            
-            >
 
+          <el-table-column prop="name" label="分类" align="center">
 
           </el-table-column>
 
-          <el-table-column
 
-            prop="time"
 
-            label="计划完成时间"
 
-            align="center"
 
-            
-            >
 
+          <el-table-column prop="time" label="计划完成时间" align="center">
 
           </el-table-column>
 
-          <el-table-column
 
-            prop="Remaining"
 
-            label="距离完结时间"
 
-            align="center"
 
-            >
 
+          <el-table-column prop="Remaining" label="距离完结时间" align="center">
 
             <template #default="scope">
 
               <div>
 
-                {{ scope.row.Remaining<0?'已超时':scope.row.Remaining+'天' }}
 
+                {{
 
+                  scope.row.Remaining < 0
 
+                    ? "已超时"
 
+                    : scope.row.Remaining + "天"
 
+                }}
 
               </div>
 
             </template>
 
           </el-table-column>
 
-            <!-- selection-change批量选择功能后续可能用到 -->
 
-            <!-- 
+          <el-table-column
 
+            prop="operation"
 
+            align="center"
 
+            label="操作"
 
+          >
 
+            <template #default="scope">
 
+              <el-button
 
+                type="primary"
 
+                size="mini"
 
+                @click="lookDetail(scope.row,scope.row.courseId, scope.row.typeid)"
 
+                >查看</el-button
 
+              >
 
+            </template>
 
+          </el-table-column>
 
+          <!-- selection-change批量选择功能后续可能用到 -->
 
+          <!-- 
             <el-table-column
 
               type="selection"
 
               width="25"
 
               >
 
             
             </el-table-column> -->
 
-            <!-- <el-table-column
 
+          <!-- <el-table-column
 
               prop="ProjectNo"
 
               label="项目编号"
 
               align="center"
 
@@ -114,12 +113,16 @@
 
               min-width="10%"
 
             >
 
             </el-table-column> -->
 
-          </el-table>
 
-        </div>
 
-        <!-- 表格结束 -->
 
-        <span slot="footer" class="dialog-footer">
 
-            <el-button @click="$store.commit('update',['NotifyDig',false])" class="AllDialogBtn" >关闭</el-button>
 
-        </span>
 
+        </el-table>
 
+      </div>
 
+      <!-- 表格结束 -->
 
+      <span slot="footer" class="dialog-footer">
 
+        <el-button
 
+          @click="$store.commit('update', ['NotifyDig', false])"
 
+          class="AllDialogBtn"
 
+          >关闭</el-button
 
+        >
 
+      </span>
 
     </el-dialog>
 
   </div>
 
 </template>
 
@@ -127,23 +130,28 @@
 
 <script>
 
 export default {
 
   data() {
 
-    return {
 
-    };
 
+    return {};
 
   },
 
   methods: {
 
     homeExit() {
 
       window.location.href = "http://10.16.30.130/sso/caslogout.jsp";
 
     },
 
-    CleanStorage(){
 
-      sessionStorage.clear()
 
+    CleanStorage() {
 
+      sessionStorage.clear();
 
+    },
 
+    lookDetail(r,val, tid) {
 
+      //查看详情按钮
 
+      // localStorage.setItem("pid",JSON.stringify(val))
 
+      this.$store.commit('update', ['NotifyDig', false]);
 
+      this.$router.push(`/projectApplicationDetailMain?tid=${tid}&pid=${val}`);
 
     },
 
   },
 
-  mounted(){
 
-    window.addEventListener('beforeunload', this.CleanStorage());
 
+  mounted() {
 
+    window.addEventListener("beforeunload", this.CleanStorage());
 
+  },
 
+  beforeDestroy() {
 
+    window.removeEventListener("beforeunload", this.CleanStorage());
 
   },
 
-  beforeDestroy(){
 
-    window.removeEventListener('beforeunload', this.CleanStorage());
 
-  }
 
 };
 
 </script>
 
 
@@ -192,14 +200,13 @@ body {
 
         width: 90px;
 
         // height: 30px;
 
       }
 
-      .Notify{
 
-        .item{
 
+      .Notify {
 
+        .item {
 
           margin-right: 50px;
 
           font-size: 1.1em;
 
           cursor: pointer;
 
         }
 
       }
 
-
 
     }
 
   }
 
 }
 
@@ -211,103 +218,106 @@ hr {
 
   margin: 0px 0px 10px 0px;
 
   background: #ccc;
 
 }
 
-.pdfTable{      //查看详情已完结页面的下载pdf的table样式
 
-    border: none;
 
-    border-top: solid 1px black;
 
-    // border-right:  solid 1px black;
 
-    border-left:  solid 1px black;
 
-    position: relative;
 
-    margin-top: 150px;
 
-    margin-bottom: 120px;
 
-    font-size: 20px;
 
-    width: 1200px;
 
-    // min-width: 1200px;
 
-    // max-width: 1500px;
 
-    .jc{
 
+.pdfTable {
 
+  //查看详情已完结页面的下载pdf的table样式
 
+  border: none;
 
+  border-top: solid 1px black;
 
+  // border-right:  solid 1px black;
 
+  border-left: solid 1px black;
 
+  position: relative;
 
+  margin-top: 150px;
 
+  margin-bottom: 120px;
 
+  font-size: 20px;
 
+  width: 1200px;
 
+  // min-width: 1200px;
 
+  // max-width: 1500px;
 
+  .jc {
 
+    font-weight: 600;
 
+  }
 
+  .pdfTit {
 
+    position: absolute;
 
+    top: -140px;
 
+    left: 50%;
 
+    width: 100%;
 
+    transform: translate(-50%);
 
+    display: flex;
 
+    justify-content: center;
 
+    flex-wrap: wrap;
 
+    .school {
 
       font-weight: 600;
 
+      font-size: 44px;
 
+      letter-spacing: 10px;
 
     }
 
-    .pdfTit{
 
-      position: absolute;
 
-      top: -140px;
 
-      left: 50%;
 
+    .wordTitle {
 
+      font-weight: 500;
 
+      font-size: 32px;
 
       width: 100%;
 
-      transform: translate(-50%);
 
-      display: flex;justify-content: center;flex-wrap: wrap;
 
-      .school{
 
-        font-weight: 600;
 
-        font-size: 44px;
 
-        letter-spacing: 10px;
 
-      }
 
-      .wordTitle{
 
-        font-weight: 500;
 
-        font-size: 32px;
 
-        width: 100%;
 
-        text-align: center;
 
-        letter-spacing: 5px;
 
-        margin-bottom: 10px;
 
-      }
 
-      .date{
 
-        font-weight: bold;
 
-        font-size: 20px;
 
-        transform: translate(400px);
 
-      }
 
+      text-align: center;
 
+      letter-spacing: 5px;
 
+      margin-bottom: 10px;
 
     }
 
-    .notes{
 
-      position: absolute;
 
-        width: 100%;
 
-        display: flex;
 
-        flex-direction:column;
 
-      }
 
-        .checkAreaBlc{
 
-          margin-left: 40px;
 
-        }
 
-    .textLeft{
 
-      text-align: left ;
 
-      vertical-align: top;
 
-      position: relative;
 
-      max-width:100% ;
 
-      height: 300px;
 
-      // white-space: nowrap;
 
-      span{
 
-        // white-space: nowrap
 
-        word-wrap: break-word;
 
-        word-break: break-all;
 
-      }
 
-      :deep(.el-textarea__inner){
 
-        border: none ;
 
-        border-radius: 0px;
 
-        text-align: left !important;
 
-        font-size: 16px;
 
-      }
 
+    .date {
 
+      font-weight: bold;
 
+      font-size: 20px;
 
+      transform: translate(400px);
 
     }
 
-    tr{
 
-      // position: relative;
 
-      // height: 80px;
 
-      td{
 
-        border: none;
 
-        border-bottom: solid 1px black;
 
-        border-right: solid 1px black;
 
-        height: 80px;
 
-        text-align: center;
 
-        line-height: 30px;
 
-        min-width: 160px;
 
-        box-sizing: border-box;
 
-        padding: 5px;
 
-      p{
 
+  }
 
+  .notes {
 
+    position: absolute;
 
+    width: 100%;
 
+    display: flex;
 
+    flex-direction: column;
 
+  }
 
+  .checkAreaBlc {
 
+    margin-left: 40px;
 
+  }
 
+  .textLeft {
 
+    text-align: left;
 
+    vertical-align: top;
 
+    position: relative;
 
+    max-width: 100%;
 
+    height: 300px;
 
+    // white-space: nowrap;
 
+    span {
 
+      // white-space: nowrap
 
+      word-wrap: break-word;
 
+      word-break: break-all;
 
+    }
 
+    :deep(.el-textarea__inner) {
 
+      border: none;
 
+      border-radius: 0px;
 
+      text-align: left !important;
 
+      font-size: 16px;
 
+    }
 
+  }
 
+  tr {
 
+    // position: relative;
 
+    // height: 80px;
 
+    td {
 
+      border: none;
 
+      border-bottom: solid 1px black;
 
+      border-right: solid 1px black;
 
+      height: 80px;
 
+      text-align: center;
 
+      line-height: 30px;
 
+      min-width: 160px;
 
+      box-sizing: border-box;
 
+      padding: 5px;
 
+      p {
 
         font-weight: 600;
 
       }
 
-      :deep(.el-select .el-input .el-select__caret){
 
+      :deep(.el-select .el-input .el-select__caret) {
 
         display: none;
 
       }
 
-      :deep(.el-textarea__inner){
 
+      :deep(.el-textarea__inner) {
 
         // padding: 0;
 
-        border: none ;
 
+        border: none;
 
         border-radius: 0px;
 
         text-align: center;
 
         font-size: 16px;
 
       }
 
-      :deep(.el-input__inner){
 
-        border: none ;
 
+      :deep(.el-input__inner) {
 
+        border: none;
 
         border-radius: 0px;
 
         text-align: center;
 
         font-size: 16px;
 
@@ -316,120 +326,124 @@ hr {
 
       :deep(input)::-webkit-inner-spin-button {
 
         -webkit-appearance: none;
 
       }
 
-      :deep(input)[type="number"]{
 
-          -moz-appearance: textfield;
 
+      :deep(input)[type="number"] {
 
+        -moz-appearance: textfield;
 
       }
 
     }
 
-  }            
+  }
 
 }
 
 
-.exitTable{   //所见所得填写项目的table样式
 
-            border: none;
 
-            border-top: solid 1px black;
 
-            border-left:  solid 1px black;
 
-            position: relative;
 
-            margin-top: 150px;
 
-            margin-bottom: 120px;
 
-            // font-size: 20px;
 
-            width: 1200px;
 
-            font-family:Arial,"Microsoft Yahe","微软雅黑";
 
-            .bold{
 
-              font-weight: 600;
 
-            }
 
-            .pdfTit{
 
-              position: absolute;
 
-              top: -140px;
 
-              left: 50%;
 
-              width: 100%;
 
-              transform: translate(-50%);
 
-              display: flex;justify-content: center;flex-wrap: wrap;
 
-              .school{
 
-                font-weight: 600;
 
-                font-size: 30px;
 
-                letter-spacing: 10px;
 
-              }
 
-              .wordTitle{
 
-                font-weight: 500;
 
-                font-size: 28px;
 
-                width: 100%;
 
-                text-align: center;
 
-                letter-spacing: 5px;
 
-                margin-bottom: 10px;
 
-              }
 
-              .date{
 
-                font-weight: bold;
 
-                font-size: 20px;
 
-                transform: translate(400px);
 
-              }
 
-            }
 
+.exitTable {
 
+  //所见所得填写项目的table样式
 
+  border: none;
 
+  border-top: solid 1px black;
 
+  border-left: solid 1px black;
 
+  position: relative;
 
+  margin-top: 150px;
 
+  margin-bottom: 120px;
 
+  // font-size: 20px;
 
+  width: 1200px;
 
+  font-family: Arial, "Microsoft Yahe", "微软雅黑";
 
+  .bold {
 
+    font-weight: 600;
 
+  }
 
+  .pdfTit {
 
+    position: absolute;
 
+    top: -140px;
 
+    left: 50%;
 
+    width: 100%;
 
+    transform: translate(-50%);
 
+    display: flex;
 
+    justify-content: center;
 
+    flex-wrap: wrap;
 
+    .school {
 
+      font-weight: 600;
 
+      font-size: 30px;
 
+      letter-spacing: 10px;
 
+    }
 
+    .wordTitle {
 
+      font-weight: 500;
 
+      font-size: 28px;
 
+      width: 100%;
 
+      text-align: center;
 
+      letter-spacing: 5px;
 
+      margin-bottom: 10px;
 
+    }
 
+    .date {
 
+      font-weight: bold;
 
+      font-size: 20px;
 
+      transform: translate(400px);
 
+    }
 
+  }
 
 
-            .textLeft{
 
-              :deep(.el-textarea__inner){
 
-                border: none ;
 
-                border-radius: 0px;
 
-                text-align: left !important;
 
-                font-size: 16px;
 
-              }
 
-            }
 
-            tr td{
 
-              border: none;
 
-              border-bottom: solid 1px black;
 
-              border-right: solid 1px black;
 
-              height: 40px;
 
-              text-align: center;
 
-              // line-height: 30px;
 
-              min-width: 160px;
 
-              box-sizing: border-box;
 
-              padding: 5px;
 
-              // &:last-of-type{
 
-              //   border-right:  solid 1px black;
 
-              // }
 
-              p{
 
-                font-weight: 600;
 
-              }
 
-              :deep(.el-select .el-input .el-select__caret){
 
-                display: none;
 
-                font-family:Arial,"Microsoft Yahe","微软雅黑";
 
-              }
 
-              :deep(.el-textarea__inner){
 
-                // padding: 0;
 
-                border: none ;
 
-                // outline: none;
 
-                border-radius: 0px;
 
-                text-align: center;
 
-                font-size: 16px;
 
-                font-family:Arial,"Microsoft Yahe","微软雅黑";
 
-              }
 
-              :deep(.el-input__inner){
 
-                border: none ;
 
-                border-radius: 0px;
 
-                text-align: center;
 
-                font-size: 16px;
 
-                font-family:Arial,"Microsoft Yahe","微软雅黑";
 
-              }
 
-              :deep(input)::-webkit-outer-spin-button,
 
-              :deep(input)::-webkit-inner-spin-button {
 
-                -webkit-appearance: none;
 
-              }
 
-              :deep(input)[type="number"]{
 
-                  -moz-appearance: textfield;
 
-              }
 
-            }
 
+  .textLeft {
 
+    :deep(.el-textarea__inner) {
 
+      border: none;
 
+      border-radius: 0px;
 
+      text-align: left !important;
 
+      font-size: 16px;
 
+    }
 
+  }
 
+  tr td {
 
+    border: none;
 
+    border-bottom: solid 1px black;
 
+    border-right: solid 1px black;
 
+    height: 40px;
 
+    text-align: center;
 
+    // line-height: 30px;
 
+    min-width: 160px;
 
+    box-sizing: border-box;
 
+    padding: 5px;
 
+    // &:last-of-type{
 
+    //   border-right:  solid 1px black;
 
+    // }
 
+    p {
 
+      font-weight: 600;
 
+    }
 
+    :deep(.el-select .el-input .el-select__caret) {
 
+      display: none;
 
+      font-family: Arial, "Microsoft Yahe", "微软雅黑";
 
+    }
 
+    :deep(.el-textarea__inner) {
 
+      // padding: 0;
 
+      border: none;
 
+      // outline: none;
 
+      border-radius: 0px;
 
+      text-align: center;
 
+      font-size: 16px;
 
+      font-family: Arial, "Microsoft Yahe", "微软雅黑";
 
+    }
 
+    :deep(.el-input__inner) {
 
+      border: none;
 
+      border-radius: 0px;
 
+      text-align: center;
 
+      font-size: 16px;
 
+      font-family: Arial, "Microsoft Yahe", "微软雅黑";
 
+    }
 
+    :deep(input)::-webkit-outer-spin-button,
 
+    :deep(input)::-webkit-inner-spin-button {
 
+      -webkit-appearance: none;
 
+    }
 
+    :deep(input)[type="number"] {
 
+      -moz-appearance: textfield;
 
+    }
 
+  }
 
 
-            .notes{
 
-              width: 100%;
 
-              display: flex;
 
-              flex-direction:column;
 
-              position: absolute;
 
-              left: 0;
 
-              bottom: -100px;
 
-              // justify-content: flex-start;
 
-              text-align: left;
 
-              // margin-bottom: 30px;
 
-            }
 
+  .notes {
 
+    width: 100%;
 
+    display: flex;
 
+    flex-direction: column;
 
+    position: absolute;
 
+    left: 0;
 
+    bottom: -100px;
 
+    // justify-content: flex-start;
 
+    text-align: left;
 
+    // margin-bottom: 30px;
 
+  }
 
 }
 
-      
-.pAHeader {    //一级页面一级标题
 
+
 
+.pAHeader {
 
+  //一级页面一级标题
 
 
   width: 100%;
 
   display: flex;
 
@@ -456,8 +470,9 @@ hr {
 
   }
 
 }
 
 
-.vfpHeader {   //二级页面一级标题
 
-  
+.vfpHeader {
 
+  //二级页面一级标题
 
+
 
   width: 100%;
 
   display: flex;
 
   justify-content: flex-start;
 
@@ -492,7 +507,8 @@ hr {
 
   }
 
 }
 
 
-.tabTit {     //二级页面二级标题
 
+.tabTit {
 
+  //二级页面二级标题
 
 
   width: 100%;
 
   font-size: 18px;
 
@@ -562,9 +578,8 @@ hr {
 
   background-color: rgba(255, 255, 255, 0);
 
 }
 
 
-
 
-
 
-.AppBar {    //横行的跳转导航栏
 
+.AppBar {
 
+  //横行的跳转导航栏
 
 
   display: flex;
 
   margin-top: 15px;
 
@@ -598,10 +613,9 @@ hr {
 
   // }
 
 }
 
 
+.AddMember {
 
+  //添加成员对话框
 
 
-
 
-.AddMember {   //添加成员对话框
 
-  
   .el-input__inner {
 
     width: 300px;
 
   }
 
@@ -666,8 +680,9 @@ hr {
 
   }
 
 }
 
 
-.selects {   //一级页面搜索框，不包含项目管理、成果展示
 
- 
+.selects {
 
+  //一级页面搜索框，不包含项目管理、成果展示
 
+
 
   width: 100%;
 
   margin-top: 20px;
 
   display: flex;
 
@@ -690,9 +705,10 @@ hr {
 
     transform: translate(0, 22%);
 
   }
 
 }
 
- 
-.selectInp {   // 一级页面搜索框 项目管理、成果展示
 
- 
+
 
+.selectInp {
 
+  // 一级页面搜索框 项目管理、成果展示
 
+
 
   display: flex;
 
   justify-content: space-between;
 
   margin-top: 20px;
 
@@ -731,9 +747,10 @@ hr {
 
   }
 
 }
 
 
-.twoSelectInp {  //一级页面搜索框 创业公司登记、消息提示
 
+.twoSelectInp {
 
+  //一级页面搜索框 创业公司登记、消息提示
 
   width: 100%;
 
-  
+
 
   display: flex;
 
   justify-content: space-between;
 
   margin-top: 20px;
 
@@ -766,13 +783,14 @@ hr {
 
   }
 
 }
 
 
-  
-.disa {    //禁用按钮样式
 
+.disa {
 
+  //禁用按钮样式
 
   background-color: #c8c9cc !important;
 
   border-color: #c8c9cc;
 
   cursor: no-drop !important;
 
 }
 
-.fontSize {   //所有表格字体大小
 
+.fontSize {
 
+  //所有表格字体大小
 
 
   margin-top: 15px;
 
   // margin-bottom: 60px;
 
@@ -793,8 +811,9 @@ hr {
 
     }
 
   }
 
 }
 
-.paginations {  //分页栏
 
-  
+.paginations {
 
+  //分页栏
 
+
 
   position: relative;
 
   display: flex;
 
   justify-content: flex-end;
 
@@ -803,8 +822,8 @@ hr {
 
   bottom: 0;
 
 }
 
 
-
 
-.showFileArea {    //在线查看文档内容居中
 
+.showFileArea {
 
+  //在线查看文档内容居中
 
 
   width: 100%;
 
   height: 100%;
 
@@ -813,16 +832,17 @@ hr {
 
   justify-content: center;
 
 }
 
 
+.editor {
 
+  //显示栏
 
 
-.editor { //显示栏
 
-  
   width: 100%;
 
   box-sizing: border-box;
 
   padding: 15px 0px 10px 0px;
 
 }
 
 
-.pageSubmitData { //页面提交数据,删除成员，审核对话框样式
 
-  
+.pageSubmitData {
 
+  //页面提交数据,删除成员，审核对话框样式
 
+
 
   .el-dialog__header {
 
     display: flex;
 
     justify-content: center;
 
@@ -954,7 +974,7 @@ hr {
 
   }
 
 }
 
 
-.DialogBox{
 
+.DialogBox {
 
   display: flex;
 
   justify-content: center;
 
   align-items: flex-start;
 
@@ -962,170 +982,176 @@ hr {
 
   width: 100%;
 
   height: 100%;
 
   // background-color: red;
 
-  .DialogTitle{
 
+  .DialogTitle {
 
     color: white;
 
     font-size: 18px;
 
   }
 
-  .changeFull{
 
+  .changeFull {
 
     color: gray;
 
     cursor: pointer;
 
     position: absolute;
 
     right: 3%;
 
     font-size: 1em;
 
-    &:hover{
 
+    &:hover {
 
       color: white;
 
     }
 
   }
 
 }
 
 
+.select {
 
+  //活动申请填写信息区域（没用）
 
 
-.select {    //活动申请填写信息区域（没用）
 
-
 
-width: 100%;
 
-box-sizing: border-box;
 
-margin-top: 30px;
 
-// margin-bottom: 8px;
 
-.label {
 
-  //label标签
 
-  min-width: 98px;
 
-  margin-right: 5px;
 
-  display: inline-block;
 
-  text-align: justify;
 
-  text-justify: distribute-all-lines;
 
-  text-align-last: justify;
 
-  transform: translate(0, 22%);
 
-  padding-right: 15px;
 
-  font-size: 16px;
 
-}
 
-.inpBlock {   //一个个输入框小方块
 
- 
-  display: flex;
 
-  margin-bottom: 15px;
 
-  position: relative;
 
-  input::-webkit-outer-spin-button,
 
-  input::-webkit-inner-spin-button {
 
-    -webkit-appearance: none !important;
 
-  }
 
-  input[type="number"] {
 
-    -moz-appearance: textfield;
 
+  width: 100%;
 
+  box-sizing: border-box;
 
+  margin-top: 30px;
 
+  // margin-bottom: 8px;
 
+  .label {
 
+    //label标签
 
+    min-width: 98px;
 
+    margin-right: 5px;
 
+    display: inline-block;
 
+    text-align: justify;
 
+    text-justify: distribute-all-lines;
 
+    text-align-last: justify;
 
+    transform: translate(0, 22%);
 
+    padding-right: 15px;
 
+    font-size: 16px;
 
   }
 
-}
 
-
 
-.selectTop {
 
-  width: 86%;
 
-  display: flex;
 
-}
 
+  .inpBlock {
 
+    //一个个输入框小方块
 
 
-.selectMid {
 
-  display: flex;
 
-  margin-top: 16px;
 
+    display: flex;
 
+    margin-bottom: 15px;
 
+    position: relative;
 
+    input::-webkit-outer-spin-button,
 
+    input::-webkit-inner-spin-button {
 
+      -webkit-appearance: none !important;
 
+    }
 
+    input[type="number"] {
 
+      -moz-appearance: textfield;
 
+    }
 
+  }
 
 
-  .selectLeft {
 
-    width: 40%;
 
+  .selectTop {
 
+    width: 86%;
 
     display: flex;
 
-    flex-direction: column;
 
-    margin-right: 70px;
 
-    // align-items: center;
 
   }
 
-  .selectRight {
 
-    width: 40%;
 
-    height: 150px;
 
+
 
+  .selectMid {
 
     display: flex;
 
-    flex-direction: column;
 
-    .el-cascader {
 
-      width: 100%;
 
+    margin-top: 16px;
 
+
 
+    .selectLeft {
 
+      width: 40%;
 
+      display: flex;
 
+      flex-direction: column;
 
+      margin-right: 70px;
 
+      // align-items: center;
 
+    }
 
+    .selectRight {
 
+      width: 40%;
 
+      height: 150px;
 
+      display: flex;
 
+      flex-direction: column;
 
+      .el-cascader {
 
+        width: 100%;
 
+      }
 
     }
 
   }
 
 }
 
-}
 
 
-.AllDialogBtn {   //所有对话框按钮（好像没用）
 
- 
- width: 120px;
 
- font-size: 16px !important;
 
+.AllDialogBtn {
 
+  //所有对话框按钮（好像没用）
 
+
 
+  width: 120px;
 
+  font-size: 16px !important;
 
 }
 
 
-.pTit {   //项目详情类大标题（好像没用）
 
+.pTit {
 
+  //项目详情类大标题（好像没用）
 
 
-color: #3994ff;
 
-font-weight: 550;
 
-font-size: 18px;
 
-margin: 15px 0;
 
+  color: #3994ff;
 
+  font-weight: 550;
 
+  font-size: 18px;
 
+  margin: 15px 0;
 
 }
 
 
+.pTit2 {
 
+  //项目详情类小标题（好像没用）
 
 
-.pTit2 {  //项目详情类小标题（好像没用）
 
-  
   margin-top: 15px;
 
   color: #3994ff;
 
   font-weight: 550;
 
   font-size: 16px;
 
 }
 
 
-.addMoneyBtn {    //自定义写的的添加框 （没用）
 
+.addMoneyBtn {
 
+  //自定义写的的添加框 （没用）
 
 
-width: 120px;
 
-cursor: pointer;
 
-height: 40px;
 
-border: #000 1px dashed;
 
-border-radius: 5px;
 
-margin: 18px 10px 30px;
 
-display: flex;
 
-justify-content: center;
 
-line-height: 40px;
 
-font-size: 16px;
 
-position: relative;
 
-.jia {
 
-  border-radius: 50%;
 
-  border: 1.5px #ccc solid;
 
-  font-size: 25px;
 
-  line-height: 26px;
 
-  font-weight: 10;
 
+  width: 120px;
 
+  cursor: pointer;
 
+  height: 40px;
 
+  border: #000 1px dashed;
 
+  border-radius: 5px;
 
+  margin: 18px 10px 30px;
 
   display: flex;
 
   justify-content: center;
 
-  margin-top: 6px;
 
-  margin-right: 5px;
 
-  height: 27px;
 
-  width: 27px;
 
-  color: #ccc;
 
-}
 
-#upFile {
 
-  position: absolute;
 
-  width: 100%;
 
-  height: 100%;
 
-  transform: scale(1.1, 1.1);
 
-  opacity: 0;
 
-}
 
+  line-height: 40px;
 
+  font-size: 16px;
 
+  position: relative;
 
+  .jia {
 
+    border-radius: 50%;
 
+    border: 1.5px #ccc solid;
 
+    font-size: 25px;
 
+    line-height: 26px;
 
+    font-weight: 10;
 
+    display: flex;
 
+    justify-content: center;
 
+    margin-top: 6px;
 
+    margin-right: 5px;
 
+    height: 27px;
 
+    width: 27px;
 
+    color: #ccc;
 
+  }
 
+  #upFile {
 
+    position: absolute;
 
+    width: 100%;
 
+    height: 100%;
 
+    transform: scale(1.1, 1.1);
 
+    opacity: 0;
 
+  }
 
 }
 
 
-.baseBtn {   //所有页面底部按钮框（好像没用）
 
+.baseBtn {
 
+  //所有页面底部按钮框（好像没用）
 
 
-width: 100%;
 
-display: flex;
 
-justify-content: flex-end;
 
-margin: 10px 0;
 
-margin-top: 30px;
 
-.blockWidth {
 
+  width: 100%;
 
   display: flex;
 
-  justify-content: space-between;
 
-  [type="button"] {
 
-    background: #409eff;
 
-    color: #fff !important;
 
+  justify-content: flex-end;
 
+  margin: 10px 0;
 
+  margin-top: 30px;
 
+  .blockWidth {
 
     display: flex;
 
-    border: none;
 
-    justify-content: center;
 
-    font-size: 16px;
 
-    width: 120px;
 
-    margin-left: 20px;
 
-    height: 40px;
 
-    align-items: center;
 
+    justify-content: space-between;
 
+    [type="button"] {
 
+      background: #409eff;
 
+      color: #fff !important;
 
+      display: flex;
 
+      border: none;
 
+      justify-content: center;
 
+      font-size: 16px;
 
+      width: 120px;
 
+      margin-left: 20px;
 
+      height: 40px;
 
+      align-items: center;
 
+    }
 
   }
 
 }
 
-}
 
 
-.twoStyle { //左边两边对齐，右边靠右的靠右样式资金管理页面里的（没用）
 
+.twoStyle {
 
+  //左边两边对齐，右边靠右的靠右样式资金管理页面里的（没用）
 
 
-display: flex !important;
 
-justify-content: flex-end;
 
+  display: flex !important;
 
+  justify-content: flex-end;
 
 }
 
 </style>

+ 1 - 1
src/views/activityManage/newMarkerActivity.vue
Zobraziť súbor 

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

+ 1 - 1
src/views/activityManage/newNomMarkerActivity.vue
Zobraziť súbor 

@@ -16,7 +16,7 @@
 
         width="600px"
 
         class="pageSubmitData">
 
         
-        <div class="deleteContent">确定提交“{{wordData['activityName']}}”个人创客？</div>
 
+        <div class="deleteContent">确定提交“{{wordData['activityName']}}”创客项目吗？</div>
 
         <span slot="footer" class="dialog-footer">
 
           <el-button type="primary" @click="applyActivity" class="AllDialogBtn">确认提交</el-button>
 
           <el-button @click="submitHint=false" class="AllDialogBtn">取消</el-button>

+ 37 - 35
src/views/echarts/components/CircularChart.vue
Zobraziť súbor 

@@ -1,44 +1,46 @@
 
 <template>
 
-    <div ref="Circular" class="mid"></div>
 
+  <div ref="Circular" class="mid"></div>
 
 </template>
 
 
 <script>
 
- import * as echarts from 'echarts';
 
-    export default {
 
-        props:['data'],
 
-        methods:{
 
-            setCircularData(){
 
-              const Circular = echarts.init(this.$refs['Circular']);
 
-              let option = {
 
-                title:{
 
-                  text:"创新创业项目类型"
 
-                },
 
-                legend: {
 
-                  orient: 'vertical',
 
-                  top:"10%",
 
-                  left:"left"
 
-                },
 
-                series: [
 
-                  {
 
-                    type: 'pie',
 
-                    label: {
 
-                      show:true,
 
-                      position:"inner",
 
-                      formatter:'{d}%'
 
-                    },
 
-                    data: this.data
 
-                  }
 
-                ]
 
-              }
 
-              Circular.setOption(option)
 
-            },
 
+import * as echarts from "echarts";
 
+export default {
 
+  props: ["data"],
 
+  methods: {
 
+    setCircularData() {
 
+      const Circular = echarts.init(this.$refs["Circular"]);
 
+      let option = {
 
+        title: {
 
+          text: "创新创业项目类型",
 
+        },
 
+        legend: {
 
+          orient: "vertical",
 
+          top: "10%",
 
+          left: "left",
 
+        },
 
+        tooltip: {
 
+          trigger: "item",
 
         },
 
-        mounted(){
 
-            this.setCircularData();
 
-        }
 
-    }
 
+        series: [
 
+          {
 
+            type: "pie",
 
+            label: {
 
+              show: true,
 
+              position: "inner",
 
+              formatter: "{d}%",
 
+            },
 
+            data: this.data,
 
+          },
 
+        ],
 
+      };
 
+      Circular.setOption(option);
 
+    },
 
+  },
 
+  mounted() {
 
+    this.setCircularData();
 
+  },
 
+};
 
 </script>
 
 
 <style lang="less" scoped>
 
-
 
 </style>

+ 59 - 57
src/views/echarts/components/ColumnarChart.vue
Zobraziť súbor 

@@ -1,67 +1,69 @@
 
 <template>
 
-    <div ref="Columnar" class="histogram"></div>
 
+  <div ref="Columnar" class="histogram"></div>
 
 </template>
 
 
 <script>
 
-import * as echarts from 'echarts';
 
-    export default {
 
-        props:['data'],
 
-        methods:{
 
-            //横向柱状图
 
-            setColumnarData(){
 
-              const Columnar = echarts.init(this.$refs['Columnar']);
 
-              let option ={
 
-                grid: {
 
-                  top: 80,
 
-                },
 
-                title:{
 
-                  text:"个人创客资金",
 
-                  top:0
 
-                },
 
-                dataset: {
 
-                  // 提供一份数据。
 
-                  source:this.data
 
-                },
 
-                // 声明一个 X 轴，类目轴（category）。默认情况下，类目轴对应到 dataset 第一列。
 
-                xAxis: { 
-                  type: 'category',
 
-                  axisLabel: {
 
-                    formatter: function (value) {
 
-                      // 设置每行显示的最大字符数
 
-                      var maxLength = 4;
 
-                      // 计算文本需要换行的行数
 
-                      var rowNumber = Math.ceil(value.length / maxLength);
 
-                      // 拼接换行后的文本
 
-                      var newText = '';
 
-                      for (var i = 0; i < rowNumber; i++) {
 
-                        var start = i * maxLength;
 
-                        var end = start + maxLength;
 
-                        newText += value.slice(start, end) + '\n';
 
-                      }
 
-                      return newText;
 
-                    }
 
-                  }
 
-                },
 
-                // 声明一个 Y 轴，数值轴。
 
-                yAxis: {
 
-                  name:"单位：元",
 
-                  nameTextStyle:{
 
-                    fontSize:14,
 
-                    align:"center",
 
-                  }
 
-                },
 
-                // 声明多个 bar 系列，默认情况下，每个系列会自动对应到 dataset 的每一列。
 
-                series: [{ type: 'bar' ,itemStyle:{color:"#5aaef3"}}]
 
+import * as echarts from "echarts";
 
+export default {
 
+  props: ["data"],
 
+  methods: {
 
+    //横向柱状图
 
+    setColumnarData() {
 
+      const Columnar = echarts.init(this.$refs["Columnar"]);
 
+      let option = {
 
+        grid: {
 
+          top: 80,
 
+        },
 
+        title: {
 
+          text: "创客资金",
 
+          top: 0,
 
+        },
 
+        tooltip: {
 
+          trigger: "item",
 
+        },
 
+        dataset: {
 
+          // 提供一份数据。
 
+          source: this.data,
 
+        },
 
+        // 声明一个 X 轴，类目轴（category）。默认情况下，类目轴对应到 dataset 第一列。
 
+        xAxis: {
 
+          type: "category",
 
+          axisLabel: {
 
+            formatter: function (value) {
 
+              // 设置每行显示的最大字符数
 
+              var maxLength = 6;
 
+              // 计算文本需要换行的行数
 
+              var rowNumber = Math.ceil(value.length / maxLength);
 
+              // 拼接换行后的文本
 
+              var newText = "";
 
+              for (var i = 0; i < rowNumber; i++) {
 
+                var start = i * maxLength;
 
+                var end = start + maxLength;
 
+                newText += value.slice(start, end) + "\n";
 
               }
 
-              Columnar.setOption(option)
 
-            }
 
+              return newText;
 
+            },
 
+          },
 
+        },
 
+        // 声明一个 Y 轴，数值轴。
 
+        yAxis: {
 
+          name: "单位：元",
 
+          nameTextStyle: {
 
+            fontSize: 14,
 
+            align: "center",
 
+          },
 
         },
 
-        mounted(){
 
-            this.setColumnarData();
 
-        }
 
-    }
 
+        // 声明多个 bar 系列，默认情况下，每个系列会自动对应到 dataset 的每一列。
 
+        series: [{ type: "bar", itemStyle: { color: "#5aaef3" } }],
 
+      };
 
+      Columnar.setOption(option);
 
+    },
 
+  },
 
+  mounted() {
 
+    this.setColumnarData();
 
+  },
 
+};
 
 </script>
 
 
 <style lang="less" scoped>
 
-
 
 </style>

+ 81 - 78
src/views/echarts/components/HorizontalChart.vue
Zobraziť súbor 

@@ -1,88 +1,91 @@
 
 <template>
 
-    <div ref="Horizontal" class="mid"></div>
 
+  <div ref="Horizontal" class="mid"></div>
 
 </template>
 
 
 <script>
 
-import * as echarts from 'echarts';
 
-    export default {
 
-        props:['data'],
 
-        methods:{
 
-            setHorizontalData(){
 
-              const Horizontal = echarts.init(this.$refs['Horizontal']);
 
-              let option = {
 
-                grid: {
 
-                  top: 80, // 设置网格顶部的边距为 50px 
-                  left:10,
 
-                  bottom:0,
 
-                  right:"100px"
 
-                  // left:'-10px'
 
-                },
 
-                title:{
 
-                  text:"创客活动资金"
 
-                },
 
-                dataset: {
 
-                  source: [
 
-                    [ 'product', 'amount'],
 
-                    ...this.data
 
-                  ],
 
-                },
 
-                xAxis: { 
-                  position:"top",
 
-                  name:"单位：元",
 
-                  nameTextStyle:{
 
-                    fontSize:14,
 
-                    align:"left",
 
-                    verticalAlign:"bottom",
 
-                    padding:[0,0,7,10],
 
-                  }
 
-                },
 
-                yAxis: {
 
-                  type: 'category',
 
-                  zlevel:1,
 
-                  axisLabel:{
 
-                    inside:true,
 
-                    margin:4,
 
-                  //   formatter: function (value) {
 
-                  //     const vl = Math.floor(value.length/2);
 
-                  //     let newText = value.slice(0,vl)+'\n'+value.slice(vl)
 
-                  //     return newText;
 
-                  // },
 
-                  color:function(value,index){
 
-                    const textWidth = option['dataset']['source'][option['dataset']['source'].length-1][1]/6/2;
 
-                    const vl = option['dataset']['source'][index+1][1]
 
-                    return vl >= textWidth ? 'white' : '#3c4654';
 
-                  }
 
-                  },
 
-                },
 
-                series: [
 
-                  {
 
-                    type: 'bar',
 
-                    barWidth:55,
 
-                    label:{
 
-                      show:true,
 
-                      position:"right"
 
-                    },
 
-                    encode: {
 
-                      x: 'amount',
 
-                      y: 'product'
 
-                    },
 
-                    itemStyle:{
 
-                      color:"#3eb370"
 
-                    }
 
-                  }
 
-                ]
 
-              }
 
-              Horizontal.setOption(option)
 
+import * as echarts from "echarts";
 
+export default {
 
+  props: ["data"],
 
+  methods: {
 
+    setHorizontalData() {
 
+      const Horizontal = echarts.init(this.$refs["Horizontal"]);
 
+      let option = {
 
+        grid: {
 
+          top: 80, // 设置网格顶部的边距为 50px
 
+          left: 10,
 
+          bottom: 0,
 
+          right: "100px",
 
+          // left:'-10px'
 
+        },
 
+        title: {
 
+          text: "创客活动资金",
 
+        },
 
+        tooltip: {
 
+          trigger: "item",
 
+        },
 
+        dataset: {
 
+          source: [["product", "amount"], ...this.data],
 
+        },
 
+        xAxis: {
 
+          position: "top",
 
+          name: "单位：元",
 
+          nameTextStyle: {
 
+            fontSize: 14,
 
+            align: "left",
 
+            verticalAlign: "bottom",
 
+            padding: [0, 0, 7, 10],
 
+          },
 
+        },
 
+        yAxis: {
 
+          type: "category",
 
+          zlevel: 1,
 
+          axisLabel: {
 
+            inside: true,
 
+            margin: 4,
 
+            //   formatter: function (value) {
 
+            //     const vl = Math.floor(value.length/2);
 
+            //     let newText = value.slice(0,vl)+'\n'+value.slice(vl)
 
+            //     return newText;
 
+            // },
 
+            color: function (value, index) {
 
+              const textWidth =
 
+                option["dataset"]["source"][
 
+                  option["dataset"]["source"].length - 1
 
+                ][1] /
 
+                6 /
 
+                2;
 
+              const vl = option["dataset"]["source"][index + 1][1];
 
+              return vl >= textWidth ? "white" : "#3c4654";
 
             },
 
+          },
 
         },
 
-        mounted(){
 
-            this.setHorizontalData();
 
-            console.log(this.HorizontalData);
 
-        }
 
-
 
-    }
 
+        series: [
 
+          {
 
+            type: "bar",
 
+            barWidth: 55,
 
+            label: {
 
+              show: true,
 
+              position: "right",
 
+            },
 
+            encode: {
 
+              x: "amount",
 
+              y: "product",
 
+            },
 
+            itemStyle: {
 
+              color: "#3eb370",
 
+            },
 
+          },
 
+        ],
 
+      };
 
+      Horizontal.setOption(option);
 
+    },
 
+  },
 
+  mounted() {
 
+    this.setHorizontalData();
 
+    console.log(this.HorizontalData);
 
+  },
 
+};
 
 </script>
 
 
 <style lang="less" scoped>
 
-
 
 </style>

+ 196 - 166
src/views/echarts/echarts.vue
Zobraziť súbor 

@@ -1,207 +1,237 @@
 
 <template>
 
-    <!-- 创业公司登记 -->
 
-    <div class="firm" v-loading="loading">
 
-      <div class="pAHeader">
 
-        <div class="pAHeader1">数据监测</div>
 
-      </div>
 
-      <hr />
 
-      <!-- 顶部展示信息区开始 -->
 
-      <topData v-if="!loading" :data="HeaderData"/>
 
-      <!-- 顶部展示信息区结束 -->
 
-      <!-- 中部大饼区开始 -->
 
-     <div class="midBlock">
 
+  <!-- 创业公司登记 -->
 
+  <div class="firm" v-loading="loading">
 
+    <div class="pAHeader">
 
+      <div class="pAHeader1">数据监测</div>
 
+    </div>
 
+    <hr />
 
+    <!-- 顶部展示信息区开始 -->
 
+    <topData v-if="!loading" :data="HeaderData" />
 
+    <!-- 顶部展示信息区结束 -->
 
+    <!-- 中部大饼区开始 -->
 
+    <div class="midBlock">
 
       <!-- 圆形图开始 -->
 
-      <CircularChart v-if="!loading" :data="CircularData"/>
 
+      <CircularChart v-if="!loading" :data="CircularData" />
 
       <!-- 圆形图结束 -->
 
       <!-- 横向柱状图开始 -->
 
-      <HorizontalChart v-if="!loading" :data="HorizontalData"/>
 
+      <HorizontalChart v-if="!loading" :data="HorizontalData" />
 
       <!-- 横向柱状图结束 -->
 
-     </div>
 
-      <!-- 中部大饼区结束 -->
 
-
 
-      <!-- 柱状图区域开始 -->
 
-      <ColumnarChart v-if="!loading" :data="ColumnarData"/>
 
-      <!-- 柱状图区域结束 -->
 
-
 
-      <!-- 底部表格区域开始 -->
 
-      <RankingTable v-if="!loading" :tableData="tableData"/>
 
-<!-- 通知表格结束-->
 
-      <!-- 底部表格区域结束 -->
 
+    </div>
 
+    <!-- 中部大饼区结束 -->
 
 
+    <!-- 柱状图区域开始 -->
 
+    <ColumnarChart v-if="!loading" :data="ColumnarData" />
 
+    <!-- 柱状图区域结束 -->
 
 
-    </div>
 
-  </template>
 
+    <!-- 底部表格区域开始 -->
 
+    <RankingTable v-if="!loading" :tableData="tableData" />
 
+    <!-- 通知表格结束-->
 
+    <!-- 底部表格区域结束 -->
 
+  </div>
 
+</template>
 
     
   <script>
 
- //顶部数据
 
- import topData from './components/topData.vue'
 
- //圆形图
 
- import CircularChart from './components/CircularChart.vue';
 
- //横向柱状图
 
- import HorizontalChart from './components/HorizontalChart.vue';
 
- //竖向柱状图
 
- import ColumnarChart from './components/ColumnarChart.vue';
 
- //排名表格
 
- import RankingTable from './components/RankingTable.vue';
 
-  export default {
 
-   components:{topData,CircularChart,HorizontalChart,ColumnarChart,RankingTable},
 
-    data() {
 
-      return {
 
-        loading:false,
 
-        //头部区域数据
 
-        HeaderData:{
 
-          people:0,
 
-          project:0,
 
-          activity:0,
 
-          // budget:0,
 
-          isPay:0
 
-        },
 
-        //圆形
 
-        CircularData:[
 
-          {value:0,name:"个人创客"},
 
-          {value:0,name:"创客活动"}
 
-        ],
 
-        //横行的柱状
 
-        HorizontalData:[
 
-            // [ '物联网激光切割器',0],
 
-            // [ '人工智能领跑马拉松',1000, ],
 
-            // [ '3D演奏智能工具', 2000],
 
-            // [ '人工智能分链机器',3000],
 
-        ],
 
-        // 柱状
 
-        ColumnarData:[
 
-              // ['3D智能分链机器', 2000],
 
-              // ['3D智能分链机器1',3000],
 
-              // ['3D智能分链机器2', 2500],
 
-              // ['3D智能分链机器3', 1000],
 
-              // ['3D智能分链机器4', 2000],
 
-              // ['3D智能分链机器5',3000],
 
-              // ['3D智能分链机器6', 2500],
 
-              // ['3D智能分链机器7', 1000],
 
-              // ['3D智能分链机器8', 2000],
 
-              // ['3D智能分链机器9',3000],
 
-              // ['3D智能分链机器10', 2500],
 
-              // ['3D智能分链机器11', 1000],
 
-              // ['3D智能分链机器12', 2000],
 
-              // ['3D智能分链机器13',3000],
 
-              // ['3D智能分链机器14', 2500],
 
-              // ['3D智能分链机器15', 1000],
 
-            ],
 
-        tableData: [
 
-          // {title:"人工智能分链机器",pro_leader:"覃罡彤",TypeName:"个人创客",Activity:"286",ClassName:"信息与通讯学院"},
 
-          // {title:"3D演奏智能工具",pro_leader:"袁一鸣",TypeName:"个人创客",Activity:"225",ClassName:"信息与通讯学院"},
 
-          // {title:"物联网切割机器",pro_leader:"张晓分",TypeName:"个人创客",Activity:"169",ClassName:"中德制造"},
 
-          // {title:"人工智能领航AI马拉松",pro_leader:"林子夏",TypeName:"创客活动",Activity:"121",ClassName:"中德制造"},
 
-        ]
 
-      };
 
-    },
 
-    methods:{
 
-      getData(){
 
-        this.loading = true;
 
-        this.ajax.get(this.$store.state.api+'/getEchartsData',{
 
-          uid:this.$store.state.userInfo.userid
 
-        }).then(result=>{
 
-          console.log(result);
 
-          let data = result['data'];
 
+//顶部数据
 
+import topData from "./components/topData.vue";
 
+//圆形图
 
+import CircularChart from "./components/CircularChart.vue";
 
+//横向柱状图
 
+import HorizontalChart from "./components/HorizontalChart.vue";
 
+//竖向柱状图
 
+import ColumnarChart from "./components/ColumnarChart.vue";
 
+//排名表格
 
+import RankingTable from "./components/RankingTable.vue";
 
+export default {
 
+  components: {
 
+    topData,
 
+    CircularChart,
 
+    HorizontalChart,
 
+    ColumnarChart,
 
+    RankingTable,
 
+  },
 
+  data() {
 
+    return {
 
+      loading: false,
 
+      //头部区域数据
 
+      HeaderData: {
 
+        people: 0,
 
+        project: 0,
 
+        activity: 0,
 
+        // budget:0,
 
+        isPay: 0,
 
+      },
 
+      //圆形
 
+      CircularData: [
 
+        { value: 0, name: "创客空间" },
 
+        { value: 0, name: "创客项目" },
 
+        { value: 0, name: "创客活动" },
 
+      ],
 
+      //横行的柱状
 
+      HorizontalData: [
 
+        // [ '物联网激光切割器',0],
 
+        // [ '人工智能领跑马拉松',1000, ],
 
+        // [ '3D演奏智能工具', 2000],
 
+        // [ '人工智能分链机器',3000],
 
+      ],
 
+      // 柱状
 
+      ColumnarData: [
 
+        // ['3D智能分链机器', 2000],
 
+        // ['3D智能分链机器1',3000],
 
+        // ['3D智能分链机器2', 2500],
 
+        // ['3D智能分链机器3', 1000],
 
+        // ['3D智能分链机器4', 2000],
 
+        // ['3D智能分链机器5',3000],
 
+        // ['3D智能分链机器6', 2500],
 
+        // ['3D智能分链机器7', 1000],
 
+        // ['3D智能分链机器8', 2000],
 
+        // ['3D智能分链机器9',3000],
 
+        // ['3D智能分链机器10', 2500],
 
+        // ['3D智能分链机器11', 1000],
 
+        // ['3D智能分链机器12', 2000],
 
+        // ['3D智能分链机器13',3000],
 
+        // ['3D智能分链机器14', 2500],
 
+        // ['3D智能分链机器15', 1000],
 
+      ],
 
+      tableData: [
 
+        // {title:"人工智能分链机器",pro_leader:"覃罡彤",TypeName:"个人创客",Activity:"286",ClassName:"信息与通讯学院"},
 
+        // {title:"3D演奏智能工具",pro_leader:"袁一鸣",TypeName:"个人创客",Activity:"225",ClassName:"信息与通讯学院"},
 
+        // {title:"物联网切割机器",pro_leader:"张晓分",TypeName:"个人创客",Activity:"169",ClassName:"中德制造"},
 
+        // {title:"人工智能领航AI马拉松",pro_leader:"林子夏",TypeName:"创客活动",Activity:"121",ClassName:"中德制造"},
 
+      ],
 
+    };
 
+  },
 
+  methods: {
 
+    getData() {
 
+      this.loading = true;
 
+      this.ajax
 
+        .get(this.$store.state.api + "/getEchartsData", {
 
+          uid: this.$store.state.userInfo.userid,
 
+        })
 
+        .then((result) => {
 
+          let data = result["data"];
 
           // console.log(data)
 
           //创客项目人数
 
-          this.HeaderData['people']=data[0][0]['total']
 
+          this.HeaderData["people"] = data[0][0]["total"];
 
           //目前积累项目数量
 
-          this.HeaderData['project'] = data[1][0]['student']+data[1][0]['wordspace']
 
+          this.HeaderData["project"] =
 
+            data[1][0]["student"] + data[1][0]["wordspace"];
 
           //目前积累活动数量
 
-          this.HeaderData['activity'] = data[2][0]['Maker']+data[2][0]['personal']
 
+          this.HeaderData["activity"] =
 
+            data[2][0]["Maker"] + data[2][0]["personal"];
 
           //已支出预算
 
           let num = 0;
 
-          data[3].forEach(item=>{
 
-            item['isUse'] = 0;
 
-            let isUse =JSON.parse(item['actualuse']);
 
-            for(let i in isUse)item['isUse']+=Number(isUse[i]);
 
-            num+=item['isUse'];
 
-          })
 
+          data[3].forEach((item) => {
 
+            item["isUse"] = 0;
 
+            let isUse = JSON.parse(item["actualuse"]);
 
+            for (let i in isUse) item["isUse"] += Number(isUse[i]);
 
+            num += item["isUse"];
 
+          });
 
           // this.HeaderData['isPay'] = 9999999;
 
           // this.HeaderData['isPay'] = 10000000;
 
-          this.HeaderData['isPay'] = num;
 
+          this.HeaderData["isPay"] = num;
 
           //扇形图数据
 
-          this.CircularData[0]['value'] = data[2][0]['personal']
 
-          this.CircularData[1]['value'] = data[2][0]['Maker']
 
+          this.CircularData[0]["value"] = data[5][0]["tskj"];
 
+          this.CircularData[1]["value"] = data[5][0]["ckxm"];
 
+          this.CircularData[2]["value"] = data[2][0]["Maker"];
 
 
           //创客活动资金
 
           console.log(data[3]);
 
-          let MakerData = data[3].filter(item=>item.type==0);
 
+          let MakerData = data[3].filter((item) => item.type == 2);
 
           let GroupMakerData = [];
 
-          MakerData.forEach(item=>{
 
-            let addActivity = GroupMakerData.filter(fItem=>fItem['acId']==item['acId']);
 
-            if(addActivity.length!=0){
 
-              addActivity[0]['isUse']+=item['isUse'];
 
-            }else{
 
+          MakerData.forEach((item) => {
 
+            let addActivity = GroupMakerData.filter(
 
+              (fItem) => fItem["acId"] == item["acId"]
 
+            );
 
+            if (addActivity.length != 0) {
 
+              addActivity[0]["isUse"] += item["isUse"];
 
+            } else {
 
               GroupMakerData.push(item);
 
             }
 
-          })
 
-          GroupMakerData.sort((item1,item2)=>item2['isUse']-item1['isUse']).splice(0,4).sort((item1,item2)=>item1['isUse']-item2['isUse']).forEach(item=>this.HorizontalData.push([item['title'],item['isUse']]))
 
+          });
 
+          GroupMakerData.sort((item1, item2) => item2["isUse"] - item1["isUse"])
 
+            .splice(0, 4)
 
+            .sort((item1, item2) => item1["isUse"] - item2["isUse"])
 
+            .forEach((item) =>
 
+              this.HorizontalData.push([item["title"], item["isUse"]])
 
+            );
 
 
-          //个人创客资金
 
-          let personalData =  data[3].filter(item=>item.type==1);
 
-          console.log(personalData)
 
+          //项目资金
 
+          let personalData = data[6].filter((item) => item.type != 2);
 
           let GroupPersonalData = [];
 
-          personalData.forEach(item=>{
 
-            let addActivity = GroupPersonalData.filter(fItem=>fItem['acId']==item['acId']);
 
-            if(addActivity.length!=0){
 
-              addActivity[0]['isUse']+=item['isUse'];
 
-            }else{
 
+          personalData.forEach((item) => {
 
+            let addActivity = GroupPersonalData.filter(
 
+              (fItem) => fItem["acId"] == item["acId"]
 
+            );
 
+            if (addActivity.length != 0) {
 
+              addActivity[0]["isUse"] += item["isUse"];
 
+            } else {
 
               GroupPersonalData.push(item);
 
             }
 
-          })
 
-          console.log(GroupPersonalData);
 
-          GroupPersonalData.sort((item1,item2)=>item2['isUse']-item1['isUse']).splice(0,16).sort((item1,item2)=>item1['isUse']-item2['isUse']).forEach(item=>this.ColumnarData.push([item['title'],item['isUse']]))
 
+          });
 
+          for (var i = 0; i < GroupPersonalData.length; i++) {
 
+            var obj = eval("(" + GroupPersonalData[i].actualuse + ")");
 
+            var sum = 0;
 
+            for (var key in obj) {
 
+              if (obj.hasOwnProperty(key)) {
 
+                sum += parseInt(obj[key]);
 
+              }
 
+            }
 
+            GroupPersonalData[i].value = sum;
 
+          }
 
+          GroupPersonalData.sort(function (a, b) {
 
+            return a.value - b.value;
 
+          });
 
+          GroupPersonalData.forEach((item) =>
 
+            this.ColumnarData.push([item["title"], item["value"]])
 
+          );
 
           //项目排名
 
           this.tableData = data[4];
 
 
-
 
-
 
-
 
-
 
           this.loading = false;
 
-        }).catch(err=>{
 
-          console.log(err)
 
         })
 
-      }
 
+        .catch((err) => {
 
+          console.log(err);
 
+        });
 
     },
 
-    mounted(){
 
-      this.getData();
 
-    }
 
-  };
 
-  </script>
 
+  },
 
+  mounted() {
 
+    this.getData();
 
+  },
 
+};
 
+</script>
 
     
 <style lang="less">
 
-  .midBlock{     //中部大饼
 
-    max-width: 100%;
 
-    min-width: 90%;
 
-    height: 400px;
 
-    margin-top: 20px;
 
-    // background: #ce7070;
 
-    display: flex;
 
-    justify-content: space-between;
 
-    align-items: center;
 
-    .mid{
 
-      height: 95%;
 
-      width: 49%;
 
-      padding: 20px;
 
-      padding-left: 0;
 
-      box-sizing: border-box;
 
-      background: #f3f6f7;
 
-      overflow: hidden;
 
-    }
 
-  }
 
-
 
-  .histogram{       //柱状图
 
-    margin-top: 20px;
 
-    padding-top: 20px;    
+.midBlock {
 
+  //中部大饼
 
+  max-width: 100%;
 
+  min-width: 90%;
 
+  height: 400px;
 
+  margin-top: 20px;
 
+  // background: #ce7070;
 
+  display: flex;
 
+  justify-content: space-between;
 
+  align-items: center;
 
+  .mid {
 
+    height: 95%;
 
+    width: 49%;
 
+    padding: 20px;
 
+    padding-left: 0;
 
     box-sizing: border-box;
 
-    // padding: 20px;
 
-    min-width: 90%;
 
-    max-width: 100%;
 
-    height: 400px;
 
     background: #f3f6f7;
 
     overflow: hidden;
 
   }
 
+}
 
+
 
+.histogram {
 
+  //柱状图
 
+  margin-top: 20px;
 
+  padding-top: 20px;
 
+  box-sizing: border-box;
 
+  // padding: 20px;
 
+  min-width: 90%;
 
+  max-width: 100%;
 
+  height: 400px;
 
+  background: #f3f6f7;
 
+  overflow: hidden;
 
+}
 
 </style>

+ 1 - 1
src/views/projectApply/MakerSpaceApply.vue
Zobraziť súbor 

@@ -15,7 +15,7 @@
 
           :visible.sync="submitHint"
 
           width="600px"
 
           class="pageSubmitData">
 
-          <div class="deleteContent">确定提交“{{wordData['projectName']}}”项目立项？</div>
 
+          <div class="deleteContent">确定提交“{{wordData['projectName']}}”项目吗？</div>
 
           <span slot="footer" class="dialog-footer">
 
             <el-button type="primary" @click="applyProject" class="AllDialogBtn">确认提交</el-button>
 
             <el-button @click="submitHint=false" class="AllDialogBtn">取消</el-button>

+ 1 - 1
src/views/projectApply/newStudentProjectApply.vue
Zobraziť súbor 

@@ -19,7 +19,7 @@
 
           width="600px"
 
           class="pageSubmitData">
 
           
-          <div class="deleteContent">确定提交“{{wordData['projectName']}}”项目立项？</div>
 
+          <div class="deleteContent">确定提交“{{wordData['projectName']}}”项目吗？</div>
 
           <span slot="footer" class="dialog-footer">
 
             <el-button type="primary" @click="submitWord" class="AllDialogBtn">确认提交</el-button>
 
             <el-button @click="submitHint=false" class="AllDialogBtn">取消</el-button>

+ 3 - 3
src/views/projectApply/projectApplication.vue
Zobraziť súbor 

@@ -253,21 +253,21 @@
 
               >
 
               <el-button
 
                 type="primary"
 
-                v-if="scope.row.isupload == 2"
 
+                v-if="scope.row.isupload == 2&& $store.state.userInfo.type!=0"
 
                 class="disa"
 
                 size="mini"
 
                 >已审核</el-button
 
               >
 
               <el-button
 
                 type="primary"
 
-                v-if="scope.row.isupload == 3"
 
+                v-if="scope.row.isupload == 3&& $store.state.userInfo.type!=0"
 
                 class="disa"
 
                 size="mini"
 
                 >待结项</el-button
 
               >
 
               <el-button
 
                 type="primary"
 
-                v-if="scope.row.isupload == 4"
 
+                v-if="scope.row.isupload == 4&& $store.state.userInfo.type!=0"
 
                 class="disa"
 
                 size="mini"
 
                 >已结项</el-button

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov