Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
e5a72838 by 杨炀
Options

no message

1 parent d8c13c81
Inline Side-by-side
Showing 3 changed files with 82 additions and 12 deletions
src/apiPc/common.js
...@@ -154,5 +154,12 @@ export function getquerySchedule2Pre(qy) { ...@@ -154,5 +154,12 @@ export function getquerySchedule2Pre(qy) {
154 params: qy 154 params: qy
155 }) 155 })
156 } 156 }
157 export function queryScheduleSingle(qy) {
158 return request({
159 url: `/league/schedule/queryScheduleSingle`,
160 method: 'get',
161 params: qy
162 })
163 }
157 164
158 165
......
src/viewsPc/components/schSearch.vue
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
10 <div v-if="!type||type==''"> 10 <div v-if="!type||type==''">
11 <div @click="type='0'" class="rItem">{{ language==0?'按项目查询':'Query by project' }}</div> 11 <div @click="type='0'" class="rItem">{{ language==0?'按项目查询':'Query by project' }}</div>
12 <div @click="type='1'" class="rItem">{{ language==0?'按团队查询':'Query by team' }}</div> 12 <div @click="type='1'" class="rItem">{{ language==0?'按团队查询':'Query by team' }}</div>
13 <div @click="type='2'" class="rItem">{{ language==0?'按姓名查询':'Query by name' }}</div>
13 </div> 14 </div>
14 15
15 <div v-if="type=='0'"> 16 <div v-if="type=='0'">
...@@ -28,10 +29,13 @@ ...@@ -28,10 +29,13 @@
28 v-for="(form, index) in list" :key="index" 29 v-for="(form, index) in list" :key="index"
29 :timestamp="form.date + ' ' + form.timeStr" 30 :timestamp="form.date + ' ' + form.timeStr"
30 > 31 >
31 <div class="text-primary">{{ form.projectName }}</div> 32 <div class="text-primary">
33 <span v-if="language==1&&form.projectNameEn">{{ form.projectNameEn }}</span>
34 <span v-else-if="form.projectName">{{ form.projectName }}</span>
35 <span class="fr">{{form.changCi}} <i v-if="form.changCi">/ </i> {{language==0?form.lun:form.lunEn}} </span>
36 </div>
32 <div>{{form.danceType}}</div> 37 <div>{{form.danceType}}</div>
33 <div>{{form.address}}</div> 38 <div>{{form.address}}</div>
34 <div></div>
35 </el-timeline-item> 39 </el-timeline-item>
36 </el-timeline> 40 </el-timeline>
37 </div> 41 </div>
...@@ -61,20 +65,59 @@ ...@@ -61,20 +65,59 @@
61 <el-collapse accordion> 65 <el-collapse accordion>
62 <el-collapse-item :name="index" :title="team[0].title" v-for="(team,index) in teamlist" :key="index"> 66 <el-collapse-item :name="index" :title="team[0].title" v-for="(team,index) in teamlist" :key="index">
63 <el-timeline> 67 <el-timeline>
64 <el-timeline-item placement="top" 68 <el-timeline-item placement="top" v-for="(form, index) in team" :key="index">
65 v-for="(form, index) in team" :key="index" 69
66 :timestamp="form.date + ' ' + form.timeStr" 70 <div class="text-primary" style="position: relative;top:-15px">
67 > 71 {{ form.date + ' ' + form.timeStr + ' / '+form.address }}
68 <div class="text-primary">{{ form.projectName }}</div> 72 <span v-if="form.lunEn"> / {{ form.lunEn }}</span>
73 <span v-else-if="form.lun"> / {{ form.lun }}</span>
74 <span v-if="form.changCi "> / {{ language==0?'场次':'Session' }}：{{ form.changCi }}</span>
75 </div>
76 <div class="tname" v-if="form.projectNameEn">{{ form.projectNameEn}}</div>
77 <div class="tname" v-if="form.projectName">{{ form.projectName }}</div>
69 <div>{{form.danceType}}</div> 78 <div>{{form.danceType}}</div>
70 <div>{{form.address}}</div>
71 <div></div>
72 </el-timeline-item> 79 </el-timeline-item>
73 </el-timeline> 80 </el-timeline>
74 </el-collapse-item> 81 </el-collapse-item>
75 </el-collapse> 82 </el-collapse>
76 </div> 83 </div>
77 </div> 84 </div>
85
86 <div v-if="type=='2'">
87 <div class="flex mt30">
88 <el-input :placeholder="language==0?'输入选手姓名查询':'Enter the name of the player to Query'"
89 v-model="query3" clearable
90 @enter="personalSearch" @blur="personalSearch" @empty="personalSearch"/>
91 <el-button @click="personalSearch" class="btn-lineG" style="color: #fff">{{
92 language == 0 ? '查询' : 'Search'
93 }}
94 </el-button>
95 </div>
96 <div v-if="list.length>0" class="temell mt20">
97 <el-timeline>
98 <el-timeline-item placement="top" v-for="(team,j) in list" :key="j">
99 <div v-for="(form, index) in team" :key="index" v-show="index==0">
100 <div class="text-primary" style="position: relative;top:-15px">
101 {{ form.date + ' ' + form.timeStr + ' / '+form.address }}
102 <span v-if="form.lunEn"> / {{ form.lunEn }}</span>
103 <span v-else-if="form.lun"> / {{ form.lun }}</span>
104 <span v-if="form.changCi "> / {{ language==0?'场次':'Session' }}：{{ form.changCi }}</span>
105 </div>
106 <div class="tname" v-if="form.projectNameEn">{{ form.projectNameEn}}</div>
107 <div class="tname" v-if="form.projectName">{{ form.projectName }}</div>
108 <div>{{form.danceType}}</div>
109 </div>
110 <div v-for="(form, index) in team" :key="index" v-show="index>0" style="margin: 8px 0 0">
111 {{ form.date + ' ' + form.timeStr + ' / '+form.address }}
112 <span v-if="form.lunEn"> / {{ form.lunEn }}</span>
113 <span v-else-if="form.lun"> / {{ form.lun }}</span>
114 <span v-if="form.changCi "> / {{ language==0?'场次':'Session' }}：{{ form.changCi }}</span>
115 </div>
116 </el-timeline-item>
117 </el-timeline>
118 </div>
119 </div>
120
78 </div> 121 </div>
79 </el-dialog> 122 </el-dialog>
80 </template> 123 </template>
...@@ -87,7 +130,7 @@ import { ...@@ -87,7 +130,7 @@ import {
87 getqySchedule, 130 getqySchedule,
88 getqySchedule2, 131 getqySchedule2,
89 getTeamBackNumber, 132 getTeamBackNumber,
90 getTeamBackNumberPre 133 getTeamBackNumberPre, queryScheduleSingle
91 } from "@/apiPc/common"; 134 } from "@/apiPc/common";
92 import {useStorage} from "@vueuse/core/index"; 135 import {useStorage} from "@vueuse/core/index";
93 136
...@@ -100,6 +143,7 @@ const groupList = ref([]) ...@@ -100,6 +143,7 @@ const groupList = ref([])
100 const teamlist = ref([]) 143 const teamlist = ref([])
101 const query = ref('') 144 const query = ref('')
102 const query2 = ref('') 145 const query2 = ref('')
146 const query3 = ref('')
103 const type = ref('') 147 const type = ref('')
104 const showGroupList = ref(false) 148 const showGroupList = ref(false)
105 const search = () => { 149 const search = () => {
...@@ -143,6 +187,24 @@ const searchTeam = () => { ...@@ -143,6 +187,24 @@ const searchTeam = () => {
143 187
144 }) 188 })
145 } 189 }
190 const personalSearch = () => {
191 if (!query3.value) {
192 ElMessage.warning(language.value == 0 ? '请输入搜索关键词' : 'Enter project name or code to Query')
193 return
194 }
195 loading.value = true
196 queryScheduleSingle({query: query3.value}).then(res => {
197 loading.value = false
198 if (!res.data||res.data.length==0) {
199 list.value = []
200 //提示 '未找到结果，请重新查询'
201 ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result')
202 return
203 }
204 list.value = res.data
205 })
206
207 }
146 const open = (param) => { 208 const open = (param) => {
147 show.value = true 209 show.value = true
148 list.value = [] 210 list.value = []
...@@ -167,6 +229,7 @@ function showDetail(name) { ...@@ -167,6 +229,7 @@ function showDetail(name) {
167 </script> 229 </script>
168 230
169 <style scoped lang="scss"> 231 <style scoped lang="scss">
232 .tname{font-size: 14px;font-weight: bold;position: relative;top: -8px}
170 .tip{font-size: 12px;margin: 4px 0 0;display: inline-block;} 233 .tip{font-size: 12px;margin: 4px 0 0;display: inline-block;}
171 .rItem{ 234 .rItem{
172 height: 130px; 235 height: 130px;
......
vite.config.js
...@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => { ...@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => {
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: 'http://192.168.1.131:8081/', 86 target: 'http://192.168.1.131:8081/',
87 target: 'https://jijin.wtwuxicenter.com/stage-api', 87 // target: 'https://jijin.wtwuxicenter.com/stage-api',
88 // target: 'https://wdsfwuxicenter.com/stage-api/', 88 // target: 'https://wdsfwuxicenter.com/stage-api/',
89 changeOrigin: true, 89 changeOrigin: true,
90 rewrite: (p) => p.replace(/^\/dev-api/, '') 90 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!