liuxiangqi 1 年間 前
コミット
7babf6c324
共有5 個のファイルを変更した36 個の追加7 個の削除を含む
  1. 1 1
      src/assets/styles/ruoyi.scss
  2. 2 1
      src/assets/styles/sidebar.scss
  3. 1 1
      src/components/Breadcrumb/index.vue
  4. 1 1
      src/layout/components/Sidebar/Logo.vue
  5. 31 3
      src/views/index.vue

+ 1 - 1
src/assets/styles/ruoyi.scss

@@ -78,7 +78,7 @@
 			background-color: #f8f8f9;
 			color: #515a6e;
 			height: 40px;
-			font-size: 13px;
+			font-size: 14px;
 		}
 	}
 	.el-table__body-wrapper {

+ 2 - 1
src/assets/styles/sidebar.scss

@@ -73,7 +73,8 @@
     .el-menu-item, .el-submenu__title {
       overflow: hidden !important;
       text-overflow: ellipsis !important;
-      white-space: nowrap !important;
+      white-space: nowrap !important;
+      font-size: 15px;
     }
 
     // menu hover

+ 1 - 1
src/components/Breadcrumb/index.vue

@@ -62,7 +62,7 @@ export default {
 <style lang="scss" scoped>
 .app-breadcrumb.el-breadcrumb {
   display: inline-block;
-  font-size: 14px;
+  font-size: 15px;
   line-height: 50px;
   margin-left: 8px;
 

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -78,7 +78,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 16px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

+ 31 - 3
src/views/index.vue

@@ -119,14 +119,29 @@
           </template>
         </el-table-column>
       </el-table>
+      <h3 class="toolbar">
+        <span class="title">已申报项目</span>
+        <div class="tool">
+          <el-button type="text" size="mini" @click="$router.push('/project/project-declare')">查看更多</el-button>
+        </div>
+      </h3>
+      <el-table v-loading="loading" :data="declareList" border>
+        <el-table-column label="申报年度" prop="projectYear"></el-table-column>
+        <el-table-column label="项目起止时间" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" prop="projectName" align="center"/>
+      </el-table>
     </template>
-    
+
   </div>
 </template>
 
 <script>
   import {getIndexDataApi} from "@/api/common/common.js"
-  import {yearListApi} from "@/api/enterprise/project/project"
+  import {yearListApi,listProjectApi} from "@/api/enterprise/project/project"
 export default {
   name: "Index",
   computed: {
@@ -144,16 +159,21 @@ export default {
       version: "1.0.0",
       info: {},
       list: [],
+      declareList: [],
       total: 0,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-      },
+      },
+      params: {
+        reportState: '4'
+      }
     };
   },
   created() {
     this.getData()
     this.getList()
+    this.getDeclareList()
   },
   methods: {
     goTarget(href) {
@@ -179,6 +199,14 @@ export default {
     //编辑
     handleEdit(row) {
       this.$router.push({name: 'editProject', query: {id: row.id, entId: row.entId, type: 'update', activeName: '1', source: 'add'}})
+    },
+    getDeclareList() {
+      this.loading = true;
+      listProjectApi(this.params).then(response => {
+        this.declareList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
   }
 };