webapp / GreenwayWeb

Commit de91fb0d93c24d0fda6bdc359ad6eb63595bfb3a

Authored by 杨鑫
2 parents 9d9c6f7d 2727043f

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 30 changed files with 1268 additions and 99 deletions
admin-web-master/dist.zip
View file @de91fb0
No preview for this file type
admin-web-master/src/api/newly.js
  View file @de91fb0
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 // import request from '@/utils/request2' 2 // import request from '@/utils/request2'
3 3
  4 +
  5 +// 租赁情况统计
  6 +export function rentalSituationStatistics(data) {
  7 + return request({
  8 + url: '/statistical/rentalSituationStatistics',
  9 + method: 'post',
  10 + data
  11 + })
  12 +}
  13 +// 绿道段统计
  14 +export function areaShopStatistics(data) {
  15 + return request({
  16 + url: '/statistical/areaShopStatistics',
  17 + method: 'post',
  18 + data
  19 + })
  20 +}
  21 +// 绿道公园统计
  22 +export function areaParkStatistics(data) {
  23 + return request({
  24 + url: '/statistical/areaParkStatistics',
  25 + method: 'post',
  26 + data
  27 + })
  28 +}
4 // 字典 29 // 字典
5 export function getChilds(data) { 30 export function getChilds(data) {
6 return request({ 31 return request({
admin-web-master/src/assets/images/icon1.png deleted
View file @9d9c6f7

14.6 KB
admin-web-master/src/assets/images/icon2.png deleted
View file @9d9c6f7

13 KB
admin-web-master/src/assets/images/icon3.png deleted
View file @9d9c6f7

14.4 KB
admin-web-master/src/assets/images/icon4.png deleted
View file @9d9c6f7

3.46 KB
admin-web-master/src/assets/images/icon5.png deleted
View file @9d9c6f7

3.36 KB
admin-web-master/src/assets/images/icon6.png deleted
View file @9d9c6f7

3.62 KB
admin-web-master/src/assets/images/iconcd1.png 0 → 100644
View file @de91fb0

3.44 KB
admin-web-master/src/assets/images/iconcd2.png 0 → 100644
View file @de91fb0

3.37 KB
admin-web-master/src/assets/images/iconcd3.png 0 → 100644
View file @de91fb0

3.45 KB
admin-web-master/src/assets/images/iconcd4.png 0 → 100644
View file @de91fb0

3.46 KB
admin-web-master/src/assets/images/iconcd5.png 0 → 100644
View file @de91fb0

3.43 KB
admin-web-master/src/assets/images/icongg1.png 0 → 100644
View file @de91fb0

3.53 KB
admin-web-master/src/assets/images/icongg2.png 0 → 100644
View file @de91fb0

3.48 KB
admin-web-master/src/assets/images/icongg3.png 0 → 100644
View file @de91fb0

3.63 KB
admin-web-master/src/assets/images/icongg4.png 0 → 100644
View file @de91fb0

3.53 KB
admin-web-master/src/assets/images/icongg5.png 0 → 100644
View file @de91fb0

3.58 KB
admin-web-master/src/assets/images/iconsp1.png 0 → 100644
View file @de91fb0

3.46 KB
admin-web-master/src/assets/images/iconsp2.png 0 → 100644
View file @de91fb0

3.34 KB
admin-web-master/src/assets/images/iconsp3.png 0 → 100644
View file @de91fb0

3.51 KB
admin-web-master/src/assets/images/iconsp4.png 0 → 100644
View file @de91fb0

3.47 KB
admin-web-master/src/assets/images/iconsp5.png 0 → 100644
View file @de91fb0

3.47 KB
admin-web-master/src/components/newmap/map.vue
  View file @de91fb0
@@ -65,15 +65,16 @@ export default { @@ -65,15 +65,16 @@ export default {
65 // 遍历 message 数组，为每个位置创建一个标记 65 // 遍历 message 数组，为每个位置创建一个标记
66 if (e.length > 0) { 66 if (e.length > 0) {
67 e.forEach(item => { 67 e.forEach(item => {
  68 + // console.error( item)
68 let list = this.ontype == '1' ? item.mapPunctuation.split(',') : this.ontype == '2' ? item.mapPunctuation.split(',') : this.ontype == '3' ? item.mapMarker.split(',') : []; 69 let list = this.ontype == '1' ? item.mapPunctuation.split(',') : this.ontype == '2' ? item.mapPunctuation.split(',') : this.ontype == '3' ? item.mapMarker.split(',') : [];
69 item.lat = parseFloat(list[0]); 70 item.lat = parseFloat(list[0]);
70 item.lng = parseFloat(list[1]); 71 item.lng = parseFloat(list[1]);
71 item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无'; 72 item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无';
72 const markerLatLng = new qq.maps.LatLng(item.lat, item.lng); 73 const markerLatLng = new qq.maps.LatLng(item.lat, item.lng);
73 - const customIconUrl1 = require('@/assets/images/icon4.png'); // 确保返回的是 URL 字符串  
74 - const customIconUrl2 = require('@/assets/images/icon6.png'); // 确保返回的是 URL 字符串  
75 - const customIconUrl3 = require('@/assets/images/icon5.png'); // 确保返回的是 URL 字符串  
76 - const icon = this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:'' 74 + const customIconUrl1 = require(item.publishStatus=='0'?'@/assets/images/iconsp1.png':item.publishStatus=='1'?'@/assets/images/iconsp2.png':item.publishStatus=='2'?'@/assets/images/iconsp3.png':item.publishStatus=='3'?'@/assets/images/iconsp4.png':item.publishStatus=='4'?'@/assets/images/iconsp5.png':'@/assets/images/iconsp1.png'); // 确保返回的是 URL 字符串
  75 + const customIconUrl2 = require(item.publishStatus=='0'?'@/assets/images/icongg1.png':item.publishStatus=='1'?'@/assets/images/icongg2.png':item.publishStatus=='2'?'@/assets/images/icongg3.png':item.publishStatus=='3'?'@/assets/images/icongg4.png':item.publishStatus=='4'?'@/assets/images/icongg5.png':'@/assets/images/icongg1.png'); // 确保返回的是 URL 字符串
  76 + const customIconUrl3 = require(item.publishStatus=='0'?'@/assets/images/iconcd1.png':item.publishStatus=='1'?'@/assets/images/iconcd2.png':item.publishStatus=='2'?'@/assets/images/iconcd3.png':item.publishStatus=='3'?'@/assets/images/iconcd4.png':item.publishStatus=='4'?'@/assets/images/iconcd5.png':'@/assets/images/iconcd1.png'); // 确保返回的是 URL 字符串
  77 + const icon = this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:''
77 const marker = new qq.maps.Marker({ 78 const marker = new qq.maps.Marker({
78 position: markerLatLng, 79 position: markerLatLng,
79 map: this.map, 80 map: this.map,
@@ -95,7 +96,7 @@ export default { @@ -95,7 +96,7 @@ export default {
95 <div style="padding:10px 0;border-radius: 18px;"> 96 <div style="padding:10px 0;border-radius: 18px;">
96 <p style="padding-top:10px;">资源名称:${item.name}</p> 97 <p style="padding-top:10px;">资源名称:${item.name}</p>
97 <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p> 98 <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p>
98 - <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p> 99 + <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='0'?'color: #707B86;':item.publishStatus=='1'?'color: #ECAF5C;':item.publishStatus=='2'?'color: #4A77C9;':item.publishStatus=='3'?'color: #E75A46;':item.publishStatus=='4'?'color: #2AB867;':'color: #707B86;'}">${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
99 </div> 100 </div>
100 `; 101 `;
101 // <div style="background: #fff;padding:5px 15px;border-radius: 18px;"> 102 // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
admin-web-master/src/utils/request.js
  View file @de91fb0
@@ -17,12 +17,16 @@ let baseURL = &#39;&#39; @@ -17,12 +17,16 @@ let baseURL = &#39;&#39;
17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18
19 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; 19 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20 - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; 20 + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21
22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23
24 24
  25 +<<<<<<< HEAD
25 baseURL = 'http://128.10.249.26:9003'; 26 baseURL = 'http://128.10.249.26:9003';
  27 +=======
  28 + // baseURL = 'http://128.10.249.23:9003';
  29 +>>>>>>> 2727043f776460ef29f119ecf30a65f746104338
26 30
27 31
28 } else { 32 } else {
admin-web-master/src/views/detect/admap copy 4.vue 0 → 100644
  View file @de91fb0
  1 +<template>
  2 + <div style="background-color:#f7f7f7;padding:10px 10px;">
  3 + <div class="zhuti" v-if="onaction == '1'">
  4 + <div style="height:58px;line-height:58px;">
  5 + <div style="color:#0006"> <span>招商资源监测</span> <span style="padding:0 5px;">></span> <span
  6 + style="color:#000000e6">资源地图</span></div>
  7 + </div>
  8 + <div class="formSearch">
  9 + <el-form :inline="true">
  10 + <el-form-item label="资源名称" prop="name">
  11 + <el-input v-model="name" placeholder="请输入" maxlength="50"></el-input>
  12 + </el-form-item>
  13 + </el-form>
  14 +
  15 + <div>
  16 + <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
  17 + </el-button>
  18 + <el-button @click="resetting" class="buttonHover"
  19 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
  20 + </el-button>
  21 + </div>
  22 + </div>
  23 + <!-- 线上 -->
  24 + <div>
  25 + <div style="margin-bottom: 20px;">
  26 + <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
  27 + icon="el-icon-circle-plus-outline">新增</el-button>
  28 + <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
  29 + </div>
  30 + <!-- 地图 -->
  31 + <div style="display: flex;justify-content: space-between;margin-bottom: 20px;">
  32 + <div style="width: 100%;height: 400px; border: 1px solid #3F9B6A;position: relative;">
  33 + <mapchakannew :ontype="ontype" ref="mapchakannewrefs"></mapchakannew>
  34 + </div>
  35 + </div>
  36 + <div style="margin: 20px 0;">
  37 + <div style="display: flex;font-size: 14px">
  38 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
  39 + </div>
  40 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
  41 + 广告位</div>
  42 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地
  43 + </div>
  44 + </div>
  45 + </div>
  46 + <!-- 表格 -->
  47 + <el-table v-if="ontype=='1'" :data="tableData"
  48 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  49 + <el-table-column label="序号" width="50">
  50 + <template slot-scope="scope">
  51 + {{scope.$index +1 }}
  52 + </template>
  53 + </el-table-column>
  54 + <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
  55 + <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
  56 + <template slot-scope="scope">
  57 + {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}}
  58 + </template>
  59 + </el-table-column>
  60 + <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
  61 + </el-table-column>
  62 + <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
  63 + </el-table-column>
  64 + <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>
  65 + <template slot-scope="scope">
  66 + {{scope.row.belongingDepartment || '无'}}
  67 + </template>
  68 + </el-table-column>
  69 + <el-table-column label="负责人" prop="head" show-overflow-tooltip>
  70 + <template slot-scope="scope">
  71 + {{scope.row.head || '无'}}
  72 + </template>
  73 + </el-table-column>
  74 + <el-table-column label="提交时间" prop="createDate"> </el-table-column>
  75 + <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
  76 + <template slot-scope="scope">
  77 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
  78 + </template>
  79 + </el-table-column>
  80 + <el-table-column label="操作" min-width="100" fixed="right">
  81 + <template slot-scope="scope">
  82 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  83 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  84 + @click="removeinfo(scope.row,'编辑')">编辑
  85 + </div>
  86 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  87 + @click="closemsg(scope.row)">删除</div>
  88 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  89 + @click="opencl(scope.row,'sp')">发布</div>
  90 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
  91 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
  92 + </template>
  93 + </el-table-column>
  94 + </el-table>
  95 + <el-table v-if="ontype=='2'" :data="tableData"
  96 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  97 + <el-table-column label="序号" width="50">
  98 + <template slot-scope="scope">
  99 + {{scope.$index +1}}
  100 + </template>
  101 + </el-table-column>
  102 + <el-table-column label="广告位名称" prop="advertisingName" show-overflow-tooltip>
  103 + </el-table-column>
  104 + <el-table-column label="广告位类型" prop="advertisingType" show-overflow-tooltip>
  105 + </el-table-column>
  106 + <el-table-column label="创建人" prop="createUser"> </el-table-column>
  107 + <el-table-column label="提交时间" prop="createDate"> </el-table-column>
  108 + <!-- <el-table-column prop="publishStatus" label="发布状态" >
  109 + <template slot-scope="scope">
  110 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'待发布':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
  111 + </template>
  112 + </el-table-column>
  113 + <el-table-column prop="leaseExpirationDate" label="租赁到期时间" >
  114 + </el-table-column>
  115 + <el-table-column label="操作" fixed="right">
  116 + <template slot-scope="scope">
  117 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  118 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
  119 + </div>
  120 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
  121 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
  122 + @click="opencl(scope.row,'gg')">发布</div>
  123 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
  124 + @click="removeinfozz(scope.row,'2','下架')">下架</div>
  125 + </template>
  126 + </el-table-column> -->
  127 + <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
  128 + <template slot-scope="scope">
  129 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
  130 + </template>
  131 + </el-table-column>
  132 + <el-table-column label="操作" min-width="100" fixed="right">
  133 + <template slot-scope="scope">
  134 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  135 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  136 + @click="removeinfo(scope.row,'编辑')">编辑
  137 + </div>
  138 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  139 + @click="closemsg(scope.row)">删除</div>
  140 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  141 + @click="opencl(scope.row,'gg')">发布</div>
  142 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
  143 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
  144 + </template>
  145 + </el-table-column>
  146 + </el-table>
  147 + <el-table v-if="ontype=='3'" :data="tableData"
  148 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  149 + <el-table-column label="序号" width="50">
  150 + <template slot-scope="scope">
  151 + {{scope.$index +1}}
  152 + </template>
  153 + </el-table-column>
  154 + <el-table-column label="场地名称" prop="venueName" show-overflow-tooltip>
  155 + </el-table-column>
  156 + <el-table-column label="场地类型" prop="venueType" show-overflow-tooltip>
  157 + </el-table-column>
  158 + <el-table-column label="实际使用面积(元/m²)" prop="actualArea" show-overflow-tooltip>
  159 + <template slot-scope="scope">
  160 + {{scope.row.actualArea}}元/m²
  161 + </template>
  162 + </el-table-column>
  163 + <el-table-column label="所属区域" prop="district" show-overflow-tooltip>
  164 + </el-table-column>
  165 + <!-- <el-table-column label="详细位置" prop="detailedLocation" show-overflow-tooltip>
  166 + </el-table-column> -->
  167 + <!-- <el-table-column prop="publishStatus" label="发布状态">
  168 + <template slot-scope="scope">
  169 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'待发布':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
  170 + </template>
  171 + </el-table-column>
  172 + <el-table-column label="操作" fixed="right">
  173 + <template slot-scope="scope">
  174 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  175 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
  176 + </div>
  177 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
  178 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="opencl(scope.row,'cd')">发布</div>
  179 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
  180 + @click="removeinfozz(scope.row,'2','下架')">下架</div>
  181 + </template>
  182 + </el-table-column> -->
  183 + <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
  184 + <template slot-scope="scope">
  185 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
  186 + </template>
  187 + </el-table-column>
  188 + <el-table-column label="操作" min-width="100" fixed="right">
  189 + <template slot-scope="scope">
  190 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  191 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  192 + @click="removeinfo(scope.row,'编辑')">编辑
  193 + </div>
  194 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  195 + @click="closemsg(scope.row)">删除</div>
  196 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  197 + @click="opencl(scope.row,'cd')">发布</div>
  198 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
  199 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
  200 + </template>
  201 + </el-table-column>
  202 + </el-table>
  203 + <div style="display: flex;justify-content: space-between;" class="bom">
  204 + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
  205 + <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
  206 + background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
  207 + @current-change="handleCurrentChange">
  208 + </el-pagination>
  209 + </div>
  210 +
  211 + </div>
  212 +
  213 + </div>
  214 +
  215 +
  216 +
  217 +
  218 +
  219 +
  220 + <div class="zhuti" v-if="onaction == '2'">
  221 + <div style="height:58px;line-height:58px;">
  222 + <div style="color:#0006">
  223 + <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span
  224 + style="padding:0 5px;">></span> <span style="color:#000000e6">新增</span></div>
  225 + </div>
  226 + <div style="margin: 0 0;">
  227 + <div style="display: flex;font-size: 14px">
  228 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
  229 + </div>
  230 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
  231 + 广告位</div>
  232 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地
  233 + </div>
  234 + </div>
  235 + </div>
  236 + <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
  237 + <add @removeonaction="removeonaction"></add>
  238 + </div>
  239 + <div v-if="ontype == '2'" style="padding: 20px 20px 20px 0;">
  240 + <addmap @removeonaction="removeonaction" type="all" :leixing="leixing"></addmap>
  241 + </div>
  242 + <div v-if="ontype == '3'" style="padding: 20px 20px 20px 0;">
  243 + <addcd @removeonaction="removeonaction"></addcd>
  244 + </div>
  245 + </div>
  246 + <div class="zhuti" v-if="onaction == '3'">
  247 + <div style="height:58px;line-height:58px;">
  248 + <div style="color:#0006">
  249 + <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span
  250 + style="padding:0 5px;">></span> <span style="color:#000000e6">查看</span></div>
  251 + </div>
  252 + <div v-if="ontype == '1'">
  253 + <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
  254 + </div>
  255 + <div v-if="ontype == '2'">
  256 + <chakanmap :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></chakanmap>
  257 + </div>
  258 + <div v-if="ontype == '3'">
  259 + <chakancd :editbgid="detailsinfo" @removeonaction="removeonaction"></chakancd>
  260 + </div>
  261 + </div>
  262 + <div class="zhuti" v-if="onaction == '4'">
  263 + <div style="height:58px;line-height:58px;">
  264 + <div style="color:#0006">
  265 + <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span
  266 + style="padding:0 5px;">></span> <span style="color:#000000e6">{{contractChangeReason}}</span></div>
  267 + </div>
  268 + <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
  269 + <add :info="detailsinfo" @removeonaction="removeonaction"></add>
  270 + </div>
  271 + <div v-if="ontype == '2'" style="padding: 20px 20px 20px 0;">
  272 + <addmap :info="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></addmap>
  273 + </div>
  274 + <div v-if="ontype == '3'" style="padding: 20px 20px 20px 0;">
  275 + <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd>
  276 + </div>
  277 + </div>
  278 + <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
  279 + :close-on-press-escape="false" :show-close="false">
  280 + <cl :type="ontype == '1'?'商铺':ontype == '2'?'广告位':ontype == '3'?'场地':'-'" :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
  281 + </el-dialog>
  282 + </div>
  283 +
  284 +
  285 +</template>
  286 +
  287 +<script>
  288 + import {
  289 + cereResourceStrategy,
  290 + editStatus,
  291 + cereBusinessOperationadd
  292 + } from '../../api/newly.js'
  293 + import {
  294 + ceGetAll
  295 + } from '../../api/sam.js'
  296 + import * as information from '../../api/information';
  297 + import * as map1 from '../../api/map1';
  298 + import {
  299 + likeGet,
  300 + } from '../../api/map1'
  301 + import {
  302 + getAlls,
  303 + changAlls
  304 + } from '../../api/information';
  305 + import add from '../../components/add/addinformation'
  306 + import resourceCommodity from '../../components/resourceCommodity/index'
  307 + import MapContainer from "@/components/MapContainer/MapContainer"
  308 + import addmap from '../../components/add/addmap'
  309 + import addcd from '../../components/add/addcd'
  310 + import chakanmap from '../../components/chakan/map'
  311 + import chakancd from '../../components/chakan/cd'
  312 + import cl from '@/components/change/cl.vue'
  313 + import mapchakannew from '@/components/newmap/map'
  314 + export default {
  315 + data() {
  316 + return {
  317 + oncetype:'',
  318 + name: '',
  319 + oninfo: {},
  320 + celueData: [],
  321 + clData: [],
  322 + multipleSelection: [],
  323 + addcl: false,
  324 + leixing: true,
  325 + //传地图数据
  326 + parentMessage: [],
  327 + ontype: '1',
  328 + contractChangeReason: '',
  329 + detailsinfo: {},
  330 + pagequery: {
  331 + pageNumber: 0,
  332 + pageSize: 10,
  333 + },
  334 + tableData: [],
  335 + total: 0,
  336 + onaction: '1',
  337 + formInline: {},
  338 + pageindex: {
  339 + pageNumber: 1,
  340 + pageSize: 10,
  341 + },
  342 + }
  343 + },
  344 + components: {
  345 + mapchakannew,
  346 + cl,
  347 + chakancd,
  348 + addcd,
  349 + addmap,
  350 + chakanmap,
  351 + MapContainer,
  352 + add,
  353 + resourceCommodity,
  354 + },
  355 + created() {
  356 + this.getAll()
  357 + },
  358 + methods: {
  359 + minSev(e) {
  360 + this.multipleSelection = e
  361 + console.error(this.multipleSelection)
  362 + let ids = []
  363 + for (let index = 0; index < this.multipleSelection.length; index++) {
  364 + ids.push(this.multipleSelection[index].id)
  365 + }
  366 + console.error(this.oninfo)
  367 + let c1 = {
  368 + resourcesId: this.oncetype + this.oninfo.id,
  369 + rentalPoliciesIds: ids,
  370 + }
  371 + if(c1.rentalPoliciesIds.length==0){
  372 + this.$message({
  373 + message: '请选择策略进行绑定',
  374 + type: 'warning'
  375 + })
  376 + return
  377 + }
  378 + console.error(c1)
  379 + cereResourceStrategy(c1).then(res => {
  380 + if (res.code == 200) {
  381 + this.addcl = false
  382 + this.$message({
  383 + message: '绑定成功',
  384 + type: 'success'
  385 + })
  386 + editStatus({
  387 + resourcesId: this.oncetype + this.oninfo.id,
  388 + publishStatus: '1'
  389 + }).then(res => {
  390 + this.onSubmit()
  391 + })
  392 + cereBusinessOperationadd({
  393 + type: '发布',
  394 + resourceId: this.oncetype + this.oninfo.id,
  395 + operator: localStorage.getItem('roleName'),
  396 + operationTime: this.gettime()
  397 + }).then(res => {
  398 + console.error(res)
  399 + })
  400 + } else {
  401 + this.$message({
  402 + message: '绑定失败',
  403 + type: 'error'
  404 + })
  405 + }
  406 + })
  407 + },
  408 + mingClose() {
  409 + this.multipleSelection = []
  410 + this.addcl = false
  411 + },
  412 + async opencl(row, e) {
  413 + this.oncetype = e
  414 + this.oninfo = row
  415 + this.multipleSelection = []
  416 + this.addcl = true
  417 + },
  418 + chenge(e) {
  419 + this.ontype = null
  420 + // 延迟一秒执行
  421 + setTimeout(() => {
  422 + this.ontype = e
  423 + this.pagequery.pageNumber = 0
  424 + this.getAll()
  425 + this.$forceUpdate();
  426 + }, 10)
  427 +
  428 + },
  429 + gettime() {
  430 + // 获取当前时间
  431 + let currentTime = new Date();
  432 +
  433 + // 获取年份
  434 + let year = currentTime.getFullYear();
  435 +
  436 + // 获取月份（注意月份是从0开始计数的，所以需要加1）
  437 + let month = currentTime.getMonth() + 1;
  438 +
  439 + // 获取日期
  440 + let day = currentTime.getDate();
  441 +
  442 + // 获取小时
  443 + let hours = currentTime.getHours();
  444 +
  445 + // 获取分钟
  446 + let minutes = currentTime.getMinutes();
  447 +
  448 + // 获取秒数
  449 + let seconds = currentTime.getSeconds();
  450 +
  451 + // 获取毫秒数
  452 + let milliseconds = currentTime.getMilliseconds();
  453 +
  454 + // 格式化时间为 YYYY-MM-DD
  455 + let formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
  456 +
  457 + // 格式化时间为 HH:MM:SS
  458 + let formattedTime =
  459 + `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
  460 +
  461 + // 格式化时间为 YYYY-MM-DD HH:MM:SS
  462 + let formattedDateTime = `${formattedDate} ${formattedTime}`;
  463 + return formattedDateTime
  464 +
  465 + },
  466 + removeinfozz(row, e, tit) {
  467 + let that = this
  468 + this.$confirm('确定要' + tit + '吗？', '提示', {
  469 + confirmButtonText: '确定',
  470 + cancelButtonText: '取消',
  471 + type: 'warning'
  472 + }).then(() => {
  473 + if (this.ontype == '1') {
  474 + information.editList({
  475 + ...row,
  476 + publishStatus: e
  477 + }).then(res => {
  478 + console.error(res)
  479 + if (res.code == 200) {
  480 + this.$message({
  481 + message: tit + '成功',
  482 + type: 'success'
  483 + })
  484 + this.removeonaction('1')
  485 + cereBusinessOperationadd({
  486 + type: tit,
  487 + resourceId: 'sp' + row.id,
  488 + operator: localStorage.getItem('roleName'),
  489 + operationTime: that.gettime()
  490 + }).then(res => {
  491 + console.error(res)
  492 + })
  493 + } else {
  494 + this.$message({
  495 + message: res.msg,
  496 + type: 'error'
  497 + })
  498 + }
  499 + })
  500 + } else if (this.ontype == '2') {
  501 + map1.editList({
  502 + ...row,
  503 + publishStatus: e
  504 + }).then(res => {
  505 + console.error(res)
  506 + if (res.code == 200) {
  507 + this.$message({
  508 + message: tit + '成功',
  509 + type: 'success'
  510 + })
  511 + this.removeonaction('1')
  512 + cereBusinessOperationadd({
  513 + type: tit,
  514 + resourceId: 'gg' + row.id,
  515 + operator: localStorage.getItem('roleName'),
  516 + operationTime: that.gettime()
  517 + }).then(res => {
  518 + console.error(res)
  519 + })
  520 + } else {
  521 + this.$message({
  522 + message: res.msg,
  523 + type: 'error'
  524 + })
  525 + }
  526 + })
  527 + } else if (this.ontype == '3') {
  528 + information.changedit({
  529 + ...row,
  530 + publishStatus: e
  531 + }).then(res => {
  532 + console.error(res)
  533 + if (res.code == 200) {
  534 + this.$message({
  535 + message: tit + '成功',
  536 + type: 'success'
  537 + })
  538 + this.removeonaction('1')
  539 + cereBusinessOperationadd({
  540 + type: tit,
  541 + resourceId: 'cd' + row.id,
  542 + operator: localStorage.getItem('roleName'),
  543 + operationTime: that.gettime()
  544 + }).then(res => {
  545 + console.error(res)
  546 + })
  547 + } else {
  548 + this.$message({
  549 + message: res.msg,
  550 + type: 'error'
  551 + })
  552 + }
  553 + })
  554 + }
  555 +
  556 + })
  557 + },
  558 + details(row) {
  559 + this.detailsinfo = row
  560 + this.onaction = '3'
  561 + },
  562 + removeinfo(row, e) {
  563 + this.contractChangeReason = e
  564 + this.detailsinfo = row
  565 + this.onaction = '4'
  566 + },
  567 + async getAll() {
  568 + if (this.ontype == '1') {
  569 + const res = await getAlls({
  570 + ...this.pagequery,
  571 + shopName: this.name
  572 + })
  573 + this.tableData = res.data.content
  574 + this.total = res.data.totalElements
  575 + } else if (this.ontype == '2') {
  576 + const res = await likeGet({
  577 + ...this.pagequery,
  578 + advertisingName: this.name
  579 + })
  580 + this.tableData = res.data.content
  581 + this.total = res.data.totalElements
  582 + } else if (this.ontype == '3') {
  583 + const res = await changAlls({
  584 + ...this.pagequery,
  585 + venueName: this.name
  586 + })
  587 + this.tableData = res.data.content
  588 + this.total = res.data.totalElements
  589 + }
  590 + // console.error(']]]]]]]]]')
  591 + // console.error(this.tableData)
  592 + this.$refs.mapchakannewrefs.initMap(this.tableData)
  593 +
  594 + },
  595 + removeonaction(e) {
  596 + console.error(e)
  597 + this.onaction = e
  598 + this.pagequery.pageNumber = 0
  599 + this.getAll()
  600 + },
  601 + handleCurrentChange(val) {
  602 + this.pagequery.pageNumber = val - 1
  603 + this.getAll()
  604 + },
  605 + handleSizeChange(val) {
  606 + this.pagequery.pageSize = val
  607 + },
  608 + // 查询按钮
  609 + async onSubmit() {
  610 + this.pagequery.pageNumber = 0
  611 + this.getAll()
  612 + },
  613 + //重置按钮
  614 + resetting() {
  615 + this.pagequery = {
  616 + pageNumber: 0,
  617 + pageSize: 10,
  618 + },
  619 + this.name = ''
  620 + this.getAll()
  621 + },
  622 + //删除
  623 + closemsg(item) {
  624 + const h = this.$createElement;
  625 + this.$msgbox({
  626 + title: '消息',
  627 + message: h('p', null, [
  628 + h('span', null, '是否删除 '),
  629 + ]),
  630 + showCancelButton: true,
  631 + showClose: false,
  632 + confirmButtonText: '确定',
  633 + cancelButtonText: '取消',
  634 + customClass: 'oe-dialog-btn',
  635 + beforeClose: (action, instance, done) => {
  636 + if (action === 'confirm') {
  637 + if (this.ontype == '1') {
  638 + information.delList({
  639 + id: item.id
  640 + }).then(res => {
  641 + this.$message({
  642 + message: '删除成功',
  643 + type: 'success'
  644 + })
  645 + this.getAll()
  646 + done();
  647 + })
  648 + } else if (this.ontype == '2') {
  649 + map1.delList({
  650 + id: item.id
  651 + }).then(res => {
  652 + this.$message({
  653 + message: '删除成功',
  654 + type: 'success'
  655 + })
  656 + this.getAll()
  657 + done();
  658 + })
  659 + } else if (this.ontype == '3') {
  660 + information.changDel({
  661 + id: item.id
  662 + }).then(res => {
  663 + this.$message({
  664 + message: '删除成功',
  665 + type: 'success'
  666 + })
  667 + this.getAll()
  668 + done();
  669 + })
  670 + }
  671 + } else {
  672 + done();
  673 + }
  674 + }
  675 + })
  676 + },
  677 + //地图详细
  678 + HandMapItem(item) {
  679 + console.log(item)
  680 +
  681 +
  682 + // if (this.activeName == 'first') {
  683 + // this.editbgid = item
  684 + // this.restype = '商铺'
  685 +
  686 + // this.showBian = true
  687 + // if (typeof this.editbgid.mapPunctuation == 'string') {
  688 + // this.parentMessage = JSON.parse(this.editbgid.mapPunctuation)
  689 + // }
  690 +
  691 + // } else if (this.activeName == 'second') {
  692 + // this.editbgid = item
  693 + // this.restype = '广告位'
  694 +
  695 + // this.showBian = true
  696 + // if (item.advertisingType == '线上广告位') {
  697 + // this.leixing = true
  698 + // } else {
  699 + // this.leixing = false
  700 + // }
  701 +
  702 + // if (typeof this.editbgid.mapMarker == 'string') {
  703 + // this.parentMessage = JSON.parse(this.editbgid.mapMarker)
  704 + // }
  705 + // } else if (this.activeName == 'third') {
  706 + // this.editbgid = item
  707 + // this.restype = '场地'
  708 +
  709 + // this.showBian = true
  710 + // if (typeof this.editbgid.mapMarker == 'string') {
  711 + // this.parentMessage = JSON.parse(this.editbgid.mapMarker)
  712 + // }
  713 + // } else if (this.activeName == 'fourth') {
  714 +
  715 + // }
  716 +
  717 +
  718 + },
  719 + }
  720 +
  721 + }
  722 +</script>
  723 +<style lang="scss" scoped>
  724 + .formSearch {
  725 + display: flex;
  726 + width: 100%;
  727 + font-size: 14px;
  728 + justify-content: space-between;
  729 + }
  730 +
  731 + .zhuti {
  732 + padding: 0 20px 20px 20px;
  733 + min-height: calc(100vh - 50px - 20px);
  734 + background-color: #Fff;
  735 +
  736 + }
  737 +
  738 + .chengeXia {
  739 + border-bottom: 6px solid #3F9B6A;
  740 + padding-bottom: 4px;
  741 + color: #3F9B6A;
  742 + }
  743 +
  744 + .tableBtn {
  745 + display: inline-block;
  746 + margin-right: 10px;
  747 + cursor: pointer;
  748 + }
  749 +
  750 + ::v-deep .el-dialog__body {
  751 + padding: 0 0 !important;
  752 + }
  753 +
  754 + .el-dialog__header {
  755 + padding: 0;
  756 + display: none;
  757 + }
  758 +</style>
admin-web-master/src/views/detect/admap.vue
  View file @de91fb0
@@ -5,14 +5,139 @@ @@ -5,14 +5,139 @@
5 <div style="color:#0006"> <span>招商资源监测</span> <span style="padding:0 5px;">></span> <span 5 <div style="color:#0006"> <span>招商资源监测</span> <span style="padding:0 5px;">></span> <span
6 style="color:#000000e6">资源地图</span></div> 6 style="color:#000000e6">资源地图</span></div>
7 </div> 7 </div>
  8 + <div>
  9 + <div style="display: flex;margin-bottom: 20px;width: 100%;justify-content: space-between;">
  10 + <div class="boxitem">
  11 + <div class="leftrigth">
  12 + <div class="tit">
  13 + 租赁情况
  14 + </div>
  15 + <div class="num">
  16 + {{publishStatusinfo.source}}
  17 + </div>
  18 + </div>
  19 + <dv class="leftrigth">
  20 + <el-select size="mini" v-model="topinfo.publishStatus" clearable placeholder="请选择"
  21 + style="width: 185px;font-size: 8px;" @change="changepublishStatus">
  22 + <el-option label="待发布" value="0"></el-option>
  23 + <el-option label="待审核" value="1"></el-option>
  24 + <el-option label="已发布" value="2"></el-option>
  25 + <el-option label="不通过" value="3"></el-option>
  26 + <el-option label="已租赁" value="4"></el-option>
  27 + </el-select>
  28 + <div style="text-align: right;">
  29 + <!-- <el-button size="mini" style="background-color: #3F9B6A;color: #fff;font-size: 8px;padding: 0;text-align: center;height: 25px;line-height: 25px;min-width: 80px;">地图显示</el-button> -->
  30 + </div>
  31 + </dv>
  32 + </div>
  33 + <div class="boxitem">
  34 + <div class="leftrigth">
  35 + <div class="tit">
  36 + 绿道段
  37 + </div>
  38 + <div class="num">
  39 + {{belongingGreenwaySectioninfo.source}}
  40 + </div>
  41 + </div>
  42 + <dv class="leftrigth">
  43 + <el-select size="mini" v-model="topinfo.belongingGreenwaySection" clearable placeholder="请选择"
  44 + style="width: 185px;font-size: 8px;" @change="changebelongingGreenwaySection">
  45 + <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
  46 + :key="index"></el-option>
  47 + </el-select>
  48 + <div style="text-align: right;">
  49 + <!-- <el-button size="mini" style="background-color: #3F9B6A;color: #fff;font-size: 8px;padding: 0;text-align: center;height: 25px;line-height: 25px;min-width: 80px;">地图显示</el-button> -->
  50 + </div>
  51 + </dv>
  52 + </div>
  53 + <div class="boxitem">
  54 + <div class="leftrigth">
  55 + <div class="tit">
  56 + 绿道公园
  57 + </div>
  58 + <div class="num">
  59 + {{belongingParkTrailinfo.source}}
  60 + </div>
  61 + </div>
  62 + <dv class="leftrigth">
  63 + <el-select size="mini" v-model="topinfo.belongingParkTrail" clearable placeholder="请选择"
  64 + style="width: 185px;font-size: 8px;" @change="changebelongingParkTrail">
  65 + <el-option :label="item.name" :value="item.code" v-for="(item,index) in gongyuanList"
  66 + :key="index"></el-option>
  67 + </el-select>
  68 + <div style="text-align: right;">
  69 + <!-- <el-button size="mini" style="background-color: #3F9B6A;color: #fff;font-size: 8px;padding: 0;text-align: center;height: 25px;line-height: 25px;min-width: 80px;">地图显示</el-button> -->
  70 + </div>
  71 + </dv>
  72 + </div>
  73 + <div class="boxitem">
  74 + <div class="leftrigth">
  75 + <div class="tit">
  76 + 资源数量
  77 + </div>
  78 + <div class="num">
  79 + {{alllistnum}}
  80 + </div>
  81 + </div>
  82 + <dv class="leftrigth">
  83 + <el-select size="mini" v-model="topinfo.type" clearable placeholder="请选择"
  84 + style="width: 185px;font-size: 8px;" @change="changetype">
  85 + <el-option label="商铺" value="0"></el-option>
  86 + <el-option label="广告位" value="1"></el-option>
  87 + <el-option label="场地" value="2"></el-option>
  88 + </el-select>
  89 + <div style="text-align: right;">
  90 + <!-- <el-button size="mini" style="background-color: #3F9B6A;color: #fff;font-size: 8px;padding: 0;text-align: center;height: 25px;line-height: 25px;min-width: 80px;">地图显示</el-button> -->
  91 + </div>
  92 + </dv>
  93 + </div>
  94 + </div>
  95 + </div>
8 <div class="formSearch"> 96 <div class="formSearch">
9 <el-form :inline="true"> 97 <el-form :inline="true">
10 <el-form-item label="资源名称" prop="name"> 98 <el-form-item label="资源名称" prop="name">
11 <el-input v-model="name" placeholder="请输入" maxlength="50"></el-input> 99 <el-input v-model="name" placeholder="请输入" maxlength="50"></el-input>
12 </el-form-item> 100 </el-form-item>
  101 + <el-form-item label="状态" prop="allpublishStatus">
  102 + <el-select v-model="allpublishStatus" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
  103 + <el-option label="待发布" value="0"></el-option>
  104 + <el-option label="待审核" value="1"></el-option>
  105 + <el-option label="已发布" value="2"></el-option>
  106 + <el-option label="不通过" value="3"></el-option>
  107 + <el-option label="已租赁" value="4"></el-option>
  108 + </el-select>
  109 + </el-form-item>
  110 +
  111 + <el-form-item label="所属区域" prop="belongingRegion" v-if="ontype=='1'">
  112 + <el-select v-model="pagequeryshop.belongingRegion" clearable placeholder="请选择"
  113 + style="width: 168px;margin-right: 15px">
  114 + <el-option v-for="(item,index) in regionOptions" :key="index" :label="item.label"
  115 + :value="item.value"></el-option>
  116 + </el-select>
  117 + </el-form-item>
  118 + <el-form-item label="商铺类型" prop="shopType" v-if="ontype=='1'">
  119 + <el-select v-model="pagequeryshop.shopType" clearable placeholder="请选择"
  120 + style="width: 168px;margin-right: 15px">
  121 + <el-option v-for="(item,index) in typeShopList" :key="index" :label="item.label"
  122 + :value="item.value"></el-option>
  123 + </el-select>
  124 + </el-form-item>
  125 + <el-form-item label="所属区域" prop="district" v-if="ontype=='3'">
  126 + <el-select v-model="pagequerycd.district" clearable placeholder="请选择"
  127 + style="width: 168px;margin-right: 15px">
  128 + <el-option v-for="(item,index) in regionOptions" :key="index" :label="item.label"
  129 + :value="item.value"></el-option>
  130 + </el-select>
  131 + </el-form-item>
  132 + <el-form-item label="场地类型" prop="venueType" v-if="ontype=='3'">
  133 + <el-select v-model="pagequerycd.venueType" placeholder="请选择" style="width: 100%;">
  134 + <el-option v-for="(item,index) in siteTypeList" :key="index" :label="item.label"
  135 + :value="item.value"></el-option>
  136 + </el-select>
  137 + </el-form-item>
13 </el-form> 138 </el-form>
14 139
15 - <div> 140 + <div style="width: 200px;">
16 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询 141 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
17 </el-button> 142 </el-button>
18 <el-button @click="resetting" class="buttonHover" 143 <el-button @click="resetting" class="buttonHover"
@@ -33,6 +158,13 @@ @@ -33,6 +158,13 @@
33 <mapchakannew :ontype="ontype" ref="mapchakannewrefs"></mapchakannew> 158 <mapchakannew :ontype="ontype" ref="mapchakannewrefs"></mapchakannew>
34 </div> 159 </div>
35 </div> 160 </div>
  161 + <div style="display: flex;margin-bottom: 20px;width: 100%;flex-direction: row-reverse;font-size: 12px;">
  162 + <div v-for="(item,index) in typelist" :key="index"
  163 + style="display: flex;margin-left: 15px;align-items: center;">
  164 + <div style="width: 10px;height: 10px;margin-right: 3px;" :style="'background:'+item.background"></div>
  165 + <div :style="'color:'+item.background">{{ item.name }}</div>
  166 + </div>
  167 + </div>
36 <div style="margin: 20px 0;"> 168 <div style="margin: 20px 0;">
37 <div style="display: flex;font-size: 14px"> 169 <div style="display: flex;font-size: 14px">
38 <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺 170 <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
@@ -54,7 +186,8 @@ @@ -54,7 +186,8 @@
54 <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column> 186 <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
55 <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip> 187 <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
56 <template slot-scope="scope"> 188 <template slot-scope="scope">
57 - {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}} 189 + {{gettypeShopList(scope.row.shopType) || '无'}}
  190 + <!-- {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}} -->
58 </template> 191 </template>
59 </el-table-column> 192 </el-table-column>
60 <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip> 193 <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
@@ -74,7 +207,7 @@ @@ -74,7 +207,7 @@
74 <el-table-column label="提交时间" prop="createDate"> </el-table-column> 207 <el-table-column label="提交时间" prop="createDate"> </el-table-column>
75 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 208 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
76 <template slot-scope="scope"> 209 <template slot-scope="scope">
77 - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}} 210 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
78 </template> 211 </template>
79 </el-table-column> 212 </el-table-column>
80 <el-table-column label="操作" min-width="100" fixed="right"> 213 <el-table-column label="操作" min-width="100" fixed="right">
@@ -126,7 +259,7 @@ @@ -126,7 +259,7 @@
126 </el-table-column> --> 259 </el-table-column> -->
127 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 260 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
128 <template slot-scope="scope"> 261 <template slot-scope="scope">
129 - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}} 262 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
130 </template> 263 </template>
131 </el-table-column> 264 </el-table-column>
132 <el-table-column label="操作" min-width="100" fixed="right"> 265 <el-table-column label="操作" min-width="100" fixed="right">
@@ -156,9 +289,9 @@ @@ -156,9 +289,9 @@
156 <el-table-column label="场地类型" prop="venueType" show-overflow-tooltip> 289 <el-table-column label="场地类型" prop="venueType" show-overflow-tooltip>
157 </el-table-column> 290 </el-table-column>
158 <el-table-column label="实际使用面积(元/m²)" prop="actualArea" show-overflow-tooltip> 291 <el-table-column label="实际使用面积(元/m²)" prop="actualArea" show-overflow-tooltip>
159 - <template slot-scope="scope">  
160 - {{scope.row.actualArea}}元/m²  
161 - </template> 292 + <template slot-scope="scope">
  293 + {{scope.row.actualArea}}元/m²
  294 + </template>
162 </el-table-column> 295 </el-table-column>
163 <el-table-column label="所属区域" prop="district" show-overflow-tooltip> 296 <el-table-column label="所属区域" prop="district" show-overflow-tooltip>
164 </el-table-column> 297 </el-table-column>
@@ -182,7 +315,7 @@ @@ -182,7 +315,7 @@
182 </el-table-column> --> 315 </el-table-column> -->
183 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 316 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
184 <template slot-scope="scope"> 317 <template slot-scope="scope">
185 - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}} 318 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
186 </template> 319 </template>
187 </el-table-column> 320 </el-table-column>
188 <el-table-column label="操作" min-width="100" fixed="right"> 321 <el-table-column label="操作" min-width="100" fixed="right">
@@ -221,7 +354,8 @@ @@ -221,7 +354,8 @@
221 <div style="height:58px;line-height:58px;"> 354 <div style="height:58px;line-height:58px;">
222 <div style="color:#0006"> 355 <div style="color:#0006">
223 <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span 356 <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span
224 - style="padding:0 5px;">></span> <span style="color:#000000e6">新增</span></div> 357 + style="padding:0 5px;">></span> <span style="color:#000000e6">新增</span>
  358 + </div>
225 </div> 359 </div>
226 <div style="margin: 0 0;"> 360 <div style="margin: 0 0;">
227 <div style="display: flex;font-size: 14px"> 361 <div style="display: flex;font-size: 14px">
@@ -247,7 +381,8 @@ @@ -247,7 +381,8 @@
247 <div style="height:58px;line-height:58px;"> 381 <div style="height:58px;line-height:58px;">
248 <div style="color:#0006"> 382 <div style="color:#0006">
249 <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span 383 <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span
250 - style="padding:0 5px;">></span> <span style="color:#000000e6">查看</span></div> 384 + style="padding:0 5px;">></span> <span style="color:#000000e6">查看</span>
  385 + </div>
251 </div> 386 </div>
252 <div v-if="ontype == '1'"> 387 <div v-if="ontype == '1'">
253 <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity> 388 <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
@@ -263,7 +398,8 @@ @@ -263,7 +398,8 @@
263 <div style="height:58px;line-height:58px;"> 398 <div style="height:58px;line-height:58px;">
264 <div style="color:#0006"> 399 <div style="color:#0006">
265 <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span 400 <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span
266 - style="padding:0 5px;">></span> <span style="color:#000000e6">{{contractChangeReason}}</span></div> 401 + style="padding:0 5px;">></span> <span style="color:#000000e6">{{contractChangeReason}}</span>
  402 + </div>
267 </div> 403 </div>
268 <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;"> 404 <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
269 <add :info="detailsinfo" @removeonaction="removeonaction"></add> 405 <add :info="detailsinfo" @removeonaction="removeonaction"></add>
@@ -277,7 +413,8 @@ @@ -277,7 +413,8 @@
277 </div> 413 </div>
278 <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false" 414 <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
279 :close-on-press-escape="false" :show-close="false"> 415 :close-on-press-escape="false" :show-close="false">
280 - <cl :type="ontype == '1'?'商铺':ontype == '2'?'广告位':ontype == '3'?'场地':'-'" :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl> 416 + <cl :type="ontype == '1'?'商铺':ontype == '2'?'广告位':ontype == '3'?'场地':'-'" :resourcesId="oncetype+oninfo.id"
  417 + v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
281 </el-dialog> 418 </el-dialog>
282 </div> 419 </div>
283 420
@@ -288,8 +425,17 @@ @@ -288,8 +425,17 @@
288 import { 425 import {
289 cereResourceStrategy, 426 cereResourceStrategy,
290 editStatus, 427 editStatus,
291 - cereBusinessOperationadd  
292 - } from '../../api/newly.js' 428 + cereBusinessOperationadd,
  429 +
  430 + rentalSituationStatistics,
  431 + areaShopStatistics,
  432 + areaParkStatistics
  433 + } from '@/api/newly.js'
  434 + import {
  435 + gongyuan,
  436 + lvdaoduan,
  437 + parkTrails
  438 + } from '@/api/information.js';
293 import { 439 import {
294 ceGetAll 440 ceGetAll
295 } from '../../api/sam.js' 441 } from '../../api/sam.js'
@@ -314,7 +460,56 @@ @@ -314,7 +460,56 @@
314 export default { 460 export default {
315 data() { 461 data() {
316 return { 462 return {
317 - oncetype:'', 463 + alllistnum: 0,
  464 + typelist: [{
  465 + name: '已租赁',
  466 + background: '#2AB867',
  467 + },
  468 + {
  469 + name: '已发布',
  470 + background: '#4A77C9',
  471 + },
  472 + {
  473 + name: '不通过',
  474 + background: '#E75A46',
  475 + },
  476 + {
  477 + name: '待审核',
  478 + background: '#ECAF5C',
  479 + },
  480 + {
  481 + name: '待发布',
  482 + background: '#707B86',
  483 + },
  484 + ],
  485 + pagequerycd: {
  486 + district: '',
  487 + venueType: ''
  488 + },
  489 + pagequeryshop: {
  490 + belongingRegion: '',
  491 + belongingDepartment: '',
  492 + shopType: ''
  493 + },
  494 + allpublishStatus: '',
  495 + lvdaoList: [],
  496 + gongyuanList: [],
  497 + topinfo: {
  498 + publishStatus: '',
  499 + belongingGreenwaySection: '',
  500 + belongingParkTrail: '',
  501 + type: ''
  502 + },
  503 + publishStatusinfo: {
  504 + source: 0
  505 + },
  506 + belongingGreenwaySectioninfo: {
  507 + source: 0
  508 + },
  509 + belongingParkTrailinfo: {
  510 + source: 0
  511 + },
  512 + oncetype: '',
318 name: '', 513 name: '',
319 oninfo: {}, 514 oninfo: {},
320 celueData: [], 515 celueData: [],
@@ -341,6 +536,17 @@ @@ -341,6 +536,17 @@
341 }, 536 },
342 } 537 }
343 }, 538 },
  539 + computed: {
  540 + regionOptions() {
  541 + return this.$store.state.cent.regionList;
  542 + },
  543 + typeShopList() {
  544 + return this.$store.state.cent.typeShopList;
  545 + },
  546 + siteTypeList() {
  547 + return this.$store.state.cent.siteTypeList;
  548 + }
  549 + },
344 components: { 550 components: {
345 mapchakannew, 551 mapchakannew,
346 cl, 552 cl,
@@ -352,10 +558,95 @@ @@ -352,10 +558,95 @@
352 add, 558 add,
353 resourceCommodity, 559 resourceCommodity,
354 }, 560 },
355 - created() { 561 + async created() {
  562 + const lvdao = await lvdaoduan()
  563 + const gongyua = await parkTrails()
  564 + this.lvdaoList = lvdao.data.concat(gongyua.data)
  565 + const budao = await gongyuan()
  566 + this.gongyuanList = budao.data.concat(gongyua.data)
356 this.getAll() 567 this.getAll()
  568 + this.changepublishStatus()
  569 + this.changebelongingGreenwaySection()
  570 + this.changebelongingParkTrail()
  571 + this.changetype()
357 }, 572 },
358 methods: { 573 methods: {
  574 + gettypeShopList(code) {
  575 + if (!code) {
  576 + return '无';
  577 + }
  578 + for (let i = 0; i < this.typeShopList.length; i++) {
  579 + const item = this.typeShopList[i];
  580 + item.value = item.value + ''
  581 + if (item.value === code) {
  582 + return item.label;
  583 + }
  584 + }
  585 + return '无';
  586 + },
  587 + changepublishStatus() {
  588 + rentalSituationStatistics({
  589 + rentalStatus: this.topinfo.publishStatus
  590 + }).then(res => {
  591 + console.error(res)
  592 + this.publishStatusinfo = res.data
  593 + })
  594 + },
  595 + changebelongingGreenwaySection() {
  596 + areaShopStatistics({
  597 + belongingGreenwaySection: this.topinfo.belongingGreenwaySection
  598 + }).then(res => {
  599 + console.error(res)
  600 + this.belongingGreenwaySectioninfo = res.data
  601 + })
  602 + },
  603 + async changetype() {
  604 + let nums = 0
  605 + if (this.topinfo.type == '') {
  606 + const res = await getAlls({
  607 + pageNumber: 0,
  608 + pageSize: 1,
  609 + })
  610 + nums = nums + res.data.totalElements
  611 + const res1 = await likeGet({
  612 + pageNumber: 0,
  613 + pageSize: 1,
  614 + })
  615 + nums = nums + res1.data.totalElements
  616 + const res2 = await changAlls({
  617 + pageNumber: 0,
  618 + pageSize: 1,
  619 + })
  620 + nums = nums + res2.data.totalElements
  621 + } else if (this.topinfo.type == '0') {
  622 + const res = await getAlls({
  623 + pageNumber: 0,
  624 + pageSize: 1,
  625 + })
  626 + nums = nums + res.data.totalElements
  627 + } else if (this.topinfo.type == '1') {
  628 + const res = await likeGet({
  629 + pageNumber: 0,
  630 + pageSize: 1,
  631 + })
  632 + nums = nums + res.data.totalElements
  633 + } else if (this.topinfo.type == '2') {
  634 + const res = await changAlls({
  635 + pageNumber: 0,
  636 + pageSize: 1,
  637 + })
  638 + nums = nums + res.data.totalElements
  639 + }
  640 + this.alllistnum = nums
  641 + },
  642 + changebelongingParkTrail() {
  643 + areaParkStatistics({
  644 + belongingParkTrail: this.topinfo.belongingParkTrail
  645 + }).then(res => {
  646 + console.error(res)
  647 + this.belongingParkTrailinfo = res.data
  648 + })
  649 + },
359 minSev(e) { 650 minSev(e) {
360 this.multipleSelection = e 651 this.multipleSelection = e
361 console.error(this.multipleSelection) 652 console.error(this.multipleSelection)
@@ -368,13 +659,13 @@ @@ -368,13 +659,13 @@
368 resourcesId: this.oncetype + this.oninfo.id, 659 resourcesId: this.oncetype + this.oninfo.id,
369 rentalPoliciesIds: ids, 660 rentalPoliciesIds: ids,
370 } 661 }
371 - if(c1.rentalPoliciesIds.length==0){  
372 - this.$message({  
373 - message: '请选择策略进行绑定',  
374 - type: 'warning'  
375 - })  
376 - return  
377 - } 662 + if (c1.rentalPoliciesIds.length == 0) {
  663 + this.$message({
  664 + message: '请选择策略进行绑定',
  665 + type: 'warning'
  666 + })
  667 + return
  668 + }
378 console.error(c1) 669 console.error(c1)
379 cereResourceStrategy(c1).then(res => { 670 cereResourceStrategy(c1).then(res => {
380 if (res.code == 200) { 671 if (res.code == 200) {
@@ -424,7 +715,7 @@ @@ -424,7 +715,7 @@
424 this.getAll() 715 this.getAll()
425 this.$forceUpdate(); 716 this.$forceUpdate();
426 }, 10) 717 }, 10)
427 - 718 +
428 }, 719 },
429 gettime() { 720 gettime() {
430 // 获取当前时间 721 // 获取当前时间
@@ -568,21 +859,26 @@ @@ -568,21 +859,26 @@
568 if (this.ontype == '1') { 859 if (this.ontype == '1') {
569 const res = await getAlls({ 860 const res = await getAlls({
570 ...this.pagequery, 861 ...this.pagequery,
571 - shopName: this.name 862 + shopName: this.name,
  863 + publishStatus: this.allpublishStatus,
  864 + ...this.pagequeryshop
572 }) 865 })
573 this.tableData = res.data.content 866 this.tableData = res.data.content
574 this.total = res.data.totalElements 867 this.total = res.data.totalElements
575 } else if (this.ontype == '2') { 868 } else if (this.ontype == '2') {
576 const res = await likeGet({ 869 const res = await likeGet({
577 ...this.pagequery, 870 ...this.pagequery,
578 - advertisingName: this.name 871 + advertisingName: this.name,
  872 + publishStatus: this.allpublishStatus
579 }) 873 })
580 this.tableData = res.data.content 874 this.tableData = res.data.content
581 this.total = res.data.totalElements 875 this.total = res.data.totalElements
582 } else if (this.ontype == '3') { 876 } else if (this.ontype == '3') {
583 const res = await changAlls({ 877 const res = await changAlls({
584 ...this.pagequery, 878 ...this.pagequery,
585 - venueName: this.name 879 + venueName: this.name,
  880 + publishStatus: this.allpublishStatus,
  881 + ...this.pagequerycd
586 }) 882 })
587 this.tableData = res.data.content 883 this.tableData = res.data.content
588 this.total = res.data.totalElements 884 this.total = res.data.totalElements
@@ -617,6 +913,16 @@ @@ -617,6 +913,16 @@
617 pageSize: 10, 913 pageSize: 10,
618 }, 914 },
619 this.name = '' 915 this.name = ''
  916 + this.allpublishStatus = ''
  917 + this.pagequeryshop = {
  918 + belongingRegion: '',
  919 + belongingDepartment: '',
  920 + shopType: ''
  921 + }
  922 + this.pagequerycd = {
  923 + district: '',
  924 + venueType: ''
  925 + }
620 this.getAll() 926 this.getAll()
621 }, 927 },
622 //删除 928 //删除
@@ -721,6 +1027,37 @@ @@ -721,6 +1027,37 @@
721 } 1027 }
722 </script> 1028 </script>
723 <style lang="scss" scoped> 1029 <style lang="scss" scoped>
  1030 + .boxitem {
  1031 + // width: 280px;
  1032 + width: 23%;
  1033 + padding: 10px;
  1034 + box-sizing: border-box;
  1035 + height: 110px;
  1036 + display: flex;
  1037 + justify-content: space-between;
  1038 + border: 1px solid #eee;
  1039 + font-size: 13px;
  1040 + margin-right: 20px;
  1041 +
  1042 + .leftrigth {
  1043 + display: flex;
  1044 + flex-direction: column;
  1045 + justify-content: space-between;
  1046 + height: 100%;
  1047 + }
  1048 +
  1049 + .num {
  1050 + font-size: 26px;
  1051 + color: #3F9B6A;
  1052 + }
  1053 +
  1054 + .tit {
  1055 + font-size: 13px;
  1056 + color: #000;
  1057 + line-height: 28px;
  1058 + }
  1059 + }
  1060 +
724 .formSearch { 1061 .formSearch {
725 display: flex; 1062 display: flex;
726 width: 100%; 1063 width: 100%;
admin-web-master/src/views/detect/information/index.vue
  View file @de91fb0
@@ -14,26 +14,34 @@ @@ -14,26 +14,34 @@
14 <el-input v-model="pagequery.shopName" placeholder="请输入" maxlength="50"></el-input> 14 <el-input v-model="pagequery.shopName" placeholder="请输入" maxlength="50"></el-input>
15 </el-form-item> 15 </el-form-item>
16 <el-form-item label="所属区域" prop="belongingRegion"> 16 <el-form-item label="所属区域" prop="belongingRegion">
17 - <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">  
18 - <el-option v-for="(item,index) in regionOptions"  
19 - :key="index" :label="item.label" :value="item.value"></el-option> 17 + <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择"
  18 + style="width: 168px;margin-right: 15px">
  19 + <el-option v-for="(item,index) in regionOptions" :key="index" :label="item.label"
  20 + :value="item.value"></el-option>
20 </el-select> 21 </el-select>
21 </el-form-item> 22 </el-form-item>
22 <el-form-item label="归属部门" prop="belongingDepartment"> 23 <el-form-item label="归属部门" prop="belongingDepartment">
23 <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input> 24 <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input>
24 </el-form-item> 25 </el-form-item>
25 - <el-form-item label="状态" prop="publishStatus">  
26 - <el-select v-model="pagequery.publishStatus" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">  
27 - <el-option label="待发布" value="0"></el-option>  
28 - <el-option label="待审核" value="1"></el-option>  
29 - <el-option label="已发布" value="2"></el-option>  
30 - <el-option label="不通过" value="3"></el-option>  
31 - <el-option label="已租赁" value="4"></el-option>  
32 - </el-select>  
33 - </el-form-item> 26 + <el-form-item label="商铺类型" prop="shopType">
  27 + <el-select v-model="pagequery.shopType" clearable placeholder="请选择"
  28 + style="width: 168px;margin-right: 15px">
  29 + <el-option v-for="(item,index) in typeShopList" :key="index" :label="item.label" :value="item.value"></el-option>
  30 + </el-select>
  31 + </el-form-item>
  32 + <el-form-item label="状态" prop="publishStatus">
  33 + <el-select v-model="pagequery.publishStatus" clearable placeholder="请选择"
  34 + style="width: 168px;margin-right: 15px">
  35 + <el-option label="待发布" value="0"></el-option>
  36 + <el-option label="待审核" value="1"></el-option>
  37 + <el-option label="已发布" value="2"></el-option>
  38 + <el-option label="不通过" value="3"></el-option>
  39 + <el-option label="已租赁" value="4"></el-option>
  40 + </el-select>
  41 + </el-form-item>
34 </el-form> 42 </el-form>
35 43
36 - <div> 44 + <div style="width: 200px;">
37 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询 45 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
38 </el-button> 46 </el-button>
39 <el-button @click="resetting" class="buttonHover" 47 <el-button @click="resetting" class="buttonHover"
@@ -48,7 +56,8 @@ @@ -48,7 +56,8 @@
48 </div> 56 </div>
49 <!-- 表格 --> 57 <!-- 表格 -->
50 58
51 - <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 59 + <el-table :data="tableData"
  60 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
52 <el-table-column label="序号" width="50"> 61 <el-table-column label="序号" width="50">
53 <template slot-scope="scope"> 62 <template slot-scope="scope">
54 {{scope.$index +1 }} 63 {{scope.$index +1 }}
@@ -57,14 +66,14 @@ @@ -57,14 +66,14 @@
57 <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column> 66 <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
58 <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip> 67 <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
59 <template slot-scope="scope"> 68 <template slot-scope="scope">
60 - {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}} 69 + {{gettypeShopList(scope.row.shopType) || '无'}}
61 </template> 70 </template>
62 </el-table-column> 71 </el-table-column>
63 <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip> 72 <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
64 </el-table-column> 73 </el-table-column>
65 <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip> 74 <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
66 </el-table-column> 75 </el-table-column>
67 - <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip> 76 + <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>
68 <template slot-scope="scope"> 77 <template slot-scope="scope">
69 {{scope.row.belongingDepartment || '无'}} 78 {{scope.row.belongingDepartment || '无'}}
70 </template> 79 </template>
@@ -74,7 +83,7 @@ @@ -74,7 +83,7 @@
74 {{scope.row.head || '无'}} 83 {{scope.row.head || '无'}}
75 </template> 84 </template>
76 </el-table-column> 85 </el-table-column>
77 - <el-table-column label="提交时间" prop="createDate" > </el-table-column> 86 + <el-table-column label="提交时间" prop="createDate"> </el-table-column>
78 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 87 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
79 <template slot-scope="scope"> 88 <template slot-scope="scope">
80 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} 89 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
@@ -83,11 +92,13 @@ @@ -83,11 +92,13 @@
83 <el-table-column label="操作" min-width="100" fixed="right"> 92 <el-table-column label="操作" min-width="100" fixed="right">
84 <template slot-scope="scope"> 93 <template slot-scope="scope">
85 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 94 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
86 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="removeinfo(scope.row,'编辑')">编辑 95 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  96 + @click="removeinfo(scope.row,'编辑')">编辑
87 </div> 97 </div>
88 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="closemsg(scope.row)">删除</div>  
89 <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" 98 <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
90 - @click="opencl(scope.row,'sp')">发布</div> 99 + @click="closemsg(scope.row)">删除</div>
  100 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  101 + @click="opencl(scope.row,'sp')">发布</div>
91 <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'" 102 <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
92 @click="removeinfozz(scope.row,'0','下架')">下架</div> 103 @click="removeinfozz(scope.row,'0','下架')">下架</div>
93 </template> 104 </template>
@@ -95,9 +106,9 @@ @@ -95,9 +106,9 @@
95 </el-table> 106 </el-table>
96 <div style="display: flex;justify-content: space-between;" class="bom"> 107 <div style="display: flex;justify-content: space-between;" class="bom">
97 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div> 108 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
98 - <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequery.pageSize"  
99 - background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"  
100 - @current-change="handleCurrentChange"> 109 + <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]"
  110 + :page-size="pagequery.pageSize" background small layout="prev, pager, next" :total="total"
  111 + @size-change="handleSizeChange" @current-change="handleCurrentChange">
101 </el-pagination> 112 </el-pagination>
102 </div> 113 </div>
103 114
@@ -138,8 +149,8 @@ @@ -138,8 +149,8 @@
138 <add :info="detailsinfo" @removeonaction="removeonaction"></add> 149 <add :info="detailsinfo" @removeonaction="removeonaction"></add>
139 </div> 150 </div>
140 </div> 151 </div>
141 - <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center  
142 - :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"> 152 + <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
  153 + :close-on-press-escape="false" :show-close="false">
143 <cl :type="'商铺'" :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl> 154 <cl :type="'商铺'" :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
144 </el-dialog> 155 </el-dialog>
145 </div> 156 </div>
@@ -152,12 +163,12 @@ @@ -152,12 +163,12 @@
152 delList, 163 delList,
153 editList, 164 editList,
154 getAlls, 165 getAlls,
155 - parkTrails 166 + parkTrails
156 } from '@/api/information'; 167 } from '@/api/information';
157 import add from '@/components/add/addinformation' 168 import add from '@/components/add/addinformation'
158 import resourceCommodity from '@/components/resourceCommodity/index' 169 import resourceCommodity from '@/components/resourceCommodity/index'
159 - import cl from '@/components/change/cl.vue'  
160 - import { 170 + import cl from '@/components/change/cl.vue'
  171 + import {
161 cereResourceStrategy, 172 cereResourceStrategy,
162 editStatus, 173 editStatus,
163 cereBusinessOperationadd, 174 cereBusinessOperationadd,
@@ -165,33 +176,36 @@ @@ -165,33 +176,36 @@
165 export default { 176 export default {
166 data() { 177 data() {
167 return { 178 return {
168 - lvdaoList:[],  
169 - oncetype:'',  
170 - addcl:false,  
171 - oninfo:{},  
172 - multipleSelection:[], 179 + lvdaoList: [],
  180 + oncetype: '',
  181 + addcl: false,
  182 + oninfo: {},
  183 + multipleSelection: [],
173 contractChangeReason: '', 184 contractChangeReason: '',
174 detailsinfo: {}, 185 detailsinfo: {},
175 pagequery: { 186 pagequery: {
176 - belongingRegion:'',  
177 - shopName:'', 187 + belongingRegion: '',
  188 + shopName: '',
178 pageNumber: 0, 189 pageNumber: 0,
179 pageSize: 10, 190 pageSize: 10,
180 - belongingGreenwaySection:'',  
181 - belongingDepartment:'',  
182 - publishStatus:'' 191 + belongingGreenwaySection: '',
  192 + belongingDepartment: '',
  193 + publishStatus: '',
  194 + shopType:''
183 }, 195 },
184 tableData: [], 196 tableData: [],
185 total: 0, 197 total: 0,
186 onaction: '1', 198 onaction: '1',
187 - formInline: {  
188 - }, 199 + formInline: {},
189 } 200 }
190 }, 201 },
191 computed: { 202 computed: {
192 regionOptions() { 203 regionOptions() {
193 return this.$store.state.cent.regionList; 204 return this.$store.state.cent.regionList;
194 - } 205 + },
  206 + typeShopList() {
  207 + return this.$store.state.cent.typeShopList;
  208 + },
195 }, 209 },
196 components: { 210 components: {
197 cl, 211 cl,
@@ -200,9 +214,22 @@ @@ -200,9 +214,22 @@
200 }, 214 },
201 async created() { 215 async created() {
202 this.getAll() 216 this.getAll()
203 - 217 +
204 }, 218 },
205 methods: { 219 methods: {
  220 + gettypeShopList(code) {
  221 + if (!code) {
  222 + return '无';
  223 + }
  224 + for (let i = 0; i < this.typeShopList.length; i++) {
  225 + const item = this.typeShopList[i];
  226 + item.value = item.value + ''
  227 + if (item.value === code) {
  228 + return item.label;
  229 + }
  230 + }
  231 + return '无';
  232 + },
206 minSev(e) { 233 minSev(e) {
207 this.multipleSelection = e 234 this.multipleSelection = e
208 console.error(this.multipleSelection) 235 console.error(this.multipleSelection)
@@ -212,16 +239,16 @@ @@ -212,16 +239,16 @@
212 } 239 }
213 console.error(ids) 240 console.error(ids)
214 let c1 = { 241 let c1 = {
215 - resourcesId: this.oncetype+this.oninfo.id, 242 + resourcesId: this.oncetype + this.oninfo.id,
216 rentalPoliciesIds: ids, 243 rentalPoliciesIds: ids,
217 } 244 }
218 - if(c1.rentalPoliciesIds.length==0){  
219 - this.$message({  
220 - message: '请选择策略进行绑定',  
221 - type: 'warning'  
222 - })  
223 - return  
224 - } 245 + if (c1.rentalPoliciesIds.length == 0) {
  246 + this.$message({
  247 + message: '请选择策略进行绑定',
  248 + type: 'warning'
  249 + })
  250 + return
  251 + }
225 console.error(c1) 252 console.error(c1)
226 cereResourceStrategy(c1).then(res => { 253 cereResourceStrategy(c1).then(res => {
227 if (res.code == 200) { 254 if (res.code == 200) {
@@ -231,14 +258,14 @@ @@ -231,14 +258,14 @@
231 type: 'success' 258 type: 'success'
232 }) 259 })
233 editStatus({ 260 editStatus({
234 - resourcesId: this.oncetype+this.oninfo.id, 261 + resourcesId: this.oncetype + this.oninfo.id,
235 publishStatus: '1' 262 publishStatus: '1'
236 }).then(res => { 263 }).then(res => {
237 this.onSubmit() 264 this.onSubmit()
238 }) 265 })
239 cereBusinessOperationadd({ 266 cereBusinessOperationadd({
240 - type:'发布',  
241 - resourceId: this.oncetype+this.oninfo.id, 267 + type: '发布',
  268 + resourceId: this.oncetype + this.oninfo.id,
242 operator: localStorage.getItem('roleName'), 269 operator: localStorage.getItem('roleName'),
243 operationTime: this.gettime() 270 operationTime: this.gettime()
244 }).then(res => { 271 }).then(res => {
@@ -256,7 +283,7 @@ @@ -256,7 +283,7 @@
256 this.multipleSelection = [] 283 this.multipleSelection = []
257 this.addcl = false 284 this.addcl = false
258 }, 285 },
259 - async opencl(row,e) { 286 + async opencl(row, e) {
260 this.oncetype = e 287 this.oncetype = e
261 this.oninfo = row 288 this.oninfo = row
262 this.multipleSelection = [] 289 this.multipleSelection = []
@@ -317,14 +344,14 @@ @@ -317,14 +344,14 @@
317 type: 'success' 344 type: 'success'
318 }) 345 })
319 cereBusinessOperationadd({ 346 cereBusinessOperationadd({
320 - type:tit,  
321 - resourceId: 'sp'+row.id, 347 + type: tit,
  348 + resourceId: 'sp' + row.id,
322 operator: localStorage.getItem('roleName'), 349 operator: localStorage.getItem('roleName'),
323 operationTime: that.gettime() 350 operationTime: that.gettime()
324 }).then(res => { 351 }).then(res => {
325 console.error(res) 352 console.error(res)
326 }) 353 })
327 - 354 +
328 this.removeonaction('1') 355 this.removeonaction('1')
329 } else { 356 } else {
330 this.$message({ 357 this.$message({
@@ -373,13 +400,14 @@ @@ -373,13 +400,14 @@
373 //重置按钮 400 //重置按钮
374 resetting() { 401 resetting() {
375 this.pagequery = { 402 this.pagequery = {
376 - belongingRegion:'',  
377 - shopName:'', 403 + belongingRegion: '',
  404 + shopName: '',
378 pageNumber: 0, 405 pageNumber: 0,
379 pageSize: 10, 406 pageSize: 10,
380 - belongingGreenwaySection:'',  
381 - belongingDepartment:'',  
382 - publishStatus:'' 407 + belongingGreenwaySection: '',
  408 + belongingDepartment: '',
  409 + publishStatus: '',
  410 + shopType:''
383 }, 411 },
384 this.getAll() 412 this.getAll()
385 }, 413 },
@@ -426,6 +454,7 @@ @@ -426,6 +454,7 @@
426 background-color: #Fff; 454 background-color: #Fff;
427 455
428 } 456 }
  457 +
429 .chengeXia { 458 .chengeXia {
430 border-bottom: 6px solid #3F9B6A; 459 border-bottom: 6px solid #3F9B6A;
431 padding-bottom: 4px; 460 padding-bottom: 4px;
@@ -439,9 +468,11 @@ @@ -439,9 +468,11 @@
439 font-size: 14px; 468 font-size: 14px;
440 justify-content: space-between; 469 justify-content: space-between;
441 } 470 }
  471 +
442 .greens { 472 .greens {
443 color: #3F9B6A; 473 color: #3F9B6A;
444 } 474 }
  475 +
445 .bg-purple-dark { 476 .bg-purple-dark {
446 background: #99a9bf; 477 background: #99a9bf;
447 } 478 }
@@ -453,17 +484,18 @@ @@ -453,17 +484,18 @@
453 .bg-purple-light { 484 .bg-purple-light {
454 background: #e5e9f2; 485 background: #e5e9f2;
455 } 486 }
  487 +
456 .grid-content { 488 .grid-content {
457 border-radius: 4px; 489 border-radius: 4px;
458 min-height: 36px; 490 min-height: 36px;
459 } 491 }
460 -  
461 </style> 492 </style>
462 <style lang="scss" scoped> 493 <style lang="scss" scoped>
463 ::v-deep .el-dialog__body { 494 ::v-deep .el-dialog__body {
464 padding: 0 0 !important; 495 padding: 0 0 !important;
465 } 496 }
466 - .el-dialog__header{ 497 +
  498 + .el-dialog__header {
467 padding: 0; 499 padding: 0;
468 display: none; 500 display: none;
469 } 501 }
admin-web-master/src/views/detect/map/index.vue
  View file @de91fb0
@@ -31,6 +31,16 @@ @@ -31,6 +31,16 @@
31 </el-select> --> 31 </el-select> -->
32 <el-input v-model="pagequery.deviceType" placeholder="请输入" maxlength="50"></el-input> 32 <el-input v-model="pagequery.deviceType" placeholder="请输入" maxlength="50"></el-input>
33 </el-form-item> 33 </el-form-item>
  34 + <el-form-item label="状态" prop="publishStatus">
  35 + <el-select v-model="pagequery.publishStatus" clearable placeholder="请选择"
  36 + style="width: 168px;margin-right: 15px">
  37 + <el-option label="待发布" value="0"></el-option>
  38 + <el-option label="待审核" value="1"></el-option>
  39 + <el-option label="已发布" value="2"></el-option>
  40 + <el-option label="不通过" value="3"></el-option>
  41 + <el-option label="已租赁" value="4"></el-option>
  42 + </el-select>
  43 + </el-form-item>
34 </el-form> 44 </el-form>
35 45
36 <div> 46 <div>
@@ -197,7 +207,8 @@ @@ -197,7 +207,8 @@
197 advertisingType: '线上广告位', 207 advertisingType: '线上广告位',
198 pageNumber: 0, 208 pageNumber: 0,
199 pageSize: 10, 209 pageSize: 10,
200 - advertisingName:'' 210 + advertisingName:'',
  211 + publishStatus:''
201 }, 212 },
202 tableData: [], 213 tableData: [],
203 total: 0, 214 total: 0,
@@ -436,6 +447,7 @@ @@ -436,6 +447,7 @@
436 pageSize: 10, 447 pageSize: 10,
437 advertisingName:'', 448 advertisingName:'',
438 advertisingType: this.pagequery.advertisingType, 449 advertisingType: this.pagequery.advertisingType,
  450 + publishStatus:''
439 }, 451 },
440 this.getAll() 452 this.getAll()
441 }, 453 },
lvdao-miniapp/utils/rsaEncrypt.js
  View file @de91fb0
@@ -14,7 +14,7 @@ export function encrypt(txt) { @@ -14,7 +14,7 @@ export function encrypt(txt) {
14 return encryptor.encrypt(txt) // 对需要加密的数据进行加密 14 return encryptor.encrypt(txt) // 对需要加密的数据进行加密
15 } 15 }
16 16
17 -// 解密 17 +// 解密
18 export function decrypt(txt) { 18 export function decrypt(txt) {
19 const encryptor = new JSEncrypt() 19 const encryptor = new JSEncrypt()
20 encryptor.setPrivateKey(privateKey) 20 encryptor.setPrivateKey(privateKey)