'最新'

杨鑫
1 parent c69d6cf4
Showing 19 changed files with 83 additions and 42 deletions
admin-web-master/dist.zip
admin-web-master/src/components/add/addcd.vue
admin-web-master/src/components/add/addmap.vue
admin-web-master/src/components/add/addsam.vue
admin-web-master/src/components/chakan/cd.vue
admin-web-master/src/components/change/cl.vue
admin-web-master/src/components/resourceCommodity/index.vue
admin-web-master/src/utils/request.js
admin-web-master/src/views/analysis/ranking/index.vue
admin-web-master/src/views/analysis/refund/index.vue
admin-web-master/src/views/analysis/statistics/index.vue
admin-web-master/src/views/detect copy/addziyuan.vue
admin-web-master/src/views/detect/addziyuan.vue
admin-web-master/src/views/detect/admap.vue
admin-web-master/src/views/detect/map.vue
admin-web-master/src/views/detect/ziyuanList.vue
admin-web-master/src/views/revenue/totalsales/index.vue
ceres-uniapp-master/config/api.js
ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
@@ -73,7 +73,7 @@
       <el-form-item label="场地描述" prop="description">
         <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="ruleForm.description" placeholder="请输入"
           type="textarea" /> -->
-          <wangEditor v-model="ruleForm.description" ref="editor" :height="100"></wangEditor>
+          <wangEditor v-model="ruleForm.description" ref="editor" :height="200"></wangEditor>
       </el-form-item>
       <el-form-item label="规划图纸" prop="planningDrawing">
         <upimg filePath="cd" inputtype="planningDrawing" :value="ruleForm.planningDrawing" :cmpOption="{disabled:false,isSetCover:false}"
@@ -40,7 +40,7 @@
           @changimg="e=>changimg(e,'locationDiagram')"></upimg>
       </el-form-item>
       <el-form-item label="介绍" prop="memo">
-        <wangEditor v-model="formInline.memo" ref="editor" :height="100"></wangEditor>
+        <wangEditor v-model="formInline.memo" ref="editor" :height="200"></wangEditor>
         <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"
           type="textarea" /> -->
       </el-form-item>
@@ -78,9 +78,10 @@
         </div>
       </el-form-item>
       <el-form-item label="设备类型" prop="deviceType" >
-        <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 100%;">
+		  <el-input v-model="formInline.deviceType" placeholder="请输入"  maxlength="50"></el-input>
+        <!-- <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 100%;">
           <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <el-form-item label="设备大小" prop="equipmentSize" >
         <el-input v-model="formInline.equipmentSize" placeholder="宽:300mm 长:400mm 高: 400mm"  maxlength="30"></el-input>
@@ -86,10 +86,10 @@
         </el-col> -->
       </el-row>
       <el-form-item v-if="ruleForm.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
-        <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor>
+        <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="200"></wangEditor>
       </el-form-item>
       <el-form-item label="其他说明" prop="otherDescription">
-        <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="100"></wangEditor>
+        <wangEditor v-model="ruleForm.otherDescription" ref="editor" :height="200"></wangEditor>
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -266,10 +266,10 @@
               </el-col> -->
             </el-row>
             <el-form-item v-if="formInline.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
-              <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
+              <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="200"></wangEditor>
             </el-form-item>
             <el-form-item label="其他说明" prop="otherDescription">
-              <wangEditor v-model="formInline.otherDescription" ref="editor" :height="100"></wangEditor>
+              <wangEditor v-model="formInline.otherDescription" ref="editor" :height="200"></wangEditor>
             </el-form-item>
           </el-form>
           <div style="display: flex;justify-content: flex-end;margin-top:20px;">
@@ -37,7 +37,7 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="负责人" prop="responsiblePerson">
-                      <div  class="duiqi">{{editbgid.belongingParkTrail  || '无'}}</div>
+                      <div  class="duiqi">{{editbgid.responsiblePerson  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -49,7 +49,7 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="联系电话" prop="phoneNumber">
-                      <div  class="duiqi">{{editbgid.belongingParkTrail  || '无'}}</div>
+                      <div  class="duiqi">{{editbgid.phoneNumber  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -25,7 +25,11 @@
               </el-table-column>
               <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip></el-table-column>
               <el-table-column label="适用资源" prop="applicableResources" show-overflow-tooltip></el-table-column>
-              <el-table-column label="租金价格" prop="rentalPrice" show-overflow-tooltip></el-table-column>
+              <el-table-column label="租金价格(/M²)" prop="rentalPrice" show-overflow-tooltip>
+				  <template slot-scope="scope">
+				    {{scope.row.rentalPrice}}/M²
+				  </template>
+			  </el-table-column>
               <el-table-column label="付款周期" prop="leaseTerm" show-overflow-tooltip></el-table-column>
               <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column> -->
             </el-table>
@@ -6,7 +6,7 @@
           <div style="margin-top: 30px;" class="editcss">
             <TitleWithCircle title="基础信息" />
             <div style="padding: 20px;">
-              <el-form :model="editbgid" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+              <el-form :model="editbgid" ref="ruleForm" label-width="120px" class="demo-ruleForm">
                 <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="商铺名称" prop="shopName">
@@ -49,9 +49,14 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
-                      <div class="duiqi">{{editbgid.belongingGreenwaySection || '无'}}</div>
+                      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection)}}</div>
                     </el-form-item>
                   </el-col>
+				  <el-col :span="8">
+				    <el-form-item label="所属公园/步道" prop="belongingParkTrail">
+				      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail)}}</div>
+				    </el-form-item>
+				  </el-col>
                   <el-col :span="8">
                     <el-form-item label="门牌号" prop="houseNumber">
                       <div class="duiqi">{{editbgid.houseNumber || '无'}}</div>
@@ -303,7 +308,10 @@
   } from '@/api/newly';
   import newmap from "@/components/newmap/index";
   import {
-    editList
+    editList,
+	gongyuan,
+	parkTrails,
+	lvdaoduan,
   } from '@/api/information.js';
   import allimg from '@/components/chakan/allimg.vue';
   export default {
@@ -351,7 +359,8 @@
         parentMessage: {},
         datalist: [],
         datalist1:[],
-        datalistxsj:[]
+        datalistxsj:[],
+		lvdaoList:[]
       }
     },
     created() {
@@ -364,7 +373,6 @@
           resourcesId: 'sp' + this.editbgid.id
         }
         cereResourceStrategylist(c1).then(res => {
-          console.error(res)
           if (!Array.isArray(res.data)) {
             this.datalist = [];
             return;
@@ -372,7 +380,6 @@
           this.datalist = res.data
         })
         cereBusinessPlan(c1).then(res => {
-          console.error(res)
           if (!Array.isArray(res.data)) {
             this.datalist1 = [];
             return;
@@ -382,11 +389,37 @@
         this.getAllxsj()
         this.getAllzl()
       }
+	  this.getAll()
     },
+	
     computed: {
     },
     methods: {
+		async	getAll(){
+			const lvdao = await lvdaoduan()
+			const gongyua  = await parkTrails() 
+			const budao = await gongyuan()
+			const lvList = lvdao.data.concat(gongyua.data)
+			
+			this.lvdaoList = lvList.concat(budao.data)
+		},
+		getLvdaoNameByCode(code) {
+		    // 若传入的 code 为空，直接返回空字符串
+		    if (!code) {
+		        return '';
+		    }
+		    // 遍历 this.lvdaoList 数组
+		    for (let i = 0; i < this.lvdaoList.length; i++) {
+		        const item = this.lvdaoList[i];
+		        // 当传入的 code 等于 item 的 code 时，返回 item 的 name
+		        if (item.code === code) {
+		            return item.name;
+		        }
+		    }
+		    // 若遍历完数组都没找到匹配的 code，返回空字符串
+		    return '无';
+		},
       open(row) {
         console.error(row)
         this.xiangTab= 'first'
@@ -16,12 +16,12 @@ let hostall = window.location.href;
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
-  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  baseURL = 'http://128.10.249.23:9003';
+  // baseURL = 'http://128.10.249.23:9003';
 } else {
   console.error('---------------------')
@@ -135,6 +135,7 @@ export default {
         this.pageIndex.startTime = this.list[0]
         this.pageIndex.endTime = this.list[1]
       }
+	  this.currentPage = 1
       this.getAll()
     },
 	extractAndDeduplicateTicketChannels(arr) {
@@ -155,6 +156,7 @@ export default {
             ticketChannel:"",
             ticketType:""
         }
+		this.currentPage = 1
         this.list= []
         this.getAll()
     },
@@ -214,6 +214,7 @@ export default {
             this.pageIndex.startTime = this.pageIndex.list[0]
             this.pageIndex.endTime = this.pageIndex.list[1]
           }
+		  this.currentPage = 1
           this.getAll()
         },
         clear(){
@@ -227,7 +228,7 @@ export default {
         ticketType: "",
         type:""
             }
-
+this.currentPage = 1
             this.getAll()
         },
         changepiao(){
@@ -184,6 +184,7 @@
 					this.pageIndex.startTime = this.pageIndex.list[0]
 					this.pageIndex.endTime = this.pageIndex.list[1]
 				}
+				this.currentPage = 1
 				this.getAll()
 			},
 			extractAndDeduplicateTicketChannels(arr) {
@@ -214,6 +215,7 @@
 					ticketChannel: "",
 					ticketType: ""
 				}
+				this.currentPage = 1
 				this.getAll()
 			},
 			changepiao() {
@@ -417,10 +417,11 @@
                   <el-col :span="12">
                     <el-form-item label="设备类型" prop="deviceType" v-if='leixing == false'>
                       <div style="display: flex;justify-content: space-between;">
-                        <el-select v-model="ruleForm.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;">
+						   <el-input v-model="ruleForm.deviceType" placeholder="请输入"  maxlength="50"></el-input>
+                        <!-- <el-select v-model="ruleForm.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;">
                           <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
                           <el-option label="2" value="2"></el-option>
-                        </el-select>
+                        </el-select> -->
                       </div>
                     </el-form-item>
                   </el-col>
@@ -431,10 +431,7 @@
                 <el-col :span="12">
                   <el-form-item label="设备类型" prop="deviceType" v-if='leixing == false'>
                     <div style="display: flex;justify-content: space-between;">
-                      <el-select v-model="ruleForm.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;">
-                        <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
-                        <el-option label="2" value="2"></el-option>
-                      </el-select>
+                        <el-input v-model="formInline.deviceType" placeholder="请输入"  maxlength="50"></el-input>
                     </div>
                   </el-form-item>
                 </el-col>
@@ -155,7 +155,10 @@
           </el-table-column>
           <el-table-column label="场地类型" prop="venueType" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="实际使用面积" prop="actualArea" show-overflow-tooltip>
+          <el-table-column label="实际使用面积(/M²)" prop="actualArea" show-overflow-tooltip>
+			  <template slot-scope="scope">
+			    {{scope.row.actualArea}}/M²
+			  </template>
           </el-table-column>
           <el-table-column label="所属区域" prop="district" show-overflow-tooltip>
           </el-table-column>
@@ -23,9 +23,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="设备类型" prop="deviceType" v-if="leixing == false">
-              <el-select v-model="formSel.deviceType" placeholder="请选择" style="width: 168px;margin-right: 15px">
-                <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
-              </el-select>
+                <el-input v-model="formSel.deviceType" placeholder="请输入"  maxlength="50"></el-input>
             </el-form-item>
             <!-- <el-form-item label="创建时间" prop="createDate">
@@ -220,10 +220,7 @@
             </el-form-item>
             <el-form-item label="设备类型" prop="deviceType" v-if='leixing == false'>
               <div style="display: flex;justify-content: space-between;">
-                <el-select v-model="ruleForm.deviceType"  style="margin-top:5px;width: 92%;" :disabled="edit">
-                  <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
-                  <el-option label="2" value="2"></el-option>
-                </el-select>
+                <el-input v-model="ruleForm.deviceType" placeholder="请输入"  maxlength="50"></el-input>
               </div>
             </el-form-item>
@@ -237,6 +237,7 @@ this.echar( this.tableData)
           this.pageIndex.startTime = this.pageIndex.list[0]
           this.pageIndex.endTime = this.pageIndex.list[1]
         }
+		this.currentPage = 1
         this.getAll()
       },
       clear(){
@@ -249,6 +250,7 @@ this.echar( this.tableData)
               ticketChannel:"",
               ticketType:""
           }
+		  this.currentPage = 1
           this.getAll()
       },
     echar(datas) {
 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
-// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
-// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
-
+const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
+const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
+const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
 // const DOMAIN_PREFIXPING = 'http://128.10.249.26:9003' 
 // const DOMAIN_PREFIX = 'http://128.10.249.26:9007'
-const host = `${window.location.protocol}//${window.location.host}`
-const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
-const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
-const TIAOZHUAN = `${host}/cdwlMall/`
+// const host = `${window.location.protocol}//${window.location.host}`
+// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
+// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
+// const TIAOZHUAN = `${host}/cdwlMall/`
@@ -60,7 +60,7 @@
             </view>
             <view class="goodsDes-box u-skeleton-fillet flex-column-plus mar-top-30">
               <view class="flex-row-plus" @click.stop="goGoodsDetails(item.shopId,item.productId,item.skuId)">
-                <image class="goodsDes-img default-img" :src="item.productImage"></image>
+                <image class="goodsDes-img default-img" :src="$baseURL+item.productImage"></image>
                 <view class="goodsDesText-box">
                   <label class="fs26 goodsDes-text">{{item.productName}}</label>
                   <view class="mar-top-70">