diff --git a/admin-web-master/src/api/inr.js b/admin-web-master/src/api/inr.js
index 03cca2c..ddfd437 100644
--- a/admin-web-master/src/api/inr.js
+++ b/admin-web-master/src/api/inr.js
@@ -28,3 +28,12 @@ export function tanDel(data) {
     data
   })
 }
+// 谈判列表导出
+export function excelQueryByPage(data) {
+  return request({
+    url: '/cereNegotiationDetails/excelQueryByPage',
+    method: 'post',
+    data,
+    responseType:blob
+  })
+}
diff --git a/admin-web-master/src/views/ipm/inr/index.vue b/admin-web-master/src/views/ipm/inr/index.vue
index 4cff704..3d85b9f 100644
--- a/admin-web-master/src/views/ipm/inr/index.vue
+++ b/admin-web-master/src/views/ipm/inr/index.vue
@@ -626,24 +626,10 @@ const res = await tanGetAll(this.formSel)
          await tanDel({id:item.id})
          this.getAll()
       },
-      gitOut(){
-         let add =[]
-        this.tableData.map(item=>{
-
-             let obj ={
-               intentCustomerName:'',
-               customerLevel:'',
-               contactPhone:'',
-               nextFollowUpStartTime:''
-             }
-          obj.intentCustomerName = item.cereFollowDetails.cereCustomerInfo.intentCustomerName
-          obj.contactPhone = item.cereFollowDetails.cereCustomerInfo.contactPhone
-          obj.customerLevel = item.cereFollowDetails.cereCustomerInfo.customerLevel
-          obj.nextFollowUpStartTime = item.nextNegotiationStartTime
-            add.push(obj)
-
-        })
-      },
+     // async gitOut(){
+     //    await excelQueryByPage(this.pageindex)
+
+     //  },
     }
   }
 </script>
diff --git a/wenjuan/.env.development b/wenjuan/.env.development
index 68dc6bb..5986f04 100644
--- a/wenjuan/.env.development
+++ b/wenjuan/.env.development
@@ -3,12 +3,12 @@ ENV = 'development'
 
 # base api
 VUE_APP_BASE_API = '/dev-api'
-# VUE_APP_DOMAIN_PREFIX_1='http://192.168.2.133:9003'
-# VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.133:9007'
+ VUE_APP_DOMAIN_PREFIX_1='http://192.168.2.7:9003'
+ VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.7:9007'
 # VUE_APP_DOMAIN_PREFIX_1='https://h5.028wlkj.com/cdwlMall/meserver/admin-server/'
 # VUE_APP_DOMAIN_PREFIX_2='https://h5.028wlkj.com/cdwlMall/meserver/api'
- VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/meserver/admin-server/'
- VUE_APP_DOMAIN_PREFIX_2='https://jy.scjysm.asia:18086/meserver/api'
+# VUE_APP_DOMAIN_PREFIX_1='http://jy.scjysm.asia:18086/meserver/admin-server/'
+# VUE_APP_DOMAIN_PREFIX_2='https://jy.scjysm.asia:18086/meserver/api'
 # 开发环境
 # 演示环境
 # VUE_APP_DOMAIN_PREFIX = '/api'
diff --git a/yanshouban/src/api/activityBz.js b/yanshouban/src/api/activityBz.js
index c25c87c..de78c29 100644
--- a/yanshouban/src/api/activityBz.js
+++ b/yanshouban/src/api/activityBz.js
@@ -205,3 +205,35 @@ export  function copy(data) {
     data
   })
 }
+
+
+// 审核流程导出
+export function excelQueryByPage(data) {
+  return request({
+    url: '/cereEventDetails/excelQueryByPage',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
+
+// 导入
+export function excelAdd(data) {
+  return request({
+    url: '/cereEventDetails/excelAdd',
+    method: 'post',
+    data,
+   headers: {
+     'Content-type': 'multipart/form-data'
+   }
+  })
+}
+
+//  效果评估
+export function effectEvaluation(data) {
+  return request({
+    url: `/cereEventDetails/effectEvaluation/${data.id}`,
+    method: 'get',
+    data
+  })
+}
diff --git a/yanshouban/src/api/business.js b/yanshouban/src/api/business.js
index 7a95d7e..da1f9e4 100644
--- a/yanshouban/src/api/business.js
+++ b/yanshouban/src/api/business.js
@@ -145,3 +145,16 @@ export function wordDelete(data) {
     data
   })
 }
+
+
+// 导入商家
+export function excelAdd(data) {
+  return request({
+    url: '/cereBasicInformationShop/excelAdd',
+    method: 'post',
+    data,
+    headers: {
+      'Content-type': 'multipart/form-data'
+    }
+  })
+}
diff --git a/yanshouban/src/api/fangli.js b/yanshouban/src/api/fangli.js
index b610121..e56303f 100644
--- a/yanshouban/src/api/fangli.js
+++ b/yanshouban/src/api/fangli.js
@@ -34,3 +34,15 @@ export function fangDel(data) {
     data
   })
 }
+
+// 导入管理模板
+export const excelAdd = (data = {}) => {
+  return request({
+    url: '/cereBusinessPlan/excelAdd',
+    method: 'post',
+    data,
+    headers: {
+      'Content-type': 'multipart/form-data'
+    }
+  })
+}
diff --git a/yanshouban/src/api/inr.js b/yanshouban/src/api/inr.js
index 03cca2c..efa6965 100644
--- a/yanshouban/src/api/inr.js
+++ b/yanshouban/src/api/inr.js
@@ -28,3 +28,12 @@ export function tanDel(data) {
     data
   })
 }
+// 谈判列表导出
+export function excelQueryByPage(data) {
+  return request({
+    url: '/cereNegotiationDetails/excelQueryByPage',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
diff --git a/yanshouban/src/api/manage.js b/yanshouban/src/api/manage.js
index eb8929c..ccad9ae 100644
--- a/yanshouban/src/api/manage.js
+++ b/yanshouban/src/api/manage.js
@@ -85,3 +85,36 @@ export function daoqi(data) {
     data
   })
 }
+// 退租决算打印
+
+export function pdfManagementOfFinalAccountsForRentals(data) {
+  return request({
+    url: '/cereLeasingInformation/pdfManagementOfFinalAccountsForRentals',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
+// 续租管理打印
+
+export function pdfLeaseRenewalManagement(data) {
+  return request({
+    url: '/cereLeasingInformation/pdfLeaseRenewalManagement',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
+
+// 合同导入
+
+export function excelAdd(data) {
+  return request({
+    url: '/cereContractInformation/excelAdd',
+    method: 'post',
+    data,
+    headers: {
+      'Content-type': 'multipart/form-data'
+    }
+  })
+}
diff --git a/yanshouban/src/api/planningBz.js b/yanshouban/src/api/planningBz.js
index dfa0d98..7cb3901 100644
--- a/yanshouban/src/api/planningBz.js
+++ b/yanshouban/src/api/planningBz.js
@@ -44,3 +44,15 @@ export function queryById(data) {
   })
 }
 
+// 导入规划模板
+export const excelAdd = (data = {}) => {
+  return request({
+    url: '/cereInvestmentPlanningManagement/excelAdd',
+    method: 'post',
+    data,
+    headers: {
+      'Content-type': 'multipart/form-data'
+    }
+  })
+}
+
diff --git a/yanshouban/src/api/rentalMan.js b/yanshouban/src/api/rentalMan.js
index 92585f6..b64a963 100644
--- a/yanshouban/src/api/rentalMan.js
+++ b/yanshouban/src/api/rentalMan.js
@@ -51,3 +51,13 @@ export function excelLeaseRenewalManagement(data) {
     responseType: 'blob'
   })
 }
+
+// PDF打印
+export function pdfRentOutQueryByPage(data) {
+  return request({
+    url: '/cereLeasingInformation/pdfRentOutQueryByPage',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
diff --git a/yanshouban/src/utils/jiami.js b/yanshouban/src/utils/jiami.js
index b914a7e..af9895c 100644
--- a/yanshouban/src/utils/jiami.js
+++ b/yanshouban/src/utils/jiami.js
@@ -1,7 +1,7 @@
 // 文本加密
 import { sm4 } from 'sm-crypto';
-const DEFAULT_KEY ="cda4442f102f6396cca76902e37ad7cb";
-const DEFAULT_IV = "8bd8a83221742166c7532b7275a7fe9c";
+const DEFAULT_KEY ="cda4442f102f6396eea76902e37ad7cb";
+const DEFAULT_IV = "8bd8a83221742111c7532b7275a7fe9c";
 export const encrypt = (str) => {
     if(!str) {
         return ''
@@ -11,7 +11,7 @@ export const encrypt = (str) => {
         mode: 'cbc',
         padding: 'pkcs#7'
         })
-    return 'ENC(' + encryptStr + ')'
+    return encryptStr
 }
 
 // 文本解密
@@ -19,12 +19,12 @@ export const decrypt = (str) => {
     if(!str) {
         return ''
     }
-    if(str.indexOf('ENC(') === -1) {
-        return str
-    }
-    const str_ = str.replace('ENC(', '').replace(')', '')
+//     if(str.indexOf('ENC(') === -1) {
+//         return str
+//     }
+//     const str_ = str.replace('ENC(', '').replace(')', '')
     try {        
-        const decryptStr = sm4.decrypt(str_, DEFAULT_KEY, {
+        const decryptStr = sm4.decrypt(str, DEFAULT_KEY, {
             iv: DEFAULT_IV,
             mode: 'cbc',
             padding: 'pkcs#7'
diff --git a/yanshouban/src/utils/request.js b/yanshouban/src/utils/request.js
index ccc88a8..45810fa 100644
--- a/yanshouban/src/utils/request.js
+++ b/yanshouban/src/utils/request.js
@@ -11,9 +11,9 @@ import {
 } from '@/utils/auth'
 const host = window.location.host;
 let PREFIX;
-if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61.123:9003') {
+if (host == '172.16.61.48' || host == '172.16.61.49:5173' || host =='172.16.61.123:9003') {
    // PREFIX = 'https://jdc.scjysm.asia:1443/meserver/admin-server';
-   PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
+ PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
    // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
    // PREFIX = 'http://172.16.61.48/meserver/admin-server';
 }else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){
@@ -21,14 +21,14 @@ if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61.
  // PREFIX = 'http://172.16.61.48/meserver/admin-server';
   // PREFIX = 'http://192.168.2.213:9003';
   // PREFIX = 'http://8.130.38.56:8019/admin-server';
- PREFIX = 'http://192.168.8.106:9003';
+ PREFIX = 'http://192.168.2.7:9003';
  // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
    // PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
    // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
     // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'
 
 }else{
-  PREFIX = '/admin-server';
+  PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
 }
 
 
diff --git a/yanshouban/src/views/active/couponlist/component/shopList.vue b/yanshouban/src/views/active/couponlist/component/shopList.vue
index 15cbb93..0af7772 100644
--- a/yanshouban/src/views/active/couponlist/component/shopList.vue
+++ b/yanshouban/src/views/active/couponlist/component/shopList.vue
@@ -116,7 +116,6 @@ export default {
     search () {
 
     },
-    // businessListGetAll
     // 初始化查询所有数据
     async getAll(formInline) {
       const res = await businessListGetAll(formInline)
@@ -124,7 +123,7 @@ export default {
       this.tableData = res.data.list
       this.tableData.map(res=>{
         res.shopPhone = this.$decrypt(res.shopPhone)
-        res.shopPassword = this.$decrypt(res.shopPassword)
+        // res.shopPassword = this.$decrypt(res.shopPassword)
         res.idCardNum = this.$decrypt(res.idCardNum)
         res.emailAddress = this.$decrypt(res.emailAddress)
         res.shopAdress = this.$decrypt(res.shopAdress)
diff --git a/yanshouban/src/views/activity/activityBian.vue b/yanshouban/src/views/activity/activityBian.vue
index 0445476..ee031a7 100644
--- a/yanshouban/src/views/activity/activityBian.vue
+++ b/yanshouban/src/views/activity/activityBian.vue
@@ -69,6 +69,16 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
+                  <el-select v-model="secondData.rangeSetting" placeholder="请选择"  style="width: 100%">
+                    <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
+                    <el-option label="活动场地内" value="活动场地内"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <div style="padding: 10px">
               <el-row :gutter="20">
                   <el-col :span="12">
diff --git a/yanshouban/src/views/activity/activityBz.vue b/yanshouban/src/views/activity/activityBz.vue
index 1369e10..f601bca 100644
--- a/yanshouban/src/views/activity/activityBz.vue
+++ b/yanshouban/src/views/activity/activityBz.vue
@@ -88,6 +88,16 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
+                      <el-select v-model="ruleForm.rangeSetting" placeholder="请选择"  style="width: 100%">
+                        <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
+                        <el-option label="活动场地内" value="活动场地内"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
                   <el-row :gutter="20">
                     <el-col :span="12">
                       <el-form-item label="活动主要目的" prop="mainPurpose" class="grid-content bg-purple">
@@ -297,7 +307,9 @@
       <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
         <el-button  @click="close" style="background-color: #3F9B6A;color: #fff;">取消
         </el-button>
-        <el-button  @click="onSubmit" style="background-color: #3F9B6A;color: #fff;">确定
+        <el-button  @click="onSubmit(1)" style="background-color: #3F9B6A;color: #fff;">暂存
+        </el-button>
+        <el-button  @click="onSubmit(0)" style="background-color: #3F9B6A;color: #fff;">确定
         </el-button>
       </div>
     </div>
@@ -393,6 +405,7 @@
           eventTheme: '', //活动主题
           sponsor: '', //活动主办方
           participants: '', //活动参与方
+          rangeSetting:'',
           mainPurpose: '', //活动主要目的
           coverPoster: '', //封面海报
           internalLaborCostEstimation: '', //内部人工成本预估
@@ -558,7 +571,7 @@
 
       },
       //保存
-      onSubmit() {
+      onSubmit(val) {
         // pdf.save('output.pdf')
         let that = this
         let FlieName = this.ruleForm.planName
@@ -614,6 +627,7 @@
         // }
         this.$refs.jibenFrom.validate((valid) => {
           if (valid) {
+            this.ruleForm.isDraft = val
             add(this.ruleForm).then(res => {
               this.$message({
                 message: '保存成功',
@@ -735,6 +749,7 @@
           eventTheme: '', //活动主题
           sponsor: '', //活动主办方
           participants: '', //活动参与方
+          rangeSetting:'',
           mainPurpose: '', //活动主要目的
           coverPoster: '', //封面海报
           internalLaborCostEstimation: '', //内部人工成本预估
diff --git a/yanshouban/src/views/activity/activitySp.vue b/yanshouban/src/views/activity/activitySp.vue
index 5ae93c9..2a9852e 100644
--- a/yanshouban/src/views/activity/activitySp.vue
+++ b/yanshouban/src/views/activity/activitySp.vue
@@ -57,7 +57,7 @@
                    {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
                    </template>
                </el-table-column>
-               <el-table-column label="修改时间" prop="createDate" min-width="250" >
+               <el-table-column label="创建时间" prop="createDate" min-width="250" >
                </el-table-column>
                <el-table-column prop="createUser" label="上传人员" min-width="80">
 
@@ -664,6 +664,7 @@
           pageNumber: 1,
           pageSize: 10,
           dataOwnership: '1',
+          isDraft:0
         },
         multipleSelection: [],
         options: [{
diff --git a/yanshouban/src/views/activity/index.vue b/yanshouban/src/views/activity/index.vue
index e6443ce..d8fb7b5 100644
--- a/yanshouban/src/views/activity/index.vue
+++ b/yanshouban/src/views/activity/index.vue
@@ -22,14 +22,24 @@
           </div>
         </div>
         <div style="margin: 20px 0;">
-          <div>
+          <div style="display:flex;">
             <el-button icon="el-icon-circle-plus-outline" @click="create"
               style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">新增</el-button>
             <el-button style="background-color: #E24E5A;color: #fff;" icon="el-icon-delete"
               @click="handleDelete" class="DelBtnHover">删除</el-button>
             <el-button  style="background-color: #3F9B6A;color: #fff;" @click="duibi">效果对比</el-button>
-            <el-button  style="background-color: #3F9B6A;color: #fff;" @click="daoru">导入</el-button>
+            <el-upload class="upload-demo" ref="upload"
+                              :limit="1"
+                              accept=".xlsx"
+                          :action="uploadFileUrl"
+                              :on-success="daoru"
+                              :file-list="daoData"
+                               :auto-upload="true"
+                               :show-file-list="false">
+                              <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;margin:0 15px;"  class="buttonHover" >导入</el-button>
+                            </el-upload>
             <el-button  style="background-color: #3F9B6A;color: #fff;" @click="caogao">草稿箱</el-button>
+            <el-button  style="background-color: #3F9B6A;color: #fff;" @click="daochu">审核流程导出</el-button>
             <!-- <el-button  style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;"
               icon="el-icon-folder-add" class="buttonHover" @click="xinFenlei">活动分类管理</el-button> -->
           </div>
@@ -54,7 +64,7 @@
                   <div class="custom-tree-node" slot-scope="{ node, data }">
                     <span>{{ node.label }}</span>
                     <span style="font-size: 15px !important;">
-                      <!-- <i class="el-icon-circle-plus" @click="xinFenlei(node,data)" style="padding-right: 5px;"></i> -->
+                      <i class="el-icon-circle-plus" @click="xinFenlei(node,data)" style="padding-right: 5px;"></i>
                       <i class="el-icon-delete-solid" @click="() => fenDelete(node, data)"></i>
                     </span>
                   </div>
@@ -84,7 +94,7 @@
                     {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
                   </template>
                 </el-table-column>
-                <el-table-column label="修改时间" prop="createDate"width="250" >
+                <el-table-column label="创建时间" prop="createDate"width="250" >
                 </el-table-column>
                 <el-table-column prop="createUser" label="上传人员" width="80">
 
@@ -95,7 +105,7 @@
                     <!-- <div class="tableBtn greens">发布</div> -->
                     <div class="tableBtn greens" @click="handleEditForm(scope.row)">执行情况</div>
                     <div @click="OAshen(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">上传到OA</div>
-                     <div class="tableBtn greens" @click="xiaoguo(scope.row)">效果评估</div>
+                     <div class="tableBtn greens" @click="xiaoguo(scope.row)" v-if="scope.row.state == '5'" >效果评估</div>
             <!-- <div class="tableBtn greens">策略调整</div> -->
             <div class="tableBtn greens" @click="koop(scope.row)">复制</div>
                 </template>
@@ -124,7 +134,7 @@
 <!-- 详情活动方案 -->
 <el-dialog title="活动方案详情" :visible.sync="ggXin" custom-class='xiang_css' style="padding: 0;" width="80%" center
   :close-on-click-modal="false" :close-on-press-escape="false" @close="refreshData">
-  <div>
+  <div ref="actXiang">
     <div style="width: 100%;">
       <div style="display: flex;padding:0px 20px 20px 20px; ">
         <div style="width: 150px;height: 80px;" v-if="secondData.coverPoster">
@@ -277,77 +287,6 @@
           </div>
         </div>
       </div>
-      <!-- <div style="width: 28%;">
-                <div style="padding: 10px;height: 500px;">
-                  <div style="font-size: 14px;font-weight: 600;padding: 10px;">流程轨迹</div>
-                  <el-steps style="height: 400px;padding: 10px;" direction="vertical" finish-status="process "
-                    :active="0">
-                    <el-step>
-                      <template slot="title">
-                        <div style="font-size: 14px;font-weight: 600;padding-bottom: 10px;">审核节点</div>
-                           </template>
-                      <template slot="description">
-                        <div class="custom-step-description">
-                          <div>
-                            当前处理人:王伟明
-                          </div>
-                        </div>
-                      </template>
-                    </el-step>
-                    <el-step  style="position: relative;">
-                      <template slot="title">
-                        <div style="font-size: 14px;font-weight: 600;padding-bottom: 10px;">品牌部门审批</div>
-                           </template>
-                      <template slot="description">
-                        <div class="custom-step-description">
-                          <div>
-                            操作:通过
-                            <span style="position: absolute;top: 0px;right: 0px;">2023-11-02 11:26:48</span>
-                          </div>
-                          <div>
-                            操作人:王伟明
-                          </div>
-                        </div>
-                      </template>
-                    </el-step>
-                    <el-step  style="position: relative;">
-                      <template slot="title">
-                        <div style="font-size: 14px;font-weight: 600;padding-bottom: 10px;">业务部门经理审核</div>
-                           </template>
-                      <template slot="description">
-                        <div class="custom-step-description">
-                          <div>
-                            操作:通过
-                            <span style="position: absolute;top: 0px;right: 0px;">2023-11-02 11:26:48</span>
-                          </div>
-                          <div>
-                            操作人:王伟明
-                          </div>
-                        </div>
-                      </template>
-                    </el-step>
-                    <el-step  style="position: relative;">
-                      <template slot="title">
-                        <div style="font-size: 14px;font-weight: 600;padding-bottom: 10px;">开始</div>
-                           </template>
-                      <template slot="description">
-                        <div class="custom-step-description">
-                          <div>
-                            操作:通过
-                            <span style="position: absolute;top: 0px;right: 0px;">2023-11-02 11:26:48</span>
-                          </div>
-                          <div>
-                            操作人:王伟明
-                          </div>
-                          <div>
-                            补充说明:发起流程事项审批
-                          </div>
-                        </div>
-                      </template>
-                    </el-step>
-                  </el-steps>
-                </div>
-              </div> -->
     </div>
     <div v-if="activeName=='second'">
       <div style="padding: 20px">
@@ -548,15 +487,14 @@
 
               </el-row>
               <el-row :gutter="20">
-                <el-col :span="8">
+                <el-col :span="24">
                   <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name">
                    <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
                      :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
-                     :show-file-list="false" v-if="zhixingBian">
-                     <div style="color: #2d8a58;margin-left: 10px;" slot="trigger">
-                       上传附件
-                     </div>
+                     :show-file-list="true" v-if="zhixingBian">
+                              <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
                    </el-upload>
+                   <div v-else>{{zhixingList.feedbackContent}}</div>
                   </el-form-item>
                 </el-col>
 
@@ -573,6 +511,9 @@
       </div>
     </div>
   </div>
+      <div style="display: flex;justify-content: flex-end;padding:10px" v-if="activeName=='first'">
+        <el-button  @click="downloadPdf"  style="background-color: #3F9B6A;color: #fff" >下载
+        </el-button></div>
 </el-dialog>
 </div>
 </div>
@@ -793,37 +734,37 @@
                 <div style="display:flex;padding:10px 0;">
                     <div style="margin-right:40px;width:17%">
                       <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
-                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.expectedAttractTraffic}}</span>人</div>
+                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.expectedAttractTrafficAnalyse}}%</div>
                       <div style="height:5px;background-color:#FEC03D;"></div>
                     </div>
                     <div style="margin-right:40px;width:17%">
                       <div style="color:#BBBBBB;font-size:10px;">参与人数</div>
-                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.expectedParticipation}}</span>人</div>
+                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.expectedParticipationAnalyse}}%</div>
                       <div style="height:5px;background-color:#58A3F7;"></div>
                     </div>
                     <div style="margin-right:40px;width:17%">
                       <div style="color:#BBBBBB;font-size:10px;">直接收益</div>
-                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.expectedDirectBenefits}}</span></div>
+                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.expectedDirectBenefitsAnalysis}}%</div>
                       <div style="height:5px;background-color:#4BCED0;"></div>
                     </div>
                     <div style="margin-right:40px;width:17%">
                       <div style="color:#BBBBBB;font-size:10px;">间接收益</div>
-                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.expectedIndirectBenefits}}</span></div>
+                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.expectedIndirectBenefitsAnalysis}}%</div>
                       <div style="height:5px;background-color:#3F9B6A;"></div>
                     </div>
                     <div style="margin-right:40px;width:17%">
                       <div style="color:#BBBBBB;font-size:10px;">投入生产比</div>
-                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.incomeAnalysis}}%</span></div>
+                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.incomeAnalysis}}%</div>
                       <div style="height:5px;background-color:#8167F5;"></div>
                     </div>
                 </div>
-                <div style="font-size:12px;margin:10px 0;">效果分析</div>
-                <div style="display:flex;padding:10px 0;">
+                <!-- <div style="font-size:12px;margin:10px 0;">效果分析</div> -->
+                <!-- <div style="display:flex;padding:10px 0;">
                     <div style="margin-right:40px;width:17%">
                       <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
                       <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
@@ -850,11 +791,11 @@
                     </div>
                     <div style="margin-right:40px;width:17%">
                       <div style="color:#BBBBBB;font-size:10px;">投入生产比</div>
-                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;">4289</span>人</div>
-                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                      <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;">{{fenxiData.incomeAnalysis}}</span>人</div>
+                      <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.incomeAnalysis}}%</div>
                       <div style="height:5px;background-color:#8167F5;"></div>
                     </div>
-                </div>
+                </div> -->
           </div>
             <div style="padding:0 20px;margin-top:20px;">
               <div style="border:1px solid #EFEFEF;padding:20px 15px">
@@ -1111,9 +1052,8 @@
                                        </el-table-column>
                                        <el-table-column label="操作" width="350">
                                          <template slot-scope="scope">
-                                           <div @click="shiyong(1,scope.row)" class="tableBtn greens">使用</div>
-                                           <div class="tableBtn greens" @click="handleEditForm(scope.row)">执行情况</div>
-                                           <div @click="actBian(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">修改</div>
+                                           <div @click="shiyong(scope.row)" class="tableBtn greens">使用</div>
+                                           <!-- <div @click="actBian(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">修改</div> -->
                                            <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
                                        </template>
                                      </el-table-column>
@@ -1150,12 +1090,17 @@
     cereAdd,
     cereEdit,
     cereDel,
-    copy
+    copy,
+    excelQueryByPage,
+    excelAdd,
+    effectEvaluation
   } from '../../api/activityBz'
   import addAct from "./activityBz"
   import actbians from "./activityBian"
   import * as echarts from 'echarts'
   import Vue from 'vue'
+  import html2canvas from 'html2canvas'
+  import jsPDF from 'jspdf'
   import {
     uploadUrl
   } from '@/utils/request'
@@ -1167,6 +1112,8 @@
     data() {
       return {
         uploadFileUrl: uploadUrl, // 请求地址
+        daoData:[],
+        fenxiData:{},
         fileData:[],
         addAct: false, //新增页
         actbianMsg: {
@@ -1232,9 +1179,11 @@
           text: '活动主要目的',
           eventTheme: ''
         }, {
-          id: '5',
-          name: '状态',
-          eventTheme: '待审核'
+          id: 0,
+          name: '范围设置',
+          planName: '',
+          text: '状态',
+          eventTheme: ''
         }],
         internalLaborCostEstimation: '',
         externalLaborCostEstimation: '',
@@ -1309,11 +1258,13 @@
           expectedDirectBenefits: '', //直接收益
           expectedIndirectBenefits: '', //间接收益
           createDate: '', //创建时间
+          feedbackContent:''
         }, //执行效果列表
         pageindex: {
           pageNumber: 1,
           pageSize: 10,
-          dataOwnership: '1'
+          dataOwnership: '1',
+          isDraft:0
         },
         multipleSelection: [],
         options: [],
@@ -1416,7 +1367,8 @@
                pageNumber: 1,
                pageSize: 10,
                dataOwnership: '1',
-               classificationCode:data.id
+               classificationCode:data.id,
+               isDraft:0
              }
              const res = await queryByPage(pageindex)
              this.tableData = res.data.content
@@ -1426,7 +1378,8 @@
              this.pageindex={
              pageNumber: 1,
              pageSize: 10,
-             dataOwnership: '1'
+             dataOwnership: '1',
+             isDraft:0
            }
            const res = await queryByPage(this.pageindex)
            this.tableData = res.data.content
@@ -1476,6 +1429,7 @@
             dataOwnership: '1',
             pageNumber: 1,
             pageSize: 10,
+            auditTime:0
           })
           this.tableData = res.data.content
         } else if (this.planName == '' && this.eventTheme != '') {
@@ -1484,6 +1438,7 @@
             dataOwnership: '1',
             pageNumber: 1,
             pageSize: 10,
+            auditTime:0
           })
           this.tableData = res.data.content
         } else {
@@ -1493,6 +1448,7 @@
             dataOwnership: '1',
             pageNumber: 1,
             pageSize: 10,
+            auditTime:0
           })
           this.tableData = res.data.content
         }
@@ -1500,6 +1456,7 @@
       },
       //详情点击
       handleEditForm(item) {
+        this.fileData = []
         this.zhixingList = {
           planTime:[],
           planName: '', //活动名称
@@ -1521,6 +1478,7 @@
           expectedDirectBenefits: '', //直接收益
           expectedIndirectBenefits: '', //间接收益
           createDate: '', //创建时间
+          feedbackContent:''
         } //执行效果列表
         actPage({
           detailsId: item.id,
@@ -1585,8 +1543,8 @@
           that.tableData1[2].planName = res.data.content[0].sponsor
           that.tableData1[3].eventTheme = res.data.content[0].participants
           that.tableData1[3].planName = res.data.content[0].mainPurpose
-
-          that.tableData1[4].eventTheme = this.getStatus(res.data.content[0].state)
+          that.tableData1[4].planName = this.getStatus(res.data.content[0].state)
+          that.tableData1[4].eventTheme =  res.data.content[0].rangeSetting
           //活动成本信息
           that.internalLaborCostEstimation = res.data.content[0].internalLaborCostEstimation
           that.externalLaborCostEstimation = res.data.content[0].externalLaborCostEstimation
@@ -1661,6 +1619,9 @@
       },
       //执行效果保存
       async bianji() {
+   if(this.fileData.length !=0){
+                this.zhixingList.feedbackContent = this.fileData[0].url
+          }
         if (this.zhiXing) {
           this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
           this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
@@ -1887,6 +1848,9 @@
 
       },
       xiaoguo(item) {
+        effectEvaluation({id:item.id}).then(res=>{
+                  this.fenxiData = res.data
+        })
         this.xiaoguoBox = true
         this.$nextTick(() => {
           this.shopLiu(this.$refs.shopL);
@@ -2115,22 +2079,32 @@
 
            },
          handleUploadSuccess(response, file, fileList) {
-           console.log(response, file, fileList)
-           // this.fileData.push(file)
+          const fileMsg = {
+            name:file.name,
+             url: file.response.data.url,
+          }
+          // 将文件地址存储在 uploadedFiles 数组中
+          this.fileData.push(fileMsg);
          },
          handleRemove(){
-
-         },
-         daoru(){
-
+        this.fileData = []
          },
+       daoru(response, file, fileList){
+         this.daoData.push(file.raw)
+         const formDate = new FormData()
+         formDate.append('file', this.daoData[0])
+         excelAdd(formDate).then(res => {
+            this.getAll()
+         })
+           },
      caogao(){
 
 
      let pageindex =  {
   pageNumber: 1,
   pageSize: 10,
-  dataOwnership: '1'
+  dataOwnership: '1',
+  isDraft:1
      }
      queryByPage(pageindex).then(res=>{
        this.caoList = res.data.content
@@ -2138,7 +2112,7 @@
        this.caogaoshow =true
 
      },
-     shiyong(val,item){
+     shiyong(item){
 
          const h = this.$createElement;
          this.$msgbox({
@@ -2153,14 +2127,14 @@
            customClass: 'oe-dialog-btn',
            beforeClose: (action, instance, done) => {
              if (action === 'confirm') {
-               // contentEdit({
-               //   id: item.id,
-               //    draftStatus:1
-               // }).then(res => {
-               //   this.getAll()
-               //   this.getcaogao()
-               //   done();
-               // })
+               xiangedit({
+                 id:item.id,
+                  isDraft:0
+               }).then(res => {
+                 this.getAll()
+                 this.caogao()
+                 done();
+               })
              } else {
                done();
              }
@@ -2169,6 +2143,56 @@
 
 
      },
+    async daochu(){
+         let res = await excelQueryByPage(this.pageindex)
+            if(!res){
+              return
+            }
+            const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+            const fileName = '审核流程.xls'
+            if ('download' in document.createElement('a')) {
+               // 非IE下载
+               const elink = document.createElement('a')
+               elink.download = fileName
+               elink.style.display = 'none'
+               elink.href = URL.createObjectURL(blob)
+               document.body.appendChild(elink)
+               elink.click()
+               URL.revokeObjectURL(elink.href) // 释放URL 对象
+               document.body.removeChild(elink)
+             } else {
+              // IE10+下载
+              navigator.msSaveBlob(blob, fileName)
+            }
+            this.$message({
+              message: '导出成功',
+              type: 'success'
+            })
+
+
+     },
+     // 下载
+      async downloadPdf() {
+           const content = this.$refs.actXiang;
+
+           // 使用 html2canvas 将 div 渲染为画布
+           const canvas = await html2canvas(content);
+
+           // 获取画布的图像数据
+           const imgData = canvas.toDataURL('image/png');
+
+           // 创建一个新的 PDF 文档
+           const pdf = new jsPDF('p', 'mm', 'a4');
+
+           // 添加图像到 PDF，第二个参数是图像格式，第三个参数是缩放比例
+           const imgWidth = 190; // 图像的宽度（mm）
+           const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比
+
+           pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm）
+
+           // 保存 PDF 文件
+           pdf.save('活动方案.pdf');
+         },
     }
   }
 </script>
diff --git a/yanshouban/src/views/ads/fangli/index.vue b/yanshouban/src/views/ads/fangli/index.vue
index 299ebed..1d2f457 100644
--- a/yanshouban/src/views/ads/fangli/index.vue
+++ b/yanshouban/src/views/ads/fangli/index.vue
@@ -38,17 +38,26 @@
           </div>
 
         </div>
-        <div style="margin-bottom:20px;">
+        <div style="margin-bottom: 20px;display:flex;">
           <el-button
-              style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
+              style="background-color: #3F9B6A;color: #fff;padding:8px 15px;margin-right:15px;" icon="el-icon-circle-plus-outline"
             @click="addbuss"
             >新增</el-button
           >
-          <!-- <el-button
+          <el-upload class="upload-demo" ref="upload"
+                            :limit="1"
+                            accept=".xlsx"
+                            :action="action"
+                            :on-success="daoru"
+                            :file-list="fileData"
+                             :auto-upload="true"
+                             :show-file-list="false">
+                            <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover">导入</el-button>
+                          </el-upload>
+         <!-- <el-button
               style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
             @click="daoru"
-            >导入</el-button
-          > -->
+            >导入</el-button> -->
         </div>
         <!-- 表格 -->
         <el-table
@@ -171,10 +180,10 @@
               <div class="tableBtn greens" v-if="scope.row.auditStatus =='1'"  @click="peizhi(scope.row)">
                 审核流程配置
               </div>
-              <div class="tableBtn greens" v-if="scope.row.enableStatus== 1 &&scope.row.auditStatus =='2'"  @click="qiyong(scope.row,0)">
+              <div class="tableBtn greens" v-if="scope.row.enableStatus== 1 || scope.row.enableStatus == null &&scope.row.auditStatus =='2'"  @click="qiyong(scope.row,0)">
                 启用
               </div>
-              <div class="tableBtn greens" v-if="scope.row.enableStatus == 0 &&scope.row.auditStatus =='2' "  @click="qiyong(scope.row,1)">
+              <div class="tableBtn greens" v-if="scope.row.enableStatus == 0   &&scope.row.auditStatus =='2' "  @click="qiyong(scope.row,1)">
                 禁用
               </div>
               <div class="tableBtn greens" @click="delGuan(scope.row)"  >
@@ -199,22 +208,22 @@
         </div>
       </div>
     </div>
-    <el-dialog :visible.sync="peiShow" custom-class='bian_css' style="padding: 0;" width="75%"
+    <el-dialog :visible.sync="peiShow" custom-class='bian_css' style="padding: 0;" width="45%"
       :close-on-press-escape="false" center :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
       <div style="padding:20px;">
-          <el-form label-position="right" ref="jibenFrom" :model="peiForm" :rules="peiFormRules" label-width="140px"
+        <div style="font-size: 14px;padding-bottom: 20px;color: #000;">审核流程配置</div>
+          <el-form label-position="right" ref="jibenFrom" :model="peiForm"  label-width="140px"
             style="position: relative">
             <el-form-item label="审核提醒时间" class="grid-content bg-purple device-from" prop="planName">
-              <el-date-picker style="width:160px;margin-right:5px" v-model="peiForm.auditTime"
-                value-format="yyyy-M-d"   type="daterange" range-separator="-" start-placeholder=""
-                end-placeholder="" prefix-icon="none" >
+              <el-date-picker style="width:240px;margin-right:5px" v-model="peiForm.auditTime"
+                value-format="yyyy-MM-dd HH:mm:ss"    type="datetime" prefix-icon="none" >
               </el-date-picker>
             </el-form-item>
             </el-form>
         <div style="padding-top:20px;display:flex;justify-content: flex-end;">
-          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+          <el-button  style="background-color: #3F9B6A;color: #fff"
             @click="peiCheck">确定</el-button>
-          <el-button @click="peiShow = false" style="background-color: #3F9B6A;color: #fff">取消</el-button>
+          <el-button @click="peiShow = false"  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" class="buttonHover">取消</el-button>
 
         </div>
 
@@ -247,8 +256,8 @@ import {
   fangAdd,
   fangEdit,
   fangDel,
+  excelAdd
 }from '../../../api/fangli'
-
 import upimg from "@/components/ImageUpload/index"
 import addxin from "./addform"
 import xiang from "./bianform"
@@ -256,6 +265,7 @@ export default {
   components: {upimg,addxin,xiang},
   data() {
     return {
+      fileData:[],
       detbox: false, // 详情
       edit: true, // 编辑
       formInline: {
@@ -550,6 +560,14 @@ export default {
       this.peiShow = true
       this.peiId = item.id
     },
+ daoru(response, file, fileList){
+   this.fileData.push(file.raw)
+   const formDate = new FormData()
+   formDate.append('file', this.fileData[0])
+   excelAdd(formDate).then(res => {
+      this.getAll()
+   })
+     },
   }
 }
 </script>
diff --git a/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue b/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue
index a4d9c68..2e66483 100644
--- a/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue
+++ b/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue
@@ -943,7 +943,15 @@ this.pageindex.advertisingSpaceType ='实体广告位'
                   this.tableData = res.data.content
                   this.total = res.data.content.length
           this.xxNum = res.data.content.length
-
+  this.tableData.map(res=>{
+        res.lesseeName = this.$decrypt(res.lesseeName)
+        res.contactPhone = this.$decrypt(res.contactPhone)
+        res.idCardNumber = this.$decrypt(res.idCardNumber)
+        res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+        res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+        res.address = this.$decrypt(res.address)
+        res.emailAddress = this.$decrypt(res.emailAddress)
+      })
                   const stList = await AdvertiserInfoGetAll(pageindex)
                   this.stNum = stList.data.content.length
 
@@ -957,7 +965,15 @@ this.pageindex.advertisingSpaceType ='实体广告位'
                   this.tableData = res.data.content
                   this.total = res.data.content.length
           this.stNum = res.data.content.length
-
+          this.tableData.map(res=>{
+                res.lesseeName = this.$decrypt(res.lesseeName)
+                res.contactPhone = this.$decrypt(res.contactPhone)
+                res.idCardNumber = this.$decrypt(res.idCardNumber)
+                res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+                res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+                res.address = this.$decrypt(res.address)
+                res.emailAddress = this.$decrypt(res.emailAddress)
+              })
                   const stList = await AdvertiserInfoGetAll(pageindex)
                   this.xxNum = stList.data.content.length
         }
@@ -1008,6 +1024,15 @@ this.pageindex.advertisingSpaceType ='实体广告位'
                       this.tableData = res.data.content
                       this.total = res.data.content.length
               this.xxNum = res.data.content.length
+              this.tableData.map(res=>{
+                    res.lesseeName = this.$decrypt(res.lesseeName)
+                    res.contactPhone = this.$decrypt(res.contactPhone)
+                    res.idCardNumber = this.$decrypt(res.idCardNumber)
+                    res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+                    res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+                    res.address = this.$decrypt(res.address)
+                    res.emailAddress = this.$decrypt(res.emailAddress)
+                  })
               let pageindex={
                         pageNumber: 1,
                         pageSize: 10,
@@ -1023,6 +1048,15 @@ this.pageindex.advertisingSpaceType ='实体广告位'
               this.tableData = res.data.content
               this.total = res.data.content.length
       this.stNum = res.data.content.length
+      this.tableData.map(res=>{
+            res.lesseeName = this.$decrypt(res.lesseeName)
+            res.contactPhone = this.$decrypt(res.contactPhone)
+            res.idCardNumber = this.$decrypt(res.idCardNumber)
+            res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+            res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+            res.address = this.$decrypt(res.address)
+            res.emailAddress = this.$decrypt(res.emailAddress)
+          })
       let pageindex={
                 pageNumber: 1,
                 pageSize: 10,
diff --git a/yanshouban/src/views/advertisement/index.vue b/yanshouban/src/views/advertisement/index.vue
index 3a0150a..47232c4 100644
--- a/yanshouban/src/views/advertisement/index.vue
+++ b/yanshouban/src/views/advertisement/index.vue
@@ -99,6 +99,9 @@
               <div @click="xiajia(scope.row)" class="tableBtn greens" v-if="leixing ==1 && scope.row.auditStatus =='4'">下架</div> -->
               <div @click="toufang(scope.row)" class="tableBtn greens" v-if="leixing == 1 && scope.row.auditStatus =='2'">投放</div>
               <div @click="xiajia(scope.row)" class="tableBtn greens" v-if="leixing ==1 && scope.row.auditStatus =='4'">下架</div>
+              <div class="tableBtn greens" v-if="scope.row.auditStatus =='1'"  @click="peizhi(scope.row)">
+                审核流程配置
+              </div>
               <div @click="gengGai(scope.row)" class="tableBtn greens" v-if="leixing == 1&& scope.row.auditStatus !='5'">更改状态</div>
               <div @click="handleDelete(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='1'">删除</div>
               <!-- <div @click="handleDelete(scope.row)" class="tableBtn greens" >删除</div> -->
@@ -753,8 +756,30 @@
                                             </div>
                                 </el-dialog>
       </div>
+<el-dialog :visible.sync="peiShow" custom-class='bian_css' style="padding: 0;" width="45%"
+      :close-on-press-escape="false" center :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
+      <div style="padding:20px;">
+        <div style="font-size: 14px;padding-bottom: 20px;color: #000;">审核流程配置</div>
+          <el-form label-position="right" ref="jibenFrom" :model="peiForm"  label-width="140px"
+            style="position: relative">
+            <el-form-item label="审核提醒时间" class="grid-content bg-purple device-from" prop="planName">
+              <el-date-picker style="width:240px;margin-right:5px" v-model="peiForm.auditTime"
+                value-format="yyyy-MM-dd HH:mm:ss"    type="datetime" prefix-icon="none" >
+              </el-date-picker>
+            </el-form-item>
+            </el-form>
+        <div style="padding-top:20px;display:flex;justify-content: flex-end;">
+          <el-button  style="background-color: #3F9B6A;color: #fff"
+            @click="peiCheck">确定</el-button>
+          <el-button @click="peiShow = false"  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" class="buttonHover">取消</el-button>
+
+        </div>
+
+      </div>
 
+    </el-dialog>
       </div>
+
     </div>
 
   </div>
@@ -864,7 +889,12 @@
         xsNum:0,
         stNum:0,
         hetongList:{},
-        auditStatusNum:''
+        auditStatusNum:'',
+        peiForm:{
+          auditTime:''
+        },
+        peiShow:false,
+        peiId:''
       }
     },
     created() {
@@ -1163,7 +1193,25 @@
         await updateList({id:this.secondData.id,auditStatus:'5'})
         this.steatShow = false
         this.getAll()
+      },
+   async peiCheck(){
+      if(this.peiForm.auditTime ==''){
+        this.$message({
+          message: '请填写审核提醒时间',
+        })
+        return;
       }
+      await fangEdit({id:this.peiId,auditTime:this.peiForm.auditTime})
+       this.peiShow = false
+       this.getAll()
+    },
+    peizhi(item){
+      this.peiForm = {
+        auditTime:''
+      }
+      this.peiShow = true
+      this.peiId = item.id
+    },
     }
   }
 </script>
diff --git a/yanshouban/src/views/atmosphere/atmosphereBian.vue b/yanshouban/src/views/atmosphere/atmosphereBian.vue
index 1b203c5..ce2fcd1 100644
--- a/yanshouban/src/views/atmosphere/atmosphereBian.vue
+++ b/yanshouban/src/views/atmosphere/atmosphereBian.vue
@@ -66,6 +66,17 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
+                  <el-select v-model="secondData.rangeSetting" placeholder="请选择"  style="width: 100%">
+                    <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
+                    <el-option label="活动场地内" value="活动场地内"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
             <div style="padding: 10px">
               <el-row :gutter="20">
                 <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
diff --git a/yanshouban/src/views/atmosphere/atmosphereBz.vue b/yanshouban/src/views/atmosphere/atmosphereBz.vue
index 8060066..5da25e5 100644
--- a/yanshouban/src/views/atmosphere/atmosphereBz.vue
+++ b/yanshouban/src/views/atmosphere/atmosphereBz.vue
@@ -91,7 +91,16 @@
                         </el-form-item>
                       </el-col>
                     </el-row>
-
+<el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
+                      <el-select v-model="ruleForm.rangeSetting" placeholder="请选择"  style="width: 100%">
+                        <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
+                        <el-option label="活动场地内" value="活动场地内"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
                       <el-row :gutter="20">
                         <el-col :span="12">
                                                 <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
@@ -297,12 +306,14 @@
             </el-tab-pane>
           </el-tabs>
 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
-          <el-button plain @click="onSubmit" size="mini" style="background-color: #3F9B6A;color: #fff;">保存
-          </el-button>
-          <!-- <el-button plain @click="zancun" size="mini" style="background-color: #3F9B6A;color: #fff;">暂存
-          </el-button> -->
-          <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">取消
+  <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">取消
+  </el-button>
+  <el-button  @click="onSubmit(1)" style="background-color: #3F9B6A;color: #fff;">暂存
+  </el-button>
+          <el-button plain @click="onSubmit(0)" size="mini" style="background-color: #3F9B6A;color: #fff;">保存
           </el-button>
+
+
         </div>
     </div>
 
@@ -393,6 +404,7 @@ uploadFileUrl: uploadUrl, // 请求地址
           eventTheme:'',//活动主题
           sponsor:'',//活动主办方
           participants:'',//活动参与方
+          rangeSetting:'',
           mainPurpose:'',//活动主要目的
           coverPoster:'',//封面海报
           internalLaborCostEstimation:'',//内部人工成本预估
@@ -504,7 +516,7 @@ uploadFileUrl: uploadUrl, // 请求地址
          //  }
         },
         //保存
-    onSubmit(){
+    onSubmit(val){
        this.updateCurrentTime();
        let that = this
        let FlieName = this.ruleForm.planName
@@ -559,6 +571,7 @@ uploadFileUrl: uploadUrl, // 请求地址
         // }
         this.$refs.jibenFrom.validate((valid) => {
                  if (valid) {
+                   this.ruleForm.isDraft = val
                    add(this.ruleForm).then(res=>{
                      this.$message({
                                message: '保存成功',
@@ -681,6 +694,7 @@ this.tuxiangData = {
             eventTheme: '', //活动主题
             sponsor: '', //活动主办方
             participants: '', //活动参与方
+            rangeSetting:'',
             mainPurpose: '', //活动主要目的
             coverPoster: '', //封面海报
             internalLaborCostEstimation: '', //内部人工成本预估
diff --git a/yanshouban/src/views/atmosphere/atmosphereGl.vue b/yanshouban/src/views/atmosphere/atmosphereGl.vue
index f2f6bb0..f932320 100644
--- a/yanshouban/src/views/atmosphere/atmosphereGl.vue
+++ b/yanshouban/src/views/atmosphere/atmosphereGl.vue
@@ -22,13 +22,23 @@
                 </div>
               </div>
               <div style="margin:20px 0;">
-                <div>
+                <div style="display:flex;">
                   <el-button icon="el-icon-circle-plus-outline"  @click="create"
                     style="background-color: #3F9B6A;color: #fff;">新增</el-button>
                     <el-button  style="background-color: #E24E5A;color: #fff;" icon="el-icon-delete" @click="handleDelete" class="DelBtnHover">删除</el-button>
                   <el-button  style="background-color: #3F9B6A;color: #fff;" @click="duibi">效果对比</el-button>
-                  <el-button  style="background-color: #3F9B6A;color: #fff;" @click="daoru">导入</el-button>
+                  <el-upload class="upload-demo" ref="upload"
+                                    :limit="1"
+                                    accept=".xlsx"
+                                :action="uploadFileUrl"
+                                    :on-success="daoru"
+                                    :file-list="daoData"
+                                     :auto-upload="true"
+                                     :show-file-list="false">
+                                    <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;margin:0 15px;"  class="buttonHover">导入</el-button>
+                                  </el-upload>
                   <el-button  style="background-color: #3F9B6A;color: #fff;" @click="caogao">草稿箱</el-button>
+                  <el-button  style="background-color: #3F9B6A;color: #fff;" @click="daochu">审核流程导出</el-button>
                   <!-- <el-button  style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;"
                     icon="el-icon-folder-add" class="buttonHover" @click="xinFenlei">氛围分类管理</el-button> -->
                 </div>
@@ -82,7 +92,7 @@
                         {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
                         </template>
                       </el-table-column>
-                      <el-table-column label="修改时间" prop="createDate"width="250" >
+                      <el-table-column label="创建时间" prop="createDate"width="250" >
                       </el-table-column>
                       <el-table-column prop="createUser" label="上传人员" width="80">
 
@@ -93,7 +103,7 @@
                           <!-- <div class="tableBtn greens">发布</div> -->
                           <div class="tableBtn greens" @click="handleEditForm(scope.row)">执行情况</div>
                           <div @click="OAshen(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">上传到OA</div>
-                          <div class="tableBtn greens" @click="xiaoguo(scope.row)">效果评估</div>
+                          <div class="tableBtn greens" @click="xiaoguo(scope.row)" v-if="scope.row.state == '5'" >效果评估</div>
                           <!-- <div class="tableBtn greens">策略调整</div> -->
                           <div class="tableBtn greens" @click="koop(scope.row)">复制</div>
                         </template>
@@ -123,7 +133,7 @@
         <!-- 详情活动方案 -->
         <el-dialog title="氛围方案详情" :visible.sync="ggXin" custom-class='xiang_css' style="padding: 0;" width="80%"
           center :close-on-click-modal="false"  :close-on-press-escape="false" @close="refreshData">
-          <div>
+          <div ref="actXiang">
             <div style="width: 100%;">
               <div style="display: flex;padding:0px 20px 20px 20px; ">
                 <div style="width: 150px;height: 80px;" v-if="secondData.coverPoster">
@@ -541,15 +551,14 @@
 
                       </el-row>
                       <el-row :gutter="20">
-                        <el-col :span="8">
+                        <el-col :span="24">
                           <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name">
                            <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
                              :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
-                             :show-file-list="false" v-if="zhixingBian">
-                             <div style="color: #2d8a58;margin-left: 10px;" slot="trigger">
-                               上传附件
-                             </div>
+                             :show-file-list="true" v-if="zhixingBian">
+                                      <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
                            </el-upload>
+                           <div v-else>{{zhixingList.feedbackContent}}</div>
                           </el-form-item>
                         </el-col>
 
@@ -563,9 +572,11 @@
                   <el-button plain @click="bianji"  style="background-color: #3F9B6A;color: #fff" v-if="zhixingBian">保存
                   </el-button>
                 </div>
-
             </div>
           </div>
+          <div style="display: flex;justify-content: flex-end;padding:10px" v-if="activeName=='first'">
+            <el-button  @click="downloadPdf"  style="background-color: #3F9B6A;color: #fff" >下载
+            </el-button></div>
         </el-dialog>
       </div>
     </div>
@@ -614,37 +625,37 @@
                      <div style="display:flex;padding:10px 0;">
                          <div style="margin-right:40px;width:17%">
                            <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
-                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.expectedAttractTraffic}}</span>人</div>
+                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.expectedAttractTrafficAnalyse}}%</div>
                            <div style="height:5px;background-color:#FEC03D;"></div>
                          </div>
                          <div style="margin-right:40px;width:17%">
                            <div style="color:#BBBBBB;font-size:10px;">参与人数</div>
-                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.expectedParticipation}}</span>人</div>
+                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.expectedParticipationAnalyse}}%</div>
                            <div style="height:5px;background-color:#58A3F7;"></div>
                          </div>
                          <div style="margin-right:40px;width:17%">
                            <div style="color:#BBBBBB;font-size:10px;">直接收益</div>
-                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.expectedDirectBenefits}}</span></div>
+                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.expectedDirectBenefitsAnalysis}}%</div>
                            <div style="height:5px;background-color:#4BCED0;"></div>
                          </div>
                          <div style="margin-right:40px;width:17%">
                            <div style="color:#BBBBBB;font-size:10px;">间接收益</div>
-                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.expectedIndirectBenefits}}</span></div>
+                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.expectedIndirectBenefitsAnalysis}}%</div>
                            <div style="height:5px;background-color:#3F9B6A;"></div>
                          </div>
                          <div style="margin-right:40px;width:17%">
                            <div style="color:#BBBBBB;font-size:10px;">投入生产比</div>
-                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
+                           <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">{{fenxiData.incomeAnalysis}}%</span></div>
+                           <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">{{fenxiData.incomeAnalysis}}%</div>
                            <div style="height:5px;background-color:#8167F5;"></div>
                          </div>
                      </div>
-                     <div style="font-size:12px;margin:10px 0;">效果分析</div>
-                     <div style="display:flex;padding:10px 0;">
+                     <!-- <div style="font-size:12px;margin:10px 0;">效果分析</div> -->
+                     <!-- <div style="display:flex;padding:10px 0;">
                          <div style="margin-right:40px;width:17%">
                            <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
                            <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
@@ -675,7 +686,7 @@
                            <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
                            <div style="height:5px;background-color:#8167F5;"></div>
                          </div>
-                     </div>
+                     </div> -->
                </div>
                  <div style="padding:0 20px;margin-top:20px;">
                    <div style="border:1px solid #EFEFEF;padding:20px 15px">
@@ -1106,9 +1117,8 @@
                                        </el-table-column>
                                        <el-table-column label="操作" width="350">
                                          <template slot-scope="scope">
-                                           <div @click="shiyong(1,scope.row)" class="tableBtn greens">使用</div>
-                                           <div class="tableBtn greens" @click="handleEditForm(scope.row)">执行情况</div>
-                                           <div @click="actBian(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">修改</div>
+                                           <div @click="shiyong(scope.row)" class="tableBtn greens">使用</div>
+                                           <!-- <div @click="actBian(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">修改</div> -->
                                            <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
                                        </template>
                                      </el-table-column>
@@ -1145,12 +1155,17 @@
     cereGet,
     cereAdd,
     cereEdit,
-    cereDel
+    cereDel,
+    excelQueryByPage,
+    excelAdd,
+    effectEvaluation
   } from '../../api/activityBz'
   import addAct from "./atmosphereBz"
   import atmbians from "./atmosphereBian"
   import * as echarts from 'echarts'
   import Vue from 'vue'
+  import html2canvas from 'html2canvas'
+  import jsPDF from 'jspdf'
   import {
     uploadUrl
   } from '@/utils/request'
@@ -1164,6 +1179,7 @@ components: { addAct,atmbians},
           acBian:'',//编辑数据
           bianshow:false,//编辑页
         },
+          fenxiData:{},
         planName:'',
         planFen:'',
         eventTheme:'',
@@ -1222,9 +1238,11 @@ components: { addAct,atmbians},
           text: '活动主要目的',
           eventTheme: ''
         },{
-          id: '5',
-          name: '状态',
-          eventTheme: '待审核'
+       id:0,
+       name: '范围设置',
+       planName: '',
+       text: '状态',
+       eventTheme: ''
         }],
         internalLaborCostEstimation:'',
         externalLaborCostEstimation:'',
@@ -1304,7 +1322,8 @@ components: { addAct,atmbians},
         pageindex: {
           pageNumber: 1,
           pageSize: 10,
-          dataOwnership:'2'
+          dataOwnership:'2',
+          isDraft:0
         },
         multipleSelection:[],//选择的数据
         options: [],
@@ -1345,6 +1364,7 @@ components: { addAct,atmbians},
                 duibiOne:{},
                 duibiTwo:{},
                 uploadFileUrl: uploadUrl, // 请求地址
+                daoData:[],
                 fileData:[],
                 caoList:[],
                 caogaoshow:false
@@ -1377,7 +1397,7 @@ components: { addAct,atmbians},
       //查询全数据
       async getAll() {
         const res = await queryByPage((this.pageindex))
-        console.log(res.data)
+
         this.tableData = res.data.content
         this.total = res.data.content.length
         let page = {
@@ -1407,12 +1427,13 @@ components: { addAct,atmbians},
               }));
         },
         async handleNodeClick(data){
-            console.log('Node clicked:', data);
+
             let pageindex= {
               pageNumber: 1,
               pageSize: 10,
               dataOwnership: '2',
-              classificationCode:data.id
+              classificationCode:data.id,
+              isDraft:0
             }
             const res = await queryByPage(pageindex)
             this.tableData = res.data.content
@@ -1422,7 +1443,8 @@ components: { addAct,atmbians},
             this.pageindex={
             pageNumber: 1,
             pageSize: 10,
-            dataOwnership: '2'
+            dataOwnership: '2',
+            isDraft:0
           }
           const res = await queryByPage(this.pageindex)
           this.tableData = res.data.content
@@ -1469,13 +1491,13 @@ components: { addAct,atmbians},
       //查询
      async onSubmit(){
         if(this.planName != '' && this.eventTheme == ''){
-             const res = await danqueryById({planName:this.planName,dataOwnership:'2', pageNumber: 1,pageSize: 10,})
+             const res = await danqueryById({planName:this.planName,dataOwnership:'2', pageNumber: 1,pageSize: 10, auditTime:0})
             this.tableData = res.data.content
         }else if(this.planName == '' && this.eventTheme != ''){
-          const res = await danqueryById({eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10,})
+          const res = await danqueryById({eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10, auditTime:0})
           this.tableData = res.data.content
         }else{
-          const res = await danqueryById({planName:this.planName,eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10, })
+          const res = await danqueryById({planName:this.planName,eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10, auditTime:0 })
          this.tableData = res.data.content
         }
 
@@ -1497,7 +1519,9 @@ components: { addAct,atmbians},
                 },
       //执行效果保存
       async bianji() {
-        console.log(this.zhiXing)
+        if(this.fileData.length !=0){
+              this.zhixingList.feedbackContent = this.fileData[0].url
+        }
         if(this.zhiXing){
           this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
           this.zhixingList.eventEndTime=this.zhixingList.planTime[1]
@@ -1519,6 +1543,7 @@ components: { addAct,atmbians},
       },
       //详情点击
     handleEditForm(item) {
+      this.fileData = []
       this.zhixingList={
           planTime: [],
           planName: '', //活动名称
@@ -1600,8 +1625,8 @@ components: { addAct,atmbians},
                that.tableData1[2].planName =  res.data.content[0].sponsor
                that.tableData1[3].eventTheme = res.data.content[0].participants
                  that.tableData1[3].planName =  res.data.content[0].mainPurpose
-                  // that.tableData1[4].eventTheme =  res.data.content[0].state
-                   that.tableData1[4].eventTheme = this.getStatus(res.data.content[0].state)
+               that.tableData1[4].planName = this.getStatus(res.data.content[0].state)
+               that.tableData1[4].eventTheme =  res.data.content[0].rangeSetting
                   //活动成本信息
                that.internalLaborCostEstimation=res.data.content[0].internalLaborCostEstimation
                 that.externalLaborCostEstimation=res.data.content[0].externalLaborCostEstimation
@@ -1811,6 +1836,9 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
                 }
               },
               xiaoguo(item) {
+                effectEvaluation({id:item.id}).then(res=>{
+                          this.fenxiData = res.data
+                })
                 this.xiaoguoBox = true
                 this.$nextTick(() => {
                   this.shopLiu(this.$refs.shopL);
@@ -2079,20 +2107,30 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
 
                 },
                 handleUploadSuccess(response, file, fileList) {
-                  console.log(response, file, fileList)
-                  // this.fileData.push(file)
+                 const fileMsg = {
+                   name:file.name,
+                    url: file.response.data.url,
+                 }
+                 // 将文件地址存储在 uploadedFiles 数组中
+                 this.fileData.push(fileMsg);
                 },
                 handleRemove(){
-
+this.fileData=[]
+                },
+            daoru(response, file, fileList){
+              this.daoData.push(file.raw)
+              const formDate = new FormData()
+              formDate.append('file', this.daoData[0])
+              excelAdd(formDate).then(res => {
+                 this.getAll()
+              })
                 },
-                daoru(){
-
-                       },
                    caogao(){
                    let pageindex =  {
                 pageNumber: 1,
                 pageSize: 10,
-                dataOwnership: '2'
+                dataOwnership: '2',
+                isDraft:1
                    }
                    queryByPage(pageindex).then(res=>{
                      this.caoList = res.data.content
@@ -2100,7 +2138,7 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
                      this.caogaoshow =true
 
                    },
-                   shiyong(val,item){
+                   shiyong(item){
 
                        const h = this.$createElement;
                        this.$msgbox({
@@ -2115,14 +2153,15 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
                          customClass: 'oe-dialog-btn',
                          beforeClose: (action, instance, done) => {
                            if (action === 'confirm') {
-                             // contentEdit({
-                             //   id: item.id,
-                             //    draftStatus:1
-                             // }).then(res => {
-                             //   this.getAll()
-                             //   this.getcaogao()
-                             //   done();
-                             // })
+                             xiangedit({
+                               id: item.id,
+                                draftStatus:1,
+                                isDraft:0
+                             }).then(res => {
+                           this.getAll()
+                           this.caogao()
+                               done();
+                             })
                            } else {
                              done();
                            }
@@ -2131,6 +2170,56 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
 
 
                    },
+                   async daochu(){
+                        let res = await excelQueryByPage(this.pageindex)
+                           if(!res){
+                             return
+                           }
+                           const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+                           const fileName = '审核流程.xls'
+                           if ('download' in document.createElement('a')) {
+                              // 非IE下载
+                              const elink = document.createElement('a')
+                              elink.download = fileName
+                              elink.style.display = 'none'
+                              elink.href = URL.createObjectURL(blob)
+                              document.body.appendChild(elink)
+                              elink.click()
+                              URL.revokeObjectURL(elink.href) // 释放URL 对象
+                              document.body.removeChild(elink)
+                            } else {
+                             // IE10+下载
+                             navigator.msSaveBlob(blob, fileName)
+                           }
+                           this.$message({
+                             message: '导出成功',
+                             type: 'success'
+                           })
+
+
+                    },
+                    // 下载
+                     async downloadPdf() {
+                          const content = this.$refs.actXiang;
+
+                          // 使用 html2canvas 将 div 渲染为画布
+                          const canvas = await html2canvas(content);
+
+                          // 获取画布的图像数据
+                          const imgData = canvas.toDataURL('image/png');
+
+                          // 创建一个新的 PDF 文档
+                          const pdf = new jsPDF('p', 'mm', 'a4');
+
+                          // 添加图像到 PDF，第二个参数是图像格式，第三个参数是缩放比例
+                          const imgWidth = 190; // 图像的宽度（mm）
+                          const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比
+
+                          pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm）
+
+                          // 保存 PDF 文件
+                          pdf.save('氛围方案.pdf');
+                        },
     }
   }
 </script>
diff --git a/yanshouban/src/views/atmosphere/atmosphereSp.vue b/yanshouban/src/views/atmosphere/atmosphereSp.vue
index 23f5487..7b935c6 100644
--- a/yanshouban/src/views/atmosphere/atmosphereSp.vue
+++ b/yanshouban/src/views/atmosphere/atmosphereSp.vue
@@ -59,7 +59,7 @@
                      {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
                      </template>
                  </el-table-column>
-                 <el-table-column label="修改时间" prop="createDate" min-width="250" >
+                 <el-table-column label="创建时间" prop="createDate" min-width="250" >
                  </el-table-column>
                  <el-table-column prop="createUser" label="上传人员" min-width="80">
 
@@ -912,7 +912,8 @@
         pageindex: {
           pageNumber: 1,
           pageSize: 10,
-          dataOwnership: '2'
+          dataOwnership: '2',
+          isDraft:0
         },
         multipleSelection: [],
         options: [{
diff --git a/yanshouban/src/views/business/autd/index.vue b/yanshouban/src/views/business/autd/index.vue
index 8d130e6..4448e47 100644
--- a/yanshouban/src/views/business/autd/index.vue
+++ b/yanshouban/src/views/business/autd/index.vue
@@ -450,7 +450,7 @@ export default {
       this.total = res.data.total
       this.tableData.map(res=>{
         res.shopPhone = this.$decrypt(res.shopPhone)
-        res.shopPassword = this.$decrypt(res.shopPassword)
+        // res.shopPassword = this.$decrypt(res.shopPassword)
         res.emailAddress = this.$decrypt(res.emailAddress)
         res.idCardNum = this.$decrypt(res.idCardNum)
       })
diff --git a/yanshouban/src/views/business/businessList/index.vue b/yanshouban/src/views/business/businessList/index.vue
index 94de591..874e737 100644
--- a/yanshouban/src/views/business/businessList/index.vue
+++ b/yanshouban/src/views/business/businessList/index.vue
@@ -64,14 +64,23 @@
           </el-button>
         </div>
       </div>
-      <div style="margin-bottom:20px;">
+      <div style="margin-bottom: 20px;display:flex;">
         <el-button
           @click="addbuss"
           icon="el-icon-circle-plus-outline"
-         style="background-color: #3F9B6A;color: #fff;"
+         style="background-color: #3F9B6A;color: #fff;margin-right:15px;"
         >新增
         </el-button>
-
+        <el-upload class="upload-demo" ref="upload"
+                          :limit="1"
+                          accept=".xlsx"
+                          :action="action"
+                          :on-success="daoru"
+                          :file-list="fileData"
+                           :auto-upload="true"
+                           :show-file-list="false">
+                          <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover">导入</el-button>
+                        </el-upload>
       </div>
       <!-- 表格 -->
       <div class="tableBox">
@@ -659,7 +668,8 @@ import {
   businessListGetById,
   businessListUpdate,
   businessListStart,
-  delBusinessById
+  delBusinessById,
+  excelAdd
 } from '@/api/business'
 import upimg from "@/components/ImageUpload/index";
   import {
@@ -668,11 +678,14 @@ import upimg from "@/components/ImageUpload/index";
   import {
     getAlls as map1
   } from '@/api/map1'
+  import { uploadUrl,token } from '@/utils/request'
 export default {
   components: {upimg},
   data () {
     // 这里存放数据
     return {
+      action:uploadUrl,
+      fileData:[],
       // 新建商家弹框
       dialogVisible: false,
       activeName: 0,
@@ -899,8 +912,7 @@ export default {
     addCheck (ruleForm) {
       this.$refs[ruleForm].validate(valid => {
         if (valid) {
-          console.log(this.userState)
-          console.log(this.ruleForm)
+
           // if (this.personPhone !== '') {
           //   this.ruleForm.chargePersonPhone = this.personPhone
           // }
@@ -932,6 +944,15 @@ export default {
           }
 
           if (!this.userState) {
+
+            // this.ruleForm.shopPhone = this.$encrypt(this.ruleForm.shopPhone)
+            // this.ruleForm.shopPassword = this.$encrypt(this.ruleForm.shopPassword)
+            // this.ruleForm.idCardNum = this.$encrypt(this.ruleForm.idCardNum)
+            // this.ruleForm.emailAddress = this.$encrypt(this.ruleForm.emailAddress)
+            // this.ruleForm.shopAdress = this.$encrypt(this.ruleForm.shopAdress)
+            // this.ruleForm.legalRepresentative = this.$encrypt(this.ruleForm.legalRepresentative)
+            // this.ruleForm.chargePersonPhone = this.$encrypt(this.ruleForm.chargePersonPhone)
+
             businessListSave(this.ruleForm).then(res => {
 
               if (res.code === '') {
@@ -1052,21 +1073,24 @@ export default {
 
       })
     },
-    // businessListGetAll
+
     // 初始化查询所有数据
-    async getAll (formInline) {
+    async getAll(formInline) {
       const res = await businessListGetAll(formInline)
+
       this.total = res.data.total
       this.tableData = res.data.list
-      this.tableData.map(res=>{
-        res.shopPhone = this.$decrypt(res.shopPhone)
-        res.shopPassword = this.$decrypt(res.shopPassword)
-        res.idCardNum = this.$decrypt(res.idCardNum)
-        res.emailAddress = this.$decrypt(res.emailAddress)
-        res.shopAdress = this.$decrypt(res.shopAdress)
-        res.legalRepresentative = this.$decrypt(res.legalRepresentative)
-        res.chargePersonPhone = this.$decrypt(res.chargePersonPhone)
+
+      this.tableData.map(item=>{
+        item.shopPhone = this.$decrypt(item.shopPhone)
+        item.shopPassword = this.$decrypt(item.shopPassword)
+        item.idCardNum = this.$decrypt(item.idCardNum)
+        item.emailAddress = this.$decrypt(item.emailAddress)
+        item.shopAdress = this.$decrypt(item.shopAdress)
+        item.legalRepresentative = this.$decrypt(item.legalRepresentative)
+        item.chargePersonPhone = this.$decrypt(item.chargePersonPhone)
       })
+
     },
     // 编辑号码
     inputPhone () {
@@ -1122,6 +1146,14 @@ export default {
     MingDelete(index){
        this.ziyuanData.splice(index, 1);
     },
+   daoru(response, file, fileList){
+     this.fileData.push(file.raw)
+     const formDate = new FormData()
+     formDate.append('file', this.fileData[0])
+     excelAdd(formDate).then(res => {
+        this.getAll(this.formInline)
+     })
+       },
   }
 }
 </script>
diff --git a/yanshouban/src/views/couponmanagement/coupon.vue b/yanshouban/src/views/couponmanagement/coupon.vue
index 3dad718..2aa6c46 100644
--- a/yanshouban/src/views/couponmanagement/coupon.vue
+++ b/yanshouban/src/views/couponmanagement/coupon.vue
@@ -226,7 +226,7 @@
       this.shopList = res1.data.list
       this.shopList.map(res=>{
         res.shopPhone = this.$decrypt(res.shopPhone)
-        res.shopPassword = this.$decrypt(res.shopPassword)
+        // res.shopPassword = this.$decrypt(res.shopPassword)
         res.idCardNum = this.$decrypt(res.idCardNum)
         res.emailAddress = this.$decrypt(res.emailAddress)
         res.shopAdress = this.$decrypt(res.shopAdress)
diff --git a/yanshouban/src/views/customer/icManagement/index.vue b/yanshouban/src/views/customer/icManagement/index.vue
index 2efdb70..bf0cba3 100644
--- a/yanshouban/src/views/customer/icManagement/index.vue
+++ b/yanshouban/src/views/customer/icManagement/index.vue
@@ -507,6 +507,14 @@
         const res = await icManAll(this.pageindex);
         this.tableData = res.data.content
         this.total = res.data.content.length
+        this.tableData.map(res=>{
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+          res.contactName = this.$decrypt(res.contactName)
+          res.contactPhone = this.$decrypt(res.contactPhone)
+        })
       },
       // 编辑确认
       async msgeditS() {
@@ -610,6 +618,14 @@
         const res = await icManAll(this.formSel)
         this.tableData = res.data.content
         this.total = res.data.content.length
+        this.tableData.map(res=>{
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+          res.contactName = this.$decrypt(res.contactName)
+          res.contactPhone = this.$decrypt(res.contactPhone)
+        })
       },
 
       // 详情点击
diff --git a/yanshouban/src/views/customer/icReview/index.vue b/yanshouban/src/views/customer/icReview/index.vue
index e28f717..137fcc4 100644
--- a/yanshouban/src/views/customer/icReview/index.vue
+++ b/yanshouban/src/views/customer/icReview/index.vue
@@ -821,6 +821,14 @@ export default {
  const res = await icManAll(this.pageindex)
  this.tableData = res.data.content
    this.total = res.data.content.length
+   this.tableData.map(res=>{
+     res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+     res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+     res.address = this.$decrypt(res.address)
+     res.emailAddress = this.$decrypt(res.emailAddress)
+     res.contactName = this.$decrypt(res.contactName)
+     res.contactPhone = this.$decrypt(res.contactPhone)
+   })
     },
 
     bianjilist(item) {
@@ -835,7 +843,16 @@ export default {
      const res =  await icManAll(this.formSel)
        this.tableData = res.data.content
          this.total = res.data.content.length
+         this.tableData.map(res=>{
+           res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+           res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+           res.address = this.$decrypt(res.address)
+           res.emailAddress = this.$decrypt(res.emailAddress)
+           res.contactName = this.$decrypt(res.contactName)
+           res.contactPhone = this.$decrypt(res.contactPhone)
+         })
     },
+
     // 详情点击
    async handleEditForm(item) {
           this.secondData = item;
diff --git a/yanshouban/src/views/customer/rUser/index.vue b/yanshouban/src/views/customer/rUser/index.vue
index 45295b0..f483340 100644
--- a/yanshouban/src/views/customer/rUser/index.vue
+++ b/yanshouban/src/views/customer/rUser/index.vue
@@ -335,7 +335,6 @@
   } from '@/utils/request'
 
   import {
-    businessListGetAll,
     businessListSave,
     businessListGetById,
     businessListUpdate,
diff --git a/yanshouban/src/views/customer/rsaManagement/index.vue b/yanshouban/src/views/customer/rsaManagement/index.vue
index 932211e..a697dcf 100644
--- a/yanshouban/src/views/customer/rsaManagement/index.vue
+++ b/yanshouban/src/views/customer/rsaManagement/index.vue
@@ -803,6 +803,14 @@
         const res = await rsaManAll(this.pageindex);
         this.tableData = res.data.content;
         this.total = res.data.content.length
+        this.tableData.map(res=>{
+          res.contactPhone = this.$decrypt(res.contactPhone)
+          res.idCardNumber = this.$decrypt(res.idCardNumber)
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+        })
         const ziyuan =  await getAlls(this.pageindex)
          const ggw  = await map1(this.pageindex)
         this.ziyuanData = [...ziyuan.data.content,...ggw.data.content]
@@ -1010,6 +1018,14 @@ async getshen(item){
         const res = await rsaManAll(this.formSel)
         this.tableData = res.data.content
         this.total = res.data.content.length
+        this.tableData.map(res=>{
+          res.contactPhone = this.$decrypt(res.contactPhone)
+          res.idCardNumber = this.$decrypt(res.idCardNumber)
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+        })
       },
       mingClose(){
         this.multipleSelection =[]
diff --git a/yanshouban/src/views/customer/rsaReview/index.vue b/yanshouban/src/views/customer/rsaReview/index.vue
index 7e8588b..f9455c6 100644
--- a/yanshouban/src/views/customer/rsaReview/index.vue
+++ b/yanshouban/src/views/customer/rsaReview/index.vue
@@ -929,6 +929,14 @@ export default {
   const res = await rsaManAll(this.pageindex);
   this.tableData = res.data.content;
   this.total = res.data.content.length
+  this.tableData.map(res=>{
+    res.contactPhone = this.$decrypt(res.contactPhone)
+    res.idCardNumber = this.$decrypt(res.idCardNumber)
+    res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+    res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+    res.address = this.$decrypt(res.address)
+    res.emailAddress = this.$decrypt(res.emailAddress)
+  })
     },
     // 查询
     async onSubmit() {
@@ -936,6 +944,14 @@ export default {
         const res = await rsaManAll(this.formSel)
         this.tableData = res.data.content
         this.total = res.data.content.length
+        this.tableData.map(res=>{
+          res.contactPhone = this.$decrypt(res.contactPhone)
+          res.idCardNumber = this.$decrypt(res.idCardNumber)
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+        })
 
     },
 
diff --git a/yanshouban/src/views/customer/yixiang/index.vue b/yanshouban/src/views/customer/yixiang/index.vue
new file mode 100644
index 0000000..6151119
--- /dev/null
+++ b/yanshouban/src/views/customer/yixiang/index.vue
@@ -0,0 +1,1421 @@
+<template>
+  <div style="background-color:#f7f7f7;padding:10px 10px;">
+    <div class="zhuti">
+      <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">
+          <el-form :inline="true" :model="formSel">
+            <el-form-item label="意向客户名称">
+              <el-input v-model="formSel.intentCustomerName" placeholder="请输入" class="moren" style="width:168px" />
+            </el-form-item>
+            <el-form-item label="意向资源名称">
+              <el-input v-model="formSel.intentionalStoreName" placeholder="请输入" class="moren" style="width:168px" />
+            </el-form-item>
+            <!-- <el-form-item label="编号">
+              <el-input v-model="formSel.id" placeholder="请输入" class="moren" style="width:168px" />
+            </el-form-item> -->
+            <el-form-item label="意向资源类型">
+              <el-select v-model="formSel.intentionalBusinessType" placeholder="请选择" style="width:168px">
+                <el-option label="商铺" value="商铺" />
+                <el-option label="广告位" value="广告位" />
+                <el-option label="场地" value="场地" />
+              </el-select>
+            </el-form-item>
+
+
+          </el-form>
+          <div style="width: 15%;">
+            <el-button style="background-color: #3F9B6A;color: #fff" @click="onSubmit">查询
+            </el-button>
+            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+              @click="resetting">重置
+            </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="80">
+            <template slot-scope="scope">
+              {{scope.$index+1}}
+            </template>
+          </el-table-column>
+          <el-table-column label="意向客户名称" prop="intentCustomerName" min-width="150" />
+          <el-table-column label="意向资源名称" prop="intentionalStoreName" min-width="150" />
+          <el-table-column label="编号" prop="id" min-width="150" />
+          <el-table-column label="意向资源类型" prop="intentionalBusinessType" min-width="150" />
+          <el-table-column label="开始日期" prop="businessStartTime" min-width="200" />
+          <el-table-column label="意向租期" prop="leaseTerm" min-width="150" />
+          <el-table-column label="意向租金单价(元/平方)" prop="rent" min-width="250" />
+
+          <el-table-column label="操作" min-width="350">
+            <template slot-scope="scope">
+              <div class="tableBtn greens" @click="handleEditForm(scope.row)">
+                查看
+              </div>
+              <div class="tableBtn greens" @click="bianjilist(scope.row)" >
+                编辑
+              </div>
+              <div class="tableBtn greens" @click="pipei(scope.row)" >
+                一键匹配
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 详情框  :visible.sync="detbox" -->
+        <!-- <div  v-show="detbox" class="dialog_css_Xq " style="padding: 0;width:85%"> -->
+        <el-dialog :visible.sync="detbox" custom-class="tongyong_css" style="padding: 0" width="55%" center
+          :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
+          <div style="
+              background-color: #fafafa;
+              border: 1px solid #eaeaea;
+              height: 42px;
+              width: 100%;
+              padding: 0 20px;
+              line-height: 42px;
+            ">
+            {{edit==true?'详情':'编辑'}}
+          </div>
+          <div style="padding: 0 20px">
+            <div style="
+                display: flex;
+                justify-content: space-between;
+                font-size: 14px;
+                margin-bottom: 20px;
+              ">
+              <el-tabs v-model="card" >
+                <el-tab-pane label="意向信息" name="first">
+                  <el-form ref="form" label-width="150px">
+                    <el-form-item label="租用时段">
+                      <el-date-picker style="width: 100%;" v-model="rentalPeriodTime"
+                       value-format="yyyy-MM-dd" type="datetimerange" range-separator="至"
+                        start-placeholder="开始日期" end-placeholder="结束日期" align="right" :disabled="edit?true:false">
+                      </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="租期">
+                   <el-select v-model="secondData.leaseTerm"  :disabled="edit?true:false">
+                       <el-option label="年" value="年" />
+                       <el-option label="月" value="月" />
+                       <el-option label="日" value="日" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="租金">
+                      <el-input v-model="secondData.rent" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="意向经营类型">
+                      <el-select v-model="secondData.intentionalBusinessType" placeholder="请选择" :disabled="edit?true:false">
+                       <el-option label="商铺" value="商铺" />
+                       <el-option label="场地" value="场地" />
+                       <el-option label="广告位" value="广告位" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="意向区域（如有）">
+                      <el-input v-model="secondData.intendedArea" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="意向商铺位置（如有）">
+                      <el-input v-model="secondData.intentionalStoreLocation" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="意向商铺名称（如有）">
+                      <el-input v-model="secondData.intentionalStoreName" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+
+                  </el-form>
+
+                </el-tab-pane>
+                <el-tab-pane label="主体信息" name="second">
+                  <el-form ref="form" label-width="140px">
+                    <el-form-item label="主体名称">
+                      <el-input v-model="secondData.subjectName" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="统一社会信用代码">
+                      <el-input v-model="secondData.unifiedSocialCreditCode" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="类型">
+                      <el-select v-model="secondData.type" placeholder="请选择" :disabled="edit?true:false">
+                        <el-option label="个人" value="个人" />
+                        <el-option label="企业" value="企业" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="法定代表人">
+                      <el-input v-model="secondData.legalRepresentative" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="经营范围">
+                      <el-input type="textarea" v-model="secondData.businessScope" :rows="4"
+                        :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="注册资本">
+                      <el-input v-model="secondData.registeredCapital" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="成立日期">
+                      <el-input v-model="secondData.establishmentDate" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="住所">
+                      <el-input v-model="secondData.address" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="邮箱地址">
+                      <el-input v-model="secondData.emailAddress" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="营业期限">
+                      <el-date-picker style="width: 100%;" v-model="businessStartTime"
+                       value-format="yyyy-MM-dd" type="datetimerange" range-separator="至"
+                        start-placeholder="开始日期" end-placeholder="结束日期" align="right" :disabled="edit?true:false">
+                      </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="营业执照">
+                      <upimg v-model="secondData.businessLicense" :limit="1" :fileSize="1" :isShowTip="false"
+                        v-if="edit==false"></upimg>
+                      <img :src="secondData.businessLicense" alt="" v-else>
+                    </el-form-item>
+                  </el-form>
+
+                </el-tab-pane>
+
+                <el-tab-pane label="申请人信息" name="there">
+                  <el-form ref="form" label-width="140px">
+                    <el-form-item label="申请人">
+                      <el-input v-model="secondData.intentCustomerName" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系电话">
+                      <el-input v-model="secondData.contactPhone" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="证件类型">
+                      <el-select v-model="ruleForm.idCardType" placeholder="请选择" :disabled="edit?true:false">
+                        <el-option label="身份证" value="身份证" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="身份证号码">
+                      <el-input v-model="secondData.idCardNumber" :disabled="edit?true:false"></el-input>
+                    </el-form-item>
+                    <el-form-item label="身份证有效期">
+                      <el-date-picker style="width: 100%;" v-model="idCardValidStart" value-format="yyyy-MM-dd"
+                        type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                        align="right" :disabled="edit?true:false">
+                      </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="身份证照片(正面)">
+                      <upimg v-model="secondData.idCardPhotoFront" :limit="1" :fileSize="1" :isShowTip="false"
+                        v-if="edit==false"></upimg>
+                      <img :src="secondData.idCardPhotoFront" alt="" v-else style="width:150px;height:150px">
+                    </el-form-item>
+                    <el-form-item label="身份证照片(反面)">
+                      <upimg v-model="secondData.idCardPhotoBack" :limit="1" :fileSize="1" :isShowTip="false"
+                        v-if="edit==false"></upimg>
+                      <img :src="secondData.idCardPhotoBack" alt="" v-else style="width:150px;height:150px">
+                    </el-form-item>
+                    <el-form-item label="是否为法人">
+                      <el-select v-model="ruleForm.isLegalPerson" placeholder="请选择" :disabled="edit?true:false">
+                        <el-option label="否" value="0" />
+                        <el-option label="是" value="1" />
+
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="企业授权书">
+                      <upimg v-model="secondData.enterpriseAuthorization" :limit="1" :fileSize="1" :isShowTip="false"
+                        v-if="edit==false"></upimg>
+                      <img :src="secondData.enterpriseAuthorization" alt="" style="width:150px;height:150px" v-else>
+                    </el-form-item>
+                  </el-form>
+                  <!-- <div style="padding: 0 20px 20px 20px">
+                    <div style="margin-top: 20px;">
+                      <div style="width: 100%;border:1px solid #EAEAEA;">
+                        <div
+                          style="display: flex;flex-wrap: wrap;justify-content: space-between;padding: 10px 10px;width: 100%;border-top:1px solid #EAEAEA;background-color: #FAFAFA;border-right:1px solid #EAEAEA;border-left:1px solid #EAEAEA;">
+                          <div style="line-height: 28px;">意向资源</div>
+                          <div style="" class="leixingSel" v-if="edit == false">
+                            <div class="tableBtn greens" >添加</div>
+
+                          </div>
+                        </div>
+                        <div style="padding:15px">
+                          <el-table :data="selshop"
+                            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                            :border="true" style="width: 100%">
+                            <el-table-column label="序号" prop="id" min-width="6%" />
+                            <el-table-column label="资源名称" prop="shopName" min-width="10%" />
+                            <el-table-column label="资源编号" prop="detailedLocation" min-width="10%" />
+                            <el-table-column label="资源类型" prop="actualUsableArea" min-width="10%" />
+                            <el-table-column label="意向租期" prop="belongingRegion" min-width="10%" />
+                            <el-table-column label="意向租金(元)" prop="belongingDepartment" min-width="10%" />
+                            <el-table-column label="操作" prop="head" min-width="10%">
+                              <template slot-scope="scope" v-if="edit == false">
+                                <div class="tableBtn greens" @click="bianjilist(scope.row)">
+                                  编辑
+                                </div>
+                                <div class="tableBtn greens" @click="delGuan(scope.row)">
+                                  删除
+                                </div>
+                              </template>
+                            </el-table-column>
+                          </el-table>
+                        </div>
+                      </div>
+                    </div>
+
+                  </div>-->
+                </el-tab-pane>
+              </el-tabs>
+            </div>
+
+            <div style="
+                width: 99%;
+                padding: 10px;
+                display: flex;
+                justify-content: flex-end;
+              ">
+              <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                @click="closeFn(1)">取消</el-button>
+              <!--         <el-button
+               style="background-color: #3F9B6A;color: #fff"
+                @click="bianji"
+                v-if="edit"
+                >编辑</el-button
+              > -->
+
+              <el-button style="background-color: #3F9B6A;color: #fff" @click="msgeditS"
+                v-if="edit == false">确定</el-button>
+            </div>
+          </div>
+        </el-dialog>
+        <!-- 一键匹配 -->
+        <el-dialog :visible.sync="pip" custom-class="tongyong_css" style="padding: 0" width="55%" center
+          :close-on-click-modal="false" class="dialog_css_Xq" >
+          <div style="
+              background-color: #fafafa;
+              border: 1px solid #eaeaea;
+              height: 42px;
+              width: 100%;
+              padding: 0 20px;
+              line-height: 42px;
+            ">
+           匹配记录
+          </div>
+          <div style="padding: 0 20px">
+            <div style="
+                display: flex;
+                justify-content: space-between;
+                font-size: 14px;
+
+              ">
+              <el-form ref="form"  :inline="true" :model="pipeiSel" style="padding-top: 10px;">
+                <el-form-item label="意向资源类型">
+                  <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择"  style="width:168px">
+                    <el-option label="商铺" value="sp" />
+                    <el-option label="广告位" value="gg" />
+                    <el-option label="场地" value="cd" />
+                  </el-select>
+
+                </el-form-item>
+                <el-form-item label="租期">
+                  <el-select v-model="pipeiSel.resources.cereRentalPolicies.leaseTerm" style="width:168px"  >
+                      <el-option label="年" value="年" />
+                      <el-option label="月" value="月" />
+                      <el-option label="日" value="日" />
+                     </el-select>
+                </el-form-item>
+                <el-form-item label="租金范围">
+                  <el-select v-model="pipeiSel.resources.cereRentalPolicies.rentalPrice" placeholder="请选择" style="width:168px">
+                    <el-option label="0-10000" value="0-10000" />
+                    <el-option label="10000-20000" value="10000-20000" />
+                    <el-option label="20000-50000" value="20000-50000" />
+                    <el-option label="50000-100000" value="50000-100000" />
+                  </el-select>
+                </el-form-item>
+              </el-form>
+                <div style="
+                    padding-top: 15px;
+                  ">
+                  <el-button style="background-color: #3F9B6A;color: #fff"
+                @click="pipeiBtn"  >查询</el-button>
+                  <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                  @click="pipeiClose"   >重置</el-button>
+                </div>
+            </div>
+            <!-- <div style="margin-bottom:20px;">
+              <el-button style="background-color: #3F9B6A;color: #fff"
+              >导出</el-button>
+            </div> -->
+            <el-table :data="
+                pipData.slice(
+                  (currentPage - 1) * pageSize,
+                  currentPage * pageSize
+                )
+              " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+              <el-table-column label="序号" min-width="80">
+                <template slot-scope="scope">
+                  {{scope.$index+1}}
+                </template>
+              </el-table-column>
+              <el-table-column label="资源名称" prop="intentCustomerName" min-width="150" />
+              <el-table-column label="编号" prop="resourcesId" min-width="150" />
+              <el-table-column label="意向资源类型" prop="shopName" min-width="150" />
+              <el-table-column label="最近释放日期" prop="businessStartTime" min-width="150" />
+              <el-table-column label="最短租期" prop="contactInformation" min-width="150" />
+              <el-table-column label="意向租金单价(元/平方)" prop="contactInformation" min-width="250" />
+              <el-table-column prop="auditStatus" label="资源状态" min-width="150">
+                <template slot-scope="scope">
+
+                </template>
+              </el-table-column>
+
+            </el-table>
+          </div>
+        </el-dialog>
+        <!-- ******************************************************弹框开始****************************************************** -->
+        <!-- 新增弹框 -->
+        <el-dialog :visible.sync="ggXin" custom-class="tongyong_css" style="padding: 0" width="65%" center
+          :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
+          <div style="
+              background-color: #fafafa;
+              border: 1px solid #eaeaea;
+              height: 42px;
+              width: 100%;
+              margin-bottom: 20px;
+              padding: 0 20px;
+              line-height: 42px;
+            ">
+            新增
+          </div>
+          <div class="setup">
+            <el-steps :space="200" :active="stepNum">
+              <el-step title="意向信息" />
+              <el-step title="主体信息" />
+              <el-step title="申请人信息" />
+            </el-steps>
+          </div>
+          <div v-if="stepNum == 0" style="padding: 0 20px 20px 20px">
+            <el-form ref="ruleForm" :model="ruleForm" label-width="150px">
+              <el-form-item label="租用时段" prop="idCardPhotoBack">
+                <el-date-picker v-model="rentalPeriodTime" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd" />
+              </el-form-item>
+              <el-form-item label="租期" prop="leaseTerm">
+                <el-select v-model="ruleForm.leaseTerm" placeholder="请选择" >
+                    <el-option label="年" value="年" />
+                    <el-option label="月" value="月" />
+                    <el-option label="日" value="日" />
+                   </el-select>
+              </el-form-item>
+
+              <el-form-item label="租金" prop="rent">
+                <el-input v-model="ruleForm.rent" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="意向经营类型" prop="intentionalBusinessType">
+                <el-select v-model="ruleForm.intentionalBusinessType" placeholder="请选择" style="width: 100%;">
+                  <el-option label="商铺" value="商铺" />
+                  <el-option label="场地" value="场地" />
+                  <el-option label="广告位" value="广告位" />
+                </el-select>
+              </el-form-item>
+
+<el-form-item label="意向区域(如有)" prop="intendedArea">
+                                <el-input v-model="ruleForm.intendedArea" placeholder="请输入" />
+              </el-form-item>
+<el-form-item label="意向商铺位置(如有)" prop="intentionalStoreLocation">
+                                <el-input v-model="ruleForm.intentionalStoreLocation" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="意向商铺名称(如有)" prop="intentionalStoreName">
+                                              <el-input v-model="ruleForm.intentionalStoreName" placeholder="请输入" />
+                            </el-form-item>
+            </el-form>
+          </div>
+          <div v-if="stepNum == 1" style="padding: 0 20px 20px 20px">
+
+            <el-form ref="ruleForm" :model="ruleForm" label-width="130px">
+              <el-form-item label="主体名称" prop="subjectName">
+                <el-input v-model="ruleForm.subjectName" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
+                <el-input v-model="ruleForm.unifiedSocialCreditCode" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="类型" prop="type">
+                <el-select v-model="ruleForm.type" placeholder="请选择" style="width: 100%;">
+                  <el-option label="个人" value="个人" />
+                  <el-option label="企业" value="企业" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="法定代表人" prop="legalRepresentative">
+                <el-input v-model="ruleForm.legalRepresentative" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="经营范围" prop="businessScope">
+                <el-input type="textarea" v-model="ruleForm.businessScope" :rows="4"></el-input>
+              </el-form-item>
+              <el-form-item label="注册资本" prop="registeredCapital">
+                <el-input v-model="ruleForm.registeredCapital" placeholder="请输入" />
+
+              </el-form-item>
+              <el-form-item label="成立日期" prop="establishmentDate">
+                <el-input v-model="ruleForm.establishmentDate" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="住所" prop="address">
+                <el-input v-model="ruleForm.address" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="邮箱地址" prop="emailAddress">
+                <el-input v-model="ruleForm.emailAddress" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="营业期限" prop="idCardPhotoBack">
+                <el-date-picker v-model="businessStartTime" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd" />
+              </el-form-item>
+              <el-form-item label="营业执照" prop="businessLicense">
+                <upimg v-model="ruleForm.businessLicense" :limit="1" :fileSize="1"></upimg>
+              </el-form-item>
+
+            </el-form>
+          </div>
+          <div v-if="stepNum == 2" style="padding: 0 20px 20px 20px">
+            <el-form ref="ruleForm" :model="ruleForm" label-width="130px">
+              <el-form-item label="申请人" prop="intentCustomerName">
+                <el-input v-model="ruleForm.intentCustomerName" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="联系电话" prop="contactPhone">
+                <el-input v-model="ruleForm.contactPhone" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="证件类型" prop="idCardType">
+                <el-select v-model="ruleForm.idCardType" placeholder="请选择" style="width:100%">
+                  <el-option label="身份证" value="身份证" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="身份证号" prop="idCardNumber">
+                <el-input v-model="ruleForm.idCardNumber" placeholder="请输入" />
+              </el-form-item>
+              <el-form-item label="身份证有效期" prop="idCardNumber">
+                <el-date-picker v-model="idCardValidStart" type="daterange" range-separator="至" start-placeholder="开始时间"
+                  end-placeholder="结束时间" value-format="yyyy-MM-dd" />
+              </el-form-item>
+              <el-form-item label="身份证照片(正面)" prop="idCardPhotoFront">
+                <upimg v-model="ruleForm.idCardPhotoFront" :limit="1" :fileSize="1"></upimg>
+              </el-form-item>
+              <el-form-item label="身份证照片(反面)" prop="idCardPhotoBack">
+                <upimg v-model="ruleForm.idCardPhotoBack" :limit="1" :fileSize="1"></upimg>
+              </el-form-item>
+              <el-form-item label="是否为法人" prop="isLegalPerson">
+                <el-select v-model="ruleForm.isLegalPerson" placeholder="请选择" style="width:100%">
+                  <el-option label="否" value="0" />
+                  <el-option label="是" value="1" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="企业授权书" prop="enterpriseAuthorization">
+                <upimg v-model="ruleForm.enterpriseAuthorization" :limit="1" :fileSize="1"></upimg>
+              </el-form-item>
+            </el-form>
+            <!-- <div style="margin-top: 20px;">
+              <div style="width: 100%;border:1px solid #EAEAEA;">
+                <div
+                  style="display: flex;flex-wrap: wrap;justify-content: space-between;padding: 10px 10px;width: 100%;border-top:1px solid #EAEAEA;background-color: #FAFAFA;border-right:1px solid #EAEAEA;border-left:1px solid #EAEAEA;">
+                  <div style="line-height: 28px;">意向资源</div>
+                  <div style="" class="leixingSel">
+                    <div class="tableBtn greens" @click="addMing=true">添加</div>
+                  </div>
+                </div>
+                <div style="padding:15px">
+                  <el-table :data="selshop"
+                    :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                    :border="true" style="width: 100%">
+                    <el-table-column label="序号" prop="id" min-width="6%" />
+                    <el-table-column label="资源名称" prop="shopName" min-width="10%" />
+                    <el-table-column label="资源编号" prop="detailedLocation" min-width="10%" />
+                    <el-table-column label="资源类型" prop="actualUsableArea" min-width="10%" />
+                    <el-table-column label="意向租期" prop="belongingRegion" min-width="10%" />
+                    <el-table-column label="意向租金(元)" prop="belongingDepartment" min-width="10%" />
+                    <el-table-column label="操作" prop="head" min-width="10%">
+                      <template slot-scope="scope">
+                        <div class="tableBtn greens" @click="bianjilist(scope.row)">
+                          编辑
+                        </div>
+                        <div class="tableBtn greens" @click="delGuan(scope.row)">
+                          删除
+                        </div>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </div>
+              </div>
+            </div>-->
+
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+              @click="closeFn(2)">取 消</el-button>
+            <el-button v-if="stepNum != 2" style="background-color: #3F9B6A;color: #fff"
+              @click="lextStep(1)">下一步</el-button>
+            <el-button v-if="stepNum != 0" style="background-color: #3F9B6A;color: #fff"
+              @click="lextStep(0)">上一步</el-button>
+            <el-button v-if="stepNum == 2" style="background-color: #3F9B6A;color: #fff" @click="addCheck('ruleForm')">确
+              定</el-button>
+          </span>
+
+          <!-- <el-dialog :visible.sync="addMing" custom-class='XDD_css' style="padding: 0;" width="50%"
+            append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+            <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+              <div>添加</div>
+            </div>
+            <div style="padding: 15px;width:100%">
+              <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>选择资源</div>
+                </div>
+                <div style="padding: 15px;">
+                  <div style="padding: 0px 20px 0px 0px">
+                    <el-table :data="ziyuanData"
+                    @selection-change="handleSelectionChange" tooltip-effect="dark"
+                      :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="序号"  min-width="8%" >
+                        <template slot-scope="scope">
+                          {{scope.$index + 1}}
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="编号" prop="id" min-width="22%">
+
+                      </el-table-column>
+                      <el-table-column label="资源名称"  min-width="15%">
+                      <template slot-scope="scope">
+                        {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName}}
+                      </template>
+                      </el-table-column>
+                      <el-table-column label="资源类型" min-width="15%">
+                        <template slot-scope="scope">
+                          {{scope.row.advertisingType ?scope.row.advertisingType:'商铺'}}
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="notes" label="对应策略" min-width="15%">
+                      </el-table-column>
+                    </el-table>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
+              <el-button  @click="mingClose" class="buttonHover"
+                    style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
+              </el-button>
+              <el-button  @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
+              </el-button>
+
+            </div>
+          </el-dialog> -->
+        </el-dialog>
+        <div class="fenye">
+          <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
+            layout="prev, pager, next,total" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    uploadUrl,
+    token
+  } from '@/utils/request'
+  import {
+    rsaManAll,
+    rsaManAdd,
+    rsaManEdit,
+    rsaManDel,
+    ziyuanduiy,
+  } from '../../../api/rsaManagement'
+  import {
+   getAlls
+  } from '../../../api/information.js'
+  import {
+    getAlls as map1
+  } from '../../../api/map1'
+  import upimg from "@/components/ImageUpload/index"
+  export default {
+    components: {
+      upimg
+    },
+
+    data() {
+      return {
+        detbox: false, // 详情
+        edit: true, // 编辑
+        addMing: false,//资源
+        selshop: [], //意向资源列表
+        action: uploadUrl, // 上传图片
+        myHeaders: {
+          'Authorization-admin': token
+        },
+        ggXin: false, // 新增
+        sel: [], // 选择资源
+        stepNum: 0, // 切换
+        linShop: [], // 临铺列表
+        isAdd: false, //添加铺位弹框
+        formSel: {
+         intentCustomerName:'',
+         region:'',
+         id:'',
+          auditStatus:'',
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        ruleForm: {
+          intentCustomerName: '', //意向客户名称
+          contactPhone: '', //联系电话
+          entityType: '', //主体类型
+          customerLevel: '', //客户级别
+          isLegalPerson: '', //是否为法人(0:否,1:是)
+          enterpriseAuthorization: '', //企业授权书
+          idCardNumber: '', //身份证号
+          idCardType: '', //证件类型
+          idCardValidStart: '', //身份证有效开始时间
+          idCardValidEnd: '', //身份证有效结束时间
+          idCardPhotoFront: '', //身份证照片(正面)
+          idCardPhotoBack: '', //身份证照片(反面)
+          subjectName: '', //主体名称
+          unifiedSocialCreditCode: '', //统一社会信用代码
+          type: '', //类型(可能是企业类型等)
+          legalRepresentative: '', //法定代表人
+          businessScope: '', //经营范围
+          registeredCapital: '', //注册资本
+          establishmentDate: '', //成立日期
+          address: '', //住所
+          emailAddress: '', //邮箱地址
+          businessStartTime: '', //营业开始时间(如果为全天，则可为NULL或指定默认时
+          businessEndTime: '', //营业结束时间(如果为全天，则可为NULL或指定默认时
+          businessLicense: '', //营业执照(存储路径或URL)
+          intendedResources: '', //意向资源
+          auditStatus:'1',
+          rentalPeriodStartTime:'',
+          rentalPeriodEndTime:'',
+          leaseTerm:'',
+          rent:'',
+          intentionalBusinessType:'',
+          intendedArea:'',
+          intentionalStoreLocation:'',
+          intentionalStoreName:'',
+        },
+        idCardValidStart: [],
+        businessStartTime: [],
+        rentalPeriodTime:[],
+        card: 'first', // 切换
+        secondData: {},
+        currentPage: 1,
+        total: 10,
+        flag: false,
+        pageSize: 10,
+        tableData: [],
+        msgid: '',
+        pageindex: {
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        ziyuanData:[],
+        multipleSelection:[],
+        pip:false,
+        pipData:[],
+        pipeiSel:{
+        resources:{
+                  cereRentalPolicies:{
+                      businessType:'',
+                      leaseTerm:'',
+                      rentalPrice:''
+                  }
+              },
+          pageNumber:1,
+          pageSize:10,
+        }
+      }
+    },
+
+    created() {
+      this.getAll();
+    },
+    mounted() {},
+    // beforeDestroy() {
+    //   const editor = this.editor
+    //   if (editor == null) return
+    //   editor.destroy() // 组件销毁时，及时销毁编辑器
+    // },
+    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) {
+        if (val == 0) {
+          this.stepNum = this.stepNum - 1;
+        } else {
+          this.stepNum = this.stepNum + 1;
+        }
+      },
+      // 查询全数据
+      async getAll() {
+        const res = await rsaManAll(this.pageindex);
+        this.tableData = res.data.content;
+        this.total = res.data.content.length
+        this.tableData.map(res=>{
+          res.contactPhone = this.$decrypt(res.contactPhone)
+          res.idCardNumber = this.$decrypt(res.idCardNumber)
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+        })
+        const ziyuan =  await getAlls(this.pageindex)
+         const ggw  = await map1(this.pageindex)
+        this.ziyuanData = [...ziyuan.data.content,...ggw.data.content]
+      },
+      // 编辑确认
+      async msgeditS() {
+        this.secondData.id = this.msgid
+        if (this.idCardValidStart.length != 0) {
+          this.secondData.idCardValidStart = this.idCardValidStart[0]
+          this.secondData.idCardValidEnd = this.idCardValidStart[1]
+        }
+        if (this.businessStartTime.length != 0) {
+          this.secondData.businessStartTime = this.businessStartTime[0]
+          this.secondData.businessEndTime = this.businessStartTime[1]
+        }
+        if (this.rentalPeriodTime.length != 0) {
+           this.secondData.rentalPeriodStartTime = this.rentalPeriodTime[0]
+           this.secondData.rentalPeriodEndTime = this.rentalPeriodTime[1]
+         }
+
+        const res = await rsaManEdit(this.secondData)
+        this.detbox = false;
+        this.getAll();
+      },
+      bianji() {
+        if (this.edit) {
+          this.edit = false;
+        }
+
+      },
+      // 编辑
+      bianjilist(item) {
+        this.secondData = item
+       this.$set(this.idCardValidStart, 0, item.idCardValidStart)
+       this.$set(this.idCardValidStart, 1, item.idCardValidEnd)
+       this.$set(this.businessStartTime, 0, item.businessStartTime)
+       this.$set(this.businessStartTime, 1, item.businessEndTime)
+       this.$set(this.rentalPeriodTime, 0, item.rentalPeriodStartTime)
+       this.$set(this.rentalPeriodTime, 1, item.rentalPeriodEndTime)
+        this.msgid = item.id;
+        this.detbox = true
+        if (this.edit) {
+          this.edit = false;
+        }
+      },
+      async chehui(item){
+        await rsaManEdit({id:item.id,auditStatus:'1'})
+        this.getAll()
+      },
+async getshen(item){
+  await rsaManEdit({id:item.id,auditStatus:'2'})
+  this.getAll()
+},
+
+
+      // 详情点击
+       handleEditForm(item) {
+         console.log(item.rentalPeriodEndTime)
+        this.secondData = item
+      this.$set(this.idCardValidStart, 0, item.idCardValidStart)
+      this.$set(this.idCardValidStart, 1, item.idCardValidEnd)
+      this.$set(this.businessStartTime, 0, item.businessStartTime)
+      this.$set(this.businessStartTime, 1, item.businessEndTime)
+      this.$set(this.rentalPeriodTime, 0, item.rentalPeriodStartTime)
+      this.$set(this.rentalPeriodTime, 1, item.rentalPeriodEndTime)
+        this.card = 'first'
+        this.detbox = true;
+        this.msgid = item.id;
+      },
+      // 新增
+      addbuss() {
+        this.ruleForm = {
+            intentCustomerName: '', //意向客户名称
+            contactPhone: '', //联系电话
+            entityType: '', //主体类型
+            customerLevel: '', //客户级别
+            isLegalPerson: '', //是否为法人(0:否,1:是)
+            enterpriseAuthorization: '', //企业授权书
+            idCardNumber: '', //身份证号
+            idCardType: '', //证件类型
+            idCardValidStart: '', //身份证有效开始时间
+            idCardValidEnd: '', //身份证有效结束时间
+            idCardPhotoFront: '', //身份证照片(正面)
+            idCardPhotoBack: '', //身份证照片(反面)
+            subjectName: '', //主体名称
+            unifiedSocialCreditCode: '', //统一社会信用代码
+            type: '', //类型(可能是企业类型等)
+            legalRepresentative: '', //法定代表人
+            businessScope: '', //经营范围
+            registeredCapital: '', //注册资本
+            establishmentDate: '', //成立日期
+            address: '', //住所
+            emailAddress: '', //邮箱地址
+            businessStartTime: '', //营业开始时间(如果为全天，则可为NULL或指定默认时
+            businessEndTime: '', //营业结束时间(如果为全天，则可为NULL或指定默认时
+            businessLicense: '', //营业执照(存储路径或URL)
+            intendedResources: '', //意向资源
+            auditStatus:'1',
+            rentalPeriodStartTime:'',
+            rentalPeriodEndTime:'',
+            leaseTerm:'',
+            rent:'',
+            intentionalBusinessType:'',
+            intendedArea:'',
+            intentionalStoreLocation:'',
+            intentionalStoreName:'',
+
+        }
+        this.rentalPeriodTime = []
+        this.ggXin = true;
+        this.getAll();
+      },
+      // 新增确定
+      async addCheck() {
+        if (this.idCardValidStart.length != 0) {
+          this.ruleForm.idCardValidStart = this.idCardValidStart[0]
+          this.ruleForm.idCardValidEnd = this.idCardValidStart[1]
+        }
+        if (this.businessStartTime.length != 0) {
+          this.ruleForm.businessStartTime = this.businessStartTime[0]
+          this.ruleForm.businessEndTime = this.businessStartTime[1]
+        }
+        if (this.rentalPeriodTime.length != 0) {
+          this.ruleForm.rentalPeriodStartTime = this.rentalPeriodTime[0]
+          this.ruleForm.rentalPeriodEndTime = this.rentalPeriodTime[1]
+        }
+
+       if(this.ziyuanData.length !=0){
+         this.ruleForm.intendedResources = this.ziyuanData[0].id
+       }
+        await rsaManAdd(this.ruleForm)
+        this.idCardValidStart = []
+        this.businessStartTime = []
+        this.rentalPeriodTime = []
+        this.getAll();
+        this.stepNum = 0;
+        this.ggXin = false;
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val;
+      },
+      handleSizeChange(val) {
+        this.pageSize = val;
+      },
+      // 取消
+      closeFn(val) {
+        if (val == 1) {
+          this.detbox = false;
+          this.edit = true;
+        } else {
+          this.ggXin = false;
+          this.stepNum = 0;
+        }
+      },
+      //删除管理列表
+      async delGuan(item) {
+        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') {
+              rsaManDel({
+                id: item.id
+              }).then(res => {
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
+        })
+
+      },
+
+      handlePreview(file) {
+        console.log(file);
+      },
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+
+      // 重置按钮
+      resetting() {
+        this.formSel = {
+         intentCustomerName:'',
+         region:'',
+         id:'',
+          auditStatus:'',
+          pageNumber: 1,
+          pageSize: 10,
+        };
+        this.getAll()
+      },
+      // 查询
+      async onSubmit() {
+        const res = await rsaManAll(this.formSel)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+        this.tableData.map(res=>{
+          res.contactPhone = this.$decrypt(res.contactPhone)
+          res.idCardNumber = this.$decrypt(res.idCardNumber)
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+        })
+      },
+      mingClose(){
+        this.multipleSelection =[]
+        this.addMing = false
+
+      },
+      minSev() {
+        this.selshop = this.multipleSelection
+        this.addMing = false
+        this.multipleSelection =[]
+      },
+      pipei(item){
+        this.pip = true
+        this.pipData = []
+      },
+      pipeiBtn(){
+        if(this.pipeiSel.resources.cereRentalPolicies.businessType == 'sp'){
+          this.pipeiSel.resourcesId = 'sp'
+        }else if(this.pipeiSel.resources.cereRentalPolicies.businessType == 'cd'){
+           this.pipeiSel.resourcesId = 'cd'
+        }else{
+           this.pipeiSel.resourcesId = 'gg'
+        }
+        ziyuanduiy(this.pipeiSel).then(res=>{
+          this.pipData = res.data.content
+        })
+      },
+      pipeiClose(){
+        this.pipeiSel ={
+        resources:{
+                  cereRentalPolicies:{
+                      businessType:'',
+                      leaseTerm:'',
+                      rentalPrice:''
+                  }
+              },
+           resourcesId:'',
+          pageNumber:1,
+          pageSize:10,
+        },
+        this.pipData = []
+      },
+    }
+  }
+</script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
+<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;
+  }
+
+  .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;
+  }
+
+  /deep/.el-dialog__title {
+    color: #000;
+  }
+
+  .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 .el-upload:hover {
+    border-color: #409eff;
+  }
+
+  .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 .el-dialog__wrapper {
+    .dialog_css {
+      margin-right: 12px;
+      margin-top: 61px !important;
+
+      .el-dialog__title {
+        font-size: 16px !important;
+        font-weight: 600;
+        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/yanshouban/src/views/detect/admap.vue b/yanshouban/src/views/detect/admap.vue
index 360ef83..d6ae36d 100644
--- a/yanshouban/src/views/detect/admap.vue
+++ b/yanshouban/src/views/detect/admap.vue
@@ -51,14 +51,20 @@
             </el-button>
           </div>
         </div>
-        <div style="margin-bottom:20px;"><el-button @click="addbuss"
+        <div style="margin-bottom: 20px;display:flex;">
+          <el-button @click="addbuss"
             style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
             icon="el-icon-circle-plus-outline">新增</el-button>
-      <!--      <el-button
-                style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
-              @click="daoru"
-              >导入</el-button
-            > -->
+        <el-upload class="upload-demo" ref="upload"
+                          :limit="1"
+                          accept=".xlsx"
+                          :action="uploadFileUrl"
+                          :on-success="daoru"
+                          :file-list="daoData"
+                           :auto-upload="true"
+                           :show-file-list="false">
+                          <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover">导入</el-button>
+                        </el-upload>
             </div>
         <!-- 地图 -->
         <div style="display: flex;justify-content: space-between;margin-bottom: 20px;">
@@ -136,6 +142,10 @@
                 </el-table-column>
                 <el-table-column prop="detailedLocation" label="详细地址" min-width="300">
                 </el-table-column>
+                <el-table-column label="商户名称" prop="actualUsableArea" min-width="150">
+                </el-table-column>
+                <el-table-column label="商户电话" prop="belongingDepartment" min-width="150">
+                </el-table-column>
                 <el-table-column label="实际使用面积" prop="actualUsableArea" min-width="150">
                 </el-table-column>
                 <el-table-column label="归属部门" prop="belongingDepartment" min-width="150">
@@ -1511,6 +1521,7 @@
     changadd,
     changedit,
     changDel,
+
   } from '../../api/information'
   import {
     getAlls as getAllMap,
@@ -1765,6 +1776,7 @@
         mapData: {},
 fileData:[],
 uploadFileUrl: uploadUrl, // 请求地址
+daoData:[]
       }
 
 
@@ -2266,6 +2278,14 @@ uploadFileUrl: uploadUrl, // 请求地址
         // 将文件地址存储在 uploadedFiles 数组中
         this.fileData.push(fileMsg);
       },
+     daoru(response, file, fileList){
+       this.daoData.push(file.raw)
+       const formDate = new FormData()
+       formDate.append('file', this.daoData[0])
+       excelAdd(formDate).then(res => {
+          this.getAll()
+       })
+        },
     }
   }
 </script>
diff --git a/yanshouban/src/views/detect/analyse.vue b/yanshouban/src/views/detect/analyse.vue
index 85a4f4c..dbd51d9 100644
--- a/yanshouban/src/views/detect/analyse.vue
+++ b/yanshouban/src/views/detect/analyse.vue
@@ -5,32 +5,26 @@
         <div style="color:#0006"> <span>招商资源监测</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">统计分析</span></div>
       </div>
+    <div style="display:flex;justify-content: space-between">
+      <div style="display:flex;">
+        <!-- <div style="margin-right: 10px;line-height:35px;">商铺/广告位资源统计</div> -->
+        <el-date-picker v-model="FormTime"  value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期"
+          end-placeholder="结束日期" style="width: 200px;margin-right: 10px;ma" prefix-icon="none">
+        </el-date-picker>
+        <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
+        </el-button>
+        <el-button @click="resetting" class="buttonHover"
+          style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
+        </el-button>
+      </div>
+      <div>
+        <el-button @click="gitOut" style="background-color: #3F9B6A;color: #fff">导出
+        </el-button>
+      </div>
+    </div>
+    <div ref="tubiao">
       <div style="width: 100%;margin-bottom:30px;">
-        <div style="display:flex;justify-content: space-between">
-          <div style="display:flex;">
-            <div style="margin-right: 10px;line-height:35px;">商铺/广告位资源统计</div>
-    <!--        <el-select v-model="formSel.createDate" placeholder="所属区域" style="width: 150px;margin-right: 10px">
-              <el-option label="1" value="1" />
-              <el-option label="2" value="2" />
-            </el-select>
-            <el-select v-model="formSel.createDate" placeholder="经营类型" style="width: 150px;margin-right: 10px">
-              <el-option label="1" value="1" />
-              <el-option label="2" value="2" />
-            </el-select> -->
-            <el-date-picker v-model="FormTime"  value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期"
-              end-placeholder="结束日期" style="width: 200px;margin-right: 10px;ma" prefix-icon="none">
-            </el-date-picker>
-            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
-            </el-button>
-            <el-button @click="resetting" class="buttonHover"
-              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
-            </el-button>
-          </div>
-          <!-- <div>
-            <el-button @click="gitOut" style="background-color: #3F9B6A;color: #fff">导出
-            </el-button>
-          </div> -->
-        </div>
+
         <div style="display:flex;margin-top:10px;">
           <div style="width:48%;height: 400px;marigin-right:20px;">
             <div style="display: flex;justify-content: space-between;">
@@ -264,6 +258,59 @@
           </div>
         </div>
       </div> -->
+<div style="width: 100%;margin-bottom:20px;">
+        <div style="display:flex;justify-content: space-between">
+          <div style="display:flex;">
+            <div style="margin-right: 10px;line-height:35px;">合同情况统计</div>
+            <!-- <el-select v-model="formSel.createDate" placeholder="所属区域" style="width: 150px;margin-right: 10px">
+              <el-option label="1" value="1" />
+              <el-option label="2" value="2" />
+            </el-select>
+            <el-select v-model="formSel.createDate" placeholder="经营类型" style="width: 150px;margin-right: 10px">
+              <el-option label="1" value="1" />
+              <el-option label="2" value="2" />
+            </el-select>
+            <el-date-picker v-model="value1" type="datetimerange" range-separator="-" start-placeholder="开始日期"
+              end-placeholder="结束日期" style="width: 200px;margin-right: 10px;ma" prefix-icon="none">
+            </el-date-picker>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
+            </el-button> -->
+          </div>
+          <!-- <div>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">导出
+            </el-button>
+          </div> -->
+        </div>
+        <div style="display:flex;margin-top:10px;">
+          <div style="width:48%;height: 400px;marigin-right:20px;">
+            <div style="display: flex;justify-content: space-between;">
+              <div style="line-height:35px;">商铺/广告位整体经营统计</div>
+              <!-- <div>
+                <el-select v-model="formSel.createDate" placeholder="类型" style="width: 100px;margin-right: 10px">
+                  <el-option label="1" value="1" />
+                  <el-option label="2" value="2" />
+                </el-select>
+              </div> -->
+            </div>
+            <div ref="shopJing" style="width:100%;height: 400px;"></div>
+          </div>
+          <div style="width:48%;height: 400px;marigin-right:20px;">
+            <div style="display: flex;justify-content: space-between;">
+              <div style="line-height:35px;">出租、退租、续租统计</div>
+              <!-- <div>
+                <el-select v-model="formSel.createDate" placeholder="类型" style="width: 100px;margin-right: 10px">
+                  <el-option label="1" value="1" />
+                  <el-option label="2" value="2" />
+                </el-select>
+              </div> -->
+            </div>
+            <div ref="tuiTong" style="width:100%;height: 400px;"></div>
+          </div>
+        </div>
+      </div>
 
       <div style="width: 100%;margin-bottom:20px;">
         <div style="display:flex;justify-content: space-between">
@@ -306,7 +353,7 @@
           </div>
           <div style="width:48%;height: 400px;marigin-right:20px;">
             <div style="display: flex;justify-content: space-between;">
-              <div style="line-height:35px;">签约数量占比</div>
+              <div style="line-height:35px;">合同签约数量占比</div>
               <!-- <div>
                 <el-select v-model="formSel.createDate" placeholder="类型" style="width: 100px;margin-right: 10px">
                   <el-option label="1" value="1" />
@@ -318,7 +365,20 @@
           </div>
         </div>
       </div>
+      <div style="width: 100%;margin-bottom:20px;">
+        <div style="display:flex;justify-content: space-between">
+        </div>
+        <div style="display:flex;margin-top:10px;">
+          <div style="width:48%;height: 400px;marigin-right:20px;">
+            <div style="display: flex;justify-content: space-between;">
+              <div style="line-height:35px;">合同信息统计分析</div>
+            </div>
+            <div ref="hetong" style="width:100%;height: 400px;"></div>
+          </div>
 
+        </div>
+      </div>
+    </div>
     </div>
 
   </div>
@@ -329,6 +389,8 @@
     statistical,
   } from '@/api/information'
   import * as echarts from 'echarts'
+  import html2canvas from 'html2canvas'
+  import jsPDF from 'jspdf'
   export default {
     name: 'atmosphereGl',
     data() {
@@ -341,8 +403,8 @@
         tableData: [],
         FormTime:[],
         pageindex: {
-           startTime: "1990-09-11",
-             endTime: "2024-11-09"
+           startTime: "",
+             endTime: ""
         },
         formSel: {
 
@@ -351,26 +413,83 @@
     },
     computed: {},
     created() {
-      this.getAll()
+
 
     },
     mounted() {
-
-      // this.charDam1()
-      // this.charDam2()
-      // this.charDam3()
-      // this.charDam4()
-      // this.charDam5()
-
-      // this.charDam7()
-
-      // this.charDam9()
+      this.getAll()
     },
     methods: {
+
       charDam(datas) {
+
         let Dom = this.$refs.shop2TJ
         let myChart = echarts.init(Dom)
         let processedData = datas.map(item => ({
+          name: item.shopName,
+          value: item.price
+        }))
+        let option = {
+          legend: {},
+          tooltip: {},
+          xAxis: {
+            type: 'category',
+              data:processedData.map(item => item.name),
+              axisLabel: {
+                         //x轴文字的配置
+                                   show: true,
+                                   interval: 0,//使x轴文字显示全
+                                   textStyle: {
+                                     color: "#000000"
+                                   },
+                                   formatter: function(params) {
+                                     var newParamsName = "";
+                                     var paramsNameNumber = params.length;
+                                     var provideNumber = 4; //一行显示几个字
+                                     var rowNumber = Math.ceil(paramsNameNumber / provideNumber);
+                                     if (paramsNameNumber > provideNumber) {
+                                       for (var p = 0; p < rowNumber; p++) {
+                                         var tempStr = "";
+                                         var start = p * provideNumber;
+                                         var end = start + provideNumber;
+                                         if (p == rowNumber - 1) {
+                                           tempStr = params.substring(start, paramsNameNumber);
+                                         } else {
+                                           tempStr = params.substring(start, end) + "\n";
+                                         }
+                                         newParamsName += tempStr;
+                                       }
+                                     } else {
+                                       newParamsName = params;
+                                     }
+                                     return newParamsName;
+                                   }
+                                 }
+
+          },
+          yAxis: {
+            type: 'value',
+          },
+          grid: {
+            left: '1%',
+            right: '1%',
+            top: '5%',
+            bottom: '6%',
+            containLabel: true
+          },
+          series: [{
+            type: 'bar',
+            color: '#3f9b6a',
+            data: processedData.map(item => item.value),
+          }
+          ]
+        };
+        option && myChart.setOption(option);
+      },
+      hetongDam(datas) {
+        let Dom = this.$refs.hetong
+        let myChart = echarts.init(Dom)
+        let processedData = datas.map(item => ({
           name: item.trendDate,
           value: item.trendQuantity
         }))
@@ -380,6 +499,9 @@
           xAxis: {
             type: 'category',
               data:processedData.map(item => item.name),
+              axisLabel: {
+             interval: 0,//使x轴文字显示全
+              }
           },
           yAxis: {
             type: 'value',
@@ -405,9 +527,10 @@
         let myChart = echarts.init(Dom);
 
         let processedData = datas.map(item => ({
-          name: item.trendDate || '11',
+          name: item.trendDate,
           value: item.trendQuantity
         }))
+         console.log(processedData)
         processedData.push({name:'',value:0})
         let option = {
           xAxis: {
@@ -484,106 +607,70 @@
       },
       charDam3(datas) {
         let Dom = this.$refs.shop1TJ
-        let myChart = echarts.init(Dom);
+         let myChart = echarts.init(Dom)
+         let processedData = datas.map(item => ({
+           name: item.location,
+           value: item.trendQuantity
+         }))
+         let option = {
+           legend: {},
+           tooltip: {},
+           xAxis: {
+             type: 'category',
+               data:processedData.map(item => item.name),
+                axisLabel: {
+                           //x轴文字的配置
+                                     show: true,
+                                     interval: 0,//使x轴文字显示全
+                                     textStyle: {
+                                       color: "#000000"
+                                     },
+                                     formatter: function(params) {
+                                       var newParamsName = "";
+                                       var paramsNameNumber = params.length;
+                                       var provideNumber = 4; //一行显示几个字
+                                       var rowNumber = Math.ceil(paramsNameNumber / provideNumber);
+                                       if (paramsNameNumber > provideNumber) {
+                                         for (var p = 0; p < rowNumber; p++) {
+                                           var tempStr = "";
+                                           var start = p * provideNumber;
+                                           var end = start + provideNumber;
+                                           if (p == rowNumber - 1) {
+                                             tempStr = params.substring(start, paramsNameNumber);
+                                           } else {
+                                             tempStr = params.substring(start, end) + "\n";
+                                           }
+                                           newParamsName += tempStr;
+                                         }
+                                       } else {
+                                         newParamsName = params;
+                                       }
+                                       return newParamsName;
+                                     }
+                                   }
+
+           },
+           yAxis: {
+             type: 'value',
+           },
+           // grid: {
+           //   left: '1%',
+           //   right: '1%',
+           //   top: '5%',
+           //   bottom: '6%',
+           //   containLabel: true
+           // },
+           series: [{
+             type: 'bar',
+             color: '#3f9b6a',
+             data: processedData.map(item => item.value),
+           }
+           ]
+         };
+         option && myChart.setOption(option);
+
 
-        let processedData = datas.map(item => ({
-          // name: item.trendDate || '11',
-          value: item.trendQuantity
-        }))
-        let option = {
-          legend: {},
-          tooltip: {},
-       xAxis: {
-         type: 'category',
-         data: ['商铺','场地','广告位'],
-       },
-          yAxis: {
-            type: 'value',
-            max: 50
-          },
-          grid: {
-            left: '1%',
-            right: '1%',
-            top: '5%',
-            bottom: '6%',
-            containLabel: true
-          },
-          series: [{
-            type: 'bar',
-            color: '#3f9b6a',
-            data: processedData.map(item => item.value),
-            type: 'line'
-          },
-          ]
-        };
-        option && myChart.setOption(option);
       },
-      // charDam4() {
-      //   let Dom = this.$refs.shop4ZX
-      //   let myChart = echarts.init(Dom);
-      //   let option = {
-      //     xAxis: {
-      //       type: 'category',
-      //       data: ['2024-07', '2024-08', '2024-09', '2024-10', '2024-11', '2024-12', '2024-13']
-      //     },
-      //     yAxis: {
-      //       type: 'value'
-      //     },
-      //     grid: {
-      //       left: '1%',
-      //       right: '1%',
-      //       top: '5%',
-      //       bottom: '6%',
-      //       containLabel: true
-      //     },
-      //     series: [{ // 设置线条颜色
-      //       lineStyle: {
-      //         color: '#3f9b6a', // 这里设置为红色
-      //         width: 2, // 线条宽度
-      //       },
-      //       data: [0,0, 0, 1, 0, 0],
-      //       type: 'line'
-      //     }]
-      //   }
-      //   option && myChart.setOption(option);
-
-      // },
-      // charDam5() {
-      //   let Dom = this.$refs.shop4TJ
-      //   let myChart = echarts.init(Dom);
-      //   let option = {
-      //     tooltip: {
-      //       trigger: 'axis',
-      //       axisPointer: {
-      //         type: 'shadow'
-      //       }
-      //     },
-      //     grid: {
-      //       left: '3%',
-      //       right: '4%',
-      //       bottom: '3%',
-      //       containLabel: true
-      //     },
-      //     xAxis: {
-      //       type: 'value',
-      //       boundaryGap: [0, 0.01]
-      //     },
-      //     yAxis: {
-      //       type: 'category',
-      //       data: ['商户A', '商户B', '商户C', '商户D', '商户E', ]
-      //     },
-      //     series: [{
-      //       lineStyle: {
-      //         color: '#3f9b6a', // 这里设置为红色
-      //         width: 2, // 线条宽度
-      //       },
-      //       name: '2011',
-      //       type: 'bar',
-      //       data: [2, 4, 5, 4, 1, 5]
-      //     }]
-      //   };
-      //   option && myChart.setOption(option);
-      // },
       charDam6(datas) {
 
         let Dom = this.$refs.shop5ZX
@@ -668,64 +755,91 @@
 }
         option && myChart.setOption(option);
       },
+      tuichar(datas) {
+        let Dom = this.$refs.tuiTong
+        let myChart = echarts.init(Dom)
+        let processedData = datas.map(item => ({
+          name: item.rentalCondition,
+          value: item.trendQuantity
+        }))
+        let option = {
+          xAxis: {
+            type: 'category',
+           data:processedData.map(item => item.name),
+          },
+          yAxis: {
+            type: 'value'
+          },
+          grid: {
+            left: '1%',
+            right: '1%',
+            top: '5%',
+            bottom: '6%',
+            containLabel: true
+          },
+          series: [{ // 设置线条颜色
+            lineStyle: {
+              color: '#3f9b6a', // 这里设置为红色
+              width: 2, // 线条宽度
+            },
+          data: processedData.map(item => item.value),
+            type: 'line'
+          }]
+        }
+        option && myChart.setOption(option);
 
-// charDam9(){
-
-//     let Dom = this.$refs.shop3TJ
-//     let myChart = echarts.init(Dom);
-//     let option = {
-//       tooltip: {
-//         trigger: 'axis',
-//         axisPointer: {
-//           type: 'shadow'
-//         }
-//       },
-//       grid: {
-//         left: '3%',
-//         right: '4%',
-//         bottom: '3%',
-//         containLabel: true
-//       },
-//       xAxis: {
-//         type: 'value',
-//         boundaryGap: [0, 0.01]
-//       },
-//       yAxis: {
-//         type: 'category',
-//         data: ['商户A', '商户B', '商户C', '商户D', '商户E', ]
-//       },
-//       series: [{
-//         lineStyle: {
-//           color: '#3f9b6a', // 这里设置为红色
-//           width: 2, // 线条宽度
-//         },
-//         name: '2011',
-//         type: 'bar',
-//         data: [1, 2, 3, 4, 5, 10]
-//       }]
-//     };
-//     option && myChart.setOption(option);
-
-// },
 
+      },
+      charJing(datas){
+
+          let Dom = this.$refs.shopJing
+          let myChart = echarts.init(Dom)
+          let processedData = datas.map(item => ({
+            name: item.shopName,
+            value: item.price
+          }))
+          let option = {
+            legend: {},
+            tooltip: {},
+            xAxis: {
+              type: 'category',
+                data:processedData.map(item => item.name),
+            },
+            yAxis: {
+              type: 'value',
+            },
+            grid: {
+              left: '1%',
+              right: '1%',
+              top: '5%',
+              bottom: '6%',
+              containLabel: true
+            },
+            series: [{
+              type: 'bar',
+              color: '#3f9b6a',
+              data: processedData.map(item => item.value),
+            }
+            ]
+          };
+          option && myChart.setOption(option);
+
+      },
       async getAll() {
         const res = await statistical(this.pageindex)
 
-        this.charDam(res.data.seekingIntentionStatistics)
+        this.charDam(res.data.merchantChargeStatistics)
         this.charDam2(res.data.seekingIntentionStatistics)
         this.charDam6(res.data.contractTrend)
-
+this.hetongDam(res.data.contractTrend)
         this.charDam7(res.data.basicQueryTrends)
    let trends=[...res.data.shopTrend,...res.data.venueTrend,...res.data.advertisingTrend]
 
         this.charDam1(trends)
-         this.charDam3(trends)
-      },
-      handleSizeChange() {
-
-      },
-      handleCurrentChange() {
+         this.charDam3(res.data.tollLocationStatistics)
+         this.charJing(res.data.operationStatistics)
 
+         this.tuichar(res.data.rentalStatistics)
       },
       resetting(){
       this.FormTime = []
@@ -738,19 +852,40 @@
               endTime:this.FormTime[1]
         }
         const res = await statistical(Msg)
-        this.charDam(res.data.seekingIntentionStatistics)
+        this.charDam(res.data.merchantChargeStatistics)
         this.charDam2(res.data.seekingIntentionStatistics)
         this.charDam6(res.data.contractTrend)
+        this.hetongDam(res.data.contractTrend)
 this.charDam7(res.data.basicQueryTrends)
    let trends=[...res.data.shopTrend,...res.data.venueTrend,...res.data.advertisingTrend]
 
         this.charDam1(trends)
-         this.charDam3(trends)
-
+         this.charDam3(res.data.tollLocationStatistics)
+         this.tuichar(res.data.rentalStatistics)
+        this.charJing(res.data.operationStatistics)
       },
-      gitOut(){
+      // 下载
+       async gitOut() {
+            const content = this.$refs.tubiao;
 
-      },
+            // 使用 html2canvas 将 div 渲染为画布
+            const canvas = await html2canvas(content);
+
+            // 获取画布的图像数据
+            const imgData = canvas.toDataURL('image/png');
+
+            // 创建一个新的 PDF 文档
+            const pdf = new jsPDF('p', 'mm', 'a4');
+
+            // 添加图像到 PDF，第二个参数是图像格式，第三个参数是缩放比例
+            const imgWidth = 190; // 图像的宽度（mm）
+            const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比
+
+            pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm）
+
+            // 保存 PDF 文件
+            pdf.save('统计图.pdf');
+          },
     }
   }
 </script>
diff --git a/yanshouban/src/views/ipm/followup/index.vue b/yanshouban/src/views/ipm/followup/index.vue
index 9858f86..34061df 100644
--- a/yanshouban/src/views/ipm/followup/index.vue
+++ b/yanshouban/src/views/ipm/followup/index.vue
@@ -658,11 +658,27 @@
         const res = await genGetAll(this.pageindex)
         this.tableData = res.data.content
         this.total = res.data.content.length
+        this.tableData.map(res=>{
+          res.contactPhone = this.$decrypt(res.contactPhone)
+          res.idCardNumber = this.$decrypt(res.idCardNumber)
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+        })
         const ziyuan =  await getAlls(this.pageindex)
          const ggw  = await map1(this.pageindex)
         this.ziyuanData = [...ziyuan.data.content,...ggw.data.content]
         const kehu = await icManAll(this.pageindex);
         this.kehuData = kehu.data.content
+        this.kehuData.map(res=>{
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+          res.contactName = this.$decrypt(res.contactName)
+          res.contactPhone = this.$decrypt(res.contactPhone)
+        })
       },
 
       // 新增确定按钮
@@ -796,7 +812,14 @@
         const res = await genGetAll(this.formSel)
         this.tableData = res.data.content
         this.total = res.data.content.length
-
+  this.tableData.map(res=>{
+          res.contactPhone = this.$decrypt(res.contactPhone)
+          res.idCardNumber = this.$decrypt(res.idCardNumber)
+          res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
+          res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+          res.address = this.$decrypt(res.address)
+          res.emailAddress = this.$decrypt(res.emailAddress)
+        })
       },
       //重置按钮
       resetting() {
diff --git a/yanshouban/src/views/ipm/inr/index.vue b/yanshouban/src/views/ipm/inr/index.vue
index 96b32b9..0026657 100644
--- a/yanshouban/src/views/ipm/inr/index.vue
+++ b/yanshouban/src/views/ipm/inr/index.vue
@@ -388,6 +388,7 @@
    tanAdd,
    tanEdit,
    tanDel,
+   excelQueryByPage
   } from '../../../api/inr.js'
   import upimg from "@/components/ImageUpload/index"
   import {
@@ -629,23 +630,33 @@ const res = await tanGetAll(this.formSel)
          await tanDel({id:item.id})
          this.getAll()
       },
-      gitOut(){
-         let add =[]
-        this.tableData.map(item=>{
-
-             let obj ={
-               intentCustomerName:'',
-               customerLevel:'',
-               contactPhone:'',
-               nextFollowUpStartTime:''
-             }
-          obj.intentCustomerName = item.cereFollowDetails.cereCustomerInfo.intentCustomerName
-          obj.contactPhone = item.cereFollowDetails.cereCustomerInfo.contactPhone
-          obj.customerLevel = item.cereFollowDetails.cereCustomerInfo.customerLevel
-          obj.nextFollowUpStartTime = item.nextNegotiationStartTime
-            add.push(obj)
-
-        })
+     async gitOut(){
+           let res = await excelQueryByPage(this.pageindex)
+              if(!res){
+                return
+              }
+              const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+              const fileName = '谈判列表.xls'
+              if ('download' in document.createElement('a')) {
+                 // 非IE下载
+                 const elink = document.createElement('a')
+                 elink.download = fileName
+                 elink.style.display = 'none'
+                 elink.href = URL.createObjectURL(blob)
+                 document.body.appendChild(elink)
+                 elink.click()
+                 URL.revokeObjectURL(elink.href) // 释放URL 对象
+                 document.body.removeChild(elink)
+               } else {
+                // IE10+下载
+                navigator.msSaveBlob(blob, fileName)
+              }
+              this.$message({
+                message: '导出成功',
+                type: 'success'
+              })
+
+
       },
     }
   }
diff --git a/yanshouban/src/views/media/mediaMana.vue b/yanshouban/src/views/media/mediaMana.vue
index 2330e7f..d638a53 100644
--- a/yanshouban/src/views/media/mediaMana.vue
+++ b/yanshouban/src/views/media/mediaMana.vue
@@ -120,7 +120,7 @@
         <!-- 详情活动方案 -->
         <el-dialog :title="wangShow==false?'修改页 ':'详情页'" :visible.sync="ggXin" custom-class='bian_css' style="padding: 0;" width="65s%"
           center :close-on-click-modal="false" :close-on-press-escape="false" :show-close='false'>
-              <div style="padding: 10px 20px;">
+              <div style="padding: 10px 20px;" ref="contentToConvert">
                     <el-form   ref="ruleFormInfo" :model="secondData" label-width="120px"
                       style="position: relative">
                       <el-form-item label="方案标题" class="grid-content bg-purple device-from" prop="name">
@@ -145,6 +145,9 @@
                 <el-button @click="ggXin=false"
                   style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;" class="buttonHover">返回
                 </el-button>
+                <el-button @click="daochu"  v-if="wangShow"
+                  style="color: #fff;background-color: #3F9B6A;">生成PDF
+                </el-button>
                 <el-button @click="TuiEdit"  v-if="!wangShow"
                   style="color: #fff;background-color: #3F9B6A;">确定
                 </el-button>
@@ -523,6 +526,8 @@
   import addAct from "./mediaMannaAdd"
   import wangEditor from "@/components/editor/index";
   import upimg from "@/components/ImageUpload/index"
+  import html2canvas from 'html2canvas'
+  import jsPDF from 'jspdf'
   export default {
 components: { addAct,wangEditor,upimg},
     data() {
@@ -604,6 +609,29 @@ components: { addAct,wangEditor,upimg},
 
     },
     methods: {
+     async daochu(){
+
+             const content = this.$refs.contentToConvert;
+
+             // 使用 html2canvas 将 div 渲染为画布
+             const canvas = await html2canvas(content);
+
+             // 获取画布的图像数据
+             const imgData = canvas.toDataURL('image/png');
+
+             // 创建一个新的 PDF 文档
+             const pdf = new jsPDF('p', 'mm', 'a4');
+
+             // 添加图像到 PDF，第二个参数是图像格式，第三个参数是缩放比例
+             const imgWidth = 190; // 图像的宽度（mm）
+             const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比
+
+             pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm）
+
+             // 保存 PDF 文件
+             pdf.save('媒体推广.pdf');
+
+      },
       //查询全数据
       async getAll() {
         const res = await tuiGetAll(this.pageindex)
diff --git a/yanshouban/src/views/member/memberList/details.vue b/yanshouban/src/views/member/memberList/details.vue
index e2b0138..9b63918 100644
--- a/yanshouban/src/views/member/memberList/details.vue
+++ b/yanshouban/src/views/member/memberList/details.vue
@@ -369,12 +369,17 @@ export default {
         if (item.fields === 'sex') {
           item.value = item.value === '1' ? '男' : '女'
         }
+
+        item.value = this.$decrypt(item.value)
+        console.log(item)
       })
     },
     // 初始化查询所有标签
     async getSelect (name) {
       const res = await getLabels(name)
       this.tipsList = res.data
+
+
     },
     doCancel () {
       this.visible = false
diff --git a/yanshouban/src/views/online/QRFunds/index.vue b/yanshouban/src/views/online/QRFunds/index.vue
index fea8c8f..e589cb4 100644
--- a/yanshouban/src/views/online/QRFunds/index.vue
+++ b/yanshouban/src/views/online/QRFunds/index.vue
@@ -182,6 +182,7 @@ export default {
         res.emailAddress = this.$decrypt(res.emailAddress)
         res.shopAdress = this.$decrypt(res.shopAdress)
         res.legalRepresentative = this.$decrypt(res.legalRepresentative)
+        res.chargePersonPhone = this.$decrypt(res.chargePersonPhone)
       })
     },
     onSubmit(){
diff --git a/yanshouban/src/views/scheme/addressguan.vue b/yanshouban/src/views/scheme/addressguan.vue
new file mode 100644
index 0000000..60d6e04
--- /dev/null
+++ b/yanshouban/src/views/scheme/addressguan.vue
@@ -0,0 +1,443 @@
+<template>
+    <div class="zhuti"  v-if="addressShow">
+      <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 class="demo-input-suffix">
+            <div style="width:68px;height:36px;line-height:32px;">位置</div>
+            <el-input placeholder="请输入" v-model="formSel.policyName" style="width:168px;margin-right: 15px">
+            </el-input>
+          </div>
+          <div>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
+            </el-button>
+          </div>
+        </div>
+        <div style="margin:20px 0;">
+          <el-button icon="el-icon-circle-plus-outline" @click="addbuss"
+            style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">新增</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="100"  >
+            <template slot-scope="scope">
+              {{scope.$index +1}}
+                 </template>
+          </el-table-column>
+          <el-table-column label="位置名称" prop="policyName" min-width="200" >
+          </el-table-column>
+          <el-table-column label="创建时间" prop="applicableResources" min-width="100" >
+          </el-table-column>
+          <el-table-column label="操作" min-width="200" >
+            <template slot-scope="scope">
+              <div @click="handleEditForm(scope.row)" class="tableBtn greens">编辑</div>
+              <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="fenye">
+          <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
+              layout="total,prev, pager,next" :total="total"
+            @current-change="handleCurrentChange" />
+        </div>
+      </div>
+      <el-dialog :title="index == 0?'新增页':'编辑页'" :visible.sync="xinShow" custom-class='bian_css' style="padding: 0;" width="55%" center
+        :close-on-click-modal="false" >
+        <div style="padding:20px;" class="xinFrom">
+          <el-form  :model="form" ref="ruleForm"  label-width="80px">
+            <el-form-item label="商铺位置" prop="policyName">
+              <el-input v-model="form.policyName" placeholder="请输入" style="width: 87%;margin-right: 15px"  maxlength="50"></el-input>
+            </el-form-item>
+
+          </el-form>
+          <div style="display: flex;justify-content: flex-end;margin-top:20px;">
+            <el-button @click="closeFn()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;"
+              class="buttonHover">取 消</el-button>
+            <el-button type="primary" @click="addCheck(index)"
+              style="background-color: #3F9B6A;color: #fff;border-color:#3F9B6A;">确 定</el-button>
+
+          </div>
+        </div>
+      </el-dialog>
+    </div>
+</template>
+
+<script>
+  import {
+   ceGetAll,
+   ceAdd,
+   ceEdit,
+   ceDel,
+  } from '../../api/sam.js'
+  import wangEditor from "@/components/editor/index"
+  import upimg from "@/components/ImageUpload/index"
+  import {
+    uploadUrl
+  } from '@/utils/request'
+  export default {
+   components: { wangEditor ,upimg},
+   props: {
+     addressShow: {
+       type: Boolean,
+       default: false
+     },
+   },
+    data() {
+      return {
+      formSel:{
+        policyName:''
+      },
+      tableData:[],
+        currentPage: 1,
+        total: 0,
+        flag: false,
+        pageSize: 10,
+        xinShow:false,
+        form:{
+          policyName:'',
+        },
+        index:0
+
+      }
+    },
+
+    created() {
+
+
+    },
+    mounted() {
+this.getAll()
+    },
+
+    methods: {
+      getAll(){
+
+      },
+      handleCurrentChange(){
+
+      },
+      onSubmit(){
+
+      },
+      resetting(){
+
+      },
+      closeFn(){
+
+        this.xinShow = false
+        this.getAll()
+      },
+      addCheck(){
+   this.xinShow = false
+this.getAll()
+      },
+      addbuss(){
+        this.index = 0
+        this.xinShow = true
+      },
+      handleEditForm(){
+        this.index =1
+        this.xinShow = true
+      },
+      handleDelete(){
+
+      },
+    }
+  }
+</script>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
+<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;
+
+  }
+
+  /deep/ .el-form-item__content {
+    line-height: 0;
+  }
+
+  ::v-deep .xinForm .el-form-item__content {
+    line-height: 3;
+  }
+
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+    cursor: pointer;
+  }
+
+
+
+  .greens {
+    color: #3F9B6A;
+  }
+
+
+  .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;
+  }
+
+  .el-row {
+    margin-bottom: 20px;
+  }
+
+  :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;
+    width: 83%;
+  }
+
+  .pagination {
+    text-align: right;
+    line-height: 20px;
+  }
+
+
+
+ /deep/ .dialog_css {
+   margin-top: 11vh;
+   margin-left: 13%;
+   padding: 0px;
+
+   .el-dialog__title {
+     font-size: 12px;
+   }
+ }
+
+  /deep/.el-dialog__body {
+    padding: 0px;
+  }
+
+  /deep/ .el-dialog__header {
+    background-color: #fff;
+  }
+
+  /deep/.el-dialog__title {
+    color: #000;
+  }
+
+  .el-row {
+    margin-bottom: 20px;
+
+    &: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 .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+  .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 .el-date-editor .el-range-separator {
+    line-height: 24px;
+  }
+
+</style>
+<style lang="scss" scoped>
+  ::v-deep .xinFrom{
+    padding-top:20px;
+    .el-input--mini .el-input__inner{
+      height:36px;
+      line-height:36px;
+    }
+    .el-range-editor--mini.el-input__inner{
+        height:36px;
+        width:100%;
+    }
+  }
+  ::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 .formSearch {
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+  }
+  ::v-deep .el-radio-group{
+    padding-top:14px;
+  }
+  ::v-deep .el-radio{
+    font-weight:100 !important;
+  }
+   ::v-deep .bian_css{
+    overflow-y:initial !important;
+  }
+</style>
diff --git a/yanshouban/src/views/scheme/planningBz.vue b/yanshouban/src/views/scheme/planningBz.vue
index e7616d9..4939534 100644
--- a/yanshouban/src/views/scheme/planningBz.vue
+++ b/yanshouban/src/views/scheme/planningBz.vue
@@ -33,9 +33,19 @@
             </el-button>
           </div>
         </div>
-        <div style="margin:20px 0;">
+        <div style="margin:20px 0;display:flex;">
           <el-button icon="el-icon-circle-plus-outline" @click="addbuss(1)"
             style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">新增</el-button>
+            <el-upload class="upload-demo" ref="upload"
+                              :limit="1"
+                              accept=".xlsx"
+                              :action="upload"
+                              :on-success="daoru"
+                              :file-list="fileData"
+                               :auto-upload="true"
+                               :show-file-list="false">
+                              <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;margin-left:15px;"  class="buttonHover">导入</el-button>
+                            </el-upload>
         </div>
 
         <!-- 表格 -->
@@ -312,17 +322,20 @@
    addList,
    updateList,
    queryById,
+   excelAdd
   } from '../../api/planningBz.js'
   import wangEditor from "@/components/editor/index"
   import upimg from "@/components/ImageUpload/index"
   import {
     uploadUrl
   } from '@/utils/request'
+
   export default {
    components: { wangEditor ,upimg},
     data() {
       return {
        upload:uploadUrl,
+       fileData:[],
         formSel: {
           planningName:'',
           planningType:'',
@@ -450,7 +463,7 @@ this.total = res.data.content.length
              this.fileList = fileList.slice(-3);
            },
       handleSuccess(file,fileList) {
-        console.log(file,fileList)
+
            // const fileUrl = response.data.url;
                 const fileMsg = {
                   name:fileList.name,
@@ -493,7 +506,10 @@ this.total = res.data.content.length
             this.secondData.annex = JSON.parse(item.annex)
 
         }
-         this.fileList.push(this.secondData.annex)
+         if(this.secondData.annex!="" && this.secondData.annex!=''){
+           this.fileList.push(this.secondData.annex)
+         }
+
         // this.secondData.annex  = JSON.parse(this.secondData.annex)
 
 
@@ -599,7 +615,7 @@ this.total = res.data.content.length
         console.log(file);
       },
       handleRemove(file, fileList) {
-        console.log(file, fileList);
+
         this.fileList = []
       },
       //重置按钮
@@ -632,6 +648,14 @@ this.total = res.data.content.length
         const day = ('0' + date.getDate()).slice(-2);
         return `${year}-${month}-${day}`;
       },
+      daoru(response, file, fileList){
+        this.fileData.push(file.raw)
+        const formDate = new FormData()
+        formDate.append('file', this.fileData[0])
+        excelAdd(formDate).then(res => {
+           this.getAll()
+        })
+      },
     }
   }
 </script>
diff --git a/yanshouban/src/views/scheme/sam.vue b/yanshouban/src/views/scheme/sam.vue
index 8be5efa..ce9d802 100644
--- a/yanshouban/src/views/scheme/sam.vue
+++ b/yanshouban/src/views/scheme/sam.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="background-color:#f7f7f7;padding:10px 10px;">
-    <div class="zhuti">
+    <div class="zhuti" v-if="addressShow == 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>
@@ -54,6 +54,8 @@
         <div style="margin:20px 0;">
           <el-button icon="el-icon-circle-plus-outline" @click="addbuss(1)"
             style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">新增</el-button>
+            <el-button  @click="addressShow =true"
+              style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">商铺位置管理</el-button>
         </div>
 
         <!-- 表格 -->
@@ -216,6 +218,7 @@
 
     </el-dialog>
         <samXin :xinShow="ggXin" @childClose='childClose'></samXin>
+        <addressguan :addressShow="addressShow" @addClose='addClose' v-if="addressShow"></addressguan>
   </div>
 </template>
 
@@ -229,14 +232,16 @@
   import wangEditor from "@/components/editor/index"
   import upimg from "@/components/ImageUpload/index"
 import samXin from "./samXin"
+import addressguan from "./addressguan"
   import {
     uploadUrl
   } from '@/utils/request'
   export default {
-   components: { wangEditor ,upimg,samXin},
+   components: { wangEditor ,upimg,samXin,addressguan},
     data() {
       return {
         formInline: {},
+        addressShow:false,
         upload:uploadUrl,
         plan_Time:[],
         formSel: {
@@ -269,7 +274,8 @@ import samXin from "./samXin"
         },
         fileList: [],
         paymentDate:[],
-        leaseDate:[]
+        leaseDate:[],
+        modelData:[]
       }
     },
 
@@ -409,6 +415,10 @@ this.getAll()
          this.xiang = false
          this.getAll()
       },
+      addClose(msg){
+          this.addressShow = msg
+          this.getAll()
+      },
     }
   }
 </script>
diff --git a/yanshouban/src/views/serve/MarkActivity/index.vue b/yanshouban/src/views/serve/MarkActivity/index.vue
index 4aef8dc..51efe4d 100644
--- a/yanshouban/src/views/serve/MarkActivity/index.vue
+++ b/yanshouban/src/views/serve/MarkActivity/index.vue
@@ -684,6 +684,10 @@
       const res =  await Registration(page)
       this.mingList = res.data
         this.baoming = true
+        this.mingList.map(res=>{
+          res.userName = this.$decrypt(res.userName)
+          res.userPhone = this.$decrypt(res.userPhone)
+        })
       }
 
     }
diff --git a/yanshouban/src/views/serve/kefuServe/index.vue b/yanshouban/src/views/serve/kefuServe/index.vue
index 0aeedd3..5dbe2e2 100644
--- a/yanshouban/src/views/serve/kefuServe/index.vue
+++ b/yanshouban/src/views/serve/kefuServe/index.vue
@@ -23,7 +23,7 @@
       <div>
         <!-- 搜索 -->
         <div style="margin-bottom:20px;">
-            保修记录
+            报修记录
         </div>
 
         <!-- 表格 -->
@@ -39,7 +39,7 @@
               {{scope.$index+1}}
             </template>
           </el-table-column>
-          <el-table-column label="保修类型" prop="deviceType" width="auto" min-width="12%" />
+          <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" />
           <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" />
 <el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" />
           <el-table-column label="备注" prop="memo" width="auto" min-width="12%" />
diff --git a/yanshouban/src/views/setup/user/index.vue b/yanshouban/src/views/setup/user/index.vue
index f0dcae7..9e918a7 100644
--- a/yanshouban/src/views/setup/user/index.vue
+++ b/yanshouban/src/views/setup/user/index.vue
@@ -326,10 +326,14 @@ export default {
       userGetById({ platformUserId: row.platformUserId }).then(res => {
         this.addForm = res.data
         this.addForm.roleIds = res.data.ids
-        console.log(this.addForm)
-        console.log(this.roleList)
+this.addForm.username = this.$decrypt(this.addForm.username)
+        this.addForm.email = this.$decrypt(this.addForm.email)
+        this.addForm.password = this.$decrypt(this.addForm.password)
+        this.addForm.phone = this.$decrypt(this.addForm.phone)
         // this.addForm.roleIds = [1];
       })
+
+
     },
     // 删除用户
     async del (row) {
diff --git a/yanshouban/src/views/shopRental/manage/index.vue b/yanshouban/src/views/shopRental/manage/index.vue
index 46afee2..c47a565 100644
--- a/yanshouban/src/views/shopRental/manage/index.vue
+++ b/yanshouban/src/views/shopRental/manage/index.vue
@@ -37,10 +37,19 @@
             </el-button>
           </div>
         </div>
-        <div style="margin-bottom: 20px;">
-          <el-button @click="addbuss(1)" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
+        <div style="margin-bottom: 20px;display:flex;">
+          <el-button @click="addbuss(1)" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;margin-right:15px;"
             icon="el-icon-circle-plus-outline">新增</el-button>
-          <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
+          <el-upload class="upload-demo" ref="upload"
+                            :limit="5"
+                            accept=".xlsx"
+                        :action="uploadFileUrl"
+                            :on-success="daoru"
+                            :file-list="fileData"
+                             :auto-upload="true"
+                             :show-file-list="false">
+                            <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover">导入</el-button>
+                          </el-upload>
         </div>
         <!-- 表格 -->
 
@@ -1202,9 +1211,7 @@
     async
   } from 'q'
   import axios from 'axios'
-  import {
-    uploadUrl
-  } from '@/utils/request'
+import { uploadUrl,token } from '@/utils/request'
   import {
     contractGetAll,
     contractDel,
@@ -1214,13 +1221,15 @@
     cereLeasingByPage,
     cereLeasingEdit,
     cereLeasingAdd,
-    cereLeasingDel
+    cereLeasingDel,
+    excelAdd
   } from '../../../api/manage.js'
   export default {
     name: 'manage',
     data() {
       return {
         uploadFileUrl: uploadUrl, // 请求地址
+        fileData:[],
         hetongBox: false, //合同
         detbox: false, //详情
         leixing: true, //切换
@@ -1257,6 +1266,7 @@
           promotionVideo: '',
           promotionImage: '',
           notes: '',
+          rentalCondition:0,
         }, //租赁信息字段
         tableData: [{
           id:1,
@@ -1383,6 +1393,7 @@ biangengPan:false,
         this.chengeTatle = val
       },
       async getAll(val) {
+        console.log(this.pageindex)
         const res = await cereLeasingByPage(this.pageindex)
         this.tableData = res.data.content
         this.total = res.data.content.length
@@ -1521,6 +1532,7 @@ biangengPan:false,
            promotionVideo: '',
            promotionImage: '',
            notes: '',
+           rentalCondition:0,
          }//租赁信息字段
         this.heForm={
            contractNumber: '', //合同对应的ID
@@ -1718,6 +1730,14 @@ this.ggXin = true
       bianDel(index){
         this.biangengTab.splice(index, 1);
       },
+    daoru(response, file, fileList){
+      this.fileData.push(file.raw)
+      const formDate = new FormData()
+      formDate.append('file', this.fileData[0])
+      excelAdd(formDate).then(res => {
+         this.getAll()
+      })
+        },
     }
   }
 </script>
diff --git a/yanshouban/src/views/shopRental/renewalMan/index.vue b/yanshouban/src/views/shopRental/renewalMan/index.vue
index b8d21fa..fb2a60d 100644
--- a/yanshouban/src/views/shopRental/renewalMan/index.vue
+++ b/yanshouban/src/views/shopRental/renewalMan/index.vue
@@ -39,6 +39,7 @@
           <div>
             <el-button
               style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" @click="daochu">导出</el-button>
+              <el-button @click="dayin"  style="background-color: #3F9B6A;color: #fff">打印</el-button>
           </div>
 
         </div>
@@ -793,7 +794,7 @@
 
                                       <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;">
                                         <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button>
-                                        <!-- <el-button  style="background-color: #3F9B6A;color: #fff">打印</el-button> -->
+
                                         <!-- <el-button  style="background-color: #3F9B6A;color: #fff">发送</el-button> -->
 
                                       </div>
@@ -817,7 +818,8 @@
     updateList,
     queryById,
     cereLeasingById,
-    cereLeasingEdit
+    cereLeasingEdit,
+    pdfLeaseRenewalManagement
   } from '../../../api/manage.js'
   import {
   rentalGetAll,
@@ -874,7 +876,7 @@
        },
      pageNumber: 1,
      pageSize: 10,
-
+    rentalCondition:3
      },
      xiangData:{},
      heData:{},
@@ -890,6 +892,7 @@
         pageindex: {
           pageNumber: 1,
           pageSize: 10,
+          rentalCondition:3
         },
         bianjiBox:1,
         chengeTatle:1,
@@ -932,6 +935,30 @@
 
     },
     methods: {
+      async dayin(){
+         let res = await pdfLeaseRenewalManagement(this.pageindex)
+           if(!res){
+                   return
+                 }
+                 const blob = new Blob([res], { type: 'application/pdf' })
+                 const fileName = '续租管理.pdf'
+                 if ('download' in document.createElement('a')) {
+                    // 非IE下载
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'none'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href) // 释放URL 对象
+                    document.body.removeChild(elink)
+                  } else {
+                   // IE10+下载
+                   navigator.msSaveBlob(blob, fileName)
+                 }
+
+
+       },
       chenge(val){
         this.formSel={
           affiliation: '',
@@ -1057,7 +1084,7 @@
        },
      pageNumber: 1,
      pageSize: 10,
-
+    rentalCondition:3
      }
    this.leaseStartDate = []
      this.getAll()
diff --git a/yanshouban/src/views/shopRental/rentTermination/index.vue b/yanshouban/src/views/shopRental/rentTermination/index.vue
index fdab819..71e20c7 100644
--- a/yanshouban/src/views/shopRental/rentTermination/index.vue
+++ b/yanshouban/src/views/shopRental/rentTermination/index.vue
@@ -41,6 +41,8 @@
           </el-button>
           <el-button @click="daochu" style="background-color: #3F9B6A;color: #fff">导出
           </el-button>
+          <el-button  @click="dayin"  style="background-color: #3F9B6A;color: #fff">打印</el-button>
+
         </div>
         <!-- 表格 -->
 
@@ -640,8 +642,7 @@
                                                   </div>
                                           <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;">
                                             <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button>
-                                           <!-- <el-button  style="background-color: #3F9B6A;color: #fff">打印</el-button>
-                                            <el-button  style="background-color: #3F9B6A;color: #fff">发送</el-button> -->
+
 
                                           </div>
                                     </div>
@@ -662,7 +663,7 @@
     contractDel,
     updateList,
     queryById,
-
+    pdfManagementOfFinalAccountsForRentals,
     cereLeasingEdit
   } from '../../../api/manage.js'
   import {
@@ -729,11 +730,12 @@
           },
         pageNumber: 1,
         pageSize: 10,
-
+        rentalCondition:2
         },
         pageindex: {
           pageNumber: 1,
           pageSize: 10,
+          rentalCondition:2
         },
         bianjiBox: 1,
         chengeTatle: 1,
@@ -794,7 +796,30 @@
     this.total = res.data.numberOfElements
     this.tableData = res.data.content
       },
+     async dayin(){
+        let res = await pdfManagementOfFinalAccountsForRentals(this.pageindex)
+          if(!res){
+                  return
+                }
+                const blob = new Blob([res], { type: 'application/pdf' })
+                const fileName = '退租决算管理.pdf'
+                if ('download' in document.createElement('a')) {
+                   // 非IE下载
+                   const elink = document.createElement('a')
+                   elink.download = fileName
+                   elink.style.display = 'none'
+                   elink.href = URL.createObjectURL(blob)
+                   document.body.appendChild(elink)
+                   elink.click()
+                   URL.revokeObjectURL(elink.href) // 释放URL 对象
+                   document.body.removeChild(elink)
+                 } else {
+                  // IE10+下载
+                  navigator.msSaveBlob(blob, fileName)
+                }
 
+
+      },
       // 退租确定按钮
        addCheck(val) {
         this.ggXin = false
@@ -924,7 +949,7 @@
           },
         pageNumber: 1,
         pageSize: 10,
-
+        rentalCondition:2
         }
       this.leaseStartDate = []
         this.getAll()
diff --git a/yanshouban/src/views/shopRental/rentalMan/index.vue b/yanshouban/src/views/shopRental/rentalMan/index.vue
index 7c7f39f..15e6902 100644
--- a/yanshouban/src/views/shopRental/rentalMan/index.vue
+++ b/yanshouban/src/views/shopRental/rentalMan/index.vue
@@ -39,6 +39,7 @@
               style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">批量导出</el-button> -->
             <el-button
               style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" @click="daochu">导出</el-button>
+              <el-button @click="dayin" style="background-color: #3F9B6A;color: #fff">打印</el-button>
           </div>
         </div>
         <!-- 表格 -->
@@ -965,7 +966,7 @@
 
                                           <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;">
                                             <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button>
-                                            <!-- <el-button  style="background-color: #3F9B6A;color: #fff">打印</el-button> -->
+
                                             <!-- <el-button  style="background-color: #3F9B6A;color: #fff">发送</el-button> -->
 
                                           </div>
@@ -987,10 +988,10 @@
   rentalGetAll,
   rentalDel,
   rentalAdd,
-  excelRentOutQueryByPage
+  excelRentOutQueryByPage,
+  pdfRentOutQueryByPage
   } from '../../../api/rentalMan.js'
 import {
-  businessListGetAll,
   businessListSave,
   businessListGetById,
   businessListUpdate,
@@ -1049,10 +1050,12 @@ import {
           },
         pageNumber: 1,
         pageSize: 10,
+        rentalCondition:1
         },
         pageindex: {
           pageNumber: 1,
           pageSize: 10,
+          rentalCondition:1
         },
         zhong:{
               intentionalRent:'',
@@ -1103,6 +1106,7 @@ import {
           },
         pageNumber: 1,
         pageSize: 10,
+        rentalCondition:1
         }
         this.leixing  = !this.leixing
 
@@ -1203,6 +1207,7 @@ import {
           },
         pageNumber: 1,
         pageSize: 10,
+        rentalCondition:1
         },
         this.leaseStartDate = []
           this.getAll()
@@ -1227,7 +1232,7 @@ import {
       pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm）
 
       // 保存 PDF 文件
-      pdf.save('downloaded.pdf');
+      pdf.save('入住单.pdf');
     },
     // 出租单查看
     outlook(item){
@@ -1236,7 +1241,6 @@ import {
       this.outdan = true
     },
     delList(){
-
               const h = this.$createElement;
                       this.$msgbox({
                         title: '消息',
@@ -1286,6 +1290,30 @@ import {
          })
 
     },
+    async dayin(){
+ let res = await pdfRentOutQueryByPage(this.pageindex)
+   if(!res){
+           return
+         }
+         const blob = new Blob([res], { type: 'application/pdf' })
+         const fileName = '出租管理.pdf'
+         if ('download' in document.createElement('a')) {
+            // 非IE下载
+            const elink = document.createElement('a')
+            elink.download = fileName
+            elink.style.display = 'none'
+            elink.href = URL.createObjectURL(blob)
+            document.body.appendChild(elink)
+            elink.click()
+            URL.revokeObjectURL(elink.href) // 释放URL 对象
+            document.body.removeChild(elink)
+          } else {
+           // IE10+下载
+           navigator.msSaveBlob(blob, fileName)
+         }
+
+    },
+
     }
   }
 </script>
diff --git a/yanshouban/src/views/shopRental/warning/index.vue b/yanshouban/src/views/shopRental/warning/index.vue
index 1168a1b..cd868b0 100644
--- a/yanshouban/src/views/shopRental/warning/index.vue
+++ b/yanshouban/src/views/shopRental/warning/index.vue
@@ -115,27 +115,18 @@
                     <div >
                           <div style="margin-bottom: 20px;">
                           <el-form ref="form" :model="zhong" label-width="80px">
-                            <el-form-item label="甲方">
+                            <el-form-item label="甲方"  v-if="index != 2">
                               <el-input v-model="zhong.lessorName" disabled></el-input>
                             </el-form-item>
-                            <el-form-item label="乙方">
+                            <el-form-item label="乙方"   v-if="index != 2">
                               <el-input v-model="zhong.tenantName" disabled></el-input>
                             </el-form-item>
-                            <el-form-item label="合同编号">
+                            <el-form-item label="合同编号"  v-if="index != 2">
                               <el-input v-model="zhong.contractNumber" disabled></el-input>
                             </el-form-item>
-                            <el-form-item label="起止时间">
+                            <el-form-item label="起止时间" v-if="index != 2">
                               <el-input v-model="zhong.leaseStartDate" disabled></el-input>
                             </el-form-item>
-                            <el-form-item label="月租金" v-if="index ==2">
-                              <el-input v-model="zhong.contractAmount" disabled ></el-input>
-                            </el-form-item>
-                            <el-form-item label="缴费日期" v-if="index ==2">
-                              <el-input v-model="zhong.contractAmount" disabled ></el-input>
-                            </el-form-item>
-                            <el-form-item label="逾期" v-if="index ==2">
-                              <el-input v-model="zhong.name" disabled ></el-input>
-                            </el-form-item>
                             <el-form-item label="申请人" v-if="index !=2">
                               <el-input v-model="zhong.application"  ></el-input>
                             </el-form-item>
@@ -728,6 +719,9 @@
     cereLeasingByPage,
     daoqi
   } from '../../../api/manage.js'
+  import {
+  ManaAdd
+  } from '../../../api/PerWorkstation.js'
   export default {
     data() {
       return {
@@ -827,9 +821,36 @@
   },
       // 新增确定按钮
       async addCheck(val) {
-            this.ggXin = false
 
+                if(this.index == 2){
+                  let pageMsg = {
+                    content:this.zhong.reasonApplication,
+                    createdAt:this.nowTime(),
+                    postType:'立即发布',
+                    receiverMerchant:'电商商家',
+                    status:'1',
+                    title:'到期提醒'
+                  }
+                  await ManaAdd(pageMsg)
+               this.$message({
+                 message: '发送成功',
+                 type: 'success'
+               })
+                }
+                this.ggXin = false
       },
+
+      nowTime(){
+    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}`;
+    },
        // 获取时间
      currentTime(){
      let date = new Date();
diff --git a/yanshouban/src/views/stockControl/inventory/index.vue b/yanshouban/src/views/stockControl/inventory/index.vue
index 284045a..41f4516 100644
--- a/yanshouban/src/views/stockControl/inventory/index.vue
+++ b/yanshouban/src/views/stockControl/inventory/index.vue
@@ -1,7 +1,10 @@
 <!--  -->
 <template>
-  <div>
+  <div style="background-color:#f7f7f7;padding:10px 10px;">
     <div class="pending">
+      <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 class="formSearch">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
@@ -37,9 +40,10 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" plain @click="search">查询</el-button>
-            <el-button plain @click="clear">重置</el-button>
-            <el-button type="success" plain @click="productDataExport">导出商品</el-button>
+            <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
+            <el-button class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"   @click="clear">重置</el-button>
+            <el-button style="background-color: #3F9B6A;color: #fff" @click="productDataExport">导出商品</el-button>
             <!-- <span
               v-for="(item, index) in btnList"
               :key="index"
@@ -58,8 +62,7 @@
           ref="multipleTable"
           v-loading="loading"
           :data="tableData"
-          border
-          :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
+         :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
           tooltip-effect="dark"
           style="width: 100%"
         >
@@ -116,7 +119,32 @@
           </el-table-column>
           <el-table-column label="操作" width="200">
             <template slot-scope="scope">
-              <div class="btnList">
+              <div class="tableBtn greens"
+              v-if="scope.row.shelveState == 1"
+              slot="reference"
+              style="margin-right: 10px"
+              type="text"
+              @click="OutForced(scope.row)" >
+                强制下架
+              </div>
+              <div class="tableBtn greens"
+             v-if="scope.row.shelveState == 1"
+             type="text"
+             @click="setFictitious(scope.row)">
+                虚拟销量
+              </div>
+              <div class="tableBtn greens"
+            v-if="scope.row.shelveState == 2"
+            type="text"
+            @click="examineShow(scope.row)" >
+                审核
+              </div>
+              <div class="tableBtn greens"
+           type="text"
+           @click="Godetails(scope.row)" >
+                查看详情
+              </div>
+              <!-- <div class="btnList">
                 <el-button
                   v-if="scope.row.shelveState == 1"
                   slot="reference"
@@ -138,7 +166,7 @@
                   type="text"
                   @click="Godetails(scope.row)"
                 >查看详情</el-button>
-              </div>
+              </div> -->
             </template>
           </el-table-column>
         </el-table>
@@ -177,8 +205,9 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="examineVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submintUs">确 定</el-button>
+        <el-button  class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="examineVisible = false">取 消</el-button>
+        <el-button  style="background-color: #3F9B6A;color: #fff"  @click="submintUs">确 定</el-button>
       </span>
     </el-dialog>
     <!-- 设置虚拟销量 -->
@@ -199,8 +228,9 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="FictitiousVisible = false">取 消</el-button>
-        <el-button type="primary" @click="FicSubmintUs">确 定</el-button>
+        <el-button class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="FictitiousVisible = false">取 消</el-button>
+        <el-button style="background-color: #3F9B6A;color: #fff" @click="FicSubmintUs">确 定</el-button>
       </span>
     </el-dialog>
     <add-commodity ref="addCommodity" :examine-show="examineShow" @reset="reset" />
@@ -402,7 +432,9 @@ export default {
 //@import url(); 引入公共css类
 @import url("../../../styles/elDialog.scss");
 .pending {
-  padding: 30px;
+  padding: 0  20px 20px 20px;
+  min-height: calc(100vh - 50px - 20px);
+  background-color: #Fff;
 }
 .fenye {
   margin-top: 20px;
@@ -445,4 +477,18 @@ export default {
     }
   }
 }
+  .tableBtn {
+       display: inline-block;
+       margin-right: 10px;
+     }
+
+   .greens {
+       color: #3F9B6A ;
+     }
+     ::v-deep .buttonHover:hover{
+       color:#3f9b6a !important;
+       border-color: #c5e1d2 !important;
+       background-color: #ecf5f0 !important;
+       outline: none;
+     }
 </style>
diff --git a/yanshouban/src/views/stockControl/stocksForewarn/index.vue b/yanshouban/src/views/stockControl/stocksForewarn/index.vue
index 22fedad..53f6dc6 100644
--- a/yanshouban/src/views/stockControl/stocksForewarn/index.vue
+++ b/yanshouban/src/views/stockControl/stocksForewarn/index.vue
@@ -19,17 +19,24 @@
          <div :class="fut?'formSearch':'collapsed'" ref="formSearch">
             <el-form :inline="true" :model="formSel" label-width="auto">
               <el-form-item label="商品名称">
-                <el-input v-model="formSel.shopname" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
+                <el-input v-model="formSel.productName" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
               </el-form-item>
-              <el-form-item label="入库人">
+              <!-- <el-form-item label="入库人">
                 <el-input v-model="formSel.rkr" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="上架时间">
-                <el-input v-model="formSel.stime" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
+                 <el-date-picker
+                      v-model="formSel.createTime"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      prefix-icon="none"
+                      style="width: 178px;margin-right: 5px;"
+                      placeholder="选择日期时间">
+                    </el-date-picker>
               </el-form-item>
-              <el-form-item label="入库时间">
+              <!-- <el-form-item label="入库时间">
                 <el-input v-model="formSel.rtime" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
-              </el-form-item>
+              </el-form-item> -->
               </el-form>
               </div>
         </div>
@@ -161,10 +168,10 @@ export default {
         anNum:'',
       },
       formSel:{
-        shopname:'',
-        rkr:'',
-        sTime:'',
-        rTime:''
+   productName:'',
+   createTime:'',
+   page: 1,
+   pageSize: 10
       },
       formInline: {
         searchType: '1',
@@ -202,7 +209,28 @@ export default {
     },
     //  查询
     search () {
-
+      this.total = 1;
+      this.formSel.page = 1;
+      this.getAll(this.formSel);
+    },
+    resetting(){
+      this.formSel = {
+      productName:'',
+      createTime:'',
+      page: 1,
+      pageSize: 10
+         }
+         this.formInline =  {
+           searchType: '1',
+           search: '', // 搜索字段
+           state: '',
+           // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
+           dates: [], // 下单时间数组
+           page: 1,
+           shopName: '',
+           pageSize: 10
+         }
+           this.getAll(this.formInline)
     },
    async kucunSet(){
      const yuzhi={
diff --git a/yanshouban/vue.config.js b/yanshouban/vue.config.js
index df890d6..8a09324 100644
--- a/yanshouban/vue.config.js
+++ b/yanshouban/vue.config.js
@@ -67,7 +67,7 @@ module.exports = {
       //   changeOrigin: true,
       // },
       '/meserver/admin-server/':{
-        target: 'https://jy.scjysm.asia:18086/meserver/admin-server/', // 测试
+        target: 'https://jy.scjysm.asia:18086/admin-server/', // 测试
         // target: 'http://172.16.61.123:8080/meserver/admin-server/', // 测试
         // https://jy.scjysm.asia:18086/admin-server  http://172.16.61.123:8080/meserver/admin-server/    https://wjdc.scjysm.asia1443/cdwlMall/admin-server
         // target: 'http://localhost:9003/', // 平台端