xuqiang 4 anni fa
parent
commit
6f28f9bada

+ 3 - 3
src/main/vue/src/views/performance/ArrangeJudgeList.vue

@@ -64,7 +64,7 @@
                                 </el-row>
                             </el-card>
                             <!-- </el-collapse-item>
-                </el-collapse> -->
+                            </el-collapse> -->
                         </div>
                     </el-collapse-transition>
                     <div style="width:100%;textAlign:center;margin-bottom:10px;">
@@ -257,9 +257,9 @@ export default {
                 { body: 'json' }
             )
             .then(res => {
-                console.log(res);
+                // console.log(res);
                 this.onlines = res.content[0].online;
-                console.log(this.onlines);
+                // console.log(this.onlines);
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
                         this.performances.push({

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

@@ -138,10 +138,12 @@
             >
             </el-pagination>
         </div>
+        <record-logs ref="dataRef" :dialogVisibles="isShow" @close="isShow = false"></record-logs>
     </div>
 </template>
 <script>
 import pageableTable from '@/mixins/pageableTable';
+import RecordLogs from '../../components/RecordLogs';
 import format from 'date-fns/format';
 import startOfDay from 'date-fns/startOfDay';
 import endOfDay from 'date-fns/endOfDay';
@@ -150,6 +152,7 @@ import { th } from 'date-fns/locale';
 export default {
     name: 'RecordRegulationHistory',
     mixins: [pageableTable],
+    components: { RecordLogs },
     created() {
         this.$http
             .get('/district/NJ')
@@ -166,6 +169,7 @@ export default {
         return {
             multipleMode: false,
             search: '',
+            isShow: false,
             url: '/record/all',
             downloading: false,
             categoryOptions: [{ label: '承办单位', value: 'ORGANIZER' }],
@@ -231,12 +235,8 @@ export default {
             });
         },
         editRow(row) {
-            this.$router.push({
-                path: '/recordEdit',
-                query: {
-                    rid: row.id
-                }
-            });
+            this.isShow = true;
+            this.$refs.dataRef.init(row.id);
         },
         checkRow(row) {
             this.$refs.table.toggleRowExpansion(row, true);