From 0c5d2ce85efb719fa60dcedd82757e70b5e61780 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Tue, 24 Dec 2024 06:55:59 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/api/newly.js                           |  31 +++++++++++++++++++++++++++++++
 admin-web-master/src/components/add/addinformation.vue      |  76 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
 admin-web-master/src/components/change/cl.vue               |   8 ++++----
 admin-web-master/src/components/resourceCommodity/index.vue |  25 +++++++++++++++++++++----
 admin-web-master/src/views/detect/admap.vue                 |  53 +++++++++++++++++++++++------------------------------
 admin-web-master/src/views/detect/examine/index.vue         | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------
 admin-web-master/src/views/detect/information/index.vue     |  20 ++++++++++++++------
 admin-web-master/src/views/detect/map/index.vue             | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
 8 files changed, 353 insertions(+), 165 deletions(-)

diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index 891c653..7e3c816 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -1,5 +1,36 @@
 import request from '@/utils/request'
 import requestnew from '@/utils/request2'
+
+//   资源获取方案
+
+export function cereBusinessPlan(data) {
+  return request({
+    url: '/cereBusinessPlan/getPage ',
+    method: 'post',
+    data
+  })
+}
+//   资源状态修改
+
+export function editStatus(data) {
+  return request({
+    url: '/cereResourceStrategy/editStatus',
+    method: 'post',
+    data
+  })
+}
+
+
+//   资源策略查询
+
+export function getResourceStrategy(data) {
+  return request({
+    url: '/cereResourceStrategy/getResourceStrategy',
+    method: 'post',
+    data
+  })
+}
+
 // 获取策略
 
 export function cereResourceStrategylist(data) {
diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue
index 4c3347b..5247a1b 100644
--- a/admin-web-master/src/components/add/addinformation.vue
+++ b/admin-web-master/src/components/add/addinformation.vue
@@ -116,17 +116,24 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="建筑图纸" prop="architecturalDrawings">
             <upimg v-model="ruleForm.architecturalDrawings" :limit="5" :fileSize="1"></upimg>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
+      <el-form-item label="建筑图纸" prop="architecturalDrawings">
+        <el-upload :action="$baseURL" class="avatar-uploader" :auto-upload="false" :show-file-list="false"
+          :on-remove="hefuRemove('architecturalDrawings')" :on-change="(e) => hefuSuccess(e,'architecturalDrawings')">
+          <img v-if="ruleForm.architecturalDrawings" :src="$baseURL+ruleForm.architecturalDrawings" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="商铺描述" prop="shopDescription">
-            <el-input type="textarea" v-model="ruleForm.shopDescription" style="margin-top:5px;" placeholder="请输入"
+            <el-input type="textarea" v-model="ruleForm.shopDescription" style="margin-top:5px;width: 100%;" placeholder="请输入"
               maxlength="200"></el-input>
           </el-form-item>
         </el-col>
@@ -134,8 +141,14 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="展示主图" prop="displayMainImage">
-            <upimg v-model="ruleForm.displayMainImage" :limit="1" :fileSize="1"></upimg>
+            <!-- <upimg v-model="ruleForm.displayMainImage" :limit="1" :fileSize="1"></upimg> -->
+            <el-upload :action="$baseURL" class="avatar-uploader" :auto-upload="false" :show-file-list="false"
+              :on-remove="hefuRemove('displayMainImage')" :on-change="(e) => hefuSuccess(e,'displayMainImage')">
+              <img v-if="ruleForm.displayMainImage" :src="$baseURL+ruleForm.displayMainImage" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </el-form-item>
+          
         </el-col>
       </el-row>
       <el-row :gutter="20">
@@ -394,39 +407,27 @@
       close() {
         this.$emit('removeonaction', '1')
       },
-      hefuRemove() {
-        this.hefuData = []
+      hefuRemove(e) {
+        // this.ruleForm[e] = ''
       },
-      hefuSuccess(response, file, fileList) {
-        this.fileData = []
+      hefuSuccess(response, e) {
         console.error(response)
+        console.error(e)
+        this.ruleForm[e] = ''
         let fd = new FormData()
         fd.append('file', response.raw)
-        fd.append('filePath', 'hetong')
+        fd.append('filePath', 'sp')
         miniioupload(fd).then(res => {
           console.error(res)
-          const fileMsg = {
-            name: response.name,
-            url: res.data,
-          }
-          this.fileData.push(fileMsg)
+          this.ruleForm[e] = res.data
         })
-      },
+      }
 
 
     },
   };
 </script>
 <style lang="scss">
-  .el-upload {
-    display: block;
-    /* text-align: left; */
-  }
-.video-uploader {
-  .el-upload {
-    text-align: left;
-  }
-}
   .el-dialog__header {
     background-color: #F2F3F5;
     text-align: left;
@@ -437,4 +438,31 @@
     font-size: 15px;
     color: #303133;
   }
+
+  .avatar-uploader .el-upload {
+    border: 1px dashed #3F9B6A;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .avatar-uploader .el-upload:hover {
+    border-color: #3F9B6A;
+  }
+
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
 </style>
diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
index cbca4c9..249f305 100644
--- a/admin-web-master/src/components/change/cl.vue
+++ b/admin-web-master/src/components/change/cl.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="policy-selector">
-    <div class="policy-selector-header">
+    <!-- <div class="policy-selector-header">
       <h3>选择策略</h3>
-    </div>
+    </div> -->
     <div class="policy-selector-content" style="max-height:50vh;overflow-y: auto;">
       <el-table
         :data="celueData"
@@ -71,12 +71,12 @@ export default {
 
 <style scoped>
 .policy-selector {
-  padding: 30px;
+  padding: 20px;
   width: 100%;
   margin: 0 auto;
   border: 1px solid #ddd;
   border-radius: 4px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
 }
 
 .policy-selector-header {
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index b1fe813..21bd1a7 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -102,8 +102,19 @@
         </el-tab-pane>
         <el-tab-pane label="招商方案信息" name="second">
           <div style="margin-top: 30px;" class="editcss">
-            <!-- <TitleWithCircle title="招商方案信息" /> -->
-
+            <TitleWithCircle title="招商方案信息" />
+            <div style="padding: 20px;">
+              <el-table :data="datalist1"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                <el-table-column label="招商方案名称" prop="planName" min-width="200">
+                </el-table-column>
+                <el-table-column label="创建日期" prop="createTime" min-width="100">
+                </el-table-column>
+                <!-- <el-table-column label="当前状态" prop="businessType" min-width="100">
+                </el-table-column> -->
+              </el-table>
+            </div>
             <TitleWithCircle title="策略方案" />
             <div style="padding: 20px;">
               <el-table :data="datalist"
@@ -202,7 +213,8 @@
   import MapXian from "@/components/MapContainer/MapXian";
   import TitleWithCircle from '@/components/top/index';
   import {
-    cereResourceStrategylist
+    cereResourceStrategylist,
+    cereBusinessPlan
   } from '@/api/newly';
   export default {
     components: {
@@ -222,7 +234,8 @@
         xiangTab: 'first',
         list: [],
         parentMessage: {},
-        datalist: []
+        datalist: [],
+        datalist1:[]
       }
     },
     created() {
@@ -242,6 +255,10 @@
           console.error(res)
           this.datalist = res.data
         })
+        cereBusinessPlan(c1).then(res => {
+          console.error(res)
+          this.datalist1 = res.data
+        })
       }
     },
     computed: {
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 85cc7d1..f745ef7 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -8,14 +8,9 @@
       <!-- 线上 -->
       <div>
         <!-- 搜索 -->
-        <div class="formSearch">
+        <!-- <div class="formSearch">
           <el-form :inline="true" :model="pagequery">
-            <!-- <el-form-item label="商铺名称" prop="shopName">
-              <el-select v-model="pagequery.shopName" placeholder="请选择" style="width: 168px;margin-right: 15px">
-                <el-option :label="item.shopName" :value="item.shopName" v-for="(item,index) in this.tableData"
-                  :key="index" />
-              </el-select>
-            </el-form-item> -->
+
             <el-form-item label="所属区域" prop="belongingRegion">
               <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px">
                 <el-option label="成华区" value="成华区"></el-option>
@@ -45,7 +40,7 @@
               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
             </el-button>
           </div>
-        </div>
+        </div> -->
         <div style="margin-bottom: 20px;">
           <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
             icon="el-icon-circle-plus-outline">新增</el-button>
@@ -97,20 +92,19 @@
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.rentalStatus=='0'?'待租':'已租'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="250" fixed="right">
             <template slot-scope="scope">
-              <div @click="opencl(scope.row,'sp')" class="tableBtn greens">绑定策略</div>
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
               </div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
-                @click="removeinfozz(scope.row,'1','发布')">发布</div>
+              @click="opencl(scope.row,'sp')">发布</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
-                @click="removeinfozz(scope.row,'0','下架')">下架</div>
+                @click="removeinfozz(scope.row,'2','下架')">下架</div>
             </template>
           </el-table-column>
         </el-table>
@@ -145,8 +139,8 @@
             </template>
           </el-table-column> -->
           <el-table-column prop="publishStatus" label="发布状态" min-width="120">
-            <template slot-scope="scope">
-              {{scope.row.publishStatus == 0?'待发布':'已提交'}}
+              <template slot-scope="scope">
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
           <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="200">
@@ -154,14 +148,13 @@
           <el-table-column label="操作" min-width="250" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div @click="opencl(scope.row,'gg')" class="tableBtn greens">绑定策略</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
               </div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
-                @click="removeinfozz(scope.row,'1','发布')">发布</div>
+              @click="opencl(scope.row,'gg')">发布</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
-                @click="removeinfozz(scope.row,'0','下架')">下架</div>
+                @click="removeinfozz(scope.row,'2','下架')">下架</div>
             </template>
           </el-table-column>
         </el-table>
@@ -196,14 +189,14 @@
           <el-table-column label="操作" min-width="250" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div @click="opencl(scope.row,'cd')" class="tableBtn greens">绑定策略</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
+              <!-- <div @click="opencl(scope.row,'cd')" class="tableBtn greens">绑定策略</div> -->
+              <div class="tableBtn greens" @click="removeinfo(scope.row,'编辑')">编辑
               </div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
+              <!-- <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
                 @click="removeinfozz(scope.row,'1','发布')">发布</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
-                @click="removeinfozz(scope.row,'0','下架')">下架</div>
+                @click="removeinfozz(scope.row,'0','下架')">下架</div> -->
             </template>
           </el-table-column>
         </el-table>
@@ -279,9 +272,9 @@
         <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd>
       </div>
     </div>
-    <el-dialog :visible.sync="addcl" style="padding: 0px;" width="65%" append-to-body center
+    <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center
       :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
-      <cl @minSev="minSev" @mingClose="mingClose"></cl>
+      <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
     </el-dialog>
   </div>
 
@@ -290,7 +283,7 @@
 
 <script>
   import {
-    cereResourceStrategy
+    cereResourceStrategy,editStatus
   } from '../../api/newly.js'
   import {
     ceGetAll
@@ -370,9 +363,6 @@
         let c1 = {
           resourcesId: this.oncetype+this.oninfo.id,
           rentalPoliciesIds: ids,
-          // resources:this.oninfo
-          // rentalPoliciesId: 28,
-          // resourcesId: "sp65"
         }
         console.error(c1)
         cereResourceStrategy(c1).then(res => {
@@ -382,6 +372,12 @@
               message: '绑定成功',
               type: 'success'
             })
+            editStatus({
+              resourcesId: this.oncetype+this.oninfo.id,
+              publishStatus: '3'
+            }).then(res => {
+              this.onSubmit()
+            })
           } else {
             this.$message({
               message: '绑定失败',
@@ -400,9 +396,6 @@
         this.multipleSelection = []
         this.addcl = true
       },
-      handleSelectionChange(val) {
-        this.multipleSelection = val
-      },
       chenge(e) {
         this.ontype = e
         this.pagequery.pageNumber = 0
diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue
index dbb2f83..ba831f8 100644
--- a/admin-web-master/src/views/detect/examine/index.vue
+++ b/admin-web-master/src/views/detect/examine/index.vue
@@ -3,19 +3,13 @@
     <div class="zhuti" v-if="onaction == '1'">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>招商资源监测</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">资源地图</span></div>
+            style="color:#000000e6">资源发布审核</span></div>
       </div>
       <!-- 线上 -->
       <div>
         <!-- 搜索 -->
-        <div class="formSearch">
+        <!-- <div class="formSearch">
           <el-form :inline="true" :model="pagequery">
-            <!-- <el-form-item label="商铺名称" prop="shopName">
-              <el-select v-model="pagequery.shopName" placeholder="请选择" style="width: 168px;margin-right: 15px">
-                <el-option :label="item.shopName" :value="item.shopName" v-for="(item,index) in this.tableData"
-                  :key="index" />
-              </el-select>
-            </el-form-item> -->
             <el-form-item label="所属区域" prop="belongingRegion">
               <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px">
                 <el-option label="成华区" value="成华区"></el-option>
@@ -45,68 +39,63 @@
               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
             </el-button>
           </div>
-        </div>
-        <div style="margin-bottom: 20px;">
-          <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
-            icon="el-icon-circle-plus-outline">新增</el-button>
-          <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
-        </div>
-        <!-- 地图 -->
-        <!-- <div style="display: flex;justify-content: space-between;margin-bottom: 20px;">
-          <div style="width: 100%;height: 400px; border: 1px solid #3F9B6A;position: relative;">
-            <MapContainer :message="tableData" @MapItem='HandMapItem' ref="mapComponent"></MapContainer>
-          </div>
         </div> -->
         <div style="margin: 20px 0;">
           <div style="display: flex;font-size: 14px">
             <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
             </div>
-            <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
+            <!-- <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
               广告位</div>
             <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地
-            </div>
+            </div> -->
           </div>
         </div>
         <!-- 表格 -->
-        <el-table v-if="ontype=='1'" :data="tableData"
+        <!--  -->
+        <el-table border v-if="ontype=='1'" :span-method="objectSpanMethod" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="80">
+          <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.$index +1 }}
+              {{scope.row.cereBasicInformationShop.shopName}}
             </template>
           </el-table-column>
-          <el-table-column label="编号" prop="venueNumber" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="门牌号" prop="houseNumber" show-overflow-tooltip>
-
-          </el-table-column>
-          <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip>
-
-          </el-table-column>
-          <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="建筑形式" prop="architecturalForm" show-overflow-tooltip>
-          </el-table-column>
           <el-table-column prop="detailedLocation" label="详细地址" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.cereBasicInformationShop.detailedLocation}}
+            </template>
           </el-table-column>
           <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.cereBasicInformationShop.actualUsableArea}}
+            </template>
+          </el-table-column>
+          <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.shopinfo.policyName}}
+            </template>
           </el-table-column>
-          <el-table-column label="负责人" prop="head" show-overflow-tooltip>
+          <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
+            </template>
           </el-table-column>
-          <el-table-column label="租赁到期时间" prop="leaseExpirationDate" show-overflow-tooltip>
+          <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.shopinfo.payDay}}
+            </template>
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.rentalStatus=='0'?'待租':'已租'}}
+              {{scope.row.cereBasicInformationShop.publishStatus=='0'?'待发布':scope.row.cereBasicInformationShop.publishStatus=='1'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='2'?'已下架':scope.row.cereBasicInformationShop.publishStatus=='3'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="250" fixed="right">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
-              <div @click="opencl(scope.row,'sp')" class="tableBtn greens">绑定策略</div>
-              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
+              <!-- <div @click="opencl(scope.row,'sp')" class="tableBtn greens">绑定策略</div> -->
+              <div @click="details(scope.row.cereBasicInformationShop)" class="tableBtn greens">查看</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
               </div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
+              <!-- <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> -->
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
                 @click="removeinfozz(scope.row,'1','发布')">发布</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
@@ -226,8 +215,10 @@
 
     <div class="zhuti" v-if="onaction == '2'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">新增</span></div>
+        <div style="color:#0006">
+          <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-'  }}</span> <span
+            style="padding:0 5px;">></span> <span style="color:#000000e6">新增</span>
+        </div>
       </div>
       <div style="margin: 20px 0;">
         <div style="display: flex;font-size: 14px">
@@ -251,8 +242,10 @@
     </div>
     <div class="zhuti" v-if="onaction == '3'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>{{ONACTION == '1'?'商铺基本信息':ONACTION == '2'?'广告位基本信息管理':ONACTION == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">查看</span></div>
+        <div style="color:#0006">
+          <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-'  }}</span> <span
+            style="padding:0 5px;">></span> <span style="color:#000000e6">查看</span>
+        </div>
       </div>
       <div v-if="ontype == '1'">
         <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
@@ -266,8 +259,10 @@
     </div>
     <div class="zhuti" v-if="onaction == '4'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>{{ONACTION == '1'?'商铺基本信息':ONACTION == '2'?'广告位基本信息管理':ONACTION == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">{{contractChangeReason}}</span></div>
+        <div style="color:#0006">
+          <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-'  }}</span> <span
+            style="padding:0 5px;">></span> <span style="color:#000000e6">{{contractChangeReason}}</span>
+        </div>
       </div>
       <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
         <add :info="detailsinfo" @removeonaction="removeonaction"></add>
@@ -290,7 +285,8 @@
 
 <script>
   import {
-    cereResourceStrategy
+    cereResourceStrategy,
+    getResourceStrategy
   } from '@/api/newly.js'
   import {
     ceGetAll
@@ -311,7 +307,7 @@
   import addcd from '@/components/add/addcd'
   import chakanmap from '@/components/chakan/map'
   import chakancd from '@/components/chakan/cd'
-    import cl from '@/components/change/cl.vue'
+  import cl from '@/components/change/cl.vue'
   import {
     on
   } from 'screenfull';
@@ -330,10 +326,9 @@
         contractChangeReason: '',
         detailsinfo: {},
         pagequery: {
-          dataStatus: '1',
+          publishStatus: '1',
           pageNumber: 0,
           pageSize: 10,
-          contractName: ''
         },
         tableData: [],
         total: 0,
@@ -359,6 +354,32 @@
       this.getAll()
     },
     methods: {
+      objectSpanMethod({
+        row,
+        column,
+        rowIndex,
+        columnIndex
+      }) {
+        if (columnIndex != 3 && columnIndex != 4 && columnIndex != 5) {
+          if (rowIndex % row.num === 0) {
+            return {
+              rowspan: row.num,
+              colspan: 1
+            };
+          } else {
+            return {
+              rowspan: 1,
+              colspan: 1
+            };
+          }
+        } else {
+          return {
+            rowspan: 1,
+            colspan: 1
+          };
+        }
+
+      },
       minSev(e) {
         this.multipleSelection = e
         console.error(this.multipleSelection)
@@ -368,7 +389,7 @@
         }
         console.error(this.oninfo)
         let c1 = {
-          resourcesId: this.oncetype+this.oninfo.id,
+          resourcesId: this.oncetype + this.oninfo.id,
           rentalPoliciesIds: ids,
           // resources:this.oninfo
           // rentalPoliciesId: 28,
@@ -394,7 +415,7 @@
         this.multipleSelection = []
         this.addcl = false
       },
-      async opencl(row,e) {
+      async opencl(row, e) {
         this.oncetype = e
         this.oninfo = row
         this.multipleSelection = []
@@ -524,17 +545,45 @@
       },
       async getAll() {
         if (this.ontype == '1') {
-          const res = await getAlls(this.pagequery)
-          this.tableData = res.data.content
-          this.total = res.data.totalElements
+          const res = await getResourceStrategy({
+            ...this.pagequery,
+            resourcesId: 'sp'
+          })
+          let c1 = []
+          for (let index = 0; index < res.data.list.length; index++) {
+            const element = res.data.list[index];
+            if (element.cereBasicInformationShop.id) {
+
+              let obj = {
+                cereBasicInformationShop: element.cereBasicInformationShop,
+                num: element.cereRentalPolicies.length
+              }
+              for (let i = 0; i < element.cereRentalPolicies.length; i++) {
+                // console.error(index,i)
+                const element1 = element.cereRentalPolicies[i];
+                obj.shopinfo = element1
+                c1.push(obj)
+              }
+
+            }
+          }
+          this.tableData = c1
+          console.error(this.tableData)
+          this.total = res.data.total
         } else if (this.ontype == '2') {
-          const res = await likeGet(this.pagequery)
-          this.tableData = res.data.content
-          this.total = res.data.totalElements
+          const res = await getResourceStrategy({
+            ...this.pagequery,
+            resourcesId: 'gg'
+          })
+          this.tableData = res.data.list
+          this.total = res.data.total
         } else if (this.ontype == '3') {
-          const res = await changAlls(this.pagequery)
-          this.tableData = res.data.content
-          this.total = res.data.totalElements
+          const res = await getResourceStrategy({
+            ...this.pagequery,
+            resourcesId: 'cd'
+          })
+          this.tableData = res.data.list
+          this.total = res.data.total
         }
 
       },
@@ -880,7 +929,8 @@
     background-color: #ecf5f0 !important;
     outline: none;
   }
-  .el-dialog__header{
+
+  .el-dialog__header {
     padding: 0 0 !important;
   }
 </style>
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index ac610a5..a3bc6f6 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -82,7 +82,7 @@
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.rentalStatus=='0'?'待租':'已租'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="250" fixed="right">
@@ -94,7 +94,7 @@
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
               @click="opencl(scope.row,'sp')">发布</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
-                @click="removeinfozz(scope.row,'0','下架')">下架</div>
+                @click="removeinfozz(scope.row,'2','下架')">下架</div>
             </template>
           </el-table-column>
         </el-table>
@@ -143,9 +143,9 @@
         <add :info="detailsinfo" @removeonaction="removeonaction"></add>
       </div>
     </div>
-    <el-dialog :visible.sync="addcl" style="padding: 0px;" width="65%" append-to-body center
+    <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center
       :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
-      <cl @minSev="minSev" @mingClose="mingClose"></cl>
+      <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
     </el-dialog>
   </div>
 
@@ -171,7 +171,8 @@
     import cl from '@/components/change/cl.vue'
 
     import {
-    cereResourceStrategy
+    cereResourceStrategy,
+    editStatus
   } from '@/api/newly.js'
   export default {
     data() {
@@ -224,6 +225,12 @@
               message: '绑定成功',
               type: 'success'
             })
+            editStatus({
+              resourcesId: this.oncetype+this.oninfo.id,
+              publishStatus: '3'
+            }).then(res => {
+              this.onSubmit()
+            })
           } else {
             this.$message({
               message: '绑定失败',
@@ -598,6 +605,7 @@
     outline: none;
   }
   .el-dialog__header{
-    padding: 0 0 !important;
+    padding: 0;
+    display: none;
   }
 </style>
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index d5ff60a..3781d0b 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -8,11 +8,11 @@
       <!-- 线上 -->
       <div>
         <div style="display: flex;font-size: 14px">
-        <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia':''">线上</div>
-        ({{xsNum}})
-        <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)"
-          :class="leixing?'':'chengeXia'">实体</div>({{xxNum}})
-      </div>
+          <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia':''">线上</div>
+          ({{xsNum}})
+          <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)"
+            :class="leixing?'':'chengeXia'">实体</div>({{xxNum}})
+        </div>
         <!-- 搜索 -->
         <div class="formSearch">
           <el-form :inline="true" :model="pagequery" style="margin-top: 15px;">
@@ -93,7 +93,7 @@
           </el-table-column> -->
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.rentalStatus=='0'?'待租':'已租'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
           <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="150" show-overflow-tooltip>
@@ -101,10 +101,12 @@
           <el-table-column label="操作" min-width="250" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
+              </div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfozz(scope.row,'1','发布')">发布</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" @click="removeinfozz(scope.row,'0','下架')">下架</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="opencl(scope.row,'gg')">发布</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
+                @click="removeinfozz(scope.row,'2','下架')">下架</div>
             </template>
           </el-table-column>
         </el-table>
@@ -141,7 +143,8 @@
             style="color:#000000e6">查看</span></div>
       </div>
       <div>
-        <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></resourceCommodity>
+        <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing">
+        </resourceCommodity>
       </div>
     </div>
     <div class="zhuti" v-if="onaction == '4'">
@@ -153,6 +156,10 @@
         <add :info="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></add>
       </div>
     </div>
+    <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
+      :close-on-press-escape="false" :show-close="false">
+      <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
+    </el-dialog>
   </div>
 
 
@@ -168,12 +175,22 @@
   } from '../../../api/map1'
   import add from '../../../components/add/addmap'
   import resourceCommodity from '../../../components/chakan/map'
+  import {
+    cereResourceStrategy,
+    editStatus
+  } from '@/api/newly.js'
+   import cl from '@/components/change/cl.vue'
   export default {
     data() {
       return {
+        oncetype: '',
+        addcl: false,
+        oninfo: {},
+        multipleSelection: [],
+
         xsNum: 0,
         xxNum: 0,
-        leixing:true,
+        leixing: true,
         contractChangeReason: '',
         detailsinfo: {},
         pagequery: {
@@ -185,11 +202,11 @@
         tableData: [],
         total: 0,
         onaction: '1',
-        formInline: {
-        },
+        formInline: {},
       }
     },
     components: {
+      cl,
       add,
       resourceCommodity,
     },
@@ -197,6 +214,50 @@
       this.getAll()
     },
     methods: {
+      minSev(e) {
+        this.multipleSelection = e
+        console.error(this.multipleSelection)
+        let ids = []
+        for (let index = 0; index < this.multipleSelection.length; index++) {
+          ids.push(this.multipleSelection[index].id)
+        }
+        console.error(this.oninfo)
+        let c1 = {
+          resourcesId: this.oncetype + this.oninfo.id,
+          rentalPoliciesIds: ids,
+        }
+        console.error(c1)
+        cereResourceStrategy(c1).then(res => {
+          if (res.code == 200) {
+            this.addcl = false
+            this.$message({
+              message: '绑定成功',
+              type: 'success'
+            })
+            editStatus({
+              resourcesId: this.oncetype + this.oninfo.id,
+              publishStatus: '3'
+            }).then(res => {
+              this.onSubmit()
+            })
+          } else {
+            this.$message({
+              message: '绑定失败',
+              type: 'error'
+            })
+          }
+        })
+      },
+      mingClose() {
+        this.multipleSelection = []
+        this.addcl = false
+      },
+      async opencl(row, e) {
+        this.oncetype = e
+        this.oninfo = row
+        this.multipleSelection = []
+        this.addcl = true
+      },
       chenge(val) {
         if (val == 1) {
           this.leixing = true
@@ -245,21 +306,21 @@
         return formattedDateTime
 
       },
-      removeinfozz(row, e,tit) {
+      removeinfozz(row, e, tit) {
         let that = this
-        this.$confirm('确定要' + tit +'吗？', '提示', {
+        this.$confirm('确定要' + tit + '吗？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
           editList({
             ...row,
-            publishStatus:e
+            publishStatus: e
           }).then(res => {
             console.error(res)
             if (res.code == 200) {
               this.$message({
-                message: tit+'成功',
+                message: tit + '成功',
                 type: 'success'
               })
               this.removeonaction('1')
@@ -306,21 +367,21 @@
         this.tableData = res.data.content
         this.total = res.data.totalElements
         let obj1 = {
-        pageNumber: 1,
-        pageSize: 10,
-        advertisingType: '线上广告位'
-      }
-      likeGet(obj1).then(res => {
-        this.xsNum = res.data.content.length
-      })
-      let obj2 = {
-        pageNumber: 1,
-        pageSize: 10,
-        advertisingType: '实体广告位'
-      }
-      likeGet(obj2).then(res => {
-        this.xxNum = res.data.content.length
-      })
+          pageNumber: 1,
+          pageSize: 10,
+          advertisingType: '线上广告位'
+        }
+        likeGet(obj1).then(res1 => {
+          this.xsNum = res1.data.totalElements
+        })
+        let obj2 = {
+          pageNumber: 1,
+          pageSize: 10,
+          advertisingType: '实体广告位'
+        }
+        likeGet(obj2).then(res2 => {
+          this.xxNum = res2.data.totalElements
+        })
       },
       removeonaction(e) {
         console.error(e)
--
libgit2 0.21.4