冲突解决

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "伍继app",
-    "appid" : "__UNI__945DA73",
+    "appid" : "__UNI__3C58560",
     "description" : "伍继app升级",
     "versionName" : "2.0",
     "versionCode" : 2,

package-lock.json

@@ -3,13 +3,6 @@
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
-  
-  "sockjs":{
-  "dev": false
-  },
-  "sockjs-client" :{
-  "dev": false
-  },
   "dependencies": {
     "@babel/runtime": {
       "version": "7.16.7",

pages.json

@@ -96,10 +96,29 @@
 		{
 			"path": "pages/device-Manage/device-Manage",
 			"style": {
-				"navigationBarTitleText": "设备管理"
+				"navigationBarTitleText": "设备管理",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [
+							{
+								"text": "系统配电图",
+								"fontSize": "22rpx",
+								"float": "right",
+								"width": "auto"
+							}
+						]
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/device-Manage/electricalSystem/index",
+			"style": {
+				"navigationBarTitleText": "系统配电图"
 			}
 		},
 
+
 		{
 			"path": "pages/analyse/analyse",
 			"style": {

pages/device-Manage/device-Manage.vue

@@ -38,6 +38,12 @@
 			this.deviceType=option.deviceType
 			this.getDeviceManage({"companyCode":option.companyCode,"deviceType":option.deviceType})
 		},
+		onNavigationBarButtonTap(e) {
+			console.log(e)
+			uni.navigateTo({
+				url: './electricalSystem/index?siteId=1'
+			});
+		},
 		methods: {
 			
 			async getDeviceManage(ming={}) {

pages/device-Manage/electricalSystem/index.vue

@@ -0,0 +1,39 @@
+<template>
+	<view class="">
+		<web-view :src="'http://localhost:8081/vuefiv/#/?siteId='+siteId" allow></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				siteId:"",
+				deviceData:[],
+				modalName: null,
+			};
+		},
+		
+		onLoad:function(option){
+			// console.log(111)
+			// console.log(option)
+			this.siteId = option.siteId
+		},
+		mounted () {
+		},
+		methods: {
+		}
+
+	}
+</script>
+
+<style lang="scss">
+	.cu-list.menu-avatar>.cu-item .content>uni-view:first-child {
+		font-size: 32rpx;
+	}
+
+	.num {
+		font-size: 30rpx;
+		color: #666;
+	}
+</style>

pages/index/index.vue

@@ -187,11 +187,11 @@
 			document.querySelector('.uni-page-head-hd').style.display = 'none'
 		},
 
-		beforeCreate: function() {
-		},
+		beforeCreate: function() {},
 
 
 		onLoad: function(option) {
+
 		
 			// if (option.op) {
 			// 	this.getData();
@@ -201,6 +201,7 @@
 			// }
 			
 			
+=
 			this.getData();
 
 			this.hackReset = false;
@@ -211,9 +212,9 @@
 
 		methods: {
 
-			
+
 			async init() {
-				window.location.href =  this.$BASE_URL+"Com/getPageAuthorization1"
+				window.location.href = this.$BASE_URL + "Com/getPageAuthorization1"
 			},
 			// end
 
@@ -293,8 +294,6 @@
 	window.addEventListener('popstate', function() {
 		// alert('点击返回按钮了！')
 	});
-	
-	
 </script>
 
 <style lang="scss">

util/api.js

@@ -1,4 +1,5 @@
 // const BASE_URL = 'https://iot.usky.cn/USKYOF/USKYOF.php/Home/' //(测试域名)  
+
 const BASE_URL = 'https://qhome.usky.cn//USKYOF/USKYOF.php/Home/' //(正式域名新)  
 const websiteUrl = 'https://qhome.usky.cn/'