licailing 4 лет назад
Родитель
Сommit
d605a96d77

+ 2 - 0
src/main/java/com/izouma/wenlvju/domain/performance/Arrange.java

@@ -1,5 +1,6 @@
 package com.izouma.wenlvju.domain.performance;
 
+import com.izouma.wenlvju.annotations.SearchableOne;
 import com.izouma.wenlvju.converter.LongArrayConverter;
 import com.izouma.wenlvju.domain.BaseEntity;
 import com.izouma.wenlvju.enums.PerformanceStatus;
@@ -28,6 +29,7 @@ public class Arrange extends BaseEntity {
 
     private String name;
 
+    @SearchableOne
     @ApiModelProperty(value = "活动地点")
     private String address;
 

+ 285 - 343
src/main/vue/src/router.js

@@ -72,6 +72,14 @@ const router = new Router({
                         title: '菜单权限'
                     }
                 },
+                {
+                    path: '/upload',
+                    name: 'upload',
+                    component: () => import(/* webpackChunkName: "upload" */ '@/views/Upload.vue'),
+                    meta: {
+                        title: '上传'
+                    }
+                },
                 {
                     path: '/userEdit',
                     name: 'userEdit',
@@ -93,84 +101,92 @@ const router = new Router({
                     name: 'StaffList',
                     component: () => import(/* webpackChunkName: "staffList" */ '@/views/user/StaffList.vue'),
                     meta: {
-                        title: '用户管理'
+                        title: '工作人员'
                     }
                 },
                 {
-                    path: '/echarts',
-                    name: 'echarts',
-                    component: () => import('@/views/Echarts.vue'),
+                    path: '/expertList',
+                    name: 'expertList',
+                    component: () => import(/* webpackChunkName: "expertList" */ '@/views/user/ExpertList.vue'),
                     meta: {
-                        title: '地图图表'
+                        title: '专家管理'
                     }
                 },
                 {
-                    path: '/video',
-                    name: 'video',
-                    component: () => import(/* webpackChunkName: "video" */ '@/views/Video.vue'),
+                    path: '/expertEdit',
+                    name: 'expertEdit',
+                    component: () => import(/* webpackChunkName: "expertEdit" */ '@/views/user/ExpertEdit.vue'),
                     meta: {
-                        title: '监控平台'
+                        title: '专家编辑'
                     }
                 },
                 {
-                    path: '/assignExpert',
-                    name: 'assignExpert',
-                    component: () => import(/* webpackChunkName: "assignExpert" */ '@/views/rate/AssignExpert.vue'),
+                    path: '/organizationEdit',
+                    name: 'OrganizationEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "organizationEdit" */ '@/views/organization/OrganizationEdit.vue'),
                     meta: {
-                        title: '分配专家组'
+                        title: '承办单位编辑'
                     }
                 },
                 {
-                    path: '/arrangeAssignExpert',
-                    name: 'arrangeAssignExpert',
+                    path: '/organizationList',
+                    name: 'OrganizationList',
                     component: () =>
-                        import(
-                            /* webpackChunkName: "arrangeAssignExpert" */ '@/views/performance/ArrangeAssignExpert.vue'
-                        ),
+                        import(/* webpackChunkName: "organizationList" */ '@/views/organization/OrganizationList.vue'),
                     meta: {
-                        title: '分配评委'
+                        title: '承办单位'
                     }
                 },
                 {
-                    path: '/gradeList',
-                    name: 'gradeList',
-                    component: () => import(/* webpackChunkName: "gradeList" */ '@/views/rate/GradeList.vue'),
+                    path: '/gradingOrganizationEdit',
+                    name: 'GradingOrganizationEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "gradingOrganizationEdit" */ '@/views/GradingOrganizationEdit.vue'),
                     meta: {
-                        title: '评分'
+                        title: '考级机构编辑'
                     }
                 },
                 {
-                    path: '/organization',
-                    name: 'organization',
+                    path: '/gradingOrganizationList',
+                    name: 'GradingOrganizationList',
                     component: () =>
-                        import(/* webpackChunkName: "organization" */ '@/views/organization/Organization.vue'),
+                        import(/* webpackChunkName: "gradingOrganizationList" */ '@/views/GradingOrganizationList.vue'),
                     meta: {
-                        title: '等级评定'
+                        title: '考级机构'
                     }
                 },
                 {
-                    path: '/organization1',
-                    name: 'organization1',
-                    component: () =>
-                        import(/* webpackChunkName: "organization1" */ '@/views/organization/Organization1.vue'),
+                    path: '/operationLogList',
+                    name: 'OperationLogList',
+                    component: () => import(/* webpackChunkName: "operationLogList" */ '@/views/OperationLogList.vue'),
                     meta: {
-                        title: '等级评定'
+                        title: '操作日志'
                     }
                 },
                 {
-                    path: '/expertList',
-                    name: 'expertList',
-                    component: () => import(/* webpackChunkName: "expertList" */ '@/views/user/ExpertList.vue'),
+                    path: '/exceptionLogList',
+                    name: 'ExceptionLogList',
+                    component: () => import(/* webpackChunkName: "exceptionLogList" */ '@/views/ExceptionLogList.vue'),
                     meta: {
-                        title: '专家管理'
+                        title: '异常日志'
                     }
                 },
+                /**通用设置 */
                 {
-                    path: '/expertEdit',
-                    name: 'expertEdit',
-                    component: () => import(/* webpackChunkName: "expertEdit" */ '@/views/user/ExpertEdit.vue'),
+                    path: '/settings',
+                    name: 'Settings',
+                    component: () => import(/* webpackChunkName: "settingList" */ '@/views/Settings.vue'),
                     meta: {
-                        title: '专家编辑'
+                        title: '设置'
+                    }
+                },
+                {
+                    path: '/artTypes',
+                    name: 'ArtTypes',
+                    component: () => import(/* webpackChunkName: "artTypes" */ '@/views/ArtTypes.vue'),
+                    meta: {
+                        title: '艺术分类'
                     }
                 },
                 {
@@ -182,13 +198,22 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/upload',
-                    name: 'upload',
-                    component: () => import(/* webpackChunkName: "upload" */ '@/views/Upload.vue'),
+                    path: '/awardEdit',
+                    name: 'AwardEdit',
+                    component: () => import(/* webpackChunkName: "awardEdit" */ '@/views/AwardEdit.vue'),
                     meta: {
-                        title: '上传'
+                        title: '奖项类别设置编辑'
+                    }
+                },
+                {
+                    path: '/awardList',
+                    name: 'AwardList',
+                    component: () => import(/* webpackChunkName: "awardList" */ '@/views/AwardList.vue'),
+                    meta: {
+                        title: '奖项类别设置'
                     }
                 },
+                /**备案 */
                 {
                     path: '/recordEdit',
                     name: 'RecordEdit',
@@ -206,57 +231,29 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/recordOrganizationList',
-                    name: 'RecordOrganizationList',
-                    component: () =>
-                        import(/* webpackChunkName: "recordList" */ '@/views/record/RecordOrganizationList.vue'),
+                    path: '/recordInfo',
+                    name: 'RecordInfo',
+                    component: () => import(/* webpackChunkName: "recordInfo" */ '@/views/record/RecordInfo.vue'),
                     meta: {
                         title: '备案管理'
                     }
                 },
                 {
-                    path: '/recordCheck',
-                    name: 'RecordCheck',
-                    component: () => import(/* webpackChunkName: "recordCheck" */ '@/views/record/RecordCheck.vue'),
-                    meta: {
-                        title: '检查记录'
-                    }
-                },
-                {
-                    path: '/recordRegulationList',
-                    name: 'RecordRegulationList',
-                    component: () =>
-                        import(/* webpackChunkName: "recordList" */ '@/views/record/RecordRegulationList.vue'),
-                    meta: {
-                        title: '监管管理'
-                    }
-                },
-                {
-                    path: '/recordRegulationHistory',
-                    name: 'RecordRegulationHistory',
+                    path: '/recordOrganizationList',
+                    name: 'RecordOrganizationList',
                     component: () =>
-                        import(/* webpackChunkName: "recordList" */ '@/views/record/RecordRegulationHistory.vue'),
-                    meta: {
-                        title: '监管管理'
-                    }
-                },
-                {
-                    path: '/videoList',
-                    name: 'VideoList',
-                    component: () => import(/* webpackChunkName: "videoList" */ '@/views/record/VideoList.vue'),
+                        import(/* webpackChunkName: "recordList" */ '@/views/record/RecordOrganizationList.vue'),
                     meta: {
-                        title: '视频监控'
+                        title: '备案管理'
                     }
                 },
                 {
-                    path: '/videoOrganizationList',
-                    name: 'VideoOrganizationList',
+                    path: '/recordDistrictList',
+                    name: 'RecordList',
                     component: () =>
-                        import(
-                            /* webpackChunkName: "videoOrganizationList" */ '@/views/record/VideoOrganizationList.vue'
-                        ),
+                        import(/* webpackChunkName: "recordList" */ '@/views/record/RecordDistrictList.vue'),
                     meta: {
-                        title: '视频监控'
+                        title: '备案管理'
                     }
                 },
                 {
@@ -268,15 +265,6 @@ const router = new Router({
                         title: '监管管理'
                     }
                 },
-                {
-                    path: '/recordDistrictList',
-                    name: 'RecordList',
-                    component: () =>
-                        import(/* webpackChunkName: "recordList" */ '@/views/record/RecordDistrictList.vue'),
-                    meta: {
-                        title: '备案管理'
-                    }
-                },
                 {
                     path: '/recordList',
                     name: 'RecordList',
@@ -285,139 +273,120 @@ const router = new Router({
                         title: '备案管理'
                     }
                 },
+                /**监管 */
                 {
-                    path: '/performanceEdit',
-                    name: 'PerformanceEdit',
+                    path: '/recordRegulationList',
+                    name: 'RecordRegulationList',
                     component: () =>
-                        import(/* webpackChunkName: "performanceEdit" */ '@/views/performance/PerformanceEdit.vue'),
+                        import(/* webpackChunkName: "recordList" */ '@/views/record/RecordRegulationList.vue'),
                     meta: {
-                        title: '展演管理编辑'
+                        title: '监管管理'
                     }
                 },
                 {
-                    path: '/performanceList',
-                    name: 'PerformanceList',
-                    component: () =>
-                        import(/* webpackChunkName: "performanceList" */ '@/views/performance/PerformanceList.vue'),
+                    path: '/videoList',
+                    name: 'VideoList',
+                    component: () => import(/* webpackChunkName: "videoList" */ '@/views/record/VideoList.vue'),
                     meta: {
-                        title: '展演管理'
+                        title: '视频监控'
                     }
                 },
                 {
-                    path: '/performanceListShow',
-                    name: 'PerformanceListShow',
+                    path: '/recordRegulationHistory',
+                    name: 'RecordRegulationHistory',
                     component: () =>
-                        import(/* webpackChunkName: "performanceList" */ '@/views/performance/PerformanceListShow.vue'),
+                        import(/* webpackChunkName: "recordList" */ '@/views/record/RecordRegulationHistory.vue'),
                     meta: {
-                        title: '展演列表'
+                        title: '监管管理'
                     }
                 },
                 {
-                    path: '/performanceShow',
-                    name: 'PerformanceShow',
+                    path: '/historyRoomList',
+                    name: 'HistoryRoomList',
                     component: () =>
-                        import(/* webpackChunkName: "performanceShow" */ '@/views/performance/PerformanceShow.vue'),
-                    meta: {
-                        title: '展演详情'
-                    }
-                },
-                {
-                    path: '/rateEdit',
-                    name: 'RateEdit',
-                    component: () => import(/* webpackChunkName: "rateEdit" */ '@/views/rate/RateEdit.vue'),
-                    meta: {
-                        title: '等级评定申请'
-                    }
-                },
-                {
-                    path: '/rateOrganizerList',
-                    name: 'RateOrganizerList',
-                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateOrganizerList.vue'),
-                    meta: {
-                        title: '等级评定'
-                    }
-                },
-                {
-                    path: '/rateExpertList',
-                    name: 'RateExpertList',
-                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateExpertList.vue'),
+                        import(/* webpackChunkName: "historyRoomList" */ '@/views/video/HistoryRoomList.vue'),
                     meta: {
-                        title: '等级评定'
+                        title: '视频管理'
                     }
                 },
                 {
-                    path: '/rateAudit',
-                    name: 'RateAudit',
-                    component: () => import(/* webpackChunkName: "rateAudit" */ '@/views/rate/RateAudit.vue'),
+                    path: '/recordCheck',
+                    name: 'RecordCheck',
+                    component: () => import(/* webpackChunkName: "recordCheck" */ '@/views/record/RecordCheck.vue'),
                     meta: {
-                        title: '等级评定申请'
+                        title: '检查记录'
                     }
                 },
                 {
-                    path: '/rateGrade',
-                    name: 'RateGrade',
-                    component: () => import(/* webpackChunkName: "rateGrade" */ '@/views/rate/RateGrade.vue'),
+                    path: '/echarts',
+                    name: 'echarts',
+                    component: () => import('@/views/Echarts.vue'),
                     meta: {
-                        title: '打分'
+                        title: '地图图表'
                     }
                 },
                 {
-                    path: '/rateDistrictList',
-                    name: 'RateDistrictList',
-                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateDistrictList.vue'),
+                    path: '/videoOrganizationList',
+                    name: 'VideoOrganizationList',
+                    component: () =>
+                        import(
+                            /* webpackChunkName: "videoOrganizationList" */ '@/views/record/VideoOrganizationList.vue'
+                        ),
                     meta: {
-                        title: '等级评定'
+                        title: '视频监控'
                     }
                 },
                 {
-                    path: '/rateDistrictListPending',
-                    name: 'RateDistrictListPending',
-                    component: () =>
-                        import(/* webpackChunkName: "rateList" */ '@/views/rate/RateDistrictListPending.vue'),
+                    path: '/examRoomEdit',
+                    name: 'ExamRoomEdit',
+                    component: () => import(/* webpackChunkName: "examRoomEdit" */ '@/views/ExamRoomEdit.vue'),
                     meta: {
-                        title: '申请待办'
+                        title: '考场管理编辑'
                     }
                 },
                 {
-                    path: '/rateDistrictListDone',
-                    name: 'RateDistrictListDone',
-                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateDistrictListDone.vue'),
+                    path: '/examRoomList',
+                    name: 'ExamRoomList',
+                    component: () => import(/* webpackChunkName: "examRoomList" */ '@/views/ExamRoomList.vue'),
                     meta: {
-                        title: '申请已办'
+                        title: '考场管理'
                     }
                 },
                 {
-                    path: '/rateList',
-                    name: 'RateList',
-                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateList.vue'),
+                    path: '/showRoomList',
+                    name: 'ShowRoomList',
+                    component: () => import(/* webpackChunkName: "showRoomList" */ '@/views/video/ShowRoomList.vue'),
                     meta: {
-                        title: '等级评定'
+                        title: '监控列表'
                     }
                 },
+                /**咨询投诉 */
                 {
-                    path: '/rateListPending',
-                    name: 'RateListPending',
-                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateListPending.vue'),
+                    path: '/complainEdit',
+                    name: 'ComplainEdit',
+                    component: () => import(/* webpackChunkName: "complainEdit" */ '@/views/ComplainEdit.vue'),
                     meta: {
-                        title: '申请待办'
+                        title: '咨询投诉编辑'
                     }
                 },
                 {
-                    path: '/rateListDone',
-                    name: 'RateListDone',
-                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateListDone.vue'),
+                    path: '/complainShow',
+                    name: 'ComplainShow',
+                    component: () => import(/* webpackChunkName: "complainShow" */ '@/views/ComplainShow.vue'),
                     meta: {
-                        title: '申请完成'
+                        title: '咨询投诉详情'
                     }
                 },
                 {
-                    path: '/rateListRejected',
-                    name: 'RateListRejected',
-                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateListRejected.vue'),
+                    path: '/complainList',
+                    name: 'ComplainList',
+                    component: () => import(/* webpackChunkName: "complainList" */ '@/views/ComplainList.vue'),
                     meta: {
-                        title: '驳回记录'
+                        title: '咨询投诉'
                     }
                 },
+                /**等级评定 */
+                /**承办单位 */
                 {
                     path: '/organizationInfo',
                     name: 'OrganizationInfo',
@@ -428,63 +397,46 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/organizationEdit',
-                    name: 'OrganizationEdit',
+                    path: '/organization',
+                    name: 'organization',
                     component: () =>
-                        import(/* webpackChunkName: "organizationEdit" */ '@/views/organization/OrganizationEdit.vue'),
+                        import(/* webpackChunkName: "organization" */ '@/views/organization/Organization.vue'),
                     meta: {
-                        title: '承办单位编辑'
+                        title: '等级评定'
                     }
                 },
                 {
-                    path: '/organizationList',
-                    name: 'OrganizationList',
+                    path: '/organization1',
+                    name: 'organization1',
                     component: () =>
-                        import(/* webpackChunkName: "organizationList" */ '@/views/organization/OrganizationList.vue'),
-                    meta: {
-                        title: '承办单位'
-                    }
-                },
-                {
-                    path: '/artTypes',
-                    name: 'ArtTypes',
-                    component: () => import(/* webpackChunkName: "artTypes" */ '@/views/ArtTypes.vue'),
-                    meta: {
-                        title: '艺术分类'
-                    }
-                },
-                {
-                    path: '/artTypeEdit',
-                    name: 'ArtTypeEdit',
-                    component: () => import(/* webpackChunkName: "artTypeEdit" */ '@/views/ArtTypeEdit.vue'),
+                        import(/* webpackChunkName: "organization1" */ '@/views/organization/Organization1.vue'),
                     meta: {
-                        title: '艺术分类编辑'
+                        title: '等级评定'
                     }
                 },
+                /**等级评定流程 */
                 {
-                    path: '/artTypeList',
-                    name: 'ArtTypeList',
-                    component: () => import(/* webpackChunkName: "artTypeList" */ '@/views/ArtTypeList.vue'),
+                    path: '/rateEdit',
+                    name: 'RateEdit',
+                    component: () => import(/* webpackChunkName: "rateEdit" */ '@/views/rate/RateEdit.vue'),
                     meta: {
-                        title: '艺术分类'
+                        title: '等级评定申请'
                     }
                 },
                 {
-                    path: '/gradingOrganizationEdit',
-                    name: 'GradingOrganizationEdit',
-                    component: () =>
-                        import(/* webpackChunkName: "gradingOrganizationEdit" */ '@/views/GradingOrganizationEdit.vue'),
+                    path: '/rateAudit',
+                    name: 'RateAudit',
+                    component: () => import(/* webpackChunkName: "rateAudit" */ '@/views/rate/RateAudit.vue'),
                     meta: {
-                        title: '考级机构编辑'
+                        title: '等级评定申请'
                     }
                 },
                 {
-                    path: '/gradingOrganizationList',
-                    name: 'GradingOrganizationList',
-                    component: () =>
-                        import(/* webpackChunkName: "gradingOrganizationList" */ '@/views/GradingOrganizationList.vue'),
+                    path: '/assignExpert',
+                    name: 'assignExpert',
+                    component: () => import(/* webpackChunkName: "assignExpert" */ '@/views/rate/AssignExpert.vue'),
                     meta: {
-                        title: '考级机构'
+                        title: '分配专家组'
                     }
                 },
                 {
@@ -499,117 +451,141 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/settingEdit',
-                    name: 'SettingEdit',
-                    component: () => import(/* webpackChunkName: "settingEdit" */ '@/views/SettingEdit.vue'),
+                    path: '/gradeList',
+                    name: 'gradeList',
+                    component: () => import(/* webpackChunkName: "gradeList" */ '@/views/rate/GradeList.vue'),
                     meta: {
-                        title: '设置编辑'
+                        title: '评分'
                     }
                 },
                 {
-                    path: '/settings',
-                    name: 'Settings',
-                    component: () => import(/* webpackChunkName: "settingList" */ '@/views/Settings.vue'),
+                    path: '/rateExpertList',
+                    name: 'RateExpertList',
+                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateExpertList.vue'),
                     meta: {
-                        title: '设置'
+                        title: '等级评定'
                     }
                 },
                 {
-                    path: '/operationLogList',
-                    name: 'OperationLogList',
-                    component: () => import(/* webpackChunkName: "operationLogList" */ '@/views/OperationLogList.vue'),
+                    path: '/rateGrade',
+                    name: 'RateGrade',
+                    component: () => import(/* webpackChunkName: "rateGrade" */ '@/views/rate/RateGrade.vue'),
                     meta: {
-                        title: '操作日志'
+                        title: '打分'
                     }
                 },
+                /**等级评定列表 */
                 {
-                    path: '/exceptionLogList',
-                    name: 'ExceptionLogList',
-                    component: () => import(/* webpackChunkName: "exceptionLogList" */ '@/views/ExceptionLogList.vue'),
+                    path: '/rateOrganizerList',
+                    name: 'RateOrganizerList',
+                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateOrganizerList.vue'),
                     meta: {
-                        title: '异常日志'
+                        title: '等级评定'
                     }
                 },
                 {
-                    path: '/examRoomEdit',
-                    name: 'ExamRoomEdit',
-                    component: () => import(/* webpackChunkName: "examRoomEdit" */ '@/views/ExamRoomEdit.vue'),
+                    path: '/rateDistrictList',
+                    name: 'RateDistrictList',
+                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateDistrictList.vue'),
                     meta: {
-                        title: '考场管理编辑'
+                        title: '等级评定'
                     }
                 },
                 {
-                    path: '/examRoomList',
-                    name: 'ExamRoomList',
-                    component: () => import(/* webpackChunkName: "examRoomList" */ '@/views/ExamRoomList.vue'),
+                    path: '/rateDistrictListPending',
+                    name: 'RateDistrictListPending',
+                    component: () =>
+                        import(/* webpackChunkName: "rateList" */ '@/views/rate/RateDistrictListPending.vue'),
                     meta: {
-                        title: '考场管理'
+                        title: '申请待办'
                     }
                 },
                 {
-                    path: '/historyRoomList',
-                    name: 'HistoryRoomList',
-                    component: () =>
-                        import(/* webpackChunkName: "historyRoomList" */ '@/views/video/HistoryRoomList.vue'),
+                    path: '/rateDistrictListDone',
+                    name: 'RateDistrictListDone',
+                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateDistrictListDone.vue'),
                     meta: {
-                        title: '视频管理'
+                        title: '申请已办'
                     }
                 },
                 {
-                    path: '/showRoomList',
-                    name: 'ShowRoomList',
-                    component: () => import(/* webpackChunkName: "showRoomList" */ '@/views/video/ShowRoomList.vue'),
+                    path: '/rateList',
+                    name: 'RateList',
+                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateList.vue'),
                     meta: {
-                        title: '监控列表'
+                        title: '等级评定'
                     }
                 },
                 {
-                    path: '/recordInfo',
-                    name: 'RecordInfo',
-                    component: () => import(/* webpackChunkName: "recordInfo" */ '@/views/record/RecordInfo.vue'),
+                    path: '/rateListPending',
+                    name: 'RateListPending',
+                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateListPending.vue'),
                     meta: {
-                        title: '备案管理'
+                        title: '申请待办'
                     }
                 },
                 {
-                    path: '/complainEdit',
-                    name: 'ComplainEdit',
-                    component: () => import(/* webpackChunkName: "complainEdit" */ '@/views/ComplainEdit.vue'),
+                    path: '/rateListDone',
+                    name: 'RateListDone',
+                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateListDone.vue'),
                     meta: {
-                        title: '咨询投诉编辑'
+                        title: '申请已办'
                     }
                 },
                 {
-                    path: '/complainShow',
-                    name: 'ComplainShow',
-                    component: () => import(/* webpackChunkName: "complainShow" */ '@/views/ComplainShow.vue'),
+                    path: '/rateListRejected',
+                    name: 'RateListRejected',
+                    component: () => import(/* webpackChunkName: "rateList" */ '@/views/rate/RateListRejected.vue'),
                     meta: {
-                        title: '咨询投诉详情'
+                        title: '驳回记录'
                     }
                 },
+                /**展演 */
+                /**活动信息 */
                 {
-                    path: '/complainList',
-                    name: 'ComplainList',
-                    component: () => import(/* webpackChunkName: "complainList" */ '@/views/ComplainList.vue'),
+                    path: '/performanceEdit',
+                    name: 'PerformanceEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "performanceEdit" */ '@/views/performance/PerformanceEdit.vue'),
                     meta: {
-                        title: '咨询投诉'
+                        title: '展演管理编辑'
                     }
                 },
                 {
-                    path: '/recordExpertEdit',
-                    name: 'RecordExpertEdit',
-                    component: () => import(/* webpackChunkName: "recordExpertEdit" */ '@/views/RecordExpertEdit.vue'),
+                    path: '/performanceList',
+                    name: 'PerformanceList',
+                    component: () =>
+                        import(/* webpackChunkName: "performanceList" */ '@/views/performance/PerformanceList.vue'),
                     meta: {
-                        title: '考级专业考官编辑'
+                        title: '展演管理'
                     }
                 },
                 {
-                    path: '/programmeShow',
-                    name: 'ProgrammeShow',
+                    path: '/performanceListShow',
+                    name: 'PerformanceListShow',
                     component: () =>
-                        import(/* webpackChunkName: "programmeShow" */ '@/views/performance/ProgrammeShow.vue'),
+                        import(/* webpackChunkName: "performanceList" */ '@/views/performance/PerformanceListShow.vue'),
                     meta: {
-                        title: '节目详情'
+                        title: '展演列表'
+                    }
+                },
+                {
+                    path: '/performanceShow',
+                    name: 'PerformanceShow',
+                    component: () =>
+                        import(/* webpackChunkName: "performanceShow" */ '@/views/performance/PerformanceShow.vue'),
+                    meta: {
+                        title: '展演详情'
+                    }
+                },
+                /**节目初审 */
+                {
+                    path: '/programmeOrgList',
+                    name: 'ProgrammeOrgList',
+                    component: () =>
+                        import(/* webpackChunkName: "programmeOrgList" */ '@/views/performance/ProgrammeOrgList.vue'),
+                    meta: {
+                        title: '节目管理'
                     }
                 },
                 {
@@ -631,47 +607,54 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/programmeResultList',
-                    name: 'ProgrammeResultList',
+                    path: '/programmeShow',
+                    name: 'ProgrammeShow',
                     component: () =>
-                        import(
-                            /* webpackChunkName: "programmeResultList" */ '@/views/performance/ProgrammeResultList.vue'
-                        ),
+                        import(/* webpackChunkName: "programmeShow" */ '@/views/performance/ProgrammeShow.vue'),
                     meta: {
-                        title: '节目获奖'
+                        title: '节目详情'
                     }
                 },
                 {
-                    path: '/programmeOrgList',
-                    name: 'ProgrammeOrgList',
+                    path: '/arrangeList',
+                    name: 'ArrangeList',
                     component: () =>
-                        import(/* webpackChunkName: "programmeOrgList" */ '@/views/performance/ProgrammeOrgList.vue'),
+                        import(/* webpackChunkName: "arrangeList" */ '@/views/performance/ArrangeList.vue'),
                     meta: {
-                        title: '节目管理'
+                        title: '节目编排'
                     }
                 },
                 {
-                    path: '/programmeGroupList',
-                    name: 'ProgrammeGroupList',
+                    path: '/progGroupOnlineList',
+                    name: 'ProgGroupOnlineList',
                     component: () =>
                         import(
-                            /* webpackChunkName: "programmeGroupList" */ '@/views/performance/ProgrammeGroupList.vue'
+                            /* webpackChunkName: "progGroupOnlineList" */ '@/views/performance/ProgGroupOnlineList.vue'
                         ),
                     meta: {
                         title: '节目分组'
                     }
                 },
                 {
-                    path: '/progGroupOnlineList',
-                    name: 'ProgGroupOnlineList',
+                    path: '/programmeGroupList',
+                    name: 'ProgrammeGroupList',
                     component: () =>
                         import(
-                            /* webpackChunkName: "progGroupOnlineList" */ '@/views/performance/ProgGroupOnlineList.vue'
+                            /* webpackChunkName: "programmeGroupList" */ '@/views/performance/ProgrammeGroupList.vue'
                         ),
                     meta: {
                         title: '节目分组'
                     }
                 },
+                {
+                    path: '/arrangeJudgeList',
+                    name: 'ArrangeJudgeList',
+                    component: () =>
+                        import(/* webpackChunkName: "arrangeJudgeList" */ '@/views/performance/ArrangeJudgeList.vue'),
+                    meta: {
+                        title: '分配评委'
+                    }
+                },
                 {
                     path: '/programmeSignList',
                     name: 'ProgrammeSignList',
@@ -703,67 +686,6 @@ const router = new Router({
                         title: '得分列表'
                     }
                 },
-                {
-                    path: '/participantEdit',
-                    name: 'ParticipantEdit',
-                    component: () =>
-                        import(/* webpackChunkName: "participantEdit" */ '@/views/performance/ParticipantEdit.vue'),
-                    meta: {
-                        title: '参演人员编辑'
-                    }
-                },
-                {
-                    path: '/participantList',
-                    name: 'ParticipantList',
-                    component: () =>
-                        import(/* webpackChunkName: "participantList" */ '@/views/performance/ParticipantList.vue'),
-                    meta: {
-                        title: '参演人员'
-                    }
-                },
-                {
-                    path: '/arrangeEdit',
-                    name: 'ArrangeEdit',
-                    component: () =>
-                        import(/* webpackChunkName: "arrangeEdit" */ '@/views/performance/ArrangeEdit.vue'),
-                    meta: {
-                        title: '节目编排编辑'
-                    }
-                },
-                {
-                    path: '/arrangeList',
-                    name: 'ArrangeList',
-                    component: () =>
-                        import(/* webpackChunkName: "arrangeList" */ '@/views/performance/ArrangeList.vue'),
-                    meta: {
-                        title: '节目编排'
-                    }
-                },
-                {
-                    path: '/arrangeJudgeList',
-                    name: 'ArrangeJudgeList',
-                    component: () =>
-                        import(/* webpackChunkName: "arrangeJudgeList" */ '@/views/performance/ArrangeJudgeList.vue'),
-                    meta: {
-                        title: '分配评委'
-                    }
-                },
-                {
-                    path: '/awardEdit',
-                    name: 'AwardEdit',
-                    component: () => import(/* webpackChunkName: "awardEdit" */ '@/views/AwardEdit.vue'),
-                    meta: {
-                        title: '奖项类别设置编辑'
-                    }
-                },
-                {
-                    path: '/awardList',
-                    name: 'AwardList',
-                    component: () => import(/* webpackChunkName: "awardList" */ '@/views/AwardList.vue'),
-                    meta: {
-                        title: '奖项类别设置'
-                    }
-                },
                 {
                     path: '/programmeAwardEdit',
                     name: 'ProgrammeAwardEdit',
@@ -786,7 +708,18 @@ const router = new Router({
                         title: '奖项设置'
                     }
                 },
-                /**复审 */
+                {
+                    path: '/programmeResultList',
+                    name: 'ProgrammeResultList',
+                    component: () =>
+                        import(
+                            /* webpackChunkName: "programmeResultList" */ '@/views/performance/ProgrammeResultList.vue'
+                        ),
+                    meta: {
+                        title: '节目获奖'
+                    }
+                },
+                /**展演复审 */
                 {
                     path: '/programmeReviewList',
                     name: 'ProgrammeList',
@@ -815,6 +748,15 @@ const router = new Router({
                     meta: {
                         title: '分配评委'
                     }
+                },
+                {
+                    path: '/signReviewList',
+                    name: 'ProgrammeSignList',
+                    component: () =>
+                        import(/* webpackChunkName: "programmeSignList" */ '@/views/performance/ProgrammeSignList.vue'),
+                    meta: {
+                        title: '节目签到'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

+ 13 - 11
src/main/vue/src/views/performance/ArrangeJudgeList.vue

@@ -22,7 +22,7 @@
                 <el-form-item>
                     <el-button type="primary" @click="getData">查询</el-button>
                 </el-form-item>
-                <div v-if="!onlines">
+                <div v-if="!online">
                     <el-collapse-transition>
                         <div v-show="showMore">
                             <el-card shadow="hover" :body-style="{ padding: '20px' }" style="margin-bottom: 20px">
@@ -42,15 +42,16 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12" :offset="0">
-                                        <el-form-item prop="address" class="flex" label="活动地点" style="width: 100%">
-                                            <el-select v-model="form.address">
+                                        <el-form-item prop="address" class="flex" label="活动地点">
+                                            <!-- <el-select v-model="form.address">
                                                 <el-option
                                                     v-for="(item, index) in addresses"
                                                     :key="index"
                                                     :value="item.value"
                                                     :label="item.value"
                                                 ></el-option>
-                                            </el-select>
+                                            </el-select> -->
+                                            <el-input v-model="form.address" style="width: 316px"></el-input>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12" :offset="0">
@@ -78,7 +79,7 @@
             </el-form>
         </div>
         <el-table
-            v-if="!onlines"
+            v-if="!online"
             :data="tableData"
             empty-text="暂无数据"
             row-key="id"
@@ -115,7 +116,7 @@
         </el-table>
 
         <el-table
-            v-if="onlines"
+            v-if="online"
             :data="tableData"
             style="margin-top:20px"
             empty-text="暂无数据"
@@ -191,7 +192,7 @@ export default {
             downloading: false,
             form: {},
             performances: [],
-            onlines: '',
+            online: true,
             addresses: [],
             dateRange: '',
             rules: {
@@ -206,8 +207,7 @@ export default {
                 { label: '集体', value: 'COLLECTIVE' }
             ],
             columnKeys: ['date', 'morning', 'address'],
-            addressList: [],
-            activeNames: []
+            addressList: []
         };
     },
     created() {
@@ -224,8 +224,10 @@ export default {
                 { body: 'json' }
             )
             .then(res => {
-                this.onlines = res.content[0].online;
-                // console.log(this.onlines);
+                this.online = res.content[0].online;
+                if (this.review) {
+                    this.online = res.content[0].reviewOnline;
+                }
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
                         this.performances.push({

+ 12 - 0
src/main/vue/src/views/performance/review/ProgScoreAdminList.vue

@@ -0,0 +1,12 @@
+<template>
+    <prog-score-admin-list :review="true"></prog-score-admin-list>
+</template>
+<script>
+import ProgScoreAdminList from '@/views/performance/ProgScoreAdminList';
+export default {
+    components: {
+        ProgScoreAdminList
+    }
+};
+</script>
+<style lang="less" scoped></style>

+ 12 - 0
src/main/vue/src/views/performance/review/ProgrammeSignList.vue

@@ -0,0 +1,12 @@
+<template>
+    <programme-sign-list :review="true"></programme-sign-list>
+</template>
+<script>
+import ProgrammeSignList from '@/views/performance/ProgrammeSignList';
+export default {
+    components: {
+        ProgrammeSignList
+    }
+};
+</script>
+<style lang="less" scoped></style>