licailing 5 years ago
parent
commit
a49c1f5803

+ 4 - 1
src/main/vue/src/views/PerformanceList.vue

@@ -106,7 +106,10 @@ export default {
             return '';
             return '';
         },
         },
         beforeGetData() {
         beforeGetData() {
-            return { search: this.search };
+            return {
+                search: this.search,
+                sort: 'createdAt,desc'
+            };
         },
         },
         toggleMultipleMode(multipleMode) {
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
             this.multipleMode = multipleMode;

+ 20 - 4
src/main/vue/src/views/RateList.vue

@@ -66,7 +66,7 @@
                         type="primary"
                         type="primary"
                         size="mini"
                         size="mini"
                         plain
                         plain
-                        v-if="row.status === 'FIRST_REVIEW_PASS'"
+                        v-if="(row.status === 'FIRST_REVIEW_PASS') & display"
                         >分配专家组</el-button
                         >分配专家组</el-button
                     >
                     >
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
@@ -130,13 +130,18 @@ export default {
             ],
             ],
             supervisor: [],
             supervisor: [],
             dialogVisible: false,
             dialogVisible: false,
-            rateId: ''
+            rateId: '',
+            display: false
         };
         };
     },
     },
+    created() {
+        this.getAdmin();
+    },
     computed: {
     computed: {
         selection() {
         selection() {
             return this.$refs.table.selection.map(i => i.id);
             return this.$refs.table.selection.map(i => i.id);
-        }
+        },
+        ...mapState(['userInfo'])
     },
     },
     mounted() {
     mounted() {
         this.$http
         this.$http
@@ -166,7 +171,10 @@ export default {
             return '';
             return '';
         },
         },
         beforeGetData() {
         beforeGetData() {
-            return { search: this.search };
+            return {
+                search: this.search,
+                sort: 'createdAt,desc'
+            };
         },
         },
         toggleMultipleMode(multipleMode) {
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
             this.multipleMode = multipleMode;
@@ -284,6 +292,14 @@ export default {
             this.$alert('专家打出的分数为:' + row.score, '分数', {
             this.$alert('专家打出的分数为:' + row.score, '分数', {
                 confirmButtonText: '确定'
                 confirmButtonText: '确定'
             });
             });
+        },
+        getAdmin() {
+            let data = this.userInfo.authorities;
+            data.forEach(element => {
+                if (element.name === 'ROLE_ADMIN') {
+                    this.display = true;
+                }
+            });
         }
         }
     }
     }
 };
 };

+ 1 - 0
src/main/vue/src/views/RecordList.vue

@@ -123,6 +123,7 @@ export default {
         beforeGetData() {
         beforeGetData() {
             return {
             return {
                 search: this.search,
                 search: this.search,
+                sort: 'recordTime,desc',
                 query: {
                 query: {
                     district: this.districtId,
                     district: this.districtId,
                     del: false
                     del: false

+ 1 - 0
src/main/vue/src/views/RecordList2.vue

@@ -149,6 +149,7 @@ export default {
         beforeGetData() {
         beforeGetData() {
             return {
             return {
                 search: this.search,
                 search: this.search,
+                sort: 'recordTime,desc',
                 query: {
                 query: {
                     district: this.districtId,
                     district: this.districtId,
                     del: false
                     del: false