Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin

src/main/resources/static/app/intelligent/aeration/controller/aerationJobCtrl.js

@@ -180,6 +180,7 @@ angular.module('app.intelligent')
     $scope.save = function () {
     	$scope.aerationJob.tfkssj = $("#tfkssj").val();
     	$scope.aerationJob.tfjssj = $("#tfjssj").val();
+    	$scope.aerationJob.djrq = $("#djrq").val();
     	
     	if (!$scope.saveFlag) {
     		if (validator.form()) {

src/main/resources/static/app/intelligent/aeration/views/aerationJob-edit.html

@@ -170,8 +170,8 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="aerationJob.djrq" ng-disabled="isNotEdit"
-														name="djrq" class="form-control datepicker" required data-smart-datepicker>
+													<input type="text" ng-model="aerationJob.djrq" ng-disabled="isNotEdit" id="djrq"
+														name="djrq" class="form-control datepicker" required onClick="WdatePicker({lang:'zh-cn'})" >
 												</label>
 											</th>
 											<th>
@@ -449,7 +449,7 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="aerationJob.zfdjmj"
+													<input type="text" ng-model="aerationJob.zfdjmjZhi"
 														ng-disabled="isNotEdit" name="zfdjmj" min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
 														class="form-control" />
 												</label>

src/main/resources/static/app/intelligent/grainDetection/controller/insectPestDetectionCtrl.js

@@ -1,6 +1,6 @@
 "use strict";
 angular.module('app.intelligent').controller("insectPestDetectionCtrl", function ($scope, $stateParams, $state, $rootScope, insectPestDetectionService, $interval,archiveService,$filter) {
-
+    // console.log($rootScope);
     // 默认分页
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 筛选条件
@@ -319,7 +319,7 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
 
     // 保存.
     $scope.saveData = function () {
-        console.log($scope.pestList);
+        // console.log($scope.pestList);
         if (!$scope.saveFlag) {
             if (validator.form()) {
                 // 设置saveFlag为true,防止重复提交.
@@ -346,7 +346,7 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
                 });
                 hczlStr = hczlStr.slice(0, hczlStr.length - 1);
                 ckmdzjhStr = ckmdzjhStr.slice(0, ckmdzjhStr.length - 1);
-                console.log(hczlStr, ckmdzjhStr);
+                // console.log(hczlStr, ckmdzjhStr);
                 $scope.insectPests.hczl = hczlStr;
                 $scope.insectPests.ckmdzjh = ckmdzjhStr;
                 //保存熏蒸数据

src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-edit.html

@@ -124,6 +124,23 @@
 												</label>
 											</th>
 										</tr>
+										<tr>
+											<th>
+												<label label class="label" style="margin-top: 9px;text-align: center;">发生部位</label>
+											</th>
+											<th>
+												<section>
+													<label class="input">
+														<input class="form-control" type="text" ng-model="insectPests.fsbw"
+															   name="hckyxfx">
+													</label>
+												</section>
+											</th>
+											<th></th>
+											<th></th>
+											<th></th>
+											<th></th>
+										</tr>
 									</table>
 								</fieldset>
 

src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-list.html

@@ -58,7 +58,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> -->
                                         <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>
@@ -68,19 +68,29 @@
                                     </thead>
 
                                     <tbody>
-                                    <tr ng-repeat="insectPest in pageInfo.list">
+                                    <tr ng-repeat="insectPest in pageInfo.list track by $index" ng-init="parentIndex=$index">
                                         <td style="text-align:center;">{{ $index + 1 }}</td>
                                         <td style="text-align:center;">{{ storeHouseCodeObj[insectPest.vcfcode].storehouseName }}</td>
                                         <td style="text-align:center;">{{ wares[insectPest.vhwid].warehouseName }}</td>
                                         <td style="text-align:center;">{{ insectPest.standor }}</td>
-                                        <td style="text-align:center;">{{ insectPest.standtime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
-                                        <td style="text-align:center;">{{ insectPest.itdh }}</td>
-                                        <td style="text-align:center;">{{ dicData[insectPest.hczl] }}</td>
-                                        <td style="text-align:center;">{{ insectPest.ivalue }}</td>
+                                        <td style="text-align:center;">{{ insectPest.standtime.slice(0, insectPest.standtime.length - 2) | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+                                        <!-- <td style="text-align:center;">{{ insectPest.itdh }}</td> -->
+                                        <td style="text-align:center;">
+                                            <span ng-repeat="cIns in insectPest.hczl.split('#') track by $index">
+                                                <span ng-if="$index < insectPest.ckmdzjh.split('|').length - 1">{{ dicData[cIns] }}&nbsp;|</span>
+                                                <span ng-if="$index >= insectPest.ckmdzjh.split('|').length - 1">{{ dicData[cIns] }}</span>
+                                            </span>
+                                        </td>
+                                        <td style="text-align:center;">
+                                            <span ng-repeat="cIns in insectPest.ckmdzjh.split('|') track by $index">
+                                                <span ng-if="$index < insectPest.ckmdzjh.split('|').length - 1">{{ cIns }}&nbsp;|</span>
+                                                <span ng-if="$index >= insectPest.ckmdzjh.split('|').length - 1">{{ cIns }}</span>
+                                            </span>&nbsp;
+                                        </td>
                                         <td style="text-align:center;">{{ insectPest.vupdatepeople }}</td>
                                         <td style="text-align:center;">{{ insectPest.vupdatetime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
-                                            <a ng-hide="isArchive" ng-hide="insectPest.iTdh == null" href-void ng-click="onlyInsectPestDetection(insectPest.vCfCode)"><i class=""></i>{{storeHouseCodeObj[insectPest.vCfCode].storehouseName}}检测</a>
+                                            <a ng-hide="isArchive" ng-hide="insectPest.iTdh == null" href-void ng-click="onlyInsectPestDetection(insectPest.vcfcode)"><i class=""></i>{{storeHouseCodeObj[insectPest.vcfcode].storehouseName}}检测</a>
                                         </td>
                                     </tr>
                                     </tbody>