反馈列表

gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java

@@ -141,12 +141,12 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
 
         List<TOrderFeedback> feedbackList = tOrderFeedbackMapper.selectTOrderFeedbackByOrderId(tWorkOrder.getOrderId());
         List<OrderFeedbackVo> feedbackVoList = new ArrayList<>();
-        OrderFeedbackVo feedbackVo = new OrderFeedbackVo();
         TDeviceInfo device = null;
 
         if(feedbackList.size() != 0) {
 
             for (TOrderFeedback feedback : feedbackList) {
+                OrderFeedbackVo feedbackVo = new OrderFeedbackVo();
                 if (feedback != null) {
                     BeanUtils.copyProperties(feedback, feedbackVo);
                 }

gassafety-web/src/views/workOrder/basicsInfo/detail.vue

@@ -146,8 +146,15 @@
                 :timestamp="activity.feedbackTime">
                 <el-card>
                   <div style="float: left;margin-left: 50px;">
-                    <p>设备类型：{{activity.deviceType}}</p>
-                    <p>设备名称：{{activity.deviceType}}</p>
+                    <p>设备类型：
+                      <span v-if="activity.deviceType == 0">管道</span>
+                      <span v-if="activity.deviceType == 1">调压箱</span>
+                      <span v-if="activity.deviceType == 2">阀门井</span>
+                      <span v-if="activity.deviceType == 3">流量计</span>
+                      <span v-if="activity.deviceType == 4">压力表</span>
+                    </p>
+
+                    <p>设备名称：{{activity.deviceName}}</p>
                     <p>反馈信息：{{activity.contents}}</p>
                   </div>
                   <div style="float: left;margin-left: 50px;">
@@ -165,15 +172,15 @@
                     <div class="feedbackTime">
                       <el-image :src="activity.pictureUrl3" v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 70px;"></el-image>
                     </div>
-                    
-                    
+
+
                   </div>
-                 
+
                 </el-card>
               </el-timeline-item>
             </el-timeline>
           </div>
-          
+
             <!-- <el-timeline-item timestamp="2018/4/3" placement="top">
               <el-card>
                 <p>反馈时间：{{contents}}</p>
@@ -184,7 +191,7 @@
                 <p>是否解决：{{contents}}</p>
               </el-card>
             </el-timeline-item> -->
-          
+
           <!-- <div style="width: 95%;float: left;">
             <div style="float: left;margin-left: 50px;" >
               <el-image :src="form.pictureUrl1" fit="cover" v-if="form.pictureUrl1 != null && form.pictureUrl1 != ''" style="width: 100px;height: 100px;">
@@ -207,9 +214,9 @@
               </el-form-item>
             </el-form>
           </div>-->
-        </div> 
+        </div>
 <!-- 返回按钮 -->
-        
+
 
 
       </div>