仓房展示-web

depot-web/src/main/resources/static/app/intelligent/grainDetection/controller/humitureDetection3D-listCtrl.js

@@ -0,0 +1,16 @@
+"use strict";
+angular.module('app.intelligent').controller("humitureDetection3D-listCtrl", function ($scope, $state,$rootScope, $uibModalInstance, items, temperatureRecordService, $filter, $uibModal) {
+
+    $scope.layernumber = items.list.layernumber ;// 层数
+    $scope.lmax = items.list.lmax; //层最高温
+    $scope.lmin = items.list.lmin;  //层最低温
+    $scope.lavg = items.list.lavg;  //层平均温
+    $scope.layerAllData = items.layerAllData //层温全部数据
+
+
+
+     //关闭弹窗
+     $scope.cancel = function () {
+        $uibModalInstance.close();
+    };
+})

depot-web/src/main/resources/static/app/intelligent/grainDetection/controller/humitureDetection3DCtrl.js

@@ -0,0 +1,286 @@
+"use strict";
+angular.module('app.intelligent').controller("humitureDetection3DCtrl", function ($scope, $state, $rootScope, $uibModalInstance, items, temperatureRecordService, APP_CONFIG, $filter, $uibModal) {
+    $scope.orgId = $rootScope.depotInfo.orgId;
+    $scope.id = items.id;
+    $scope.vCfCode = items.vCfCode; // 仓房编码
+    $scope.time = items.time; // 检测时间
+    $scope.intemp = items.intemp; // 仓内温
+    $scope.inh = items.inh; // 仓内湿
+    $scope.outtemp = items.outtemp; // 仓外温
+    $scope.outh = items.outh; // 仓外湿
+    $scope.max = items.max; // 最高粮温
+    $scope.min = items.min; // 最低粮温
+    $scope.avg = items.avg; // 平均粮温 'yyyy-MM-dd HH:mm:ss'
+    $scope.tableTime = $filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss'); // 制表时间
+
+    // 获取层数及每层数据
+    $scope.layerAvgTempData = function () {
+        temperatureRecordService.findByHouseAndTime(items.vCfCode, items.time, items.id).then(function (data) {
+            // console.log(data.data,'data.data1111')
+            $scope.layerData = data.data.reverse();         
+        })
+    };
+    $scope.layerAvgTempData();
+
+    // 合并列计算
+    $scope.calculateMethod = function () {
+        /**
+         * 1.静态-定长
+         *  仓名-平均温: td_type_1=8
+         *  处理意见和备注: td_type_2=4
+         *  检验员: td_type_3=6
+         * 2.动态-变长
+         *  层均温: td_type_4=N*2
+         *  层温表格: td_type_5=N
+         */
+        var td_type_1 = 8;
+        var td_type_2 = 4;
+        var td_type_3 = 6;
+        var td_type_4 = 1;
+        $scope.td_type_4_true = false;
+        var td_type_5 = 1;
+        // 放行标志
+        $scope.td_type_5_avg_true = false;
+        $scope.td_type_5_avg_p_true = false;
+        var td_type_5_d = 0;
+        // 仓温仓湿
+        $.ajax({
+            type: "GET",
+            dataType: "json",
+            // async:true;   //异步
+            async: false,  //同步
+            url: APP_CONFIG.intelligentUrl + '/intelligents/temperatureRecord/findByHouseAndTime',
+            data: {
+                vDatatime: items.time == undefined ? "" : items.time,
+                vCfCode: items.vCfCode == undefined ? "" : items.vCfCode,
+                lqId: items.id
+            },
+            success: function (data) {
+                td_type_4 = data.data.length * 2; // 层数
+                // console.log("层数: " + data.data.length);
+            }
+        });
+        // 行/列
+        $.ajax({
+            type: "GET",
+            dataType: "json",
+            // async:true;   //异步
+            async: false,  //同步
+            url: APP_CONFIG.intelligentUrl + '/intelligents/temperatureRecord/findByHouseAndTimes',
+            data: {
+                vDatatime: items.time == undefined ? "" : items.time,
+                vCfCode: items.vCfCode == undefined ? "" : items.vCfCode,
+                lqId: items.id
+            },
+            success: function (data) {
+                td_type_5 = Object.keys(data.data[0]).length; // 温度表格单行大小
+                td_type_5_d = data.data.length; // 温度表格总大小
+                /*console.log("表格总大小: " + data.data.length);
+                console.log("单行大小: " + Object.keys(data.data[0]).length);*/
+            }
+        });
+        // 获取最长列(td)
+        var max = Math.max(td_type_1, td_type_2, td_type_3, td_type_4, td_type_5);
+        // console.log("max: " + max);
+        // 计算合并列
+        if (max > td_type_1) {
+            // +2 分配给两个td
+            $scope.td_type_1 = (max - td_type_1) + 2;
+        }
+        if (max > td_type_2) {
+            $scope.td_type_2 = (max - td_type_2) + 2;
+        }
+        if (max > td_type_3) {
+            // +3 分配给3个td
+            $scope.td_type_3 = (max - td_type_3) + 3;
+        }
+        if (max > td_type_4) {
+            $scope.td_type_4 = max - td_type_4;
+            $scope.td_type_4_true = true;
+        }
+        // 温度表格合并计算
+        $scope.td_type_5_avg = 1;
+        $scope.td_type_5_avg_p = 1;
+        if (max > td_type_5) {
+            // 温度表格平均分配到层以外的其他列(td)
+            var td_type_5_t = max - td_type_5; // 获取比最大小几
+            // 判断是否可以每人得到一个
+            var td_type_5_r = td_type_5_t % td_type_5; // 取余
+            if (td_type_5_t > td_type_5) { // 没人大于一个就分
+                if (td_type_5_r == 0) { // 整除
+                    $scope.td_type_5_avg = td_type_5_t / td_type_5 + 1; // 平均分,加1把自己算上
+                    // 放行标志
+                    $scope.td_type_5_avg_true = true;
+                    // console.log('整除avg: ' + $scope.td_type_5_avg);
+                } else { // 不能整除
+                    var td_type_5_d = td_type_5_t - td_type_5_r; // 减掉多余
+                    $scope.td_type_5_avg = td_type_5_d / (td_type_5 - 1) + 1; // 减掉多余的在平均分(平均-1),少分一份
+                    $scope.td_type_5_avg_p = $scope.td_type_5_avg + td_type_5_r + 1; // 余数给一个人加上plus
+                    // 放行标志
+                    $scope.td_type_5_avg_true = true;
+                    $scope.td_type_5_avg_p_true = true;
+                    /*console.log('不能整除avg: ' + $scope.td_type_5_avg);
+                    console.log('不能整除avg_p: ' + $scope.td_type_5_avg_p);*/
+                }
+            } else { // 不够分,直接plus
+                $scope.td_type_5_avg_p = td_type_5_r + 1; // 加的1为自己
+                // 放行标志
+                $scope.td_type_5_avg_p_true = true;
+                // console.log('不够avg: ' + $scope.td_type_5_avg_p);
+            }
+        }
+        /**
+         * 检测员,保管员,主管科长
+         * @type {number}
+         */
+        // 声明合并变量
+        var td_type_3_t = $scope.td_type_3 % 3; // 计算临时变量,并获取余数
+        var td_type_3_s = 1; // 将余数分配,主管科长
+        var td_type_3_avg = 1; // 可平均分配变量
+        var td_type_3_r = 1; // 去除余数,可平均分配值变量
+        if (td_type_3_t == 0) { // 可平均分配
+            var avg_avg_avg = $scope.td_type_3 / 3;
+            $scope.td_type_avg_1 = avg_avg_avg; // 检测员
+            $scope.td_type_avg_2 = avg_avg_avg; // 保管员
+            $scope.td_type_avg_3 = avg_avg_avg; // 主管科长
+        } else { // 不可平均分配
+            td_type_3_r = $scope.td_type_3 - td_type_3_t; // 获取可平均分配值
+            td_type_3_avg = td_type_3_r / 3; // 检测员,保管员可平均分配值
+            td_type_3_s = td_type_3_avg + td_type_3_t;// 主管科长(余数+平均)
+
+            $scope.td_type_avg_1 = td_type_3_avg; // 检测员可平均分配值
+            $scope.td_type_avg_2 = td_type_3_avg; // 保管员可平均分配值
+            $scope.td_type_avg_3 = td_type_3_s; // 主管科长(余数+平均)
+        }
+    };
+    $scope.calculateMethod();
+
+
+    // 获取该行数据
+    $scope.getListData = function (item) {
+        console.log(item, '获取该行数据');
+        // console.log(item.id, '获取该行数据id');
+        $scope.layernumber = item.layernumber;
+        // var number = item.layernumber
+        // 根据每行id拿到每层全部数据
+        // 点温表格
+        temperatureRecordService.findByTempTable(items.id).then(function (data) {
+            var detailList = data.data;
+
+            var trNum = 0;
+            /**
+             *  $scope.td_type_5_avg_true = true;
+             $scope.td_type_5_avg_p_true = true;
+             $scope.td_type_5_avg $scope.td_type_5_avg_p
+             */
+            // 高低温报警
+            var tallTemp = $rootScope.warningValueList[$scope.vCfCode] == undefined
+                ? 100 : $rootScope.warningValueList[$scope.vCfCode].high == undefined
+                    ? 100 : $rootScope.warningValueList[$scope.vCfCode].high; // 一般不超过3000℃
+            var lowTemp = $rootScope.warningValueList[$scope.vCfCode] == undefined
+                ? -274 : $rootScope.warningValueList[$scope.vCfCode].low == undefined
+                    ? -274 : $rootScope.warningValueList[$scope.vCfCode].low; // 绝对0度为-273.15℃
+            /*console.log('tallTemp: ' + tallTemp);
+            console.log('lowTemp: ' + lowTemp);*/
+            // 层
+            // for (var key_z in detailList) {
+            // var key_z = 1;
+            // 天津库要求1层为最底层最大层数.
+            // console.log($scope.layernumber, '$scope.layernumber')
+            // 行
+            for (var key_x in detailList[$scope.layernumber]) {
+                // console.log(key_x,"key_x");
+                // 列
+                for (var key_y in detailList[$scope.layernumber][key_x]) {
+                    // console.log(key_y,"key_y")
+                    // key_y = 100 / (key_y+1) + '%';
+                    // console.log(key_y)
+                    // 判断只在第一行上方添加列
+
+                    // 温度
+                    for (var obj in detailList[$scope.layernumber][key_x][key_y]) {
+                        var temp = detailList[$scope.layernumber][key_x][key_y][obj].temp;
+                        // 过滤高低温设备异常报警
+                        
+                        if (temp == 250) { // 250设备异常
+                            $("#t_body tr").eq(trNum + 1).append(
+                                "<td colspan='" + $scope.td_type_5_avg + "' style=\"border-style: none;text-align: center;color: red;\">"
+                                + '-100' + "</td>"
+                            );
+                        } else {
+                            if (temp >= tallTemp) { // 高温报警
+                                $("#t_body tr").eq(trNum + 1).append(
+                                    "<td colspan='" + $scope.td_type_5_avg + "' style=\"border-style: none;text-align: center;color: red;\">"
+                                    + "<acronym title=\"粮温高限报警为: " + tallTemp + "℃\">"
+                                    + temp + "</td>"
+                                );
+                            } else if (temp <= lowTemp) { // 低温报警
+                                $("#t_body tr").eq(trNum + 1).append(
+                                    "<td colspan='" + $scope.td_type_5_avg + "' style=\"border-style: none;text-align: center;color: blue;\">"
+                                    + "<acronym title=\"粮温低限报警为: " + lowTemp + "℃\">"
+                                    + temp + "</td>"
+                                );
+                            } else { // 正常值
+                                if(temp ==item.lmax){
+                                    $("#t_body tr").eq(trNum + 1).append(
+                                        "<td colspan='" + $scope.td_type_5_avg + "' style=\"border-style: none;text-align: center;background-color:#ff9931;color:#fff;\">"
+                                        + temp + "</td>"
+                                    );
+                                }
+                                else if(temp ==item.lmin){
+                                    $("#t_body tr").eq(trNum + 1).append(
+                                        "<td colspan='" + $scope.td_type_5_avg + "' style=\"border-style: none;text-align: center;background-color:#199ec6;color:#fff;\">"
+                                        + temp + "</td>"
+                                    );
+                                }else{
+                                    $("#t_body tr").eq(trNum + 1).append(
+                                        "<td colspan='" + $scope.td_type_5_avg + "' style=\"border-style: none;text-align: center;\">"
+                                        + temp + "</td>"
+                                    );
+                                }
+                                
+                            }
+                        }
+                    }
+                }
+                $("#t_body").append("<tr></tr>");
+                trNum++;
+            }
+            $("#t_body").append("<tr></tr>");
+            trNum++;
+            // 去除多余tr
+            $("#t_body").find("tr:last").remove();
+            /*// 去除多余tr
+            var max = $("#t_body tr:last").index();//获取最后一行的索引值
+            //获取比上面索引值小三的行，删除就行
+            var get = max - 4;//注意这里是减四
+            $("#t_body tr:gt(" + get + ")").remove();*/
+        });
+        // });
+
+        // 初始参数
+        var params = [];
+        params.layerAllData = $scope.layerAllData;
+        params.list = item;
+        // params.number = item.layernumber
+        $uibModal.open({
+            size: 'lg',
+
+            templateUrl: 'app/intelligent/grainDetection/views/humitureDetection3D-list.html',
+            controller: 'humitureDetection3D-listCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
+
+    //关闭弹窗
+    $scope.cancel = function () {
+        $uibModalInstance.close();
+    };
+
+});

depot-web/src/main/resources/static/app/intelligent/grainDetection/controller/humitureDetectionModel.js

@@ -200,17 +200,17 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
             var key_z = 1;
             // console.log("length: ",Object.keys(detailList).length);
             // 天津库要求1层为最底层最大层数.
-            for (var i = Object.keys(detailList).length; i > 0; i--) {
+            for (var i=1;i<= Object.keys(detailList).length; i++) {
                 // console.log(i);
                 if ($scope.td_type_5_avg_true) {
                     $("#t_body tr").eq(trNum).append(
                         "<td colspan='" + $scope.td_type_5_avg + "' style=\"border: 1px solid #000;text-align: center;\">"
-                        + key_z + '层' + "</td>"
+                        + i + '层' + "</td>"
                     );
                 } else {
                     $("#t_body tr").eq(trNum).append(
                         "<td colspan='" + $scope.td_type_5_avg_p + "' style=\"border: 1px solid #000;text-align: center;width:5%;\">"
-                        + key_z + '层' + "</td>"
+                        + i + '层' + "</td>"
                     );
                 }
                 // 行
@@ -585,6 +585,27 @@ angular.module('app.intelligent').controller("humitureDetectionModel", function
             }
         });
     };
+
+    // 仓房展示
+    $scope.vCfCode3DShow = function () {
+        var params = items;
+        params.vCfCode = items.vCfCode; // 仓房编码
+        // params.time = items.time; // 检测时间
+        params.id = items.id;
+        $uibModal.open({
+            size: 'lg',
+            // templateUrl: 'app/intelligent/grainInspect/views/grainSituationComparison-model.html',
+            templateUrl: 'app/intelligent/grainDetection/views/humitureDetection3D.html',
+            controller: 'humitureDetection3DCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
     // 粮情对比
     $scope.vCfCodeGSituationComparison = function () {
         var params = [];

depot-web/src/main/resources/static/app/intelligent/grainDetection/views/humitureDetection-model.html

@@ -9,6 +9,7 @@
         <div style="width: 100%;margin-top:-15px;text-align: left;">
             <!--<a class="btn btn-default btn-sm" ng-click="vCfCodeGrainSituationTrend()"> <i class="fa fa-search"></i>&nbsp;粮情趋势</a>
             <a class="btn btn-default btn-sm" ng-click="vCfCodeGSituationComparison()"> <i class="fa fa-search"></i>&nbsp;粮情对比</a>-->
+            <a class="btn btn-default btn-sm" ng-click="vCfCode3DShow()"> <i class="fa fa-language"></i>&nbsp;仓房展示</a>
             <a class="btn btn-default btn-sm"
                href="3Dlc/index.html?orgId={{orgId}}&vCfCode={{vCfCode}}&id={{id}}&libraryType=0" target="_blank"> <i
                     class="fa fa-search"></i>&nbsp;三维图展示</a>

depot-web/src/main/resources/static/app/intelligent/grainDetection/views/humitureDetection3D-list.html

@@ -0,0 +1,99 @@
+<div id="content1">
+    <!-- <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;
+        </button>
+        <h4 class="modal-title" id="myModalLabel">3D展示图</h4>
+
+    </div> -->
+    <div class="layer-title">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;
+        </button>
+        <h5><span> 第{{ layernumber }}层</span> <span>层高温： {{ lmax }} ℃</span> <span>层低温：{{ lmin }} ℃ </span> <span>层均温：{{ lavg }}℃</span>
+        </h5>
+    </div>
+    <div class="modal-body">
+        <!-- 该行全部数据 -->
+        <!-- <table>
+            <tr ng-repeat= 'item in layerAllData'>
+                <td ng-repeat = 'i in item'> {{i.temp}}</td>
+            </tr>
+        </table> -->
+        <table  class="table table-bordered table-striped" style="table-layout: fixed;border-collapse:collapse; width:100%; margin-bottom:0;">
+            <tbody id="t_body">
+            <tr></tr>
+            <tr></tr>
+            </tbody>
+        </table>
+        <div ng-repeat='itemArr in layerAllData'>
+            <!-- {{itemArr}} -->
+            <div ng-repeat = 'item in itemArr'>
+                <!-- {{item}} -->
+                <div ng-repeat = 'i in item' >
+                    <!-- {{i}} -->
+                    <div ng-repeat = 'a in i' ng-if="a.z ==layernumber">
+                        {{ a.temp }}
+                        <!-- <div ng-repeat = 'b in a'>
+                            {{b.temp}}
+                        </div> -->
+                        <table>
+                            <tr>
+                                <td ng-if='a.x==1'>
+                                    {{a.temp}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td ng-if='a.x==2'>
+                                    {{a.temp}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td ng-if='a.x==3'>
+                                    {{a.temp}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td ng-if='a.x==4'>
+                                    {{a.temp}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td ng-if='a.x==5'>
+                                    {{a.temp}}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td ng-if='a.x==6'>
+                                    {{a.temp}}
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<style ng-scoped>
+    /* .layer-content {
+    text-align: center;
+    width: 800px;
+    background-color: cadetblue;
+    opacity: 0.6;
+} */
+
+    .layer-title h5 {
+        height: 30px;
+        font-weight: 600;
+        font-size: 16px;
+        line-height: 30px;
+        text-align: center;
+        border-bottom: 1px solid #000;
+    }
+
+    .close {
+        line-height: 30px;
+        margin-right: 15px;
+    }
+</style>

depot-web/src/main/resources/static/app/intelligent/grainDetection/views/humitureDetection3D.html

@@ -0,0 +1,103 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;
+        </button>
+        <h4 class="modal-title" id="myModalLabel">仓房展示</h4>
+    </div>
+    <div class="modal-body">
+        <div class="cengdata" >
+            <img src="styles/img/grainDetection/7层1.png" style="height: 500px;width: 750px;" alt="">
+            <div class="storehouseInTemp">
+                <span>气温：{{outtemp}}℃</span>
+                <span>气湿：{{outh}} %</span>
+                <span>仓温：{{intemp}} ℃</span>
+                <span>仓湿：{{inh}} %</span>
+            </div>
+            <div class="storehouseOutTemp">
+                <span>最高温：{{max}} ℃</span>
+                <span>最低温：{{min}} ℃</span>
+                <span>平均温：{{avg}} ℃</span>
+            </div>
+            <ul id ='layerData' >
+                <li ng-click='getListData(item)' ng-repeat='item in layerData'>
+                    <span>层高温：{{ item.lmax }} ℃</span><span>层低温：{{ item.lmin }} ℃</span><span>层均温：{{ item.lavg }} ℃</span><span>第 {{ item.layernumber }} 层</span>
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+<style scoped>
+    .modal-content {
+        text-align: center;
+        width: 800px;
+        
+    }
+    .close {
+        font-size: 30px;
+        font-weight: 600;
+        color: #000;
+    }
+    .modal-title {
+        font-weight: 600;
+        font-size: 24px;
+    }
+    .cengdata img {
+        position: relative;
+
+    }
+    .storehouseInTemp {
+        position: absolute;
+        top: 32px;
+        left:150px;
+        color: #fff;
+    }
+    .storehouseInTemp span {
+        padding-right: 15px;
+    }
+    .storehouseOutTemp {
+        position: absolute;
+        top: 62px;
+        left:150px;
+        color: #fff;
+    }
+    .storehouseOutTemp span {
+        padding-right: 15px;
+    }
+    /* .storehouseOutTemp span:last-child {
+        padding-left: 20px;
+    } */
+
+    #layerData {
+        padding: 0;
+        left:0;
+    }
+    .cengdata ul {
+        position: absolute;
+        bottom: 110px;
+        /* left: 135px; */
+
+    }
+    .cengdata li {
+        list-style: none;
+        /* display: block; */
+        width: 650px;
+        height: 35px;
+        line-height: 35px;
+        color: #fff;
+        cursor:pointer;
+    }
+    .cengdata li span {
+         margin-right: 15px;
+    }
+    .cengdata li span:last-child {
+        /* color: red; */
+        margin-left: 40px;
+        float: right;
+        
+    }
+    /* .modal-body {
+         background-color:rgb(160 160 167 / 1); 
+    } */
+</style>