gypRoc hace 4 años
padre
commit
88a625e920

+ 2 - 2
src/main/resources/static/app/dashboard/dashboardCopy.html

@@ -14,7 +14,7 @@
14
         <div class="col-lg-9 col-sm-12 home-right" style="height:100%;">
14
         <div class="col-lg-9 col-sm-12 home-right" style="height:100%;">
15
             <div class="row" style="height:70%;">
15
             <div class="row" style="height:70%;">
16
                 <!--**待办事项 视频监控 粮食市场价格变化 col-sm-3**-->
16
                 <!--**待办事项 视频监控 粮食市场价格变化 col-sm-3**-->
17
-                <div class="col-lg-9 col-md-9 col-sm-12 home-search-main" style="height:100%;">
17
+                <div class="col-lg-8 col-md-8 col-sm-12 home-search-main" style="height:100%;">
18
                     <div class="row" style="height: 100%;">
18
                     <div class="row" style="height: 100%;">
19
                         <div class="home-search-wrap row" style="height:15%;">
19
                         <div class="home-search-wrap row" style="height:15%;">
20
                             <div class="col-md-12 col-sm-12 weather-bor"
20
                             <div class="col-md-12 col-sm-12 weather-bor"
@@ -138,7 +138,7 @@
138
                     </div>
138
                     </div>
139
                 </div>
139
                 </div>
140
                 <!--**/查询 仓图 col-sm-5**-->
140
                 <!--**/查询 仓图 col-sm-5**-->
141
-                <div class="col-lg-3 col-md-3 col-sm-12" style="height:100%;">
141
+                <div class="col-lg-4 col-md-4 col-sm-12" style="height:100%;">
142
                     <div class="row" style="height:100%">
142
                     <div class="row" style="height:100%">
143
                         <div data-smart-include="app/home/views/dangqzy.html"></div>
143
                         <div data-smart-include="app/home/views/dangqzy.html"></div>
144
                         <!--**当前作业 col-sm-12**-->
144
                         <!--**当前作业 col-sm-12**-->

+ 12 - 9
src/main/resources/static/app/home/controller/homeworkCtrl copy.js

@@ -25,17 +25,20 @@ angular.module('app.system')
25
                 },
25
                 },
26
                 legend: {
26
                 legend: {
27
                     data: ['出库', '入库','通风','熏蒸','静态储存'],
27
                     data: ['出库', '入库','通风','熏蒸','静态储存'],
28
-                    x:"right",
29
-                    y:"center",
30
-                    orient:"vertical",
31
-                    textStyle:{    //图例文字的样式	
32
-                        fontSize:8,
33
-                      },
28
+                    x:"center",
29
+                    // y:"bottom",
30
+                    bottom:"5%",
31
+                    orient:"horizontal",
32
+                    // //图例大小
33
+                    itemHeight:6,
34
+                    itemWidth:10,
35
+                    padding: 2,
36
+                    fontSize:8,
34
 
37
 
35
                   },
38
                   },
36
                   grid: {
39
                   grid: {
37
                     // left: '0',
40
                     // left: '0',
38
-                    right: '24%',
41
+                    left: 'center',
39
                     bottom: '0%',
42
                     bottom: '0%',
40
                
43
                
41
                   },
44
                   },
@@ -43,8 +46,8 @@ angular.module('app.system')
43
                   {
46
                   {
44
                   
47
                   
45
                     type: 'pie',
48
                     type: 'pie',
46
-                    radius: ['30%', '55%'],
47
-                    center: ["42%", "55%"],   
49
+                    radius: ['20%', '45%'],
50
+                    center: ["50%", "50%"],   
48
                     avoidLabelOverlap: false,
51
                     avoidLabelOverlap: false,
49
                     label: {
52
                     label: {
50
                       show: false,
53
                       show: false,

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

@@ -4,6 +4,6 @@
4
         <div>
4
         <div>
5
             <h3 style="color:#333">仓房状态</h3>
5
             <h3 style="color:#333">仓房状态</h3>
6
         </div>
6
         </div>
7
-        <div class="home-module-content" id="cfState"></div>
7
+        <div class="home-module-content" id="cfState" style="padding:0px;"></div>
8
     </div>
8
     </div>
9
 </div>
9
 </div>