ylj/ahyd_DIB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cclu 2023-10-07 11:20:52 +08:00
parent 87bbc1d3fb
commit b65e279bbc
7 changed files with 93 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{ {
"name": "ahyd_DIB", "name": "ahyd_DIB-master",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {

7
pages/commercialBI/carPortrait.vue
View File

@ -376,9 +376,7 @@ export default {
} }
}, },
onLoad(option){ onLoad(option){
console.log('option',option)
this.isShowAllProvince = option.mustAllProvince this.isShowAllProvince = option.mustAllProvince
console.log("this.isShowAllProvince",this.isShowAllProvince)
this.backType = option.type this.backType = option.type
}, },
onShow(){ onShow(){
@ -401,7 +399,6 @@ export default {
if (storeTime){ if (storeTime){
this.time = storeTime this.time = storeTime
} }
console.log(' this.time', this.time)
this.single = this.$util.getThisMonthHave(this.time) this.single = this.$util.getThisMonthHave(this.time)
this.searchText = this.time this.searchText = this.time
const date = new Date(this.time) const date = new Date(this.time)
@ -444,7 +441,6 @@ export default {
if (this.serviceInfo.SERVERPART_NAME==='安徽驿达' || this.isShowAllProvince==='true'){ if (this.serviceInfo.SERVERPART_NAME==='安徽驿达' || this.isShowAllProvince==='true'){
this.isShowAllProvince = true this.isShowAllProvince = true
} }
console.log('this.isShowAllProvince',this.isShowAllProvince)
if (this.isShowAllProvince === true){ if (this.isShowAllProvince === true){
this.serviceInfo.SERVERPART_NAME = '安徽驿达' this.serviceInfo.SERVERPART_NAME = '安徽驿达'
this.serviceInfo.Serverpart_ID = undefined this.serviceInfo.Serverpart_ID = undefined
@ -578,7 +574,6 @@ export default {
item.entryList = [{name:'已入区',value:Number(item.flowRate.split('%')[0])},{name:'未入区',value:100 - item.flowRate.split('%')[0]}] item.entryList = [{name:'已入区',value:Number(item.flowRate.split('%')[0])},{name:'未入区',value:100 - item.flowRate.split('%')[0]}]
item.bg = item.name.indexOf('皖中')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/Middle.png':item.name.indexOf('皖西')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/west.png':item.name.indexOf('皖东')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/east.png':item.name.indexOf('皖南')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/south.png':item.name.indexOf('皖北')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/north.png':'' item.bg = item.name.indexOf('皖中')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/Middle.png':item.name.indexOf('皖西')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/west.png':item.name.indexOf('皖东')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/east.png':item.name.indexOf('皖南')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/south.png':item.name.indexOf('皖北')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/north.png':''
}) })
console.log('bayonetPie',bayonetPie)
for (let i=0;i<=bayonetPie.length-1;i++){ for (let i=0;i<=bayonetPie.length-1;i++){
for (let j=0;j<=bayonetPie.length - i - 1;j++){ for (let j=0;j<=bayonetPie.length - i - 1;j++){
if (bayonetPie[j] && bayonetPie[j + 1] && bayonetPie[j].entry && bayonetPie[j+1].entry){ if (bayonetPie[j] && bayonetPie[j + 1] && bayonetPie[j].entry && bayonetPie[j+1].entry){
@ -591,7 +586,6 @@ export default {
} }
} }
bayonetPie.forEach(item=>{ bayonetPie.forEach(item=>{
console.log('item',item)
for (let i=0;i<=item.spList.length-1;i++){ for (let i=0;i<=item.spList.length-1;i++){
for (let j=0;j<=item.spList.length - i - 1;j++){ for (let j=0;j<=item.spList.length - i - 1;j++){
if (item.spList[j] && item.spList[j + 1] && item.spList[j].Vehicle_Count && item.spList[j+1].Vehicle_Count){ if (item.spList[j] && item.spList[j + 1] && item.spList[j].Vehicle_Count && item.spList[j+1].Vehicle_Count){
@ -609,7 +603,6 @@ export default {
const number = Number(item.flowRate.split('%')[0]) const number = Number(item.flowRate.split('%')[0])
this.showScoreAnimation1(number,index) this.showScoreAnimation1(number,index)
}) })
console.log('this.regionList',this.regionList)
uni.hideLoading() uni.hideLoading()
}, },
//车型选择 //车型选择

6
pages/commercialBI/components/car/entryZone.vue
View File

@ -95,7 +95,7 @@ export default {
this.probabilityPath = '' this.probabilityPath = ''
this.dataList = value this.dataList = value
this.dataList.forEach(item=>{ this.dataList.forEach(item=>{
item.AddUpCount = this.$util.noDecimal(item.Vehicle_AddUpCount) item.AddUpCount = item.Vehicle_AddUpCount?this.$util.noDecimal(item.Vehicle_AddUpCount):0
allCount +=item.Vehicle_AddUpCount allCount +=item.Vehicle_AddUpCount
allRate +=item.EntryAddUp_Rate allRate +=item.EntryAddUp_Rate
this.Serverpart_ID = item.Serverpart_ID this.Serverpart_ID = item.Serverpart_ID
@ -135,7 +135,7 @@ export default {
} }
let probabilityData = [] let probabilityData = []
value.forEach(item=>{ value.forEach(item=>{
let value = item.Entry_Rate let value = item.Entry_Rate?item.Entry_Rate:0
let text = item.Serverpart_Region + '区' + value .toFixed(2) + '%' let text = item.Serverpart_Region + '区' + value .toFixed(2) + '%'
if (text.length<8){ if (text.length<8){
//不要删区里面的空格！！！！ //不要删区里面的空格！！！！
@ -168,8 +168,6 @@ export default {
} }
this.drawCharts('carNum' , res,configCarNum ) this.drawCharts('carNum' , res,configCarNum )
this.drawCharts2('probability',probabilityRes,config) this.drawCharts2('probability',probabilityRes,config)
console.log('config',config)
console.log('configCarNum',configCarNum)
}, },
drawCharts(id,data,config){ drawCharts(id,data,config){
const ctx = uni.createCanvasContext(id, this); const ctx = uni.createCanvasContext(id, this);

90
pages/index/index.vue
View File

@ -379,13 +379,54 @@
<text class="funItemText">{{item.name}}</text> <text class="funItemText">{{item.name}}</text>
</div> </div>
</div> </div>
<!-- 车流预警-->
<!-- -->
<view class="carWarning" v-if="special" @click="handleGoWarning">
<div class="carWarningTop">
<!-- @click="handleGoWarning" -->
<div class="warningBox" >
<image class="warningIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/home/carIcon.svg"/>
<div class="trafficBox" >
<text class="trafficCar">车流预警</text>
<image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/carMoreIcon.svg"/>
</div>
</div>
<div class="moreStoreBox" >
<span class="moreText">更多记录</span>
<image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
</div>
</div>
<div class="contentList" >
<div class="contentItem" v-for="(item,index) in warningList" :key="index">
<div class="index">
<div class="boxBg" v-if="index<=2"></div>
<span class="indexText" :style="{fontWeight:index<=2?'bold':'normal',color:index<=2?'#160002':'#786B6C'}">{{index + 1}}</span>
</div>
<div class="serviceBox">
<span class="name">{{item.name}}</span>
<span class="position">{{item.SERVERPART_REGION}}区</span>
</div>
<div class="numberBox">
<span class="number">{{item.VEHICLE_COUNT}}</span>
<span class="unit">/辆</span>
</div>
<div class="addBox">
<image class="addIcon" :src="Number(item.VEHICLE_RATE)>100?'/static/images/examine/add.svg':Number(item.VEHICLE_RATE)===100?'':'/static/images/examine/reduce.svg'"/>
<span class="add">{{item.VEHICLE_RATE}}%</span>
</div>
</div>
</div>
</view>
<!--欢度国庆--> <!--欢度国庆-->
<div class="nationalDay"> <div class="nationalDay" @click="goToNational">
<div class="national"> <div class="national">
<div class="nationalTop"> <div class="nationalTop">
<div class="nationalTopLeft"> <div class="nationalTopLeft">
<image class="lanternImg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/lantern.png" /> <image class="lanternImg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/lantern.png" />
<div class="titleBox" @click="goToNational"> <div class="titleBox">
<!-- @click="goToNational" -->
<!-- <image class="titleBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/titleBox.svg"/>--> <!-- <image class="titleBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/titleBox.svg"/>-->
<div class="title" > <div class="title" >
<span class="text">欢度国庆</span> <span class="text">欢度国庆</span>
@ -563,42 +604,6 @@
</view> </view>
</view> </view>
<!-- 车流预警-->
<view class="carWarning" v-if="special">
<div class="carWarningTop">
<div class="warningBox" @click="handleGoWarning">
<image class="warningIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/home/carIcon.svg"/>
<div class="trafficBox" >
<text class="trafficCar">车流预警</text>
<image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/carMoreIcon.svg"/>
</div>
</div>
<div class="moreStoreBox" @click="handleGoWarning">
<!-- <span class="moreText">更多记录</span>-->
<!-- <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>-->
</div>
</div>
<div class="contentList" >
<div class="contentItem" v-for="(item,index) in warningList" :key="index">
<div class="index">
<div class="boxBg" v-if="index<=2"></div>
<span class="indexText" :style="{fontWeight:index<=2?'bold':'normal',color:index<=2?'#160002':'#786B6C'}">{{index + 1}}</span>
</div>
<div class="serviceBox">
<span class="name">{{item.name}}</span>
<span class="position">{{item.SERVERPART_REGION}}区</span>
</div>
<div class="numberBox">
<span class="number">{{item.VEHICLE_COUNT}}</span>
<span class="unit">/辆</span>
</div>
<div class="addBox">
<image class="addIcon" :src="Number(item.VEHICLE_RATE)>100?'/static/images/examine/add.svg':Number(item.VEHICLE_RATE)===100?'':'/static/images/examine/reduce.svg'"/>
<span class="add">{{item.VEHICLE_RATE}}%</span>
</div>
</div>
</div>
</view>
<!-- 人流预警--> <!-- 人流预警-->
<view class="peopleWarning" v-if="false"> <view class="peopleWarning" v-if="false">
@ -719,7 +724,8 @@
<!--通知框--> <!--通知框-->
<div class="notice" v-if="isShow" style="bottom: 200px;"> <!-- v-if="isShow"-->
<div class="notice" style="bottom: 200px;">
<view class="left"> <view class="left">
<image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/index/warning.svg"></image> <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/index/warning.svg"></image>
<view class="text"> <view class="text">
@ -3770,7 +3776,11 @@ $iphoneHeight: env(safe-area-inset-bottom);
display: flex; display: flex;
align-items: center; align-items: center;
.moreText{ .moreText{
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #A69E9F;
line-height: 36rpx;
} }
.moreIcon{ .moreIcon{
width: 18px; width: 18px;

12
pages/nationalPage/index.vue
View File

@ -17,13 +17,13 @@
<div v-if="selectTab===1"> <div v-if="selectTab===1">
<!-- 服务区当日营收 Top5--> <!-- 服务区当日营收 Top5-->
<div class="dailyRevenue"> <div class="dailyRevenue" @click="handleGoMore(1)">
<div class="dailyContent"> <div class="dailyContent">
<image class="itemBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/revenueItemBg.png"/> <image class="itemBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/revenueItemBg.png"/>
<div class="list"> <div class="list">
<div class="listTop"> <div class="listTop">
<p class="title">{{ dayName }}营收 Top5</p> <p class="title">{{ dayName }}营收 Top5</p>
<div class="moreBox" @click="handleGoMore(1)"> <div class="moreBox">
<span class="text">查看更多</span> <span class="text">查看更多</span>
<image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/> <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
</div> </div>
@ -55,13 +55,13 @@
</div> </div>
</div> </div>
<!-- 当日入区车流量 Top5--> <!-- 当日入区车流量 Top5-->
<div class="dailyEntry"> <div class="dailyEntry" @click="handleGoMore(2)">
<div class="dailyContent"> <div class="dailyContent">
<image class="itemBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/entryIcon.png"/> <image class="itemBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/entryIcon.png"/>
<div class="list"> <div class="list">
<div class="listTop"> <div class="listTop">
<p class="title">{{dayName}}入区车流量 Top5</p> <p class="title">{{dayName}}入区车流量 Top5</p>
<div class="moreBox" @click="handleGoMore(2)"> <div class="moreBox">
<span class="text">查看更多</span> <span class="text">查看更多</span>
<image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/> <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
</div> </div>
@ -92,13 +92,13 @@
</div> </div>
</div> </div>
<!-- 当日入区车流量增幅 Top5--> <!-- 当日入区车流量增幅 Top5-->
<div class="dailyEntryAdd"> <div class="dailyEntryAdd" @click="handleGoMore(3)">
<div class="dailyContent"> <div class="dailyContent">
<image class="itemBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/entryAdd.png"/> <image class="itemBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/entryAdd.png"/>
<div class="list"> <div class="list">
<div class="listTop"> <div class="listTop">
<p class="title">{{dayName}}入区车流量增幅 Top5</p> <p class="title">{{dayName}}入区车流量增幅 Top5</p>
<div class="moreBox" @click="handleGoMore(3)"> <div class="moreBox">
<span class="text">查看更多</span> <span class="text">查看更多</span>
<image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/> <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
</div> </div>

3
pages/suggestion/suggestion.vue
View File

@ -86,7 +86,8 @@
} }
}, },
goDetail(item) { goDetail(item) {
this.$util.toNextRoute('navigateTo', "/pages/suggestion/suggestionDetail?SUGGESTION_ID=" + item.SUGGESTION_ID) console.log('item',item)
this.$util.toNextRoute('navigateTo', "/pages/suggestion/suggestionDetail?SUGGESTION_ID=" + item.SUGGESTION_ID+"&type="+item.SUGGESTION_STATE)
}, },
}, },

43
pages/suggestion/suggestionDetail.vue
View File

@ -41,7 +41,7 @@
<span class="text-detail">{{suggestionDetail.DISPOSITION_PERSON}}</span> <span class="text-detail">{{suggestionDetail.DISPOSITION_PERSON}}</span>
</div> </div>
<block v-if="isDirector==1 "> <block v-if="isDirector===1 ">
<div class="suggestion-detail-middle"> <div class="suggestion-detail-middle">
<p class="text-title">处理意见</p> <p class="text-title">处理意见</p>
<div class="text-detail textarea-box"> <div class="text-detail textarea-box">
@ -67,7 +67,7 @@
<p class="text-title">{{suggestionDetail.DISPOSITION_PERSON}}</p> <p class="text-title">{{suggestionDetail.DISPOSITION_PERSON}}</p>
<p class="text-detail">{{suggestionDetail.FEEDBACK_INFO}}</p> <p class="text-detail">{{suggestionDetail.FEEDBACK_INFO}}</p>
</div> </div>
<div class="suggestion-detail-middle no-border" v-if="isDirector==2"> <div class="suggestion-detail-middle no-border" v-if="isDirector===2">
<p class="text-title">处理结果</p> <p class="text-title">处理结果</p>
<div class="text-detail textarea-box"> <div class="text-detail textarea-box">
<textarea auto-height v-model="suggestionIdea" placeholder="填写问题处理结果" cursor-spacing="100"/> <textarea auto-height v-model="suggestionIdea" placeholder="填写问题处理结果" cursor-spacing="100"/>
@ -107,8 +107,8 @@
DispostionStaffId: '', // 处理人账号ID DispostionStaffId: '', // 处理人账号ID
suggestionIdea: '', // 处理意见 suggestionIdea: '', // 处理意见
dealerList: [], dealerList: [],
isPostMsg:false isPostMsg:false,
type:0
}; };
}, },
computed:{ computed:{
@ -130,21 +130,39 @@
...mapMutations(['shouldReLoadingList']), ...mapMutations(['shouldReLoadingList']),
// 获取详情 // 获取详情
getSuggestionDetail() { getSuggestionDetail() {
let info = this.user.AuthorityInfo
console.log('info',info)
console.log('type',this.type)
let _this = this let _this = this
let key={1000:"待处理",2000:"待反馈",3000:"已处理"} let key={1000:"待处理",2000:"待反馈",3000:"已处理"}
this.$request.$get('GetSuggestionDetail',{ let req
if (this.type === 1000 && info['e2fb458b-d1bd-48fa-805e-fc93dc71efb7']===1){
action_data: _this.SUGGESTION_ID req = {
}).then(res =>{ action_data: _this.SUGGESTION_ID,
GUID:'e2fb458b-d1bd-48fa-805e-fc93dc71efb7'
}
}else if(this.type === 2000 && info['ea2fc404-d924-4c88-98de-1f4d96137745']===1){
req = {
action_data: _this.SUGGESTION_ID,
GUID:'ea2fc404-d924-4c88-98de-1f4d96137745'
}
}else{
req = {
action_data: _this.SUGGESTION_ID,
}
}
// let req = {
// action_data: _this.SUGGESTION_ID
// }
this.$request.$get('GetSuggestionDetail',req).then(res =>{
console.log('res',res)
if(!res.ResultCode ||res.ResultCode!='100'){ if(!res.ResultCode ||res.ResultCode!='100'){
_this.isShow = false _this.isShow = false
}else { }else {
let _data = res.Data let _data = res.Data
_data.SUGGESTION_STATE_TEXT = key[_data.SUGGESTION_STATE] _data.SUGGESTION_STATE_TEXT = key[_data.SUGGESTION_STATE]
console.log('SORTNUM',_data.SORTNUM)
if(_data.SORTNUM == 0) { // 判断该条数据是否为待当前用户处理 if(_data.SORTNUM == 0) { // 判断该条数据是否为待当前用户处理
switch(_data.SUGGESTION_STATE) { switch(_data.SUGGESTION_STATE) {
case 1000: // 待处理 case 1000: // 待处理
@ -160,6 +178,8 @@
} }
} }
_this.suggestionDetail = _data _this.suggestionDetail = _data
console.log('suggestionDetail',_this.suggestionDetail)
console.log('isDirector',_this.isDirector)
_this.isShow = true _this.isShow = true
} }
@ -273,6 +293,7 @@
onLoad(option) { onLoad(option) {
let _this = this let _this = this
this.SUGGESTION_ID = option.SUGGESTION_ID this.SUGGESTION_ID = option.SUGGESTION_ID
this.type = Number(option.type)
if(option.source && option.source=='push' ){ if(option.source && option.source=='push' ){
let _this = this let _this = this
setTimeout(function(){ setTimeout(function(){