Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 import com.zehong.system.domain.TDeviceInfo;
+import com.zehong.system.domain.TOrderFeedback;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -42,6 +43,9 @@ public class WorkOrderVo extends BaseEntity
     /** 设备列表 */
     private List<TDeviceInfo> deviceInfoList;
 
+    /** 反馈信息列表 */
+    private List<TOrderFeedback> feedbackList;
+
     /** 设备数量 */
     private int deviceNum;
 
@@ -86,28 +90,12 @@ public class WorkOrderVo extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date actualTime;
 
+    /** 归档信息 */
+    private String archiving;
+
     /** 备注 */
     private String remarks;
 
-    /** 反馈内容 */
-    private String contents;
-
-    /** 反馈时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date feedbackTime;
-
-    /** 图片地址1 */
-    private String pictureUrl1;
-
-    /** 图片地址2 */
-    private String pictureUrl2;
-
-    /** 图片地址3 */
-    private String pictureUrl3;
-
-    /** 处理状态 */
-    private String dealStatus;
-
     public void setOrderId(String orderId)
     {
         this.orderId = orderId;
@@ -169,6 +157,14 @@ public class WorkOrderVo extends BaseEntity
         this.deviceInfoList = deviceInfoList;
     }
 
+    public List<TOrderFeedback> getFeedbackList() {
+        return feedbackList;
+    }
+
+    public void setFeedbackList(List<TOrderFeedback> feedbackList) {
+        this.feedbackList = feedbackList;
+    }
+
     public int getDeviceNum() {
         return deviceNum;
     }
@@ -234,6 +230,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return orderStatus;
     }
+
     public void setAppointInspector(Long appointInspector)
     {
         this.appointInspector = appointInspector;
@@ -243,6 +240,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return appointInspector;
     }
+
     public void setAllotTime(Date allotTime) 
     {
         this.allotTime = allotTime;
@@ -252,6 +250,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return allotTime;
     }
+
     public void setActualInspector(Long actualInspector)
     {
         this.actualInspector = actualInspector;
@@ -261,6 +260,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return actualInspector;
     }
+
     public void setActualTime(Date actualTime) 
     {
         this.actualTime = actualTime;
@@ -270,6 +270,7 @@ public class WorkOrderVo extends BaseEntity
     {
         return actualTime;
     }
+
     public void setRemarks(String remarks) 
     {
         this.remarks = remarks;
@@ -280,6 +281,14 @@ public class WorkOrderVo extends BaseEntity
         return remarks;
     }
 
+    public String getArchiving() {
+        return archiving;
+    }
+
+    public void setArchiving(String archiving) {
+        this.archiving = archiving;
+    }
+
     public String getAppointInspectorName() {
         return appointInspectorName;
     }
@@ -296,54 +305,6 @@ public class WorkOrderVo extends BaseEntity
         this.actualInspectorName = actualInspectorName;
     }
 
-    public String getContents() {
-        return contents;
-    }
-
-    public void setContents(String contents) {
-        this.contents = contents;
-    }
-
-    public Date getFeedbackTime() {
-        return feedbackTime;
-    }
-
-    public void setFeedbackTime(Date feedbackTime) {
-        this.feedbackTime = feedbackTime;
-    }
-
-    public String getPictureUrl1() {
-        return pictureUrl1;
-    }
-
-    public void setPictureUrl1(String pictureUrl1) {
-        this.pictureUrl1 = pictureUrl1;
-    }
-
-    public String getPictureUrl2() {
-        return pictureUrl2;
-    }
-
-    public void setPictureUrl2(String pictureUrl2) {
-        this.pictureUrl2 = pictureUrl2;
-    }
-
-    public String getPictureUrl3() {
-        return pictureUrl3;
-    }
-
-    public void setPictureUrl3(String pictureUrl3) {
-        this.pictureUrl3 = pictureUrl3;
-    }
-
-    public String getDealStatus() {
-        return dealStatus;
-    }
-
-    public void setDealStatus(String dealStatus) {
-        this.dealStatus = dealStatus;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -139,14 +139,8 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
         workOrderVo.setDeviceInfoList(deviceInfoList);
 
         List<TOrderFeedback> feedbackList = tOrderFeedbackMapper.selectTOrderFeedbackByOrderId(tWorkOrder.getOrderId());
-        if(feedbackList.size() != 0){
-            TOrderFeedback feedback = feedbackList.get(0);
-            workOrderVo.setContents(feedback.getContents());
-            workOrderVo.setFeedbackTime(feedback.getFeedbackTime());
-            workOrderVo.setDealStatus(feedback.getDealStatus());
-            workOrderVo.setPictureUrl1(feedback.getPictureUrl1() != null ? feedback.getPictureUrl1() : null);
-            workOrderVo.setPictureUrl2(feedback.getPictureUrl2() != null ? feedback.getPictureUrl2() : null);
-            workOrderVo.setPictureUrl3(feedback.getPictureUrl3() != null ? feedback.getPictureUrl3() : null);
+        if(feedbackList.size() != 0) {
+            workOrderVo.setFeedbackList(feedbackList);
         }
 
         return workOrderVo;

gassafety-web/package-lock.json

@@ -8288,8 +8288,13 @@
     },
     "moment": {
       "version": "2.29.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+=======
       "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz",
       "integrity": "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M="
+>>>>>>> dd8dcc504cb2f87f10777f69f9c7966739123486
     },
     "move-concurrently": {
       "version": "1.0.1",

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

@@ -71,9 +71,9 @@
               <el-form-item label="下发时间:" prop="allotTime">
                 <font>{{form.allotTime}}</font>
               </el-form-item>
-              <el-form-item label="接收时间:" prop="actualTime">
+              <!-- <el-form-item label="接收时间:" prop="actualTime">
                 <font>{{form.actualTime}}</font>
-              </el-form-item>
+              </el-form-item> -->
           </el-form>
           <div id="marbox" style="width: 700px;height: 250px;float: left;margin-top: -35px; border: 1px solid rgb(218, 213, 213);">
             <div style="width: 100%;height: 100%" id="container"></div>

gassafety-web/src/views/workOrder/workorder/workorder.vue

-<template>
-  <div class="app-container workorder">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="登录地址" prop="ipaddr">
-        <el-input
-          v-model="queryParams.ipaddr"
-          placeholder="请输入登录地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-
-    </el-form>
-
-    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
-
-    <el-table
-      v-loading="loading"
-      :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
-      style="width: 100%;"
-    >
-      <el-table-column label="序号" type="index" align="center">
-        <template slot-scope="scope">
-          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
-      <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
-      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="浏览器" align="center" prop="browser" />
-      <el-table-column label="操作系统" align="center" prop="os" />
-      <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.loginTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleForceLogout(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
-          >强退</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" /> -->
-  </div>
-</template>
-
-<script>
-import { list, forceLogout } from "@/api/monitor/online";
-
-export default {
-  name: "Online",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      pageNum: 1,
-      pageSize: 10,
-      // 查询参数
-      queryParams: {
-        ipaddr: undefined,
-        userName: undefined
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询登录日志列表 */
-    getList() {
-      this.loading = true;
-      list(this.queryParams).then(response => {
-        this.list = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 强退按钮操作 */
-    handleForceLogout(row) {
-      this.$confirm('是否确认强退名称为"' + row.userName + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return forceLogout(row.tokenId);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("强退成功");
-        }).catch(() => {});
-    }
-  }
-};
-</script>
-<style>
-  .workorder .pagination-container[data-v-72233bcd] {
-    background: #fff;
-    padding: 0;
-}
-.workorder .pagination-container {
-    position: relative;
-    height: 25px;
-    margin-bottom: 10px;
-    margin-top: 15px;
-    padding: 0 !important;
-}
-.workorder .pagination-container .el-pagination {
-    left: 0;
-    position: absolute;
-}
-.workorder .el-pagination {
-    white-space: nowrap;
-    padding: 0;
-    color: #303133;
-    font-weight: bold;
-}
-</style>