新首页

src/main/resources/static/app/dashboard/dashboard.html

@@ -4,10 +4,11 @@
     <div class="row pad-top2 row-main">
         <div class="col-lg-3 col-md-12 col-sm-12" style="height:100%;">
             <div class="row" style="height:100%;">
-                <div data-smart-include="app/home/views/daibsx.html"></div>
-                <!-- <div data-smart-include="app/home/views/daibsx copy.html"></div> -->
+                <!-- <div data-smart-include="app/home/views/daibsx.html"></div> -->
+                <div data-smart-include="app/home/views/daibsx copy.html"></div>
                 <!--**待办事项 col-sm-12**-->
-                <div data-smart-include="app/home/views/liangkjbzk.html"></div>
+                <!-- <div data-smart-include="app/home/views/liangkjbzk.html"></div> -->
+                <div data-smart-include="app/home/views/liangkjbzk copy.html"></div>
                 <!--**粮库基本状况 col-sm-12**-->
             </div>
         </div>
@@ -16,131 +17,21 @@
                 <!--**待办事项 视频监控 粮食市场价格变化 col-sm-3**-->
                 <div class="col-lg-9 col-md-9 col-sm-12 home-search-main" style="height:100%;">
                     <div class="row" style="height: 100%;">
-                        <div class="home-search-wrap row" style="height:15%;">
-                            <div class="col-md-12 col-sm-12 weather-bor"
-                                style="background: #fff;border-radius: 5px;">
-                                <!--查询-->
-                                <!--
-                        <div class="input-group home-search">
-                            <div class="btn-group dropdown" data-dropdown>
-                                <div class="drop-div" data-toggle="dropdown">
-                                    请选择查询项 <span class="caret"></span>
-                                </div>
-                                <ul class="dropdown-menu">
-                                    <li>
-                                        <a href-void>Action</a>
-                                    </li>
-                                    <li>
-                                        <a href-void>Another action</a>
-                                    </li>
-                                    <li>
-                                        <a href-void>Something else here</a>
-                                    </li>
-                                    <li class="divider"></li>
-                                    <li>
-                                        <a href-void>Separated link</a>
-                                    </li>
-                                </ul>
-                            </div>
-                            <div class="sear-int-box">
-                            	<i class="sear-icon"></i><input class="form-control" type="text" placeholder="请输入查询内容">
-                            </div>
-                            <div class="input-group-btn"><button class="btn" type="button">搜索</button></div>
+                        <div class="home-search-wrap row" style="height:15%;" >
+                            <a href="#/prewarning/index">
+                                <img style="width:100%" src="styles/img/home/home-bg.png" alt="">
+                            </a>
+                        
+                        
                         </div>
-                        -->
-                                <div class="weather-box">
-                                    <span class="date-box" style="color:#333;font-size:16px"> {{depotInfo.orgName}}欢迎您</span>
-                                    <span id="dateInfo" class="date-box"
-                                        style="color:#333;font-size:16px">{{now | date:'yyyy-MM-dd'}}</span>
-                                    <!--<iframe src="http://tianqi.5ikfc.com:90/plugin-code/?style=1&dy=1&cl=ffffff&tl=ffffff&th=ffffff" allowTransparency="true" frameborder="0" scrolling="no" width="280" height="50" id="weather_frame" style="background: black;"></iframe>-->
-                                </div>
-                            </div>
-                            <!--/搜索 col-sm-6-->
-
-                        </div>
-                        <!--****/搜索**-->
-                        <div class="cangt" ng-controller="cangtCtrl" style="height:84%;">
-                            <div class="cangt-oper" style="z-index:800;">
-                                <select id="sele" class="form-control input-sm" ng-change="tempCameraChange()"
-                                    ng-model="seleVal" style="color:#1ca1e0;">
-                                    <option value="1">监控</option>
-                                    <option value="2">粮情</option>
-                                </select>
-                                <ul id="indexBJ-ul">
-                                    <li style="cursor: pointer;"><img src="../../styles/img/home-1/baoj.png" />报警</li>
-                                </ul>
-                            </div>
-                            <div class="wrap-imgbox1" style="height:100%;">
-
-                                <!-- <img id="img" src="styles/img/home-1/cangt.png" style="width: 100%;height: 100%;"/> -->
-                                <img id="img" src="{{birdsEyeUrl}}" style="width: 100%;height: 100%;" />
-
-                                <!-- <div style="position: absolute;width: 100%;height:100%;top:0px;left:0px" id="showDiv"
-                                    auto-height>
-                                </div> -->
-
-                                <div style="position: absolute;width: 100%;height:100%;top:0px;left:0px" id="showDiv1"
-                                auto-height>
-                            </div>
-                                <div>
-                                    <div class='jk-icon-box' id="iconDiv"></div>
-                                    <!--<div class='jk-icon-box'>-->
-                                    <!--<div class='jk-text-box' style='z-index:0;border-radius:1%;resize: both;height: 0px;width:9%;left:52.86%;top:13.81%;position: absolute;text-align:center;line-height: 6;'>-->
-                                    <!--<i class='text-i' style='cursor:default;padding: 0px 0px;font-size: 15px;'>P1库</i>-->
-                                    <!--</div>-->
-                                    <!--<div class='jk-text-box' style='z-index:0;border-radius:1%;resize: both;height: 0px;width:10%;left:53.37%;top:49.17%;position: absolute;text-align:center;line-height: 6;'>-->
-                                    <!--<i class='text-i' style='cursor:default;padding: 0px 0px;font-size: 15px;'>P2库</i>-->
-                                    <!--</div>-->
-                                    <!--<div class='jk-text-box' style='z-index:0;border-radius:1%;resize: both;height: 0px;width:10%;left:32.43%;top:12.9%;position: absolute;text-align:center;line-height: 6;'>-->
-                                    <!--<i class='text-i' style='cursor:default;padding: 0px 0px;font-size: 15px;'>P3库</i>-->
-                                    <!--</div>-->
-                                    <!--<div class='jk-text-box' style='z-index:0;border-radius:1%;resize: both;height: 0px;width:10%;left:31.84%;top:50.68%;position: absolute;text-align:center;line-height: 6;'>-->
-                                    <!--<i class='text-i' style='cursor:default;padding: 0px 0px;font-size: 15px;'>P4库</i>-->
-                                    <!--</div>-->
-                                    <!--<div class='jk-text-box' style='z-index:0;border-radius:1%;resize: both;height: 0px;width:15%;left:72.62%;top:32.93%;position: absolute;text-align:center;line-height: 3;'>-->
-                                    <!--<i class='text-i' style='cursor:default;padding: 0px 0px;font-size: 15px;'>P5库</i>-->
-                                    <!--</div>-->
-                                    <!--</div>-->
-                                </div>
-                            </div>
-                            <div class="changt-icon baoj-icon-box">
-                                <!--<img style="top:120px; left:250px;" src="styles/img/home-1/ship.png"/>-->
-                                <!--<img class="baoj-icon" style="top:130px; left:275px;" src="styles/img/home-1/baoj.png"/>-->
-                            </div>
-                            <div id="popContainer" style="display:none;">
-
-                            </div>
-                            <!--********/弹窗*******-->
-                            <div class="modal fade" id="cameraPlayModal" tabindex="-1" role="dialog"
-                                aria-labelledby="myModalLabel" aria-hidden="true">
-                                <div class="modal-dialog" style="width:78%;height:85%;">
-                                    <div class="modal-content" style="height:100%;">
-                                        <div class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                                                &times;
-                                            </button>
-                                            <h4 class="modal-title" id="myModalLabel">{{alias}}</h4>
-                                        </div>
-                                        <div class="modal-body" id="ocxDiv" style="height:80%;">
-                                            <!--<div smart-include="app/monitor/views/camera-ocx.html"></div>-->
-                                        </div>
-                                        <div class="modal-footer">
-                                            <button type="button" class="btn btn-default" data-dismiss="modal"
-                                                ng-click="distroyOcx()">
-                                                取消
-                                            </button>
-                                        </div>
-                                    </div><!-- /.modal-content -->
-                                </div><!-- /.modal-dialog -->
-                            </div><!-- /.modal-->
-                        </div>
-                        <!--*******/cangt******-->
+                       
                     </div>
                 </div>
                 <!--**/查询 仓图 col-sm-5**-->
                 <div class="col-lg-3 col-md-3 col-sm-12" style="height:100%;">
                     <div class="row" style="height:100%">
-                        <div data-smart-include="app/home/views/dangqzy.html"></div>
+                        <!-- <div data-smart-include="app/home/views/dangqzy.html"></div> -->
+                        <div data-smart-include="app/home/views/dangqzy copy.html"></div>
                         <!--**当前作业 col-sm-12**-->
                         <div data-smart-include="app/home/views/kuczb.html"></div>
                         <!--**储粮量/库存占比 col-sm-12**-->
@@ -151,7 +42,8 @@
                 <!--**/当前作业 储粮量/库存占比 粮食品种 储粮等级 col-sm-4**-->
             </div>
             <div class="row home-row-fotter" style="height:30%;">
-                <div data-smart-include="app/home/views/quxt.html"></div>
+                <!-- <div data-smart-include="app/home/views/quxt.html"></div> -->
+                <div data-smart-include="app/home/views/quxt copy.html"></div>
                 <!--**三温曲线图 col-sm-12**-->
                 <div data-smart-include="app/home/views/liangspz.html"></div>
                 <!--**粮食品种 col-sm-12**-->

src/main/resources/static/app/home/controller/depotProfileCtrl copy.js

@@ -0,0 +1,103 @@
+"use strict";
+
+angular.module('app.system').controller("depotProfileCtrlCopy",
+function ($scope, $stateParams, $rootScope, $timeout, $uibModal, liangspzService, $state, APP_CONFIG) {
+
+    $("#kuAlarm").html($("" +
+        "<div class=\"liangspz-charts\" id=\"kuAlarm\" style=\"height: 100%;width:100%;\" >" +
+        "</div>"));
+
+    $scope.loadData = function () {
+
+
+
+
+
+            // 基于准备好的dom，初始化echarts实例
+            var kuAlarm = echarts.init(document.getElementById('kuAlarm'));
+
+            // var labelOption = {
+            // 	    normal: {
+            // 	        show: false,
+            // 	        formatter: '{c}  {name|{a}}',
+            // 	        fontSize: 16,
+            // 	        rich: {
+            // 	            name: {
+            // 	                textBorderColor: '#fff'
+            // 	            }
+            // 	        }
+            // 	    }
+            // 	};
+
+
+            // 指定图表的配置项和数据
+            var option = {
+                
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        type: 'shadow'
+                    }
+                },
+                legend: {},
+                grid: {
+                    left: '0px',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                },
+                xAxis: {
+                    type: 'value',
+                    boundaryGap: [0, 0.01]
+                },
+                yAxis: {
+                    type: 'category',
+                    data: ['虞城粮食储备公司', '民权粮食储备公司', '拓城粮食储备公司', '宁陵粮食储备公司']
+                },
+                series: [{
+                        name: '温度异常',
+                        type: 'bar',
+                        data: [2, 5, 6, 8,]
+                    },
+                    {
+                        name: '视频分析',
+                        type: 'bar',
+                        data: [1, 3, 2, 5, ]
+                    },
+                    {
+                        name: '设备断联',
+                        type: 'bar',
+                        data: [3, 2, 1, 3,]
+                    }
+                ]
+            };
+            // option.grid.height = $("#kuAlarm").height() / 1.5 - 25;
+            // option.grid.width = $("#kuAlarm").width() * 0.8;
+
+
+            // var kuAlarm = echarts.init(document.getElementById('kuAlarm'));
+            kuAlarm.setOption(option);
+            setTimeout(function () {
+                window.onresize = function () {
+                    console.log(1111)
+                    kuAlarm.resize();
+                }
+            }, 200)
+
+            // 使用刚指定的配置项和数据显示图表。
+            //myChart.setOption(option);
+        },
+
+
+
+
+        function (data) {
+            console.log(data);
+        }
+
+   
+
+
+$scope.loadData();
+
+})

src/main/resources/static/app/home/controller/homeworkCtrl copy.js

@@ -0,0 +1,94 @@
+"use strict";
+angular.module('app.system')
+    .controller("homeworkCtrlCopy", function($scope,$rootScope,$filter,$state,$compile,$timeout,$interval,alertService, $http,ptService, APP_CONFIG) {
+        $("#cfState").html($("" +
+        "<div class=\"charts-histogram-1\" id=\"cfState\" style=\"height: 100%;width:100%;\" >" +
+        "</div>"));
+
+
+    //获取number天前的日期
+
+
+
+
+
+
+
+
+    $scope.cfCharts = function () {
+        var cfState = echarts.init(document.getElementById('cfState'));
+            //初始化echarts 图表
+          var  option = {
+                tooltip: {
+                  trigger: 'item'
+                },
+                legend: {
+                    data: ['熏蒸','出库', '入库','通风','静态储存'],
+                    x:"right",
+                    y:"center",
+                    orient:"vertical"
+                  },
+                  grid: {
+                    // left: '0',
+                    right: '24%',
+                    bottom: '0%',
+               
+                  },
+                series: [
+                  {
+                  
+                    type: 'pie',
+                    radius: ['40%', '60%'],
+                    center: ["35%", "58%"], 　　
+                    avoidLabelOverlap: false,
+                    label: {
+                      show: false,
+                      position: 'center'
+                    },
+                    emphasis: {
+                      label: {
+                        show: true,
+                        fontSize: '40',
+                        fontWeight: 'bold'
+                      }
+                    },
+                    labelLine: {
+                      show: false
+                    },
+                    data: [
+                      { value: 1048, name: '通风' },
+                      { value: 735, name: '静态储存' },
+                      { value: 580, name: '入库' },
+                      { value: 484, name: '出库' },
+                      { value: 300, name: '熏蒸' }
+                    ]
+                  }
+                ]
+              };
+
+       
+
+            // var myChart = echarts.init(document.getElementById('quxt'));
+           
+        
+       
+            cfState.setOption(option);
+
+
+            cfState.setOption(option);
+            setTimeout(function () {
+                window.onresize = function () {
+                    cfState.resize();
+                }
+            }, 100)
+
+
+            // myChart.setOption(option);
+
+        },
+        function (data) {
+            console.log(data);
+        }
+        $scope.cfCharts();
+
+    });

src/main/resources/static/app/home/controller/quxtCtrl copy.js

@@ -0,0 +1,111 @@
+"use strict";
+
+angular.module('app.system').controller("quxtCtrlCopy",
+function ($scope, $stateParams, $compile, $rootScope, $timeout, $interval, $uibModal, grainTempService, threetempcheckService, StorehouseService, $state, APP_CONFIG) {
+
+    $("#crkqx").html($("" +
+        "<div class=\"charts-histogram-1\" id=\"crkqx\" style=\"height: 100%;width:100%;\" >" +
+        "</div>"));
+
+
+    //获取number天前的日期
+
+
+
+
+
+
+
+
+    $scope.newInit = function () {
+        var crkqx = echarts.init(document.getElementById('crkqx'));
+            //初始化echarts 图表
+         var option = {
+               
+                tooltip: {
+                  trigger: 'axis'
+                },
+                legend: {
+                  data: ['出库', '入库'],
+                  x:"right",
+                  y:"center",
+                  orient:"vertical"
+                },
+                grid: {
+                  left: '3%',
+                  right: '14%',
+                  bottom: '13%',
+                  containLabel: true
+                },
+                toolbox: {
+                  
+                },
+                xAxis: {
+                  type: 'category',
+                  boundaryGap: false,
+                  data: ['2022-07', '2022-08', '2022-09', '2022-10', '2022-11'],
+                  axisLine: {
+                    lineStyle: {
+                        type: 'solid',
+                        // color:'#fff',
+                        color:"#ccc",
+                        width:'1'
+                    }
+                }
+                },
+                yAxis: {
+                  type: 'value',
+                  axisLine: {
+                    lineStyle: {
+                        type: 'solid',
+                        // color:'#fff',
+                        color:"#ccc",
+                        width:'1'
+                    }
+                }
+                },
+                series: [
+                  {
+                    name: '出库',
+                    type: 'line',
+                    stack: 'Total',
+                    data: [120, 132, 101, 134, 90, 230, 210]
+                  },
+                  {
+                    name: '入库',
+                    type: 'line',
+                    stack: 'Total',
+                    data: [220, 182, 191, 234, 290, 330, 310]
+                  },
+            
+                
+                 
+                ]
+              };
+
+       
+
+            // var myChart = echarts.init(document.getElementById('quxt'));
+           
+        
+       
+            crkqx.setOption(option);
+
+
+            crkqx.setOption(option);
+            setTimeout(function () {
+                window.onresize = function () {
+                    crkqx.resize();
+                }
+            }, 100)
+
+
+            // myChart.setOption(option);
+
+        },
+        function (data) {
+            console.log(data);
+        }
+        $scope.newInit();
+
+})

src/main/resources/static/app/home/views/daibsx copy.html

@@ -1,9 +1,9 @@
 <div class="col-sm-12 home-module" ng-controller="daibsxCtrl" style="margin-top:8px;height:20%">
 
     <div class="col-center col-center-1" style="height:100%">
-       <div style="position: absolute;top:10px">库存总量</div>
+       <div style="position: absolute;top:10px;left:10px;font-size:15px;color:#333;font-weight:500">库存总量</div>
        <div>
-           <img src="" alt="">
+           <img style="position:absolute;top:30px;width:80%;height:80%" src="styles/img/home/home-bg.png" alt="">
        </div>
     </div>
 

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

@@ -1,20 +1,9 @@
-<div class="col-sm-12 home-module" ng-controller="homeworkCtrl" style="margin-top: 8px;height:32.5%;"  >
+<div class="col-sm-12 home-module" ng-controller="homeworkCtrlCopy" style="margin-top: 8px;height:32.5%;"  >
 
     <div class="col-center col-center-5" style="height: 100%;">
         <div>
-            <h3 style="color:#333">当前作业</h3>
-        </div>
-        <div class="home-module-content">
-            <ul class="list-group" style="height:80%;overflow:auto; margin:30px 1px 0px 6px; padding-top: 0px;">
-                
-
-
-
-                <li class="list-group-item" ng-repeat="tf in tfData" ng-click="getJobDate('3.1',tf.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2_new.png"/>&nbsp;{{tf.storehouseName}}正在通风作业</li>
-                <li class="list-group-item" ng-repeat="xz in xzData" ng-click="getJobDate('3.2',xz.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2_new.png"/>&nbsp;{{xz.storehouseName}}正在熏蒸作业</li>
-                <li class="list-group-item" ng-repeat="rk in rkData" ng-click="getJobDate('3.3',rk.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2_new.png"/>&nbsp;{{rk.storehouseName}}正在入库作业</li>
-                <li class="list-group-item" ng-repeat="ck in ckData" ng-click="getJobDate('3.4',ck.houseId)" style="cursor:pointer;"><img src="styles/img/home-1/text-icon2_new.png"/>&nbsp;{{ck.storehouseName}}正在出库作业</li>
-            </ul>
+            <h3 style="color:#333">仓房状态</h3>
         </div>
+        <div class="home-module-content" id="cfState"></div>
     </div>
 </div>

src/main/resources/static/app/home/views/liangkjbzk copy.html

@@ -1,45 +1,9 @@
-<div class="col-sm-12 home-module mar-top2" ng-controller="depotProfileCtrl" style="height:79%;margin-top:7px;">
+<div class="col-sm-12 home-module mar-top2" ng-controller="depotProfileCtrlCopy" style="height:79%;margin-top:7px;">
 	
     <div class="col-center col-center-6" style="height:100%;">
-        <h3 style="color:#333;">粮库基本状况</h3>
-        <div class="home-module-content">
-            <div class="video-mon">
-                <div class="product-image" style="padding:3px;">
-                    <div id="myCarousel-2" class="carousel slide" data-smart-ride-carousel>
-                        <ol class="carousel-indicators">
-                            <li data-target="#myCarousel-2" data-slide-to="0" class="active"></li>
-                            <li data-target="#myCarousel-2" data-slide-to="1" class=""></li>
-                            <li data-target="#myCarousel-2" data-slide-to="2" class=""></li>
-                            <li data-target="#myCarousel-2" data-slide-to="3" class=""></li>
-                        </ol>
-                        <div class="carousel-inner">
-                            <!-- Slide 1 -->
-                            <div class="item active">
-                                <img src="{{imagelist[0].imgUrl}}"/>
-                            </div>
-                            <!-- Slide 2 -->
-                            <div class="item">
-                                <img src="{{imagelist[1].imgUrl}}"/>
-                            </div>
-                            <!-- Slide 3 -->
-                            <div class="item">
-                                <img src="{{imagelist[2].imgUrl}}"/>
-                            </div>
-                            <div class="item">
-                                <img src="{{imagelist[3].imgUrl}}"/>
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-                <!--*******product-image********-->
-                
-                <div class="liangkjbzk-line"></div>
-                <div class="liangkjbzk-con">
-                    <p ng-bind="depotInfo.briefIntroduction" style="color:#555;font-size:14px"></p>
-                </div>
-            </div>
-        </div>
+        <h3 style="color:#333;">库区报警排名</h3>
+        <div class="home-module-content" id="kuAlarm"></div>
+        
         
         
     </div>

src/main/resources/static/app/home/views/quxt copy.html

@@ -0,0 +1,6 @@
+<div class="col-md-6 col-sm-6 picture-mar1 mar-top2 home-module" ng-controller="quxtCtrlCopy" id="quxtDiv" style="padding: 0px;height:100%;margin-top:10px">
+    <div class="col-center col-center-3" style="margin-left:0px;">
+        <h3 style="color:#333">出入库趋势(单位:吨)</h3>
+        <div class="home-module-content" id="crkqx"></div>
+    </div>
+</div>