diff --git a/ahyd_DIB.zip b/ahyd_DIB.zip index da58b47..af23b05 100644 Binary files a/ahyd_DIB.zip and b/ahyd_DIB.zip differ diff --git a/common/css/expensesTop.css b/common/css/expensesTop.css index be47d46..0bff0ce 100644 --- a/common/css/expensesTop.css +++ b/common/css/expensesTop.css @@ -241,7 +241,7 @@ h4 { background-image: url('/static/images/expense/ccsy.png'); } .ico-ccry:before{ - background-image: url('/static/images/expense/ccry.png'); + background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/expense/ccry.png'); } .ico-xmgl:before{ background-image: url('/static/images/expense/xmgl.png'); @@ -286,5 +286,5 @@ h4 { background-image: url('/static/images/expense/gzsl.png'); } .ico-jfmc:before{ - background-image: url('/static/images/expense/jfmc.png'); + background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/expense/jfmc.png'); } diff --git a/common/css/tenderingDetail.css b/common/css/tenderingDetail.css index 5f752ce..3eb974a 100644 --- a/common/css/tenderingDetail.css +++ b/common/css/tenderingDetail.css @@ -4,7 +4,7 @@ padding-bottom: 32rpx; } .content-title { - + width: 78%; margin: 0 auto; padding: 16px 0; @@ -27,7 +27,7 @@ /* border: 1rpx solid #eee; */ border-radius: 8rpx; /* box-shadow: 0px 2rpx 8rpx 0.4rpx #e2e2e2; */ - box-shadow: 0px 4rpx 10rpx 0px rgba(201,201,201,0.52); + box-shadow: 0px 4rpx 10rpx 0px rgba(201,201,201,0.52); margin-left: 30rpx; margin-right: 30rpx; background-color: #fff; @@ -42,14 +42,14 @@ .card-title { display: flex; justify-content: space-between; - align-items: flex-start; + align-items: flex-start; } - + .base-body { font-size: 26rpx; display: flex; justify-content: flex-start; - + align-items: center; padding: 0 16rpx 12rpx 16rpx; } @@ -77,7 +77,7 @@ font-size: 26rpx; white-space: nowrap; } - + .item-price { color: #f69d63; /* font-weight: bold; */ @@ -92,11 +92,11 @@ padding-top: 16rpx; } .detail-other { - padding: 0 16rpx 16rpx; + padding: 0 16rpx 16rpx; } .detail-sign { font-size: 28rpx; - padding: 16rpx 32rpx 8rpx 32rpx; + padding: 16rpx 32rpx 8rpx 32rpx; } .detail-other p { font-size: 26rpx; @@ -120,7 +120,7 @@ } .base-info + .base-info { margin-top: 20rpx; - } + } .text-b9 { color: #b9b9b9 } @@ -131,7 +131,7 @@ align-items: flex-start; overflow: hidden; } - + .uni-list-cell:after { height: 0; } @@ -211,7 +211,7 @@ background-image: url('/static/images/tender/xmgm.png'); } .ico-zbfs:before{ - background-image: url('/static/images/tender/zbfs.png'); + background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/tender/zbfs.png'); } .ico-qtyq:before{ background-image: url('/static/images/tender/yj.png'); diff --git a/components/filesComponent/fileUnit.vue b/components/filesComponent/fileUnit.vue index b027e3f..5787606 100644 --- a/components/filesComponent/fileUnit.vue +++ b/components/filesComponent/fileUnit.vue @@ -11,7 +11,7 @@ {{fileItem.name}} - + @@ -23,7 +23,7 @@ }, data(){ return { - + active: false } }, @@ -62,10 +62,10 @@ title: res }) } - + }); } - + }, } } @@ -77,9 +77,9 @@ position: relative; margin-top: 16rpx; display: flex; - align-items: center; + align-items: center; } -.active .file-text{ +.active .file-text{ color: #007AFF; } .file-text { @@ -124,7 +124,7 @@ background-image: url('../../static/images/fileType/rarzip.png'); } .ico-more:before{ - background-image: url('../../static/images/fileType/more.png'); + background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/fileType/more.png'); } .ico-wjxz:before{ background-image: url('../../static/images/fileType/downLoad.png'); diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue index e040cde..ad307ff 100644 --- a/components/tabbar/tabbar.vue +++ b/components/tabbar/tabbar.vue @@ -6,12 +6,12 @@ 驿达 驿达 @@ -22,12 +22,12 @@ 我的 我的 diff --git a/pages/askForLeave/newLeave.vue b/pages/askForLeave/newLeave.vue index 75b38d8..cac635b 100644 --- a/pages/askForLeave/newLeave.vue +++ b/pages/askForLeave/newLeave.vue @@ -9,12 +9,12 @@ 请假审批流程 @@ -27,7 +27,7 @@ * - + @@ -45,7 +45,7 @@ data() { return { prodeList: [ - + 456, 461, 462 @@ -61,17 +61,17 @@ }, methods: { choeseSelect(_id) { - this.selectType = _id + this.selectType = _id if(_id==462){ this.severpartList = this.canselectList.ListSpregion }else{ this.severpartList = this.canselectList.ListServer } this.$forceUpdate() - + }, pickerChange(e){ - + this.pickerIndex = e.detail.value }, getSeverpart(){ @@ -83,21 +83,21 @@ }, nextTap(){ this.$util.toNextRoute('navigateTo', '/pages/askForLeave/newLeave2?prodefId='+this.selectType+'&sCode='+this.severpartList[this.pickerIndex].SERVERPART_CODE) - + }, getProde(){ let _this =this - let img = ['/static/images/leave/fwq-yg.png','/static/images/leave/fwq-gl.png','/static/images/leave/qy.png'] + let img = ['https://eshangtech.com/ShopICO/ahyd-BID/leave/fwq-yg.png','https://eshangtech.com/ShopICO/ahyd-BID/leave/fwq-gl.png','https://eshangtech.com/ShopICO/ahyd-BID/leave/qy.png'] this.$request.$get('GetProdefInfo',{}).then(res=>{ if(res.ResultCode==100){ _this.selectType = res.Data.List[0].Prodef_Id - res.Data.List.map((n,i)=>{ + res.Data.List.map((n,i)=>{ n.Prodef_Name = n.Prodef_Name.replace('请假审批流程','') n.imgPath = img[i] - + }) _this.prodeList = res.Data.List - + } }) } @@ -146,14 +146,14 @@ .active:after { content: ''; position: absolute; - background-image: url('../../static/images/leave/type-active.png'); + background-image: url('../../static/images/leave/type-active.png'); background-size: contain; background-repeat: no-repeat; right: -2upx; top: 0; height: 59upx; width: 61upx; - + } .type-title{ margin-top: 24upx; diff --git a/pages/earlyWarning/detail.vue b/pages/earlyWarning/detail.vue index bc7d02d..a7062c1 100644 --- a/pages/earlyWarning/detail.vue +++ b/pages/earlyWarning/detail.vue @@ -27,7 +27,7 @@ {{ res.RevenueINC.increaseRate?res.RevenueINC.increaseRate>0?`+${res.RevenueINC.increaseRate}%`:res.RevenueINC.increaseRate<0?`${res.RevenueINC.increaseRate}%`:'0':'-' }} - 销售明细 + 对客营收 {{ res.BayonetINC.increaseRate?res.BayonetINC.increaseRate>0?`+${res.BayonetINC.increaseRate}%`:res.BayonetINC.increaseRate<0?`${res.BayonetINC.increaseRate}%`:'0':'-' }} @@ -41,7 +41,7 @@ - 销售明细 + 对客营收 /万元 {{date || ''}} @@ -112,7 +112,7 @@ {{selectType===1?`${res.ServerpartName}${date || ''}度车流`:selectType===2?`${res.ServerpartName}${date || ''}车流`:selectType===3?`${res.ServerpartName}${date || ''}车流`:selectType===4?`${res.ServerpartName}${date || ''}车流`:''}} {{res.BayonetINC.increaseRate>0?'增加':res.BayonetINC.increaseRate<0?'减少':''}}{{res.BayonetINC.increaseRate?`${Math.abs(res.BayonetINC.increaseRate)}%`:'-'}} - {{selectType===1?',销售明细':selectType===2?',门店的营收减少':selectType===3?',销售明细':selectType===4?',销售明细':''}} + {{selectType===1?',对客营收':selectType===2?',门店的营收减少':selectType===3?',对客营收':selectType===4?',对客营收':''}} {{res.RevenueINC.increaseRate>0?'增加':res.RevenueINC.increaseRate<0?'减少':''}}{{res.RevenueINC.increaseRate?`${Math.abs(res.RevenueINC.increaseRate)}%`:'-'}} diff --git a/pages/earlyWarning/index.vue b/pages/earlyWarning/index.vue index a2523f2..402c26a 100644 --- a/pages/earlyWarning/index.vue +++ b/pages/earlyWarning/index.vue @@ -154,7 +154,7 @@ - 销售明细 + 对客营收 @@ -196,7 +196,7 @@ - 销售明细 + 对客营收 /万元 diff --git a/pages/expenseApproval/expenseApproval.vue b/pages/expenseApproval/expenseApproval.vue index 3687b22..900bef5 100644 --- a/pages/expenseApproval/expenseApproval.vue +++ b/pages/expenseApproval/expenseApproval.vue @@ -136,7 +136,7 @@ { name:'借款单申请', typeId: "401601", - src: '../../../../../static/images/expense/type/jkdsp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/jkdsp.png', },{ name: '服务区报销', typeId: "401602", @@ -148,11 +148,11 @@ },{ name:'保证金退付', typeId: "401604", - src: '../../../../../static/images/expense/type/bzjtf.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/bzjtf.png', },{ name:'工程结算单', typeId: "401605", - src: '../../../../../static/images/expense/type/gcjsd.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/gcjsd.png', } ] } @@ -175,7 +175,7 @@ ,{ name:'行政资产申请', typeId: "401101", - src: '../../../../../static/images/expense/type/xzzcsp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/xzzcsp.png', } ,{ name: '公务交通', @@ -195,7 +195,7 @@ ,{ name:'工程款支付', typeId: "401203", - src: '../../../../../static/images/expense/type/gcjsd.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/gcjsd.png', } ,{ name:'经费预算', @@ -210,11 +210,11 @@ ,{ name:'内部转账', typeId: "401301", - src: '../../../../../static/images/expense/type/bzjtf.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/bzjtf.png', } ,{ name:'大额支付', - src: '../../../../../static/images/expense/type/dezf.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/dezf.png', typeId: "401302" } ,{ @@ -225,7 +225,7 @@ ,{ name:'领付款申请', typeId:"401304", - src: '../../../../../static/images/expense/type/jkdsp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/jkdsp.png', }, ] diff --git a/pages/index/index.vue b/pages/index/index.vue index c8a8fd9..a8fb687 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,6 @@ @@ -41,7 +41,7 @@ type:String } }, - + computed: { // getStatus () { // let _this = this @@ -56,7 +56,7 @@ // return _this.proStatus[_this.item.HIGHWAYPROINST_NEXTID] // } // } - + // } }, methods: { @@ -89,7 +89,7 @@ margin-bottom: 16upx; justify-content: center; font-size: 32upx; - + } .contentName { margin-left: 56upx; @@ -131,6 +131,6 @@ /* background-color: #fdfdfd; */ padding: 0 32upx 24upx 32upx; /* font-size: 26upx; */ - + } diff --git a/pages/revenueStatistics/detail.vue b/pages/revenueStatistics/detail.vue index 1c32893..ae3af12 100644 --- a/pages/revenueStatistics/detail.vue +++ b/pages/revenueStatistics/detail.vue @@ -33,7 +33,7 @@ - 销售明细/万元 + 对客销售/万元 @@ -67,7 +67,7 @@ - 营收明细 + 销售明细 /万元 diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue index c6740a0..e985f41 100644 --- a/pages/revenueStatistics/index.vue +++ b/pages/revenueStatistics/index.vue @@ -46,7 +46,7 @@ - 销售明细/万元 + 对客销售/万元 服务区排名 @@ -83,7 +83,7 @@ - 营收明细 + 销售明细 /万元 diff --git a/pages/revenueStatistics/servicePartList.vue b/pages/revenueStatistics/servicePartList.vue index da247c3..4f717e7 100644 --- a/pages/revenueStatistics/servicePartList.vue +++ b/pages/revenueStatistics/servicePartList.vue @@ -40,7 +40,7 @@ - {{ type===1?'销售明细':type===2?'营业收入':type===3?'入区车流':'' }} + {{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }} {{type===3?'/万辆':'/万元'+`${type===2?' (除税)':''}`}} diff --git a/pages/robot/index.vue b/pages/robot/index.vue index 3a454c0..d5c1f29 100644 --- a/pages/robot/index.vue +++ b/pages/robot/index.vue @@ -63,19 +63,18 @@ export default { this.dialogueList.push({text:`'小驿还无法理解,请换个说法我会不停努力学习的!'`,type:1}) }else{ let str = data.Result_Data.RevenueAnalysis + '\n' - let obj = data.Result_Data.ServerpartList - if(obj){ - for(let key in obj){ - if(str){ - str+=`${key}:${this.formatNumber(obj[key].curYearData / 10000)}万元,同比${obj[key].increaseRate>0?'增幅':obj[key].increaseRate<0?'降幅':''}${obj[key].increaseRate ||''}\n` - }else{ - str = `${key}:${this.formatNumber(obj[key].curYearData / 10000)}万元,同比${obj[key].increaseRate>0?'增幅':obj[key].increaseRate<0?'降幅':''}${obj[key].increaseRate || ''}\n` - } - } - + let list = data.Result_Data.ServerpartList + if(list && list.length>0){ + list.forEach(item=>{ + let obj = item['RevenueINC'] + if(str){ + str+=`${item.ServerpartName}:${this.formatNumber(obj.curYearData / 10000)}万元${obj.increaseRate>0?',同比增幅':obj.increaseRate<0?',同比降幅':''}${obj.increaseRate ||''}\n` + }else{ + str = `${item.ServerpartName}:${this.formatNumber(obj.curYearData / 10000)}万元${obj.increaseRate>0?',同比同比增幅':obj.increaseRate<0?',同比降幅':''}${obj.increaseRate || ''}\n` + } + }) } - this.dialogueList.push({text: str,type:1}) } this.isLoading = false diff --git a/pages/serviceAreaReimbursement/serviceAreaReimbursement.vue b/pages/serviceAreaReimbursement/serviceAreaReimbursement.vue index f34f158..3ce2ef6 100644 --- a/pages/serviceAreaReimbursement/serviceAreaReimbursement.vue +++ b/pages/serviceAreaReimbursement/serviceAreaReimbursement.vue @@ -89,12 +89,12 @@ } ,{ name:'付款审批', - src: '../../../../../static/images/expense/type/jkdsp.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/jkdsp.png', typeId:2000 } ,{ name:'资金拨付', - src: '../../../../../static/images/expense/type/bzjtf.png', + src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/bzjtf.png', typeId:4000 } ], diff --git a/pages/summaryOfPortraits/components/businessPortrait.vue b/pages/summaryOfPortraits/components/businessPortrait.vue index 3aed5dc..35eedce 100644 --- a/pages/summaryOfPortraits/components/businessPortrait.vue +++ b/pages/summaryOfPortraits/components/businessPortrait.vue @@ -296,6 +296,9 @@ export default { }, //获取服务区基本信息 async getServiceInfo(){ + if(!this.serviceInfo.Serverpart_ID){ + return + } let req = { ServerpartId:this.serviceInfo.Serverpart_ID } @@ -593,6 +596,7 @@ export default { }, async getBusinessTypeList(){ + console.log('getBusinessTypeList') let req if (this.serviceInfo.SERVERPART_NAME==='安徽驿达'){ req = { @@ -600,8 +604,8 @@ export default { StatisticsDate:this.time, BusinessTradeIds:-1 } - this.businessTypeList = [] - return + // this.businessTypeList = [] + // return }else{ req = { ProvinceCode:'340000', diff --git a/static/images/expense/ccry.png b/static/images/expense/ccry.png deleted file mode 100644 index bfd73d9..0000000 Binary files a/static/images/expense/ccry.png and /dev/null differ diff --git a/static/images/expense/jfmc.png b/static/images/expense/jfmc.png deleted file mode 100644 index 32ce81c..0000000 Binary files a/static/images/expense/jfmc.png and /dev/null differ diff --git a/static/images/expense/type/bzjtf.png b/static/images/expense/type/bzjtf.png deleted file mode 100644 index d5e8212..0000000 Binary files a/static/images/expense/type/bzjtf.png and /dev/null differ diff --git a/static/images/expense/type/dezf.png b/static/images/expense/type/dezf.png deleted file mode 100644 index 1fc3eb2..0000000 Binary files a/static/images/expense/type/dezf.png and /dev/null differ diff --git a/static/images/expense/type/fksp.png b/static/images/expense/type/fksp.png deleted file mode 100644 index e56f03f..0000000 Binary files a/static/images/expense/type/fksp.png and /dev/null differ diff --git a/static/images/expense/type/gcjsd.png b/static/images/expense/type/gcjsd.png deleted file mode 100644 index 93560ca..0000000 Binary files a/static/images/expense/type/gcjsd.png and /dev/null differ diff --git a/static/images/expense/type/jkdsp.png b/static/images/expense/type/jkdsp.png deleted file mode 100644 index e2f58b2..0000000 Binary files a/static/images/expense/type/jkdsp.png and /dev/null differ diff --git a/static/images/expense/type/xzzcsp.png b/static/images/expense/type/xzzcsp.png deleted file mode 100644 index 555f31c..0000000 Binary files a/static/images/expense/type/xzzcsp.png and /dev/null differ diff --git a/static/images/fileType/more.png b/static/images/fileType/more.png deleted file mode 100644 index 1c0ee6d..0000000 Binary files a/static/images/fileType/more.png and /dev/null differ diff --git a/static/images/index/guest.svg b/static/images/index/guest.svg deleted file mode 100644 index 73a3afa..0000000 --- a/static/images/index/guest.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - 商业bi/车流画像备份_3@2x - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/static/images/index/htcx-no.png b/static/images/index/htcx-no.png deleted file mode 100644 index eda5635..0000000 Binary files a/static/images/index/htcx-no.png and /dev/null differ diff --git a/static/images/index/purchaseAmount.svg b/static/images/index/purchaseAmount.svg deleted file mode 100644 index d5ab478..0000000 --- a/static/images/index/purchaseAmount.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - 首页图标/本月计划备份_2@2x - - - - - - - - - - - - - \ No newline at end of file diff --git a/static/images/index/yidaFenrun.svg b/static/images/index/yidaFenrun.svg deleted file mode 100644 index a3cb79b..0000000 --- a/static/images/index/yidaFenrun.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - 首页图标/本月计划备份_17@2x - - - - - - - - - - - - - \ No newline at end of file diff --git a/static/images/investment/jyqk.png b/static/images/investment/jyqk.png deleted file mode 100644 index 1e25c1c..0000000 Binary files a/static/images/investment/jyqk.png and /dev/null differ diff --git a/static/images/leave/fwq-gl.png b/static/images/leave/fwq-gl.png deleted file mode 100644 index c75664f..0000000 Binary files a/static/images/leave/fwq-gl.png and /dev/null differ diff --git a/static/images/leave/fwq-yg.png b/static/images/leave/fwq-yg.png deleted file mode 100644 index d63fdf6..0000000 Binary files a/static/images/leave/fwq-yg.png and /dev/null differ diff --git a/static/images/leave/qy.png b/static/images/leave/qy.png deleted file mode 100644 index 575a7ce..0000000 Binary files a/static/images/leave/qy.png and /dev/null differ diff --git a/static/images/reader/recive-read.png b/static/images/reader/recive-read.png deleted file mode 100644 index d5cdee0..0000000 Binary files a/static/images/reader/recive-read.png and /dev/null differ diff --git a/static/images/revenue/back-page.png b/static/images/revenue/back-page.png deleted file mode 100644 index edb5c9c..0000000 Binary files a/static/images/revenue/back-page.png and /dev/null differ diff --git a/static/images/revenue/card-title.png b/static/images/revenue/card-title.png deleted file mode 100644 index b4e9e08..0000000 Binary files a/static/images/revenue/card-title.png and /dev/null differ diff --git a/static/images/tabBar/company_active.png b/static/images/tabBar/company_active.png deleted file mode 100644 index 3451261..0000000 Binary files a/static/images/tabBar/company_active.png and /dev/null differ diff --git a/static/images/tabBar/company_normal.png b/static/images/tabBar/company_normal.png deleted file mode 100644 index 2573ab4..0000000 Binary files a/static/images/tabBar/company_normal.png and /dev/null differ diff --git a/static/images/tabBar/user_active.svg b/static/images/tabBar/user_active.svg deleted file mode 100644 index 8bbd275..0000000 --- a/static/images/tabBar/user_active.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - 首页@3x - - - - - - - - - - - \ No newline at end of file diff --git a/static/images/tabBar/user_normal.svg b/static/images/tabBar/user_normal.svg deleted file mode 100644 index e1f1fd4..0000000 --- a/static/images/tabBar/user_normal.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - 首页备份@3x - - - - - - - - - - - \ No newline at end of file diff --git a/static/images/tender/zbfs.png b/static/images/tender/zbfs.png deleted file mode 100644 index 5d53097..0000000 Binary files a/static/images/tender/zbfs.png and /dev/null differ