‘衔接各个页面’

common/common.js

@@ -26,14 +26,14 @@ class Common{
 		// 		}
 		// 	});
 		
-		uni.switchTab({
+		// uni.switchTab({
 			
-			url: url,success: function(e) {				
-				//if (page[0] == undefined || page[0] == null) return;
-					page[page.length-1].onLoad();
-				}
+		// 	url: url,success: function(e) {				
+		// 		//if (page[0] == undefined || page[0] == null) return;
+		// 			page[page.length-1].onLoad();
+		// 		}
 				
-		})
+		// })
 		
 		
 	}

common/data.json

@@ -0,0 +1,363 @@
+{
+  "success": true,
+  "data": {
+    "Column": {
+      "categories": ["2012", "2013", "2014", "2015", "2016", "2017"],
+      "series": [{
+        "name": "成交量1",
+        "data": [15, {
+          "value": 20,
+          "color": "#f04864"
+        }, 45, 37, 43, 34]
+      }, {
+        "name": "成交量2",
+        "data": [30, {
+          "value": 40,
+          "color": "#facc14"
+        }, 25, 14, 34, 18]
+      }]
+    },
+    "ColumnB": {
+      "categories": ["04/21", "04/22", "04/23", "04/24", "04/25", "04/26", "04/27"],
+      "series": [{
+		  "legendShape": "circle",
+        "name": "功率",
+        "data": [10, 20, 30, 40, 20, 15,20],
+		"textColor":"#ffffff",
+		"color": "#2fc25b"
+      }]
+    },
+    "ColumnMeter": {
+      "categories": ["2013", "2014", "2015", "2016", "2017", "2018"],
+      "series": [{
+        "name": "目标值",
+        "data": [35, 36, 31, 33, 13, 34],
+        "color": "#2fc25b"
+      }, {
+        "name": "完成量",
+        "data": [18, 27, 21, 24, 6, 28],
+        "color": "#1890ff"
+      }]
+    },
+    "ColumnStack": {
+      "categories": ["2013", "2014", "2015", "2016", "2017", "2018"],
+      "series": [{
+        "name": "新成交量3",
+        "data": [35, 36, 31, 33, 13, 34]
+      }, {
+        "name": "新成交量4",
+        "data": [18, 27, 21, 24, 6, 28]
+      }, {
+        "name": "新成交量5",
+        "data": [18, 27, 21, 24, 6, 28]
+      }]
+    },
+    "Mix": {
+      "categories": ["2012", "2013", "2014", "2015", "2016", "2017"],
+      "series": [{
+        "name": "曲面",
+        "data": [70, 50, 85, 130, 64, 88],
+        "type": "area",
+        "style": "curve"
+      }, {
+        "name": "柱1",
+        "data": [40, 30, 55, 110, 24, 58],
+        "type": "column"
+      }, {
+        "name": "柱2",
+        "data": [50, 20, 75, 60, 34, 38],
+        "type": "column"
+      }, {
+        "name": "曲线",
+        "data": [70, 50, 85, 130, 64, 88],
+        "type": "line",
+        "style": "curve",
+        "color": "#1890ff",
+        "disableLegend": true
+      }, {
+        "name": "折线",
+        "data": [120, 140, 105, 170, 95, 160],
+        "type": "line",
+        "color": "#2fc25b"
+      }, {
+        "name": "点",
+        "data": [100, 80, 125, 150, 112, 132],
+        "type": "point",
+        "color": "#f04864"
+      }]
+    },
+    "LineA": {
+      "categories": ["04/21", "04/22", "04/23", "04/24", "04/25", "04/26", "04/27"],
+      "series": [{
+        "name": "成交量A",
+        "data": [35, 8, 25, 37, 4, 20,40]
+      }, {
+        "name": "成交量B",
+        "data": [70, 40, 65, 100, 44, 68,50]
+      }, {
+        "name": "成交量C",
+        "data": [100, 80, 95, 150, 112, 132,120]
+      }]
+    },
+    "LineB": {
+      "categories": ["2012", "2013", "2014", "2015", "2016", "2017"],
+      "series": [{
+        "name": "成交量A",
+        "data": [35, 20, 25, 37, 4, 20]
+      }, {
+        "name": "成交量B",
+        "data": [70, 40, 65, 100, 44, 68]
+      }, {
+        "name": "成交量C",
+        "data": [100, 80, 95, 150, 112, 132]
+      }]
+    },
+    "Area": {
+      "categories": ["2012", "2013", "2014", "2015", "2016", "2017"],
+      "series": [{
+        "name": "成交量A",
+        "data": [100, 80, 95, 150, 112, 132],
+        "color": "#facc14"
+      }, {
+        "name": "成交量B",
+        "data": [70, 40, 65, 100, 44, 68],
+        "color": "#2fc25b"
+      }, {
+        "name": "成交量C",
+        "data": [35, 20, 25, 37, 4, 20],
+        "color": "#1890ff"
+      }]
+    },
+    "Pie": {
+      "series": [{
+        "name": "一班",
+        "data": 50
+      }, {
+        "name": "二班",
+        "data": 30
+      }, {
+        "name": "三班",
+        "data": 20
+      }, {
+        "name": "四班",
+        "data": 18
+      }, {
+        "name": "五班",
+        "data": 8
+      }]
+    },
+    "Ring": {
+      "series": [{
+        "name": "一班",
+        "data": 50
+      }, {
+        "name": "二班",
+        "data": 30
+      }, {
+        "name": "三班",
+        "data": 20
+      }, {
+        "name": "四班",
+        "data": 18
+      }, {
+        "name": "五班",
+        "data": 8
+      }]
+    },
+    "Radar": {
+      "categories": ["维度1", "维度2", "维度3", "维度4", "维度5", "维度6"],
+      "series": [{
+        "name": "成交量1",
+        "data": [90, 110, 165, 195, 187, 172]
+      }, {
+        "name": "成交量2",
+        "data": [190, 210, 105, 35, 27, 102]
+      }]
+    },
+    "Arcbar1": {
+      "series": [{
+        "name": "正确率",
+        "data": 0.29,
+        "color": "#2fc25b"
+      }]
+    },
+    "Arcbar2": {
+      "series": [{
+        "name": "错误率",
+        "data": 0.65,
+        "color": "#f04864"
+      }]
+    },
+    "Arcbar3": {
+      "series": [{
+        "name": "完成率",
+        "data": 0.85,
+        "color": "#1890ff"
+      }]
+    },
+    "Gauge": {
+      "categories": [{
+        "value": 0.2,
+        "color": "#1890ff"
+      }, {
+        "value": 0.8,
+        "color": "#2fc25b"
+      }, {
+        "value": 1,
+        "color": "#f04864"
+      }],
+      "series": [{
+        "name": "完成率",
+        "data": 0.66
+      }]
+    },
+    "Candle": {
+      "categories": [
+        "2013/1/24", "2013/1/25", "2013/1/28", "2013/1/29", "2013/1/30",
+        "2013/1/31", "2013/2/1", "2013/2/4", "2013/2/5", "2013/2/6",
+        "2013/2/7", "2013/2/8", "2013/2/18", "2013/2/19", "2013/2/20",
+        "2013/2/21", "2013/2/22", "2013/2/25", "2013/2/26", "2013/2/27",
+        "2013/2/28", "2013/3/1", "2013/3/4", "2013/3/5", "2013/3/6",
+        "2013/3/7", "2013/3/8", "2013/3/11", "2013/3/12", "2013/3/13",
+        "2013/3/14", "2013/3/15", "2013/3/18", "2013/3/19", "2013/3/20",
+        "2013/3/21", "2013/3/22", "2013/3/25", "2013/3/26", "2013/3/27",
+        "2013/3/28", "2013/3/29", "2013/4/1", "2013/4/2", "2013/4/3",
+        "2013/4/8", "2013/4/9", "2013/4/10", "2013/4/11", "2013/4/12",
+        "2013/4/15", "2013/4/16", "2013/4/17", "2013/4/18", "2013/4/19",
+        "2013/4/22", "2013/4/23", "2013/4/24", "2013/4/25", "2013/4/26",
+        "2013/5/2", "2013/5/3", "2013/5/6", "2013/5/7", "2013/5/8",
+        "2013/5/9", "2013/5/10", "2013/5/13", "2013/5/14", "2013/5/15",
+        "2013/5/16", "2013/5/17", "2013/5/20", "2013/5/21", "2013/5/22",
+        "2013/5/23", "2013/5/24", "2013/5/27", "2013/5/28", "2013/5/29",
+        "2013/5/30", "2013/5/31", "2013/6/3", "2013/6/4", "2013/6/5",
+        "2013/6/6", "2013/6/7", "2013/6/13"
+      ],
+      "series": [{
+        "name": "上证指数",
+        "data": [ 
+          [2320.26, 2302.6, 2287.3, 2362.94],
+          [2300, 2291.3, 2288.26, 2308.38],
+          [2295.35, 2346.5, 2295.35, 2346.92],
+          [2347.22, 2358.98, 2337.35, 2363.8],
+          [2360.75, 2382.48, 2347.89, 2383.76],
+          [2383.43, 2385.42, 2371.23, 2391.82],
+          [2377.41, 2419.02, 2369.57, 2421.15],
+          [2425.92, 2428.15, 2417.58, 2440.38],
+          [2411, 2433.13, 2403.3, 2437.42],
+          [2432.68, 2434.48, 2427.7, 2441.73],
+          [2430.69, 2418.53, 2394.22, 2433.89],
+          [2416.62, 2432.4, 2414.4, 2443.03],
+          [2441.91, 2421.56, 2415.43, 2444.8],
+          [2420.26, 2382.91, 2373.53, 2427.07],
+          [2383.49, 2397.18, 2370.61, 2397.94],
+          [2378.82, 2325.95, 2309.17, 2378.82],
+          [2322.94, 2314.16, 2308.76, 2330.88],
+          [2320.62, 2325.82, 2315.01, 2338.78],
+          [2313.74, 2293.34, 2289.89, 2340.71],
+          [2297.77, 2313.22, 2292.03, 2324.63],
+          [2322.32, 2365.59, 2308.92, 2366.16],
+          [2364.54, 2359.51, 2330.86, 2369.65],
+          [2332.08, 2273.4, 2259.25, 2333.54],
+          [2274.81, 2326.31, 2270.1, 2328.14],
+          [2333.61, 2347.18, 2321.6, 2351.44],
+          [2340.44, 2324.29, 2304.27, 2352.02],
+          [2326.42, 2318.61, 2314.59, 2333.67],
+          [2314.68, 2310.59, 2296.58, 2320.96],
+          [2309.16, 2286.6, 2264.83, 2333.29],
+          [2282.17, 2263.97, 2253.25, 2286.33],
+          [2255.77, 2270.28, 2253.31, 2276.22],
+          [2269.31, 2278.4, 2250, 2312.08],
+          [2267.29, 2240.02, 2239.21, 2276.05],
+          [2244.26, 2257.43, 2232.02, 2261.31],
+          [2257.74, 2317.37, 2257.42, 2317.86],
+          [2318.21, 2324.24, 2311.6, 2330.81],
+          [2321.4, 2328.28, 2314.97, 2332],
+          [2334.74, 2326.72, 2319.91, 2344.89],
+          [2318.58, 2297.67, 2281.12, 2319.99],
+          [2299.38, 2301.26, 2289, 2323.48],
+          [2273.55, 2236.3, 2232.91, 2273.55],
+          [2238.49, 2236.62, 2228.81, 2246.87],
+          [2229.46, 2234.4, 2227.31, 2243.95],
+          [2234.9, 2227.74, 2220.44, 2253.42],
+          [2232.69, 2225.29, 2217.25, 2241.34],
+          [2196.24, 2211.59, 2180.67, 2212.59],
+          [2215.47, 2225.77, 2215.47, 2234.73],
+          [2224.93, 2226.13, 2212.56, 2233.04],
+          [2236.98, 2219.55, 2217.26, 2242.48],
+          [2218.09, 2206.78, 2204.44, 2226.26],
+          [2199.91, 2181.94, 2177.39, 2204.99],
+          [2169.63, 2194.85, 2165.78, 2196.43],
+          [2195.03, 2193.8, 2178.47, 2197.51],
+          [2181.82, 2197.6, 2175.44, 2206.03],
+          [2201.12, 2244.64, 2200.58, 2250.11],
+          [2236.4, 2242.17, 2232.26, 2245.12],
+          [2242.62, 2184.54, 2182.81, 2242.62],
+          [2187.35, 2218.32, 2184.11, 2226.12],
+          [2213.19, 2199.31, 2191.85, 2224.63],
+          [2203.89, 2177.91, 2173.86, 2210.58],
+          [2170.78, 2174.12, 2161.14, 2179.65],
+          [2179.05, 2205.5, 2179.05, 2222.81],
+          [2212.5, 2231.17, 2212.5, 2236.07],
+          [2227.86, 2235.57, 2219.44, 2240.26],
+          [2242.39, 2246.3, 2235.42, 2255.21],
+          [2246.96, 2232.97, 2221.38, 2247.86],
+          [2228.82, 2246.83, 2225.81, 2247.67],
+          [2247.68, 2241.92, 2231.36, 2250.85],
+          [2238.9, 2217.01, 2205.87, 2239.93],
+          [2217.09, 2224.8, 2213.58, 2225.19],
+          [2221.34, 2251.81, 2210.77, 2252.87],
+          [2249.81, 2282.87, 2248.41, 2288.09],
+          [2286.33, 2299.99, 2281.9, 2309.39],
+          [2297.11, 2305.11, 2290.12, 2305.3],
+          [2303.75, 2302.4, 2292.43, 2314.18],
+          [2293.81, 2275.67, 2274.1, 2304.95],
+          [2281.45, 2288.53, 2270.25, 2292.59],
+          [2286.66, 2293.08, 2283.94, 2301.7],
+          [2293.4, 2321.32, 2281.47, 2322.1],
+          [2323.54, 2324.02, 2321.17, 2334.33],
+          [2316.25, 2317.75, 2310.49, 2325.72],
+          [2320.74, 2300.59, 2299.37, 2325.53],
+          [2300.21, 2299.25, 2294.11, 2313.43],
+          [2297.1, 2272.42, 2264.76, 2297.1],
+          [2270.71, 2270.93, 2260.87, 2276.86],
+          [2264.43, 2242.11, 2240.07, 2266.69],
+          [2242.26, 2210.9, 2205.07, 2250.63],
+          [2190.1, 2148.35, 2126.22, 2190.1]
+        ]
+      }]
+    },
+
+    "CandleColumn": {
+      "categories": [
+        "2013/1/24", "2013/1/25", "2013/1/28", "2013/1/29", "2013/1/30",
+        "2013/1/31", "2013/2/1", "2013/2/4", "2013/2/5", "2013/2/6",
+        "2013/2/7", "2013/2/8", "2013/2/18", "2013/2/19", "2013/2/20",
+        "2013/2/21", "2013/2/22", "2013/2/25", "2013/2/26", "2013/2/27",
+        "2013/2/28", "2013/3/1", "2013/3/4", "2013/3/5", "2013/3/6",
+        "2013/3/7", "2013/3/8", "2013/3/11", "2013/3/12", "2013/3/13",
+        "2013/3/14", "2013/3/15", "2013/3/18", "2013/3/19", "2013/3/20",
+        "2013/3/21", "2013/3/22", "2013/3/25", "2013/3/26", "2013/3/27",
+        "2013/3/28", "2013/3/29", "2013/4/1", "2013/4/2", "2013/4/3",
+        "2013/4/8", "2013/4/9", "2013/4/10", "2013/4/11", "2013/4/12",
+        "2013/4/15", "2013/4/16", "2013/4/17", "2013/4/18", "2013/4/19",
+        "2013/4/22", "2013/4/23", "2013/4/24", "2013/4/25", "2013/4/26",
+        "2013/5/2", "2013/5/3", "2013/5/6", "2013/5/7", "2013/5/8",
+        "2013/5/9", "2013/5/10", "2013/5/13", "2013/5/14", "2013/5/15",
+        "2013/5/16", "2013/5/17", "2013/5/20", "2013/5/21", "2013/5/22",
+        "2013/5/23", "2013/5/24", "2013/5/27", "2013/5/28", "2013/5/29",
+        "2013/5/30", "2013/5/31", "2013/6/3", "2013/6/4", "2013/6/5",
+        "2013/6/6", "2013/6/7", "2013/6/13"
+      ],
+      "series": [{
+        "name": "成交量1",
+        "data": [15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20,
+          45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20,
+          45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20,
+          45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20,
+          45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45
+        ]
+      }]
+    },
+    "tips": "【开源不易、改造不易、哪(拿)来简单】uCharts将始终坚持开源，为您提供最便捷的高性能图表工具！"
+  }
+}

components/detail/Detail.vue

@@ -1,95 +1,136 @@
 <template>
-	<view class="content">
-		<view class="top">
-			<view class="threeLine" @tap="openDrawer">
-				<image src="../../static/picture/fourLine.png" style="width: 30px;height: 30px;margin-top: 10px;margin-left: 10px;"></image>
+	<view class="contentike">
+		<view class="fixed" style="color: #FFFDEF;">
+			<cu-custom bgColor="bg-gradual-black" :isBack="true">
+				<block slot="backText">
+					<view style="height: 80rpx;line-height: 80rpx; color: #FFFDEF;" @tap="goToIndex()">返回</view>
+					<view class="addressName">{{address}}</view>
+				</block>
+				
+			</cu-custom>
+		</view>
+		<view class="threeTarget">
+			<view class="target">
+				<view class="target_zi">指标</view>
+				<view class="target_dianLiang">日发电量</view>
 			</view>
-			<view class="text">
-				<view class="notice">
-					<view class="icon cuIcon-notice text-white" v-if="badge != 0">
-						<view class="cu-tag looknumber">
-							<block v-if="badge != 1">{{ badge > 99 ? '99+' : badge }}</block>
-						</view>
-					</view>
-				</view>
-				宁夏新能源公司
+			<view class="target">
+				<view style="font-size: 16px;margin-top: -7px;">数值</view>
+				<view class="target_count">40</view>
 			</view>
-			<view class="plus">+</view>
-		</view>
-		<!-- 抽屉组件 -->
-		<div>
-			<drawer ref="drawer"></drawer>
-		</div>
-		<view class="cu-card case">
-			<view class="cu-list menu-avatar">
-				<view class="operationBar">
-					<view class="operationBarTextLeft">盘面异动</view>
-					<view class="operationBarTextRight">更多 ></view>
-				</view>
-				<view class="qiun-columns">
-					<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-						<view class="qiun-title-dot-light">基本区域图</view>
-					</view>
-					<view class="qiun-charts">
-						<canvas canvas-id="canvasArea" id="canvasArea" class="charts" @touchstart="touchArea"></canvas>
-					</view>
-				</view>
+			<view class="target">
+				<view style="font-size: 16px;margin-top: -7px;">单位</view>
+				<view class="target_danWei">kw/h</view>
 			</view>
 		</view>
+
+		<view class="qiun-charts">
+			<view class="speedPowerDiagram">24小时指标曲线图</view>
+			<canvas canvas-id="canvasLineA" id="canvasLineA" class="charts" @touchstart="touchLineA"></canvas>
+		</view>
+
+
+		<view class="qiun-columnCharts">
+			<view class="sevenDayColunm">7天指标柱状图</view>
+			<canvas canvas-id="canvasColumn" id="canvasColumn" class="charts" @touchstart="touchColumn"></canvas>
+		</view>
 	</view>
 </template>
-</template>
 
 <script>
 	import uCharts from '../../components/tools/u-charts/u-charts.js';
+	import res from '../../common/data.json';
 	var _self;
-	var canvaArea = null;
-	import drawer from '../../components/drawer/threeLineDrawer.vue';
+	var canvaLineA;
+	var canvaColumn = null;
 	export default {
-		components: {
-			"drawer": drawer
-		},
-		data: function() {
-			return {
-				badge: 22,
-				drawerList: ["状态监视", "矩阵监视", "风场监视", "人员监视"],
-				inconList: ["form", "favor", "question", "edit"],
+		data() {
+			let data = {
 				cWidth: '',
 				cHeight: '',
 				pixelRatio: 1,
+				serverData: '',
+				address:'',
 
 			}
+
+
+			return data;
 		},
-		
+created: function() {
+			this.address = this.getWindPowerStationNameToSessionStorage();
+			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
+		},
+		onShow() {
+			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
+			this.address = this.getWindPowerStationNameToSessionStorage();
+			// this.hideModals();
+		},
+		onLoad() {
+			_self = this;
+			this.cWidth = uni.upx2px(750);
+			this.cHeight = uni.upx2px(400);
+			this.getColumnServerData();
+			this.getLineServerData();
+		},
+
+		onReady() {
+
+		},
+
 		methods: {
-			openDrawer: function() {
-				this.$refs.drawer.openDrawer(250, this.drawerList, this.inconList);
-			},
-			closeDrawer: function() {
-				this.drawerIsShow = false;
-			},
-			getServerData() {
-				let chartData = {
-					categories: ['2012', '2013', '2014', '2015', '2016', '2017'],
+			pushWindPowerStationNameToSessionStorage(windpowerstationName) {
+							uni.setStorageSync('windpowerstationName', windpowerstationName);
+							//sessionStorage.setItem('windpowerstationName', windpowerstationName);
+							//alert("v"+ sessionStorage.getItem("windpowerstationName"));
+							//this.common.goback('/pages/index/Index');
+						},
+						getWindPowerStationNameToSessionStorage() {
+							uni.getStorageSync('windpowerstationName');
+							return uni.getStorageSync('windpowerstationName');
+						},
+			getLineServerData() {
+				// 折线图
+				let LineA = {
+					categories: ['          17:26', '18:56', '19:56', '20:56', '21:56', '22:56', '23:56',
+						'00:56', '01:56', '02:56', '03:56', '04:56', '05:56', '06:56', '07:56', '08:56',
+						'09:56',
+						'10:56', '11:56', '12:56', '13:56', '14:56', '15:56', '16:56', '17:56            '
+					],
 					series: [{
-						name: '成交量A',
-						data: [100, 80, 95, 150, 112, 132],
-						color: '#B9D1EC'
-					}]
+						name: '功率',
+						data: [17, 21, 19, 22, 20.2, 19.1, 22.4, 23.8, 21.5, 22.9, 19.2, 22.4, 18.7, 22.1, 21.4, 22.7, 18.4, 18.4,
+							21.8, 22.5, 22.9, 19.8, 22.7,
+							23, 22.8
+						],
+						color: '#4A80B1',
+						textColor: '#FFFFFF',
+						textSize: this.seriesTextSize,
+						format: (val) => {
+							return val + "kwh"
+						},
+						index: 0,
+						legendShape: "circle",
+
+					}, ]
 				};
-				// chartData.categories=[];
-				// chartData.series[0].data=[];																		
-				this.showArea("canvasArea",chartData);	
+				this.showLineA("canvasLineA", LineA);
 			},
-			showArea(canvasId, chartData) {
-				canvaArea = new uCharts({
+			showLineA(canvasId, chartData) {
+				canvaLineA = new uCharts({
 					$this: _self,
 					canvasId: canvasId,
-					type: 'area',
+					type: 'line',
 					fontSize: 11,
-					legend: true,
+					legend: {
+						show: true,
+						position: "top",
+						float: "right",
+						fontColor: "silver",
+						itemGap: "4",
+					},
 					dataLabel: false,
-					dataPointShape: true,
+					dataPointShape: false,
 					background: '#FFFFFF',
 					pixelRatio: _self.pixelRatio,
 					categories: chartData.categories,
@@ -97,123 +138,289 @@
 					animation: true,
 					xAxis: {
 						type: 'grid',
-						gridColor: '#CCCCCC',
-						gridType: 'dash',
+						gridColor: 'silver',
+						fontColor: 'silver',
+						gridType: 'solid',
+						gridColor: '#2E2E2E',
+						axisLineColor: "#2E2E2E",
+						labelCount: "3",
+						// itemCount:"3"
+					},
+					yAxis: {
+						data: [{
+								type: "value",
+								fontColor: 'silver',
+								disabled: false, //y轴轴线
+								min: 0,
+								max: 40,
+								position: "left",
+								axisLineColor: "#2E2E2E",
+								title: "         功率:(kw/h)",
+								titleFontColor: "silver"
+							},
+							{
+								fontColor: "silver",
+								disabled: false, //y轴轴线 
+								min: 0,
+								max: 40,
+								position: "right",
+								axisLineColor: "#2E2E2E",
+								title: "功率:(kwh)",
+								titleFontColor: "silver"
+							}
+						],
+
+						gridColor: "#2E2E2E",
+						splitNumber: 4,
+						gridType: 'solid',
 						dashLength: 8,
-						axisLine:true,//x轴轴线
+						showTitle: "true",
+						format: (val) => {
+							return val.toFixed(0) + '元'
+						},
+
+					},
+					width: _self.cWidth * _self.pixelRatio,
+					height: _self.cHeight * _self.pixelRatio,
+					extra: {
+						line: {
+							type: 'line',
+							width: '1',
+						}
+					}
+				});
+
+			},
+			touchLineA(e) {
+				canvaLineA.showToolTip(e, {
+					format: function(item, category) {
+						return category + ' ' + item.name + ':' + item.data
+					}
+				});
+			},
+			moveLineA(e) {
+				canvaLineA.scroll(e);
+			},
+			getColumnServerData() {
+				res.data.data = res.data;
+				let Column = {
+					categories: [],
+					series: []
+				};
+				//这里我后台返回的是数组，所以用等于，如果您后台返回的是单条数据，需要push进去
+				Column.categories = res.data.data.ColumnB.categories;
+				Column.series = res.data.data.ColumnB.series;
+				_self.textarea = JSON.stringify(res.data.data.ColumnB);
+				_self.showColumn("canvasColumn", Column);
+			},
+			showColumn(canvasId, chartData) {
+				canvaColumn = new uCharts({
+					$this: _self,
+					canvasId: canvasId,
+					type: 'column',
+					legend: {
+						show: true,
+						fontSize: 12,
+						padding: 5,
+						fontColor: "silver",
+						itemGap: "4",
+						// margin:0,
+						position: "top",
+						float: "right"
+					},
+					fontSize: 11,
+					background: '#242424',
+					pixelRatio: _self.pixelRatio,
+					animation: true,
+					categories: chartData.categories,
+					series: chartData.series,
+
+					xAxis: {
+						// disabled:true,
+						rotateLabel: true,
+						disableGrid: true,
+						axisLineColor: '#2D2D2D',
+						fontColor: "#ffffff",
+						// gridColor:'#2D2D2D',
 					},
 					yAxis: {
-						gridType: 'dash',
-						gridColor: '#CCCCCC',
+						showTitle: true,
+						// disableGrid:true,
+						gridType: 'solid',
 						dashLength: 8,
+						gridColor: '#2D2D2D',
 						splitNumber: 5,
-						min: 10,
-						max: 180,
+						min: 0,
+						max: 40,
+						data: [{
+							min: 0,
+							max: 40,
+							position: 'left',
+							axisLine: false,
+							fontColor: "silver",
+							// title: '7天功率柱状图',
+							title: "          功率:(kw/h)",
+							titleFontColor: "silver",
+							// title: '功率(kw/h)',
+							// titleFontColor: '#FFFFFF',
+							titleFontSize: 11,
+							format: (val) => {
+								return val.toFixed(0) + ''
+							},
+						}]
 					},
+					dataLabel: true,
 					width: _self.cWidth * _self.pixelRatio,
 					height: _self.cHeight * _self.pixelRatio,
 					extra: {
-						area: {
-							type: 'straight',
-							opacity: 0.2,
-							addLine: true,
-							width: 2
+						column: {
+							type: 'group',
+							// width: _self.cWidth * _self.pixelRatio * 0.45 / chartData.categories.length
+							width: 12,
+							lineStyle: {
+								width: 5,
+							}
 						}
 					}
 				});
+
+			},
+			goToIndex(){
+				uni.switchTab({
+				     url: '/pages/index/Index'
+				    });
 			},
-			touchArea(e) {
-							canvaArea.showToolTip(e, {
-								format: function (item, category) {
-									return category + ' ' + item.name + ':' + item.data 
-								}
-							});
+			touchColumn(e) {
+				canvaColumn.showToolTip(e, {
+					format: function(item, category) {
+						if (typeof item.data === 'object') {
+							return category + ' ' + item.name + ':' + item.data.value
+						} else {
+							return category + ' ' + item.name + ':' + item.data
 						}
-		},
-		onLoad() {
-			_self = this;
-			this.cWidth = uni.upx2px(750);
-			this.cHeight = uni.upx2px(500);
-			this.getServerData();
+					}
+				});
+			},
 		}
 	}
 </script>
-
 <style>
 	page {
-		/* background: -webkit-gradient(linear, 0% 100%, 0% 0%, from(#2F698E), color-stop(0.15, #5C757C), to(#004C90)); */
-		/* background-color: #108ADA; */
+		background-color: #1F1F1F;
+		font-family:'方正兰亭细黑_GBK';
 	}
 
-	.top {
-		width: 100%;
-		height: 105upx;
-		padding-top: 5upx;
-		background-color: #3D6C8A;
+	body {
+		background: #000;
+		font-family:'方正兰亭细黑_GBK';
+		font-size: 14px;
+		color: silver;
+	}
+@font-face {
+	font-family:'方正兰亭细黑_GBK';
+	src: url(../../static/方正兰亭细黑_GBK.TTF);
+}
+	.addressName {
+		/* width: 100%; */
+		/* background-color: white; */
+		height: 80rpx;
+		line-height: 80rpx;
+		margin-left: 100px;
+		color: #FFFDEF;
 	}
 
-	.threeLine {
-		width: 50px;
-		height: 50px;
-		float: left;
+	.target_dianLiang {
+		margin-top: 15px;
+		font-size: 16px;
+		font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", STHeiti, "Microsoft Yahei", Tahoma, Simsun, sans-serif;
 	}
 
-	.text {
-		width: calc(100% - 100px);
-		height: 50px;
-		float: left;
-		color: white;
-		line-height: 50px;
-		text-align: center;
-		font-size: 18px;
+	.target_count {
+		margin-top: 15px;
+		font-size: 16px;
+		font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", STHeiti, "Microsoft Yahei", Tahoma, Simsun, sans-serif;
 	}
 
-	.notice {
-		width: 50px;
-		height: 50px;
+	.target_danWei {
+		margin-top: 15px;
+		font-size: 16px;
+		font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", STHeiti, "Microsoft Yahei", Tahoma, Simsun, sans-serif;
+
+	}
+
+	.threeTarget {
+		width: 100%;
+		height: 120px;
+		background-color: #242424;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-around;
 		float: left;
 	}
 
-	.plus {
-		width: 50px;
-		height: 50px;
-		float: right;
-		color: white;
-		font-size: 35px;
-		line-height: 50px;
+	.target {
+		width: 28%;
+		height: 78px;
+		background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1)0%, rgba(193, 94, 21, 0.2)100%);
+		border-radius: 5px;
+		float: left;
+		margin-top: 20px;
 		text-align: center;
+		color: silver;
+		padding-top: 20px;
+		font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", STHeiti, "Microsoft Yahei", Tahoma, Simsun, sans-serif;
 	}
 
-	.operationBar {
-		width: 100%;
-		height: 50px;
-		background-color: white;
-
+	.target_zi {
+		font-size: 16px;
+		text-align: center;
+		margin-top: -7px;
 	}
 
-	.operationBarTextLeft {
-		margin-left: 20px;
-		line-height: 50px;
-		font-size: 15px;
+	.speedPowerDiagram {
+		width: 100px;
+		height: 30px;
+		user-select: text;
+		-webkit-user-select: text;
+		-moz-user-select: text;
+		-ms-user-select: text;
+		color: silver;
 		float: left;
+		margin-top: 18px;
+		margin-left: 9px;
+		font-size: 11px;
 	}
 
-	.operationBarTextRight {
-		margin-right: 20px;
-		line-height: 50px;
-		font-size: 12px;
-		float: right;
-		color: #AAAAAA;
-	}
 	.qiun-charts {
-			width: 750upx;
-			height: 500upx;
-			background-color: #FFFFFF;
+		width: 750upx;
+		height: 400upx;
+		margin-top: 140px;
+		background-color: #242424;
 	}
-		
+
 	.charts {
-			width: 750upx;
-			height: 500upx;
-			background-color: #FFFFFF;
+		width: 750upx;
+		height: 400upx;
+	}
+
+	.qiun-columnCharts {
+		width: 750upx;
+		height: 400upx;
+		margin-top: 20px;
+		background-color: #242424;
+	}
+
+	.sevenDayColunm {
+		width: 100px;
+		height: 30px;
+		user-select: text;
+		-webkit-user-select: text;
+		-moz-user-select: text;
+		-ms-user-select: text;
+		color: silver;
+		float: left;
+		margin-top: 18px;
+		margin-left: 10px;
+		font-size: 11px;
 	}
 </style>

components/drawer/plusDrawer.vue

@@ -0,0 +1,188 @@
+<template>
+	<view>
+		<!-- <scroll-view scroll-y class="DrawerPage" :class="modalName=='viewModal'?'show':''" >
+		</scroll-view> -->
+		<view class="DrawerClose" :class="modalName=='viewModal'?'show':''" @tap="hideModal">
+			<text class="cuIcon-pullright"></text>
+		</view>
+		<scroll-view scroll-y class="DrawerWindow" :class="modalName=='viewModal'?'show':''" @tap="showModal" data-target="viewModal"
+		 :style="{'margin-top':marginright}">
+			<view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg" >
+				<view class="cu-item arrow" v-for="(item,index) in plusDrawerList" :key="index" @tap="pushWindPowerStationNameToSessionStorage(item.name,item.windPowerStationId);" style=" background-color: #272727; border-bottom: 1rpx solid #1F1F1F;">
+					<view class="content">
+						<!-- <text class="cuIcon-github text-grey"></text> -->
+						<text class="text-grey">{{item.name}}</text>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				modalName: null,
+				plusDrawerList: [],
+				width: '',
+				windPowerStationId: '',
+				listWidth: '',
+				marginright: ''
+			};
+		},
+		onLoad() {
+			this.windpowerstationIds = JSON.parse(uni.getStorageSync('windpowerstationNames'));
+			uni.showLoading({
+				title: '加载中...',
+				mask: true,
+			});
+		},
+		onReady() {
+			uni.hideLoading();
+		},
+		onShow() {
+			this.hideModal();
+		},
+		created: function() {
+			// this.listWidth="352px";
+			// this.marginright="-20px";
+		},
+		methods: {
+			showModal(plusDrawerList, modalName) {
+				this.plusDrawerList = plusDrawerList;
+				this.modalName = modalName;
+			},
+			hideModal(modalName) {
+				this.modalName = null;
+			},
+			// tabSelect(e) {
+			// 	this.TabCur = e.currentTarget.dataset.id;
+			// 	this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
+			// },
+			pushWindPowerStationNameToSessionStorage(windpowerstationName, windPowerStationId) {
+				uni.setStorageSync('windpowerstationName', windpowerstationName);
+				uni.setStorageSync('windPowerStationId', windPowerStationId);
+				this.common.goback('/pages/index/Index');
+			},
+			getWindPowerStationNamesToSessionStorage() {
+				uni.getStorageSync('windpowerstationNames');
+				console.log(uni.getStorageSync('windpowerstationNames'));
+				return uni.getStorageSync('windpowerstationNames');
+			},
+		},
+	}
+</script>
+
+<style>
+	page {
+		background-image: var(--gradualBlue);
+		width: 100vw;
+		overflow: hidden;
+	}
+
+	.DrawerPage {
+		position: fixed;
+		width: 100vw;
+		height: 100vh;
+		left: 0vw;
+		background-color: #242424;
+		transition: all 0.4s;
+	}
+
+	.DrawerPage.show {
+		transform: scale(0.9, 0.9);
+		left: 85vw;
+		box-shadow: 0 0 60upx rgba(0, 0, 0, 0.2);
+		transform-origin: 0;
+		background-color: #242424;
+	}
+
+	.DrawerWindow {
+		position: absolute;
+		width: 85vw;
+		height: 100vh;
+		left: 0;
+		top: 0;
+		transform: scale(0.9, 0.9) translateX(-100%);
+		opacity: 0;
+		pointer-events: none;
+		transition: all 0.4s;
+		padding: 100upx 0;
+		background-color: #242424;
+	}
+
+	.DrawerWindow.show {
+		transform: scale(1, 1) translateX(0%);
+		opacity: 1;
+		pointer-events: all;
+		background-color: #242424;
+	}
+
+	.DrawerClose {
+		position: absolute;
+		width: 40vw;
+		height: 100vh;
+		right: 0;
+		top: 0;
+		color: transparent;
+		padding-bottom: 30upx;
+		display: flex;
+		align-items: flex-end;
+		justify-content: center;
+		background-image: linear-gradient(90deg, rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.6));
+		letter-spacing: 5px;
+		font-size: 50upx;
+		opacity: 0;
+		pointer-events: none;
+		transition: all 0.4s;
+		background-color: #242424;
+	}
+
+	.DrawerClose.show {
+		opacity: 1;
+		pointer-events: all;
+		width: 15vw;
+		color: #fff;
+		background-color: #242424;
+	}
+
+	.DrawerPage .cu-bar.tabbar .action button.cuIcon {
+		width: 64upx;
+		height: 64upx;
+		line-height: 64upx;
+		margin: 0;
+		display: inline-block;
+		background-color: #242424;
+	}
+
+	.DrawerPage .cu-bar.tabbar .action .cu-avatar {
+		margin: 0;
+	}
+
+	.DrawerPage .nav {
+		flex: 1;
+	}
+
+	.DrawerPage .nav .cu-item.cur {
+		border-bottom: 0;
+		position: relative;
+	}
+
+	.DrawerPage .nav .cu-item.cur::after {
+		content: "";
+		width: 10upx;
+		height: 10upx;
+		background-color: currentColor;
+		position: absolute;
+		bottom: 10upx;
+		border-radius: 10upx;
+		left: 0;
+		right: 0;
+		margin: auto;
+	}
+
+	.DrawerPage .cu-bar.tabbar .action {
+		flex: initial;
+	}
+</style>

components/login/Login.vue

@@ -13,6 +13,7 @@
 			</view>
 			<view class="type" :style="{ 'margin-top': typeMarginTop }">
 				<a @tap="changeType('phone')">手机验证码登录</a>
+				<a style="float: right;color:#77A8E6;" @tap="goToIndex()">游客身份登录</a>
 			</view>
 			<button class="cu-btn bg-red lg" @tap="falseLogin" :disabled="usernameLoginDisabled" type="" :style="{ 'height': buttonHeight}">登录</button>
 			<view class="bottomWord" :style="{ 'font-size': bottomWordFontSize,'margin-top':bottomWordMarginTop}">
@@ -167,8 +168,29 @@ export default {
 				this.accountIsShow=false;
 			}
 		},
+		goToIndex:function(){
+			let _this = this;
+			uni.request({
+				url: 'http://49.4.78.143:8057/GyeeuserController/login?username='+'admin'+'&password='+'admin',
+				data: {},
+				method: 'GET',
+				success: function(res) {
+					console.log(res.data);
+					if (res.data.code == 200) {
+						_this.loginFalg = true;
+					} 
+				},
+				fail: () => {
+					_this.tips = '网络错误，小程序端请检查合法域名';
+				}
+			});
+			uni.switchTab({
+			     url: '/pages/index/Index'
+			    });
+				console.log(this.username)
+		},
 		falseLogin: function() {
-			if (this.username == 'abc' && this.password == '123') {
+			if (this.username == 'admin' && this.password == 'admin') {
 				this.setUsernamePassword();
 				uni.switchTab({
 					url: '/pages/index/Index'

pages.json

@@ -1,6 +1,12 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages	
 		{
+				 "path":"components/login/Login",
+				 "style":{
+					 "navigationBarTitleText": "sis登录页面"
+				 }
+		},
+		{
 			"path": "pages/index/Index",
 			"style": {
 				"navigationBarTitleText": "监视"

pages/index/Index.vue

@@ -12,20 +12,24 @@
 						</view>
 					</view>
 				</view>
-				宁夏新能源公司
+				{{address}}
 			</view>
-			<view class="plus">+</view>
+			<view class="plus" @tap="showModal" data-target="viewModal">+</view>
 		</view>
 		<!-- 抽屉组件 -->
 		<div>
 			<drawer ref="drawer"></drawer>
 		</div>
+		<div class="plusDrawer" @tap="hideModal">
+			<plusDrawer ref="plusDrawer"></plusDrawer>
+		</div>
+		<scroll-view scroll-y class="DrawerPage" :class="modalName=='viewModal'?'show':''">
 		<!--时间组件-->
 		<view class="time">
 			<view class="timeimageshizhong">
 				<image src="../../static/picture/dafeng.png" style="width: 20px;height: 20px;margin-left: 10px;"></image>
 			</view>
-			<view class="timeText">推荐时间：2020年4月15日ㅤ19:31</view>
+			<view class="timeText">推荐时间：2020年4月15日 19:31</view>
 			<view class="timeIcon">
 				<image src="../../static/picture/qingwhite.png" style="width: 25px;height: 25px;margin-left: 54px;"></image>
 			</view>
@@ -35,29 +39,29 @@
 			<view class="informationCardAll">
 				<view class="informationCardTextOne">
 					<view class="informationCardText">
-						<view class="textSilver">安全天数</view>
+						<view class="textSilver" @tap="common.navTo('/components/detail/Detail')">安全天数</view>
 						<view class="textWhite">(天)</view>
 						:15
 					</view>
 					<view class="informationCardTextzj">
-						<view class="textSilver">装机容量</view>
+						<view class="textSilver" @tap="common.navTo('/components/detail/Detail')">装机容量</view>
 						<view class="textWhite">(MV)</view>
 						:15
 					</view>
 				</view>
 				<view class="informationCardTextTwo">
 					<view class="informationCardText2">
-						<view class="textSilver">日发电量</view>
+						<view class="textSilver" @tap="common.navTo('/components/detail/Detail')">日发电量</view>
 						<view class="textWhite">(kwh)</view>
 						:150
 					</view>
 					<view class="informationCardText2">
-						<view class="textSilver">预测发电量</view>
+						<view class="textSilver" @tap="common.navTo('/components/detail/Detail')">预测发电量</view>
 						<view class="textWhite">(kwh)</view>
 						:15
 					</view>
 					<view class="informationCardText2">
-						<view class="textSilver">上网电量</view>
+						<view class="textSilver" @tap="common.navTo('/components/detail/Detail')">上网电量</view>
 						<view class="textWhite">(kwh)</view>
 						:15
 					</view>
@@ -66,7 +70,7 @@
 		</view>
 		<!--风速卡片-->
 		<view class="speedPower">
-			<view class="cardinstallredSpeed">
+			<view class="cardinstallredSpeed" @tap="common.navTo('/components/detail/Detail')">
 				<view class="cardinstalltitlegreen">
 					平均风速
 					<view class="textWhitekuangSpeed">(km/h)</view>
@@ -79,7 +83,7 @@
 					<view class="greenMaxText">max: 25</view>
 				</view>
 			</view>
-			<view class="cardinstallredSpeed">
+			<view class="cardinstallredSpeed" @tap="common.navTo('/components/detail/Detail')">
 				<view class="cardinstalltitlegreen">
 					预测风速
 					<view class="textWhitekuangSpeed">(km/h)</view>
@@ -92,7 +96,7 @@
 					<view class="greenMaxText">max: 26</view>
 				</view>
 			</view>
-			<view class="cardinstallredSpeed">
+			<view class="cardinstallredSpeed" @tap="common.navTo('/components/detail/Detail')">
 				<view class="cardinstalltitleRed">
 					实际功率
 					<view class="textWhitekuang">(kw)</view>
@@ -105,7 +109,7 @@
 					<view class="redMaxText">max: 656</view>
 				</view>
 			</view>
-			<view class="cardinstallredSpeed">
+			<view class="cardinstallredSpeed" @tap="common.navTo('/components/detail/Detail')">
 				<view class="cardinstalltitleRed">
 					理论功率
 					<view class="textWhitekuang">(kw)</view>
@@ -203,17 +207,17 @@
 		</view>
 		<scroll-view scroll-x class="horizontalSlider">
 			<view class="slide">
-				<view class="monthlyUtilizationHours">月利用小时（h）：13</view>
-				<view class="yearlyUtilizationHours">年利用小时（h）：13</view>
-				<view class="comprehensiveServicePowerConsumptionRate">综合厂用电率(%)：20</view>
-				<view class="equipmentAvailability">设备可利用率(%)：90</view>
-				<view class="sulfurDioxideEmissionReduction">减排二氧化硫(吨)：21</view>
-				<view class="carbonDioxideReduction">减排二氧化碳(吨)：5</view>
-				<view class="waterSaving">节约用水(吨)：15</view>
-				<view class="saveStandardCoal">节约标煤(吨)：35</view>
-				<view class="mttr">mttr(h)：22</view>
-				<view class="mtbf">mtbf(h)：24</view>
-			</view>
+							<view class="monthlyUtilizationHours" @tap="common.navTo('/components/detail/Detail')">月利用小时（h）：13</view>
+							<view class="yearlyUtilizationHours" @tap="common.navTo('/components/detail/Detail')">年利用小时（h）：13</view>
+							<view class="comprehensiveServicePowerConsumptionRate" @tap="common.navTo('/components/detail/Detail')">综合厂用电率(%)：20</view>
+							<view class="equipmentAvailability" @tap="common.navTo('/components/detail/Detail')">设备可利用率(%)：90</view>
+							<view class="sulfurDioxideEmissionReduction" @tap="common.navTo('/components/detail/Detail')">减排二氧化硫(吨)：21</view>
+							<view class="carbonDioxideReduction" @tap="common.navTo('/components/detail/Detail')">减排二氧化碳(吨)：5</view>
+							<view class="waterSaving" @tap="common.navTo('/components/detail/Detail')">节约用水(吨)：15</view>
+							<view class="saveStandardCoal" @tap="common.navTo('/components/detail/Detail')">节约标煤(吨)：35</view>
+							<view class="mttr" @tap="common.navTo('/components/detail/Detail')">mttr(h)：22</view>
+							<view class="mtbf" @tap="common.navTo('/components/detail/Detail')">mtbf(h)：24</view>
+						</view>
 		</scroll-view>
 		<!--折线图-->
 		<view class="lineChart">
@@ -650,10 +654,17 @@
 				</view>
 			</scroll-view>
 		</view>
+		</scroll-view>
+		
+		<view class="DrawerClose" :class="modalName=='viewModal'?'show':''" @tap="hideModal">
+			<text class="cuIcon-pullright"></text>
+		</view>
 	</view>
+	
 </template>
 
 <script>
+	import plusDrawer from '../../components/drawer/plusDrawer.vue'
 	import drawer from '../../components/drawer/threeLineDrawer.vue';
 	import uCharts from '../../components/tools/u-charts/u-charts.js';
 	var _self;
@@ -662,7 +673,8 @@
 	var canvaLineB = null;
 	export default {
 		components: {
-			drawer: drawer
+			drawer: drawer,
+			"plusDrawer": plusDrawer,
 		},
 		data: function() {
 			return {
@@ -683,6 +695,34 @@
 						"name": "人员监视"
 					},
 				],
+				plusDrawerList: [{
+						name: "宁夏新能源公司",
+						windPowerStationId: "NINGXIAXINNENGYUANGONGSI"
+					},
+					{
+						name: "牛首山风电场",
+						windPowerStationId: "NSS_FDC"
+					},
+					{
+						name: "香山风电场",
+						windPowerStationId: "XS_FDC"
+					},
+					{
+						name: "石板泉风电场",
+						windPowerStationId: "SBQ_FDC"
+					},
+					{
+						name: "青山风电场",
+						windPowerStationId: "QS_FDC"
+					},
+					{
+						name: "麻黄山风电场",
+						windPowerStationId: "MHS_FDC"
+					},
+				],
+				modalName: null,
+				address: '宁夏新能源公司',
+				windPowerStationId: '',
 				inconList: ['form', 'favor', 'question', 'edit'],
 				minaverageSpeed: '12',
 				maxaverageSpeed: '25',
@@ -710,7 +750,10 @@
 				windStationCardPixelRatio: 1
 			};
 		},
-
+created: function() {
+			this.address = this.getWindPowerStationNameToSessionStorage();
+			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
+		},
 		onLoad: function() {
 			let that = this;
 			setTimeout(function() {
@@ -727,6 +770,11 @@
 		},
 		onHide() {
 			this.$refs.drawer.closeDrawer();
+			this.hideModal();
+		},
+		onShow(){
+			this.windPowerStationId = uni.getStorageSync('windPowerStationId');
+			this.address = this.getWindPowerStationNameToSessionStorage();
 		},
 		methods: {
 			openDrawer: function() {
@@ -735,6 +783,24 @@
 			closeDrawer: function() {
 				this.drawerIsShow = false;
 			},
+			pushWindPowerStationNameToSessionStorage(windpowerstationName) {
+				uni.setStorageSync('windpowerstationName', windpowerstationName);
+				//sessionStorage.setItem('windpowerstationName', windpowerstationName);
+				//alert("v"+ sessionStorage.getItem("windpowerstationName"));
+				//this.common.goback('/pages/index/Index');
+			},
+			getWindPowerStationNameToSessionStorage() {
+				uni.getStorageSync('windpowerstationName');
+				return uni.getStorageSync('windpowerstationName');
+			},
+			showModal(e) {
+				this.modalName = e.currentTarget.dataset.target;
+				this.$refs.plusDrawer.showModal(this.plusDrawerList, this.modalName);
+			},
+			hideModal() {
+				this.modalName = null;
+				this.$refs.plusDrawer.hideModal(this.modalName);
+			},
 			getServerData() {
 				// 折线图
 				let LineA = {
@@ -1919,14 +1985,18 @@
 	}
 
 	body {
-		font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', 'Helvetica Neue', STHeiti, 'Microsoft Yahei', Tahoma, Simsun, sans-serif;
+		font-family:'方正兰亭细黑_GBK';
 		font-size: 20px;
 		color: silver;
 		background: #000;
 	}
-
+@font-face {
+	font-family:'方正兰亭细黑_GBK';
+	src: url(../../static/方正兰亭细黑_GBK.TTF);
+}
 	page {
 		background-color: #1f1f1f;
+		font-family:'方正兰亭细黑_GBK';
 		overflow-x: hidden;
 	}
 
@@ -2780,5 +2850,102 @@
 				width: 750upx;
 				height: 400upx;
 		}
+		.DrawerPage {
+			position: fixed;
+			width: 100vw;
+			height: 100vh;
+			left: 0vw;
+			background-color: #1f1f1f;
+			transition: all 0.4s;
+		}
+		
+		.DrawerPage.show {
+			transform: scale(0.9, 0.9);
+			left: 85vw;
+			box-shadow: 0 0 60upx rgba(0, 0, 0, 0.2);
+			transform-origin: 0;
+		}
+		
+		.DrawerWindow {
+			position: absolute;
+			width: 85vw;
+			height: 100vh;
+			left: 0;
+			top: 0;
+			transform: scale(0.9, 0.9) translateX(-100%);
+			opacity: 0;
+			pointer-events: none;
+			transition: all 0.4s;
+			padding: 100upx 0;
+		}
+		
+		.DrawerWindow.show {
+			transform: scale(1, 1) translateX(0%);
+			opacity: 1;
+			pointer-events: all;
+		}
+		
+		.DrawerClose {
+			position: absolute;
+			width: 40vw;
+			height: 100vh;
+			right: 0;
+			top: 0;
+			color: transparent;
+			padding-bottom: 30upx;
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			background-image: linear-gradient(90deg, rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.6));
+			letter-spacing: 5px;
+			font-size: 50upx;
+			opacity: 0;
+			pointer-events: none;
+			transition: all 0.4s;
+		}
+		
+		.DrawerClose.show {
+			opacity: 1;
+			pointer-events: all;
+			width: 15vw;
+			color: #fff;
+		}
+		
+		.DrawerPage .cu-bar.tabbar .action button.cuIcon {
+			width: 64upx;
+			height: 64upx;
+			line-height: 64upx;
+			margin: 0;
+			display: inline-block;
+		}
+		
+		.DrawerPage .cu-bar.tabbar .action .cu-avatar {
+			margin: 0;
+		}
+		
+		.DrawerPage .nav {
+			flex: 1;
+		}
+		
+		.DrawerPage .nav .cu-item.cur {
+			border-bottom: 0;
+			position: relative;
+		}
 		
+		.DrawerPage .nav .cu-item.cur::after {
+			content: "";
+			width: 10upx;
+			height: 10upx;
+			background-color: currentColor;
+			position: absolute;
+			bottom: 10upx;
+			border-radius: 10upx;
+			left: 0;
+			right: 0;
+			margin: auto;
+		}
+		
+		.DrawerPage .cu-bar.tabbar .action {
+			flex: initial;
+		}
 </style>