From 1a1cb38f1a0eac5baf5e50dfb3befa769573ad80 Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Thu, 4 Dec 2025 15:36:09 +0800 Subject: [PATCH] update --- .../components/SupplierOverview.vue | 15 ++-- .../js_sdk/u-charts/config-ucharts.js | 3 + pages/DigitalIntelligenceDashboard/index.vue | 2 +- pages/attendanceStatus/index.vue | 4 +- pages/index/index.vue | 4 +- pages/map/index.vue | 4 +- .../components/mapDetail.vue | 8 +- pages/summaryOfPortraits/index.vue | 47 +++++++---- pages/userCenter/userCenter.vue | 80 +++++++++---------- util/apiPath.js | 1 + util/index.js | 3 + 11 files changed, 98 insertions(+), 73 deletions(-) diff --git a/pages/DigitalIntelligenceDashboard/components/SupplierOverview.vue b/pages/DigitalIntelligenceDashboard/components/SupplierOverview.vue index fa8d25c..1178eeb 100644 --- a/pages/DigitalIntelligenceDashboard/components/SupplierOverview.vue +++ b/pages/DigitalIntelligenceDashboard/components/SupplierOverview.vue @@ -65,7 +65,7 @@ export default { return { isLoading: false, kpiData: { - totalSuppliers: 128, + totalSuppliers: 57, // 真实写死数据 avgDeliveryRate: 95.6, inventoryTurnover: 12, monthlyPurchase: 2800000 @@ -74,11 +74,11 @@ export default { totalAlerts: 3 }, categoryData: [ - { name: '食品供应商', value: 35 }, - { name: '日用品供应商', value: 28 }, - { name: '服务类供应商', value: 22 }, - { name: '设备供应商', value: 18 }, - { name: '其他', value: 25 } + { name: '经销商', value: 35 }, + { name: '品牌方', value: 9 }, + { name: '自有品牌水', value: 2 }, + { name: '零售批发类', value: 1 }, + { name: '厂家', value: 10 } ] } }, @@ -111,7 +111,8 @@ export default { position: 'right', float: 'center', padding: 5, - margin: 10 + margin: 15, + itemGap: 20 }, extra: { pie: { diff --git a/pages/DigitalIntelligenceDashboard/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/pages/DigitalIntelligenceDashboard/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js index 1e06bc8..e721e08 100644 --- a/pages/DigitalIntelligenceDashboard/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js +++ b/pages/DigitalIntelligenceDashboard/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js @@ -95,6 +95,9 @@ const cfu = { "option": {}, //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换 "formatter": { + "supplierCategoryPie": function (item, category, index, opts) { + return `${item.name}：${item.data}个` + }, "AnalysisOfMember": function (item, category, index, opts) { return `${item.name}${category}，占比：${item.data}%` }, diff --git a/pages/DigitalIntelligenceDashboard/index.vue b/pages/DigitalIntelligenceDashboard/index.vue index a9e26fc..df328a0 100644 --- a/pages/DigitalIntelligenceDashboard/index.vue +++ b/pages/DigitalIntelligenceDashboard/index.vue @@ -249,7 +249,7 @@ export default { { name: '运营中心', key: 'business' }, { name: '客群画像', key: 'customerProfile' }, { name: '经营分析', key: 'businessRevenue' }, - // { name: '供应链生态', key: 'supplierAnalysis' }, + { name: '供应链生态', key: 'supplierAnalysis' }, { name: '电商生态', key: 'mallOperation' }, ], // 各个Tab对应的导航栏数据 diff --git a/pages/attendanceStatus/index.vue b/pages/attendanceStatus/index.vue index c77a65e..f54b55a 100644 --- a/pages/attendanceStatus/index.vue +++ b/pages/attendanceStatus/index.vue @@ -736,7 +736,7 @@ export default { }, // 跳转应急事件页面 showEmergencyDetails(type) { - if (this.serviceInfo.SERVERPART_NAME) { + if (this.serviceInfo.SAName) { // type 1 应急事件 2 日常问题 this.$util.toNextRoute("navigateTo", `/pages/attendanceStatus/emergencyEvents?type=${type}`); } else { @@ -758,7 +758,7 @@ export default { let _this = this console.log('this.serviceInfothis.serviceInfo', this.serviceInfo); - if (this.serviceInfo.SERVERPART_NAME) { + if (this.serviceInfo.SAName) { if (value === 1) { this.showEmergencyDetails(1) } else if (value === 2) { diff --git a/pages/index/index.vue b/pages/index/index.vue index 96a3d2e..85d8c80 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -101,7 +101,7 @@ {{ (Math.floor(index / 12) + 2024).toString().slice(2, 4) - }}年累计对客销售/亿元 + }}年累计对客销售/亿元 {{ @@ -733,7 +733,7 @@ export default { }); } - const UreaData = await request.$apiPost("CommercialApi/BigData/GetEnergyRevenueInfo", { + const UreaData = await request.$SamemberApiPost("CommercialApi/BigData/GetEnergyRevenueInfo", { DataType: 4000, StatisticsDate: this.nowDay, ShowWY: true, diff --git a/pages/map/index.vue b/pages/map/index.vue index c28e421..98f2c2f 100644 --- a/pages/map/index.vue +++ b/pages/map/index.vue @@ -33,9 +33,9 @@
-
+
diff --git a/pages/summaryOfPortraits/components/mapDetail.vue b/pages/summaryOfPortraits/components/mapDetail.vue index b0b80b4..99b3e55 100644 --- a/pages/summaryOfPortraits/components/mapDetail.vue +++ b/pages/summaryOfPortraits/components/mapDetail.vue @@ -91,7 +91,7 @@ {{ formatArea(info.floorArea) }} 占地面积 - m² + 亩 @@ -215,7 +215,7 @@ :class="{ 'available': info.synthesisCatering > 0, 'unavailable': !info.synthesisCatering }"> 餐饮服务 ({{ formatArea(info.synthesisCatering) - }}m²) + }}m²) @@ -228,13 +228,13 @@ :class="{ 'available': info.LPGStationsArea > 0, 'unavailable': !info.LPGStationsArea }"> 加气站 ({{ formatArea(info.LPGStationsArea) - }}m²) + }}m²) 充电站 ({{ formatArea(info.chargingStationArea) - }}m²) + }}m²) diff --git a/pages/summaryOfPortraits/index.vue b/pages/summaryOfPortraits/index.vue index d1677fb..ab3981d 100644 --- a/pages/summaryOfPortraits/index.vue +++ b/pages/summaryOfPortraits/index.vue @@ -37,7 +37,7 @@ --> - + @@ -124,12 +124,25 @@ export default { this.isShowSwiper = true let seat = uni.getStorageSync('currentService') console.log('seat', seat) - this.serviceInfo = seat - if (this.selectPortrait) { - - } else { - this.selectPortrait = this.query.index ? this.query.index : seat.SERVERPART_NAME === '安徽驿达' ? 1 : 0 + console.log('this.serviceInfo', JSON.parse(JSON.stringify(this.serviceInfo))) + if (this.serviceInfo.SAName !== seat.SAName) { + this.serviceInfo = seat + this.isHandleOnShow = false + this.selectPortrait = -1 + uni.showLoading() + this.$forceUpdate() + setTimeout(() => { + this.isHandleOnShow = true + this.selectPortrait = 0 + uni.hideLoading() + }, 100) } + + // if (this.selectPortrait) { + + // } else { + // this.selectPortrait = this.query.index ? this.query.index : seat.SERVERPART_NAME === '安徽驿达' ? 1 : 0 + // } }, onHide() { this.isShowSwiper = false @@ -158,15 +171,19 @@ export default { let lastDay = uni.getStorageSync('lastDay') let pageList = getCurrentPages() console.log('pageList', pageList) - if (pageList.length > 2) { - uni.navigateBack({ - delta: 1 - }) - } else { - uni.navigateTo({ - url: `/pages/map/index?time=${lastDay}&serviceInfo=${JSON.stringify(currentService)}` - }) - } + uni.navigateTo({ + url: `/pages/map/index?time=${lastDay}&serviceInfo=${JSON.stringify(currentService)}` + }) + + // if (pageList.length > 2) { + // uni.navigateBack({ + // delta: 1 + // }) + // } else { + // uni.navigateTo({ + // url: `/pages/map/index?time=${lastDay}&serviceInfo=${JSON.stringify(currentService)}` + // }) + // } } } } diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue index 1b03bcc..6a3fd30 100644 --- a/pages/userCenter/userCenter.vue +++ b/pages/userCenter/userCenter.vue @@ -239,53 +239,53 @@ export default { //拿到登录用户有权限的内容 this.menu = uni.getMenuButtonBoundingClientRect(); - // 拿到用户头像 - this.handleGetUserAvatar() - this.dataList[2].list.forEach((item) => { - for (let key in this.user.AuthorityInfo) { - if (key === item.id) { - if (this.user.AuthorityInfo[key] === 1) { - item.isNotice = true; - } - } - } - if (item.id === "a927bf4d-f924-4034-b964-d1a8bd401d09") { - item.isNotice = true; - } - }); + // // 拿到用户头像 + // this.dataList[2].list.forEach((item) => { + // for (let key in this.user.AuthorityInfo) { + // if (key === item.id) { + // if (this.user.AuthorityInfo[key] === 1) { + // item.isNotice = true; + // } + // } + // } + // if (item.id === "a927bf4d-f924-4034-b964-d1a8bd401d09") { + // item.isNotice = true; + // } + // }); //拿到登录用户有权限的内容 判断是否有角标 - this.dataList[3].list.forEach((item) => { - for (let key in this.user.AuthorityInfo) { - if (key === item.id) { - if (this.user.AuthorityInfo[key] === 1) { - item.isNotice = true; - } - } - } - }); - //拿到登录用户有权限的内容 判断是否有角标 - this.dataList[2].list.forEach((item) => { - for (let key in this.toDoMsg) { - if (key === item.id) { - item.notice = this.toDoMsg[key]; - } - } - }); - this.dataList[3].list.forEach((item) => { - for (let key in this.toDoMsg) { - if (key === item.id) { - item.notice = this.toDoMsg[key]; - } - } - }); + // this.dataList[3].list.forEach((item) => { + // for (let key in this.user.AuthorityInfo) { + // if (key === item.id) { + // if (this.user.AuthorityInfo[key] === 1) { + // item.isNotice = true; + // } + // } + // } + // }); + // //拿到登录用户有权限的内容 判断是否有角标 + // this.dataList[2].list.forEach((item) => { + // for (let key in this.toDoMsg) { + // if (key === item.id) { + // item.notice = this.toDoMsg[key]; + // } + // } + // }); + // this.dataList[3].list.forEach((item) => { + // for (let key in this.toDoMsg) { + // if (key === item.id) { + // item.notice = this.toDoMsg[key]; + // } + // } + // }); //通过权限来判断是否可以点击跳转 - let userInfo = uni.getStorageSync("vuex"); + let userInfo = this.user + console.log('userInfouserInfouserInfo', userInfo); if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] === 1) { this.isReturn = false; } else if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] !== 1) { uni.redirectTo({ - url: `/pages/commercialBI/noData?type=homeIndex`, + url: `/pages/commercialBI/noData?type=noAuthor`, }); } diff --git a/util/apiPath.js b/util/apiPath.js index 11fdd27..431cbb1 100644 --- a/util/apiPath.js +++ b/util/apiPath.js @@ -11,6 +11,7 @@ export default { // apiurl: 'https://erysfeipeng.oicp.net/', // web api testApiurl: 'http://dev.eshangtech.com:8001/', // web api测试接口地址 apiEsUrl: "https://api.eshangtech.com/", + samemberUrl: "https://samember.yciccloud.com:8999/", mobUrl: 'http://192.168.11.125:8000/Coop.Merchant/Handler/handler_ajax.ashx', // 接口 testURL1: 'http://192.168.10.123:8000', // 测试ip diff --git a/util/index.js b/util/index.js index 364b2c4..77fb5f7 100644 --- a/util/index.js +++ b/util/index.js @@ -37,6 +37,9 @@ export default { $apiPost: function (controller, data) { return Api.request('POST', ApiPath.apiEsUrl + controller, data || {}, true) }, + $SamemberApiPost: function (controller, data) { + return Api.request('POST', ApiPath.samemberUrl + controller, data || {}, true) + }, $posGet: function (controller, data) { return Api.request('GET', ApiPath.posApiurl + controller, data || {}, true) },