diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index 127345c..c4cf33d 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 import requestnew from '@/utils/request2'
+// 批量修改资源状态
+export function modifyResourceStatus(data) {
+  return request({
+    url: '/cereBasicInformationShop/modifyResourceStatus',
+    method: 'post',
+    data
+  })
+}
 // 获取续租管理合同
 export function contractRenewalReminder(data) {
   return request({
diff --git a/admin-web-master/src/components/add/addfa.vue b/admin-web-master/src/components/add/addfa.vue
new file mode 100644
index 0000000..4911ad5
--- /dev/null
+++ b/admin-web-master/src/components/add/addfa.vue
@@ -0,0 +1,548 @@
+<template>
+  <div>
+    <el-form :model="formInline" :rules="rulesHetong" ref="heForm" label-width="130px" class="demo-ruleForm">
+      <el-form-item label="招商方案名称" class="grid-content bg-purple device-from" prop="planName">
+        <el-input v-model="formInline.planName" placeholder="请输入" maxlength="100" />
+      </el-form-item>
+      <el-form-item label="招商政策与条件" class="grid-content bg-purple" prop="investmentPolicy">
+        <wang-editor v-model="formInline.investmentPolicy" ref="editor" :height="200"></wang-editor>
+      </el-form-item>
+      <el-form-item label="方案概述" prop="summary" class="grid-content bg-purple">
+        <wang-editor v-model="formInline.summary" ref="editor" :height="200"></wang-editor>
+      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="招商资源管理" prop="shopNumber">
+            <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+              <div
+                style="font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;line-height:20px;background:#F2F3F5;">
+                <div></div>
+                <div style="color: #3F9B6A;padding:10px;" @click="mingShow">
+                  添加
+                </div>
+              </div>
+              <div style="padding: 15px;">
+                <div style="padding: 0px 20px 0px 0px">
+                  <el-table :data="AddData" :span-method="tableSpanMethod"
+                    :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                    <el-table-column label="序号" min-width="50" prop="one">
+                      <template slot-scope="scope">
+                        {{scope.$index + 1}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="资源名称"  prop="name"   show-overflow-tooltip>
+                      <template slot-scope="scope">
+                        {{scope.row.zyinfo.shopName ? scope.row.zyinfo.shopName :  scope.row.zyinfo.advertisingName?scope.row.zyinfo.advertisingName:scope.row.zyinfo.venueName}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="资源类型" prop="type" >
+                      <template slot-scope="scope">
+                        {{scope.row.zyinfo.shopName ? '商铺' : scope.row.zyinfo.advertisingType?scope.row.zyinfo.advertisingType:'场地'}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="策略名称" >
+                      <template slot-scope="scope">
+                        {{scope.row.clinfo.policyName || '-'}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="策略描述" >
+                      <template slot-scope="scope">
+                        {{scope.row.clinfo.policyName || '-'}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作" prop="cz" >
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.num == 1" @click="opencl(scope.row.zyinfo)" class="tableBtn greens">策略选择</div>
+                        <div @click="removezy(scope.row.zyinfo)" class="tableBtn greens">编辑</div>
+                        <div @click="MingDelete(scope.row.zyinfo)" class="tableBtn greens">删除</div>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </div>
+              </div>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="附件信息" prop="mainPurpose">
+        <upfile :accept="'.docx,.doc'" filePath="fa" inputtype="mainPurpose" :value="formInline.mainPurpose" @changimg="e=>changimg(e,'mainPurpose')"></upfile>
+      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item>
+            <div style="margin-top: 20px">
+              <el-button @click="add()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+              <el-button @click="close()" class="buttonHover"
+                style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-dialog :visible.sync="addMing" title="选择资源" style="padding: 0;" width="65%" append-to-body center
+      :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+      <zy v-if="addMing" @mingClose="mingClose" @minSev="minSev"></zy>
+        
+      
+    </el-dialog>
+    <el-dialog :visible.sync="onaction" title="编辑" style="padding: 0;" width="65%" append-to-body center
+      :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+      <div style="height: 40vh;overflow-y: scroll;">
+        <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
+          <add :info="detailsinfo" @removeonaction="removeonaction"></add>
+        </div>
+        <div v-if="ontype == '2'" style="padding: 20px 20px 20px 0;">
+          <addmap :info="detailsinfo" @removeonaction="removeonaction"></addmap>
+        </div>
+        <div v-if="ontype == '3'" style="padding: 20px 20px 20px 0;">
+          <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd>
+        </div>
+      </div>
+    </el-dialog>
+    <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 :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSevcl" @mingClose="mingClosecl"></cl>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import zy from "@/components/change/zy"
+  import upfile from "@/components/fujianUpload/fujianList"
+  import upimg from "@/components/ImageUpload/index"
+  import wangEditor from "@/components/editor/index";
+  import addmap from '@/components/add/addmap'
+  import addcd from '@/components/add/addcd'
+  import add from '@/components/add/addinformation'
+   import cl from '@/components/change/cl.vue'
+  import {
+    fangAdd,
+    fangEdit,
+  } from '@/api/fangli';
+  import {
+    cereResourceStrategy,
+    cereBusinessOperationadd,
+  } from '@/api/newly.js'
+  export default {
+    components: {
+      addcd,
+      addmap,
+      add,
+      upimg,
+      wangEditor,
+      upfile,
+      zy,
+      cl
+    },
+    data() {
+      return {
+        multipleSelection: [],
+        oninfo:{},
+        oncetype:'',
+        addcl:false,
+        detailsinfo:{},
+        ontype:'1',
+        onaction:false,
+        AddData: [], //选中的资源
+        addMing: false,
+        formInline: {
+          planName: '',
+          planningScheme: '',
+          investmentPolicy: '',
+          summary: '',
+          financialAnalysis: '',
+          attachmentInfo: '',
+          resourceManagement: '',
+          auditStatus: '1'
+        },
+        rulesHetong: {
+          planName: [{
+            required: true,
+            message: '请填写招商方案名称',
+            trigger: 'change'
+          }],
+        },
+      };
+    },
+    props: {
+      info: {
+        type: Object,
+        default: {}
+      }
+    },
+    async created() {
+
+    },
+    methods: {
+      minSevcl(e) {
+        this.multipleSelection = e
+        // console.error(this.multipleSelection)
+        let listall = []
+        for (let n = 0; n < this.AddData.length; n++) {
+          const element = this.AddData[n];
+          let cnet = ''
+          if (element.zyinfo.shopName) {
+            cnet = 'sp' + element.zyinfo.id
+          } else if (element.zyinfo.advertisingType) {
+            cnet = 'gg' + element.zyinfo.id
+          } else {
+            cnet = 'cd' + element.zyinfo.id
+          }
+          if (this.oninfo.id == element.zyinfo.id) {
+            for (let index = 0; index < this.multipleSelection.length; index++) {
+              let info = {
+                cnet:cnet,
+                zyinfo:element.zyinfo,
+                num:this.multipleSelection.length,
+                clinfo:this.multipleSelection[index]
+              }
+              listall.push(info)
+            }
+          } else{
+            listall.push(this.AddData[n])
+          }
+        }
+        this.AddData = listall
+        
+        this.addcl = false
+      },
+      mingClosecl() {
+        this.multipleSelection = []
+        this.addcl = false
+      },
+      async opencl(row) {
+        if (row.shopName) {
+          this.oncetype = 'sp'
+        } else if (row.advertisingType) {
+          this.oncetype = 'gg'
+        } else {
+          this.oncetype = 'cd'
+        }
+        this.oninfo = row
+        this.multipleSelection = []
+        this.addcl = true
+      },
+      removeonaction() {
+        this.onaction = false
+      },
+      removezy(row) {
+        if (row.shopName) {
+          this.ontype = '1'
+        } else if (row.advertisingType) {
+          this.ontype = '2'
+        } else {
+          this.ontype = '3'
+        }
+        this.detailsinfo = row
+        this.onaction = true
+      },
+      changimg(e, type) {
+        this.formInline[type] = e
+      },
+      addclall (id,ids) {
+        let c1 = {
+          resourcesId: id,
+          rentalPoliciesIds: ids,
+        }
+        console.error(c1)
+        cereResourceStrategy(c1).then(res => {
+          if (res.code == 200) {
+          } else {
+            this.$message({
+              message: '绑定失败',
+              type: 'error'
+            })
+          }
+        })
+      },
+      async add() {
+        if (this.formInline.id) {
+         
+        } else {
+          let c2 = ''
+          let alllist = this.buildTree(this.AddData)
+          console.error(alllist)
+          //判断alllist是不是数组
+          if (Array.isArray(alllist)) {
+            for (let i = 0; i < alllist.length; i++) {
+              let cnet = alllist[i].id
+              await this.addclall(alllist[i].id,alllist[i].clids)
+              if (i == 0) {
+                c2 = cnet
+              } else {
+                c2 = c2 + ',' + cnet
+              }
+            }
+            
+          } else{
+            return
+          }
+          console.error(c2)
+          await cereBusinessOperationadd({
+            type: '发布',
+            resourceId: c2,
+            operator: localStorage.getItem('roleName'),
+            operationTime: this.gettime()
+          }).then(res => {
+            console.error(res)
+          })
+          this.formInline.resourceManagement = c2
+          console.error({
+            ...this.formInline
+          })
+          // return
+          this.$refs.heForm.validate((valid) => {
+            console.log(valid)
+            if (valid) {
+              fangAdd({
+                ...this.formInline
+              }).then(res => {
+                console.error(res)
+                if (res.code == 200) {
+                  this.$message({
+                    message: '添加成功',
+                    type: 'success'
+                  })
+                  modifyResourceStatus({
+                    resourcesId: c2,
+                     status:"1"
+                  }).then(res => {
+                    console.error(res)
+                  })
+                  this.$emit('removeonaction', '1')
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: 'error'
+                  })
+                }
+
+              })
+            } else {
+              this.$message({
+                message: '请填写完整信息',
+                type: 'error'
+              })
+              return false;
+            }
+          })
+
+        }
+      },
+      close() {
+        this.$emit('removeonaction', '1')
+      },
+      MingDelete(item) {
+        // this.AddData.splice(item, 1);
+        let array = JSON.parse(JSON.stringify(this.AddData));
+        for (let index = 0; index < array.length; index++) {
+          const element = array[index];
+          if (element.zyinfo.id == item.id) {
+            this.AddData.splice(index, element.num);
+          }
+        }
+      },
+      async mingShow() {
+        this.addMing = true
+      },
+      minSev(e) {
+        // console.error(e)
+        let list = []
+        let filteredAddData = []
+        if(this.AddData.length>0) {
+          filteredAddData = e.filter(item => {
+            let isExist = true;
+            this.AddData.filter(itemAdd => {
+              if(itemAdd.zyinfo.id == item.id) {
+                isExist = false
+              } 
+            });
+            if(isExist) {
+              return item;
+            }
+          });
+
+        } else {
+          filteredAddData = e
+        }
+        // console.error(filteredAddData)
+        for (let index = 0; index < filteredAddData.length; index++) {
+          const element = filteredAddData[index];
+          let cnet = ''
+          if (element.shopName) {
+            cnet = 'sp' + element.id
+          } else if (element.advertisingType) {
+            cnet = 'gg' + element.id
+          } else {
+            cnet = 'cd' + element.id
+          }
+          let info = {
+            zyinfo:element,
+            num:1,
+            cnet:cnet,
+            clinfo:{
+              
+            }
+          }
+          list.push(info)
+        }
+        this.AddData = this.AddData.concat(list)
+        
+        this.addMing = false
+      },
+      mingClose() {
+        this.addMing = false
+      },
+      tableSpanMethod({ row, column, rowIndex }) {
+        if (["name", "type","one","cz"].includes(column.property)) {
+          // 判断 num 是否相同，合并行
+          const num = row.num;
+          const cnet = row.cnet;
+          const startRowIndex = this.findStartRowIndex(rowIndex, num,cnet);
+          
+          return startRowIndex === rowIndex 
+            ? { rowspan: num, colspan: 1 } 
+            : { rowspan: 0, colspan: 0 };
+        }
+      },
+      findStartRowIndex(rowIndex, num,cnet) {
+        let startRowIndex = rowIndex;
+        for (let i = rowIndex - 1; i >= 0; i--) {
+          if (this.AddData[i].num === num && this.AddData[i].cnet === cnet) {
+            startRowIndex = i;
+          } else {
+            break;
+          }
+        }
+        return startRowIndex;
+      },
+      buildTree(clinfoArray) {
+        let list = [];
+        for (let index = 0; index < clinfoArray.length; index++) {
+          const element = clinfoArray[index];
+          if(list.length>0) {
+            let c1 = true
+            for (let n = 0; n < list.length; n++) {
+              const item = list[n];
+              if(item.id == element.cnet) {
+                c1 = false
+              } else {
+                
+              }
+           }
+           if(c1) {
+              let info ={
+                id: element.cnet,
+                children:[],
+                clids:''
+              }
+              for (let i = 0; i < clinfoArray.length; i++) {
+                const elementnew = clinfoArray[i];
+                if(elementnew.cnet == info.id) {
+                  info.children.push(elementnew)
+                  if(elementnew.clinfo && elementnew.clinfo.id) {
+                    if(i == 0) {
+                      info.clids = elementnew.clinfo.id
+                    } else {
+                      info.clids = info.clids + ','+elementnew.clinfo.id
+                    }
+                  } else {
+                    this.$message({
+                      message: '资源请绑定策略',
+                      type: 'error'
+                    })
+                    return false;
+                  }
+                }
+                
+              }
+              list.push(info)
+           }
+          } else {
+            let info ={
+                id: element.cnet,
+                children:[],
+                clids:''
+              }
+              for (let i = 0; i < clinfoArray.length; i++) {
+                const elementnew = clinfoArray[i];
+                if(elementnew.cnet == info.id) {
+                  info.children.push(elementnew)
+                  if(elementnew.clinfo && elementnew.clinfo.id) {
+                    if(i == 0) {
+                      info.clids = elementnew.clinfo.id
+                    } else {
+                      info.clids = info.clids + ','+elementnew.clinfo.id
+                    }
+                  } else {
+                    this.$message({
+                      message: '资源请绑定策略',
+                      type: 'error'
+                    })
+                    return false;
+                  }
+                }
+                
+              }
+              list.push(info)
+          }
+        }
+        return list
+      },
+      gettime() {
+        // 获取当前时间
+        let currentTime = new Date();
+
+        // 获取年份
+        let year = currentTime.getFullYear();
+
+        // 获取月份（注意月份是从0开始计数的，所以需要加1）
+        let month = currentTime.getMonth() + 1;
+
+        // 获取日期
+        let day = currentTime.getDate();
+
+        // 获取小时
+        let hours = currentTime.getHours();
+
+        // 获取分钟
+        let minutes = currentTime.getMinutes();
+
+        // 获取秒数
+        let seconds = currentTime.getSeconds();
+
+        // 获取毫秒数
+        let milliseconds = currentTime.getMilliseconds();
+
+        // 格式化时间为 YYYY-MM-DD
+        let formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 HH:MM:SS
+        let formattedTime =
+          `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 YYYY-MM-DD HH:MM:SS
+        let formattedDateTime = `${formattedDate} ${formattedTime}`;
+        return formattedDateTime
+
+      },
+    },
+  };
+</script>
+<style lang="css">
+  .el-upload {
+    display: block;
+    text-align: left;
+  }
+
+  .el-dialog__header {
+    background-color: #F2F3F5;
+    text-align: left;
+  }
+
+  .el-dialog__title {
+    line-height: 30px;
+    font-size: 15px;
+    color: #303133;
+  }
+</style>
diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
index 9acd4fb..4d43d2b 100644
--- a/admin-web-master/src/components/change/cl.vue
+++ b/admin-web-master/src/components/change/cl.vue
@@ -222,9 +222,10 @@
 <style scoped>
   .policy-selector {
     padding: 20px;
+    /* padding: 20px;
     width: 100%;
     margin: 0 auto;
-    border: 1px solid #ddd;
+    border: 1px solid #ddd; */
     /* border-radius: 4px; */
     /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
   }
@@ -249,4 +250,7 @@
     justify-content: flex-end;
     align-items: center;
   }
+  ::v-deep .el-dialog__body {
+    padding: 0 0 !important;
+  }
 </style>
diff --git a/admin-web-master/src/components/change/zy.vue b/admin-web-master/src/components/change/zy.vue
new file mode 100644
index 0000000..31827f2
--- /dev/null
+++ b/admin-web-master/src/components/change/zy.vue
@@ -0,0 +1,193 @@
+<template>
+  <div class="policy-selector">
+    <div class="policy-selector-content">
+      <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+        <div
+          style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+          <div style="line-height:200%">选择策略</div>
+          <div style="display: flex">
+            <el-select v-model="zytype" placeholder="请选择" style="width: 40%;margin-right: 15px" @change="changzytype">
+                <el-option label="商铺" :value="'1'"></el-option>
+                <el-option label="广告" :value="'2'"></el-option>
+                <el-option label="场地" :value="'3'"></el-option>
+            </el-select>
+            <el-input placeholder="请输入" suffix-icon="el-icon-search" style="margin-right:15px;width: 40%;"
+              v-model="name">
+            </el-input>
+            <el-button @click="onSearch" style="background-color: #3F9B6A;color: #fff">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+            </el-button>
+          </div>
+        </div>
+        <div style="padding: 15px;">
+          <div style="padding: 0px 20px 0px 0px;max-height:40vh;overflow-y: auto;">
+            <el-table ref="multipleTable" :data="listData" tooltip-effect="dark"
+              @selection-change="handleSelectionChange"
+              :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+              <el-table-column label="选择" type="selection" width="55">
+              </el-table-column>
+              <el-table-column label="序号">
+                <template slot-scope="scope">
+                  {{scope.$index +1 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="编号" prop="id"></el-table-column>
+              <el-table-column label="资源名称">
+                <template slot-scope="scope">
+                  {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
+                </template>
+              </el-table-column>
+              <el-table-column label="资源类型">
+                <template slot-scope="scope">
+                  {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div style="display: flex;justify-content: space-between;margin: 20px 0;" class="bom">
+      <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
+      <el-pagination :current-page="pageindex.pageNumber+1" :page-sizes="[5,10, 20, 50, 100]"
+        :page-size="pageindex.pageSize" background small layout="prev, pager, next" :total="total"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange">
+      </el-pagination>
+    </div>
+    <div class="policy-selector-footer" style="display: flex; justify-content: flex-end; align-items: center;">
+      <el-button @click="confirm" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+      <el-button @click="cancel" class="buttonHover"
+        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+    import {
+    cereResourceStrategylist
+  } from '@/api/newly.js'
+  import {
+    ceGetAll
+  } from '@/api/sam.js'
+  import {
+    getAlls,
+    changAlls
+  } from '@/api/information.js'
+  import {
+    getAlls as map1
+  } from '@/api/map1.js'
+  export default {
+    data() {
+      return {
+        name:'',
+        zytype:'1',
+        total: 0,
+        pageindex: {
+          pageNumber: 0,
+          pageSize: 5,
+          publishStatus:'0'
+        },
+        selectedRows: [],
+        listData: [],
+      };
+    },
+    async created() {
+
+      await this.getAll()
+    },
+    props: {
+      resourcesId: {
+        type: String,
+        default: function () {
+          return ''
+        }
+      }
+    },
+    methods: {
+      changzytype() {
+        this.onSearch()
+      },
+      async getAll() {
+        let list = []
+        if(this.zytype == '1') {
+          list = await getAlls({shopName: this.name,...this.pageindex})
+        } else if(this.zytype == '2') {
+          list = await map1({advertisingName: this.name,...this.pageindex})
+        } else if(this.zytype == '3') {
+          list = await changAlls({venueName: this.name,...this.pageindex})
+        }
+        this.listData = list.data.content
+        this.total = list.data.totalElements
+
+      },
+      async handleCurrentChange(val) {
+        this.pageindex.pageNumber = val - 1
+        await this.getAll()
+      },
+      handleSizeChange(val) {
+        this.pageindex.pageSize = val
+        this.getAll()
+      },
+      onSearch() {
+        this.pageindex.pageNumber = 0
+        this.getAll()
+      },
+      resetting() {
+        this.pageindex = {
+          pageNumber: 0,
+          pageSize: 5,
+        }
+        this.name = ''
+        this.getAll()
+      },
+      handleSelectionChange(selection) {
+        this.selectedRows = selection;  
+      },
+      confirm() {
+
+        this.$emit('minSev',this.selectedRows);
+      },
+      cancel() {
+        this.$emit('mingClose');
+      }
+    }
+  };
+</script>
+
+<style scoped>
+  .policy-selector {
+    padding: 20px;
+    /* 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); */
+  }
+
+  .policy-selector-header {
+    text-align: left;
+    margin-bottom: 20px;
+  }
+
+  .policy-selector-header h3 {
+    margin: 0;
+    font-size: 18px;
+    color: #303133;
+  }
+
+  .policy-selector-content {
+    margin-bottom: 20px;
+  }
+
+  .policy-selector-footer {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+  ::v-deep .el-dialog__body {
+    padding: 0 0 !important;
+  }
+</style>
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 3553040..5d01662 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -18,8 +18,8 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'https://jy.scjysm.asia:18086/meserver/admin-server';
-  // baseURL = 'http://172.16.61.125:9003';
-  baseURL = 'http://10.0.0.51:9003';
+  baseURL = 'http://172.16.61.125:9003';
+  // baseURL = 'http://10.0.0.51:9003';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
 
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index 49f784b..f387d47 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -17,7 +17,7 @@ let baseURL =  ''
 // || host === 'localhost:9528'
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_2;
-  baseURL = 'http://10.0.0.51:9004';
+  baseURL = 'http://172.16.61.125:9004';
   // baseURL = 'https://jy.scjysm.asia:18086/merchant-business';
 } else {
   console.error('---------------------')
diff --git a/admin-web-master/src/views/ads/fangli/index copy.vue b/admin-web-master/src/views/ads/fangli/index copy.vue
new file mode 100644
index 0000000..a222cb1
--- /dev/null
+++ b/admin-web-master/src/views/ads/fangli/index copy.vue
@@ -0,0 +1,734 @@
+<template>
+  <div style="background-color:#f7f7f7;padding:10px 10px;">
+    <div class="zhuti" v-if="addAct == false  && banAct == false">
+      <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>
+      </div>
+      <div>
+        <!-- 搜索 -->
+        <div class="formSearch">
+          <div>
+            <el-form :model="formSel" :inline="true">
+              <el-form-item label="方案名称">
+                <el-input v-model="formSel.planName" placeholder="请输入" style="width:168px;">
+                </el-input>
+              </el-form-item>
+              <el-form-item label="计划实施时间">
+                <el-date-picker style="width:230px;" v-model="plan_Time" value-format="yyyy-MM-dd" prefix-icon="none"
+                  type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+            </el-button>
+          </div>
+
+        </div>
+        <div style="margin-bottom:20px;">
+          <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
+            @click="addbuss">新增</el-button>
+        </div>
+        <!-- 表格 -->
+        <el-table :data="
+            tableData.slice(
+              (currentPage - 1) * pageSize,
+              currentPage * pageSize
+            )
+          " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="序号" min-width="60">
+            <template slot-scope="scope">
+              {{scope.$index+1}}
+            </template>
+          </el-table-column>
+          <el-table-column label="招商方案名称" prop="planName" min-width="300" />
+          <!-- <el-table-column
+            label="规划方案名称"
+
+            min-width="300"
+          >
+          <template slot-scope="scope">
+            {{scope.row.cereInvestmentPlanningManagement.planningName}}
+          </template>
+          </el-table-column> -->
+          <!-- <el-table-column
+            label="计划实施时间"
+
+            min-width="250"
+          >
+          <template slot-scope="scope">
+            {{scope.row.cereInvestmentPlanningManagement.implementationStartTime}} - {{scope.row.cereInvestmentPlanningManagement.implementationEndTime}}
+          </template>
+          </el-table-column> -->
+          <el-table-column label="涵盖资源数">
+            <template slot-scope="scope">
+              {{ scope.row.cereResourceStrategy.length }}
+            </template>
+          </el-table-column>
+<!-- 
+          <el-table-column label="资源类型" prop="contactInformation" min-width="150">
+            <template slot-scope="scope">
+              {{ scope.row.cereResourceStrategy.id }}
+            </template>
+          </el-table-column>
+          <el-table-column label="租金/周期" min-width="150">
+            <template slot-scope="scope">
+
+            </template>
+          </el-table-column>
+          <el-table-column label="付款日" min-width="150">
+            <template slot-scope="scope">
+
+            </template>
+          </el-table-column> -->
+
+          <el-table-column label="状态">
+            <template slot-scope="scope">
+              {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':''}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" width="180" fixed="right">
+            <template slot-scope="scope">
+              <div class="tableBtn greens" @click="handleEditForm(scope.row,false)">
+                查看
+              </div>
+              <div class="tableBtn greens" @click="handleEditForm(scope.row,true)" v-if="scope.row.auditStatus =='1'">
+                编辑
+              </div>
+              <!-- <div class="tableBtn greens">
+                禁用
+              </div> -->
+              <div v-if="scope.row.auditStatus !='2'" class="tableBtn greens" @click="delGuan(scope.row)">
+                删除
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="fenye">
+          <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total"
+            @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        </div>
+      </div>
+    </div>
+    <addxin :showAdd="addAct" @childClose='childClose' v-if="addAct"></addxin>
+    <xiang :showBian="banAct" :steat='steatqie' :list='itemXiang' @bianClose='bianClose' v-if="banAct"></xiang>
+  </div>
+</template>
+
+<script>
+  import {
+    uploadUrl,
+    token
+  } from '@/utils/request'
+  import {
+    GetAllLinAn,
+    GetOnlinLinAn,
+    AddLinAn,
+    EditLinAn,
+    delLinAn,
+    addLin,
+    selLin,
+    editLin,
+    delLin,
+    selectList
+
+  } from '../../../api/tspm'
+  import {
+    fangGetAll,
+    fangGetId,
+    fangAdd,
+    fangEdit,
+    fangDel,
+  } from '../../../api/fangli'
+
+  import upimg from "@/components/ImageUpload/index"
+  import addxin from "./addform"
+  import xiang from "./bianform"
+  export default {
+    components: {
+      upimg,
+      addxin,
+      xiang
+    },
+    data() {
+      return {
+        detbox: false, // 详情
+        edit: true, // 编辑
+        formInline: {
+          shopName: '',
+          positionInformation: '',
+          shopArea: '',
+          useTo: '',
+          rent: '',
+          locationImage: '',
+          locationDescription: '',
+          temporaryPavingId: ''
+        }, // 临铺新增数据
+        LinID: '', //添加临铺ID
+        Ids: '', //查询新增的临铺列表
+        action: uploadUrl, // 上传图片
+        myHeaders: {
+          'Authorization-admin': token
+        },
+        ggXin: false, // 新增
+        sel: [], // 选择资源
+        stepNum: 0, // 切换
+        linShop: [], // 临铺列表
+        isAdd: false, //添加铺位弹框、
+        plan_Time: [],
+        formSel: {
+          planName: '',
+          pageNumber: 1,
+          pageSize: 10,
+          cereInvestmentPlanningManagement: {
+            implementationStartTime: '',
+            implementationEndTime: ''
+          }
+
+        },
+        secondData: {
+          card: 'first', // 切换
+        },
+        currentPage: 1,
+        total: 0,
+        flag: false,
+        pageSize: 10,
+        tableData: [],
+        msgid: '',
+        pageindex: {
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        addAct: false, //新增框
+        banAct: false, //详情
+        steatqie: false, //编辑详情切换
+        itemXiang: {}
+      }
+    },
+
+    created() {
+      this.getAll();
+    },
+    mounted() {},
+    methods: {
+      // 获取当前时间
+      updateCurrentTime() {
+        const now = new Date();
+        const year = now.getFullYear();
+        const month = (now.getMonth() + 1).toString().padStart(2, '0');
+        const day = now.getDate().toString().padStart(2, '0');
+        const hours = now.getHours().toString().padStart(2, '0');
+        const minutes = now.getMinutes().toString().padStart(2, '0');
+        const seconds = now.getSeconds().toString().padStart(2, '0');
+
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      lextStep(val) {
+        this.stepNum = val;
+      },
+
+      // 查询全数据
+      async getAll() {
+        const res = await fangGetAll(this.pageindex);
+        // let result = [];
+        //      res.data.content.forEach(item => {
+        //        item.cereResourceStrategy.forEach(strategy => {
+        //          // 复制原始数据的部分字段
+        //          let newItem = {
+        //            planName: item.planName,
+        //            cereInvestmentPlanningManagement: item.cereInvestmentPlanningManagement,
+        //            auditStatus: item.auditStatus,
+        //            // ...其他需要合并显示的字段
+        //          };
+        //          // 添加cereResourceStrategy中的字段
+        //          newItem.cereResourceStrategy = strategy;
+        //          result.push(newItem);
+        //        })
+        //      })
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+
+
+
+
+
+      },
+      // 查询
+      async onSubmit() {
+        let forms = {
+          planName: '',
+          pageNumber: 1,
+          pageSize: 10,
+          cereInvestmentPlanningManagement: {
+            implementationStartTime: '',
+            implementationEndTime: ''
+          }
+        }
+        if (this.formSel.planName != '') {
+          forms.planName = this.formSel.planName
+        }
+        if (this.plan_Time.length != 0) {
+          forms.cereInvestmentPlanningManagement.implementationStartTime = this.plan_Time[0]
+          forms.cereInvestmentPlanningManagement.implementationEndTime = this.plan_Time[1]
+        }
+        const res = await fangGetAll(forms)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+      },
+      // 详情编辑点击
+      handleEditForm(item, ste) {
+        console.log(item, ste)
+        if (ste) {
+          this.steatqie = true
+        } else {
+          this.steatqie = false
+        }
+        this.itemXiang = item
+        this.banAct = true
+
+      },
+      bianClose(msg) {
+        this.banAct = msg
+        this.steatqie = false
+        this.getAll()
+      },
+      // 新增
+      addbuss() {
+        this.addAct = true
+      },
+      childClose(msg) {
+        this.addAct = msg
+        this.getAll()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val;
+      },
+      handleSizeChange(val) {
+        this.pageSize = val;
+      },
+
+      handleClick() {},
+      // 上传
+      handlePreview(file) {
+        console.log(file);
+      },
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+
+      // 重置按钮
+      resetting() {
+        this.formSel = {
+          planName: '',
+          pageNumber: 1,
+          pageSize: 10,
+          cereInvestmentPlanningManagement: {
+            implementationStartTime: '',
+            implementationEndTime: ''
+          }
+        }
+        this.plan_Time = []
+        this.getAll()
+      },
+      delGuan(itme) {
+
+        const h = this.$createElement;
+        this.$msgbox({
+          title: '消息',
+          message: h('p', null, [
+            h('span', null, '是否删除 '),
+          ]),
+          showCancelButton: true,
+          showClose: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          customClass: 'oe-dialog-btn',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              fangDel({
+                id: itme.id
+              }).then(res => {
+                this.$message({
+                  message: '删除成功',
+                  type: 'success'
+                })
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
+        })
+
+
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .first-column-bg {
+    background-color: #f4f4f5 !important;
+  }
+
+  .zhuti {
+    padding: 0 20px 20px 20px;
+    min-height: calc(100vh - 50px - 20px);
+    background-color: #Fff;
+
+  }
+
+
+
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+    cursor: pointer;
+  }
+
+  .formSearch {
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+  }
+
+  .greens {
+    color: #3f9b6a;
+  }
+
+  /deep/ .el-table__row {
+    font-size: 14px;
+    color: #000000e6;
+    height: 42px;
+  }
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+    position: relative;
+  }
+
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #3f9b6a;
+  }
+
+  :last-child {
+    margin-bottom: 0;
+  }
+
+  .el-col {
+    border-radius: 4px;
+  }
+
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+
+  .bg-purple {
+    /* background: #d3dce6; */
+  }
+
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+  }
+
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+
+  /deep/ .bg-purple[data-v-0e3fe4ec] {
+    background: #fff;
+    height: 50px;
+  }
+
+  /deep/ .el-form--label-top .el-form-item__label {
+    padding: 0;
+  }
+
+  .demo-input-suffix {
+    display: flex;
+    margin-right: 20px;
+  }
+
+  .pagination {
+    text-align: right;
+    line-height: 20px;
+  }
+
+  .dialog_css {
+    padding: 0px;
+  }
+
+  .dialog_xin {
+    padding: 0px;
+  }
+
+  /deep/.el-dialog__body {
+    padding: 0px;
+  }
+
+  /deep/ .el-dialog__header {
+    background-color: #fff;
+    padding: 0;
+  }
+
+
+  .el-row {
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  /deep/ .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 108px;
+    height: 108px;
+    line-height: 108px;
+    /*text-align: center;*/
+  }
+
+  .avatar {
+    width: 108px;
+    height: 108px;
+    display: block;
+  }
+
+  ::v-deep .el-tabs__item.is-active {
+    color: #3f9b6a;
+    opacity: 1;
+  }
+
+  /deep/ .el-tabs__nav-wrap::after {
+    background-color: #fff;
+  }
+
+  ::v-deep .el-tabs__item:hover {
+    color: #3f9b6a;
+    cursor: pointer;
+    opacity: 1;
+  }
+
+  /deep/ .el-tabs__active-bar {
+    background-color: #389865;
+  }
+
+  /deep/ .el-table_2_column_13 {
+    font-weight: 100;
+  }
+
+  ::v-deep .el-input__inner:focus {
+    border: #3f9b6a 1px solid;
+  }
+
+  ::v-deep .el-input__inner:hover {
+    border: #3f9b6a 1px solid;
+  }
+
+  ::v-deep .el-select .el-input.is-focus .el-input__inner {
+    border-color: #3f9b6a;
+  }
+
+
+  /* ::v-deep .el-steps .el-step__head.is-wait {
+  background-color: red; /* 修改为你想要的颜色 */
+
+  /* 修改未进行步骤的描述文字颜色 */
+  ::v-deep .el-steps .el-step__description.is-wait {
+    color: #999;
+    /* 修改为你想要的颜色 */
+  }
+
+  /* 修改未进行步骤的图标颜色 */
+  ::v-deep .el-steps .el-step__icon.is-text.is-wait {
+    color: #999;
+    /* 修改为你想要的颜色 */
+  }
+
+  /* 修改未进行步骤的边框色 */
+  ::v-deep .el-steps .el-step__line.is-wait {
+    border-color: #eee;
+    /* 修改为你想要的颜色 */
+  }
+
+  ::v-deep .el-steps .is-process .el-step__line {
+    background-color: #3f9b6a;
+    /* 修改线的颜色 */
+  }
+
+  ::v-deep .el-steps .is-process .el-step__title {
+    color: #fe7b6a;
+    /* 修改进行中步骤的标题颜色 */
+  }
+
+  ::v-deep .el-steps .is-process .el-step__icon {
+    color: #fff;
+    /* 修改进行中步骤的图标颜色 */
+    background: #3f9b6a;
+    /* 修改进行中步骤图标的边框颜色 */
+    border: 0px;
+  }
+
+  ::v-deep .el-step__icon-inner {
+    line-height: 0;
+  }
+
+  /* 线条长度 */
+  ::v-deep .el-step.is-vertical .el-step__line {
+    top: 30px;
+    height: 60px;
+  }
+
+  ::v-deep .moren {
+    .el-input__inner {
+      margin-top: 5px;
+      padding: 0 20px;
+    }
+  }
+
+  /deep/ .el-radio-group {
+    margin-top: 11px;
+  }
+
+  /deep/ .el-radio__input.is-checked .el-radio__inner {
+    border-color: #3f9b6a;
+    background: #3f9b6a;
+  }
+
+  ::v-deep .el-col {
+    padding: 0 !important;
+  }
+
+  /deep/ .el-radio-group {
+    width: 100%;
+  }
+
+  .radio-right-side {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  /deep/ .radio-right-side .el-radio__label {
+    display: flex;
+    align-items: center;
+  }
+
+  /deep/ .radio-right-side .el-radio__inner {
+    order: 1;
+  }
+
+  /deep/ .radio-right-side .el-radio__input {
+    display: flex;
+    order: 2;
+  }
+
+  /deep/ .radio-right-side {
+    &:hover {
+      color: #000;
+    }
+  }
+
+
+  ::v-deep .setup {
+    .el-steps {
+      justify-content: center;
+    }
+  }
+
+  ::v-deep .el-step__head.is-finish {
+    color: #c0c4cc;
+    border-color: #c0c4cc;
+  }
+
+  ::v-deep .el-step__title.is-finish {
+    color: #c0c4cc;
+  }
+
+  ::v-deep .el-step__title.is-process {
+    color: #c0c4cc;
+  }
+
+  ::v-deep .el-tabs {
+    width: 100%;
+  }
+
+  ::v-deep .setup {
+    .el-step__main {
+      margin-left: -17px;
+    }
+
+    .el-step__title.is-process {
+      color: #3f9b6a;
+    }
+
+  }
+
+  ::v-deep .el-pagination__jump {
+    margin-top: 5px;
+  }
+
+  ::v-deep .linClass {
+    .el-dialog__header {
+      padding: 20px 20px 10px;
+      font-size: 14px;
+    }
+  }
+</style>
+<style lang="scss" scoped>
+  ::v-deep .bian_css {
+    .el-dialog__header {
+      padding: 0px;
+    }
+
+  }
+
+  ::v-deep .buttonHover:hover {
+    color: #3f9b6a !important;
+    border-color: #c5e1d2 !important;
+    background-color: #ecf5f0 !important;
+    outline: none;
+  }
+
+  ::v-deep .el-pagination__total {
+    position: absolute;
+    left: 10px;
+  }
+
+  ::v-deep .diaslog_zhong {
+    .el-dialog__body {
+      padding: 10px 20px 20px 20px;
+    }
+
+    .el-upload--picture-card {
+      width: 130px;
+      height: 130px;
+    }
+  }
+</style>
diff --git a/admin-web-master/src/views/ads/fangli/index.vue b/admin-web-master/src/views/ads/fangli/index.vue
index a222cb1..d73e705 100644
--- a/admin-web-master/src/views/ads/fangli/index.vue
+++ b/admin-web-master/src/views/ads/fangli/index.vue
@@ -1,26 +1,29 @@
 <template>
   <div style="background-color:#f7f7f7;padding:10px 10px;">
-    <div class="zhuti" v-if="addAct == false  && banAct == false">
+    <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>
+        <div style="color:#0006"> <span>招商资源监测</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">商铺基本信息</span></div>
       </div>
+      <!-- 线上 -->
       <div>
         <!-- 搜索 -->
         <div class="formSearch">
-          <div>
-            <el-form :model="formSel" :inline="true">
-              <el-form-item label="方案名称">
-                <el-input v-model="formSel.planName" placeholder="请输入" style="width:168px;">
-                </el-input>
-              </el-form-item>
-              <el-form-item label="计划实施时间">
-                <el-date-picker style="width:230px;" v-model="plan_Time" value-format="yyyy-MM-dd" prefix-icon="none"
-                  type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
-                </el-date-picker>
-              </el-form-item>
-            </el-form>
-          </div>
+          <el-form :inline="true" :model="pagequery">
+            <el-form-item label="商铺名称" prop="shopName">
+              <el-input v-model="pagequery.shopName" placeholder="请输入" maxlength="50"></el-input>
+            </el-form-item>
+            <el-form-item label="所属区域" prop="belongingRegion">
+              <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option v-for="(item,index) in regionOptions"
+                :key="index" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="归属部门" prop="belongingDepartment">
+              <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input>
+            </el-form-item>
+          </el-form>
+
           <div>
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
             </el-button>
@@ -28,320 +31,346 @@
               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
             </el-button>
           </div>
-
         </div>
-        <div style="margin-bottom:20px;">
-          <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
-            @click="addbuss">新增</el-button>
+        <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>
         <!-- 表格 -->
-        <el-table :data="
-            tableData.slice(
-              (currentPage - 1) * pageSize,
-              currentPage * pageSize
-            )
-          " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="60">
+
+        <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="序号" width="50">
             <template slot-scope="scope">
-              {{scope.$index+1}}
+              {{scope.$index +1 }}
             </template>
           </el-table-column>
-          <el-table-column label="招商方案名称" prop="planName" min-width="300" />
-          <!-- <el-table-column
-            label="规划方案名称"
-
-            min-width="300"
-          >
-          <template slot-scope="scope">
-            {{scope.row.cereInvestmentPlanningManagement.planningName}}
-          </template>
-          </el-table-column> -->
-          <!-- <el-table-column
-            label="计划实施时间"
-
-            min-width="250"
-          >
-          <template slot-scope="scope">
-            {{scope.row.cereInvestmentPlanningManagement.implementationStartTime}} - {{scope.row.cereInvestmentPlanningManagement.implementationEndTime}}
-          </template>
-          </el-table-column> -->
-          <el-table-column label="涵盖资源数">
+          <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.cereResourceStrategy.length }}
+              {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}}
             </template>
           </el-table-column>
-<!-- 
-          <el-table-column label="资源类型" prop="contactInformation" min-width="150">
-            <template slot-scope="scope">
-              {{ scope.row.cereResourceStrategy.id }}
-            </template>
+          <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="租金/周期" min-width="150">
+          <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>  
             <template slot-scope="scope">
-
+              {{scope.row.belongingDepartment || '无'}}
             </template>
           </el-table-column>
-          <el-table-column label="付款日" min-width="150">
+          <el-table-column label="负责人" prop="head" show-overflow-tooltip>
             <template slot-scope="scope">
-
+              {{scope.row.head || '无'}}
             </template>
-          </el-table-column> -->
-
-          <el-table-column label="状态">
+          </el-table-column>
+          <el-table-column label="发布时间" prop="createDate" > </el-table-column>
+          <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':''}}
+              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
             </template>
           </el-table-column>
-
-          <el-table-column label="操作" width="180" fixed="right">
+          <el-table-column label="操作" min-width="100" fixed="right">
             <template slot-scope="scope">
-              <div class="tableBtn greens" @click="handleEditForm(scope.row,false)">
-                查看
-              </div>
-              <div class="tableBtn greens" @click="handleEditForm(scope.row,true)" v-if="scope.row.auditStatus =='1'">
-                编辑
-              </div>
-              <!-- <div class="tableBtn greens">
-                禁用
-              </div> -->
-              <div v-if="scope.row.auditStatus !='2'" class="tableBtn greens" @click="delGuan(scope.row)">
-                删除
+              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"  @click="removeinfo(scope.row,'编辑')">编辑
               </div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="closemsg(scope.row)">删除</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+              @click="opencl(scope.row,'sp')">发布</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
+                @click="removeinfozz(scope.row,'0','下架')">下架</div>
             </template>
           </el-table-column>
         </el-table>
-        <div class="fenye">
-          <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
-            :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total"
-            @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        <div style="display: flex;justify-content: space-between;" class="bom">
+          <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
+          <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequery.pageSize"
+            background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange">
+          </el-pagination>
         </div>
+
+      </div>
+
+    </div>
+
+
+
+
+
+
+    <div class="zhuti" v-if="onaction == '2'">
+      <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>
+      </div>
+
+      <div style="padding: 20px 20px 20px 0;">
+        <add @removeonaction="removeonaction"></add>
+      </div>
+    </div>
+    <div class="zhuti" v-if="onaction == '3'">
+      <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>
+      </div>
+      <div>
+        <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
+      </div>
+    </div>
+    <div class="zhuti" v-if="onaction == '4'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>商铺基本信息</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">{{contractChangeReason}}</span></div>
+      </div>
+      <div style="padding: 20px 20px 20px 0;">
+        <add :info="detailsinfo" @removeonaction="removeonaction"></add>
       </div>
     </div>
-    <addxin :showAdd="addAct" @childClose='childClose' v-if="addAct"></addxin>
-    <xiang :showBian="banAct" :steat='steatqie' :list='itemXiang' @bianClose='bianClose' v-if="banAct"></xiang>
+
+
+    
+    <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 :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
+    </el-dialog>
   </div>
+
+
 </template>
 
 <script>
   import {
-    uploadUrl,
-    token
-  } from '@/utils/request'
-  import {
-    GetAllLinAn,
-    GetOnlinLinAn,
-    AddLinAn,
-    EditLinAn,
-    delLinAn,
-    addLin,
-    selLin,
-    editLin,
-    delLin,
-    selectList
-
-  } from '../../../api/tspm'
-  import {
-    fangGetAll,
-    fangGetId,
-    fangAdd,
-    fangEdit,
-    fangDel,
-  } from '../../../api/fangli'
-
-  import upimg from "@/components/ImageUpload/index"
-  import addxin from "./addform"
-  import xiang from "./bianform"
+    delList,
+    editList,
+    lvdaoduan,
+    getAlls
+  } from '@/api/information';
+  import add from '@/components/add/addfa'
+  import resourceCommodity from '@/components/resourceCommodity/index'
+    import cl from '@/components/change/cl.vue'
+    import {
+    cereResourceStrategy,
+    editStatus,
+    cereBusinessOperationadd,
+  } from '@/api/newly.js'
   export default {
-    components: {
-      upimg,
-      addxin,
-      xiang
-    },
     data() {
       return {
-        detbox: false, // 详情
-        edit: true, // 编辑
-        formInline: {
-          shopName: '',
-          positionInformation: '',
-          shopArea: '',
-          useTo: '',
-          rent: '',
-          locationImage: '',
-          locationDescription: '',
-          temporaryPavingId: ''
-        }, // 临铺新增数据
-        LinID: '', //添加临铺ID
-        Ids: '', //查询新增的临铺列表
-        action: uploadUrl, // 上传图片
-        myHeaders: {
-          'Authorization-admin': token
-        },
-        ggXin: false, // 新增
-        sel: [], // 选择资源
-        stepNum: 0, // 切换
-        linShop: [], // 临铺列表
-        isAdd: false, //添加铺位弹框、
-        plan_Time: [],
-        formSel: {
-          planName: '',
-          pageNumber: 1,
+        lvdaoList:[],
+        oncetype:'',
+        addcl:false,
+        oninfo:{},
+        multipleSelection:[],
+        contractChangeReason: '',
+        detailsinfo: {},
+        pagequery: {
+          belongingRegion:'',
+          shopName:'',
+          pageNumber: 0,
           pageSize: 10,
-          cereInvestmentPlanningManagement: {
-            implementationStartTime: '',
-            implementationEndTime: ''
-          }
-
+          belongingGreenwaySection:'',
+          belongingDepartment:''
         },
-        secondData: {
-          card: 'first', // 切换
-        },
-        currentPage: 1,
-        total: 0,
-        flag: false,
-        pageSize: 10,
         tableData: [],
-        msgid: '',
-        pageindex: {
-          pageNumber: 1,
-          pageSize: 10,
+        total: 0,
+        onaction: '2',
+        formInline: {
         },
-        addAct: false, //新增框
-        banAct: false, //详情
-        steatqie: false, //编辑详情切换
-        itemXiang: {}
       }
     },
-
-    created() {
-      this.getAll();
+    computed: {
+      regionOptions() {
+        return this.$store.state.app.regionOptions;
+      }
+    },
+    components: {
+      cl,
+      add,
+      resourceCommodity,
+    },
+    async created() {
+      this.getAll()
+      const lvdao = await lvdaoduan()
+      this.lvdaoList = lvdao.data
     },
-    mounted() {},
     methods: {
-      // 获取当前时间
-      updateCurrentTime() {
-        const now = new Date();
-        const year = now.getFullYear();
-        const month = (now.getMonth() + 1).toString().padStart(2, '0');
-        const day = now.getDate().toString().padStart(2, '0');
-        const hours = now.getHours().toString().padStart(2, '0');
-        const minutes = now.getMinutes().toString().padStart(2, '0');
-        const seconds = now.getSeconds().toString().padStart(2, '0');
-
-        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      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(ids)
+        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: '1'
+            }).then(res => {
+              this.onSubmit()
+            })
+            cereBusinessOperationadd({
+              type:'发布',
+              resourceId: this.oncetype+this.oninfo.id,
+              operator: localStorage.getItem('roleName'),
+              operationTime: this.gettime()
+            }).then(res => {
+              console.error(res)
+            })
+          } else {
+            this.$message({
+              message: '绑定失败',
+              type: 'error'
+            })
+          }
+        })
       },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
+      mingClose() {
+        this.multipleSelection = []
+        this.addcl = false
       },
-      lextStep(val) {
-        this.stepNum = val;
+      async opencl(row,e) {
+        this.oncetype = e
+        this.oninfo = row
+        this.multipleSelection = []
+        this.addcl = true
       },
+      gettime() {
+        // 获取当前时间
+        let currentTime = new Date();
 
-      // 查询全数据
-      async getAll() {
-        const res = await fangGetAll(this.pageindex);
-        // let result = [];
-        //      res.data.content.forEach(item => {
-        //        item.cereResourceStrategy.forEach(strategy => {
-        //          // 复制原始数据的部分字段
-        //          let newItem = {
-        //            planName: item.planName,
-        //            cereInvestmentPlanningManagement: item.cereInvestmentPlanningManagement,
-        //            auditStatus: item.auditStatus,
-        //            // ...其他需要合并显示的字段
-        //          };
-        //          // 添加cereResourceStrategy中的字段
-        //          newItem.cereResourceStrategy = strategy;
-        //          result.push(newItem);
-        //        })
-        //      })
-        this.tableData = res.data.content
-        this.total = res.data.content.length
+        // 获取年份
+        let year = currentTime.getFullYear();
 
+        // 获取月份（注意月份是从0开始计数的，所以需要加1）
+        let month = currentTime.getMonth() + 1;
 
+        // 获取日期
+        let day = currentTime.getDate();
 
+        // 获取小时
+        let hours = currentTime.getHours();
 
+        // 获取分钟
+        let minutes = currentTime.getMinutes();
+
+        // 获取秒数
+        let seconds = currentTime.getSeconds();
+
+        // 获取毫秒数
+        let milliseconds = currentTime.getMilliseconds();
+
+        // 格式化时间为 YYYY-MM-DD
+        let formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 HH:MM:SS
+        let formattedTime =
+          `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 YYYY-MM-DD HH:MM:SS
+        let formattedDateTime = `${formattedDate} ${formattedTime}`;
+        return formattedDateTime
 
       },
-      // 查询
-      async onSubmit() {
-        let forms = {
-          planName: '',
-          pageNumber: 1,
-          pageSize: 10,
-          cereInvestmentPlanningManagement: {
-            implementationStartTime: '',
-            implementationEndTime: ''
-          }
-        }
-        if (this.formSel.planName != '') {
-          forms.planName = this.formSel.planName
-        }
-        if (this.plan_Time.length != 0) {
-          forms.cereInvestmentPlanningManagement.implementationStartTime = this.plan_Time[0]
-          forms.cereInvestmentPlanningManagement.implementationEndTime = this.plan_Time[1]
-        }
-        const res = await fangGetAll(forms)
-        this.tableData = res.data.content
-        this.total = res.data.content.length
-      },
-      // 详情编辑点击
-      handleEditForm(item, ste) {
-        console.log(item, ste)
-        if (ste) {
-          this.steatqie = true
-        } else {
-          this.steatqie = false
-        }
-        this.itemXiang = item
-        this.banAct = true
+      removeinfozz(row, e, tit) {
+        let that = this
+        this.$confirm('确定要' + tit + '吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          editList({
+            ...row,
+            publishStatus: e
+          }).then(res => {
+            console.error(res)
+            if (res.code == 200) {
+              this.$message({
+                message: tit + '成功',
+                type: 'success'
+              })
+              cereBusinessOperationadd({
+                type:tit,
+                resourceId: 'sp'+row.id,
+                operator: localStorage.getItem('roleName'),
+                operationTime: that.gettime()
+              }).then(res => {
+                console.error(res)
+              })
+            
+              this.removeonaction('1')
+            } else {
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              })
+            }
 
+          })
+        })
       },
-      bianClose(msg) {
-        this.banAct = msg
-        this.steatqie = false
-        this.getAll()
+      details(row) {
+        this.detailsinfo = row
+        this.onaction = '3'
       },
-      // 新增
-      addbuss() {
-        this.addAct = true
+      removeinfo(row, e) {
+        this.contractChangeReason = e
+        this.detailsinfo = row
+        this.onaction = '4'
       },
-      childClose(msg) {
-        this.addAct = msg
+      async getAll() {
+        const res = await getAlls(this.pagequery)
+        this.tableData = res.data.content
+        this.total = res.data.totalElements
+      },
+      removeonaction(e) {
+        console.error(e)
+        this.onaction = e
+        this.pagequery.pageNumber = 0
         this.getAll()
       },
       handleCurrentChange(val) {
-        this.currentPage = val;
+        this.pagequery.pageNumber = val - 1
+        this.getAll()
       },
       handleSizeChange(val) {
-        this.pageSize = val;
-      },
-
-      handleClick() {},
-      // 上传
-      handlePreview(file) {
-        console.log(file);
+        this.pagequery.pageSize = val
+        this.pagequery.pageNumber = 0
+        this.getAll()
       },
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
+      // 查询按钮
+      async onSubmit() {
+        this.pagequery.pageNumber = 0
+        this.getAll()
       },
-
-      // 重置按钮
+      //重置按钮
       resetting() {
-        this.formSel = {
-          planName: '',
-          pageNumber: 1,
-          pageSize: 10,
-          cereInvestmentPlanningManagement: {
-            implementationStartTime: '',
-            implementationEndTime: ''
-          }
-        }
-        this.plan_Time = []
-        this.getAll()
+        this.pagequery = {
+            belongingRegion:'',
+            shopName:'',
+            pageNumber: 0,
+            pageSize: 10,
+            belongingGreenwaySection:'',
+            belongingDepartment:''
+          },
+          this.getAll()
       },
-      delGuan(itme) {
-
+      //删除
+      closemsg(item) {
         const h = this.$createElement;
         this.$msgbox({
           title: '消息',
@@ -355,8 +384,8 @@
           customClass: 'oe-dialog-btn',
           beforeClose: (action, instance, done) => {
             if (action === 'confirm') {
-              fangDel({
-                id: itme.id
+              delList({
+                id: item.id
               }).then(res => {
                 this.$message({
                   message: '删除成功',
@@ -370,32 +399,13 @@
             }
           }
         })
-
-
-      }
+      },
     }
-  }
-</script>
-<style scoped>
-  /deep/ .first-column-bg {
-    background-color: #f4f4f5 !important;
-  }
 
-  .zhuti {
-    padding: 0 20px 20px 20px;
-    min-height: calc(100vh - 50px - 20px);
-    background-color: #Fff;
-
-  }
-
-
-
-  .tableBtn {
-    display: inline-block;
-    margin-right: 10px;
-    cursor: pointer;
   }
+</script>
 
+<style lang="scss" scoped>
   .formSearch {
     display: flex;
     width: 100%;
@@ -403,332 +413,22 @@
     justify-content: space-between;
   }
 
-  .greens {
-    color: #3f9b6a;
-  }
-
-  /deep/ .el-table__row {
-    font-size: 14px;
-    color: #000000e6;
-    height: 42px;
-  }
-
-  .fenye {
-    margin-top: 20px;
-    display: flex;
-    justify-content: flex-end;
-    position: relative;
-  }
-
-  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
-    background-color: #3f9b6a;
-  }
-
-  :last-child {
-    margin-bottom: 0;
-  }
-
-  .el-col {
-    border-radius: 4px;
-  }
-
-  .bg-purple-dark {
-    background: #99a9bf;
-  }
-
-  .bg-purple {
-    /* background: #d3dce6; */
-  }
-
-  .bg-purple-light {
-    background: #e5e9f2;
-  }
-
-  .grid-content {
-    border-radius: 4px;
-    min-height: 36px;
-  }
-
-  .row-bg {
-    padding: 10px 0;
-    background-color: #f9fafc;
-  }
-
-  /deep/ .bg-purple[data-v-0e3fe4ec] {
-    background: #fff;
-    height: 50px;
-  }
-
-  /deep/ .el-form--label-top .el-form-item__label {
-    padding: 0;
-  }
-
-  .demo-input-suffix {
-    display: flex;
-    margin-right: 20px;
-  }
-
-  .pagination {
-    text-align: right;
-    line-height: 20px;
-  }
-
-  .dialog_css {
-    padding: 0px;
-  }
-
-  .dialog_xin {
-    padding: 0px;
-  }
-
-  /deep/.el-dialog__body {
-    padding: 0px;
-  }
-
-  /deep/ .el-dialog__header {
-    background-color: #fff;
-    padding: 0;
-  }
-
-
-  .el-row {
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  /deep/ .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 108px;
-    height: 108px;
-    line-height: 108px;
-    /*text-align: center;*/
-  }
-
-  .avatar {
-    width: 108px;
-    height: 108px;
-    display: block;
-  }
+  .zhuti {
+    padding: 0 20px 20px 20px;
+    min-height: calc(100vh - 50px - 20px);
+    background-color: #Fff;
 
-  ::v-deep .el-tabs__item.is-active {
-    color: #3f9b6a;
-    opacity: 1;
   }
 
-  /deep/ .el-tabs__nav-wrap::after {
-    background-color: #fff;
+  .chengeXia {
+    border-bottom: 6px solid #3F9B6A;
+    padding-bottom: 4px;
+    color: #3F9B6A;
   }
 
-  ::v-deep .el-tabs__item:hover {
-    color: #3f9b6a;
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
     cursor: pointer;
-    opacity: 1;
-  }
-
-  /deep/ .el-tabs__active-bar {
-    background-color: #389865;
-  }
-
-  /deep/ .el-table_2_column_13 {
-    font-weight: 100;
-  }
-
-  ::v-deep .el-input__inner:focus {
-    border: #3f9b6a 1px solid;
-  }
-
-  ::v-deep .el-input__inner:hover {
-    border: #3f9b6a 1px solid;
-  }
-
-  ::v-deep .el-select .el-input.is-focus .el-input__inner {
-    border-color: #3f9b6a;
-  }
-
-
-  /* ::v-deep .el-steps .el-step__head.is-wait {
-  background-color: red; /* 修改为你想要的颜色 */
-
-  /* 修改未进行步骤的描述文字颜色 */
-  ::v-deep .el-steps .el-step__description.is-wait {
-    color: #999;
-    /* 修改为你想要的颜色 */
-  }
-
-  /* 修改未进行步骤的图标颜色 */
-  ::v-deep .el-steps .el-step__icon.is-text.is-wait {
-    color: #999;
-    /* 修改为你想要的颜色 */
-  }
-
-  /* 修改未进行步骤的边框色 */
-  ::v-deep .el-steps .el-step__line.is-wait {
-    border-color: #eee;
-    /* 修改为你想要的颜色 */
-  }
-
-  ::v-deep .el-steps .is-process .el-step__line {
-    background-color: #3f9b6a;
-    /* 修改线的颜色 */
-  }
-
-  ::v-deep .el-steps .is-process .el-step__title {
-    color: #fe7b6a;
-    /* 修改进行中步骤的标题颜色 */
-  }
-
-  ::v-deep .el-steps .is-process .el-step__icon {
-    color: #fff;
-    /* 修改进行中步骤的图标颜色 */
-    background: #3f9b6a;
-    /* 修改进行中步骤图标的边框颜色 */
-    border: 0px;
-  }
-
-  ::v-deep .el-step__icon-inner {
-    line-height: 0;
-  }
-
-  /* 线条长度 */
-  ::v-deep .el-step.is-vertical .el-step__line {
-    top: 30px;
-    height: 60px;
-  }
-
-  ::v-deep .moren {
-    .el-input__inner {
-      margin-top: 5px;
-      padding: 0 20px;
-    }
-  }
-
-  /deep/ .el-radio-group {
-    margin-top: 11px;
-  }
-
-  /deep/ .el-radio__input.is-checked .el-radio__inner {
-    border-color: #3f9b6a;
-    background: #3f9b6a;
-  }
-
-  ::v-deep .el-col {
-    padding: 0 !important;
-  }
-
-  /deep/ .el-radio-group {
-    width: 100%;
-  }
-
-  .radio-right-side {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-  }
-
-  /deep/ .radio-right-side .el-radio__label {
-    display: flex;
-    align-items: center;
-  }
-
-  /deep/ .radio-right-side .el-radio__inner {
-    order: 1;
-  }
-
-  /deep/ .radio-right-side .el-radio__input {
-    display: flex;
-    order: 2;
-  }
-
-  /deep/ .radio-right-side {
-    &:hover {
-      color: #000;
-    }
-  }
-
-
-  ::v-deep .setup {
-    .el-steps {
-      justify-content: center;
-    }
-  }
-
-  ::v-deep .el-step__head.is-finish {
-    color: #c0c4cc;
-    border-color: #c0c4cc;
-  }
-
-  ::v-deep .el-step__title.is-finish {
-    color: #c0c4cc;
-  }
-
-  ::v-deep .el-step__title.is-process {
-    color: #c0c4cc;
-  }
-
-  ::v-deep .el-tabs {
-    width: 100%;
-  }
-
-  ::v-deep .setup {
-    .el-step__main {
-      margin-left: -17px;
-    }
-
-    .el-step__title.is-process {
-      color: #3f9b6a;
-    }
-
-  }
-
-  ::v-deep .el-pagination__jump {
-    margin-top: 5px;
-  }
-
-  ::v-deep .linClass {
-    .el-dialog__header {
-      padding: 20px 20px 10px;
-      font-size: 14px;
-    }
-  }
-</style>
-<style lang="scss" scoped>
-  ::v-deep .bian_css {
-    .el-dialog__header {
-      padding: 0px;
-    }
-
-  }
-
-  ::v-deep .buttonHover:hover {
-    color: #3f9b6a !important;
-    border-color: #c5e1d2 !important;
-    background-color: #ecf5f0 !important;
-    outline: none;
-  }
-
-  ::v-deep .el-pagination__total {
-    position: absolute;
-    left: 10px;
-  }
-
-  ::v-deep .diaslog_zhong {
-    .el-dialog__body {
-      padding: 10px 20px 20px 20px;
-    }
-
-    .el-upload--picture-card {
-      width: 130px;
-      height: 130px;
-    }
   }
 </style>
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 23fcb47..9623876 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -311,6 +311,7 @@
   export default {
     data() {
       return {
+        oncetype:'',
         name: '',
         oninfo: {},
         celueData: [],