展演

src/main/h5/src/views/Home.vue

@@ -65,7 +65,7 @@
             class="text2"
             v-else-if="info.process == 3 && info.programmeStatus == 'SUBMIT'"
           >
-            复审通过
+            已评奖
           </div>
           <div v-if="info.programmeStatus == 'INITIAL'">未提交</div>
           <div v-if="info.programmeStatus == 'AUDIT_FAILED'">初审未通过</div>

src/main/vue/src/views/Dashboard.vue

@@ -45,8 +45,8 @@ export default {
     data() {
         return {
             layout: [
-                { x: 0, y: 0, w: 12, h: 6, i: '0', name: 'BoardWidget' },
-                { x: 6, y: 0, w: 12, h: 6, i: '1', name: 'PolicyWidget' }
+                { x: 0, y: 0, w: 12, h: 8, i: '0', name: 'BoardWidget' },
+                { x: 6, y: 0, w: 12, h: 8, i: '1', name: 'PolicyWidget' }
                 // { x: 0, y: 0, w: 6, h: 4, i: '2', name: 'UserWidget' },
                 // { x: 6, y: 4, w: 6, h: 4, i: '3', name: 'UserWidget2' },
                 // { x: 0, y: 8, w: 6, h: 6, i: '4', name: 'BarChartWidget' },

src/main/vue/src/views/performance/ProgrammeGOList.vue

@@ -171,8 +171,7 @@ export default {
                 { label: '未提交', value: 'INITIAL' },
                 { label: '已提交', value: 'SUBMIT' },
                 { label: '初选未通过', value: 'AUDIT_FAILED' },
-                { label: '审核未通过', value: 'REVIEW_FAILED' },
-                { label: '已评奖', value: 'COMPLETE' }
+                { label: '审核未通过', value: 'REVIEW_FAILED' }
             ],
             showMore: false,
             programme: {},

src/main/vue/src/views/performance/ProgrammeList.vue

@@ -270,7 +270,7 @@
                     <span v-if="row.process == 0 && row.programmeStatus == 'SUBMIT'">初审中</span>
                     <span v-if="row.process == 1 && row.programmeStatus == 'SUBMIT'">初审通过</span>
                     <span v-if="row.process == 2 && row.programmeStatus == 'SUBMIT'">复审中</span>
-                    <span v-if="row.process == 3 && row.programmeStatus == 'SUBMIT'">复审通过</span>
+                    <span v-if="row.process == 3 && row.programmeStatus == 'SUBMIT'">已评奖</span>
                     <span v-if="row.programmeStatus == 'INITIAL'">未提交</span>
                     <span v-if="row.programmeStatus == 'AUDIT_FAILED'">初审未通过</span>
                     <span v-if="row.programmeStatus == 'REVIEW_FAILED'">复审未通过</span>
@@ -468,8 +468,7 @@ export default {
                 { label: '未提交', value: 'INITIAL' },
                 { label: '已提交', value: 'SUBMIT' },
                 { label: '初选未通过', value: 'AUDIT_FAILED' },
-                { label: '审核未通过', value: 'REVIEW_FAILED' },
-                { label: '已评奖', value: 'COMPLETE' }
+                { label: '审核未通过', value: 'REVIEW_FAILED' }
             ],
             showMore: false,
             programme: {},

src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -243,7 +243,7 @@
                     <span v-if="row.process == 0 && row.programmeStatus == 'SUBMIT'">初审中</span>
                     <span v-if="row.process == 1 && row.programmeStatus == 'SUBMIT'">初审通过</span>
                     <span v-if="row.process == 2 && row.programmeStatus == 'SUBMIT'">复审中</span>
-                    <span v-if="row.process == 3 && row.programmeStatus == 'SUBMIT'">复审通过</span>
+                    <span v-if="row.process == 3 && row.programmeStatus == 'SUBMIT'">已评奖</span>
                     <span v-if="row.programmeStatus == 'INITIAL'">未提交</span>
                     <span v-if="row.programmeStatus == 'AUDIT_FAILED'">初审未通过</span>
                     <span v-if="row.programmeStatus == 'REVIEW_FAILED'">复审未通过</span>
@@ -387,8 +387,7 @@ export default {
                 { label: '未提交', value: 'INITIAL' },
                 { label: '已提交', value: 'SUBMIT' },
                 { label: '初选未通过', value: 'AUDIT_FAILED' },
-                { label: '审核未通过', value: 'REVIEW_FAILED' },
-                { label: '已评奖', value: 'COMPLETE' }
+                { label: '审核未通过', value: 'REVIEW_FAILED' }
             ],
             loading: false,
             programme: {},

src/main/vue/src/widgets/BoardWidget.vue

@@ -43,7 +43,11 @@ export default {
             this.height = this.$refs.container.$el.offsetHeight - 100;
         });
         this.$http
-            .post('/announcement/all', { size: 10, query: { type: 'NOTIFICATION' } }, { body: 'json' })
+            .post(
+                '/announcement/all',
+                { size: 10, sort: 'createdAt,desc', query: { type: 'NOTIFICATION' } },
+                { body: 'json' }
+            )
             .then(res => {
                 this.tableData = res.content;
                 this.isEmpty = res.empty;

src/main/vue/src/widgets/PolicyWidget.vue

@@ -42,10 +42,16 @@ export default {
         this.$nextTick(() => {
             this.height = this.$refs.container.$el.offsetHeight - 100;
         });
-        this.$http.post('/announcement/all', { size: 10, query: { type: 'POLICY' } }, { body: 'json' }).then(res => {
-            this.tableData = res.content;
-            this.isEmpty = res.empty;
-        });
+        this.$http
+            .post(
+                '/announcement/all',
+                { size: 10, sort: 'createdAt,desc', query: { type: 'POLICY' } },
+                { body: 'json' }
+            )
+            .then(res => {
+                this.tableData = res.content;
+                this.isEmpty = res.empty;
+            });
     }
 };
 </script>