查询追溯bug

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

@@ -84,7 +84,7 @@
 						</div> -->
 						<div has-func="23" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==23]">
 							<!-- <a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource')"> -->
-							<a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource')">
+							<a href-void ng-click="switchTopMenu(23,'app.synth.warehouseSource1')">
 								<i class="nav-icon" style='position: relative;top:7px'><img alt="查询追溯" src="styles/img/home-1/nav-icon/chaxzs-icon.png" /></i>
 								查询追溯</a>
                             <i class="nav-feng-line"></i>

src/main/resources/static/app/synth/lifecycle/views/qualityEventAnalysis-view.html

@@ -33,7 +33,7 @@
 								<section>
 									<div>
 										<img src="styles/img/newPage/qualityEvent_view-1.png" alt="">
-										<div style="width:67%; display: flex;justify-content: space-between;padding: 0px 15px;">
+										<div style="width:95%; display: flex;justify-content: space-between;padding: 0px 15px;">
 											<span style="font-size: 18px;font-weight: 900;color: #333;"><strong>历史粮情数据</strong> </span>
 											<!-- <span>查看温湿度监测数据</span> -->
 											<a href-void ng-click="dataWSD()">

src/main/resources/static/app/synth/qualityTrace/controller/warehouseSourceCtrl.js

@@ -81,6 +81,9 @@ angular.module('app.synth').controller("warehouseSourceCtrl", function ($scope,
 			$state.go("app.synth.warehouseSource1.view", { houseId: parseInt(obj.ch) });
 		}
 	}
+	$scope.view1 = function () {
+			$state.go("app.synth.warehouseSource1.view");
+	}
 
 	// 通过递归给组织赋等级
 	$scope.fillLevel = function (parentId, level) {

src/main/resources/static/app/synth/qualityTrace/views/warehouseSource-list1.html

@@ -54,27 +54,109 @@
 									<thead>
 										<tr>
 				                            <th>序号</th>
-				                            <th>粮库名称</th>
 				                            <th>仓房名称</th>
+				                            <th>货位名称</th>
+				                            <th>储存类型</th>
 				                            <th>粮油品种</th>
-				                            <th>库存数量</th>
-				                            <th>收获年度</th>
+				                            <th>库存数量(吨)</th>
+				                            <th>等级</th>
 				                            <th>入仓时间</th>
 				                            <th>操作</th>
 				                        </tr>
 									</thead>
 
 									<tbody>
-										<tr ng-repeat="fcbgz in pageInfo.list">
-											<td>{{$index+1}}</td>
-											<td>{{fcbgz.lkmc}}</td>
-											<td>{{storehouseObj[fcbgz.ch].storehouseName}}</td>
-											<td>{{dicData[fcbgz.pz]}}</td>
-											<td>{{fcbgz.kcsl}}</td>
-											<td>{{dicData[fcbgz.scnf]}}</td>
-											<td>{{fcbgz.cjsj | date :'yyyy/MM/dd'}}</td>
+										<tr>
+											<td>1</td>
+											<td>1号仓</td>
+											<td>1-1</td>
+											<td>原粮</td>
+											<td>小麦及混合小麦</td>
+											<td>725000</td>
+											<td>一等</td>
+											<td>2021-04-26</td>
+											<td>
+											    <a href-void ng-click="view1()"><i class="fa fa-info-circle"></i>查看</a>&emsp;
+												<!-- <a href-void ng-click="view(fcbgz, '2')"><i class="fa fa-info-circle"></i>质检信息</a>&emsp;
+											    <a href-void ng-click="view(fcbgz, '3')"><i class="fa fa-info-circle"></i>粮情信息</a>&emsp; -->
+<!-- 											    <a href-void ng-click="view(fcbgz, '4')"><i class="fa fa-info-circle"></i>作业记录</a> -->
+											</td>
+										</tr>
+										<tr>
+											<td>2</td>
+											<td>2号仓</td>
+											<td>2-1</td>
+											<td>原粮</td>
+											<td>玉米</td>
+											<td>720000</td>
+											<td>二等</td>
+											<td>2021-01-06</td>
+											<td>
+											    <a href-void ng-click="view1()"><i class="fa fa-info-circle"></i>查看</a>&emsp;
+												<!-- <a href-void ng-click="view(fcbgz, '2')"><i class="fa fa-info-circle"></i>质检信息</a>&emsp;
+											    <a href-void ng-click="view(fcbgz, '3')"><i class="fa fa-info-circle"></i>粮情信息</a>&emsp; -->
+<!-- 											    <a href-void ng-click="view(fcbgz, '4')"><i class="fa fa-info-circle"></i>作业记录</a> -->
+											</td>
+										</tr>
+										<tr>
+											<td>3</td>
+											<td>3号仓</td>
+											<td>3-1</td>
+											<td>原粮</td>
+											<td>大豆</td>
+											<td>725000</td>
+											<td>三等</td>
+											<td>2021-10-26</td>
+											<td>
+											    <a href-void ng-click="view1()"><i class="fa fa-info-circle"></i>查看</a>&emsp;
+												<!-- <a href-void ng-click="view(fcbgz, '2')"><i class="fa fa-info-circle"></i>质检信息</a>&emsp;
+											    <a href-void ng-click="view(fcbgz, '3')"><i class="fa fa-info-circle"></i>粮情信息</a>&emsp; -->
+<!-- 											    <a href-void ng-click="view(fcbgz, '4')"><i class="fa fa-info-circle"></i>作业记录</a> -->
+											</td>
+										</tr>
+										<tr>
+											<td>4</td>
+											<td>4号仓</td>
+											<td>4-1</td>
+											<td>成品粮</td>
+											<td>小麦粉</td>
+											<td>12000</td>
+											<td>四等等</td>
+											<td>2021-12-28</td>
+											<td>
+											    <a href-void ng-click="view1()"><i class="fa fa-info-circle"></i>查看</a>&emsp;
+												<!-- <a href-void ng-click="view(fcbgz, '2')"><i class="fa fa-info-circle"></i>质检信息</a>&emsp;
+											    <a href-void ng-click="view(fcbgz, '3')"><i class="fa fa-info-circle"></i>粮情信息</a>&emsp; -->
+<!-- 											    <a href-void ng-click="view(fcbgz, '4')"><i class="fa fa-info-circle"></i>作业记录</a> -->
+											</td>
+										</tr>
+										<tr>
+											<td>5</td>
+											<td>5号仓</td>
+											<td>5-1</td>
+											<td>成品粮</td>
+											<td>大米及优质大米</td>
+											<td>10500</td>
+											<td>二等</td>
+											<td>2021-11-12</td>
+											<td>
+											    <a href-void ng-click="view1()"><i class="fa fa-info-circle"></i>查看</a>&emsp;
+												<!-- <a href-void ng-click="view(fcbgz, '2')"><i class="fa fa-info-circle"></i>质检信息</a>&emsp;
+											    <a href-void ng-click="view(fcbgz, '3')"><i class="fa fa-info-circle"></i>粮情信息</a>&emsp; -->
+<!-- 											    <a href-void ng-click="view(fcbgz, '4')"><i class="fa fa-info-circle"></i>作业记录</a> -->
+											</td>
+										</tr>
+										<tr>
+											<td>6</td>
+											<td>6号仓</td>
+											<td>6-1</td>
+											<td>成品粮</td>
+											<td>浸出成品油</td>
+											<td>20000</td>
+											<td>一级</td>
+											<td>2021-12-19</td>
 											<td>
-											    <a href-void ng-click="view(fcbgz, '123')"><i class="fa fa-info-circle"></i>查看</a>&emsp;
+											    <a href-void ng-click="view1()"><i class="fa fa-info-circle"></i>查看</a>&emsp;
 												<!-- <a href-void ng-click="view(fcbgz, '2')"><i class="fa fa-info-circle"></i>质检信息</a>&emsp;
 											    <a href-void ng-click="view(fcbgz, '3')"><i class="fa fa-info-circle"></i>粮情信息</a>&emsp; -->
 <!-- 											    <a href-void ng-click="view(fcbgz, '4')"><i class="fa fa-info-circle"></i>作业记录</a> -->