xiabin
This commit is contained in:
		
							parent
							
								
									7b9c9e70a3
								
							
						
					
					
						commit
						d5bd7072e1
					
				| @ -17,6 +17,8 @@ | ||||
|   "dependencies": { | ||||
|     "@element-plus/icons-vue": "^2.3.1", | ||||
|     "@smallwei/avue": "^3.6.2", | ||||
|     "@vuemap/vue-amap": "^2.0", | ||||
|     "@vuemap/vue-amap-loca": "^2.0", | ||||
|     "@wangeditor/editor": "^5.1.23", | ||||
|     "@wangeditor/editor-for-vue": "^5.1.12", | ||||
|     "animate.css": "^4.1.1", | ||||
| @ -25,9 +27,8 @@ | ||||
|     "echarts-gl": "^2.0.9", | ||||
|     "echarts-liquidfill": "^3.1.0", | ||||
|     "echarts-wordcloud": "^2.1.0", | ||||
|     "@vuemap/vue-amap": "^2.0", | ||||
|     "@vuemap/vue-amap-loca": "^2.0", | ||||
|     "element-plus": "^2.7.2", | ||||
|     "hls.js": "^1.6.2", | ||||
|     "js-base64": "^3.7.6", | ||||
|     "lodash": "^4.17.21", | ||||
|     "moment": "^2.30.1", | ||||
|  | ||||
| @ -1,5 +1,5 @@ | ||||
| <template> | ||||
|   <div ref="chartRef" style="width: 100%; height: 260px"></div> | ||||
|   <div ref="chartRef" style="width: 100%; height: 170px"></div> | ||||
| </template> | ||||
| <script> | ||||
| import { ref, reactive, watchEffect } from 'vue'; | ||||
|  | ||||
| @ -1,5 +1,5 @@ | ||||
| <template> | ||||
|   <div ref="chartRef" style="width: 100%; height: 260px"></div> | ||||
|   <div ref="chartRef" style="width: 100%; height: 170px"></div> | ||||
| </template> | ||||
| 
 | ||||
| <script> | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| <template> | ||||
| <!-- <template> | ||||
|   <div class="data-home-index"> | ||||
|     <el-row style="width: 100%; height: 100%"> | ||||
|       <el-col :span="6" class="left-charts"> | ||||
| @ -27,37 +27,6 @@ | ||||
|       <el-col :span="12"> | ||||
|         <businessMap></businessMap> | ||||
|       </el-col> | ||||
|       <!-- <el-col :span="12" style="height: 100%"> | ||||
|         <el-row style="height: 67%"> | ||||
|           <el-col :span="24" class="center-top" style="height: 100%"> | ||||
|             <div class="notice"> | ||||
|               <noticeBar :height="'40px'"></noticeBar> | ||||
|             </div> | ||||
|             <div class="top"> | ||||
|               <environment></environment> | ||||
|             </div> | ||||
|             <div class="map-gis"> | ||||
|               <plantgs></plantgs> | ||||
|             </div> | ||||
|           </el-col> | ||||
|         </el-row> | ||||
|         <el-row style="height: 33%" :gutter="30"> | ||||
|           <el-col :span="12" style="height: 100%"> | ||||
|             <customBack top-title="健康状况指标" :top-postion="'left'"> | ||||
|               <template #back> | ||||
|                 <healthStatusCharts></healthStatusCharts> | ||||
|               </template> | ||||
|             </customBack> | ||||
|           </el-col> | ||||
|           <el-col :span="12" style="height: 100%"> | ||||
|             <customBack top-title="智慧投喂控制" :top-postion="'right'"> | ||||
|               <template #back> | ||||
|                 <irrigationCharts></irrigationCharts> | ||||
|               </template> | ||||
|             </customBack> | ||||
|           </el-col> | ||||
|         </el-row> | ||||
|       </el-col> --> | ||||
|       <el-col :span="6" class="right-charts"> | ||||
|         <div class="right-charts-item"> | ||||
|           <customBack top-title="分拣包装数据统计" :top-postion="'right'"> | ||||
| @ -118,8 +87,8 @@ let four = reactive({ | ||||
| <style lang="scss" scoped> | ||||
| .data-home-index { | ||||
|   background-color: black; | ||||
|   height: 70vh; | ||||
|   margin: 0 10%; | ||||
|   height: 75vh; | ||||
|   margin: 0 15%; | ||||
|   .left-charts { | ||||
|     display: flex; | ||||
|     justify-content: space-around; | ||||
| @ -163,4 +132,4 @@ let four = reactive({ | ||||
|     } | ||||
|   } | ||||
| } | ||||
| </style> | ||||
| </style> --> | ||||
|  | ||||
| @ -3273,6 +3273,11 @@ he@^1.1.1: | ||||
|   resolved "https://registry.npmmirror.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" | ||||
|   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== | ||||
| 
 | ||||
| hls.js@^1.6.2: | ||||
|   version "1.6.2" | ||||
|   resolved "https://registry.npmmirror.com/hls.js/-/hls.js-1.6.2.tgz#02272bea644b5f61f71741256618d6b629ae7834" | ||||
|   integrity sha512-rx+pETSCJEDThm/JCm8CuadcAC410cVjb1XVXFNDKFuylaayHk1+tFxhkjvnMDAfqsJHxZXDAJ3Uc2d5xQyWlQ== | ||||
| 
 | ||||
| hookified@^1.6.0: | ||||
|   version "1.6.0" | ||||
|   resolved "https://registry.npmmirror.com/hookified/-/hookified-1.6.0.tgz#161315ed4525a21f74d710dd9cec71e73951bed2" | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user