1 比对时间任务报错

2 实时数据界面调整

zhmes-agecal-system/src/main/java/com/zehong/system/domain/PalletDeviceBinding.java

@@ -110,7 +110,7 @@ public class PalletDeviceBinding extends BaseEntity
     private String calibrationAd;
 
     /**
-     * 零点状态 0-异常;1-正常
+     * 校准AD状态 0-异常;1-正常
      */
     private String calibrationAdStatus;
 
@@ -121,7 +121,7 @@ public class PalletDeviceBinding extends BaseEntity
 
 
     /**
-     * 运行时间状态 0-失败;1-成功
+     * 运行时间状态 0-异常;1-正常
      */
     private String runTimeStatus;
 

zhmes-agecal-system/src/main/resources/mapper/system/PalletDeviceBindingMapper.xml

@@ -258,7 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="calibrationAdStatus != null">f_calibration_status = #{calibrationAdStatus},</if>
             <if test="runTimeStatus != null">f_run_time_status = #{runTimeStatus},</if>
             <if test="realTimeAd != null">f_real_time_ad = #{realTimeAd},</if>
-            <if test="realTimeStatus != null">f_real_time_status = #{realTimeStatus},</if>
+            <if test="realTimeStatus != null">f_real_time_ad_status = #{realTimeStatus},</if>
         </trim>
         where f_pallet_device_binding_id = #{palletDeviceBindingId}
     </update>
@@ -303,7 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 f_concentration = null,
                 f_run_time_status = null,
                 f_real_time_ad = null,
-                f_real_time_status = null
+                f_real_time_ad_status = null
                 <if test="item.deviceCode != null">f_device_code = #{item.deviceCode},</if>
             </trim>
             WHERE f_pallet_device_binding_id = #{item.palletDeviceBindingId}
@@ -327,7 +327,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             f_concentration = null,
             f_run_time_status = null,
             f_real_time_ad = null,
-            f_real_time_status = null
+            f_real_time_ad_status = null
         where f_tray_id = #{trayId}
     </update>
 

zhmes-agecal-web/src/views/palletDeviceUploadHistory/index.vue

@@ -56,6 +56,11 @@
       <el-table-column label="列" align="center" prop="col" />
       <el-table-column label="第几个" align="center" prop="index" />
       <el-table-column label="编号" align="center" prop="number" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="绑定时间" align="center" prop="bindingTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bindingTime, '{y}-{m}-{d}') }}</span>
@@ -66,11 +71,6 @@
           <span>{{ parseTime(scope.row.unbindingTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
           <el-tag type="info" v-if="scope.row.status === '0'">预热</el-tag>
@@ -80,28 +80,19 @@
           <el-tag type="danger" v-if="scope.row.status === '5'">通讯故障</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="设置-年" align="center" prop="recordYear" />
-      <el-table-column label="设置-月" align="center" prop="recordMonth" />
-      <el-table-column label="设置-日" align="center" prop="recordDate" />
-      <el-table-column label="设置-时" align="center" prop="recordHour" />
-      <el-table-column label="设置-分" align="center" prop="recordMinute" />
       <el-table-column label="写时间状态" align="center" prop="writeTimeStatus" width="100px" >
         <template slot-scope="scope">
-          <el-tag type="info" v-if="scope.row.writeTimeStatus === '0'">失败</el-tag>
-          <el-tag type="success" v-if="scope.row.writeTimeStatus === '1'">成功</el-tag>
+          <el-tag type="info" v-if="scope.row.writeTimeStatus === '0'">异常</el-tag>
+          <el-tag type="success" v-if="scope.row.writeTimeStatus === '1'">正常</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="调零AD" align="center" prop="adjustmentZeroAd" />
-      <el-table-column label="调零状态" align="center" prop="zeroStatus" />
-      <el-table-column label="标定AD" align="center" prop="calibrationAd" />
-      <el-table-column label="标定状态" align="center" prop="calibrationStatus" />
-      <el-table-column label="浓度值" align="center" prop="concentration" />
       <el-table-column label="运行时间状态" align="center" prop="runTimeStatus" width="110px">
         <template slot-scope="scope">
-          <el-tag type="info" v-if="scope.row.runTimeStatus === '0'">失败</el-tag>
-          <el-tag type="success" v-if="scope.row.runTimeStatus === '1'">成功</el-tag>
+          <el-tag type="info" v-if="scope.row.runTimeStatus === '0'">异常</el-tag>
+          <el-tag type="success" v-if="scope.row.runTimeStatus === '1'">正常</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="浓度值" align="center" prop="concentration" />
       <el-table-column label="实时AD值" align="center" prop="realTimeAd" />
       <el-table-column label="实时AD状态" align="center" prop="realTimeAdStatus" width="110px" >
         <template slot-scope="scope">
@@ -109,6 +100,25 @@
           <el-tag type="success" v-if="scope.row.realTimeAdStatus === '1'">正常</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="调零AD" align="center" prop="adjustmentZeroAd" />
+      <el-table-column label="调零状态" align="center" prop="zeroStatus" >
+        <template slot-scope="scope">
+          <el-tag type="info" v-if="scope.row.zeroStatus === '0'">异常</el-tag>
+          <el-tag type="success" v-if="scope.row.zeroStatus === '1'">正常</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="标定AD" align="center" prop="calibrationAd" />
+      <el-table-column label="标定状态" align="center" prop="calibrationStatus" >
+        <template slot-scope="scope">
+          <el-tag type="info" v-if="scope.row.calibrationStatus === '0'">异常</el-tag>
+          <el-tag type="success" v-if="scope.row.calibrationStatus === '1'">正常</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="设置-年" align="center" prop="recordYear" />
+      <el-table-column label="设置-月" align="center" prop="recordMonth" />
+      <el-table-column label="设置-日" align="center" prop="recordDate" />
+      <el-table-column label="设置-时" align="center" prop="recordHour" />
+      <el-table-column label="设置-分" align="center" prop="recordMinute" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->

zhmes-agecal-web/src/views/screen/components/RealTimeData.vue

@@ -95,8 +95,8 @@
           </el-table-column>
           <el-table-column label="时间运行状态" align="center" width="150">
             <template slot-scope="scope">
-              <span v-if="scope.row.runTimeStatus === '1'" class="write-success">成功</span>
-              <span v-if="scope.row.runTimeStatus === '0'" class="write-failed">失败</span>
+              <span v-if="scope.row.runTimeStatus === '1'" class="write-success">正常</span>
+              <span v-if="scope.row.runTimeStatus === '0'" class="write-failed">异常</span>
               <span v-else class="write-unknown">-</span>
             </template>
           </el-table-column>
@@ -105,29 +105,43 @@
               <div class="device-code">{{ scope.row.concentration || '-' }}</div>
             </template>
           </el-table-column>
+          <el-table-column label="实时AD" align="center" width="120">
+            <template slot-scope="scope">
+              <div class="device-code">{{ scope.row.realTimeAd || '-' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="实时AD状态" align="center" width="150">
+            <template slot-scope="scope">
+              <span v-if="scope.row.realTimeStatus === '1'" class="write-success">正常</span>
+              <span v-if="scope.row.realTimeStatus === '0'" class="write-failed">异常</span>
+              <span v-else class="write-unknown">-</span>
+            </template>
+          </el-table-column>
           <el-table-column label="零点AD" align="center" width="150">
             <template slot-scope="scope">
               <div class="device-code">{{ scope.row.adjustmentZeroAd || '-' }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="校准AD" align="center" width="120">
+          <el-table-column label="零点AD状态" align="center" width="150">
             <template slot-scope="scope">
-              <div class="device-code">{{ scope.row.calibrationAd || '-' }}</div>
+              <span v-if="scope.row.zeroStatus === '1'" class="write-success">正常</span>
+              <span v-if="scope.row.zeroStatus === '0'" class="write-failed">异常</span>
+              <span v-else class="write-unknown">-</span>
             </template>
           </el-table-column>
-
-          <el-table-column label="实时AD" align="center" width="120">
+          <el-table-column label="校准AD" align="center" width="120">
             <template slot-scope="scope">
-              <div class="device-code">{{ scope.row.realTimeAd || '-' }}</div>
+              <div class="device-code">{{ scope.row.calibrationAd || '-' }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="实时AD状态" align="center" width="150">
+          <el-table-column label="校准AD状态" align="center" width="120">
             <template slot-scope="scope">
-              <span v-if="scope.row.realTimeStatus === '1'" class="write-success">正常</span>
-              <span v-if="scope.row.realTimeStatus === '0'" class="write-failed">异常</span>
+              <span v-if="scope.row.calibrationAdStatus === '1'" class="write-success">正常</span>
+              <span v-if="scope.row.calibrationAdStatus === '0'" class="write-failed">异常</span>
               <span v-else class="write-unknown">-</span>
             </template>
           </el-table-column>
+
           <el-table-column label="通信年" prop="recordYear" align="center" width="100">
             <template slot-scope="scope">
               <div class="device-code">{{ scope.row.recordYear || '-' }}</div>