update
This commit is contained in:
parent
d1d4334f07
commit
6b7a603cb9
@ -1928,13 +1928,10 @@ export default {
|
|||||||
});
|
});
|
||||||
// 理想
|
// 理想
|
||||||
let LXData = [];
|
let LXData = [];
|
||||||
let LXInfoList = [];
|
|
||||||
// 交控
|
// 交控
|
||||||
let JKData = [];
|
let JKData = [];
|
||||||
let JKInfoList = [];
|
|
||||||
// 国网
|
// 国网
|
||||||
let GWData = [];
|
let GWData = [];
|
||||||
let GWInfoList = [];
|
|
||||||
|
|
||||||
if (data && data.length > 0) {
|
if (data && data.length > 0) {
|
||||||
data.forEach((item) => {
|
data.forEach((item) => {
|
||||||
@ -1949,6 +1946,9 @@ export default {
|
|||||||
}
|
}
|
||||||
if (serviceList && serviceList.length > 0) {
|
if (serviceList && serviceList.length > 0) {
|
||||||
serviceList.forEach((item) => {
|
serviceList.forEach((item) => {
|
||||||
|
let LXInfoList = [];
|
||||||
|
let JKInfoList = [];
|
||||||
|
let GWInfoList = [];
|
||||||
// 理想
|
// 理想
|
||||||
let LXRes = [];
|
let LXRes = [];
|
||||||
if (LXData && LXData.length > 0) {
|
if (LXData && LXData.length > 0) {
|
||||||
@ -1971,6 +1971,9 @@ export default {
|
|||||||
Power: Number(fourthItem.powerMax),
|
Power: Number(fourthItem.powerMax),
|
||||||
ConnectorID: fourthItem.connectorCode,
|
ConnectorID: fourthItem.connectorCode,
|
||||||
ConnectorType: Number(fourthItem.connectorType),
|
ConnectorType: Number(fourthItem.connectorType),
|
||||||
|
NationalStandard: Number(fourthItem.national),
|
||||||
|
VoltageLowerLimits: Number(fourthItem.voltageLimit),
|
||||||
|
VoltageUpperLimits: Number(fourthItem.voltageMax),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -2018,6 +2021,9 @@ export default {
|
|||||||
Power: Number(fourthItem.powerMax),
|
Power: Number(fourthItem.powerMax),
|
||||||
ConnectorID: fourthItem.connectorCode,
|
ConnectorID: fourthItem.connectorCode,
|
||||||
ConnectorType: Number(fourthItem.connectorType),
|
ConnectorType: Number(fourthItem.connectorType),
|
||||||
|
NationalStandard: Number(fourthItem.national),
|
||||||
|
VoltageLowerLimits: Number(fourthItem.voltageLimit),
|
||||||
|
VoltageUpperLimits: Number(fourthItem.voltageMax),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -2049,6 +2055,8 @@ export default {
|
|||||||
let thisServiceRes = GWData.filter(
|
let thisServiceRes = GWData.filter(
|
||||||
(filterItem) => filterItem.serverpartId === item.SERVERPART_ID
|
(filterItem) => filterItem.serverpartId === item.SERVERPART_ID
|
||||||
);
|
);
|
||||||
|
console.log("thisServiceRes", thisServiceRes);
|
||||||
|
|
||||||
if (thisServiceRes && thisServiceRes.length > 0) {
|
if (thisServiceRes && thisServiceRes.length > 0) {
|
||||||
thisServiceRes.forEach((subItem) => {
|
thisServiceRes.forEach((subItem) => {
|
||||||
if (subItem.equipments && subItem.equipments.length > 0) {
|
if (subItem.equipments && subItem.equipments.length > 0) {
|
||||||
@ -2065,6 +2073,9 @@ export default {
|
|||||||
Power: Number(fourthItem.powerMax),
|
Power: Number(fourthItem.powerMax),
|
||||||
ConnectorID: fourthItem.connectorCode,
|
ConnectorID: fourthItem.connectorCode,
|
||||||
ConnectorType: Number(fourthItem.connectorType),
|
ConnectorType: Number(fourthItem.connectorType),
|
||||||
|
NationalStandard: Number(fourthItem.national),
|
||||||
|
VoltageLowerLimits: Number(fourthItem.voltageLimit),
|
||||||
|
VoltageUpperLimits: Number(fourthItem.voltageMax),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -2123,6 +2134,13 @@ export default {
|
|||||||
item.LXInfoList = LXInfoList;
|
item.LXInfoList = LXInfoList;
|
||||||
item.JKInfoList = JKInfoList;
|
item.JKInfoList = JKInfoList;
|
||||||
item.GWInfoList = GWInfoList;
|
item.GWInfoList = GWInfoList;
|
||||||
|
console.log("LXInfoList", LXInfoList);
|
||||||
|
console.log("JKInfoList", JKInfoList);
|
||||||
|
console.log("GWInfoList", GWInfoList);
|
||||||
|
console.log("LXData", LXData);
|
||||||
|
console.log("JKData", JKData);
|
||||||
|
console.log("item", item);
|
||||||
|
console.log("GWData", GWData);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2897,6 +2915,8 @@ export default {
|
|||||||
this.selectPopup = 1;
|
this.selectPopup = 1;
|
||||||
},
|
},
|
||||||
handleChangeSelectPopup(value) {
|
handleChangeSelectPopup(value) {
|
||||||
|
console.log("this.nowCurrentObj", this.nowCurrentObj);
|
||||||
|
|
||||||
this.selectPopup = value;
|
this.selectPopup = value;
|
||||||
if (value === 1) {
|
if (value === 1) {
|
||||||
// 理想
|
// 理想
|
||||||
@ -3666,7 +3686,7 @@ export default {
|
|||||||
.popupTab {
|
.popupTab {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 56rpx;
|
height: 56rpx;
|
||||||
border-bottom: 1px solid #cecece;
|
border-bottom: 1px solid #f1f1f1;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name" : "皖美驿站",
|
"name" : "驿达",
|
||||||
"appid" : "__UNI__F870657",
|
"appid" : "__UNI__F870657",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.0.3",
|
"versionName" : "1.0.3",
|
||||||
@ -98,9 +98,9 @@
|
|||||||
"icons" : {
|
"icons" : {
|
||||||
"android" : {
|
"android" : {
|
||||||
"hdpi" : "C:/Users/yskj03/Desktop/整理桌面/logo 206_216/logo 216_216@1x.png",
|
"hdpi" : "C:/Users/yskj03/Desktop/整理桌面/logo 206_216/logo 216_216@1x.png",
|
||||||
"xhdpi" : "C:/Users/yskj03/Desktop/wanmeiyizhanLogo.png",
|
"xhdpi" : "C:/Users/yskj03/Desktop/整理桌面/logo 206_216/logo 96_96@1x.png",
|
||||||
"xxhdpi" : "C:/Users/yskj03/Desktop/wanmeiyizhanLogo.png",
|
"xxhdpi" : "C:/Users/yskj03/Desktop/整理桌面/logo 206_216/logo 144_144@1x.png",
|
||||||
"xxxhdpi" : "C:/Users/yskj03/Desktop/wanmeiyizhanLogo.png"
|
"xxxhdpi" : "C:/Users/yskj03/Desktop/整理桌面/logo 206_216/logo 192_192@1x.png"
|
||||||
},
|
},
|
||||||
"ios" : {
|
"ios" : {
|
||||||
"appstore" : "C:/Users/yskj03/Desktop/整理桌面/logo 206_216/logo 1024_1024@1x.png",
|
"appstore" : "C:/Users/yskj03/Desktop/整理桌面/logo 206_216/logo 1024_1024@1x.png",
|
||||||
|
|||||||
@ -464,7 +464,6 @@ export default {
|
|||||||
this.pageIndex = this.pageIndex += 1;
|
this.pageIndex = this.pageIndex += 1;
|
||||||
let res = JSON.parse(JSON.stringify(this.defaultAllServiceNameList));
|
let res = JSON.parse(JSON.stringify(this.defaultAllServiceNameList));
|
||||||
this.allServiceNameList = res.splice(0, this.pageIndex * 10 - 1);
|
this.allServiceNameList = res.splice(0, this.pageIndex * 10 - 1);
|
||||||
|
|
||||||
|
|
||||||
await this.$refs.chargeBoxRef.handldGetData();
|
await this.$refs.chargeBoxRef.handldGetData();
|
||||||
this.isHaveMore = false;
|
this.isHaveMore = false;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
6
unpackage/dist/build/app-plus/app-service.js
vendored
6
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/build/app-plus/app-view.js
vendored
2
unpackage/dist/build/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/build/app-plus/manifest.json
vendored
2
unpackage/dist/build/app-plus/manifest.json
vendored
File diff suppressed because one or more lines are too long
@ -14,7 +14,7 @@
|
|||||||
"compileType": "miniprogram",
|
"compileType": "miniprogram",
|
||||||
"libVersion": "",
|
"libVersion": "",
|
||||||
"appid": "wx4c497eddcec4a0e7",
|
"appid": "wx4c497eddcec4a0e7",
|
||||||
"projectname": "皖美驿站",
|
"projectname": "驿达",
|
||||||
"condition": {
|
"condition": {
|
||||||
"search": {
|
"search": {
|
||||||
"current": -1,
|
"current": -1,
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
|||||||
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__F870657","name":"皖美驿站","version":{"name":"1.0.3","code":103},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":false,"Push":false,"Share":{},"Speech":{},"VideoPlayer":{},"Maps":{"coordType":"gcj02"},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"AMapModule":{"__plugin_info__":{"name":"AMapModule测试插件","description":"AMapModule测试插件1.7","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.45","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"custom":true,"color":"#130F05","backgroundColor":"#fff","selectedColor":"#130F05","borderStyle":"rgba(0,0,0,0.4)","list":[{"text":"首页","pagePath":"pages/home/index","iconPath":"static/tabs/home.png","selectedIconPath":"static/tabs/home-active.png"},{"text":"线上商城","pagePath":"pages/onlineShop/index","iconPath":"static/tabs/store-active.png","selectedIconPath":"static/tabs/store-active.png"},{"text":"精选活动","pagePath":"pages/discovery/index","iconPath":"static/tabs/discovery.png","selectedIconPath":"static/tabs/discovery-active.png"},{"text":"我的","pagePath":"pages/userCenter/index","iconPath":"static/tabs/user.png","selectedIconPath":"static/tabs/user-active.png"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
|
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__F870657","name":"驿达","version":{"name":"1.0.3","code":103},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":false,"Push":false,"Share":{},"Speech":{},"VideoPlayer":{},"Maps":{"coordType":"gcj02"},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"AMapModule":{"__plugin_info__":{"name":"AMapModule测试插件","description":"AMapModule测试插件1.7","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.45","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"custom":true,"color":"#130F05","backgroundColor":"#fff","selectedColor":"#130F05","borderStyle":"rgba(0,0,0,0.4)","list":[{"text":"首页","pagePath":"pages/home/index","iconPath":"static/tabs/home.png","selectedIconPath":"static/tabs/home-active.png"},{"text":"线上商城","pagePath":"pages/onlineShop/index","iconPath":"static/tabs/store-active.png","selectedIconPath":"static/tabs/store-active.png"},{"text":"精选活动","pagePath":"pages/discovery/index","iconPath":"static/tabs/discovery.png","selectedIconPath":"static/tabs/discovery-active.png"},{"text":"我的","pagePath":"pages/userCenter/index","iconPath":"static/tabs/user.png","selectedIconPath":"static/tabs/user-active.png"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
|
||||||
Loading…
x
Reference in New Issue
Block a user