警告提醒警告时间添加

huaxin-system/src/main/resources/mapper/system/TWarningInfoMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceCode"    column="device_code"    />
         <result property="stopTime"    column="stop_time"    />
         <result property="warnStatus"    column="warn_status"    />
+        <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
     </resultMap>
@@ -22,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             warn.stop_time,
             warn.warn_status,
             warn.update_time,
+            warn.create_time,
             warn.update_by,
             us.nick_name AS nickName,
             dept.dept_name AS deptName

huaxin-web/src/views/warning/index.vue

@@ -101,6 +101,11 @@
           <span>{{ parseTime(scope.row.stopTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="警告时间" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="警告状态" align="center" prop="warnStatus" :formatter="warnStatusFormat" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">