From a5e7c65d15f122f9ace1a111fcbd7bf0fb641df1 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Mon, 11 Jul 2022 14:15:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E6=8B=86=E5=88=86=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/setting.js | 2 +- src/views/match/add/index.vue | 164 ++++++++++++++-------------------- 2 files changed, 67 insertions(+), 99 deletions(-) diff --git a/src/setting.js b/src/setting.js index 8e05d17..d7837ac 100644 --- a/src/setting.js +++ b/src/setting.js @@ -10,7 +10,7 @@ let host = `${location.origin}/` if (isDev) { jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 host = 'http://121.37.12.51/' - host = 'http://192.168.31.151:9000/'// 榕 + // host = 'http://192.168.31.151:9000/'// 榕 // host = 'http://192.168.31.137:9000/'// 赓 } else if (isPro) { jumpPath = 'https://www.huorantech.cn/judgmentPoint/' diff --git a/src/views/match/add/index.vue b/src/views/match/add/index.vue index 8329570..51d3232 100644 --- a/src/views/match/add/index.vue +++ b/src/views/match/add/index.vue @@ -143,16 +143,21 @@ - + + + + + + + + + + + + + + + 取 消 确 定 @@ -208,73 +213,19 @@ export default { range: [], rangeInit: [], rangeName: '', - // 选择区域懒加载 - props: { - multiple: true, - checkStrictly: true, - lazy: true, - lazyLoad (node, resolve) { - // 如果是在模糊搜索中，则不再用懒加载请求数据 - const input = document.querySelector('.el-cascader__search-input') - console.log("🚀 ~ file: index.vue ~ line 219 ~ lazyLoad ~ input", input, node) - if (input && input.value) return resolve([]) - const { level, value } = node - // console.log("🚀 ~ file: index.vue ~ line 221 ~ lazyLoad ~ level", node) - // 省份 - if (!level) { - that.$get(that.api.queryProvince).then(({ list }) => { - const data = [] - list.map(e => { - data.push({ - value: e.provinceId, - label: e.provinceName, - children: [] - }) - }) - resolve(data) - }).catch(res => {}) - } else if (level === 1) { - // 城市 - that.$get(that.api.queryCity, { - provinceId: value - }).then(({ list }) => { - const data = [] - list.map(e => { - data.push({ - provinceId: value, - value: e.cityId, - label: e.cityName - }) - }) - resolve(data) - }).catch(res => {}) - } else if (level === 2) { - // 学校 - that.$get(that.api.getSchoolsByProvince, { - provinceId: node.data.provinceId, - cityId: value, - schoolName: '' - }).then(({ list }) => { - const data = [] - list.map(e => { - data.push({ - value: e.schoolId, - label: e.schoolName, - leaf: true - }) - }) - resolve(data) - }).catch(res => {}) - } else { - resolve([]) - } - } - }, submiting: false, updateTime: 0, rangeTimer: null, + provinces: [], + cities: [], schools: [], - rangeList: [] + rangeForm: { + provinceId: [], + cityId: [], + schoolId: [] + }, + allSchool: [], + curProvinceId: '' }; }, components: { @@ -311,7 +262,8 @@ export default { }, mounted() { this.getData() - this.getSchool() + this.getProvince() + this.getAllSchool() }, methods: { getData() { @@ -365,37 +317,48 @@ export default { showRange() { this.rangeVisible = true }, - // 获取学校列表 - getSchool() { - this.$get(this.api.querySchoolData).then(({ list }) => { - const result = [] - list.map(e => { - result.push({ - value: e.schoolId, - label: e.schoolName, - leaf: true - }) - }) - this.schools = result + // 获取省份列表 + getProvince() { + this.$get(this.api.queryProvince).then(({ list }) => { + this.provinces = list }).catch(res => {}) }, - // 范围模糊查询前置钩子 - beforeFilter() { - return false + // 清除省份 + clearProvince(){ + this.rangeForm.cityId = '' }, - // 范围筛选 - rangeSearch(el) { - clearTimeout(this.rangeTimer) - this.rangeTimer = setTimeout(() => { - const val = el.target.value - let result = this.schools.filter(e => e.label.includes(val)) // 用学校列表做比对 - this.rangeList = val ? result : [] - }, 500) + // 获取城市列表 + getCity(val) { + const { rangeForm } = this + rangeForm.cityId = '' + this.curProvinceId = val[val.length - 1] // 因为是多选，所以会有多个id，只取最后一个 + this.$get(this.api.queryCity, { + provinceId: this.curProvinceId + }).then(({ list }) => { + this.cities = list + }).catch(res => {}) + }, + // 获取指定省市的学校列表 + getSchool(val) { + this.$get(this.api.getSchoolsByProvince, { + provinceId: this.curProvinceId, + cityId: val[val.length - 1] + }).then(({ list }) => { + this.schools = list + }).catch(res => {}) + }, + // 获取全部学校列表 + getAllSchool() { + this.$get(this.api.querySchoolData).then(({ list }) => { + this.allSchool = list + }).catch(res => {}) }, // 范围确定 rangeSubmit() { // 处理提交需要的id const data = [] + console.log("🚀 ~ file: index.vue ~ line 360 ~ rangeSubmit ~ data", this.rangeForm) + return this.range.map(e => { data.push({ provinceId: e[0] || '', @@ -679,7 +642,12 @@ $upload-lg-height: 150px; margin-left: 32px; } } - +.range-dia { + .el-select { + width: 150px; + margin-right: 10px; + } +} .add-btn { display: flex; justify-content: center; From ae043cb947761f3d8b7c27dbee6f8b892fb4866d Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Mon, 11 Jul 2022 14:31:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/match/add/index.vue | 150 +++++++++++++++++----------------- 1 file changed, 76 insertions(+), 74 deletions(-) diff --git a/src/views/match/add/index.vue b/src/views/match/add/index.vue index 51d3232..17113d4 100644 --- a/src/views/match/add/index.vue +++ b/src/views/match/add/index.vue @@ -135,29 +135,21 @@ 保存 - 发布 - 预览 + 发布 + 预览 - - - - - - - - - - - - - - - + 取 消 确 定 @@ -213,19 +205,66 @@ export default { range: [], rangeInit: [], rangeName: '', + // 选择区域懒加载 + props: { + multiple: true, + checkStrictly: true, + lazy: true, + lazyLoad (node, resolve) { + const { level, value } = node + // 省份 + console.log('lazy', node, that.range) + if (!level) { + that.$get(that.api.queryProvince).then(({ list }) => { + const data = [] + list.map(e => { + data.push({ + value: e.provinceId, + label: e.provinceName, + children: [] + }) + }) + resolve(data) + }).catch(res => {}) + } else if (level === 1) { + // 城市 + that.$get(that.api.queryCity, { + provinceId: value + }).then(({ list }) => { + const data = [] + list.map(e => { + data.push({ + provinceId: value, + value: e.cityId, + label: e.cityName + }) + }) + resolve(data) + }).catch(res => {}) + } else if (level === 2) { + // 学校 + that.$get(that.api.getSchoolsByProvince, { + provinceId: node.data.provinceId, + cityId: value, + schoolName: '' + }).then(({ list }) => { + const data = [] + list.map(e => { + data.push({ + value: e.schoolId, + label: e.schoolName, + leaf: true + }) + }) + resolve(data) + }).catch(res => {}) + } else { + resolve([]) + } + } + }, submiting: false, updateTime: 0, - rangeTimer: null, - provinces: [], - cities: [], - schools: [], - rangeForm: { - provinceId: [], - cityId: [], - schoolId: [] - }, - allSchool: [], - curProvinceId: '' }; }, components: { @@ -262,8 +301,6 @@ export default { }, mounted() { this.getData() - this.getProvince() - this.getAllSchool() }, methods: { getData() { @@ -299,6 +336,7 @@ export default { range.push(item) }) this.range = range + console.log("🚀 ~ file: matchDetail.vue ~ line 327 ~ this.$post ~ this.range", this.range) } // 选择范围name @@ -316,49 +354,18 @@ export default { // 选择范围 showRange() { this.rangeVisible = true + console.log("🚀 ~ file: index.vue ~ line 384 ~ showRange ~ rangeVisible", this.range) + // this.range = this.rangeInit }, - // 获取省份列表 - getProvince() { - this.$get(this.api.queryProvince).then(({ list }) => { - this.provinces = list - }).catch(res => {}) - }, - // 清除省份 - clearProvince(){ - this.rangeForm.cityId = '' - }, - // 获取城市列表 - getCity(val) { - const { rangeForm } = this - rangeForm.cityId = '' - this.curProvinceId = val[val.length - 1] // 因为是多选，所以会有多个id，只取最后一个 - this.$get(this.api.queryCity, { - provinceId: this.curProvinceId - }).then(({ list }) => { - this.cities = list - }).catch(res => {}) - }, - // 获取指定省市的学校列表 - getSchool(val) { - this.$get(this.api.getSchoolsByProvince, { - provinceId: this.curProvinceId, - cityId: val[val.length - 1] - }).then(({ list }) => { - this.schools = list - }).catch(res => {}) - }, - // 获取全部学校列表 - getAllSchool() { - this.$get(this.api.querySchoolData).then(({ list }) => { - this.allSchool = list - }).catch(res => {}) + // 范围模糊查询 + rangeFilter(node, keyword) { + console.log("🚀 ~ file: index.vue ~ line 363 ~ rangeFilter ~ node, keyword", node, keyword) + }, // 范围确定 rangeSubmit() { // 处理提交需要的id const data = [] - console.log("🚀 ~ file: index.vue ~ line 360 ~ rangeSubmit ~ data", this.rangeForm) - return this.range.map(e => { data.push({ provinceId: e[0] || '', @@ -402,7 +409,7 @@ export default { const data = { contestId: id || '', fileName: this.fileName, - filePath: file.fileUrl + filePath: file.fileUrl || file.fileId } this.form.contestAnnexList.push(data) // 编辑的时候需要调新增附件接口 @@ -642,12 +649,7 @@ $upload-lg-height: 150px; margin-left: 32px; } } -.range-dia { - .el-select { - width: 150px; - margin-right: 10px; - } -} + .add-btn { display: flex; justify-content: center;