Commit 4dac8c0b12da8f95d43b7ff61b06199f40d65b4c
1 parent
1dbc0b2d
1
Showing
3 changed files
with
82 additions
and
76 deletions
admin-web-master/src/components/add/addmap.vue
| 1 | <template> | 1 | <template> |
| 2 | - <div> | ||
| 3 | - <el-form v-if="ontype =='线上广告位'" :model="formInline" :rules="rules" ref="formInline" label-width="100px" | 2 | + <div > |
| 3 | + <el-form v-if="ontype =='线上广告位' && iShsow" :model="formInline" :rules="rules" ref="formInline" label-width="100px" | ||
| 4 | class="demo-ruleForm"> | 4 | class="demo-ruleForm"> |
| 5 | <el-form-item label="广告位类型" prop="advertisingType"> | 5 | <el-form-item label="广告位类型" prop="advertisingType"> |
| 6 | <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;"> | 6 | <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;"> |
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | </el-col> | 56 | </el-col> |
| 57 | </el-row> | 57 | </el-row> |
| 58 | </el-form> | 58 | </el-form> |
| 59 | - <el-form v-if="ontype =='实体广告位'" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px" | 59 | + <el-form v-if="ontype =='实体广告位' && iShsow" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px" |
| 60 | class="demo-ruleForm"> | 60 | class="demo-ruleForm"> |
| 61 | <el-form-item label="广告位类型" prop="advertisingType"> | 61 | <el-form-item label="广告位类型" prop="advertisingType"> |
| 62 | <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;"> | 62 | <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;"> |
| @@ -78,11 +78,9 @@ | @@ -78,11 +78,9 @@ | ||
| 78 | </div> | 78 | </div> |
| 79 | </el-form-item> | 79 | </el-form-item> |
| 80 | <el-form-item label="设备类型" prop="deviceType" > | 80 | <el-form-item label="设备类型" prop="deviceType" > |
| 81 | - <div style="display: flex;justify-content: space-between;"> | ||
| 82 | - <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 92%;"> | ||
| 83 | - <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option> | ||
| 84 | - </el-select> | ||
| 85 | - </div> | 81 | + <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 100%;"> |
| 82 | + <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option> | ||
| 83 | + </el-select> | ||
| 86 | </el-form-item> | 84 | </el-form-item> |
| 87 | <el-form-item label="设备大小" prop="equipmentSize" > | 85 | <el-form-item label="设备大小" prop="equipmentSize" > |
| 88 | <el-input v-model="formInline.equipmentSize" placeholder="宽:300mm 长:400mm 高: 400mm" maxlength="30"></el-input> | 86 | <el-input v-model="formInline.equipmentSize" placeholder="宽:300mm 长:400mm 高: 400mm" maxlength="30"></el-input> |
| @@ -259,7 +257,8 @@ | @@ -259,7 +257,8 @@ | ||
| 259 | gongyuanList: [], | 257 | gongyuanList: [], |
| 260 | fileData: [], | 258 | fileData: [], |
| 261 | parentMessage: {}, | 259 | parentMessage: {}, |
| 262 | - edit: true | 260 | + edit: true, |
| 261 | + iShsow:true | ||
| 263 | }; | 262 | }; |
| 264 | }, | 263 | }, |
| 265 | props: { | 264 | props: { |
| @@ -324,7 +323,13 @@ | @@ -324,7 +323,13 @@ | ||
| 324 | }, | 323 | }, |
| 325 | changeadvertisingType(e) { | 324 | changeadvertisingType(e) { |
| 326 | console.error(e) | 325 | console.error(e) |
| 326 | + this.iShsow = false | ||
| 327 | this.ontype = e | 327 | this.ontype = e |
| 328 | + // 延迟一秒执行 | ||
| 329 | + setTimeout(() => { | ||
| 330 | + this.iShsow = true | ||
| 331 | + this.$forceUpdate(); | ||
| 332 | + }, 10) | ||
| 328 | }, | 333 | }, |
| 329 | //获取当前时间 | 334 | //获取当前时间 |
| 330 | updateCurrentTime() { | 335 | updateCurrentTime() { |
admin-web-master/src/views/detect/examine/index.vue
| @@ -564,29 +564,29 @@ | @@ -564,29 +564,29 @@ | ||
| 564 | } | 564 | } |
| 565 | list = c1 | 565 | list = c1 |
| 566 | // 已审核 | 566 | // 已审核 |
| 567 | - const res1 = await getResourceStrategy({ | ||
| 568 | - ...this.pagequery, | ||
| 569 | - resourcesId: 'sp', | ||
| 570 | - shopName: this.name, | ||
| 571 | - publishStatus: '2', | ||
| 572 | - }) | 567 | + // const res1 = await getResourceStrategy({ |
| 568 | + // ...this.pagequery, | ||
| 569 | + // resourcesId: 'sp', | ||
| 570 | + // shopName: this.name, | ||
| 571 | + // publishStatus: '2', | ||
| 572 | + // }) | ||
| 573 | let c2 = [] | 573 | let c2 = [] |
| 574 | - for (let index = 0; index < res1.data.length; index++) { | ||
| 575 | - const element = res1.data[index]; | ||
| 576 | - if (element.cereBasicInformationShop.id) { | ||
| 577 | - for (let i = 0; i < element.cereRentalPolicies.length; i++) { | ||
| 578 | - var element1 = element.cereRentalPolicies[i]; | ||
| 579 | - | ||
| 580 | - var obj = { | ||
| 581 | - cereBasicInformationShop: element.cereBasicInformationShop, | ||
| 582 | - num: element.cereRentalPolicies.length, | ||
| 583 | - shopinfo: element1, | ||
| 584 | - typeid:'sp'+element.cereBasicInformationShop.id | ||
| 585 | - }; | ||
| 586 | - c2.push(obj); | ||
| 587 | - } | ||
| 588 | - } | ||
| 589 | - } | 574 | + // for (let index = 0; index < res1.data.length; index++) { |
| 575 | + // const element = res1.data[index]; | ||
| 576 | + // if (element.cereBasicInformationShop.id) { | ||
| 577 | + // for (let i = 0; i < element.cereRentalPolicies.length; i++) { | ||
| 578 | + // var element1 = element.cereRentalPolicies[i]; | ||
| 579 | + | ||
| 580 | + // var obj = { | ||
| 581 | + // cereBasicInformationShop: element.cereBasicInformationShop, | ||
| 582 | + // num: element.cereRentalPolicies.length, | ||
| 583 | + // shopinfo: element1, | ||
| 584 | + // typeid:'sp'+element.cereBasicInformationShop.id | ||
| 585 | + // }; | ||
| 586 | + // c2.push(obj); | ||
| 587 | + // } | ||
| 588 | + // } | ||
| 589 | + // } | ||
| 590 | list = [...list, ...c2] | 590 | list = [...list, ...c2] |
| 591 | this.tableData = list | 591 | this.tableData = list |
| 592 | console.log(this.tableData); | 592 | console.log(this.tableData); |
| @@ -617,29 +617,29 @@ | @@ -617,29 +617,29 @@ | ||
| 617 | 617 | ||
| 618 | list = c1 | 618 | list = c1 |
| 619 | // 已审核 | 619 | // 已审核 |
| 620 | - const res1 = await getResourceStrategy({ | ||
| 621 | - ...this.pagequery, | ||
| 622 | - resourcesId: 'gg', | ||
| 623 | - advertisingName: this.name, | ||
| 624 | - publishStatus: '2', | ||
| 625 | - }) | 620 | + // const res1 = await getResourceStrategy({ |
| 621 | + // ...this.pagequery, | ||
| 622 | + // resourcesId: 'gg', | ||
| 623 | + // advertisingName: this.name, | ||
| 624 | + // publishStatus: '2', | ||
| 625 | + // }) | ||
| 626 | let c2 = [] | 626 | let c2 = [] |
| 627 | - for (let index = 0; index < res1.data.length; index++) { | ||
| 628 | - const element = res1.data[index]; | ||
| 629 | - if (element.cereAdvertisingInformation.id) { | ||
| 630 | - for (let i = 0; i < element.cereRentalPolicies.length; i++) { | ||
| 631 | - var element1 = element.cereRentalPolicies[i]; | ||
| 632 | - | ||
| 633 | - var obj = { | ||
| 634 | - cereAdvertisingInformation: element.cereAdvertisingInformation, | ||
| 635 | - num: element.cereRentalPolicies.length, | ||
| 636 | - shopinfo: element1, | ||
| 637 | - typeid:'gg'+element.cereAdvertisingInformation.id | ||
| 638 | - }; | ||
| 639 | - c2.push(obj); | ||
| 640 | - } | ||
| 641 | - } | ||
| 642 | - } | 627 | + // for (let index = 0; index < res1.data.length; index++) { |
| 628 | + // const element = res1.data[index]; | ||
| 629 | + // if (element.cereAdvertisingInformation.id) { | ||
| 630 | + // for (let i = 0; i < element.cereRentalPolicies.length; i++) { | ||
| 631 | + // var element1 = element.cereRentalPolicies[i]; | ||
| 632 | + | ||
| 633 | + // var obj = { | ||
| 634 | + // cereAdvertisingInformation: element.cereAdvertisingInformation, | ||
| 635 | + // num: element.cereRentalPolicies.length, | ||
| 636 | + // shopinfo: element1, | ||
| 637 | + // typeid:'gg'+element.cereAdvertisingInformation.id | ||
| 638 | + // }; | ||
| 639 | + // c2.push(obj); | ||
| 640 | + // } | ||
| 641 | + // } | ||
| 642 | + // } | ||
| 643 | list = [...list, ...c2] | 643 | list = [...list, ...c2] |
| 644 | this.tableData = list | 644 | this.tableData = list |
| 645 | console.log(this.tableData); | 645 | console.log(this.tableData); |
| @@ -669,29 +669,29 @@ | @@ -669,29 +669,29 @@ | ||
| 669 | } | 669 | } |
| 670 | list = c1 | 670 | list = c1 |
| 671 | // 已审核 | 671 | // 已审核 |
| 672 | - const res1 = await getResourceStrategy({ | ||
| 673 | - ...this.pagequery, | ||
| 674 | - resourcesId: 'cd', | ||
| 675 | - venueName:this.name, | ||
| 676 | - publishStatus: '2' | ||
| 677 | - }) | 672 | + // const res1 = await getResourceStrategy({ |
| 673 | + // ...this.pagequery, | ||
| 674 | + // resourcesId: 'cd', | ||
| 675 | + // venueName:this.name, | ||
| 676 | + // publishStatus: '2' | ||
| 677 | + // }) | ||
| 678 | let c2 = [] | 678 | let c2 = [] |
| 679 | - for (let index = 0; index < res1.data.length; index++) { | ||
| 680 | - const element = res1.data[index]; | ||
| 681 | - if (element.cereBasicInformationVenue.id) { | ||
| 682 | - for (let i = 0; i < element.cereRentalPolicies.length; i++) { | ||
| 683 | - var element1 = element.cereRentalPolicies[i]; | ||
| 684 | - | ||
| 685 | - var obj = { | ||
| 686 | - cereBasicInformationVenue: element.cereBasicInformationVenue, | ||
| 687 | - num: element.cereRentalPolicies.length, | ||
| 688 | - shopinfo: element1, | ||
| 689 | - typeid:'cd'+element.cereBasicInformationVenue.id | ||
| 690 | - }; | ||
| 691 | - c2.push(obj); | ||
| 692 | - } | ||
| 693 | - } | ||
| 694 | - } | 679 | + // for (let index = 0; index < res1.data.length; index++) { |
| 680 | + // const element = res1.data[index]; | ||
| 681 | + // if (element.cereBasicInformationVenue.id) { | ||
| 682 | + // for (let i = 0; i < element.cereRentalPolicies.length; i++) { | ||
| 683 | + // var element1 = element.cereRentalPolicies[i]; | ||
| 684 | + | ||
| 685 | + // var obj = { | ||
| 686 | + // cereBasicInformationVenue: element.cereBasicInformationVenue, | ||
| 687 | + // num: element.cereRentalPolicies.length, | ||
| 688 | + // shopinfo: element1, | ||
| 689 | + // typeid:'cd'+element.cereBasicInformationVenue.id | ||
| 690 | + // }; | ||
| 691 | + // c2.push(obj); | ||
| 692 | + // } | ||
| 693 | + // } | ||
| 694 | + // } | ||
| 695 | list = [...list, ...c2] | 695 | list = [...list, ...c2] |
| 696 | this.tableData = list | 696 | this.tableData = list |
| 697 | console.log(this.tableData); | 697 | console.log(this.tableData); |
admin-web-master/src/views/detect/map/index.vue
| @@ -419,7 +419,8 @@ | @@ -419,7 +419,8 @@ | ||
| 419 | this.pagequery = { | 419 | this.pagequery = { |
| 420 | pageNumber: 0, | 420 | pageNumber: 0, |
| 421 | pageSize: 10, | 421 | pageSize: 10, |
| 422 | - advertisingName:'' | 422 | + advertisingName:'', |
| 423 | + advertisingType: this.pagequery.advertisingType, | ||
| 423 | }, | 424 | }, |
| 424 | this.getAll() | 425 | this.getAll() |
| 425 | }, | 426 | }, |