智能仓房-气象修改

src/main/resources/static/app/intelligent/weather/controller/wertherinfoCtrl.js

@@ -14,7 +14,7 @@ angular.module('app.intelligent').controller("wertherinfoCtrl", function ($scope
             $scope.pageInfo = data.data;
             $scope.werther = data.data.list[0];
         },function(data){
-            // console.log(data);
+            console.log(data);
         });
     };
     $scope.loadData();
@@ -66,7 +66,7 @@ angular.module('app.intelligent').controller("wertherinfoCtrl", function ($scope
     // 返回,取消
     $scope.retList = function () {
         $rootScope.back();
-    }
+    };
 
     // 数据同步
     $scope.synchronization = function() {
@@ -82,6 +82,7 @@ angular.module('app.intelligent').controller("wertherinfoCtrl", function ($scope
             // console.log(data);
         });
     };
+
 })
 
 .controller("wertherinfoSaveCtrl", function($scope, $state, $rootScope, $stateParams,$filter, APP_CONFIG, wertherinfoService) {
@@ -101,15 +102,15 @@ angular.module('app.intelligent').controller("wertherinfoCtrl", function ($scope
     };
 
     // 生成5位数字随机数 length->位数从0开始,max->每位上的最大值向下取整
-    $scope.getRandom = function (length,max) {
+    /*$scope.getRandom = function (length,max) {
         var code = "";
         for (var i = 0; i < length; i++) {
             code += Math.floor(Math.random() * max);
         }
         return code;
-    };
+    };*/
 
-    if ($stateParams.id != '0') { // 新增,修改
+    if ($stateParams.id != '0') { // 修改,查看
         $scope.isNotEdit = $stateParams.isNotEdit;
         $scope.notEditNum = true;
         $scope.notDisplay = false;
@@ -117,7 +118,7 @@ angular.module('app.intelligent').controller("wertherinfoCtrl", function ($scope
             $scope.notDisplay = false;
         }
         $scope.loadDataById($stateParams.id);
-    } else if ($stateParams.id == '0') {
+    } else if ($stateParams.id == '0') {  // 新增
         // 获取5位随机数-气象站编码
         // $scope.wertherinfo.vqxzcode = $scope.getRandom(5,10);
         $scope.notEditNum = true;

src/main/resources/static/app/intelligent/weather/views/weather-index.html

@@ -7,7 +7,7 @@
         <font color="#333" size="5"><b>{{werther.fhumi}}</b></font>
     </div>
     <div id="fpressure" style="text-align: center;z-index:10;">
-        <font color="#333" size="5"><b>{{werther.frain}}</b></font>
+        <font color="#333" size="5"><b>{{werther.ftotalrain}}</b></font>
     </div>
     <div id="fwinds" style="text-align: center;z-index:10;">
         <font color="#333" size="5"><b>{{werther.fwinds}}</b></font>

src/main/resources/static/app/intelligent/weather/views/weatherDetection-list.html

@@ -13,7 +13,7 @@
                     </header>
                     <div class="dt-toolbar">
                         <div class="col-xs-12 col-sm-12">
-                            <a class="btn btn-default btn-sm" ng-click="sendNowWeatherDetection()"> <i class="fa fa-search"></i>&nbsp;气象检测</a>
+                            <a has-botton="2" class="btn btn-default btn-sm" ng-click="sendNowWeatherDetection()"> <i class="fa fa-search"></i>&nbsp;气象检测</a>
                         </div>
                     </div>
                     <div>
@@ -22,7 +22,7 @@
 
                                 <table class="table table-striped table-bordered table-hover" width="100%">
                                     <tbody><tr>
-                                        <th colspan="7" style="text-align:center;vertical-align:middle;">实时天气</th>
+                                        <th colspan="8" style="text-align:center;vertical-align:middle;">实时天气</th>
                                     </tr>
                                     <tr>
                                         <th data-class="expand" style="text-align:center;">站点名称</th>
@@ -31,6 +31,7 @@
                                         <th data-class="expand" style="text-align:center;">风速</th>
                                         <th data-class="expand" style="text-align:center;">风向</th>
                                         <th data-class="expand" style="text-align:center;">气压</th>
+                                        <th data-class="expand" style="text-align:center;">降雨量</th>
                                         <th data-class="expand" style="text-align:center;">检测时间</th>
                                     </tr>
                                     <tr>
@@ -40,6 +41,7 @@
                                         <td style="text-align:center;">{{werther.fwinds}}</td>
                                         <td style="text-align:center;">{{werther.fwindd}}</td>
                                         <td style="text-align:center;">{{werther.fpressure}}</td>
+                                        <td style="text-align:center;">{{werther.ftotalrain}}</td>
                                         <td style="text-align:center;">{{werther.updateTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                     </tr>
                                     </tbody>

src/main/resources/static/app/intelligent/weather/views/wertherinfo-edit.html

@@ -13,108 +13,61 @@
                     <div>
                         <!-- widget content -->
                         <div class="widget-body no-padding">
-                            <form id="basicGrainSetEdit-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate">
+                            <form id="basicGrainSetEdit-form" class="smart-form ng-pristine ng-valid"
+                                  data-validator-option="validateOptions" novalidate="novalidate">
                                 <header>
-                                    <a href-void class="btn btn-default btn-xs" ng-click="retList()"><i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
+                                    <a href-void class="btn btn-default btn-xs" ng-click="retList()"><i
+                                            class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
                                     &nbsp;<strong>气象站信息设置详情</strong>
                                     <span class="pull-right font-xs">带*的部分必须填写</span>
                                 </header>
-                                <table class="table table-striped table-bordered table-hover" width="100%">
-                                    <fieldset>
-                                        <div class="row">
-                                            <section class="col col-3">
-                                                <label class="label">湿度:</label>
-                                                <label class="input">
-                                                    <input type="text" ng-model="wertherinfo.fhumi" ng-disabled="isNotEdit"
-                                                           ng-keyup="clearNoNum(wertherinfo,'fhumi')"
-                                                           name="fhumi" maxlength="10">
-                                                </label>
-                                            </section>
-                                            <section class="col col-3">
-                                                <label class="label">风速:</label>
-                                                <label class="input">
-                                                    <input type="text" ng-model="wertherinfo.fwinds" ng-disabled="isNotEdit"
-                                                           ng-keyup="clearNoNum(wertherinfo,'fwinds')"
-                                                           name="fwinds" maxlength="10">
-                                                </label>
-                                            </section>
-                                            <section class="col col-3">
-                                                <label class="label">风向:</label>
-                                                <label class="input">
-                                                    <input type="text" ng-model="wertherinfo.fwindd" ng-disabled="isNotEdit"
-                                                           ng-keyup="clearNoNum(wertherinfo,'fwindd')"
-                                                           placeholder="正北0,正东90,正南180,正西270" name="fwindd" maxlength="10">
-                                                </label>
-                                            </section>
-                                            <section class="col col-3">
-                                                <label class="label">气压:</label>
-                                                <label class="input">
-                                                    <input type="text" ng-model="wertherinfo.fpressure" ng-disabled="isNotEdit"
-                                                           ng-keyup="clearNoNum(wertherinfo,'fpressure')"
-                                                           name="fpressure" maxlength="10">
-                                                </label>
-                                            </section>
-                                        </div>
-                                        <div class="row">
-                                            <section class="col col-3">
-                                                <label class="label">温度:</label>
-                                                <label class="input">
-                                                    <input type="text" name="ftemp" ng-model="wertherinfo.ftemp"
-                                                           ng-keyup="clearNoNum(wertherinfo,'ftemp')"
-                                                           ng-disabled="isNotEdit" maxlength="50">
-                                                </label>
-                                            </section>
-                                            <section class="col col-3">
-                                                <label class="label">气象站名称:<span style="color: red;">*</span></label>
-                                                <label class="input">
-                                                    <input type="text" maxlength="50" ng-model="wertherinfo.vqxzname"
-                                                           ng-disabled="isNotEdit" name="vqxzname" required>
-                                                </label>
-                                            </section>
-                                            <section class="col col-3">
-                                                <label class="label">降雨量:</label>
-                                                <label class="input">
-                                                    <input type="text" ng-model="wertherinfo.frain" ng-disabled="isNotEdit"
-                                                           ng-keyup="clearNoNum(wertherinfo,'frain')"
-                                                           name="frain" maxlength="10">
-                                                </label>
-                                            </section>
-                                            <section class="col col-3">
-                                                <label class="label">备注:</label>
-                                                <label class="input">
-                                                    <input type="text" ng-model="wertherinfo.remark" ng-disabled="isNotEdit"
-                                                           name="remark" maxlength="200">
-                                                </label>
-                                            </section>
-                                        </div>
-                                        <div class="row">
-                                            <section class="col col-3">
-                                                <label class="label">站点编码:&emsp;</label>
-                                                <label class="select">
-                                                    <select ng-model="wertherinfo.sitecode" name="sitecode"
-                                                            ng-options="station.sitecode as station.sitename for station in stations"
-                                                            ng-disabled="isNotEdit" class="form-control">
-                                                        <option value="">--请选择--</option>
-                                                    </select>
-                                                </label>
-                                            </section>
-                                            <section class="col col-3" ng-hide="notDisplay">
-                                                <label class="label">气象站编码:</label>
-                                                <label class="input">
-                                                    <input type="text" ng-model="wertherinfo.vqxzcode"
-                                                           ng-blur="itExistCode(wertherinfo.vqxzcode,'')"
-                                                           ng-disabled="notEditNum" name="vqxzcode" maxlength="5">
-                                                </label>
-                                            </section>
-                                        </div>
-                                    </fieldset>
-                                    <div class="form-actions">
-                                        <footer class="text-align-center">
-                                            <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
-                                            <button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">保存</button>
-                                        </footer>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label">库点名称:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="depotInfo.orgName" ng-disabled="true"
+                                                       name="orgName">
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">站点编号:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="wertherinfo.sitecode" ng-disabled="true"
+                                                       name="sitecode" placeholder="站点编号自动生成无需填写.">
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">气象站编号:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="wertherinfo.vqxzcode" ng-disabled="true"
+                                                       name="vqxzcode" placeholder="气象站编号自动生成无需填写.">
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">气象站名称:<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input type="text" maxlength="50" ng-model="wertherinfo.vqxzname"
+                                                       ng-disabled="isNotEdit" name="vqxzname" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">备注:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="wertherinfo.remark" ng-disabled="isNotEdit"
+                                                       name="remark" maxlength="200">
+                                            </label>
+                                        </section>
                                     </div>
-                                </table>
+                                </fieldset>
+                                <div class="form-actions">
+                                    <footer class="text-align-center">
+                                        <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
+                                        <button type="button" class="btn btn-primary" ng-hide="isNotEdit"
+                                                ng-click="save()">保存
+                                        </button>
+                                    </footer>
+                                </div>
                             </form>
                         </div>
                     </div>

src/main/resources/static/app/intelligent/weather/views/wertherinfo-list.html

@@ -41,11 +41,9 @@
                                     <tr>
                                         <th data-class="expand" style="text-align:center;">序号</th>
                                         <th data-class="expand" style="text-align:center;">库点名称</th>
+                                        <th data-class="expand" style="text-align:center;">站点编号</th>
+                                        <th data-class="expand" style="text-align:center;">气象站编号</th>
                                         <th data-class="expand" style="text-align:center;">气象站名称</th>
-                                        <th data-class="expand" style="text-align:center;">温度</th>
-                                        <th data-class="expand" style="text-align:center;">风速</th>
-                                        <th data-class="expand" style="text-align:center;">气压</th>
-                                        <th data-class="expand" style="text-align:center;">降雨量</th>
                                         <th data-class="expand" style="text-align:center;">更新时间</th>
                                         <th data-class="expand" style="text-align:center;">操作</th>
                                     </tr>
@@ -55,11 +53,9 @@
                                     <tr ng-repeat="wertherinfo in pageInfo.list">
                                         <td style="text-align:center;">{{ $index + 1 }}</td>
                                         <td style="text-align:center;">{{ depotInfo.orgName }}</td>
+                                        <td style="text-align:center;">{{ wertherinfo.sitecode }}</td>
+                                        <td style="text-align:center;">{{ wertherinfo.vqxzcode }}</td>
                                         <td style="text-align:center;">{{ wertherinfo.vqxzname }}</td>
-                                        <td style="text-align:center;">{{ wertherinfo.ftemp }}</td>
-                                        <td style="text-align:center;">{{ wertherinfo.fwinds }}</td>
-                                        <td style="text-align:center;">{{ wertherinfo.fpressure }}</td>
-                                        <td style="text-align:center;">{{ wertherinfo.frain }}</td>
                                         <td style="text-align:center;">{{ wertherinfo.updatetime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
                                             <a ng-click="showView(wertherinfo.id)"><i class="fa fa-info-circle"></i>查看&nbsp;</a>&emsp;