webapp / GreenwayWeb

Commit 0e7a57c2e9fb4027c322f29af09940d94fe6393b

Authored by 杨鑫
1 parent c69d6cf4

'最新'

Inline Side-by-side
Showing 19 changed files with 83 additions and 42 deletions
admin-web-master/dist.zip deleted
View file @c69d6cf
No preview for this file type
admin-web-master/src/components/add/addcd.vue
  View file @0e7a57c
... ... @@ -73,7 +73,7 @@
73 73 <el-form-item label="场地描述" prop="description">
74 74 <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="ruleForm.description" placeholder="请输入"
75 75 type="textarea" /> -->
76   - <wangEditor v-model="ruleForm.description" ref="editor" :height="100"></wangEditor>
  76 + <wangEditor v-model="ruleForm.description" ref="editor" :height="200"></wangEditor>
77 77 </el-form-item>
78 78 <el-form-item label="规划图纸" prop="planningDrawing">
79 79 <upimg filePath="cd" inputtype="planningDrawing" :value="ruleForm.planningDrawing" :cmpOption="{disabled:false,isSetCover:false}"
... ...
admin-web-master/src/components/add/addmap.vue
  View file @0e7a57c
... ... @@ -40,7 +40,7 @@
40 40 @changimg="e=>changimg(e,'locationDiagram')"></upimg>
41 41 </el-form-item>
42 42 <el-form-item label="介绍" prop="memo">
43   - <wangEditor v-model="formInline.memo" ref="editor" :height="100"></wangEditor>
  43 + <wangEditor v-model="formInline.memo" ref="editor" :height="200"></wangEditor>
44 44 <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"
45 45 type="textarea" /> -->
46 46 </el-form-item>
... ... @@ -78,9 +78,10 @@
78 78 </div>
79 79 </el-form-item>
80 80 <el-form-item label="设备类型" prop="deviceType" >
81   - <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 100%;">
  81 + <el-input v-model="formInline.deviceType" placeholder="请输入" maxlength="50"></el-input>
  82 + <!-- <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 100%;">
82 83 <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
83   - </el-select>
  84 + </el-select> -->
84 85 </el-form-item>
85 86 <el-form-item label="设备大小" prop="equipmentSize" >
86 87 <el-input v-model="formInline.equipmentSize" placeholder="宽:300mm 长:400mm 高: 400mm" maxlength="30"></el-input>
... ...
admin-web-master/src/components/add/addsam.vue
  View file @0e7a57c
... ... @@ -86,10 +86,10 @@
86 86 </el-col> -->
87 87 </el-row>
88 88 <el-form-item v-if="ruleForm.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
89   - <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor>
  89 + <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="200"></wangEditor>
90 90 </el-form-item>
91 91 <el-form-item label="其他说明" prop="otherDescription">
92   - <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="100"></wangEditor>
  92 + <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="200"></wangEditor>
93 93 </el-form-item>
94 94 <el-row :gutter="20">
95 95 <el-col :span="12">
... ... @@ -266,10 +266,10 @@
266 266 </el-col> -->
267 267 </el-row>
268 268 <el-form-item v-if="formInline.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
269   - <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
  269 + <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="200"></wangEditor>
270 270 </el-form-item>
271 271 <el-form-item label="其他说明" prop="otherDescription">
272   - <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor>
  272 + <wangEditor v-model="formInline.otherDescription" ref="editor" :height="200"></wangEditor>
273 273 </el-form-item>
274 274 </el-form>
275 275 <div style="display: flex;justify-content: flex-end;margin-top:20px;">
... ...
admin-web-master/src/components/chakan/cd.vue
  View file @0e7a57c
... ... @@ -37,7 +37,7 @@
37 37 </el-col>
38 38 <el-col :span="8">
39 39 <el-form-item label="负责人" prop="responsiblePerson">
40   - <div class="duiqi">{{editbgid.belongingParkTrail || '无'}}</div>
  40 + <div class="duiqi">{{editbgid.responsiblePerson || '无'}}</div>
41 41 </el-form-item>
42 42 </el-col>
43 43 </el-row>
... ... @@ -49,7 +49,7 @@
49 49 </el-col>
50 50 <el-col :span="8">
51 51 <el-form-item label="联系电话" prop="phoneNumber">
52   - <div class="duiqi">{{editbgid.belongingParkTrail || '无'}}</div>
  52 + <div class="duiqi">{{editbgid.phoneNumber || '无'}}</div>
53 53 </el-form-item>
54 54 </el-col>
55 55 </el-row>
... ...
admin-web-master/src/components/change/cl.vue
  View file @0e7a57c
... ... @@ -25,7 +25,11 @@
25 25 </el-table-column>
26 26 <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip></el-table-column>
27 27 <el-table-column label="适用资源" prop="applicableResources" show-overflow-tooltip></el-table-column>
28   - <el-table-column label="租金价格" prop="rentalPrice" show-overflow-tooltip></el-table-column>
  28 + <el-table-column label="租金价格(/M²)" prop="rentalPrice" show-overflow-tooltip>
  29 + <template slot-scope="scope">
  30 + {{scope.row.rentalPrice}}/M²
  31 + </template>
  32 + </el-table-column>
29 33 <el-table-column label="付款周期" prop="leaseTerm" show-overflow-tooltip></el-table-column>
30 34 <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column> -->
31 35 </el-table>
... ...
admin-web-master/src/components/resourceCommodity/index.vue
  View file @0e7a57c
... ... @@ -6,7 +6,7 @@
6 6 <div style="margin-top: 30px;" class="editcss">
7 7 <TitleWithCircle title="基础信息" />
8 8 <div style="padding: 20px;">
9   - <el-form :model="editbgid" ref="ruleForm" label-width="100px" class="demo-ruleForm">
  9 + <el-form :model="editbgid" ref="ruleForm" label-width="120px" class="demo-ruleForm">
10 10 <el-row :gutter="20">
11 11 <el-col :span="8">
12 12 <el-form-item label="商铺名称" prop="shopName">
... ... @@ -49,9 +49,14 @@
49 49 </el-col>
50 50 <el-col :span="8">
51 51 <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
52   - <div class="duiqi">{{editbgid.belongingGreenwaySection || '无'}}</div>
  52 + <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection)}}</div>
53 53 </el-form-item>
54 54 </el-col>
  55 + <el-col :span="8">
  56 + <el-form-item label="所属公园/步道" prop="belongingParkTrail">
  57 + <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail)}}</div>
  58 + </el-form-item>
  59 + </el-col>
55 60 <el-col :span="8">
56 61 <el-form-item label="门牌号" prop="houseNumber">
57 62 <div class="duiqi">{{editbgid.houseNumber || '无'}}</div>
... ... @@ -303,7 +308,10 @@
303 308 } from '@/api/newly';
304 309 import newmap from "@/components/newmap/index";
305 310 import {
306   - editList
  311 + editList,
  312 + gongyuan,
  313 + parkTrails,
  314 + lvdaoduan,
307 315 } from '@/api/information.js';
308 316 import allimg from '@/components/chakan/allimg.vue';
309 317 export default {
... ... @@ -351,7 +359,8 @@
351 359 parentMessage: {},
352 360 datalist: [],
353 361 datalist1:[],
354   - datalistxsj:[]
  362 + datalistxsj:[],
  363 + lvdaoList:[]
355 364 }
356 365 },
357 366 created() {
... ... @@ -364,7 +373,6 @@
364 373 resourcesId: 'sp' + this.editbgid.id
365 374 }
366 375 cereResourceStrategylist(c1).then(res => {
367   - console.error(res)
368 376 if (!Array.isArray(res.data)) {
369 377 this.datalist = [];
370 378 return;
... ... @@ -372,7 +380,6 @@
372 380 this.datalist = res.data
373 381 })
374 382 cereBusinessPlan(c1).then(res => {
375   - console.error(res)
376 383 if (!Array.isArray(res.data)) {
377 384 this.datalist1 = [];
378 385 return;
... ... @@ -382,11 +389,37 @@
382 389 this.getAllxsj()
383 390 this.getAllzl()
384 391 }
  392 + this.getAll()
385 393 },
  394 +
386 395 computed: {
387 396  
388 397 },
389 398 methods: {
  399 + async getAll(){
  400 + const lvdao = await lvdaoduan()
  401 + const gongyua = await parkTrails()
  402 + const budao = await gongyuan()
  403 + const lvList = lvdao.data.concat(gongyua.data)
  404 +
  405 + this.lvdaoList = lvList.concat(budao.data)
  406 + },
  407 + getLvdaoNameByCode(code) {
  408 + // 若传入的 code 为空，直接返回空字符串
  409 + if (!code) {
  410 + return '';
  411 + }
  412 + // 遍历 this.lvdaoList 数组
  413 + for (let i = 0; i < this.lvdaoList.length; i++) {
  414 + const item = this.lvdaoList[i];
  415 + // 当传入的 code 等于 item 的 code 时，返回 item 的 name
  416 + if (item.code === code) {
  417 + return item.name;
  418 + }
  419 + }
  420 + // 若遍历完数组都没找到匹配的 code，返回空字符串
  421 + return '无';
  422 + },
390 423 open(row) {
391 424 console.error(row)
392 425 this.xiangTab= 'first'
... ...
admin-web-master/src/utils/request.js
  View file @0e7a57c
... ... @@ -16,12 +16,12 @@ let hostall = window.location.href;
16 16 let baseURL = ''
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19   - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  19 + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20 20 // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21  
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
24   - baseURL = 'http://128.10.249.23:9003';
  24 + // baseURL = 'http://128.10.249.23:9003';
25 25  
26 26 } else {
27 27 console.error('---------------------')
... ...
admin-web-master/src/views/analysis/ranking/index.vue
  View file @0e7a57c
... ... @@ -135,6 +135,7 @@ export default {
135 135 this.pageIndex.startTime = this.list[0]
136 136 this.pageIndex.endTime = this.list[1]
137 137 }
  138 + this.currentPage = 1
138 139 this.getAll()
139 140 },
140 141 extractAndDeduplicateTicketChannels(arr) {
... ... @@ -155,6 +156,7 @@ export default {
155 156     ticketChannel:"",
156 157     ticketType:""
157 158 }
  159 + this.currentPage = 1
158 160 this.list= []
159 161 this.getAll()
160 162 },
... ...
admin-web-master/src/views/analysis/refund/index.vue
  View file @0e7a57c
... ... @@ -214,6 +214,7 @@ export default {
214 214 this.pageIndex.startTime = this.pageIndex.list[0]
215 215 this.pageIndex.endTime = this.pageIndex.list[1]
216 216 }
  217 + this.currentPage = 1
217 218 this.getAll()
218 219 },
219 220 clear(){
... ... @@ -227,7 +228,7 @@ export default {
227 228     ticketType: "",
228 229     type:""
229 230 }
230   -
  231 +this.currentPage = 1
231 232 this.getAll()
232 233 },
233 234 changepiao(){
... ...
admin-web-master/src/views/analysis/statistics/index.vue
  View file @0e7a57c
... ... @@ -184,6 +184,7 @@
184 184 this.pageIndex.startTime = this.pageIndex.list[0]
185 185 this.pageIndex.endTime = this.pageIndex.list[1]
186 186 }
  187 + this.currentPage = 1
187 188 this.getAll()
188 189 },
189 190 extractAndDeduplicateTicketChannels(arr) {
... ... @@ -214,6 +215,7 @@
214 215 ticketChannel: "",
215 216 ticketType: ""
216 217 }
  218 + this.currentPage = 1
217 219 this.getAll()
218 220 },
219 221 changepiao() {
... ...
admin-web-master/src/views/detect copy/addziyuan.vue
  View file @0e7a57c
... ... @@ -417,10 +417,11 @@
417 417 <el-col :span="12">
418 418 <el-form-item label="设备类型" prop="deviceType" v-if='leixing == false'>
419 419 <div style="display: flex;justify-content: space-between;">
420   - <el-select v-model="ruleForm.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;">
  420 + <el-input v-model="ruleForm.deviceType" placeholder="请输入" maxlength="50"></el-input>
  421 + <!-- <el-select v-model="ruleForm.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;">
421 422 <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
422 423 <el-option label="2" value="2"></el-option>
423   - </el-select>
  424 + </el-select> -->
424 425 </div>
425 426 </el-form-item>
426 427 </el-col>
... ...
admin-web-master/src/views/detect/addziyuan.vue
  View file @0e7a57c
... ... @@ -431,10 +431,7 @@
431 431 <el-col :span="12">
432 432 <el-form-item label="设备类型" prop="deviceType" v-if='leixing == false'>
433 433 <div style="display: flex;justify-content: space-between;">
434   - <el-select v-model="ruleForm.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;">
435   - <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
436   - <el-option label="2" value="2"></el-option>
437   - </el-select>
  434 + <el-input v-model="formInline.deviceType" placeholder="请输入" maxlength="50"></el-input>
438 435 </div>
439 436 </el-form-item>
440 437 </el-col>
... ...
admin-web-master/src/views/detect/admap.vue
  View file @0e7a57c
... ... @@ -155,7 +155,10 @@
155 155 </el-table-column>
156 156 <el-table-column label="场地类型" prop="venueType" show-overflow-tooltip>
157 157 </el-table-column>
158   - <el-table-column label="实际使用面积" prop="actualArea" show-overflow-tooltip>
  158 + <el-table-column label="实际使用面积(/M²)" prop="actualArea" show-overflow-tooltip>
  159 + <template slot-scope="scope">
  160 + {{scope.row.actualArea}}/M²
  161 + </template>
159 162 </el-table-column>
160 163 <el-table-column label="所属区域" prop="district" show-overflow-tooltip>
161 164 </el-table-column>
... ...
admin-web-master/src/views/detect/map.vue
  View file @0e7a57c
... ... @@ -23,9 +23,7 @@
23 23 </el-select>
24 24 </el-form-item>
25 25 <el-form-item label="设备类型" prop="deviceType" v-if="leixing == false">
26   - <el-select v-model="formSel.deviceType" placeholder="请选择" style="width: 168px;margin-right: 15px">
27   - <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
28   - </el-select>
  26 + <el-input v-model="formSel.deviceType" placeholder="请输入" maxlength="50"></el-input>
29 27 </el-form-item>
30 28  
31 29 <!-- <el-form-item label="创建时间" prop="createDate">
... ...
admin-web-master/src/views/detect/ziyuanList.vue
  View file @0e7a57c
... ... @@ -220,10 +220,7 @@
220 220 </el-form-item>
221 221 <el-form-item label="设备类型" prop="deviceType" v-if='leixing == false'>
222 222 <div style="display: flex;justify-content: space-between;">
223   - <el-select v-model="ruleForm.deviceType" style="margin-top:5px;width: 92%;" :disabled="edit">
224   - <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
225   - <el-option label="2" value="2"></el-option>
226   - </el-select>
  223 + <el-input v-model="ruleForm.deviceType" placeholder="请输入" maxlength="50"></el-input>
227 224 </div>
228 225 </el-form-item>
229 226  
... ...
admin-web-master/src/views/revenue/totalsales/index.vue
  View file @0e7a57c
... ... @@ -237,6 +237,7 @@ this.echar( this.tableData)
237 237 this.pageIndex.startTime = this.pageIndex.list[0]
238 238 this.pageIndex.endTime = this.pageIndex.list[1]
239 239 }
  240 + this.currentPage = 1
240 241 this.getAll()
241 242 },
242 243 clear(){
... ... @@ -249,6 +250,7 @@ this.echar( this.tableData)
249 250     ticketChannel:"",
250 251     ticketType:""
251 252 }
  253 + this.currentPage = 1
252 254 this.getAll()
253 255 },
254 256 echar(datas) {
... ...
ceres-uniapp-master/config/api.js
  View file @0e7a57c
1 1  
2 2 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
3 3 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
4   -// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
5   -// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
6   -
  4 +const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
  5 +const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
  6 +const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
7 7 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
8 8 // const DOMAIN_PREFIXPING = 'http://128.10.249.26:9003'
9 9 // const DOMAIN_PREFIX = 'http://128.10.249.26:9007'
10   -const host = `${window.location.protocol}//${window.location.host}`
11   -const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
12   -const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
13   -const TIAOZHUAN = `${host}/cdwlMall/`
  10 +// const host = `${window.location.protocol}//${window.location.host}`
  11 +// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
  12 +// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
  13 +// const TIAOZHUAN = `${host}/cdwlMall/`
14 14  
15 15  
16 16  
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
  View file @0e7a57c
... ... @@ -60,7 +60,7 @@
60 60 </view>
61 61 <view class="goodsDes-box u-skeleton-fillet flex-column-plus mar-top-30">
62 62 <view class="flex-row-plus" @click.stop="goGoodsDetails(item.shopId,item.productId,item.skuId)">
63   - <image class="goodsDes-img default-img" :src="item.productImage"></image>
  63 + <image class="goodsDes-img default-img" :src="$baseURL+item.productImage"></image>
64 64 <view class="goodsDesText-box">
65 65 <label class="fs26 goodsDes-text">{{item.productName}}</label>
66 66 <view class="mar-top-70">
... ...