111

src/views/Query.vue

@@ -2,7 +2,11 @@
   <el-row>
     <el-col :span="6">
       <el-card style="height: calc(100vh - 147px);">
-        <el-form label-position="right" size="large" label-width="80px" :model="formData" style="max-width: 460px;">
+        <el-radio-group v-model="logType" label="日志类型" @change="changeType">
+          <el-radio-button label="normal">出入日志</el-radio-button>
+          <el-radio-button label="error">异常日志</el-radio-button>
+        </el-radio-group>
+        <el-form label-position="left" size="large" label-width="80px" :model="formData" style="max-width: 460px;margin-top: 20px;">
           <el-form-item label="开始时间">
             <el-date-picker v-model="searchData.startTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%;"/>
           </el-form-item>
@@ -26,7 +30,7 @@
       </el-card>
     </el-col>
     <el-col :span="18">
-      <el-card style="height: calc(100vh - 147px);">
+      <el-card style="height: calc(100vh - 147px);" v-if="logType == 'normal'">
         <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="logList" border size="large" style="width: 100%;height: 75.8vh;">
           <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="inState" label="出入库" align="center">
@@ -50,6 +54,39 @@
           :total="total"
         />
       </el-card>
+      <el-card style="height: calc(100vh - 147px);" v-if="logType == 'error'">
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="logList" border size="large" style="width: 100%;height: 75.8vh;">
+          <el-table-column type="index" label="序号" width="70" align="center"/>
+          <el-table-column prop="type" label="出入库" align="center" width="100">
+            <template #default="scope"> 
+              {{ scope.row.type == 'IN' ? '入库' : '出库' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="stationId" label="站台号" align="center" width="100"/>
+          <el-table-column prop="content" label="异常说明" align="center"/>
+          <el-table-column prop="createTime" label="最后更新时间" align="center" width="200"/>
+          <el-table-column prop="handleFlag" label="状态" align="center" width="100">
+            <template #default="scope">
+              <el-tag v-if="scope.row.handleFlag == '2'" type="danger">未处理</el-tag>
+              <el-tag v-if="scope.row.handleFlag == '1'">已处理</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="100">
+            <template #default="scope">
+              <el-button type="primary" size="small" v-if="scope.row.handleFlag == '2'" @click="updateError(scope.row)">处理</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          style="left: 40%;margin-top: 6px;"
+          background
+          @current-change="handleCurrentChange"
+          :current-page="searchData.pageNo"
+          :page-size="searchData.pageSize"
+          layout="total, prev, pager, next"
+          :total="total"
+        />
+      </el-card>
     </el-col>
   </el-row>
 </template>
@@ -64,6 +101,7 @@ export default defineComponent({
       const logList = ref([])
       const formData = ref({})
       const { proxy } = getCurrentInstance()
+      const logType = ref('normal')
       const searchData = ref({
         pageNo: 1,
         pageSize: 10,
@@ -94,7 +132,9 @@ export default defineComponent({
 
       const state = reactive({
         url: {
-          getGoodsRecord: '/log/getLogPage'
+          getGoodsRecord: '/log/getLogPage',
+          getErrorPage: '/error/getErrorPage',
+          updateError: '/error/updateError'
         }
       });
 
@@ -108,7 +148,8 @@ export default defineComponent({
         if (sessionStorage.getItem('storeInfo')) {
           let config = JSON.parse(sessionStorage.getItem('storeInfo'))
           searchData.value.storeCode = config.storeCode
-          postAction(state.url.getGoodsRecord, searchData.value).then(res => {
+          const url = logType.value == 'normal' ? state.url.getGoodsRecord : state.url.getErrorPage
+          postAction(url, searchData.value).then(res => {
             if (res.code !== 99200) return ElMessage.error(res.message);
             logList.value = res.data.records
             total.value = res.data.totalRows - 0
@@ -116,15 +157,32 @@ export default defineComponent({
         }
       }
 
+      const changeType = (value) => {
+        if (value) {
+          searchData.value.pageNo = 1
+          loadData()
+        }
+      }
+
+      const updateError = (row) => {
+        postAction(state.url.updateError, {errorId: row.errorId, handleFlag: 1}).then(res => {
+          if (res.code !== 99200) return ElMessage.error(res.message);
+          loadData()
+        })
+      }
+
     //   loadData()
       return {
         ...toRefs(state),
+        logType,
         logList,
         formData,
         searchData,
         total, 
         loadData,
-        handleCurrentChange
+        handleCurrentChange,
+        changeType,
+        updateError
       }
     },
 })

src/views/RFID.vue

@@ -51,7 +51,7 @@
                   </div>
                 </template>
                 <div style="height: 280px;overflow: auto;color: red" v-if="showErr">
-                  <div v-for="item in errList" :key="item.time">
+                  <div v-for="item in errList" :key="item.time" @click="showErrMessage" style="cursor: pointer;">
                     <p style="text-align: center;">-----------------{{item.time}}-----------------</p>
                     <p style="text-align: center;">{{item.content}}</p>
                   </div>
@@ -271,6 +271,40 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog title="异常信息确认" v-model="errVisible" style="width:60%">
+      <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '550'}" :data="logList" border size="large">
+        <el-table-column type="index" label="序号" width="70" align="center"/>
+        <el-table-column prop="type" label="出入库" align="center" width="100">
+          <template #default="scope"> 
+            {{ scope.row.type == 'IN' ? '入库' : '出库' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="stationId" label="站台号" align="center" width="100"/>
+        <el-table-column prop="content" label="异常说明" align="center"/>
+        <el-table-column prop="createTime" label="最后更新时间" align="center" width="200"/>
+        <el-table-column prop="handleFlag" label="状态" align="center" width="100">
+          <template #default="scope">
+            <el-tag v-if="scope.row.handleFlag == '2'" type="danger">未处理</el-tag>
+            <el-tag v-if="scope.row.handleFlag == '1'">已处理</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100">
+          <template #default="scope">
+            <el-button type="primary" size="small" v-if="scope.row.handleFlag == '2'" @click="updateError(scope.row)">处理</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        style="left: 40%;margin-top: 6px;"
+        background
+        @current-change="handleCurrentChange"
+        :current-page="searchData.pageNo"
+        :page-size="searchData.pageSize"
+        layout="total, prev, pager, next"
+        :total="total"
+      />
+    </el-dialog>
   </div>
 </template>
 
@@ -306,6 +340,13 @@ export default defineComponent({
       const errList = ref([])
       const showErr = ref(false)
       const lockReconnect = ref(false)
+      const errVisible = ref(false)
+      const logList = ref([])
+      const searchData = ref({
+        pageNo: 1,
+        pageSize: 8
+      })
+      const total = ref(0)
 
       const state = reactive({
         url: {
@@ -318,6 +359,8 @@ export default defineComponent({
           updateConfig: '/config/updateConfig',
           getStoreCode: '/config/getStoreCode',
           deleteEpc: '/log/deleteEpc',
+          getErrorPage: '/error/getErrorPage',
+          updateError: '/error/updateError'
         },
         storeInfo: {},
         storeCode: '',
@@ -577,6 +620,33 @@ export default defineComponent({
         })
       }
 
+      const showErrMessage = () => {
+        errVisible.value = true
+        loadErrData()
+      }
+
+      // 异常分页
+      const loadErrData = () => {
+        postAction(state.url.getErrorPage, searchData.value).then(res => {
+          if (res.code !== 99200) return ElMessage.error(res.message);
+          logList.value = res.data.records
+          total.value = res.data.totalRows - 0
+        })
+      }
+
+      // 处理异常
+      const updateError = (row) => {
+        postAction(state.url.updateError, {errorId: row.errorId, handleFlag: 1}).then(res => {
+          if (res.code !== 99200) return ElMessage.error(res.message);
+          loadErrData()
+        })
+      }
+
+      function handleCurrentChange (val) {
+        searchData.value.pageNo = val
+        loadErrData()
+      }
+
       loadData()
       return {
         ...toRefs(state),
@@ -608,7 +678,14 @@ export default defineComponent({
         changeErr,
         changeType,
         url: audio,
-        deleteEpc
+        deleteEpc,
+        errVisible,
+        logList,
+        updateError,
+        searchData,
+        handleCurrentChange,
+        showErrMessage,
+        total
       }
     },
 })