1

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -638,17 +638,17 @@
                     <!--温湿度 start-->
                     <li data-menu-collapse>
                         <a has-func="518" href="#">
-                            <i class="fa fa-fw fa-folder-open"></i>温湿度报警
+                            <i class="fa fa-fw fa-folder-open"></i>温湿度预警
                         </a>
                         <ul>
                             <li has-func="519">
-                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.threshold">温湿度报警设置</a>
+                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.threshold">温湿度预警设置</a>
                             </li>
                             <li has-func="520">
-                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.temperature">温度报警</a>
+                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.temperature">温度预警</a>
                             </li>
                             <li has-func="521">
-                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.humidity">湿度报警</a>
+                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.humidity">湿度预警</a>
                             </li>
                         </ul>
                     </li>
@@ -661,10 +661,10 @@
                         </a>
                         <ul>
                             <li has-func="523">
-                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.setUp">储备年限预警设置</a>
+                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.setUp">储备年限报警设置</a>
                             </li>
                             <li has-func="524">
-                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.ageWarning">储备年限预警</a>
+                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.ageWarning">储备年限报警</a>
                             </li>
                         </ul>
                     </li>

src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

@@ -54,6 +54,9 @@
                                                         style="padding:8px 10px;border-radius: 3px;">
                                                     <a class="fa fa-print" style="color:#fff">打印</a>
                                                 </button>
+                                                <button class="btn btn-primary" ng-click="returnTop()" style="padding:8px 10px;border-radius: 3px;">
+                                                    <a class="fa fa-angle" style="color:#fff">返回</a>
+                                                </button>
                                             </th>
                                         </tr>
                                         </thead>
@@ -68,21 +71,21 @@
                                                 <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;"  colspan="8">油罐设计说明</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐名称</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].storehouseName}}</td>
-                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" >使用单位</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{orgName}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >设计单位</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].sjdw}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"  colspan="2">保管员</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">油罐名称</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].storehouseName}}</td>
+                                            	<td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用单位</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{orgName}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计单位</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].sjdw}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" colspan="2">保管员</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐类型</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[tankObj[GrainCardByIdObj.storehouseId].tankType]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >建设年度</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].builddate.toString().substring(0,4)}}</td>
-                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" >油罐容量</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].tankCapacity}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">油罐类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[tankObj[GrainCardByIdObj.storehouseId].tankType]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">建设年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].builddate.toString().substring(0,4)}}</td>
+                                            	<td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">油罐容量</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].tankCapacity}}</td>
                                                 <td rowspan="7" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
                                                     <div style="width:180px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
                                                         <img style="width:180px;height:240px;" src="{{bgyurl}}">
@@ -90,81 +93,81 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">直径(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].diameter}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">储粮品种</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.subType]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">储粮方式</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散装储粮</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">直径(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].diameter}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮品种</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.subType]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">散装储粮</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">使用年限</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tank.synx}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].height}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">底面积(平方米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].bottomArea}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用年限</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tank.synx}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].height}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">底面积(平方米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].bottomArea}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">设计储油高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].designHeight}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">出油口高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].oilHeight}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">检查口高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].insportHeight}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计储油高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].designHeight}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">出油口高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].oilHeight}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">检查口高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].insportHeight}}</td>
                                             </tr>
 
                                             <tr>
                                                 <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;"  colspan="6">储油基本信息</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮油品种</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.subType]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >库存数量(吨)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油品种</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.subType]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮权所属</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{GrainCardByIdObj.grainRights}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">库存数量(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮油性质</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.quality]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入罐年度</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.toString().substring(0,4)}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油性质</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.quality]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入罐年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.inputTime.toString().substring(0,4)}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">生产年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.harvestTime]}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入罐时间(第一车)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入罐时间(最后一车)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.zhycsj}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
-                                                <td colspan="2" rowspan="2" style="vertical-align: middle;text-align: center;" class="text-center">{{tankObj[GrainCardByIdObj.storehouseId].keeperNames}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入罐时间(第一车)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.inputTime}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入罐时间(最后一车)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.zhycsj}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">产地</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.location]}}</td>
+                                                <td colspan="2" rowspan="2" class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].keeperNames}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >业务类型</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">业务类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">
 				                                    <div>
 										                <div ng-if="GrainCardByIdObj.checkTypeNum==2">移库</div>
 										                <div ng-if="GrainCardByIdObj.checkTypeNum==0">入库</div>
 										                <div ng-if="GrainCardByIdObj.checkTypeNum==1">倒仓</div>
 										            </div>
                                                 </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">管理方式</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >储粮方式</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散装储粮</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">管理方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">散装储粮</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >国别</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">中国</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">实际储油高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.csscldg}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">收储地点</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">库内</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">油罐状态</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">封仓</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">国别</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">中国</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">实际储油高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{GrainCardByIdObj.csscldg}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">收储地点</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">库内</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">油罐状态</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">封仓</td>
                                             </tr>
                                             </tbody>
                                         </table>
@@ -173,54 +176,54 @@
                                                 <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;"  colspan="6">质检信息</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">不溶性杂质含量%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">过氧化值(mmol/kg)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">水分及挥发物含量%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">酸价（KOH）/(mg/g)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">溶剂残留量(mg/kg)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">气味、滋味</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不溶性杂质含量%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.insolubleImpurity}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">过氧化值(mmol/kg)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.peroxideValue}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分及挥发物含量%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.waterVolatiles}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.insolubleImpurity}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.peroxideValue}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.waterVolatiles}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.acidValue}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.residualSolvent}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.colorsmell}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">酸价（KOH）/(mg/g)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.acidValue}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">溶剂残留量(mg/kg)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.residualSolvent}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、滋味</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.colorsmell}}</td>
                                             </tr>
                                         </table>
                                         <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
                                             <tr>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡人：{{GrainCardByIdObj.jkr}}</td>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >备注：{{GrainCardByIdObj.remark}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;background-color: #fff;">建卡人：{{GrainCardByIdObj.jkr}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;background-color: #fff;">建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;background-color: #fff;">备注：{{GrainCardByIdObj.remark}}</td>
                                             </tr>
                                         </table>
                                     </div>
                                     <div ng-if="grainCardView.storehouseYG == 2">
                                         <table class="table table-striped table-bordered table-hover" width="100%"
                                                style="table-layout: fixed;border-collapse:collapse;border:none; font-size: 13px;"
-                                               border="1">
+                                               border="5px solid black">
                                             <tbody>
                                             <tr>
                                                 <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="8">粮仓设计说明</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房名称</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].storehouseName}}</td>
-                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">使用单位</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{orgName}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计单位</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].sjdw}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px" colspan="2">保管员</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">仓房名称</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].storehouseName}}</td>
+                                            	<td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用单位</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{orgName}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计单位</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].sjdw}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="2">保管员</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房类型</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.storehouseType]}}</td>
-                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房结构</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[storehouseObj[GrainCardByIdObj.storehouseId].wall]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">建设年度</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].usedate.toString().substring(0,4)}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">仓房类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.storehouseType]}}</td>
+                                            	<td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">仓房结构</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[storehouseObj[GrainCardByIdObj.storehouseId].wall]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">建设年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].usedate.toString().substring(0,4)}}</td>
                                                 <td rowspan="6" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
                                                     <div style="width:180px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
                                                         <img style="width:180px;height:240px;" src="{{bgyurl}}">
@@ -228,85 +231,89 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">储粮品种</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.subType]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">储粮方式</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.keepingWay]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">使用年限</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].sjsynx}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮品种</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.subType]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.keepingWay]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用年限</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].sjsynx}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">内檐高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].heigth}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">内仓长(直径，米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].length}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">内仓宽(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].width}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内檐高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].heigth}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内仓长(直径，米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].length}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内仓宽(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].width}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">设计装粮线高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].grainLineHeigth}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">设计仓容(吨)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].designCapacity}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">核定仓容(吨)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].actualCapacity}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计装粮线高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].grainLineHeigth}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计仓容(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].designCapacity}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">核定仓容(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].actualCapacity}}</td>
                                             </tr>
 
                                             <tr>
                                                 <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;" height="45px" colspan="6">储粮基本信息</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">货位名称</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.warehouseName}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮油品种</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.subType]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">货位名称</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.warehouseName}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮权所属</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{GrainCardByIdObj.grainRights}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油品种</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.subType]}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">库存数量(吨)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">等级</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.ypdj]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮油性质</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.quality]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">库存数量(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">等级</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.ypdj]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油性质</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.quality]}}</td>
                                                 <td colspan="2" style="vertical-align: middle;text-align: center;" class="text-center">{{storehouseObj[GrainCardByIdObj.storehouseId].dutystoreman}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >业务类型</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >业务类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">
                                                 	<div>
 										                <div ng-if="GrainCardByIdObj.checkTypeNum==2">移库</div>
 										                <div ng-if="GrainCardByIdObj.checkTypeNum==0">入库</div>
 										                <div ng-if="GrainCardByIdObj.checkTypeNum==1">倒仓</div>
 										            </div>
                                                 </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">管理方式</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">管理方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{GrainCardByIdObj.storeType == 1 ? "直储" : "代储"}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">生产年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.harvestTime]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">产地</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.location]}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >国别</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">中国</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入仓年度</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.toString().substring(0,4)}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入仓时间(第一车)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间(最后一车)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.zhycsj}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >国别</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">中国</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入仓年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.inputTime.toString().substring(0,4)}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入仓时间(第一车)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.inputTime}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入库时间(最后一车)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">{{grainCardView.zhycsj}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >储粮方式</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散装储粮</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">初始散存粮体积长/宽/高(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.csscldc+'/'+GrainCardByIdObj.csscldk+'/'+GrainCardByIdObj.csscldg}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散存粮体积(立方米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.looseGrainVolume}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">货位状态</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">封仓</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">散装储粮</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">初始散存粮体积长/宽/高(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">
+                                                	<span ng-if="GrainCardByIdObj.csscldc != null">{{GrainCardByIdObj.csscldc +'/'}}</span>
+                                                	<span ng-if="GrainCardByIdObj.csscldk != null">{{GrainCardByIdObj.csscldk +'/'}}</span>
+                                                	<span ng-if="GrainCardByIdObj.csscldg != null">{{GrainCardByIdObj.csscldg}}</span>
+                                                </td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">散存粮体积(立方米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{GrainCardByIdObj.looseGrainVolume}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">货位状态</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">封仓</td>
                                             </tr>
                                             </tbody>
                                         </table>
@@ -316,20 +323,20 @@
                                                 <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="6">质检信息</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">容重(g/L)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">水分%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">杂质%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">不完善粒(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">硬度指数</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">色泽、气味</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">容重(g/L)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.unitWeight}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.water}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">杂质%(总量)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.impurityTotal}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.unitWeight}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.water}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.impurityTotal}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.imperfectgrainsTotal}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.hardIndex}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.colorsmell}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不完善粒(总量)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.imperfectgrainsTotal}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">硬度指数</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.hardIndex}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">色泽、气味</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.colorsmell}}</td>
                                             </tr>
                                         </table>
                                         <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;border-collapse:collapse;border:none; font-size: 13px;"
@@ -338,42 +345,37 @@
                                                 <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">质检信息</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">出糙率%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">整精米率%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">水分%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">杂质%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">谷外糙米%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">互混率%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">黄粒米%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">色泽、气味</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">出糙率%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.huskedRation}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">整精米率%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.fullGoodRation}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.water}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">杂质%(总量)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.impurityTotal}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >{{grainCardView.huskedRation}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.fullGoodRation}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.water}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.impurityTotal}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.outHuskedRation}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.intermixingRate}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.yellowRice}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.colorSmell}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">谷外糙米%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.outHuskedRation}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">互混率%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.intermixingRate}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">黄粒米%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.yellowRice}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">色泽、气味</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.colorSmell}}</td>
                                             </tr>
                                         </table>
                                         <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
                                             <tr>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡人：{{GrainCardByIdObj.jkr}}</td>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
-                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >备注：{{GrainCardByIdObj.remark}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;background-color: #fff;">建卡人：{{GrainCardByIdObj.jkr}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;background-color: #fff;">建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;background-color: #fff;">备注：{{GrainCardByIdObj.remark}}</td>
                                             </tr>
                                         </table>
                                     </div>
-                                    <br/>
-                                    <a href-void class="btn btn-default btn-xs" style="float: right;" ng-click="returnTop()">
-										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
-									</a>
 
                                 </div>
 
-
                                 <div id="Panel_2" style="display:none;">
 
                                     <table class="table table-striped table-bordered table-hover" width="100%"

src/main/resources/static/app/storage/grainCard/views/productGrain-check-G.html

@@ -5,21 +5,21 @@
         <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">粮仓设计说明</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" >仓房名称</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">仓房名称</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.storehouseName}}</td>
-        <td style="vertical-align: middle;text-align: center;" >使用单位</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >使用单位</td>
         <td style="vertical-align: middle;text-align: center;">{{orgInfo.orgName}}</td>
-        <td style="vertical-align: middle;text-align: center;" >设计单位</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计单位</td>
         <td style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].sjdw}}</td>
-        <td style="vertical-align: middle;text-align: center;"  colspan="2">保管员</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" colspan="2">保管员</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >仓房类型</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[storehouseObj[cerealsCard.spareOne].storehouseType]}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >仓房结构</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[storehouseObj[cerealsCard.spareOne].wall]}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >建设年度</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].usedate}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >仓房类型</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[storehouseObj[cerealsCard.spareOne].storehouseType]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >仓房结构</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[storehouseObj[cerealsCard.spareOne].wall]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >建设年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].usedate.toString().substring(0,4)}}</td>
         <td rowspan="7" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
             <div style="width:180px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
                 <img style="width:180px;height:240px;" src="{{cerealsCard.bgyurl}}">
@@ -27,93 +27,93 @@
         </td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">储粮品种</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">储粮方式</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.ccfsName}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">使用年限</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].sjsynx}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮品种</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lypzName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.ccfsName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用年限</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].sjsynx}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">内檐高度(米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].heigth}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">内仓长(直径，米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].length}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">内仓宽(米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].width}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内檐高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].heigth}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内仓长(直径，米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].length}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内仓宽(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].width}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">设计装粮线高度(米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].grainLineHeigth}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">设计仓容(吨)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].designCapacity}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">核定仓容(吨)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].actualCapacity}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计装粮线高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].grainLineHeigth}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计仓容(吨)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].designCapacity}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">核定仓容(吨)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].actualCapacity}}</td>
     </tr>
     <tr>
         <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;" colspan="6">储粮基本信息</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >货位名称</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.warehouseName}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lqss}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">粮油品种</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >货位名称</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.warehouseName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮权所属</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lqss}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油品种</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lypzName}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >库存数量(吨)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">包数</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.js}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">生产日期</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >库存数量(吨)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lysl}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">包数</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.js}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">生产日期</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.scrq}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >入仓年度</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj.toString().substring(0,4)}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">品牌</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.pinp}}</td>
-        <td style="vertical-align: middle;text-align: center;">入仓时间(第一车)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj}}</td>
-        <td style="vertical-align: middle;text-align: center;" colspan="2">{{storehouseObj[cerealsCard.spareOne].dutystoreman}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >入仓年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.rksj.toString().substring(0,4)}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">品牌</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.pinp}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入仓时间(第一车)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.rksj}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;" colspan="2">{{storehouseObj[cerealsCard.spareOne].dutystoreman}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" >入库时间(最后一车)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
-        <td style="vertical-align: middle;text-align: center;">等级/类别</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.lydjCode]}}</td>
-        <td style="vertical-align: middle;text-align: center;">业务类型</td>
-        <td style="vertical-align: middle;text-align: center;">
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >入库时间(最后一车)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.zhycsj}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">等级/类别</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[cerealsCard.lydjCode]}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">业务类型</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">
             <div>
                 <div ng-if="cerealsCard.ywlx==2">移库</div>
                 <div ng-if="cerealsCard.ywlx==0">入库</div>
                 <div ng-if="cerealsCard.ywlx==1">倒仓</div>
             </div>
         </td>
-        <td style="vertical-align: middle;text-align: center;">产地</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[cd]}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">产地</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[cd]}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" >国别</td>
-        <td style="vertical-align: middle;text-align: center;">中国</td>
-        <td style="vertical-align: middle;text-align: center;">粮油性质</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[lyxz]}}</td>
-        <td style="vertical-align: middle;text-align: center;">包装规格(kg/件)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzgg}}</td>
-        <td style="vertical-align: middle;text-align: center;" >保质期</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzq}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">国别</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">中国</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油性质</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[lyxz]}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">包装规格(kg/件)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.bzgg}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >保质期</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.bzq}}</td>
     </tr>
     
     <tr>
-        <td style="vertical-align: middle;text-align: center;">储存方式</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.ccfsName}}</td>
-        <td style="vertical-align: middle;text-align: center;" >管理方式</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.orgId == 76 ? "直储" : "代储"}}</td>
-        <td style="vertical-align: middle;text-align: center;">厂家</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.cj}}</td>
-        <td style="vertical-align: middle;text-align: center;">货位状态</td>
-        <td style="vertical-align: middle;text-align: center;">封仓</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储存方式</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.ccfsName}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >管理方式</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.orgId == 76 ? "直储" : "代储"}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">厂家</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.cj}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">货位状态</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">封仓</td>
     </tr>
     </tbody>
 </table>
@@ -124,28 +124,28 @@
         <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">加工精度</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.storehouseName}}</td>
-        <td style="vertical-align: middle;text-align: center;">碎米(总量)%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.brokenriceTotal}}</td>
-        <td style="vertical-align: middle;text-align: center;">小碎米含量</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.brokenriceSmall}}</td>
-        <td style="vertical-align: middle;text-align: center;">不完善粒(总量)</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.imperfectgrainsTotal}}</td>
-        <td style="vertical-align: middle;text-align: center;">杂质(总量)</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.impurityTotal}}</td>
-    </tr>
-    <tr>
-        <td style="vertical-align: middle;text-align: center;">无机杂质</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.impurityInorganic}}</td>
-        <td style="vertical-align: middle;text-align: center;">水分%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.water}}</td>
-        <td style="vertical-align: middle;text-align: center;">黄米粒</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.yellowRice}}</td>
-        <td style="vertical-align: middle;text-align: center;">互混率%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.intermixingRate}}</td>
-        <td style="vertical-align: middle;text-align: center;">色泽、气味</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.colorSmell}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">加工精度</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.storehouseName}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">碎米(总量)%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.brokenriceTotal}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">小碎米含量</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.brokenriceSmall}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不完善粒(总量)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.imperfectgrainsTotal}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">杂质(总量)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.impurityTotal}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">无机杂质</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.impurityInorganic}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.water}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">黄米粒</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.yellowRice}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">互混率%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.intermixingRate}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">色泽、气味</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.colorSmell}}</td>
     </tr>
 </table>
 <!-- 小麦粉 -->
@@ -155,28 +155,28 @@
         <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">水分%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.water}}</td>
-        <td style="vertical-align: middle;text-align: center;">加工精度</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.machiningaccuracy}}</td>
-        <td style="vertical-align: middle;text-align: center;">灰分%（以干物计）</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.ashContent}}</td>
-        <td style="vertical-align: middle;text-align: center;">湿面筋含量/%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.gluten}}</td>
-        <td style="vertical-align: middle;text-align: center;">含砂量%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.siltContent}}</td>
-    </tr>
-    <tr>
-        <td style="vertical-align: middle;text-align: center;">磁性金属物g/kg</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.magneticMetal}}</td>
-        <td style="vertical-align: middle;text-align: center;">脂肪酸值(以湿基计)</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.fatIndex}}</td>
-        <td style="vertical-align: middle;text-align: center;">气味、口味</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smelltaste}}</td>
-        <td style="vertical-align: middle;text-align: center;">外观形态</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.wgxt}}</td>
-        <td style="vertical-align: middle;text-align: center;"></td>
-        <td style="vertical-align: middle;text-align: center;"></td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.water}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">加工精度</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.machiningaccuracy}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">灰分%（以干物计）</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.ashContent}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">湿面筋含量/%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.gluten}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">含砂量%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.siltContent}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">磁性金属物g/kg</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.magneticMetal}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">脂肪酸值(以湿基计)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.fatIndex}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、口味</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smelltaste}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">外观形态</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.wgxt}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;"></td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;"></td>
     </tr>
 </table>
 <!-- 成品油 -->
@@ -186,27 +186,27 @@
         <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">气味、滋味</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smelltaste}}</td>
-        <td style="vertical-align: middle;text-align: center;">透明度</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.transparency}}</td>
-        <td style="vertical-align: middle;text-align: center;">水分及挥发物含量</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.waterVolatiles}}</td>
-        <td style="vertical-align: middle;text-align: center;">不溶性杂质含量</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.insolubleImpurity}}</td>
-        <td style="vertical-align: middle;text-align: center;">酸价</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.acidValue}}</td>
-    </tr>
-    <tr>
-        <td style="vertical-align: middle;text-align: center;">过氧化值</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.peroxideValue}}</td>
-        <td style="vertical-align: middle;text-align: center;">烟点</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smokePoint}}</td>
-        <td style="vertical-align: middle;text-align: center;">冷冻试验</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.reezeTest}}</td>
-        <td style="vertical-align: middle;text-align: center;">溶剂残留量</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.residualSolvent}}</td>
-        <td style="vertical-align: middle;text-align: center;"></td>
-        <td style="vertical-align: middle;text-align: center;"></td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、滋味</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smelltaste}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">透明度</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.transparency}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分及挥发物含量</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.waterVolatiles}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不溶性杂质含量</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.insolubleImpurity}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">酸价</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.acidValue}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">过氧化值</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.peroxideValue}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">烟点</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smokePoint}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">冷冻试验</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.reezeTest}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">溶剂残留量</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.residualSolvent}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;"></td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;"></td>
     </tr>
 </table>

src/main/resources/static/app/storage/grainCard/views/productGrain-check-T.html

@@ -5,21 +5,21 @@
         <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">油罐设计说明</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">油罐名称</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.storehouseName}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">使用单位</td>
-        <td style="vertical-align: middle;text-align: center;">{{orgInfo.orgName}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">设计单位</td>
-        <td style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].sjdw}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px" colspan="2">保管员</td>
-    </tr>
-    <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐类型</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[tankObj[cerealsCard.spareOne].tankType]}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >建设年度</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].builddate.toString().substring(0,4)}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐容量</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].tankCapacity}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">油罐名称</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.storehouseName}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用单位</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{orgInfo.orgName}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计单位</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].sjdw}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" colspan="2">保管员</td>
+    </tr>
+    <tr>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >油罐类型</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[tankObj[cerealsCard.spareOne].tankType]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >建设年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].builddate.toString().substring(0,4)}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >油罐容量</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].tankCapacity}}</td>
         <td rowspan="7" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
             <div style="width:180px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
                 <img style="width:180px;height:240px;" src="{{cerealsCard.bgyurl}}">
@@ -27,91 +27,90 @@
         </td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">直径(米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].diameter}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">储粮品种</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">储粮方式</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.ccfsName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">直径(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].diameter}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮品种</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lypzName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.ccfsName}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">使用年限</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].synx}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">高度(米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].height}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">底面积(平方米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].bottomArea}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用年限</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].synx}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].height}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">底面积(平方米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].bottomArea}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">设计储油高度(米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].designHeight}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">出油口高度(米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].oilHeight}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">检查口高度(米)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].insportHeight}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计储油高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].designHeight}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">出油口高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].oilHeight}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">检查口高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].insportHeight}}</td>
     </tr>
     <tr>
         <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;" colspan="6">储油基本信息</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">粮油品种</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lqss}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >库存数量(吨)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油品种</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lypzName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮权所属</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lqss}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">库存数量(吨)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lysl}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">等级</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.lydjCode]}}</td>
-        <td style="vertical-align: middle;text-align: center;">粮油性质</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[lyxz]}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;" >入罐年度</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj.toString().substring(0,4)}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">等级</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[cerealsCard.lydjCode]}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油性质</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[lyxz]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入罐年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.rksj.toString().substring(0,4)}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">生产日期</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">品牌</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.pinp}}</td>
-        <td style="vertical-align: middle;text-align: center;">入仓时间(第一车)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj}}</td>
-        <td style="vertical-align: middle;text-align: center;" colspan="2">{{tankObj[cerealsCard.spareOne].keeperNames}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">生产日期</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.scrq}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">品牌</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.pinp}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入仓时间(第一车)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.rksj}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;" colspan="2">{{tankObj[cerealsCard.spareOne].keeperNames}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间(最后一车)</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">保质期</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.bzq}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[cd]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入库时间(最后一车)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.zhycsj}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">保质期</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.bzq}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">产地</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[cd]}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">业务类型</td>
-        <td style="vertical-align: middle;text-align: center;">
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">业务类型</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">
             <div>
                 <div ng-if="cerealsCard.ywlx==2">移库</div>
                 <div ng-if="cerealsCard.ywlx==0">入库</div>
                 <div ng-if="cerealsCard.ywlx==1">倒仓</div>
             </div>
         </td>
-        <td style="vertical-align: middle;text-align: center;">管理方式</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.orgId == 76 ? "直储" : "代储"}}</td>
-        <td style="vertical-align: middle;text-align: center;">储存方式</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.ccfsName}}</td>
-        <td style="vertical-align: middle;text-align: center;">国别</td>
-        <td style="vertical-align: middle;text-align: center;">中国</td>
-    </tr>
-    
-    <tr>
-        <td style="vertical-align: middle;text-align: center;">实际储油高度(米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.sjcygd}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">收储地点</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">库内</td>
-        <td style="vertical-align: middle;text-align: center;">厂家</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.cj}}</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">油罐状态</td>
-        <td class="text-center" style="vertical-align: middle;text-align: center;">封仓</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">管理方式</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.orgId == 76 ? "直储" : "代储"}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储存方式</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.ccfsName}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">国别</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">中国</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">实际储油高度(米)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.sjcygd}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">收储地点</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">库内</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">厂家</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.cj}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">油罐状态</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">封仓</td>
     </tr>
     </tbody>
 </table>
@@ -122,28 +121,28 @@
         <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">加工精度</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.storehouseName}}</td>
-        <td style="vertical-align: middle;text-align: center;">碎米(总量)%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.brokenriceTotal}}</td>
-        <td style="vertical-align: middle;text-align: center;">小碎米含量</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.brokenriceSmall}}</td>
-        <td style="vertical-align: middle;text-align: center;">不完善粒(总量)</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.imperfectgrainsTotal}}</td>
-        <td style="vertical-align: middle;text-align: center;">杂质(总量)</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.impurityTotal}}</td>
-    </tr>
-    <tr>
-        <td style="vertical-align: middle;text-align: center;">无机杂质</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.impurityInorganic}}</td>
-        <td style="vertical-align: middle;text-align: center;">水分%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.water}}</td>
-        <td style="vertical-align: middle;text-align: center;">黄米粒</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.yellowRice}}</td>
-        <td style="vertical-align: middle;text-align: center;">互混率%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.intermixingRate}}</td>
-        <td style="vertical-align: middle;text-align: center;">色泽、气味</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.colorSmell}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">加工精度</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.storehouseName}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">碎米(总量)%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.brokenriceTotal}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">小碎米含量</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.brokenriceSmall}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不完善粒(总量)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.imperfectgrainsTotal}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">杂质(总量)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.impurityTotal}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">无机杂质</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.impurityInorganic}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.water}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">黄米粒</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.yellowRice}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">互混率%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.intermixingRate}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">色泽、气味</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.colorSmell}}</td>
     </tr>
 </table>
 <!-- 小麦粉 -->
@@ -153,28 +152,28 @@
         <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">水分%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.water}}</td>
-        <td style="vertical-align: middle;text-align: center;">加工精度</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.machiningaccuracy}}</td>
-        <td style="vertical-align: middle;text-align: center;">灰分%（以干物计）</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.ashContent}}</td>
-        <td style="vertical-align: middle;text-align: center;">湿面筋含量/%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.gluten}}</td>
-        <td style="vertical-align: middle;text-align: center;">含砂量%</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.siltContent}}</td>
-    </tr>
-    <tr>
-        <td style="vertical-align: middle;text-align: center;">磁性金属物g/kg</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.magneticMetal}}</td>
-        <td style="vertical-align: middle;text-align: center;">脂肪酸值(以湿基计)</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.fatIndex}}</td>
-        <td style="vertical-align: middle;text-align: center;">气味、口味</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smelltaste}}</td>
-        <td style="vertical-align: middle;text-align: center;">外观形态</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.wgxt}}</td>
-        <td style="vertical-align: middle;text-align: center;"></td>
-        <td style="vertical-align: middle;text-align: center;"></td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.water}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">加工精度</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.machiningaccuracy}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">灰分%（以干物计）</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.ashContent}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">湿面筋含量/%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.gluten}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">含砂量%</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.siltContent}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">磁性金属物g/kg</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.magneticMetal}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">脂肪酸值(以湿基计)</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.fatIndex}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、口味</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smelltaste}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">外观形态</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.wgxt}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;"></td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;"></td>
     </tr>
 </table>
 <!-- 成品油 -->
@@ -184,27 +183,27 @@
         <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">气味、滋味</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smelltaste}}</td>
-        <td style="vertical-align: middle;text-align: center;">透明度</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.transparency}}</td>
-        <td style="vertical-align: middle;text-align: center;">水分及挥发物含量</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.waterVolatiles}}</td>
-        <td style="vertical-align: middle;text-align: center;">不溶性杂质含量</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.insolubleImpurity}}</td>
-        <td style="vertical-align: middle;text-align: center;">酸价</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.acidValue}}</td>
-    </tr>
-    <tr>
-        <td style="vertical-align: middle;text-align: center;">过氧化值</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.peroxideValue}}</td>
-        <td style="vertical-align: middle;text-align: center;">烟点</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smokePoint}}</td>
-        <td style="vertical-align: middle;text-align: center;">冷冻试验</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.reezeTest}}</td>
-        <td style="vertical-align: middle;text-align: center;">溶剂残留量</td>
-        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.residualSolvent}}</td>
-        <td style="vertical-align: middle;text-align: center;"></td>
-        <td style="vertical-align: middle;text-align: center;"></td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、滋味</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smelltaste}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">透明度</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.transparency}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分及挥发物含量</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.waterVolatiles}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不溶性杂质含量</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.insolubleImpurity}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">酸价</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.acidValue}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">过氧化值</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.peroxideValue}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">烟点</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smokePoint}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">冷冻试验</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.reezeTest}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">溶剂残留量</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.residualSolvent}}</td>
+        <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;"></td>
+        <td style="vertical-align: middle;text-align: center;background-color: #fff;"></td>
     </tr>
 </table>

src/main/resources/static/app/storage/grainCard/views/productGrain-check.html

@@ -40,9 +40,9 @@
                                     <div ng-include="'app/storage/grainCard/views/productGrain-check-T.html'" ng-hide="!grainOrOil"></div>
                                     <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
                                         <tr>
-                                            <td class="text-left" style="vertical-align: middle;text-align: left;">建卡人：{{cerealsCard.jkr}}</td>
-                                            <td class="text-left" style="vertical-align: middle;text-align: left;">建卡时间：{{cerealsCard.jkrq}}</td>
-                                            <td class="text-left" style="vertical-align: middle;text-align: left;">备注：{{cerealsCard.remark}}</td>
+                                            <td class="text-left" style="vertical-align: middle;text-align: left;background-color: #fff;"">建卡人：{{cerealsCard.jkr}}</td>
+                                            <td class="text-left" style="vertical-align: middle;text-align: left;background-color: #fff;"">建卡时间：{{cerealsCard.jkrq}}</td>
+                                            <td class="text-left" style="vertical-align: middle;text-align: left;background-color: #fff;"">备注：{{cerealsCard.remark}}</td>
                                         </tr>
                                     </table>
                                 </div>

src/main/resources/static/app/warnAndAlarm/module.js

@@ -5,7 +5,7 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
     $stateProvider.state('app.warnAndAlarm', {
         abstract: true,
         data: {
-            title: '预警报警'
+            title: '预警预警'
         }
     })
     //----------------------温湿度 start-----------------
@@ -13,7 +13,7 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
         .state('app.warnAndAlarm.temperatureHumidity', {
             abstract: true,
             data: {
-                title: '温湿度报警'
+                title: '温湿度预警'
             }
         })
 
@@ -22,7 +22,7 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
         .state('app.warnAndAlarm.temperatureHumidity.threshold', {
                 url: '/warnAndAlarm/temperatureHumidity/threshold',
                 data: {
-                    title: '温湿度报警设置'
+                    title: '温湿度预警设置'
                 },
                 views: {
                     "content@app": {
@@ -32,15 +32,15 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
                 }
             }
         )
-        // 温度报警
+        // 温度预警
         .state('app.warnAndAlarm.temperatureHumidity.temperature', {
                 url: '/warnAndAlarm/temperatureHumidity/temperature',
                 data: {
-                    title: '温度报警列表'
+                    title: '温度预警列表'
                 },
                 params: {
                     thresholdType: 0,
-                    titleName: '温度报警列表'
+                    titleName: '温度预警列表'
                 },
                 views: {
                     "content@app": {
@@ -50,15 +50,15 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
                 }
             }
         )
-        // 湿度报警
+        // 湿度预警
         .state('app.warnAndAlarm.temperatureHumidity.humidity', {
             url: '/warnAndAlarm/temperatureHumidity/humidity',
             data: {
-                title: '湿度报警列表'
+                title: '湿度预警列表'
             },
             params: {
                 thresholdType: 1,
-                titleName: '湿度报警列表'
+                titleName: '湿度预警列表'
             },
             views: {
                 "content@app": {
@@ -81,7 +81,7 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
         .state('app.warnAndAlarm.reservePeriod.setUp', {
             url: '/warnAndAlarm/reservePeriod/setUp',
             data: {
-                title: '储备年限预警设置'
+                title: '储备年限报警设置'
             },
             views: {
                 "content@app": {
@@ -94,7 +94,7 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
         .state('app.warnAndAlarm.reservePeriod.ageWarning', {
             url: '/warnAndAlarm/reservePeriod/ageWarning',
             data: {
-                title: '储备年限预警'
+                title: '储备年限报警'
             },
             views: {
                 "content@app": {

src/main/resources/static/app/warnAndAlarm/reservePeriod/views/ageWarning-list.html

@@ -7,7 +7,7 @@
                 <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="true">
                     <header>
                         <span class="widget-icon"> <i class="fa fa-table"></i> </span>
-                        <h2>储备年限预警</h2>
+                        <h2>储备年限报警</h2>
                     </header>
                     <div>
                         <div class="widget-body no-padding">

src/main/resources/static/app/warnAndAlarm/reservePeriod/views/setUp-list.html

@@ -9,7 +9,7 @@
                      data-widget-editbutton="true">
                     <header>
                         <span class="widget-icon"> <i class="fa fa-table"></i> </span>
-                        <h2>储备年限预警设置</h2>
+                        <h2>储备年限报警设置</h2>
                     </header>
                     <div>
                         <div class="widget-body no-padding">

src/main/resources/static/app/warnAndAlarm/storageOverLimit/views/storeTaskProcess-list.html

@@ -43,7 +43,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>
                                         </thead>
 

src/main/resources/static/app/warnAndAlarm/tempWet/controller/tempAlarmCtrl.js

@@ -10,11 +10,11 @@ angular.module('app.warnAndAlarm').controller("tempAlarmCtrl", function ($scope,
     $scope.titleName = $stateParams.titleName;
     if ($stateParams.thresholdType) {
         // 湿度列表
-        $scope.tempValueTitle = '报警湿度%';
+        $scope.tempValueTitle = '预警湿度%';
         $scope.thresholdValueTitle = '设置湿度%';
     } else {
         // 温度列表
-        $scope.tempValueTitle = '报警温度℃';
+        $scope.tempValueTitle = '预警温度℃';
         $scope.thresholdValueTitle = '设置温度℃';
     }
 

src/main/resources/static/app/warnAndAlarm/tempWet/views/tempWarn-list.html

@@ -9,7 +9,7 @@
                      data-widget-editbutton="true">
                     <header>
                         <span class="widget-icon"> <i class="fa fa-table"></i> </span>
-                        <h2>温湿度报警设置</h2>
+                        <h2>温湿度预警设置</h2>
                     </header>
                     <div>
                         <div class="widget-body no-padding">
@@ -17,9 +17,9 @@
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-10">
                                         <!--style 默认选中样式-->
-                                        <button type="button" class="btn btn-default" style="background: #204d74;color: #fff;" ng-click="tempWetSetPage(0)">温度报警设置</button>
+                                        <button type="button" class="btn btn-default" style="background: #204d74;color: #fff;" ng-click="tempWetSetPage(0)">温度预警设置</button>
                                         &nbsp;&nbsp;
-                                        <button type="button" class="btn btn-default" ng-click="tempWetSetPage(1)">湿度报警设置</button>
+                                        <button type="button" class="btn btn-default" ng-click="tempWetSetPage(1)">湿度预警设置</button>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <label><span style="color: blue;">{{unitFlag}}</span></label>