Commit 0c5d2ce85efb719fa60dcedd82757e70b5e61780
1 parent
8984a1f4
1
Showing
8 changed files
with
353 additions
and
165 deletions
admin-web-master/src/api/newly.js
| 1 | import request from '@/utils/request' | 1 | import request from '@/utils/request' |
| 2 | import requestnew from '@/utils/request2' | 2 | import requestnew from '@/utils/request2' |
| 3 | + | ||
| 4 | +// 资源获取方案 | ||
| 5 | + | ||
| 6 | +export function cereBusinessPlan(data) { | ||
| 7 | + return request({ | ||
| 8 | + url: '/cereBusinessPlan/getPage ', | ||
| 9 | + method: 'post', | ||
| 10 | + data | ||
| 11 | + }) | ||
| 12 | +} | ||
| 13 | +// 资源状态修改 | ||
| 14 | + | ||
| 15 | +export function editStatus(data) { | ||
| 16 | + return request({ | ||
| 17 | + url: '/cereResourceStrategy/editStatus', | ||
| 18 | + method: 'post', | ||
| 19 | + data | ||
| 20 | + }) | ||
| 21 | +} | ||
| 22 | + | ||
| 23 | + | ||
| 24 | +// 资源策略查询 | ||
| 25 | + | ||
| 26 | +export function getResourceStrategy(data) { | ||
| 27 | + return request({ | ||
| 28 | + url: '/cereResourceStrategy/getResourceStrategy', | ||
| 29 | + method: 'post', | ||
| 30 | + data | ||
| 31 | + }) | ||
| 32 | +} | ||
| 33 | + | ||
| 3 | // 获取策略 | 34 | // 获取策略 |
| 4 | 35 | ||
| 5 | export function cereResourceStrategylist(data) { | 36 | export function cereResourceStrategylist(data) { |
admin-web-master/src/components/add/addinformation.vue
| @@ -116,17 +116,24 @@ | @@ -116,17 +116,24 @@ | ||
| 116 | </el-form-item> | 116 | </el-form-item> |
| 117 | </el-col> | 117 | </el-col> |
| 118 | </el-row> | 118 | </el-row> |
| 119 | - <el-row :gutter="20"> | 119 | + <!-- <el-row :gutter="20"> |
| 120 | <el-col :span="12"> | 120 | <el-col :span="12"> |
| 121 | <el-form-item label="建筑图纸" prop="architecturalDrawings"> | 121 | <el-form-item label="建筑图纸" prop="architecturalDrawings"> |
| 122 | <upimg v-model="ruleForm.architecturalDrawings" :limit="5" :fileSize="1"></upimg> | 122 | <upimg v-model="ruleForm.architecturalDrawings" :limit="5" :fileSize="1"></upimg> |
| 123 | </el-form-item> | 123 | </el-form-item> |
| 124 | </el-col> | 124 | </el-col> |
| 125 | - </el-row> | 125 | + </el-row> --> |
| 126 | + <el-form-item label="建筑图纸" prop="architecturalDrawings"> | ||
| 127 | + <el-upload :action="$baseURL" class="avatar-uploader" :auto-upload="false" :show-file-list="false" | ||
| 128 | + :on-remove="hefuRemove('architecturalDrawings')" :on-change="(e) => hefuSuccess(e,'architecturalDrawings')"> | ||
| 129 | + <img v-if="ruleForm.architecturalDrawings" :src="$baseURL+ruleForm.architecturalDrawings" class="avatar"> | ||
| 130 | + <i v-else class="el-icon-plus avatar-uploader-icon"></i> | ||
| 131 | + </el-upload> | ||
| 132 | + </el-form-item> | ||
| 126 | <el-row :gutter="20"> | 133 | <el-row :gutter="20"> |
| 127 | <el-col :span="12"> | 134 | <el-col :span="12"> |
| 128 | <el-form-item label="商铺描述" prop="shopDescription"> | 135 | <el-form-item label="商铺描述" prop="shopDescription"> |
| 129 | - <el-input type="textarea" v-model="ruleForm.shopDescription" style="margin-top:5px;" placeholder="请输入" | 136 | + <el-input type="textarea" v-model="ruleForm.shopDescription" style="margin-top:5px;width: 100%;" placeholder="请输入" |
| 130 | maxlength="200"></el-input> | 137 | maxlength="200"></el-input> |
| 131 | </el-form-item> | 138 | </el-form-item> |
| 132 | </el-col> | 139 | </el-col> |
| @@ -134,8 +141,14 @@ | @@ -134,8 +141,14 @@ | ||
| 134 | <el-row :gutter="20"> | 141 | <el-row :gutter="20"> |
| 135 | <el-col :span="12"> | 142 | <el-col :span="12"> |
| 136 | <el-form-item label="展示主图" prop="displayMainImage"> | 143 | <el-form-item label="展示主图" prop="displayMainImage"> |
| 137 | - <upimg v-model="ruleForm.displayMainImage" :limit="1" :fileSize="1"></upimg> | 144 | + <!-- <upimg v-model="ruleForm.displayMainImage" :limit="1" :fileSize="1"></upimg> --> |
| 145 | + <el-upload :action="$baseURL" class="avatar-uploader" :auto-upload="false" :show-file-list="false" | ||
| 146 | + :on-remove="hefuRemove('displayMainImage')" :on-change="(e) => hefuSuccess(e,'displayMainImage')"> | ||
| 147 | + <img v-if="ruleForm.displayMainImage" :src="$baseURL+ruleForm.displayMainImage" class="avatar"> | ||
| 148 | + <i v-else class="el-icon-plus avatar-uploader-icon"></i> | ||
| 149 | + </el-upload> | ||
| 138 | </el-form-item> | 150 | </el-form-item> |
| 151 | + | ||
| 139 | </el-col> | 152 | </el-col> |
| 140 | </el-row> | 153 | </el-row> |
| 141 | <el-row :gutter="20"> | 154 | <el-row :gutter="20"> |
| @@ -394,39 +407,27 @@ | @@ -394,39 +407,27 @@ | ||
| 394 | close() { | 407 | close() { |
| 395 | this.$emit('removeonaction', '1') | 408 | this.$emit('removeonaction', '1') |
| 396 | }, | 409 | }, |
| 397 | - hefuRemove() { | ||
| 398 | - this.hefuData = [] | 410 | + hefuRemove(e) { |
| 411 | + // this.ruleForm[e] = '' | ||
| 399 | }, | 412 | }, |
| 400 | - hefuSuccess(response, file, fileList) { | ||
| 401 | - this.fileData = [] | 413 | + hefuSuccess(response, e) { |
| 402 | console.error(response) | 414 | console.error(response) |
| 415 | + console.error(e) | ||
| 416 | + this.ruleForm[e] = '' | ||
| 403 | let fd = new FormData() | 417 | let fd = new FormData() |
| 404 | fd.append('file', response.raw) | 418 | fd.append('file', response.raw) |
| 405 | - fd.append('filePath', 'hetong') | 419 | + fd.append('filePath', 'sp') |
| 406 | miniioupload(fd).then(res => { | 420 | miniioupload(fd).then(res => { |
| 407 | console.error(res) | 421 | console.error(res) |
| 408 | - const fileMsg = { | ||
| 409 | - name: response.name, | ||
| 410 | - url: res.data, | ||
| 411 | - } | ||
| 412 | - this.fileData.push(fileMsg) | 422 | + this.ruleForm[e] = res.data |
| 413 | }) | 423 | }) |
| 414 | - }, | 424 | + } |
| 415 | 425 | ||
| 416 | 426 | ||
| 417 | }, | 427 | }, |
| 418 | }; | 428 | }; |
| 419 | </script> | 429 | </script> |
| 420 | <style lang="scss"> | 430 | <style lang="scss"> |
| 421 | - .el-upload { | ||
| 422 | - display: block; | ||
| 423 | - /* text-align: left; */ | ||
| 424 | - } | ||
| 425 | -.video-uploader { | ||
| 426 | - .el-upload { | ||
| 427 | - text-align: left; | ||
| 428 | - } | ||
| 429 | -} | ||
| 430 | .el-dialog__header { | 431 | .el-dialog__header { |
| 431 | background-color: #F2F3F5; | 432 | background-color: #F2F3F5; |
| 432 | text-align: left; | 433 | text-align: left; |
| @@ -437,4 +438,31 @@ | @@ -437,4 +438,31 @@ | ||
| 437 | font-size: 15px; | 438 | font-size: 15px; |
| 438 | color: #303133; | 439 | color: #303133; |
| 439 | } | 440 | } |
| 441 | + | ||
| 442 | + .avatar-uploader .el-upload { | ||
| 443 | + border: 1px dashed #3F9B6A; | ||
| 444 | + border-radius: 6px; | ||
| 445 | + cursor: pointer; | ||
| 446 | + position: relative; | ||
| 447 | + overflow: hidden; | ||
| 448 | + } | ||
| 449 | + | ||
| 450 | + .avatar-uploader .el-upload:hover { | ||
| 451 | + border-color: #3F9B6A; | ||
| 452 | + } | ||
| 453 | + | ||
| 454 | + .avatar-uploader-icon { | ||
| 455 | + font-size: 28px; | ||
| 456 | + color: #8c939d; | ||
| 457 | + width: 178px; | ||
| 458 | + height: 178px; | ||
| 459 | + line-height: 178px; | ||
| 460 | + text-align: center; | ||
| 461 | + } | ||
| 462 | + | ||
| 463 | + .avatar { | ||
| 464 | + width: 178px; | ||
| 465 | + height: 178px; | ||
| 466 | + display: block; | ||
| 467 | + } | ||
| 440 | </style> | 468 | </style> |
admin-web-master/src/components/change/cl.vue
| 1 | <template> | 1 | <template> |
| 2 | <div class="policy-selector"> | 2 | <div class="policy-selector"> |
| 3 | - <div class="policy-selector-header"> | 3 | + <!-- <div class="policy-selector-header"> |
| 4 | <h3>选择策略</h3> | 4 | <h3>选择策略</h3> |
| 5 | - </div> | 5 | + </div> --> |
| 6 | <div class="policy-selector-content" style="max-height:50vh;overflow-y: auto;"> | 6 | <div class="policy-selector-content" style="max-height:50vh;overflow-y: auto;"> |
| 7 | <el-table | 7 | <el-table |
| 8 | :data="celueData" | 8 | :data="celueData" |
| @@ -71,12 +71,12 @@ export default { | @@ -71,12 +71,12 @@ export default { | ||
| 71 | 71 | ||
| 72 | <style scoped> | 72 | <style scoped> |
| 73 | .policy-selector { | 73 | .policy-selector { |
| 74 | - padding: 30px; | 74 | + padding: 20px; |
| 75 | width: 100%; | 75 | width: 100%; |
| 76 | margin: 0 auto; | 76 | margin: 0 auto; |
| 77 | border: 1px solid #ddd; | 77 | border: 1px solid #ddd; |
| 78 | border-radius: 4px; | 78 | border-radius: 4px; |
| 79 | - box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); | 79 | + /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */ |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | .policy-selector-header { | 82 | .policy-selector-header { |
admin-web-master/src/components/resourceCommodity/index.vue
| @@ -102,8 +102,19 @@ | @@ -102,8 +102,19 @@ | ||
| 102 | </el-tab-pane> | 102 | </el-tab-pane> |
| 103 | <el-tab-pane label="招商方案信息" name="second"> | 103 | <el-tab-pane label="招商方案信息" name="second"> |
| 104 | <div style="margin-top: 30px;" class="editcss"> | 104 | <div style="margin-top: 30px;" class="editcss"> |
| 105 | - <!-- <TitleWithCircle title="招商方案信息" /> --> | ||
| 106 | - | 105 | + <TitleWithCircle title="招商方案信息" /> |
| 106 | + <div style="padding: 20px;"> | ||
| 107 | + <el-table :data="datalist1" | ||
| 108 | + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | ||
| 109 | + tooltip-effect="dark custom-tooltip-effect"> | ||
| 110 | + <el-table-column label="招商方案名称" prop="planName" min-width="200"> | ||
| 111 | + </el-table-column> | ||
| 112 | + <el-table-column label="创建日期" prop="createTime" min-width="100"> | ||
| 113 | + </el-table-column> | ||
| 114 | + <!-- <el-table-column label="当前状态" prop="businessType" min-width="100"> | ||
| 115 | + </el-table-column> --> | ||
| 116 | + </el-table> | ||
| 117 | + </div> | ||
| 107 | <TitleWithCircle title="策略方案" /> | 118 | <TitleWithCircle title="策略方案" /> |
| 108 | <div style="padding: 20px;"> | 119 | <div style="padding: 20px;"> |
| 109 | <el-table :data="datalist" | 120 | <el-table :data="datalist" |
| @@ -202,7 +213,8 @@ | @@ -202,7 +213,8 @@ | ||
| 202 | import MapXian from "@/components/MapContainer/MapXian"; | 213 | import MapXian from "@/components/MapContainer/MapXian"; |
| 203 | import TitleWithCircle from '@/components/top/index'; | 214 | import TitleWithCircle from '@/components/top/index'; |
| 204 | import { | 215 | import { |
| 205 | - cereResourceStrategylist | 216 | + cereResourceStrategylist, |
| 217 | + cereBusinessPlan | ||
| 206 | } from '@/api/newly'; | 218 | } from '@/api/newly'; |
| 207 | export default { | 219 | export default { |
| 208 | components: { | 220 | components: { |
| @@ -222,7 +234,8 @@ | @@ -222,7 +234,8 @@ | ||
| 222 | xiangTab: 'first', | 234 | xiangTab: 'first', |
| 223 | list: [], | 235 | list: [], |
| 224 | parentMessage: {}, | 236 | parentMessage: {}, |
| 225 | - datalist: [] | 237 | + datalist: [], |
| 238 | + datalist1:[] | ||
| 226 | } | 239 | } |
| 227 | }, | 240 | }, |
| 228 | created() { | 241 | created() { |
| @@ -242,6 +255,10 @@ | @@ -242,6 +255,10 @@ | ||
| 242 | console.error(res) | 255 | console.error(res) |
| 243 | this.datalist = res.data | 256 | this.datalist = res.data |
| 244 | }) | 257 | }) |
| 258 | + cereBusinessPlan(c1).then(res => { | ||
| 259 | + console.error(res) | ||
| 260 | + this.datalist1 = res.data | ||
| 261 | + }) | ||
| 245 | } | 262 | } |
| 246 | }, | 263 | }, |
| 247 | computed: { | 264 | computed: { |
admin-web-master/src/views/detect/admap.vue
| @@ -8,14 +8,9 @@ | @@ -8,14 +8,9 @@ | ||
| 8 | <!-- 线上 --> | 8 | <!-- 线上 --> |
| 9 | <div> | 9 | <div> |
| 10 | <!-- 搜索 --> | 10 | <!-- 搜索 --> |
| 11 | - <div class="formSearch"> | 11 | + <!-- <div class="formSearch"> |
| 12 | <el-form :inline="true" :model="pagequery"> | 12 | <el-form :inline="true" :model="pagequery"> |
| 13 | - <!-- <el-form-item label="商铺名称" prop="shopName"> | ||
| 14 | - <el-select v-model="pagequery.shopName" placeholder="请选择" style="width: 168px;margin-right: 15px"> | ||
| 15 | - <el-option :label="item.shopName" :value="item.shopName" v-for="(item,index) in this.tableData" | ||
| 16 | - :key="index" /> | ||
| 17 | - </el-select> | ||
| 18 | - </el-form-item> --> | 13 | + |
| 19 | <el-form-item label="所属区域" prop="belongingRegion"> | 14 | <el-form-item label="所属区域" prop="belongingRegion"> |
| 20 | <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px"> | 15 | <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px"> |
| 21 | <el-option label="成华区" value="成华区"></el-option> | 16 | <el-option label="成华区" value="成华区"></el-option> |
| @@ -45,7 +40,7 @@ | @@ -45,7 +40,7 @@ | ||
| 45 | style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置 | 40 | style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置 |
| 46 | </el-button> | 41 | </el-button> |
| 47 | </div> | 42 | </div> |
| 48 | - </div> | 43 | + </div> --> |
| 49 | <div style="margin-bottom: 20px;"> | 44 | <div style="margin-bottom: 20px;"> |
| 50 | <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" | 45 | <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" |
| 51 | icon="el-icon-circle-plus-outline">新增</el-button> | 46 | icon="el-icon-circle-plus-outline">新增</el-button> |
| @@ -97,20 +92,19 @@ | @@ -97,20 +92,19 @@ | ||
| 97 | </el-table-column> | 92 | </el-table-column> |
| 98 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> | 93 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> |
| 99 | <template slot-scope="scope"> | 94 | <template slot-scope="scope"> |
| 100 | - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.rentalStatus=='0'?'待租':'已租'}} | 95 | + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} |
| 101 | </template> | 96 | </template> |
| 102 | </el-table-column> | 97 | </el-table-column> |
| 103 | <el-table-column label="操作" min-width="250" fixed="right"> | 98 | <el-table-column label="操作" min-width="250" fixed="right"> |
| 104 | <template slot-scope="scope"> | 99 | <template slot-scope="scope"> |
| 105 | - <div @click="opencl(scope.row,'sp')" class="tableBtn greens">绑定策略</div> | ||
| 106 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> | 100 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> |
| 107 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 | 101 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 |
| 108 | </div> | 102 | </div> |
| 109 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> | 103 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> |
| 110 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" | 104 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" |
| 111 | - @click="removeinfozz(scope.row,'1','发布')">发布</div> | 105 | + @click="opencl(scope.row,'sp')">发布</div> |
| 112 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" | 106 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" |
| 113 | - @click="removeinfozz(scope.row,'0','下架')">下架</div> | 107 | + @click="removeinfozz(scope.row,'2','下架')">下架</div> |
| 114 | </template> | 108 | </template> |
| 115 | </el-table-column> | 109 | </el-table-column> |
| 116 | </el-table> | 110 | </el-table> |
| @@ -145,8 +139,8 @@ | @@ -145,8 +139,8 @@ | ||
| 145 | </template> | 139 | </template> |
| 146 | </el-table-column> --> | 140 | </el-table-column> --> |
| 147 | <el-table-column prop="publishStatus" label="发布状态" min-width="120"> | 141 | <el-table-column prop="publishStatus" label="发布状态" min-width="120"> |
| 148 | - <template slot-scope="scope"> | ||
| 149 | - {{scope.row.publishStatus == 0?'待发布':'已提交'}} | 142 | + <template slot-scope="scope"> |
| 143 | + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} | ||
| 150 | </template> | 144 | </template> |
| 151 | </el-table-column> | 145 | </el-table-column> |
| 152 | <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="200"> | 146 | <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="200"> |
| @@ -154,14 +148,13 @@ | @@ -154,14 +148,13 @@ | ||
| 154 | <el-table-column label="操作" min-width="250" fixed="right"> | 148 | <el-table-column label="操作" min-width="250" fixed="right"> |
| 155 | <template slot-scope="scope"> | 149 | <template slot-scope="scope"> |
| 156 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> | 150 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> |
| 157 | - <div @click="opencl(scope.row,'gg')" class="tableBtn greens">绑定策略</div> | ||
| 158 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 | 151 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 |
| 159 | </div> | 152 | </div> |
| 160 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> | 153 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> |
| 161 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" | 154 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" |
| 162 | - @click="removeinfozz(scope.row,'1','发布')">发布</div> | 155 | + @click="opencl(scope.row,'gg')">发布</div> |
| 163 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" | 156 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" |
| 164 | - @click="removeinfozz(scope.row,'0','下架')">下架</div> | 157 | + @click="removeinfozz(scope.row,'2','下架')">下架</div> |
| 165 | </template> | 158 | </template> |
| 166 | </el-table-column> | 159 | </el-table-column> |
| 167 | </el-table> | 160 | </el-table> |
| @@ -196,14 +189,14 @@ | @@ -196,14 +189,14 @@ | ||
| 196 | <el-table-column label="操作" min-width="250" fixed="right"> | 189 | <el-table-column label="操作" min-width="250" fixed="right"> |
| 197 | <template slot-scope="scope"> | 190 | <template slot-scope="scope"> |
| 198 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> | 191 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> |
| 199 | - <div @click="opencl(scope.row,'cd')" class="tableBtn greens">绑定策略</div> | ||
| 200 | - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 | 192 | + <!-- <div @click="opencl(scope.row,'cd')" class="tableBtn greens">绑定策略</div> --> |
| 193 | + <div class="tableBtn greens" @click="removeinfo(scope.row,'编辑')">编辑 | ||
| 201 | </div> | 194 | </div> |
| 202 | - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> | 195 | + <!-- <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> |
| 203 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" | 196 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" |
| 204 | @click="removeinfozz(scope.row,'1','发布')">发布</div> | 197 | @click="removeinfozz(scope.row,'1','发布')">发布</div> |
| 205 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" | 198 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" |
| 206 | - @click="removeinfozz(scope.row,'0','下架')">下架</div> | 199 | + @click="removeinfozz(scope.row,'0','下架')">下架</div> --> |
| 207 | </template> | 200 | </template> |
| 208 | </el-table-column> | 201 | </el-table-column> |
| 209 | </el-table> | 202 | </el-table> |
| @@ -279,9 +272,9 @@ | @@ -279,9 +272,9 @@ | ||
| 279 | <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd> | 272 | <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd> |
| 280 | </div> | 273 | </div> |
| 281 | </div> | 274 | </div> |
| 282 | - <el-dialog :visible.sync="addcl" style="padding: 0px;" width="65%" append-to-body center | 275 | + <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center |
| 283 | :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"> | 276 | :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"> |
| 284 | - <cl @minSev="minSev" @mingClose="mingClose"></cl> | 277 | + <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl> |
| 285 | </el-dialog> | 278 | </el-dialog> |
| 286 | </div> | 279 | </div> |
| 287 | 280 | ||
| @@ -290,7 +283,7 @@ | @@ -290,7 +283,7 @@ | ||
| 290 | 283 | ||
| 291 | <script> | 284 | <script> |
| 292 | import { | 285 | import { |
| 293 | - cereResourceStrategy | 286 | + cereResourceStrategy,editStatus |
| 294 | } from '../../api/newly.js' | 287 | } from '../../api/newly.js' |
| 295 | import { | 288 | import { |
| 296 | ceGetAll | 289 | ceGetAll |
| @@ -370,9 +363,6 @@ | @@ -370,9 +363,6 @@ | ||
| 370 | let c1 = { | 363 | let c1 = { |
| 371 | resourcesId: this.oncetype+this.oninfo.id, | 364 | resourcesId: this.oncetype+this.oninfo.id, |
| 372 | rentalPoliciesIds: ids, | 365 | rentalPoliciesIds: ids, |
| 373 | - // resources:this.oninfo | ||
| 374 | - // rentalPoliciesId: 28, | ||
| 375 | - // resourcesId: "sp65" | ||
| 376 | } | 366 | } |
| 377 | console.error(c1) | 367 | console.error(c1) |
| 378 | cereResourceStrategy(c1).then(res => { | 368 | cereResourceStrategy(c1).then(res => { |
| @@ -382,6 +372,12 @@ | @@ -382,6 +372,12 @@ | ||
| 382 | message: '绑定成功', | 372 | message: '绑定成功', |
| 383 | type: 'success' | 373 | type: 'success' |
| 384 | }) | 374 | }) |
| 375 | + editStatus({ | ||
| 376 | + resourcesId: this.oncetype+this.oninfo.id, | ||
| 377 | + publishStatus: '3' | ||
| 378 | + }).then(res => { | ||
| 379 | + this.onSubmit() | ||
| 380 | + }) | ||
| 385 | } else { | 381 | } else { |
| 386 | this.$message({ | 382 | this.$message({ |
| 387 | message: '绑定失败', | 383 | message: '绑定失败', |
| @@ -400,9 +396,6 @@ | @@ -400,9 +396,6 @@ | ||
| 400 | this.multipleSelection = [] | 396 | this.multipleSelection = [] |
| 401 | this.addcl = true | 397 | this.addcl = true |
| 402 | }, | 398 | }, |
| 403 | - handleSelectionChange(val) { | ||
| 404 | - this.multipleSelection = val | ||
| 405 | - }, | ||
| 406 | chenge(e) { | 399 | chenge(e) { |
| 407 | this.ontype = e | 400 | this.ontype = e |
| 408 | this.pagequery.pageNumber = 0 | 401 | this.pagequery.pageNumber = 0 |
admin-web-master/src/views/detect/examine/index.vue
| @@ -3,19 +3,13 @@ | @@ -3,19 +3,13 @@ | ||
| 3 | <div class="zhuti" v-if="onaction == '1'"> | 3 | <div class="zhuti" v-if="onaction == '1'"> |
| 4 | <div style="height:58px;line-height:58px;"> | 4 | <div style="height:58px;line-height:58px;"> |
| 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 | <!-- 线上 --> | 8 | <!-- 线上 --> |
| 9 | <div> | 9 | <div> |
| 10 | <!-- 搜索 --> | 10 | <!-- 搜索 --> |
| 11 | - <div class="formSearch"> | 11 | + <!-- <div class="formSearch"> |
| 12 | <el-form :inline="true" :model="pagequery"> | 12 | <el-form :inline="true" :model="pagequery"> |
| 13 | - <!-- <el-form-item label="商铺名称" prop="shopName"> | ||
| 14 | - <el-select v-model="pagequery.shopName" placeholder="请选择" style="width: 168px;margin-right: 15px"> | ||
| 15 | - <el-option :label="item.shopName" :value="item.shopName" v-for="(item,index) in this.tableData" | ||
| 16 | - :key="index" /> | ||
| 17 | - </el-select> | ||
| 18 | - </el-form-item> --> | ||
| 19 | <el-form-item label="所属区域" prop="belongingRegion"> | 13 | <el-form-item label="所属区域" prop="belongingRegion"> |
| 20 | <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px"> | 14 | <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px"> |
| 21 | <el-option label="成华区" value="成华区"></el-option> | 15 | <el-option label="成华区" value="成华区"></el-option> |
| @@ -45,68 +39,63 @@ | @@ -45,68 +39,63 @@ | ||
| 45 | style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置 | 39 | style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置 |
| 46 | </el-button> | 40 | </el-button> |
| 47 | </div> | 41 | </div> |
| 48 | - </div> | ||
| 49 | - <div style="margin-bottom: 20px;"> | ||
| 50 | - <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" | ||
| 51 | - icon="el-icon-circle-plus-outline">新增</el-button> | ||
| 52 | - <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> --> | ||
| 53 | - </div> | ||
| 54 | - <!-- 地图 --> | ||
| 55 | - <!-- <div style="display: flex;justify-content: space-between;margin-bottom: 20px;"> | ||
| 56 | - <div style="width: 100%;height: 400px; border: 1px solid #3F9B6A;position: relative;"> | ||
| 57 | - <MapContainer :message="tableData" @MapItem='HandMapItem' ref="mapComponent"></MapContainer> | ||
| 58 | - </div> | ||
| 59 | </div> --> | 42 | </div> --> |
| 60 | <div style="margin: 20px 0;"> | 43 | <div style="margin: 20px 0;"> |
| 61 | <div style="display: flex;font-size: 14px"> | 44 | <div style="display: flex;font-size: 14px"> |
| 62 | <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺 | 45 | <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺 |
| 63 | </div> | 46 | </div> |
| 64 | - <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''"> | 47 | + <!-- <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''"> |
| 65 | 广告位</div> | 48 | 广告位</div> |
| 66 | <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地 | 49 | <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地 |
| 67 | - </div> | 50 | + </div> --> |
| 68 | </div> | 51 | </div> |
| 69 | </div> | 52 | </div> |
| 70 | <!-- 表格 --> | 53 | <!-- 表格 --> |
| 71 | - <el-table v-if="ontype=='1'" :data="tableData" | 54 | + <!-- --> |
| 55 | + <el-table border v-if="ontype=='1'" :span-method="objectSpanMethod" :data="tableData" | ||
| 72 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> | 56 | :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> |
| 73 | - <el-table-column label="序号" min-width="80"> | 57 | + <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip> |
| 74 | <template slot-scope="scope"> | 58 | <template slot-scope="scope"> |
| 75 | - {{scope.$index +1 }} | 59 | + {{scope.row.cereBasicInformationShop.shopName}} |
| 76 | </template> | 60 | </template> |
| 77 | </el-table-column> | 61 | </el-table-column> |
| 78 | - <el-table-column label="编号" prop="venueNumber" show-overflow-tooltip> | ||
| 79 | - </el-table-column> | ||
| 80 | - <el-table-column label="门牌号" prop="houseNumber" show-overflow-tooltip> | ||
| 81 | - | ||
| 82 | - </el-table-column> | ||
| 83 | - <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip> | ||
| 84 | - | ||
| 85 | - </el-table-column> | ||
| 86 | - <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip> | ||
| 87 | - </el-table-column> | ||
| 88 | - <el-table-column label="建筑形式" prop="architecturalForm" show-overflow-tooltip> | ||
| 89 | - </el-table-column> | ||
| 90 | <el-table-column prop="detailedLocation" label="详细地址" show-overflow-tooltip> | 62 | <el-table-column prop="detailedLocation" label="详细地址" show-overflow-tooltip> |
| 63 | + <template slot-scope="scope"> | ||
| 64 | + {{scope.row.cereBasicInformationShop.detailedLocation}} | ||
| 65 | + </template> | ||
| 91 | </el-table-column> | 66 | </el-table-column> |
| 92 | <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip> | 67 | <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip> |
| 68 | + <template slot-scope="scope"> | ||
| 69 | + {{scope.row.cereBasicInformationShop.actualUsableArea}} | ||
| 70 | + </template> | ||
| 71 | + </el-table-column> | ||
| 72 | + <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip> | ||
| 73 | + <template slot-scope="scope"> | ||
| 74 | + {{scope.row.shopinfo.policyName}} | ||
| 75 | + </template> | ||
| 93 | </el-table-column> | 76 | </el-table-column> |
| 94 | - <el-table-column label="负责人" prop="head" show-overflow-tooltip> | 77 | + <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip> |
| 78 | + <template slot-scope="scope"> | ||
| 79 | + {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }} | ||
| 80 | + </template> | ||
| 95 | </el-table-column> | 81 | </el-table-column> |
| 96 | - <el-table-column label="租赁到期时间" prop="leaseExpirationDate" show-overflow-tooltip> | 82 | + <el-table-column label="付款日" prop="payDay" show-overflow-tooltip> |
| 83 | + <template slot-scope="scope"> | ||
| 84 | + {{scope.row.shopinfo.payDay}} | ||
| 85 | + </template> | ||
| 97 | </el-table-column> | 86 | </el-table-column> |
| 98 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> | 87 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> |
| 99 | <template slot-scope="scope"> | 88 | <template slot-scope="scope"> |
| 100 | - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.rentalStatus=='0'?'待租':'已租'}} | 89 | + {{scope.row.cereBasicInformationShop.publishStatus=='0'?'待发布':scope.row.cereBasicInformationShop.publishStatus=='1'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='2'?'已下架':scope.row.cereBasicInformationShop.publishStatus=='3'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='4'?'驳回':'-'}} |
| 101 | </template> | 90 | </template> |
| 102 | </el-table-column> | 91 | </el-table-column> |
| 103 | - <el-table-column label="操作" min-width="250" fixed="right"> | 92 | + <el-table-column label="操作" fixed="right"> |
| 104 | <template slot-scope="scope"> | 93 | <template slot-scope="scope"> |
| 105 | - <div @click="opencl(scope.row,'sp')" class="tableBtn greens">绑定策略</div> | ||
| 106 | - <div @click="details(scope.row)" class="tableBtn greens">查看</div> | 94 | + <!-- <div @click="opencl(scope.row,'sp')" class="tableBtn greens">绑定策略</div> --> |
| 95 | + <div @click="details(scope.row.cereBasicInformationShop)" class="tableBtn greens">查看</div> | ||
| 107 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 | 96 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 |
| 108 | </div> | 97 | </div> |
| 109 | - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> | 98 | + <!-- <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> --> |
| 110 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" | 99 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" |
| 111 | @click="removeinfozz(scope.row,'1','发布')">发布</div> | 100 | @click="removeinfozz(scope.row,'1','发布')">发布</div> |
| 112 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" | 101 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" |
| @@ -226,8 +215,10 @@ | @@ -226,8 +215,10 @@ | ||
| 226 | 215 | ||
| 227 | <div class="zhuti" v-if="onaction == '2'"> | 216 | <div class="zhuti" v-if="onaction == '2'"> |
| 228 | <div style="height:58px;line-height:58px;"> | 217 | <div style="height:58px;line-height:58px;"> |
| 229 | - <div style="color:#0006"> <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-' }}</span> <span style="padding:0 5px;">></span> <span | ||
| 230 | - style="color:#000000e6">新增</span></div> | 218 | + <div style="color:#0006"> |
| 219 | + <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-' }}</span> <span | ||
| 220 | + style="padding:0 5px;">></span> <span style="color:#000000e6">新增</span> | ||
| 221 | + </div> | ||
| 231 | </div> | 222 | </div> |
| 232 | <div style="margin: 20px 0;"> | 223 | <div style="margin: 20px 0;"> |
| 233 | <div style="display: flex;font-size: 14px"> | 224 | <div style="display: flex;font-size: 14px"> |
| @@ -251,8 +242,10 @@ | @@ -251,8 +242,10 @@ | ||
| 251 | </div> | 242 | </div> |
| 252 | <div class="zhuti" v-if="onaction == '3'"> | 243 | <div class="zhuti" v-if="onaction == '3'"> |
| 253 | <div style="height:58px;line-height:58px;"> | 244 | <div style="height:58px;line-height:58px;"> |
| 254 | - <div style="color:#0006"> <span>{{ONACTION == '1'?'商铺基本信息':ONACTION == '2'?'广告位基本信息管理':ONACTION == '3'?'场地基本信息管理':'-' }}</span> <span style="padding:0 5px;">></span> <span | ||
| 255 | - style="color:#000000e6">查看</span></div> | 245 | + <div style="color:#0006"> |
| 246 | + <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-' }}</span> <span | ||
| 247 | + style="padding:0 5px;">></span> <span style="color:#000000e6">查看</span> | ||
| 248 | + </div> | ||
| 256 | </div> | 249 | </div> |
| 257 | <div v-if="ontype == '1'"> | 250 | <div v-if="ontype == '1'"> |
| 258 | <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity> | 251 | <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity> |
| @@ -266,8 +259,10 @@ | @@ -266,8 +259,10 @@ | ||
| 266 | </div> | 259 | </div> |
| 267 | <div class="zhuti" v-if="onaction == '4'"> | 260 | <div class="zhuti" v-if="onaction == '4'"> |
| 268 | <div style="height:58px;line-height:58px;"> | 261 | <div style="height:58px;line-height:58px;"> |
| 269 | - <div style="color:#0006"> <span>{{ONACTION == '1'?'商铺基本信息':ONACTION == '2'?'广告位基本信息管理':ONACTION == '3'?'场地基本信息管理':'-' }}</span> <span style="padding:0 5px;">></span> <span | ||
| 270 | - style="color:#000000e6">{{contractChangeReason}}</span></div> | 262 | + <div style="color:#0006"> |
| 263 | + <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-' }}</span> <span | ||
| 264 | + style="padding:0 5px;">></span> <span style="color:#000000e6">{{contractChangeReason}}</span> | ||
| 265 | + </div> | ||
| 271 | </div> | 266 | </div> |
| 272 | <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;"> | 267 | <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;"> |
| 273 | <add :info="detailsinfo" @removeonaction="removeonaction"></add> | 268 | <add :info="detailsinfo" @removeonaction="removeonaction"></add> |
| @@ -290,7 +285,8 @@ | @@ -290,7 +285,8 @@ | ||
| 290 | 285 | ||
| 291 | <script> | 286 | <script> |
| 292 | import { | 287 | import { |
| 293 | - cereResourceStrategy | 288 | + cereResourceStrategy, |
| 289 | + getResourceStrategy | ||
| 294 | } from '@/api/newly.js' | 290 | } from '@/api/newly.js' |
| 295 | import { | 291 | import { |
| 296 | ceGetAll | 292 | ceGetAll |
| @@ -311,7 +307,7 @@ | @@ -311,7 +307,7 @@ | ||
| 311 | import addcd from '@/components/add/addcd' | 307 | import addcd from '@/components/add/addcd' |
| 312 | import chakanmap from '@/components/chakan/map' | 308 | import chakanmap from '@/components/chakan/map' |
| 313 | import chakancd from '@/components/chakan/cd' | 309 | import chakancd from '@/components/chakan/cd' |
| 314 | - import cl from '@/components/change/cl.vue' | 310 | + import cl from '@/components/change/cl.vue' |
| 315 | import { | 311 | import { |
| 316 | on | 312 | on |
| 317 | } from 'screenfull'; | 313 | } from 'screenfull'; |
| @@ -330,10 +326,9 @@ | @@ -330,10 +326,9 @@ | ||
| 330 | contractChangeReason: '', | 326 | contractChangeReason: '', |
| 331 | detailsinfo: {}, | 327 | detailsinfo: {}, |
| 332 | pagequery: { | 328 | pagequery: { |
| 333 | - dataStatus: '1', | 329 | + publishStatus: '1', |
| 334 | pageNumber: 0, | 330 | pageNumber: 0, |
| 335 | pageSize: 10, | 331 | pageSize: 10, |
| 336 | - contractName: '' | ||
| 337 | }, | 332 | }, |
| 338 | tableData: [], | 333 | tableData: [], |
| 339 | total: 0, | 334 | total: 0, |
| @@ -359,6 +354,32 @@ | @@ -359,6 +354,32 @@ | ||
| 359 | this.getAll() | 354 | this.getAll() |
| 360 | }, | 355 | }, |
| 361 | methods: { | 356 | methods: { |
| 357 | + objectSpanMethod({ | ||
| 358 | + row, | ||
| 359 | + column, | ||
| 360 | + rowIndex, | ||
| 361 | + columnIndex | ||
| 362 | + }) { | ||
| 363 | + if (columnIndex != 3 && columnIndex != 4 && columnIndex != 5) { | ||
| 364 | + if (rowIndex % row.num === 0) { | ||
| 365 | + return { | ||
| 366 | + rowspan: row.num, | ||
| 367 | + colspan: 1 | ||
| 368 | + }; | ||
| 369 | + } else { | ||
| 370 | + return { | ||
| 371 | + rowspan: 1, | ||
| 372 | + colspan: 1 | ||
| 373 | + }; | ||
| 374 | + } | ||
| 375 | + } else { | ||
| 376 | + return { | ||
| 377 | + rowspan: 1, | ||
| 378 | + colspan: 1 | ||
| 379 | + }; | ||
| 380 | + } | ||
| 381 | + | ||
| 382 | + }, | ||
| 362 | minSev(e) { | 383 | minSev(e) { |
| 363 | this.multipleSelection = e | 384 | this.multipleSelection = e |
| 364 | console.error(this.multipleSelection) | 385 | console.error(this.multipleSelection) |
| @@ -368,7 +389,7 @@ | @@ -368,7 +389,7 @@ | ||
| 368 | } | 389 | } |
| 369 | console.error(this.oninfo) | 390 | console.error(this.oninfo) |
| 370 | let c1 = { | 391 | let c1 = { |
| 371 | - resourcesId: this.oncetype+this.oninfo.id, | 392 | + resourcesId: this.oncetype + this.oninfo.id, |
| 372 | rentalPoliciesIds: ids, | 393 | rentalPoliciesIds: ids, |
| 373 | // resources:this.oninfo | 394 | // resources:this.oninfo |
| 374 | // rentalPoliciesId: 28, | 395 | // rentalPoliciesId: 28, |
| @@ -394,7 +415,7 @@ | @@ -394,7 +415,7 @@ | ||
| 394 | this.multipleSelection = [] | 415 | this.multipleSelection = [] |
| 395 | this.addcl = false | 416 | this.addcl = false |
| 396 | }, | 417 | }, |
| 397 | - async opencl(row,e) { | 418 | + async opencl(row, e) { |
| 398 | this.oncetype = e | 419 | this.oncetype = e |
| 399 | this.oninfo = row | 420 | this.oninfo = row |
| 400 | this.multipleSelection = [] | 421 | this.multipleSelection = [] |
| @@ -524,17 +545,45 @@ | @@ -524,17 +545,45 @@ | ||
| 524 | }, | 545 | }, |
| 525 | async getAll() { | 546 | async getAll() { |
| 526 | if (this.ontype == '1') { | 547 | if (this.ontype == '1') { |
| 527 | - const res = await getAlls(this.pagequery) | ||
| 528 | - this.tableData = res.data.content | ||
| 529 | - this.total = res.data.totalElements | 548 | + const res = await getResourceStrategy({ |
| 549 | + ...this.pagequery, | ||
| 550 | + resourcesId: 'sp' | ||
| 551 | + }) | ||
| 552 | + let c1 = [] | ||
| 553 | + for (let index = 0; index < res.data.list.length; index++) { | ||
| 554 | + const element = res.data.list[index]; | ||
| 555 | + if (element.cereBasicInformationShop.id) { | ||
| 556 | + | ||
| 557 | + let obj = { | ||
| 558 | + cereBasicInformationShop: element.cereBasicInformationShop, | ||
| 559 | + num: element.cereRentalPolicies.length | ||
| 560 | + } | ||
| 561 | + for (let i = 0; i < element.cereRentalPolicies.length; i++) { | ||
| 562 | + // console.error(index,i) | ||
| 563 | + const element1 = element.cereRentalPolicies[i]; | ||
| 564 | + obj.shopinfo = element1 | ||
| 565 | + c1.push(obj) | ||
| 566 | + } | ||
| 567 | + | ||
| 568 | + } | ||
| 569 | + } | ||
| 570 | + this.tableData = c1 | ||
| 571 | + console.error(this.tableData) | ||
| 572 | + this.total = res.data.total | ||
| 530 | } else if (this.ontype == '2') { | 573 | } else if (this.ontype == '2') { |
| 531 | - const res = await likeGet(this.pagequery) | ||
| 532 | - this.tableData = res.data.content | ||
| 533 | - this.total = res.data.totalElements | 574 | + const res = await getResourceStrategy({ |
| 575 | + ...this.pagequery, | ||
| 576 | + resourcesId: 'gg' | ||
| 577 | + }) | ||
| 578 | + this.tableData = res.data.list | ||
| 579 | + this.total = res.data.total | ||
| 534 | } else if (this.ontype == '3') { | 580 | } else if (this.ontype == '3') { |
| 535 | - const res = await changAlls(this.pagequery) | ||
| 536 | - this.tableData = res.data.content | ||
| 537 | - this.total = res.data.totalElements | 581 | + const res = await getResourceStrategy({ |
| 582 | + ...this.pagequery, | ||
| 583 | + resourcesId: 'cd' | ||
| 584 | + }) | ||
| 585 | + this.tableData = res.data.list | ||
| 586 | + this.total = res.data.total | ||
| 538 | } | 587 | } |
| 539 | 588 | ||
| 540 | }, | 589 | }, |
| @@ -880,7 +929,8 @@ | @@ -880,7 +929,8 @@ | ||
| 880 | background-color: #ecf5f0 !important; | 929 | background-color: #ecf5f0 !important; |
| 881 | outline: none; | 930 | outline: none; |
| 882 | } | 931 | } |
| 883 | - .el-dialog__header{ | 932 | + |
| 933 | + .el-dialog__header { | ||
| 884 | padding: 0 0 !important; | 934 | padding: 0 0 !important; |
| 885 | } | 935 | } |
| 886 | </style> | 936 | </style> |
admin-web-master/src/views/detect/information/index.vue
| @@ -82,7 +82,7 @@ | @@ -82,7 +82,7 @@ | ||
| 82 | </el-table-column> | 82 | </el-table-column> |
| 83 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> | 83 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> |
| 84 | <template slot-scope="scope"> | 84 | <template slot-scope="scope"> |
| 85 | - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.rentalStatus=='0'?'待租':'已租'}} | 85 | + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} |
| 86 | </template> | 86 | </template> |
| 87 | </el-table-column> | 87 | </el-table-column> |
| 88 | <el-table-column label="操作" min-width="250" fixed="right"> | 88 | <el-table-column label="操作" min-width="250" fixed="right"> |
| @@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
| 94 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" | 94 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" |
| 95 | @click="opencl(scope.row,'sp')">发布</div> | 95 | @click="opencl(scope.row,'sp')">发布</div> |
| 96 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" | 96 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" |
| 97 | - @click="removeinfozz(scope.row,'0','下架')">下架</div> | 97 | + @click="removeinfozz(scope.row,'2','下架')">下架</div> |
| 98 | </template> | 98 | </template> |
| 99 | </el-table-column> | 99 | </el-table-column> |
| 100 | </el-table> | 100 | </el-table> |
| @@ -143,9 +143,9 @@ | @@ -143,9 +143,9 @@ | ||
| 143 | <add :info="detailsinfo" @removeonaction="removeonaction"></add> | 143 | <add :info="detailsinfo" @removeonaction="removeonaction"></add> |
| 144 | </div> | 144 | </div> |
| 145 | </div> | 145 | </div> |
| 146 | - <el-dialog :visible.sync="addcl" style="padding: 0px;" width="65%" append-to-body center | 146 | + <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center |
| 147 | :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"> | 147 | :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"> |
| 148 | - <cl @minSev="minSev" @mingClose="mingClose"></cl> | 148 | + <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl> |
| 149 | </el-dialog> | 149 | </el-dialog> |
| 150 | </div> | 150 | </div> |
| 151 | 151 | ||
| @@ -171,7 +171,8 @@ | @@ -171,7 +171,8 @@ | ||
| 171 | import cl from '@/components/change/cl.vue' | 171 | import cl from '@/components/change/cl.vue' |
| 172 | 172 | ||
| 173 | import { | 173 | import { |
| 174 | - cereResourceStrategy | 174 | + cereResourceStrategy, |
| 175 | + editStatus | ||
| 175 | } from '@/api/newly.js' | 176 | } from '@/api/newly.js' |
| 176 | export default { | 177 | export default { |
| 177 | data() { | 178 | data() { |
| @@ -224,6 +225,12 @@ | @@ -224,6 +225,12 @@ | ||
| 224 | message: '绑定成功', | 225 | message: '绑定成功', |
| 225 | type: 'success' | 226 | type: 'success' |
| 226 | }) | 227 | }) |
| 228 | + editStatus({ | ||
| 229 | + resourcesId: this.oncetype+this.oninfo.id, | ||
| 230 | + publishStatus: '3' | ||
| 231 | + }).then(res => { | ||
| 232 | + this.onSubmit() | ||
| 233 | + }) | ||
| 227 | } else { | 234 | } else { |
| 228 | this.$message({ | 235 | this.$message({ |
| 229 | message: '绑定失败', | 236 | message: '绑定失败', |
| @@ -598,6 +605,7 @@ | @@ -598,6 +605,7 @@ | ||
| 598 | outline: none; | 605 | outline: none; |
| 599 | } | 606 | } |
| 600 | .el-dialog__header{ | 607 | .el-dialog__header{ |
| 601 | - padding: 0 0 !important; | 608 | + padding: 0; |
| 609 | + display: none; | ||
| 602 | } | 610 | } |
| 603 | </style> | 611 | </style> |
admin-web-master/src/views/detect/map/index.vue
| @@ -8,11 +8,11 @@ | @@ -8,11 +8,11 @@ | ||
| 8 | <!-- 线上 --> | 8 | <!-- 线上 --> |
| 9 | <div> | 9 | <div> |
| 10 | <div style="display: flex;font-size: 14px"> | 10 | <div style="display: flex;font-size: 14px"> |
| 11 | - <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia':''">线上</div> | ||
| 12 | - ({{xsNum}}) | ||
| 13 | - <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)" | ||
| 14 | - :class="leixing?'':'chengeXia'">实体</div>({{xxNum}}) | ||
| 15 | - </div> | 11 | + <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia':''">线上</div> |
| 12 | + ({{xsNum}}) | ||
| 13 | + <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)" | ||
| 14 | + :class="leixing?'':'chengeXia'">实体</div>({{xxNum}}) | ||
| 15 | + </div> | ||
| 16 | <!-- 搜索 --> | 16 | <!-- 搜索 --> |
| 17 | <div class="formSearch"> | 17 | <div class="formSearch"> |
| 18 | <el-form :inline="true" :model="pagequery" style="margin-top: 15px;"> | 18 | <el-form :inline="true" :model="pagequery" style="margin-top: 15px;"> |
| @@ -93,7 +93,7 @@ | @@ -93,7 +93,7 @@ | ||
| 93 | </el-table-column> --> | 93 | </el-table-column> --> |
| 94 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> | 94 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> |
| 95 | <template slot-scope="scope"> | 95 | <template slot-scope="scope"> |
| 96 | - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.rentalStatus=='0'?'待租':'已租'}} | 96 | + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} |
| 97 | </template> | 97 | </template> |
| 98 | </el-table-column> | 98 | </el-table-column> |
| 99 | <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="150" show-overflow-tooltip> | 99 | <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="150" show-overflow-tooltip> |
| @@ -101,10 +101,12 @@ | @@ -101,10 +101,12 @@ | ||
| 101 | <el-table-column label="操作" min-width="250" fixed="right"> | 101 | <el-table-column label="操作" min-width="250" fixed="right"> |
| 102 | <template slot-scope="scope"> | 102 | <template slot-scope="scope"> |
| 103 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> | 103 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> |
| 104 | - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑</div> | 104 | + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 |
| 105 | + </div> | ||
| 105 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> | 106 | <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> |
| 106 | - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfozz(scope.row,'1','发布')">发布</div> | ||
| 107 | - <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" @click="removeinfozz(scope.row,'0','下架')">下架</div> | 107 | + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="opencl(scope.row,'gg')">发布</div> |
| 108 | + <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" | ||
| 109 | + @click="removeinfozz(scope.row,'2','下架')">下架</div> | ||
| 108 | </template> | 110 | </template> |
| 109 | </el-table-column> | 111 | </el-table-column> |
| 110 | </el-table> | 112 | </el-table> |
| @@ -141,7 +143,8 @@ | @@ -141,7 +143,8 @@ | ||
| 141 | style="color:#000000e6">查看</span></div> | 143 | style="color:#000000e6">查看</span></div> |
| 142 | </div> | 144 | </div> |
| 143 | <div> | 145 | <div> |
| 144 | - <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></resourceCommodity> | 146 | + <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"> |
| 147 | + </resourceCommodity> | ||
| 145 | </div> | 148 | </div> |
| 146 | </div> | 149 | </div> |
| 147 | <div class="zhuti" v-if="onaction == '4'"> | 150 | <div class="zhuti" v-if="onaction == '4'"> |
| @@ -153,6 +156,10 @@ | @@ -153,6 +156,10 @@ | ||
| 153 | <add :info="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></add> | 156 | <add :info="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></add> |
| 154 | </div> | 157 | </div> |
| 155 | </div> | 158 | </div> |
| 159 | + <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false" | ||
| 160 | + :close-on-press-escape="false" :show-close="false"> | ||
| 161 | + <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl> | ||
| 162 | + </el-dialog> | ||
| 156 | </div> | 163 | </div> |
| 157 | 164 | ||
| 158 | 165 | ||
| @@ -168,12 +175,22 @@ | @@ -168,12 +175,22 @@ | ||
| 168 | } from '../../../api/map1' | 175 | } from '../../../api/map1' |
| 169 | import add from '../../../components/add/addmap' | 176 | import add from '../../../components/add/addmap' |
| 170 | import resourceCommodity from '../../../components/chakan/map' | 177 | import resourceCommodity from '../../../components/chakan/map' |
| 178 | + import { | ||
| 179 | + cereResourceStrategy, | ||
| 180 | + editStatus | ||
| 181 | + } from '@/api/newly.js' | ||
| 182 | + import cl from '@/components/change/cl.vue' | ||
| 171 | export default { | 183 | export default { |
| 172 | data() { | 184 | data() { |
| 173 | return { | 185 | return { |
| 186 | + oncetype: '', | ||
| 187 | + addcl: false, | ||
| 188 | + oninfo: {}, | ||
| 189 | + multipleSelection: [], | ||
| 190 | + | ||
| 174 | xsNum: 0, | 191 | xsNum: 0, |
| 175 | xxNum: 0, | 192 | xxNum: 0, |
| 176 | - leixing:true, | 193 | + leixing: true, |
| 177 | contractChangeReason: '', | 194 | contractChangeReason: '', |
| 178 | detailsinfo: {}, | 195 | detailsinfo: {}, |
| 179 | pagequery: { | 196 | pagequery: { |
| @@ -185,11 +202,11 @@ | @@ -185,11 +202,11 @@ | ||
| 185 | tableData: [], | 202 | tableData: [], |
| 186 | total: 0, | 203 | total: 0, |
| 187 | onaction: '1', | 204 | onaction: '1', |
| 188 | - formInline: { | ||
| 189 | - }, | 205 | + formInline: {}, |
| 190 | } | 206 | } |
| 191 | }, | 207 | }, |
| 192 | components: { | 208 | components: { |
| 209 | + cl, | ||
| 193 | add, | 210 | add, |
| 194 | resourceCommodity, | 211 | resourceCommodity, |
| 195 | }, | 212 | }, |
| @@ -197,6 +214,50 @@ | @@ -197,6 +214,50 @@ | ||
| 197 | this.getAll() | 214 | this.getAll() |
| 198 | }, | 215 | }, |
| 199 | methods: { | 216 | methods: { |
| 217 | + minSev(e) { | ||
| 218 | + this.multipleSelection = e | ||
| 219 | + console.error(this.multipleSelection) | ||
| 220 | + let ids = [] | ||
| 221 | + for (let index = 0; index < this.multipleSelection.length; index++) { | ||
| 222 | + ids.push(this.multipleSelection[index].id) | ||
| 223 | + } | ||
| 224 | + console.error(this.oninfo) | ||
| 225 | + let c1 = { | ||
| 226 | + resourcesId: this.oncetype + this.oninfo.id, | ||
| 227 | + rentalPoliciesIds: ids, | ||
| 228 | + } | ||
| 229 | + console.error(c1) | ||
| 230 | + cereResourceStrategy(c1).then(res => { | ||
| 231 | + if (res.code == 200) { | ||
| 232 | + this.addcl = false | ||
| 233 | + this.$message({ | ||
| 234 | + message: '绑定成功', | ||
| 235 | + type: 'success' | ||
| 236 | + }) | ||
| 237 | + editStatus({ | ||
| 238 | + resourcesId: this.oncetype + this.oninfo.id, | ||
| 239 | + publishStatus: '3' | ||
| 240 | + }).then(res => { | ||
| 241 | + this.onSubmit() | ||
| 242 | + }) | ||
| 243 | + } else { | ||
| 244 | + this.$message({ | ||
| 245 | + message: '绑定失败', | ||
| 246 | + type: 'error' | ||
| 247 | + }) | ||
| 248 | + } | ||
| 249 | + }) | ||
| 250 | + }, | ||
| 251 | + mingClose() { | ||
| 252 | + this.multipleSelection = [] | ||
| 253 | + this.addcl = false | ||
| 254 | + }, | ||
| 255 | + async opencl(row, e) { | ||
| 256 | + this.oncetype = e | ||
| 257 | + this.oninfo = row | ||
| 258 | + this.multipleSelection = [] | ||
| 259 | + this.addcl = true | ||
| 260 | + }, | ||
| 200 | chenge(val) { | 261 | chenge(val) { |
| 201 | if (val == 1) { | 262 | if (val == 1) { |
| 202 | this.leixing = true | 263 | this.leixing = true |
| @@ -245,21 +306,21 @@ | @@ -245,21 +306,21 @@ | ||
| 245 | return formattedDateTime | 306 | return formattedDateTime |
| 246 | 307 | ||
| 247 | }, | 308 | }, |
| 248 | - removeinfozz(row, e,tit) { | 309 | + removeinfozz(row, e, tit) { |
| 249 | let that = this | 310 | let that = this |
| 250 | - this.$confirm('确定要' + tit +'吗？', '提示', { | 311 | + this.$confirm('确定要' + tit + '吗？', '提示', { |
| 251 | confirmButtonText: '确定', | 312 | confirmButtonText: '确定', |
| 252 | cancelButtonText: '取消', | 313 | cancelButtonText: '取消', |
| 253 | type: 'warning' | 314 | type: 'warning' |
| 254 | }).then(() => { | 315 | }).then(() => { |
| 255 | editList({ | 316 | editList({ |
| 256 | ...row, | 317 | ...row, |
| 257 | - publishStatus:e | 318 | + publishStatus: e |
| 258 | }).then(res => { | 319 | }).then(res => { |
| 259 | console.error(res) | 320 | console.error(res) |
| 260 | if (res.code == 200) { | 321 | if (res.code == 200) { |
| 261 | this.$message({ | 322 | this.$message({ |
| 262 | - message: tit+'成功', | 323 | + message: tit + '成功', |
| 263 | type: 'success' | 324 | type: 'success' |
| 264 | }) | 325 | }) |
| 265 | this.removeonaction('1') | 326 | this.removeonaction('1') |
| @@ -306,21 +367,21 @@ | @@ -306,21 +367,21 @@ | ||
| 306 | this.tableData = res.data.content | 367 | this.tableData = res.data.content |
| 307 | this.total = res.data.totalElements | 368 | this.total = res.data.totalElements |
| 308 | let obj1 = { | 369 | let obj1 = { |
| 309 | - pageNumber: 1, | ||
| 310 | - pageSize: 10, | ||
| 311 | - advertisingType: '线上广告位' | ||
| 312 | - } | ||
| 313 | - likeGet(obj1).then(res => { | ||
| 314 | - this.xsNum = res.data.content.length | ||
| 315 | - }) | ||
| 316 | - let obj2 = { | ||
| 317 | - pageNumber: 1, | ||
| 318 | - pageSize: 10, | ||
| 319 | - advertisingType: '实体广告位' | ||
| 320 | - } | ||
| 321 | - likeGet(obj2).then(res => { | ||
| 322 | - this.xxNum = res.data.content.length | ||
| 323 | - }) | 370 | + pageNumber: 1, |
| 371 | + pageSize: 10, | ||
| 372 | + advertisingType: '线上广告位' | ||
| 373 | + } | ||
| 374 | + likeGet(obj1).then(res1 => { | ||
| 375 | + this.xsNum = res1.data.totalElements | ||
| 376 | + }) | ||
| 377 | + let obj2 = { | ||
| 378 | + pageNumber: 1, | ||
| 379 | + pageSize: 10, | ||
| 380 | + advertisingType: '实体广告位' | ||
| 381 | + } | ||
| 382 | + likeGet(obj2).then(res2 => { | ||
| 383 | + this.xxNum = res2.data.totalElements | ||
| 384 | + }) | ||
| 324 | }, | 385 | }, |
| 325 | removeonaction(e) { | 386 | removeonaction(e) { |
| 326 | console.error(e) | 387 | console.error(e) |