Browse Source

风机矩阵功能修改

shilin 4 years ago
parent
commit
cb75296ba1

+ 2 - 0
common/common.js

@@ -50,6 +50,8 @@ class Common {
 			page[page.length - 1].$vm.index_curve_columnar_windSpeed_power();
 
 		} else if (page[page.length - 1].route == "components/monitor/MatrixMonitor") {
+			page[page.length - 1].$vm.cardCur = 0;
+			page[page.length - 1].$vm.choiceIndex = -1;
 			page[page.length - 1].$vm.FDC = uni.getStorageSync('windPowerStationId');
 			page[page.length - 1].$vm.windStationName = windpowerstationName.replace('风电场', '');
 			page[page.length - 1].$vm.getProjectcollection();

+ 1 - 1
common/store.js

@@ -5,7 +5,7 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
     state: {
-		wholeSituationBackStageIp:'117.78.18.24',
+		wholeSituationBackStageIp:'192.168.3.24',//117.78.18.24
 		wholeSituationBackStagePort:'9988',
 		windpowerstationNameToId:{},
 		

+ 5 - 158
components/mine/chat/Chatindex.vue

@@ -6,7 +6,7 @@
 		
 
     <view>
-        <web-view :webview-styles="webviewStyles" src="https://192.168.1.105:4397/websocket/usercontroller/view?userid=admin"></web-view>
+        <web-view :webview-styles="webviewStyles" :src=socketurl></web-view>
     </view>
 		<!-- <view class="DrawerClose" :class="modalName == 'viewModal' ? 'show' : ''" @tap="hideModal"><text class="cuIcon-pullright"></text></view> -->
 	</view>
@@ -35,163 +35,7 @@ export default {
 			xynd_computed:'',
 			WeatherProphethomepagebool:true,
 			toggleSwitch:false,
-			menuKey:1,
-			pointKey: 'MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0087',
-			socketTask_bracelet: '',
-			socketTask_close_bracelet: '',
-			deviceName: 'Y1-A0BC',
-			deviceNamePld: 'Y1-A0BC_PLD',
-			deviceNameBs: 'Y1-A0BC_BS',
-			deviceNameSsxy: 'Y1-A0BC_SSXY',
-			deviceNameXtpl: 'Y1-A0BC_XTPL',
-			deviceNameXynd: 'Y1-A0BC_XYND',
-			deviceNameSzxy: 'Y1-A0BC_SZXY',
-			deviceNameLng: 'Y1-A0BC_LNG',
-			deviceNameLat: 'Y1-A0BC_LAT',
-			bracelet: {
-				deviceName: '',
-				deviceNamePld: '',
-				deviceNameBs: '',
-				deviceNameSsxy: '',
-				deviceNameXtpl: '',
-				deviceNameXynd: '',
-				deviceNameSzxy: '',
-			},
-			braceletCurve: {},
-			mapBegin_1:'',
-			mapEnd_1:'',
-			mapBegin_2:'',
-			mapEnd_2:'',
-			points:[
-				{
-					latitude:'',
-					longitude:''
-				},
-				{
-					latitude:'',
-					longitude:''
-				}
-			],
-			list:{},
-			braceletCurve_SSXY: [],
-			braceletCurve_PLD: [],
-			braceletCurve_SZXY: [],
-			braceletCurve_XTPL: [],
-			braceletCurve_BS: [],
-			braceletCurve_XYND: [],
-			braceletCurve_LNG: [],
-			braceletCurve_LAT: [],
-			/* targetdetail_visable: { targetdetail_target: true, targetdetail_curve: true, targetdetail_histogram: true},
-				targetdetail: { targetdetail_target: '', targetdetail_curve: '', targetdetail_histogram: ''}, */
-			targetName: '日发电量',
-			targetUnit: '万kwh',
-			
-			bool:true,
-			pld: '',
-			ssxy: '',
-			lng: '',
-			szxy: '',
-			lat: '',
-			xtpl: '',
-			bs: '',
-			xynd: '',
-			device_nam: '',
-			title: 'map',
-			latitude: 39.907,//定位中心
-			longitude: 116.39742,//
-			covers: [
-				{
-					
-					latitude:39.909 , //纬度坐标点
-					longitude:116.39742 , //经度
-					iconPath: '../../static/picture/forcast/DingWei.png', //显示的图标
-					title: '阿打算', //标注点名
-					label: {
-						//为标记点旁边增加标签
-						content: '', //文本1
-						color: '#F76350', //文本颜色
-						anchorX: 0, //label的坐标,原点是 marker 对应的经纬度
-						anchorY: -80, //label的坐标,原点是 marker 对应的经纬度
-						// 					    x:39.909,//这个组件微信在1.2.0以后就废弃了
-						// 					    y:116.39742,
-						bgColor: '#fff', //背景色
-						padding: 5, //文本边缘留白
-						borderWidth: 1, //边框宽度
-						borderColor: '#D84C29', //边框颜色
-						textAlign: 'right' //文本对齐方式。
-					},
-					callout: {
-						//自定义标记点上方的气泡窗口 点击有效
-						content: '地点1',
-						color: '#F76350',
-						fontSize: 12,
-						borderRadius: 5
-					}
-					// 					 anchor:{//经纬度在标注图标的锚点,默认底边中点
-					// 						 x:5,
-					// 						 y:1,
-					// 					  }
-				} , {
-								    latitude:39.90   ,//最后点
-								    longitude: 116.399,//
-								    iconPath: '../../static/picture/forcast/DingWei.png',
-									title:'阿迪达斯',
-									x:'',//
-									y: '',//116.399
-									label:{
-									        content:'',
-									        color:'#F76350',
-									        bgColor:'#fff',
-									        padding:5,
-									        borderRadius:4,
-									 },
-									 callout:{
-									        content:'地点2',
-									        color:'#F76350',
-									        fontSize:12
-									 }
-								} 
-			],
-			scale: 15, //地图层级
-			controls: [
-				{
-					//在地图上显示控件,控件不随着地图移动
-					id: 1, //控件id
-					/* iconPath: '../../static/picture/forcast/DingWei.png', *///显示的图标
-					position: {
-						//控件在地图的位置
-						left: 15,
-						top: 15,
-						width: 40,
-						height: 40
-					}
-				}
-			],
-			circles: [
-				{
-					//在地图上显示圆
-					latitude: 39.9,
-					longitude: 116.39,
-					fillColor: '#FFC41F', //填充颜色
-					color: '#12A1DD', //描边的颜色
-					radius: 0, //半径
-					strokeWidth: 2 //描边的宽度
-				}
-			],
-			polyline: [
-				{    /* .polyline[0].points */
-					points:[{}],
-					//指定一系列坐标点,从数组第一项连线至最后一项
-					/* points: [{ latitude:this.mapBegin_1, longitude:this.mapBegin_2 }, { latitude: this.mapEnd_1, longitude:this.mapEnd_2 }], */
-					/* points: [{ latitude: 0, longitude: 0 }, { latitude: 0, longitude: 0 }], */
-					color: '#0000AA', //线的颜色
-					width: 2, //线的宽度
-					dottedLine: true, //是否虚线
-					arrowLine: true //带箭头的线 开发者工具暂不支持该属性
-				}
-			],
-
-			badge: 22,
+			socketurl:'',
 			inconList: ['form', 'favor', 'question', 'edit'],
 			modalName: null,
 			address: '',
@@ -211,6 +55,9 @@ export default {
 		this.FDC=this.dataprocessing.getWindPowerStationId();
 		this.windPowerStationId =this.dataprocessing.getWindPowerStationId();
 		
+		let userid=uni.getStorageSync("userid")
+		
+		this.socketurl="https://192.168.3.24:4397/websocket/usercontroller/view?userid="+userid;
 
 		this.$nextTick(function() {
 			//this.getWeatherDataToday();

File diff suppressed because it is too large
+ 131 - 1049
components/monitor/MatrixMonitor.vue


BIN
static/picture/001.png


BIN
static/picture/002.png


BIN
static/picture/003.png


BIN
static/picture/004.png


BIN
static/picture/005.png


BIN
static/picture/008.png