8 changed files with 82 additions and 68 deletions
--- a/src/views/carError/index.vue
+++ b/src/views/carError/index.vue
@ -26,7 +26,7 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item label="是否已读" prop="readStatus">
+      <el-form-item label="是否已读" prop="readStatus" >
        <el-select
          v-model="queryParams.readStatus"
          placeholder="请选择是否已读"
@ -34,8 +34,14 @@
          class="!w-240px"
          @change="handleQuery"
        >
-          <el-option :label="'已读'" :value="1" />
-          <el-option :label="'未读'" :value="0" />
+          <el-option
+            :label="'已读'"
+            :value="1"
+          />
+          <el-option
+            :label="'未读'"
+            :value="0"
+          />
        </el-select>
      </el-form-item>
      <el-form-item label="时间段" prop="createTime">
@ -66,10 +72,10 @@
      row-class-name="table-row-class"
      :header-cell-style="{ backgroundColor: '#EBF1FF', padding: '13px 0' }"
    >
-      <el-table-column label="序号" align="center" type="index" width="80" />
-      <el-table-column label="AGV编号" align="center" prop="robotNo" />
+      <el-table-column label="序号" align="center" prop="id" />
      <el-table-column label="告警等级（1-4）" align="center" prop="warnLevel" />
      <el-table-column label="告警/异常ID" align="center" prop="warnCode" />
+      <el-table-column label="车辆" align="center" prop="robotNo" />
      <el-table-column label="告警/异常信息" align="center" prop="warnMsg" />
      <el-table-column label="发生时间" align="center" prop="createTime">
        <template #default="scope">
@ -119,14 +125,14 @@
 </template>

 <script setup lang="ts">
-import { useRoute } from 'vue-router'
+import { useRoute } from 'vue-router';
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as CarErrorApi from '@/api/carError'
 import { formatDate } from '@/utils/formatTime'
 import router from '@/router'
 import { ElMessage, ElMessageBox } from 'element-plus'
-const route = useRoute()
+const route = useRoute();
 defineOptions({ name: 'SystemCarError' })

 const message = useMessage() // 消息弹窗
@ -227,11 +233,15 @@ const handleExport = async () => {

 // 确认已读
 const handleRead = async (row) => {
-  ElMessageBox.confirm('您确定要已读这条异常信息?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  })
+  ElMessageBox.confirm(
+    '您确定要已读这条异常信息?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
    .then(() => {
      // ElMessage({
      //   type: 'success',
@ -253,17 +263,21 @@ const handleRead = async (row) => {

 //全部已读
 const allRead = async () => {
-  ElMessageBox.confirm('您确定要全部已读?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  })
+  ElMessageBox.confirm(
+    '您确定要全部已读?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
    .then(() => {
      // ElMessage({
      //   type: 'success',
      //   message: 'Delete completed',
      // })
-
+      
      CarErrorApi.robotWarnMsgUpdateAll().then((res) => {
        getList()
      })
@ -279,7 +293,7 @@ const allRead = async () => {
 /** 初始化 **/
 onMounted(() => {
  // console.log(route.query.robotNo)
-  if (route.query.robotNo) {
+  if(route.query.robotNo){
    queryParams.robotNo = route.query.robotNo
  }
  getList()
--- a/src/views/mapPage/locationList/editFormDialog.vue
+++ b/src/views/mapPage/locationList/editFormDialog.vue
@ -1,4 +1,5 @@
 <template>
+  <!-- 新增设备 -->
  <Dialog v-model="dialogFormVisible" title="编辑" width="600" class="equipment-form-dialog">
    <el-form :model="form" label-width="110" ref="ruleFormRef">
      <el-form-item label="库位号" prop="locationNo">
--- a/src/views/mapPage/locationList/index.vue
+++ b/src/views/mapPage/locationList/index.vue
@ -80,7 +80,7 @@
      :header-cell-style="{ backgroundColor: '#EBF1FF', padding: '13px 0' }"
    >
      <el-table-column label="序号" type="index" align="center" width="60" />
-      <el-table-column label="库位号" align="center" prop="locationNo" />
+      <el-table-column label="库位号"  align="center" prop="locationNo"/>
      <el-table-column label="线库号" prop="laneName" align="center" />
      <el-table-column label="区域号" prop="areaName" align="center" />
      <el-table-column label="物料信息" prop="skuInfo" align="center" show-overflow-tooltip />
--- a/src/views/mapPage/logList/index.vue
+++ b/src/views/mapPage/logList/index.vue
@ -86,6 +86,14 @@
                </el-select>
              </el-form-item>
              <el-form-item label="创建时间" prop="createTime">
+                <!-- <el-date-picker
+                  class="!w-240px"
+                  v-model="carLogParams.createTime"
+                  type="datetime"
+                  placeholder="请选择创建时间"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  format="YYYY-MM-DD HH:mm:ss"
+                /> -->
                <el-date-picker
                  v-model="carLogParams.createTime"
                  value-format="YYYY-MM-DD HH:mm:ss"
@ -122,7 +130,7 @@
              <el-table-column prop="actionMsg" label="日志内容" align="center" />
              <el-table-column
                prop="createTime"
-                label="创建时间"
+                label="发生时间"
                :formatter="dateFormatter"
                align="center"
              />
@ -151,28 +159,12 @@
              <el-form-item label="任务编号" prop="taskNo">
                <el-input
                  v-model="taskLogParams.taskNo"
-                  placeholder="请输入任务编号"
+                  placeholder="请输入任务ID"
                  clearable
                  @keyup.enter="handleQuery"
                  class="!w-240px"
                />
              </el-form-item>
-              <el-form-item label="任务类型" prop="taskType">
-                <el-select
-                  v-model="taskLogParams.taskType"
-                  class="!w-240px"
-                  clearable
-                  placeholder="请选择任务类型"
-                  @change="handleQuery()"
-                >
-                  <el-option label="取放货" :value="1" />
-                  <el-option label="停车" :value="2" />
-                  <el-option label="充电" :value="3" />
-                  <el-option label="移动" :value="4" />
-                  <el-option label="仅取货" :value="5" />
-                  <el-option label="仅放货" :value="6" />
-                </el-select>
-              </el-form-item>
              <el-form-item label="任务状态" prop="taskStatus">
                <el-select
                  v-model="taskLogParams.taskStatus"
@ -189,6 +181,22 @@
                  />
                </el-select>
              </el-form-item>
+              <el-form-item label="任务阶段" prop="taskStage">
+                <el-select
+                  v-model="taskLogParams.taskStage"
+                  class="!w-240px"
+                  clearable
+                  placeholder="请选择任务阶段"
+                  @change="handleQuery()"
+                >
+                  <el-option
+                    v-for="dict in getIntDictOptions(DICT_TYPE.ROBOT_QUEST_PHASES)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
              <el-form-item label="开始时间" prop="startTime" :formatter="dateFormatter">
                <el-date-picker
                  class="!w-240px"
@ -237,15 +245,21 @@
                  <el-text v-if="scope.row.taskType == 1">取放货</el-text>
                  <el-text v-if="scope.row.taskType == 2">停车</el-text>
                  <el-text v-if="scope.row.taskType == 3">充电</el-text>
-                  <el-text v-if="scope.row.taskType == 4">移动</el-text>
+                  <el-text v-if="scope.row.taskType == 4">充电</el-text>
                  <el-text v-if="scope.row.taskType == 5">仅取货</el-text>
                  <el-text v-if="scope.row.taskType == 6">仅放货</el-text>
+                  <el-text v-if="scope.row.taskType == 7">扫描码</el-text>
+                  <el-text v-if="scope.row.taskType == 8">检测托盘类型</el-text>
                </template>
              </el-table-column>
              <el-table-column prop="msg" label="任务内容" align="center" show-overflow-tooltip />
-              <el-table-column prop="taskStatus" label="任务状态" align="center" width="120">
+              <el-table-column prop="taskStatus" label="任务阶段" align="center" width="120">
                <template #default="scope">
-                  <dict-tag :type="DICT_TYPE.ROBOT_TASK_STATUS" :value="scope.row.taskStatus" />
+                  <el-text v-if="scope.row.taskStatus == 0">未开始</el-text>
+                  <el-text v-if="scope.row.taskStatus == 1">执行中</el-text>
+                  <el-text v-if="scope.row.taskStatus == 2">已完成</el-text>
+                  <el-text v-if="scope.row.taskStatus == 3">已取消</el-text>
+                  <el-text v-if="scope.row.taskStatus == 4">异常</el-text>
                </template>
              </el-table-column>
              <el-table-column
--- a/src/views/mapPage/realTimeMap/components-tool/itemAreaManagementDialog.vue
+++ b/src/views/mapPage/realTimeMap/components-tool/itemAreaManagementDialog.vue
@ -14,7 +14,7 @@
    >
      <el-table-column type="index" label="序号" width="80" align="center" />
      <el-table-column prop="areaName" label="物料区域名称" align="center" />
-      <el-table-column prop="skuInfo" label="物料信息" align="center" />
+      <el-table-column prop="skuInfo" label="物料名称" align="center" />
      <el-table-column label="操作" align="center" width="140">
        <template #default="scope">
          <el-button size="small" type="primary" @click="handleEdit(scope.row)"> 编辑 </el-button>
@ -39,10 +39,10 @@
  <el-dialog v-model="editDialogFormVisible" title="编辑" width="400">
    <el-form :model="editForm" label-width="110" :rules="editRules" ref="editFormEl">
      <el-form-item label="物料区域名称" prop="areaName" required>
-        <el-input v-model="editForm.areaName" maxlength="30" show-word-limit />
+        <el-input v-model="editForm.areaName" />
      </el-form-item>
-      <el-form-item label="物料信息" prop="skuInfo" required>
-        <el-input v-model="editForm.skuInfo" maxlength="30" show-word-limit />
+      <el-form-item label="物料名称" prop="skuInfo" required>
+        <el-input v-model="editForm.skuInfo" />
      </el-form-item>
    </el-form>
    <template #footer>
@ -123,7 +123,7 @@ const handleEdit = (row) => {
 }
 const editRules = reactive({
  skuInfo: [{ required: true, message: '请输入物料区域名称', trigger: 'blur' }],
-  areaName: [{ required: true, message: '请输入物料信息', trigger: 'blur' }]
+  areaName: [{ required: true, message: '请输入物料名称', trigger: 'blur' }]
 })
 const editFormEl = ref()
 const editSubmit = async () => {
--- a/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue
+++ b/src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue
@ -9,20 +9,10 @@
  >
    <el-form :model="form" label-width="110" ref="ruleFormRef" :rules="rules">
      <el-form-item label="物料区域名称" prop="areaName" required>
-        <el-input
-          v-model="form.areaName"
-          placeholder="请输入物料区域名称"
-          maxlength="30"
-          show-word-limit
-        />
+        <el-input v-model="form.areaName" placeholder="请输入物料区域名称" />
      </el-form-item>
-      <el-form-item label="物料信息" prop="skuInfo" required>
-        <el-input
-          v-model="form.skuInfo"
-          placeholder="请输入物料信息"
-          maxlength="30"
-          show-word-limit
-        />
+      <el-form-item label="物料名称" prop="skuInfo" required>
+        <el-input v-model="form.skuInfo" placeholder="请输入物料名称" />
      </el-form-item>
      <el-form-item label="库位数量" prop="areaNumber">
        <el-input v-model="form.areaNumber" :disabled="true" />
@ -55,13 +45,13 @@ const dialogFormVisible = ref(false) //列表的

 const rules = reactive({
  skuInfo: [{ required: true, message: '请输入物料区域名称', trigger: 'blur' }],
-  areaName: [{ required: true, message: '请输入物料信息', trigger: 'blur' }]
+  areaName: [{ required: true, message: '请输入物料名称', trigger: 'blur' }]
 })

 //新增
 const form = ref({
  positionMapId: '',
-  skuInfo: '', //物料信息
+  skuInfo: '', //物料名称
  areaName: '', //物料区域名称
  areaNumber: 0,
  mapItemIds: []
--- a/src/views/mapPage/realTimeMap/components-tool/lineLibraryManagementDialog.vue
+++ b/src/views/mapPage/realTimeMap/components-tool/lineLibraryManagementDialog.vue
@ -38,7 +38,7 @@
  <el-dialog v-model="editDialogFormVisible" title="编辑" width="400">
    <el-form :model="editForm" :rules="editRules" ref="editFormEl">
      <el-form-item label="线库名称" prop="laneName" required>
-        <el-input v-model="editForm.laneName" maxlength="30" show-word-limit />
+        <el-input v-model="editForm.laneName" />
      </el-form-item>
    </el-form>
    <template #footer>
--- a/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue
+++ b/src/views/mapPage/realTimeMap/components-tool/lineLibrarySettingDialog.vue
@ -9,12 +9,7 @@
  >
    <el-form :model="form" label-width="110" ref="lineFormRef" :rules="rules">
      <el-form-item label="线库名称" prop="laneName" required>
-        <el-input
-          v-model="form.laneName"
-          placeholder="请输入线库名称"
-          maxlength="30"
-          show-word-limit
-        />
+        <el-input v-model="form.laneName" placeholder="请输入线库名称" />
      </el-form-item>
      <el-form-item label="库位数量" prop="areaNumber" required>
        <el-input v-model="form.areaNumber" :disabled="true" />