gks 1 year ago
parent
commit
9e920f8f3e
2 changed files with 15 additions and 15 deletions
  1. 3 3
      src/views/ONLINE/index.vue
  2. 12 12
      src/views/RANK/index.vue

+ 3 - 3
src/views/ONLINE/index.vue

@@ -125,9 +125,9 @@ export default {
       rules: {
         id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
         delFlag: [{ required: true, message: '删除标志不能为空', trigger: 'blur' }],
-        deptId: [{ required: true, message: '单位编码不能为空', trigger: 'blur' },
-                 { pattern: /^[1-9a-zA-Z]{1,}$/, message: '单位编码只能输入数字和字母', trigger: 'blur' }
-                ],
+        // deptId: [{ required: true, message: '单位编码不能为空', trigger: 'blur' },
+        //          { pattern: /^[1-9a-zA-Z]{1,}$/, message: '单位编码只能输入数字和字母', trigger: 'blur' }
+        //         ],
         depName: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
         telphone: [{ required: true, message: '单位电话不能为空', trigger: 'blur' },
                   {validator: this.validateMobile, trigger: "blur"}],

+ 12 - 12
src/views/RANK/index.vue

@@ -77,17 +77,17 @@
       </el-table-column>
       <el-table-column label="全国进出口值排名" align="center" prop="ranking">
         <template slot-scope="scope">
-          {{scope.row.ranking}}
+          {{scope.row.ranking == 0 ?'-':scope.row.ranking}}
         </template>
       </el-table-column>
       <el-table-column label="中西部绩效排名" align="center" prop="midwestRanking">
         <template slot-scope="scope">
-          {{scope.row.midwestRanking}}
+          {{scope.row.midwestRanking==0?'-':scope.row.midwestRanking}}
         </template>
       </el-table-column>
       <el-table-column label="全国绩效排名" align="center" prop="nationalPerformanceRanking">
         <template slot-scope="scope">
-          {{scope.row.nationalPerformanceRanking}}
+          {{scope.row.nationalPerformanceRanking==0?'-':scope.row.nationalPerformanceRanking}}
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -257,17 +257,17 @@ export default {
     },
     // 获取近年年份
     getNearYear() {
-      let currentDate = new Date();
-      let curYear = currentDate.getFullYear();
+      // let currentDate = new Date();
+      // let curYear = currentDate.getFullYear();
 
-      // 获取近三年
-      let nearYearArr = [];
-      nearYearArr.push(curYear)
-      for (let i = 1; i <= 4; i++) {
-        nearYearArr.push(curYear - i + '');
-      }
+      // // 获取近三年
+      // let nearYearArr = [];
+      // nearYearArr.push(curYear)
+      // for (let i = 1; i <= 10; i++) {
+      //   nearYearArr.push(curYear - i + '');
+      // }
 
-      this.nearYearList = nearYearArr
+      // this.nearYearList = nearYearArr
 
     },
     // 取消按钮