dedsudiyu 3 달 전
부모
커밋
30f9cb082c
2개의 변경된 파일30개의 추가작업 그리고 18개의 파일을 삭제
  1. 2 2
      api/request/config.js
  2. 28 16
      pages/views/dataBoard/securityHidden.vue

+ 2 - 2
api/request/config.js

@@ -11,7 +11,7 @@ const config = {
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
-	// base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
+	base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
 	// base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
 	// base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	// base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
@@ -20,7 +20,7 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/api/', //暨大化材
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
     //base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
-	base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
+	// base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'http://172.16.0.65/api/', //西北农林
 	//base_url: 'https://lab.zjznai.com/labapp/', //43测试
 }

+ 28 - 16
pages/views/dataBoard/securityHidden.vue

@@ -30,7 +30,8 @@
 			</view>
 			<!-- 暂无法整改-图表 -->
 			<view class="chart-b-tow" v-if="chartIndex==1 || chartIndex==2">
-				<qiun-data-charts :canvas2d="true" type="radar" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
+				<qiun-data-charts :canvas2d="true" :tapLegend="false" :tooltipShow="false"
+				type="bar" :opts="optsTow" :echartsH5="true" :chartData="chartDataTow" />
 			</view>
 		</view>
 		<!-- 选项卡 -->
@@ -119,25 +120,36 @@
 					}
 				},
 				optsTow: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
-					padding: [5, 5, 5, 5],
-					dataLabel: false,
+					rotate: false,
+					rotateLock: false,
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
+					padding: [15, 20, 15, 15],
+					dataLabel: true,
 					enableScroll: false,
+					fontColor:'#ffffff',
 					legend: {
-						show: false,
+						show:false,
 					},
+					xAxis: {
+						boundaryGap: "justify",
+						disableGrid: false,
+						min: 0,
+						axisLine: false,
+						max: 40
+					},
+					yAxis: {},
 					extra: {
-						radar: {
-							gridType: "radar",
-							gridColor: "#CCCCCC",
-							gridCount: 3,
-							opacity: 0.2,
-							max: 200,
-							labelShow: true,
-							border: true,
-							labelColor: '#fff',
+						bar: {
+							type: "group",
+							width: 15,
+							meterBorde: 1,
+							meterFillColor: "#FFFFFF",
+							activeBgColor: "#000000",
+							activeBgOpacity: 0.08,
+							linearType: "custom",
+							barBorderCircle: true,
+							seriesGap: 2,
+							categoryGap: 2
 						}
 					}
 				},