From 4dac8c0b12da8f95d43b7ff61b06199f40d65b4c Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Wed, 19 Feb 2025 11:14:55 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/components/add/addmap.vue      |  23 ++++++++++++++---------
 admin-web-master/src/views/detect/examine/index.vue | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------
 admin-web-master/src/views/detect/map/index.vue     |   3 ++-
 3 files changed, 82 insertions(+), 76 deletions(-)

diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index 9b38a02..670eb48 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <el-form v-if="ontype =='线上广告位'" :model="formInline" :rules="rules" ref="formInline" label-width="100px"
+  <div >
+    <el-form v-if="ontype =='线上广告位' && iShsow" :model="formInline" :rules="rules" ref="formInline" label-width="100px"
       class="demo-ruleForm">
       <el-form-item label="广告位类型" prop="advertisingType">
         <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
@@ -56,7 +56,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-form v-if="ontype =='实体广告位'" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px"
+    <el-form v-if="ontype =='实体广告位' && iShsow" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px"
       class="demo-ruleForm">
       <el-form-item label="广告位类型" prop="advertisingType">
         <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
@@ -78,11 +78,9 @@
         </div>
       </el-form-item>
       <el-form-item label="设备类型" prop="deviceType" >
-        <div style="display: flex;justify-content: space-between;">
-          <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 92%;">
-            <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
-          </el-select>
-        </div>
+        <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 100%;">
+          <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备大小" prop="equipmentSize" >
         <el-input v-model="formInline.equipmentSize" placeholder="宽:300mm 长:400mm 高: 400mm"  maxlength="30"></el-input>
@@ -259,7 +257,8 @@
         gongyuanList: [],
         fileData: [],
         parentMessage: {},
-        edit: true
+        edit: true,
+        iShsow:true
       };
     },
     props: {
@@ -324,7 +323,13 @@
       },
       changeadvertisingType(e) {
         console.error(e)
+        this.iShsow = false
         this.ontype = e
+        // 延迟一秒执行
+        setTimeout(() => {
+          this.iShsow = true
+          this.$forceUpdate();
+        }, 10)
       },
       //获取当前时间
       updateCurrentTime() {
diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue
index e575119..2ebf169 100644
--- a/admin-web-master/src/views/detect/examine/index.vue
+++ b/admin-web-master/src/views/detect/examine/index.vue
@@ -564,29 +564,29 @@
           }
           list = c1
           // 已审核
-          const res1 = await getResourceStrategy({
-            ...this.pagequery,
-            resourcesId: 'sp',
-            shopName: this.name,
-            publishStatus: '2',
-          })
+          // const res1 = await getResourceStrategy({
+          //   ...this.pagequery,
+          //   resourcesId: 'sp',
+          //   shopName: this.name,
+          //   publishStatus: '2',
+          // })
           let c2 = []
-          for (let index = 0; index < res1.data.length; index++) {
-            const element = res1.data[index];
-            if (element.cereBasicInformationShop.id) {
-              for (let i = 0; i < element.cereRentalPolicies.length; i++) {
-                var element1 = element.cereRentalPolicies[i];
-
-                var obj = {
-                  cereBasicInformationShop: element.cereBasicInformationShop,
-                  num: element.cereRentalPolicies.length,
-                  shopinfo: element1,
-                  typeid:'sp'+element.cereBasicInformationShop.id
-                };
-                c2.push(obj);
-              }
-            }
-          }
+          // for (let index = 0; index < res1.data.length; index++) {
+          //   const element = res1.data[index];
+          //   if (element.cereBasicInformationShop.id) {
+          //     for (let i = 0; i < element.cereRentalPolicies.length; i++) {
+          //       var element1 = element.cereRentalPolicies[i];
+
+          //       var obj = {
+          //         cereBasicInformationShop: element.cereBasicInformationShop,
+          //         num: element.cereRentalPolicies.length,
+          //         shopinfo: element1,
+          //         typeid:'sp'+element.cereBasicInformationShop.id
+          //       };
+          //       c2.push(obj);
+          //     }
+          //   }
+          // }
           list = [...list, ...c2]
           this.tableData = list
           console.log(this.tableData);
@@ -617,29 +617,29 @@
 
           list = c1
           // 已审核
-          const res1 = await getResourceStrategy({
-            ...this.pagequery,
-            resourcesId: 'gg',
-            advertisingName: this.name,
-            publishStatus: '2',
-          })
+          // const res1 = await getResourceStrategy({
+          //   ...this.pagequery,
+          //   resourcesId: 'gg',
+          //   advertisingName: this.name,
+          //   publishStatus: '2',
+          // })
           let c2 = []
-          for (let index = 0; index < res1.data.length; index++) {
-            const element = res1.data[index];
-            if (element.cereAdvertisingInformation.id) {
-              for (let i = 0; i < element.cereRentalPolicies.length; i++) {
-                var element1 = element.cereRentalPolicies[i];
-
-                var obj = {
-                  cereAdvertisingInformation: element.cereAdvertisingInformation,
-                  num: element.cereRentalPolicies.length,
-                  shopinfo: element1,
-                  typeid:'gg'+element.cereAdvertisingInformation.id
-                };
-                c2.push(obj);
-              }
-            }
-          }
+          // for (let index = 0; index < res1.data.length; index++) {
+          //   const element = res1.data[index];
+          //   if (element.cereAdvertisingInformation.id) {
+          //     for (let i = 0; i < element.cereRentalPolicies.length; i++) {
+          //       var element1 = element.cereRentalPolicies[i];
+
+          //       var obj = {
+          //         cereAdvertisingInformation: element.cereAdvertisingInformation,
+          //         num: element.cereRentalPolicies.length,
+          //         shopinfo: element1,
+          //         typeid:'gg'+element.cereAdvertisingInformation.id
+          //       };
+          //       c2.push(obj);
+          //     }
+          //   }
+          // }
           list = [...list, ...c2]
           this.tableData = list
           console.log(this.tableData);
@@ -669,29 +669,29 @@
           }
           list = c1
           // 已审核
-          const res1 = await getResourceStrategy({
-            ...this.pagequery,
-            resourcesId: 'cd',
-            venueName:this.name,
-            publishStatus: '2'
-          })
+          // const res1 = await getResourceStrategy({
+          //   ...this.pagequery,
+          //   resourcesId: 'cd',
+          //   venueName:this.name,
+          //   publishStatus: '2'
+          // })
           let c2 = []
-          for (let index = 0; index < res1.data.length; index++) {
-            const element = res1.data[index];
-            if (element.cereBasicInformationVenue.id) {
-              for (let i = 0; i < element.cereRentalPolicies.length; i++) {
-                var element1 = element.cereRentalPolicies[i];
-
-                var obj = {
-                  cereBasicInformationVenue: element.cereBasicInformationVenue,
-                  num: element.cereRentalPolicies.length,
-                  shopinfo: element1,
-                  typeid:'cd'+element.cereBasicInformationVenue.id
-                };
-                c2.push(obj);
-              }
-            }
-          }
+          // for (let index = 0; index < res1.data.length; index++) {
+          //   const element = res1.data[index];
+          //   if (element.cereBasicInformationVenue.id) {
+          //     for (let i = 0; i < element.cereRentalPolicies.length; i++) {
+          //       var element1 = element.cereRentalPolicies[i];
+
+          //       var obj = {
+          //         cereBasicInformationVenue: element.cereBasicInformationVenue,
+          //         num: element.cereRentalPolicies.length,
+          //         shopinfo: element1,
+          //         typeid:'cd'+element.cereBasicInformationVenue.id
+          //       };
+          //       c2.push(obj);
+          //     }
+          //   }
+          // }
           list = [...list, ...c2]
           this.tableData = list
           console.log(this.tableData);
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index bcb271a..d294726 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -419,7 +419,8 @@
         this.pagequery = {
             pageNumber: 0,
             pageSize: 10,
-            advertisingName:''
+            advertisingName:'',
+            advertisingType: this.pagequery.advertisingType,
           },
           this.getAll()
       },
--
libgit2 0.21.4