licailing пре 4 година
родитељ
комит
f3a00e630f

+ 2 - 2
src/main/vue/src/views/record/RecordRegulationHistory.vue

@@ -104,9 +104,9 @@
             <el-table-column prop="organizer" label="承办单位名称" min-width="150" sortable> </el-table-column>
             <el-table-column prop="organizer" label="承办单位名称" min-width="150" sortable> </el-table-column>
             <el-table-column prop="district" label="考级地点" min-width="70"> </el-table-column>
             <el-table-column prop="district" label="考级地点" min-width="70"> </el-table-column>
             <el-table-column prop="recordTime" label="备案时间" min-width="90"> </el-table-column>
             <el-table-column prop="recordTime" label="备案时间" min-width="90"> </el-table-column>
-            <el-table-column label="操作" align="right" fixed="right" min-width="140">
+            <el-table-column label="操作" align="right" fixed="right" min-width="180">
                 <template slot-scope="{ row }">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
+                    <el-button @click="editRow(row)" size="mini" plain>查看</el-button>
                     <el-button @click="checkRow(row)" type="warning" size="mini" plain>检查记录</el-button>
                     <el-button @click="checkRow(row)" type="warning" size="mini" plain>检查记录</el-button>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>

+ 7 - 7
src/main/vue/src/views/record/RecordRegulationList.vue

@@ -61,21 +61,21 @@
         >
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
-            <el-table-column prop="examinationName" label="考级活动名称" min-width="150"> </el-table-column>
-            <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip min-width="160">
+            <el-table-column prop="examinationName" label="考级活动名称" min-width="150" sortable> </el-table-column>
+            <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip min-width="170">
                 <template slot-scope="{ row }">
                 <template slot-scope="{ row }">
                     <span>{{ row.examinationStartTime }} 至 {{ row.examinationEndTime }}</span>
                     <span>{{ row.examinationStartTime }} 至 {{ row.examinationEndTime }}</span>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
             <el-table-column prop="examinationAgency" label="考级机构名称" min-width="150" sortable> </el-table-column>
             <el-table-column prop="examinationAgency" label="考级机构名称" min-width="150" sortable> </el-table-column>
-            <el-table-column prop="organizer" label="承办单位名称" min-width="150" sortable> </el-table-column>
+            <el-table-column prop="organizer" label="承办单位名称" min-width="160" sortable> </el-table-column>
             <el-table-column prop="district" label="考级地点" min-width="70"> </el-table-column>
             <el-table-column prop="district" label="考级地点" min-width="70"> </el-table-column>
             <el-table-column prop="recordTime" label="备案时间" min-width="90"> </el-table-column>
             <el-table-column prop="recordTime" label="备案时间" min-width="90"> </el-table-column>
-            <el-table-column label="操作" align="right" fixed="right" min-width="240">
+            <el-table-column label="操作" align="right" fixed="right" min-width="260">
                 <template slot-scope="{ row }">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
-                    <el-button @click="checkRow(row)" type="warning" size="mini" plain>检查记录</el-button>
+                    <el-button @click="editRow(row)" size="mini" plain>查看</el-button>
                     <el-button @click="openRoom(row)" type="primary" size="mini" plain>考场监控</el-button>
                     <el-button @click="openRoom(row)" type="primary" size="mini" plain>考场监控</el-button>
+                    <el-button @click="checkRow(row)" type="warning" size="mini" plain>检查记录</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> -->
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
@@ -279,7 +279,7 @@ export default {
         },
         },
         openRoom(row) {
         openRoom(row) {
             this.$router.push({
             this.$router.push({
-                path: '/examRoomList',
+                path: '/showRoomList',
                 query: {
                 query: {
                     rid: row.id
                     rid: row.id
                 }
                 }