首页 探索 帮助
注册 登录
depot-tianjin
/
depot-web-tianjin
关注 6
点赞 0
派生 0
文件 工单管理 0 合并请求 1 Wiki
浏览代码

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

fanxw 1 年之前
父节点
264745c005 ee0122a4c7
当前提交
cbac4c3ce3
共有 2 个文件被更改，包括 26 次插入 和 26 次删除
分列视图 显示文件统计
  1. 13 13
      src/main/resources/static/app/storage/grainCard/views/addDailyTest.html
  2. 13 13
      src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

+ 13 - 13
src/main/resources/static/app/storage/grainCard/views/addDailyTest.html
查看文件 

@@ -30,36 +30,36 @@
30 30 
                                     <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
31 31 
                                         <tbody>
32 32 
                                         <tr>
33 
-                                            <td class="text-center" rowspan="2" colspan="2" style="vertical-align: middle;">检查日期</td>
34 
-                                            <td class="text-center" colspan="3" style="vertical-align: middle;">虫害检查</td>
35 
-                                            <td class="text-center"  rowspan="2" style="vertical-align: middle;">雨后检查</td>
36 
-                                            <td class="text-center" rowspan="2" style="vertical-align: middle;">鼠雀检查</td>
37 
-                                            <td class="text-center" rowspan="2" style="vertical-align: middle;">其他检查</td>
38 
-                                            <td class="text-center"  colspan="2"  rowspan="2" style="vertical-align: middle;">发现问题及处理情况</td>
39 
-                                            <td class="text-center"  colspan="2"  rowspan="2" style="vertical-align: middle;">操作</td>
33 
+                                            <td class="text-center" rowspan="1" colspan="2" style="vertical-align: middle;">检查日期</td>
34 
+                                            <!--<td class="text-center" colspan="3" style="vertical-align: middle;">虫害检查</td>-->
35 
+                                            <td class="text-center"  rowspan="1" style="vertical-align: middle;">雨后检查</td>
36 
+                                            <td class="text-center" rowspan="1" style="vertical-align: middle;">鼠雀检查</td>
37 
+                                            <td class="text-center" rowspan="1" colspan="2" style="vertical-align: middle;">其他检查</td>
38 
+                                            <td class="text-center"  colspan="4"  rowspan="1" style="vertical-align: middle;">发现问题及处理情况</td>
39 
+                                            <td class="text-center"  colspan="2"  rowspan="1" style="vertical-align: middle;">操作</td>
40 40 
                                         </tr>
41 
-                                        <tr>
41 
+                                        <!--<tr>
42 42 
                                             <td class="text-center" >部位</td>
43 43 
                                             <td class="text-center">密度(头/公斤)</td>
44 44 
                                             <td class="text-center">春虫虫种</td>
45 
-                                        </tr>
45 
+                                        </tr>-->
46 46 
                                         <tr  ng-repeat="dailyCard in dailyCardList">
47 47 
                                             <td class="text-center" colspan="2" style="vertical-align: middle;">
48 48 
                                                 {{dailyCard.checkTime | date:'yyyy-MM-dd' }}
49 49 
                                             </td>
50 
-                                            <td class="text-center" style="vertical-align: middle;">{{dailyCard.pestsPosition}}</td>
50 
+                                            <!--<td class="text-center" style="vertical-align: middle;">{{dailyCard.pestsPosition}}</td>
51 51 
                                             <td class="text-center" style="vertical-align: middle;">{{dailyCard.pestsDensity}}</td>
52 52 
                                             <td class="text-center" style="vertical-align: middle;">
53 53 
                                                 <span ng-if="dailyCard.pestsSpecies == null ">无</span>
54 54 
                                                 <span ng-if="dailyCard.pestsSpecies != null ">{{dicData[dailyCard.pestsSpecies]}}</span>
55 
-                                            </td>
55 
+                                            </td>-->
56 56 
                                             <td class="text-center" style="vertical-align: middle;">{{dailyCard.rainCheck}}</td>
57 57 
                                             <td class="text-center" style="vertical-align: middle;">
58 58 
                                                 <span ng-if="dailyCard.ratfinchCheck == '0' ">无</span>
59 59 
                                                 <span ng-if="dailyCard.ratfinchCheck == '1' ">有</span>
60 60 
                                             </td>
61 
-                                            <td class="text-center" style="vertical-align: middle;">{{dailyCard.otherCheck}}</td>
62 
-                                            <td class="text-center" colspan="2" style="vertical-align: middle;">
61 
+                                            <td class="text-center" colspan="2" style="vertical-align: middle;">{{dailyCard.otherCheck}}</td>
62 
+                                            <td class="text-center" colspan="4" style="vertical-align: middle;">
63 63 
                                                 <div ng-if="dailyCard.flagType == 1">
64 64 
                                                     <textarea ng-model="dailyCard.findQuestion" style="width:100%;">{{dailyCard.findQuestion}}</textarea>
65 65 
                                                 </div>

+ 13 - 13
src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html
查看文件 

@@ -1280,52 +1280,52 @@
1280 1280 
                                     style="table-layout: fixed;border-collapse:collapse;border:none;" border="1">
1281 1281 
                                     <tbody>
1282 1282 
                                     <tr>
1283 
-                                        <td class="text-center" rowspan="2" colspan="2" width="150px" style="vertical-align: middle;text-align: center;">
1283 
+                                        <td class="text-center" rowspan="1" colspan="2" width="150px" style="vertical-align: middle;text-align: center;">
1284 1284 
                                             检查日期
1285 1285 
                                         </td>
1286 
-                                        <td class="text-center" colspan="3" style="vertical-align: middle;text-align: center;">
1286 
+                                        <!--<td class="text-center" colspan="3" style="vertical-align: middle;text-align: center;">
1287 1287 
                                             虫害检查
1288 
-                                        </td>
1289 
-                                        <td class="text-center" rowspan="2" style="vertical-align: middle;text-align: center;">
1288 
+                                        </td>-->
1289 
+                                        <td class="text-center" rowspan="1" style="vertical-align: middle;text-align: center;">
1290 1290 
                                             雨后检查
1291 1291 
                                         </td>
1292 
-                                        <td class="text-center" rowspan="2" style="vertical-align: middle;text-align: center;">
1292 
+                                        <td class="text-center" rowspan="1" style="vertical-align: middle;text-align: center;">
1293 1293 
                                             鼠雀检查
1294 1294 
                                         </td>
1295 
-                                        <td class="text-center" rowspan="2" style="vertical-align: middle;text-align: center;">
1295 
+                                        <td class="text-center" rowspan="1" colspan="2" style="vertical-align: middle;text-align: center;">
1296 1296 
                                             其他检查
1297 1297 
                                         </td>
1298 
-                                        <td class="text-center" width="260px" colspan="2" rowspan="2"
1298 
+                                        <td class="text-center" width="520px" colspan="4" rowspan="1"
1299 1299 
                                             style="vertical-align: middle;text-align: center;">发现问题及处理情况
1300 1300 
                                         </td>
1301 1301 
                                     </tr>
1302 
-                                    <tr>
1302 
+                                    <!--<tr>
1303 1303 
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">部位</td>
1304 1304 
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">密度(头/公斤)</td>
1305 1305 
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">春虫虫种</td>
1306 
-                                    </tr>
1306 
+                                    </tr>-->
1307 1307
1308 1308 
                                     <tr ng-repeat="dailyCard in dailyCardList">
1309 1309 
                                         <td class="text-center" colspan="2" height="45px" style="vertical-align: middle;text-align: center;">
1310 1310 
                                             {{dailyCard.checkTime  | date :'yyyy-MM-dd'}}
1311 1311 
                                         </td>
1312 
-                                        <td class="text-center" style="vertical-align: middle;text-align: center;">
1312 
+                                        <!--<td class="text-center" style="vertical-align: middle;text-align: center;">
1313 1313 
                                             {{dailyCard.pestsPosition}}</td>
1314 1314 
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">
1315 1315 
                                             {{dailyCard.pestsDensity}}</td>
1316 1316 
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">
1317 1317 
                                             <span ng-if="dailyCard.pestsSpecies == null ">无</span>
1318 1318 
                                             <span ng-if="dailyCard.pestsSpecies != null ">{{dicData[dailyCard.pestsSpecies]}}</span>
1319 
-                                        </td>
1319 
+                                        </td>-->
1320 1320 
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">
1321 1321 
                                             {{dailyCard.rainCheck}}</td>
1322 1322 
                                         <td class="text-center" style="vertical-align: middle;text-align: center;">
1323 1323 
                                             <span ng-if="dailyCard.ratfinchCheck == 0 ">无</span>
1324 1324 
                                             <span ng-if="dailyCard.ratfinchCheck == 1 ">有</span>
1325 1325 
                                         </td>
1326 
-                                        <td class="text-center" style="vertical-align: middle;text-align: center;">
1327 
-                                            {{dailyCard.otherCheck}}</td>
1328 1326 
                                         <td class="text-center" colspan="2" style="vertical-align: middle;text-align: center;">
1327 
+                                            {{dailyCard.otherCheck}}</td>
1328 
+                                        <td class="text-center" colspan="4" style="vertical-align: middle;text-align: center;">
1329 1329 
                                             {{dailyCard.findQuestion}}
1330 1330 
                                         </td>
1331 1331 
                                     </tr>