efc9074a by 杨炀

no message

1 parent e0bb9172
...@@ -193,6 +193,8 @@ function delperson(p) { ...@@ -193,6 +193,8 @@ function delperson(p) {
193 cancelButtonText: c, 193 cancelButtonText: c,
194 type: 'warning' 194 type: 'warning'
195 }).then(() => { 195 }).then(() => {
196
197 // This user has registered for the event and cannot be deleted.
196 match.delPerson(p.id).then(res => { 198 match.delPerson(p.id).then(res => {
197 ElMessage.success(msg) 199 ElMessage.success(msg)
198 getList(groupId.value) 200 getList(groupId.value)
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
39 <el-button type="primary" plain @click="switchPerson">{{language==0?'切换':'Switch'}}</el-button> 39 <el-button type="primary" plain @click="switchPerson">{{language==0?'切换':'Switch'}}</el-button>
40 </div> 40 </div>
41 <div class="tip"> 41 <div class="tip">
42 <span v-if="language==0">*如果您参加个人项目,或给其组合/选手进行报名,请点击切换按钮重新选择人员</span> 42 <span v-if="language==0">*如果您参加个人项目,或给其组合/选手进行报名,请点击切换按钮重新选择人员</span>
43 <span v-else>*If you are participating in an individual event, or if you are signing up for another group/competitor, please click the Switch button to re-select the team.</span> 43 <span v-else>*If you would like to register individual competitions for yourself or other couples/athletes, please click "Switch" button to re-select persons concerned.</span>
44 </div> 44 </div>
45 </div> 45 </div>
46 </div> 46 </div>
......
...@@ -43,7 +43,11 @@ ...@@ -43,7 +43,11 @@
43 </div> 43 </div>
44 <div v-else> 44 <div v-else>
45 <div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div> 45 <div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div>
46 <div>{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div> 46 <div v-if="scope.row.birthPeriodSecond">{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div>
47 <div v-if="scope.row.birthPeriodThird">{{scope.row.birthPeriodThird?.replace(',',language==0?' 至 ':' to ')}}</div>
48 <div v-if="scope.row.birthPeriodFourth">{{scope.row.birthPeriodFourth?.replace(',',language==0?' 至 ':' to ')}}</div>
49 <div v-if="scope.row.birthPeriodFifth">{{scope.row.birthPeriodFifth?.replace(',',language==0?' 至 ':' to ')}}</div>
50 <div v-if="scope.row.birthPeriodSixth">{{scope.row.birthPeriodSixth?.replace(',',language==0?' 至 ':' to ')}}</div>
47 </div> 51 </div>
48 </template> 52 </template>
49 </el-table-column> 53 </el-table-column>
......
...@@ -65,25 +65,25 @@ export default defineConfig(({ mode, command }) => { ...@@ -65,25 +65,25 @@ export default defineConfig(({ mode, command }) => {
65 // https://cn.vitejs.dev/config/#server-proxy 65 // https://cn.vitejs.dev/config/#server-proxy
66 '/dev-api/ztx-train': { 66 '/dev-api/ztx-train': {
67 // target: 'http://123.60.96.243:1896/stage-api', 67 // target: 'http://123.60.96.243:1896/stage-api',
68 target: 'http://192.168.1.25:8686', 68 target: 'https://jijin.wtwuxicenter.com/stage-api',
69 changeOrigin: true, 69 changeOrigin: true,
70 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '') 70 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
71 }, 71 },
72 '/dev-api/ztx-match': { 72 '/dev-api/ztx-match': {
73 target: 'http://192.168.1.118:8083', 73 target: 'https://jijin.wtwuxicenter.com/stage-api',
74 // target: 'http://192.168.1.132:8081', 74 // target: 'http://192.168.1.132:8081',
75 changeOrigin: true, 75 changeOrigin: true,
76 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') 76 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
77 }, 77 },
78 '/dev-api/ztx-webSite': { 78 '/dev-api/ztx-webSite': {
79 // target: 'https://dance.itechtop.cn/stage-api', 79 // target: 'https://dance.itechtop.cn/stage-api',
80 target: 'http://192.168.1.118:8081/', 80 target: 'https://jijin.wtwuxicenter.com/stage-api',
81 changeOrigin: true, 81 changeOrigin: true,
82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
83 }, 83 },
84 '/dev-api': { 84 '/dev-api': {
85 target: 'http://192.168.1.118:8081/', 85 // target: 'http://192.168.1.118:8081/',
86 // target: 'https://dance.itechtop.cn/stage-api', 86 target: 'https://jijin.wtwuxicenter.com/stage-api',
87 // target: 'https://wdsfwuxicenter.com/stage-api', 87 // target: 'https://wdsfwuxicenter.com/stage-api',
88 changeOrigin: true, 88 changeOrigin: true,
89 rewrite: (p) => p.replace(/^\/dev-api/, '') 89 rewrite: (p) => p.replace(/^\/dev-api/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!