Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
8554f824 by 杨炀
Options

no message

1 parent 3ec00bf5
Inline Side-by-side
Showing 4 changed files with 68 additions and 47 deletions
src/apiPc/common.js
...@@ -133,6 +133,26 @@ export function getTeamBackNumberPre(qy) { ...@@ -133,6 +133,26 @@ export function getTeamBackNumberPre(qy) {
133 params: qy 133 params: qy
134 }) 134 })
135 } 135 }
136 136 export function getqySchedule(qy) {
137 return request({
138 url: `/league/schedule/querySchedule`,
139 method: 'get',
140 params: qy
141 })
142 }
143 export function getqySchedule2(qy) {
144 return request({
145 url: `/league/schedule/querySchedule2`,
146 method: 'get',
147 params: qy
148 })
149 }
150 export function getquerySchedule2Pre(qy) {
151 return request({
152 url: `/league/schedule/querySchedule2Pre`,
153 method: 'get',
154 params: qy
155 })
156 }
137 157
138 158
......
src/viewsPc/components/schSearch.vue
...@@ -22,29 +22,18 @@ ...@@ -22,29 +22,18 @@
22 </el-button> 22 </el-button>
23 </div> 23 </div>
24 24
25 <div v-if="list.length>0"> 25 <div v-if="list.length>0" class="mt30">
26 <div class="nowteamItem" v-for="(form, index) in list" :key="index"> 26 <el-timeline>
27 <div class="info"> 27 <el-timeline-item placement="top"
28 <div class="nowName text-center"> 28 v-for="(form, index) in list" :key="index"
29 <span class="text-primary">{{ form.number }}</span> 29 :timestamp="form.date + ' ' + form.timeStr"
30 </div> 30 >
31 <div> 31 <div class="text-primary">{{ form.projectName }}</div>
32 <label>{{ language==0?'选手1':'Name1' }}：</label>{{ form.maleName }} 32 <div>{{form.danceType}}</div>
33 <span v-if="form.maleWdsf"> - {{ form.maleWdsf }}</span> 33 <div>{{form.address}}</div>
34 </div> 34 <div></div>
35 <div> 35 </el-timeline-item>
36 <label>{{ language==0?'选手2':'Name2' }}：</label>{{ form.femaleName }} 36 </el-timeline>
37 <span v-if="form.femaleWdsf"> - {{ form.femaleWdsf }}</span>
38 </div>
39 <div>
40 <label>{{ language==0?'代表队':'Represent' }}：</label>
41 {{ form.groupName }}
42 </div>
43 <div v-if="form.zuInfo">
44 <label> {{ language==0?'组别':'Event' }}：</label>{{ form.zuInfo }}
45 </div>
46 </div>
47 </div>
48 </div> 37 </div>
49 <div v-else> 38 <div v-else>
50 <el-empty/> 39 <el-empty/>
...@@ -69,16 +58,19 @@ ...@@ -69,16 +58,19 @@
69 </ul> 58 </ul>
70 </div> 59 </div>
71 <div v-if="teamlist.length>0" class="temell mt20"> 60 <div v-if="teamlist.length>0" class="temell mt20">
72 <el-collapse v-model="activeNames" accordion> 61 <el-collapse accordion>
73 <el-collapse-item :name="index" :title="team[0][0].groupName" v-for="(team,index) in teamlist" :key="index"> 62 <el-collapse-item :name="index" :title="team[0].title" v-for="(team,index) in teamlist" :key="index">
74 <div class="nowteamItem" v-for="(p,jndex) in team" :key="jndex"> 63 <el-timeline>
75 <div class="fontSize14 text-bold">{{p[0].zuInfo}}</div> 64 <el-timeline-item placement="top"
76 <div v-for="f in p" :key="f.id"> 65 v-for="(form, index) in team" :key="index"
77 <span class="nowName text-primary">{{f.number}}</span> 66 :timestamp="form.date + ' ' + form.timeStr"
78 <span class="mr10">{{ language==0?'选手1':'Name1' }}：{{f.maleName}} </span> 67 >
79 <span>{{ language==0?'选手2':'Name2' }}：{{f.femaleName}} </span> 68 <div class="text-primary">{{ form.projectName }}</div>
80 </div> 69 <div>{{form.danceType}}</div>
81 </div> 70 <div>{{form.address}}</div>
71 <div></div>
72 </el-timeline-item>
73 </el-timeline>
82 </el-collapse-item> 74 </el-collapse-item>
83 </el-collapse> 75 </el-collapse>
84 </div> 76 </div>
...@@ -90,7 +82,13 @@ ...@@ -90,7 +82,13 @@
90 <script setup> 82 <script setup>
91 import {ref} from "vue"; 83 import {ref} from "vue";
92 import {ElMessage} from "element-plus"; 84 import {ElMessage} from "element-plus";
93 import {getBackNumber, getTeamBackNumber, getTeamBackNumberPre} from "@/apiPc/common"; 85 import {
86 getquerySchedule2Pre,
87 getqySchedule,
88 getqySchedule2,
89 getTeamBackNumber,
90 getTeamBackNumberPre
91 } from "@/apiPc/common";
94 import {useStorage} from "@vueuse/core/index"; 92 import {useStorage} from "@vueuse/core/index";
95 93
96 const language = useStorage('language', 0) 94 const language = useStorage('language', 0)
...@@ -103,14 +101,13 @@ const teamlist = ref([]) ...@@ -103,14 +101,13 @@ const teamlist = ref([])
103 const query = ref('') 101 const query = ref('')
104 const query2 = ref('') 102 const query2 = ref('')
105 const type = ref('') 103 const type = ref('')
106 const activeNames = ref(0)
107 const showGroupList = ref(false) 104 const showGroupList = ref(false)
108 const search = () => { 105 const search = () => {
109 if (!query.value) { 106 if (!query.value) {
110 ElMessage.warning(language.value == 0 ? '请输入会员号/姓名' : 'Please enter WDSF MIN / Name') 107 ElMessage.warning(language.value == 0 ? '请输入搜索关键词' : 'Enter project name or code to Query')
111 return 108 return
112 } 109 }
113 getBackNumber({query: query.value}).then(res => { 110 getqySchedule({projectName: query.value}).then(res => {
114 if (!res.data||res.data.length==0) { 111 if (!res.data||res.data.length==0) {
115 list.value = [] 112 list.value = []
116 //提示 '未找到结果，请重新查询' 113 //提示 '未找到结果，请重新查询'
...@@ -128,7 +125,7 @@ const searchTeam = () => { ...@@ -128,7 +125,7 @@ const searchTeam = () => {
128 return 125 return
129 } 126 }
130 loading.value = true 127 loading.value = true
131 getTeamBackNumberPre({query: query2.value}).then(res => { 128 getquerySchedule2Pre({groupName: query2.value}).then(res => {
132 loading.value = false 129 loading.value = false
133 if (!res.data||res.data.length==0) { 130 if (!res.data||res.data.length==0) {
134 groupList.value = [] 131 groupList.value = []
...@@ -153,6 +150,7 @@ const open = (param) => { ...@@ -153,6 +150,7 @@ const open = (param) => {
153 groupList.value = [] 150 groupList.value = []
154 query.value = '' 151 query.value = ''
155 type.value = '' 152 type.value = ''
153 loading.value = false
156 } 154 }
157 defineExpose({ 155 defineExpose({
158 open 156 open
...@@ -161,7 +159,7 @@ function showDetail(name) { ...@@ -161,7 +159,7 @@ function showDetail(name) {
161 query2.value = name 159 query2.value = name
162 showGroupList.value = false 160 showGroupList.value = false
163 loading.value = true 161 loading.value = true
164 getTeamBackNumber({query: name}).then(res => { 162 getqySchedule2({groupName: name}).then(res => {
165 loading.value = false 163 loading.value = false
166 teamlist.value = res.data 164 teamlist.value = res.data
167 }) 165 })
......
src/viewsPc/home.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <index-Ch v-if="language ==0" @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber" @schSearch="openSchSearch"/> 3 <index-Ch v-if="language ==0" @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber" @schSearch="openSchSearch"/>
4 <index-En v-else @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber"/> 4 <index-En v-else @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber" @schSearch="openSchSearch"/>
5 <div v-if="showgg" class="fixed_gg"> 5 <div v-if="showgg" class="fixed_gg">
6 <!--天气--> 6 <!--天气-->
7 <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon> 7 <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon>
......
src/viewsPc/index_en.vue
...@@ -143,10 +143,7 @@ ...@@ -143,10 +143,7 @@
143 <!-- Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>--> 143 <!-- Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>-->
144 <!-- </a>--> 144 <!-- </a>-->
145 <a class="zn-btn ml20 btn-q" v-show="matchData?.id=='1778253367748993026'" @click="backNumberSearch">Back Number</a> 145 <a class="zn-btn ml20 btn-q" v-show="matchData?.id=='1778253367748993026'" @click="backNumberSearch">Back Number</a>
146 <!-- <div>--> 146 <a class="zn-btn ml20 btn-q" v-show="matchData?.id=='1778253367748993026'" @click="schSearchSearch">Schedule Inquiry</a>
147 <!-- <a class=" ding" style="font-size: 15px;margin-top: 10px" @click="handlePickup">Pick-up/drop-off service-->
148 <!-- </a>-->
149 <!-- </div>-->
150 147
151 </div> 148 </div>
152 149
...@@ -466,7 +463,7 @@ const navigationPic = ref({ ...@@ -466,7 +463,7 @@ const navigationPic = ref({
466 }) 463 })
467 const router = useRouter() 464 const router = useRouter()
468 const { proxy } = getCurrentInstance() 465 const { proxy } = getCurrentInstance()
469 const emit = defineEmits(['pop','backNumber']) 466 const emit = defineEmits(['pop','backNumber','schSearch'])
470 const time = ref(0) 467 const time = ref(0)
471 const etime = ref(0) 468 const etime = ref(0)
472 469
...@@ -599,6 +596,12 @@ const backNumberSearch = () => { ...@@ -599,6 +596,12 @@ const backNumberSearch = () => {
599 } 596 }
600 emit('backNumber',params) 597 emit('backNumber',params)
601 } 598 }
599 const schSearchSearch = () => {
600 var params = {
601 cptId:matchData.value.id
602 }
603 emit('schSearch',params)
604 }
602 const handlePickup=()=>{ 605 const handlePickup=()=>{
603 const params={ 606 const params={
604 cptId :matchData.value.id 607 cptId :matchData.value.id
...@@ -624,7 +627,7 @@ const handlePickup=()=>{ ...@@ -624,7 +627,7 @@ const handlePickup=()=>{
624 } 627 }
625 border-radius: 15px; 628 border-radius: 15px;
626 .zn-btn{background: #FFFFFF;text-transform: uppercase; 629 .zn-btn{background: #FFFFFF;text-transform: uppercase;
627 font-size: 18px; width: fit-content; 630 font-size: 16px; width: fit-content; margin: 5px 5px 5px 0;
628 color: #453DEA; 631 color: #453DEA;
629 border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;} 632 border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;}
630 .item{box-shadow: 0px 0px 21px 0px rgba(41,23,101,0.14);margin: 40px 0 0; 633 .item{box-shadow: 0px 0px 21px 0px rgba(41,23,101,0.14);margin: 40px 0 0;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!