webapp / GreenwayWeb

Commit 3caa08e1f9a1e2e9715e3227c082320ba9811fd8

Authored by 杨鑫
2 parents 4c866766 7a0d79ed

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

Inline Side-by-side
Showing 9 changed files with 174 additions and 314 deletions
admin-web-master/dist.zip 0 → 100644
View file @3caa08e
No preview for this file type
admin-web-master/src/components/add/addsam.vue
  View file @3caa08e
... ... @@ -12,13 +12,14 @@
12 12 </el-radio-group>
13 13 </el-form-item>
14 14 <el-form-item label="策略模板" prop="policyTemplate">
15   - <el-select v-model="ruleForm.policyTemplate" placeholder="请选择" style="width:calc(100% - 100px);" @change="changeMode">
  15 + <el-select v-model="ruleForm.policyTemplate" placeholder="请选择" style="width:calc(100% - 100px);"
  16 + @change="changeMode">
16 17 <el-option :label="item.policyName" :value="item.id" v-for="(item,index) in tableData" />
17 18 </el-select>
18 19 <el-button style="background-color: #3F9B6A;color: #fff;float: right;" @click="modeCode = true">管理模板
19 20 </el-button>
20 21 </el-form-item>
21   - <el-row v-if="ruleForm.applicableResources == '商铺'">
  22 + <el-row>
22 23 <el-col :span="12">
23 24 <el-form-item label="是否出租" prop="isRental">
24 25 <el-select v-model="ruleForm.isRental" placeholder="请选择" style="width: 100%;">
... ... @@ -27,78 +28,16 @@
27 28 </el-select>
28 29 </el-form-item>
29 30 </el-col>
30   - <el-col :span="12">
  31 + <el-col :span="12" v-if="ruleForm.applicableResources == '商铺'">
31 32 <el-form-item label="经营类型" prop="businessType">
32 33 <el-select v-model="ruleForm.businessType" placeholder="请选择" style="width: 100%;">
33 34 <el-option label="超市" value="超市" />
34 35 <el-option label="鞋店" value="鞋店" />
35 36 <el-option label="家居饰品店" value="家居饰品店" />
36 37 </el-select>
37   - <!-- <el-input v-model="ruleForm.businessType" placeholder="请输入" maxlength="50"></el-input> -->
38   - </el-form-item>
39   - </el-col>
40   - </el-row>
41   - <el-row v-if="ruleForm.applicableResources == '商铺'">
42   - <el-col :span="12">
43   - <el-form-item label="租金" prop="rentalPrice">
44   - <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30">
45   - <template slot="suffix"><span
46   - style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
47   - </el-input>
48   - </el-form-item>
49   - </el-col>
50   - <el-col :span="12">
51   - <el-form-item label="付款周期" prop="leaseTerm">
52   - <el-select v-model="ruleForm.leaseTerm" placeholder="请选择" style="width: 100%;">
53   - <el-option label="日" value="日" />
54   - <el-option label="月" value="月" />
55   - <el-option label="季" value="季" />
56   - <el-option label="年" value="年" />
57   - </el-select>
58   - </el-form-item>
59   - </el-col>
60   - </el-row>
61   - <el-row v-if="ruleForm.applicableResources == '商铺'">
62   - <el-col :span="12">
63   - <el-form-item label="租赁时段" prop="leaseDate">
64   - <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
65   - style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期">
66   - </el-date-picker>
67   - </el-form-item>
68   - </el-col>
69   - <el-col :span="12">
70   - <el-form-item label="免租条件" prop="rentFreeCondition">
71   - <el-input v-model="ruleForm.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input>
72   - </el-form-item>
73   - </el-col>
74   - </el-row>
75   - <el-row v-if="ruleForm.applicableResources == '商铺'">
76   - <el-col :span="12">
77   - <el-form-item label="免租期" prop="rentFreePeriod">
78   - <el-select v-model="ruleForm.rentFreePeriod" placeholder="请选择" style="width: 100%;">
79   - <el-option :label="item" :value="item" v-for="item in 31" />
80   - </el-select>
81   - </el-form-item>
82   - </el-col>
83   - <el-col :span="12">
84   - <el-form-item label="付款日" prop="payDay">
85   - <el-select v-model="ruleForm.payDay" placeholder="请选择" style="width: 100%;">
86   - <el-option :label="item" :value="item" v-for="item in 31" />
87   - </el-select>
88   - </el-form-item>
89   - </el-col>
90   - </el-row>
91   -
92   - <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'">
93   - <el-col :span="12">
94   - <el-form-item label="是否出租" prop="isRental">
95   - <el-select v-model="ruleForm.isRental" placeholder="请选择" style="width: 100%;">
96   - <el-option label="自营" value="0" />
97   - <el-option label="是" value="1" />
98   - </el-select>
99 38 </el-form-item>
100 39 </el-col>
101   - <el-col :span="12">
  40 + <el-col :span="12" v-if="ruleForm.isRental !== '0'">
102 41 <el-form-item label="租金价格" prop="rentalPrice">
103 42 <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30">
104 43 <template slot="suffix"><span
... ... @@ -106,10 +45,7 @@
106 45 </el-input>
107 46 </el-form-item>
108 47 </el-col>
109   - </el-row>
110   - <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'">
111   -
112   - <el-col :span="12">
  48 + <el-col :span="12" v-if="ruleForm.isRental !== '0'">
113 49 <el-form-item label="付款周期" prop="leaseTerm">
114 50 <el-select v-model="ruleForm.leaseTerm" placeholder="请选择" style="width: 100%;">
115 51 <el-option label="日" value="日" />
... ... @@ -120,29 +56,25 @@
120 56 </el-form-item>
121 57 </el-col>
122 58 <el-col :span="12">
123   - <el-form-item label="租赁时段" prop="leaseDate">
  59 + <el-form-item :label="ruleForm.isRental !== '0'?'租赁时段':'使用周期'" prop="leaseDate">
124 60 <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
125 61 style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期">
126 62 </el-date-picker>
127 63 </el-form-item>
128 64 </el-col>
129   - </el-row>
130   - <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'">
131   - <el-col :span="12">
  65 + <el-col :span="12" v-if="ruleForm.isRental !== '0'">
132 66 <el-form-item label="免租条件" prop="rentFreeCondition">
133 67 <el-input v-model="ruleForm.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input>
134 68 </el-form-item>
135 69 </el-col>
136   - <el-col :span="12">
  70 + <el-col :span="12" v-if="ruleForm.isRental !== '0'">
137 71 <el-form-item label="免租期" prop="rentFreePeriod">
138 72 <el-select v-model="ruleForm.rentFreePeriod" placeholder="请选择" style="width: 100%;">
139 73 <el-option :label="item" :value="item" v-for="item in 31" />
140 74 </el-select>
141 75 </el-form-item>
142 76 </el-col>
143   - </el-row>
144   - <el-row v-if="ruleForm.applicableResources == '场地' || ruleForm.applicableResources == '广告位'">
145   - <el-col :span="12">
  77 + <el-col :span="12" v-if="ruleForm.isRental !== '0'">
146 78 <el-form-item label="付款日" prop="payDay">
147 79 <el-select v-model="ruleForm.payDay" placeholder="请选择" style="width: 100%;">
148 80 <el-option :label="item" :value="item" v-for="item in 31" />
... ... @@ -150,20 +82,12 @@
150 82 </el-form-item>
151 83 </el-col>
152 84 </el-row>
153   - <el-row>
154   - <el-col :span="24">
155   - <el-form-item label="优惠政策" prop="preferentialPolicy">
156   - <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor>
157   - </el-form-item>
158   - </el-col>
159   - </el-row>
160   - <el-row>
161   - <el-col :span="24">
162   - <el-form-item label="其他说明" prop="otherDescription">
163   - <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="100"></wangEditor>
164   - </el-form-item>
165   - </el-col>
166   - </el-row>
  85 + <el-form-item v-if="ruleForm.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
  86 + <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor>
  87 + </el-form-item>
  88 + <el-form-item label="其他说明" prop="otherDescription">
  89 + <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="100"></wangEditor>
  90 + </el-form-item>
167 91 <el-row :gutter="20">
168 92 <el-col :span="12">
169 93 <el-form-item>
... ... @@ -214,32 +138,32 @@
214 138 <el-table :data="tableData"
215 139 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
216 140 <el-table-column label="序号" width="50">
217   - <template slot-scope="scope">
218   - {{scope.$index +1}}
219   - </template>
220   - </el-table-column>
  141 + <template slot-scope="scope">
  142 + {{scope.$index +1}}
  143 + </template>
  144 + </el-table-column>
221 145 <el-table-column label="策略名称" prop="policyName">
222 146 </el-table-column>
223 147 <el-table-column label="适用资源" prop="applicableResources">
224 148 </el-table-column>
225   - <el-table-column label="经营类型" prop="businessType" >
  149 + <el-table-column label="经营类型" prop="businessType">
226 150 </el-table-column>
227   - <el-table-column prop="rentalPrice" label="租金/周期" >
  151 + <el-table-column prop="rentalPrice" label="租金/周期">
228 152 <template slot-scope="scope">
229 153 {{scope.row.rentalPrice}}/{{scope.row.leaseTerm}}
230 154 </template>
231 155 </el-table-column>
232   - <el-table-column label="付款日" >
  156 + <el-table-column label="付款日">
233 157 <template slot-scope="scope">
234 158 {{scope.row.payDay}}
235 159 </template>
236 160 </el-table-column>
237   - <el-table-column label="是否出租" prop="isRental" >
  161 + <el-table-column label="是否出租" prop="isRental">
238 162 <template slot-scope="scope">
239 163 {{scope.row.isrental == '0'?'自营':'是'}}
240 164 </template>
241 165 </el-table-column>
242   - <el-table-column label="操作" >
  166 + <el-table-column label="操作">
243 167 <template slot-scope="scope">
244 168 <div @click="addM(scope.row)" class="tableBtn greens">编辑</div>
245 169 <div @click="delM(scope.row.id)" class="tableBtn greens">删除</div>
... ... @@ -248,9 +172,9 @@
248 172 </el-table>
249 173 <div style="display: flex;justify-content: space-between;" class="bom">
250 174 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
251   - <el-pagination :current-page="querymb.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="querymb.pageSize"
252   - background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
253   - @current-change="handleCurrentChange">
  175 + <el-pagination :current-page="querymb.pageNumber+1" :page-sizes="[10, 20, 50, 100]"
  176 + :page-size="querymb.pageSize" background small layout="prev, pager, next" :total="total"
  177 + @size-change="handleSizeChange" @current-change="handleCurrentChange">
254 178 </el-pagination>
255 179 </div>
256 180 <div style="margin-top:20px;">
... ... @@ -259,8 +183,8 @@
259 183 </div>
260 184 </div>
261 185 </div>
262   - <el-dialog :title="formInline.id?'编辑模板':'新增模板'" :visible.sync="addMing" custom-class='bian_css' style="padding: 0;"
263   - width="65%" center :close-on-click-modal="false" :show-close="false" append-to-body>
  186 + <el-dialog :title="formInline.id?'编辑模板':'新增模板'" :visible.sync="addMing" custom-class='bian_css'
  187 + style="padding: 0;" width="65%" center :close-on-click-modal="false" :show-close="false" append-to-body>
264 188 <div style="padding:20px;">
265 189 <el-form :model="formInline" :rules="rulesSt2" ref="formInline" label-width="130px" class="demo-ruleForm">
266 190 <el-form-item label="策略名称" prop="policyName">
... ... @@ -273,7 +197,7 @@
273 197 <el-radio label="广告位" value="广告位">广告位</el-radio>
274 198 </el-radio-group>
275 199 </el-form-item>
276   - <el-row v-if="formInline.applicableResources == '商铺'">
  200 + <el-row>
277 201 <el-col :span="12">
278 202 <el-form-item label="是否出租" prop="isRental">
279 203 <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 100%;">
... ... @@ -282,78 +206,16 @@
282 206 </el-select>
283 207 </el-form-item>
284 208 </el-col>
285   - <el-col :span="12">
  209 + <el-col :span="12" v-if="formInline.applicableResources == '商铺'">
286 210 <el-form-item label="经营类型" prop="businessType">
287 211 <el-select v-model="formInline.businessType" placeholder="请选择" style="width: 100%;">
288 212 <el-option label="超市" value="超市" />
289 213 <el-option label="鞋店" value="鞋店" />
290 214 <el-option label="家居饰品店" value="家居饰品店" />
291 215 </el-select>
292   - <!-- <el-input v-model="formInline.businessType" placeholder="请输入" maxlength="50"></el-input> -->
293   -
294   - </el-form-item>
295   - </el-col>
296   - </el-row>
297   - <el-row v-if="formInline.applicableResources == '商铺'">
298   - <el-col :span="12">
299   - <el-form-item label="租金" prop="rentalPrice">
300   - <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30">
301   - <template slot="suffix"><span
302   - style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
303   - </el-input>
304   - </el-form-item>
305   - </el-col>
306   - <el-col :span="12">
307   - <el-form-item label="付款周期" prop="leaseTerm">
308   - <el-select v-model="formInline.leaseTerm" placeholder="请选择" style="width: 100%;">
309   - <el-option label="日" value="日" />
310   - <el-option label="月" value="月" />
311   - <el-option label="季" value="季" />
312   - <el-option label="年" value="年" />
313   - </el-select>
314   - </el-form-item>
315   - </el-col>
316   - </el-row>
317   - <el-row v-if="formInline.applicableResources == '商铺'">
318   - <el-col :span="12">
319   - <el-form-item label="租赁时段" prop="leaseDate">
320   - <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
321   - style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期">
322   - </el-date-picker>
323   - </el-form-item>
324   - </el-col>
325   - <el-col :span="12">
326   - <el-form-item label="免租条件" prop="rentFreeCondition">
327   - <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input>
328   - </el-form-item>
329   - </el-col>
330   - </el-row>
331   - <el-row v-if="formInline.applicableResources == '商铺'">
332   - <el-col :span="12">
333   - <el-form-item label="免租期" prop="rentFreePeriod">
334   - <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 100%;">
335   - <el-option :label="item" :value="item" v-for="item in 31" />
336   - </el-select>
337   - </el-form-item>
338   - </el-col>
339   - <el-col :span="12">
340   - <el-form-item label="付款日" prop="payDay">
341   - <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 100%;">
342   - <el-option :label="item" :value="item" v-for="item in 31" />
343   - </el-select>
344 216 </el-form-item>
345 217 </el-col>
346   - </el-row>
347   - <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'">
348   - <el-col :span="12">
349   - <el-form-item label="是否出租" prop="isRental">
350   - <el-select v-model="formInline.isRental" placeholder="请选择" style="width: 100%;">
351   - <el-option label="自营" value="0" />
352   - <el-option label="是" value="1" />
353   - </el-select>
354   - </el-form-item>
355   - </el-col>
356   - <el-col :span="12">
  218 + <el-col :span="12" v-if="formInline.isRental !== '0'">
357 219 <el-form-item label="租金价格" prop="rentalPrice">
358 220 <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30">
359 221 <template slot="suffix"><span
... ... @@ -361,9 +223,7 @@
361 223 </el-input>
362 224 </el-form-item>
363 225 </el-col>
364   - </el-row>
365   - <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'">
366   - <el-col :span="12">
  226 + <el-col :span="12" v-if="formInline.isRental !== '0'">
367 227 <el-form-item label="付款周期" prop="leaseTerm">
368 228 <el-select v-model="formInline.leaseTerm" placeholder="请选择" style="width: 100%;">
369 229 <el-option label="日" value="日" />
... ... @@ -374,29 +234,25 @@
374 234 </el-form-item>
375 235 </el-col>
376 236 <el-col :span="12">
377   - <el-form-item label="租赁时段" prop="leaseDate">
  237 + <el-form-item :label="formInline.isRental !== '0'?'租赁时段':'使用周期'" prop="leaseDate">
378 238 <el-date-picker v-model="leaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
379 239 style="width: 100%;" start-placeholder="开始日期" end-placeholder="结束日期">
380 240 </el-date-picker>
381 241 </el-form-item>
382 242 </el-col>
383   - </el-row>
384   - <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'">
385   - <el-col :span="12">
  243 + <el-col :span="12" v-if="formInline.isRental !== '0'">
386 244 <el-form-item label="免租条件" prop="rentFreeCondition">
387 245 <el-input v-model="formInline.rentFreeCondition" placeholder="请输入" maxlength="50"></el-input>
388 246 </el-form-item>
389 247 </el-col>
390   - <el-col :span="12">
  248 + <el-col :span="12" v-if="formInline.isRental !== '0'">
391 249 <el-form-item label="免租期" prop="rentFreePeriod">
392 250 <el-select v-model="formInline.rentFreePeriod" placeholder="请选择" style="width: 100%;">
393 251 <el-option :label="item" :value="item" v-for="item in 31" />
394 252 </el-select>
395 253 </el-form-item>
396 254 </el-col>
397   - </el-row>
398   - <el-row v-if="formInline.applicableResources == '场地' || formInline.applicableResources == '广告位'">
399   - <el-col :span="12">
  255 + <el-col :span="12" v-if="formInline.isRental !== '0'">
400 256 <el-form-item label="付款日" prop="payDay">
401 257 <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 100%;">
402 258 <el-option :label="item" :value="item" v-for="item in 31" />
... ... @@ -404,20 +260,12 @@
404 260 </el-form-item>
405 261 </el-col>
406 262 </el-row>
407   - <el-row>
408   - <el-col :span="24">
409   - <el-form-item label="优惠政策" prop="preferentialPolicy">
410   - <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
411   - </el-form-item>
412   - </el-col>
413   - </el-row>
414   - <el-row>
415   - <el-col :span="24">
416   - <el-form-item label="其他说明" prop="otherDescription">
417   - <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor>
418   - </el-form-item>
419   - </el-col>
420   - </el-row>
  263 + <el-form-item v-if="formInline.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
  264 + <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
  265 + </el-form-item>
  266 + <el-form-item label="其他说明" prop="otherDescription">
  267 + <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor>
  268 + </el-form-item>
421 269 </el-form>
422 270 <div style="display: flex;justify-content: flex-end;margin-top:20px;">
423 271 <el-button @click="closemb()" style="background-color: #fff;color: #000;border: 1px solid #B1B1B1;"
... ... @@ -445,8 +293,8 @@
445 293 },
446 294 data() {
447 295 return {
448   - addMing:false,
449   - modeAdd:false,
  296 + addMing: false,
  297 + modeAdd: false,
450 298 modeCode: false,
451 299 leaseDate: [], //租赁时段
452 300 paymentDate: [], //付款日期
... ... @@ -577,12 +425,12 @@
577 425 }
578 426 ],
579 427 },
580   - querymb:{
  428 + querymb: {
581 429 pageNumber: 0,
582 430 pageSize: 10,
583 431 isTemplate: '0'
584 432 },
585   - total:0
  433 + total: 0
586 434 };
587 435 },
588 436 props: {
... ... @@ -674,9 +522,11 @@
674 522 this.total = res.data.totalElements
675 523 },
676 524 addmb() {
677   - console.error({...this.formInline})
678   - this.formInline.isTemplate = '0'
679   - if(this.formInline.id) {
  525 + console.error({
  526 + ...this.formInline
  527 + })
  528 + this.formInline.isTemplate = '0'
  529 + if (this.formInline.id) {
680 530 if (this.leaseDate.length != 0) {
681 531 this.formInline.leaseStartDate = this.leaseDate[0]
682 532 this.formInline.leaseEndDate = this.leaseDate[1]
... ... @@ -752,8 +602,8 @@
752 602 return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
753 603 },
754 604 add() {
755   - this.ruleForm.isTemplate = '1'
756   - if(this.ruleForm.id) {
  605 + this.ruleForm.isTemplate = '1'
  606 + if (this.ruleForm.id) {
757 607 if (this.leaseDate.length != 0) {
758 608 this.ruleForm.leaseStartDate = this.leaseDate[0]
759 609 this.ruleForm.leaseEndDate = this.leaseDate[1]
... ... @@ -876,7 +726,7 @@
876 726 height: 32px;
877 727 }
878 728 }
879   -
  729 +
880 730 .formSearch {
881 731 display: flex;
882 732 width: 100%;
... ...
admin-web-master/src/components/chakan/map.vue
  View file @3caa08e
... ... @@ -93,13 +93,27 @@
93 93 <el-form-item label="备注信息" prop="memo" v-if="editbgid.advertisingType == '线上广告位'">
94 94 <div class="duiqi">{{editbgid.memo || '无'}}</div>
95 95 </el-form-item>
96   -
97   -
98   -
99   -
100   -
101   -
102 96 </el-form>
  97 + <TitleWithCircle title="历史发布/下架记录" />
  98 + <div style="padding: 20px;">
  99 + <el-table :data="datalistxsj"
  100 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  101 + tooltip-effect="dark custom-tooltip-effect">
  102 + <el-table-column label="类型" prop="type" >
  103 + </el-table-column>
  104 + <el-table-column label="操作时间" prop="operationTime" >
  105 + </el-table-column>
  106 + <el-table-column label="操作人" prop="operator">
  107 + </el-table-column>
  108 + </el-table>
  109 + <div style="display: flex;justify-content: space-between;" class="bom">
  110 + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div>
  111 + <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize"
  112 + background small layout="prev, pager, next" :total="totalsxj" @size-change="handleSizeChangesxj"
  113 + @current-change="handleCurrentChangesxj">
  114 + </el-pagination>
  115 + </div>
  116 + </div>
103 117 </div>
104 118 </div>
105 119 </el-tab-pane>
... ... @@ -161,6 +175,7 @@
161 175 import MapXian from "@/components/MapContainer/MapXian";
162 176 import TitleWithCircle from '@/components/top/index';
163 177 import {
  178 + cereBusinessOperationqueryByPage,
164 179 cereResourceStrategylist,
165 180 cereBusinessPlan
166 181 } from '@/api/newly';
... ... @@ -184,6 +199,13 @@
184 199 },
185 200 data() {
186 201 return {
  202 + datalistxsj:[],
  203 + totalsxj:0,
  204 + pagequerysxj:{
  205 + pageNumber: 0,
  206 + pageSize: 10,
  207 + resourcesId: 'sp' + this.editbgid.id
  208 + },
187 209 xiangTab: 'first',
188 210 list: [],
189 211 parentMessage: {},
... ... @@ -214,6 +236,7 @@
214 236 }
215 237 this.datalist1 = res.data
216 238 })
  239 + this.getAllxsj()
217 240 }
218 241  
219 242  
... ... @@ -222,6 +245,26 @@
222 245  
223 246 },
224 247 methods: {
  248 + handleCurrentChangesxj(val) {
  249 + this.pagequerysxj.pageNumber = val - 1
  250 + this.getAllxsj()
  251 + },
  252 + handleSizeChangesxj(val) {
  253 + this.pagequerysxj.pageSize = val
  254 + this.pagequerysxj.pageNumber = 0
  255 + this.getAllxsj()
  256 + },
  257 + getAllxsj() {
  258 + cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => {
  259 + console.error(res)
  260 + if (!Array.isArray(res.data.content)) {
  261 + this.datalistxsj = [];
  262 + return;
  263 + }
  264 + this.datalistxsj = res.data.content
  265 + this.totalsxj = res.data.totalElements
  266 + })
  267 + },
225 268 changetype() {
226 269 this.xiangTab = 'first'
227 270 this.$emit('removeonaction', '1')
... ...
admin-web-master/src/components/chakan/sam.vue
  View file @3caa08e
... ... @@ -2,131 +2,82 @@
2 2 <div>
3 3 <div>
4 4 <el-tabs v-model="xiangTab">
5   - <el-tab-pane label="资源信息" name="first">
  5 + <el-tab-pane label="策略信息" name="first">
6 6 <div style="margin-top: 30px;" class="editcss">
7 7 <TitleWithCircle title="基础信息" />
8 8 <div style="padding: 20px;">
9 9 <el-form :model="editbgid" ref="formInline" label-width="120px" class="demo-ruleForm">
10 10 <el-row :gutter="20">
11 11 <el-col :span="8">
12   - <el-form-item label="场地名称" prop="venueName">
13   - <div class="duiqi">{{editbgid.venueName || '无'}}</div>
  12 + <el-form-item label="策略名称" prop="policyName">
  13 + <div class="duiqi">{{editbgid.policyName || '无'}}</div>
14 14 </el-form-item>
15 15 </el-col>
16 16 <el-col :span="8">
17   - <el-form-item label="场地类型" prop="venueType">
18   - <div class="duiqi">{{editbgid.venueType || '无'}}</div>
  17 + <el-form-item label="适用资源" prop="applicableResources">
  18 + <div class="duiqi">{{editbgid.applicableResources || '无'}}</div>
19 19 </el-form-item>
20 20 </el-col>
21 21 <el-col :span="8">
22   - <el-form-item label="实际使用面积" prop="actualArea">
23   - <div class="duiqi">{{editbgid.actualArea || '无'}}</div>
  22 + <el-form-item label="是否出租" prop="isRental">
  23 + <div class="duiqi">{{editbgid.isRental=='0'?'自营':editbgid.isRental=='1'?'是':'无'}}</div>
24 24 </el-form-item>
25 25 </el-col>
26 26 </el-row>
27 27 <el-row :gutter="20">
28 28 <el-col :span="8">
29   - <el-form-item label="所属区域" prop="district">
30   - <div class="duiqi">{{editbgid.district || '无'}}</div>
  29 + <el-form-item label="付款日" prop="payDay">
  30 + <div class="duiqi">{{editbgid.payDay || '无'}}</div>
31 31 </el-form-item>
32 32 </el-col>
33 33 <el-col :span="8">
34   - <el-form-item label="归属部门" prop="department">
35   - <div class="duiqi">{{editbgid.department || '无'}}</div>
  34 + <el-form-item label="租金" prop="rentalPrice">
  35 + <div class="duiqi">{{editbgid.rentalPrice || '无'}}</div>
36 36 </el-form-item>
37 37 </el-col>
38 38 <el-col :span="8">
39   - <el-form-item label="负责人" prop="responsiblePerson">
40   - <div class="duiqi">{{editbgid.belongingParkTrail || '无'}}</div>
  39 + <el-form-item label="付款周期" prop="leaseTerm">
  40 + <div class="duiqi">{{editbgid.leaseTerm || '无'}}</div>
41 41 </el-form-item>
42 42 </el-col>
43 43 </el-row>
44 44 <el-row :gutter="20">
45 45 <el-col :span="8">
46   - <el-form-item label="联系人" prop="contact">
  46 + <el-form-item label="租赁时段" prop="contact">
47 47 <div class="duiqi">{{editbgid.contact || '无'}}</div>
48 48 </el-form-item>
49 49 </el-col>
50 50 <el-col :span="8">
51   - <el-form-item label="联系电话" prop="phoneNumber">
52   - <div class="duiqi">{{editbgid.belongingParkTrail || '无'}}</div>
  51 + <el-form-item label="免租条件" prop="rentFreeCondition">
  52 + <div class="duiqi">{{editbgid.rentFreeCondition || '无'}}</div>
  53 + </el-form-item>
  54 + </el-col>
  55 + <el-col :span="8">
  56 + <el-form-item label="免租期" prop="rentFreePeriod">
  57 + <div class="duiqi">{{editbgid.rentFreePeriod || '无'}}</div>
53 58 </el-form-item>
54 59 </el-col>
55 60 </el-row>
56   - <el-form-item label="详细位置" prop="detailedLocation">
57   - <div class="duiqi">{{editbgid.detailedLocation || '无'}}</div>
58   - </el-form-item>
59   - <el-form-item label="地图标点" prop="mapMarker">
60   - <div style="width: 100%;height: 300px;">
61   - <newmap :isx="false" :message="editbgid.mapMarker"></newmap>
62   - </div>
63   - </el-form-item>
64   - <el-form-item label="场地描述" prop="description">
65   - <div class="duiqi">{{editbgid.description || '无'}}</div>
66   - </el-form-item>
67   - <el-form-item label="规划图纸" prop="planningDrawing">
68   - <div v-if="editbgid.planningDrawing">
69   - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
70   - v-for="item in editbgid.planningDrawing.split(',')">
71   - </div>
72   - <div class="duiqi" v-else>无</div>
73   - </el-form-item>
74   - <el-form-item label="展示主图" prop="displayImage">
75   - <div >
76   - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
77   - v-for="item in editbgid.displayImage.split(',')">
78   - </div>
  61 + <el-row v-if="editbgid.applicableResources == '商铺'">
  62 + <el-col :span="8" >
  63 + <el-form-item label="经营类型" prop="businessType">
  64 + <div class="duiqi" >{{editbgid.businessType || '无'}}</div>
  65 + </el-form-item>
  66 + </el-col>
  67 + </el-row>
  68 + <el-form-item label="优惠政策" prop="preferentialPolicy">
  69 + <div class="duiqi" v-if="editbgid.preferentialPolicy" v-html="editbgid.preferentialPolicy"></div>
  70 + <div class="duiqi" v-else>无</div>
79 71 </el-form-item>
80   - <el-form-item label="其他视频" prop="otherImageVideos" >
81   - <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div>
  72 + <el-form-item label="其他说明" prop="otherDescription">
  73 + <div v-if="editbgid.otherDescription" class="duiqi" v-html="editbgid.otherDescription"></div>
  74 + <div class="duiqi" v-else>无</div>
82 75 </el-form-item>
83 76 </el-form>
84 77 </div>
85 78 </div>
86 79 </el-tab-pane>
87   - <el-tab-pane label="招商方案信息" name="second">
88   - <div style="margin-top: 30px;" class="editcss">
89   - <!-- <TitleWithCircle title="招商方案信息" />
90   - <div style="padding: 20px;">
91   - <el-table :data="datalist1"
92   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
93   - tooltip-effect="dark custom-tooltip-effect">
94   - <el-table-column label="招商方案名称" prop="planName" min-width="200">
95   - </el-table-column>
96   - <el-table-column label="创建日期" prop="createTime" min-width="100">
97   - </el-table-column>
98   - </el-table>
99   - </div> -->
100   - <TitleWithCircle title="策略方案" />
101   - <div style="padding: 20px;">
102   - <el-table :data="datalist"
103   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
104   - tooltip-effect="dark custom-tooltip-effect">
105   - <el-table-column label="策略名称" prop="policyName" min-width="200">
106   - </el-table-column>
107   - <el-table-column label="适用资源" prop="applicableResources" min-width="100">
108   - </el-table-column>
109   - <el-table-column label="经营类型" prop="businessType" min-width="100">
110 80  
111   - </el-table-column>
112   - <el-table-column label="租金价格" prop="rentalPrice" min-width="150">
113   - </el-table-column>
114   - <el-table-column label="租期" prop="leaseTerm" min-width="100">
115   - </el-table-column>
116   - <el-table-column label="是否出租" prop="isRental" min-width="100">
117   - <template slot-scope="scope">
118   - {{scope.row.isRental == '0'?'否':'是'}}
119   - </template>
120   - </el-table-column>
121   - <el-table-column label="是否自营" prop="planningObjectives" min-width="100">
122   - <template slot-scope="scope">
123   - {{scope.row.isSelfOperated == '0'?'否':'是'}}
124   - </template>
125   - </el-table-column>
126   - </el-table>
127   - </div>
128   - </div>
129   - </el-tab-pane>
130 81 </el-tabs>
131 82 </div>
132 83 <div>
... ...
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
  View file @3caa08e
... ... @@ -38,11 +38,6 @@
38 38 </el-button>
39 39 </div>
40 40 </div>
41   - <div style="margin-bottom: 20px;">
42   - <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
43   - icon="el-icon-circle-plus-outline">新增</el-button>
44   - <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
45   - </div>
46 41 <!-- 表格 -->
47 42 <el-table :data="tableData"
48 43 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
... ...
admin-web-master/src/views/detect/map/index.vue
  View file @3caa08e
... ... @@ -154,7 +154,8 @@
154 154 import resourceCommodity from '../../../components/chakan/map'
155 155 import {
156 156 cereResourceStrategy,
157   - editStatus
  157 + editStatus,
  158 + cereBusinessOperationadd
158 159 } from '@/api/newly.js'
159 160 import cl from '@/components/change/cl.vue'
160 161 export default {
... ... @@ -217,6 +218,14 @@
217 218 }).then(res => {
218 219 this.onSubmit()
219 220 })
  221 + cereBusinessOperationadd({
  222 + type:'发布',
  223 + resourceId: this.oncetype+this.oninfo.id,
  224 + operator: localStorage.getItem('roleName'),
  225 + operationTime: this.gettime()
  226 + }).then(res => {
  227 + console.error(res)
  228 + })
220 229 } else {
221 230 this.$message({
222 231 message: '绑定失败',
... ... @@ -300,6 +309,14 @@
300 309 message: tit + '成功',
301 310 type: 'success'
302 311 })
  312 + cereBusinessOperationadd({
  313 + type:tit,
  314 + resourceId: 'sp'+row.id,
  315 + operator: localStorage.getItem('roleName'),
  316 + operationTime: that.gettime()
  317 + }).then(res => {
  318 + console.error(res)
  319 + })
303 320 this.removeonaction('1')
304 321 } else {
305 322 this.$message({
... ...
admin-web-master/src/views/scheme/sam.vue
  View file @3caa08e
... ... @@ -13,7 +13,7 @@
13 13 <el-input placeholder="请输入" v-model="formSel.policyName" style="width:168px;margin-right: 15px">
14 14 </el-input>
15 15 <div style="width:68px;height:36px;line-height:32px;">适用资源</div>
16   - <el-select v-model="formSel.applicableResources" placeholder="请选择" style="width: 100px;margin-right: 5px">
  16 + <el-select v-model="formSel.applicableResources" placeholder="请选择" style="width: 168px;margin-right: 15px">
17 17 <el-option label="商铺" value="商铺" />
18 18 <el-option label="场地" value="场地" />
19 19 <el-option label="广告位" value="广告位" />
... ... @@ -22,15 +22,15 @@
22 22 <el-date-picker style="width:168px;margin-right: 15px" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
23 23 type="datetimerange" range-separator="-" start-placeholder="" end-placeholder="" prefix-icon="none">
24 24 </el-date-picker> -->
25   - <div style="width:68px;height:36px;line-height:32px;">经营类型</div>
26   - <el-input placeholder="请输入" v-model="formSel.businessType" style="width:168px;margin-right: 15px" />
  25 +
27 26  
28 27 <div style="width:68px;height:36px;line-height:32px;">是否出租</div>
29 28 <el-select v-model="formSel.isRental" placeholder="请选择" style="width:168px;margin-right: 15px">
30 29 <el-option label="自营" value="0" />
31 30 <el-option label="是" value="1" />
32 31 </el-select>
33   -
  32 + <div style="width:68px;height:36px;line-height:32px;">经营类型</div>
  33 + <el-input placeholder="请输入" v-model="formSel.businessType" style="width:168px;margin-right: 15px" />
34 34  
35 35 </div>
36 36 <div>
... ... @@ -74,7 +74,7 @@
74 74  
75 75 <el-table-column label="操作" min-width="200">
76 76 <template slot-scope="scope">
77   - <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
  77 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
78 78 <div @click="removeinfo(scope.row)" class="tableBtn greens">编辑</div>
79 79 <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
80 80 </template>
... ... @@ -337,6 +337,10 @@
337 337 },
338 338  
339 339 methods: {
  340 + details(row) {
  341 + this.detailsinfo = row
  342 + this.onaction = '3'
  343 + },
340 344 removeinfo(row) {
341 345 this.detailsinfo = row
342 346 this.onaction = '4'
... ...
lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
  View file @3caa08e
... ... @@ -7176,7 +7176,7 @@ function initData(vueOptions, context) {
7176 7176 try {
7177 7177 data = data.call(context); // 支持 Vue.prototype 上挂的数据
7178 7178 } catch (e) {
7179   - if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
  7179 + if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
7180 7180 console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
7181 7181 }
7182 7182 }
... ... @@ -14219,7 +14219,7 @@ function type(obj) {
14219 14219  
14220 14220 function flushCallbacks$1(vm) {
14221 14221 if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
14222   - if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
  14222 + if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
14223 14223 var mpInstance = vm.$scope;
14224 14224 console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
14225 14225 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
... ... @@ -14240,14 +14240,14 @@ function nextTick$1(vm, cb) {
14240 14240 //1.nextTick 之前 已 setData 且 setData 还未回调完成
14241 14241 //2.nextTick 之前存在 render watcher
14242 14242 if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
14243   - if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
  14243 + if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
14244 14244 var mpInstance = vm.$scope;
14245 14245 console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
14246 14246 ']:nextVueTick');
14247 14247 }
14248 14248 return nextTick(cb, vm)
14249 14249 }else{
14250   - if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
  14250 + if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
14251 14251 var mpInstance$1 = vm.$scope;
14252 14252 console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
14253 14253 ']:nextMPTick');
... ... @@ -14343,7 +14343,7 @@ var patch = function(oldVnode, vnode) {
14343 14343 });
14344 14344 var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
14345 14345 if (Object.keys(diffData).length) {
14346   - if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
  14346 + if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
14347 14347 console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
14348 14348 ']差量更新',
14349 14349 JSON.stringify(diffData));
... ... @@ -18651,7 +18651,7 @@ function _extends() {
18651 18651 var formatRegExp = /%[sdj%]/g;
18652 18652 var warning = function warning() {}; // don't print warning message when in production env or node runtime
18653 18653  
18654   -if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
  18654 +if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
18655 18655 warning = function warning(type, errors) {
18656 18656 if (typeof console !== 'undefined' && console.warn) {
18657 18657 if (errors.every(function (e) {
... ...
lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json
  View file @3caa08e
1 1 {
2   - "component": true,
3   - "usingComponents": {}
  2 + "usingComponents": {},
  3 + "component": true
4 4 }
5 5 \ No newline at end of file
... ...