Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
8ef8c005 by xiaomiao
Options

--no commit message

1 parent 71caab04
Inline Side-by-side
Showing 3 changed files with 0 additions and 12 deletions
...@@ -140,11 +140,7 @@ ...@@ -140,11 +140,7 @@
140 */ 140 */
141 singleElection (row) { 141 singleElection (row) {
142 this.selected = this.data.indexOf(row); 142 this.selected = this.data.indexOf(row);
143 <<<<<<< HEAD
144 this.$emit('row-click', row)
145 =======
146 // this.$emit('row-click', row) 143 // this.$emit('row-click', row)
147 >>>>>>> dev
148 }, 144 },
149 145
150 /** 146 /**
......
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
2 /* 2 /*
3 * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器 3 * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
4 * @Autor: renchao 4 * @Autor: renchao
5 <<<<<<< HEAD
6 * @LastEditTime: 2023-06-20 10:24:00
7 =======
8 * @LastEditTime: 2023-07-21 10:30:53 5 * @LastEditTime: 2023-07-21 10:30:53
9 >>>>>>> dev
10 */ 6 */
11 import axios from 'axios' 7 import axios from 'axios'
12 import Router from '@/router' 8 import Router from '@/router'
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 <<<<<<< HEAD
5 * @LastEditTime: 2023-06-16 09:47:53
6 =======
7 * @LastEditTime: 2023-07-17 13:18:17 4 * @LastEditTime: 2023-07-17 13:18:17
8 >>>>>>> dev
9 --> 5 -->
10 <template> 6 <template>
11 <div class="from-clues"> 7 <div class="from-clues">
......