钞小赢 4 gadi atpakaļ
vecāks
revīzija
fd3e69e223

+ 10 - 3
src/main/resources/static/app/home/controller/chuldjCtrl.js

@@ -50,8 +50,7 @@ angular.module('app.system').controller("chuldjCtrl",
50 50
 						
51 51
 						padding:[0,10,0,0], 
52 52
             	        textStyle:{    //图例文字的样式
53
-							// color:'#fff',
54
-							color:'#1ca1e0',
53
+							
55 54
 							fontSize:8,
56 55
             	    	  },
57 56
             	        data: ['一级','二级','三级']
@@ -62,6 +61,13 @@ angular.module('app.system').controller("chuldjCtrl",
62 61
             	            type: 'pie',
63 62
             	            radius : '70%',
64 63
 							center: ['50%', '60%'],
64
+							label:{
65
+								normal:{
66
+									textStyle:{
67
+										color:"#666"
68
+									}
69
+								}
70
+							},
65 71
 							
66 72
             	            data:[
67 73
             	                {value:yi, name:'一级'},
@@ -73,7 +79,8 @@ angular.module('app.system').controller("chuldjCtrl",
73 79
             	                    shadowBlur: 10,
74 80
             	                    shadowOffsetX: 0,
75 81
             	                    shadowColor: 'rgba(0, 0, 0, 0.5)'
76
-            	                }
82
+            	                },
83
+							
77 84
             	            }
78 85
             	        }
79 86
             	    ],

+ 4 - 1
src/main/resources/static/app/home/controller/kuczbCtrl.js

@@ -36,6 +36,7 @@ angular.module('app.system').controller("kuczbCtrl",
36 36
 //	        	            splitNumber: 11,
37 37
 	        	            radius: '90%',
38 38
             	            center: ['50%', '60%'],
39
+						
39 40
 	        	            axisLine: {            // 坐标轴线
40 41
 	        	                lineStyle: {       // 属性lineStyle控制线条样式
41 42
 	        	                    width: 15
@@ -55,7 +56,8 @@ angular.module('app.system').controller("kuczbCtrl",
55 56
 	        	            },
56 57
 	        	            //设置仪表盘的刻度相关属性
57 58
 	        	            axisLabel: {
58
-	        	            	fontSize:6
59
+	        	            	fontSize:6,
60
+								color:"#666"
59 61
 	        	            },
60 62
 	        	            title : {
61 63
 	        	            	show: false,
@@ -63,6 +65,7 @@ angular.module('app.system').controller("kuczbCtrl",
63 65
 	        	            	y: 'center',
64 66
 	       	                    fontWeight: 'bolder',
65 67
 	        	                fontSize:6,
68
+								
66 69
 	        	                fontStyle: 'italic',
67 70
 	        	             // 设置上下的内边距为 5,左右的内边距为 10
68 71
 	        	                textStyle:{

+ 4 - 4
src/main/resources/static/app/home/controller/liangspzCtrl.js

@@ -57,7 +57,7 @@ angular.module('app.system').controller("liangspzCtrl",
57 57
 						right:'5%', 
58 58
             	    	textStyle:{    //图例文字的样式
59 59
 							//color:'#fff',
60
-							color: '#1ca1e0',   
60
+							// color: '#1ca1e0',   
61 61
             	    	    fontSize:8
62 62
             	    	  },
63 63
             	        data: ['大豆', '玉米', '小麦', '稻谷']
@@ -82,9 +82,9 @@ angular.module('app.system').controller("liangspzCtrl",
82 82
                                 rotate:0,//倾斜度 -90 至 90 默认为0  
83 83
                                 margin:2,  
84 84
                                 textStyle:{  
85
-                                    fontWeight:"bolder",  
85
+                                    // fontWeight:"bolder",  
86 86
 									//color:"#fff"  //白色
87
-									color: '#1ca1e0'  
87
+									// color: '#1ca1e0'  
88 88
                                 }  
89 89
                             },
90 90
                             axisLine: {
@@ -116,7 +116,7 @@ angular.module('app.system').controller("liangspzCtrl",
116 116
                                 rotate:0,//倾斜度 -90 至 90 默认为0
117 117
             	                textStyle: {
118 118
 									// color: '#fff'
119
-									color: '#1ca1e0'   
119
+									// color: '#1ca1e0'   
120 120
             	                }
121 121
             	            }
122 122
             	        }

+ 4 - 4
src/main/resources/static/app/home/controller/quxtCtrl.js

@@ -75,7 +75,7 @@ angular.module('app.system').controller("quxtCtrl",
75 75
                         // ¦ {number}(y坐标,单位px)
76 76
                         textStyle: {
77 77
                             // color: '#fff'          // 图例文字颜色
78
-                            color: '#1ca1e0'   
78
+                            // color: '#1ca1e0'   
79 79
                         }
80 80
                     },
81 81
                     calculable: true,
@@ -88,7 +88,7 @@ angular.module('app.system').controller("quxtCtrl",
88 88
                             axisLabel: {
89 89
                                 textStyle: {
90 90
                                    //color: '#fff',//坐标值得具体的颜色
91
-                                   color: '#1ca1e0'  
91
+                                //    color: '#1ca1e0'  
92 92
                                 }
93 93
                             },
94 94
                             axisLine : {
@@ -108,7 +108,7 @@ angular.module('app.system').controller("quxtCtrl",
108 108
                             axisLabel: {
109 109
                                 textStyle: {
110 110
                                     // color: '#fff',//坐标值得具体的颜色
111
-                                    color: '#1ca1e0'  
111
+                                    // color: '#1ca1e0'  
112 112
                                 }
113 113
                             },
114 114
                             axisLine : {
@@ -213,7 +213,7 @@ angular.module('app.system').controller("quxtCtrl",
213 213
                // myChart.setOption(option);
214 214
                 if($("#houseSele").html() == undefined){
215 215
                     var sele = "<select id='houseSele' ng-change='newInit()' ng-model=\"houseId\" " +
216
-                        "ng-options=\"store.storehouseId as store.storehouseName for store in storehouseList\" style=\"float:right;margin-right:20px;background-color:transparent;color:#1ca1e0;min-width:65px;border-color:#1ca1e0\">\n" +
216
+                        "ng-options=\"store.storehouseId as store.storehouseName for store in storehouseList\" style=\"float:right;margin-right:20px;background-color:transparent;color:#000;min-width:65px;border-color:#999\">\n" +
217 217
                         // "        <option value=\"\">--仓房--</option>\n" +
218 218
                         "    </select>";
219 219
                     $("#quxt").prepend($compile(sele)($scope)); 

+ 2 - 2
src/main/resources/static/app/home/views/liangspz.html

@@ -1,6 +1,6 @@
1
-<div class="col-md-6 col-sm-6 mar-top2 home-module" ng-controller="liangspzCtrl" style="height:100%">
1
+<div class="col-md-6 col-sm-6 mar-top2 home-module" ng-controller="liangspzCtrl" style="height:100%;margin-top:10px">
2 2
 
3
-    <div class="col-center col-center-3">
3
+    <div class="col-center col-center-3" style="margin-right:0px">
4 4
         <h3 style="color:#333">粮食品种(单位:吨)</h3>
5 5
         <div class="home-module-content" id="lspz"></div>
6 6
             <!-- <div class="liangspz-charts" id="lspz" style="height: 180px" >

+ 1 - 1
src/main/resources/static/app/home/views/quxt.html

@@ -1,4 +1,4 @@
1
-<div class="col-md-6 col-sm-6 picture-mar1 mar-top2 home-module" ng-controller="quxtCtrl" id="quxtDiv" style="padding: 0px;height:100%">
1
+<div class="col-md-6 col-sm-6 picture-mar1 mar-top2 home-module" ng-controller="quxtCtrl" id="quxtDiv" style="padding: 0px;height:100%;margin-top:10px">
2 2
     <div class="col-center col-center-3" style="margin-left:0px;">
3 3
         <h3 style="color:#333">五温曲线图</h3>
4 4
         <div class="home-module-content" id="showChartsTemp"></div>