维修看板获取数据

mes-ui/mes-ui-admin-vue3/src/views/biz/PMRecords/detail.vue

@@ -182,7 +182,7 @@ const queryData = async (type: string, id?: number) => {
     formData.value.submitTime = new Date().getTime()
   }
 
-  if (type == 'update'||'detail') {
+  if (type == 'update'||type == 'detail') {
     const res = await EquipMaintenanceRecordApi.getEquipMaintenanceRecord(id)
     formData.value = res
   }
@@ -207,6 +207,7 @@ const submitForm = async () => {
     dialogVisible.value = false
     // 发送操作成功的事件
     emit('success')
+    goback()
   } finally {
     formLoading.value = false
   }

mes-ui/mes-ui-admin-vue3/src/views/spectaculars/index.vue

@@ -95,17 +95,25 @@
         </el-row> -->
       </el-col>
       <el-col :span="24" style="padding: 0px 10px; margin-top: 30px;">
-        <el-table :data="tableData" ref="scrollableTable" :style="{width: '100%',height:isFullscreen?'590px':'620px'}" :row-class-name="tableRowClassName">
+        <el-table :data="list" ref="scrollableTable" :style="{width: '100%',height:isFullscreen?'590px':'620px'}" :row-class-name="tableRowClassName">
           <el-table-column type="index" label="序号" align="center" width="80" />
           <!-- <el-table-column prop="date" label="保修时间" align="center" min-width="150" /> -->
           <el-table-column prop="code" label="卡片编码" align="center" min-width="150" />
-          <el-table-column prop="codename" label="卡片名称" align="center" min-width="150" />
+          <el-table-column label="卡片名称" align="center" prop="name" min-width="120">
+            <template #default="scope">
+              {{getDictLabel(DICT_TYPE.BIZ_EQUIP_MAINTENANCE_TYPE, scope.row.type)}}
+            </template>
+          </el-table-column>
           <!-- <el-table-column prop="line" align="center" label="产线" min-width="120" /> -->
-          <el-table-column prop="maintainer" align="center" label="维修人" min-width="150" />
-          <el-table-column prop="describe" align="center" label="故障描述" min-width="200" />
-          <el-table-column prop="failure" align="center" label="维修进度" min-width="150" />
-          <el-table-column prop="scheduleplain" align="center" label="进度说明" min-width="150" />
-          <el-table-column prop="consuming" align="center" label="已耗时" min-width="150" />
+          <el-table-column prop="ownerName" align="center" label="维修人" min-width="150" />
+          <el-table-column prop="description" align="center" label="故障描述" min-width="200" />
+           <el-table-column fixed="right" label="维保进度" align="center" prop="progress" min-width="120">
+          <template #default="scope">
+            {{!scope.row.progress ? '' : (parseFloat(scope.row.progress) + '%')}}
+          </template>
+        </el-table-column>
+          <el-table-column prop="remark" align="center" label="进度说明" min-width="150" />
+          <el-table-column prop="timeConsumed" align="center" label="已耗时" min-width="150" />
         </el-table>
       </el-col>
     </el-row>
@@ -116,6 +124,9 @@
 <script setup lang="ts">
 import * as echarts from 'echarts'
 import { ref, onMounted, onUnmounted } from 'vue'
+import * as EquipMaintenanceRecordApi from '@/api/biz/equipmaintenancerecord'
+import { getStrDictOptions, DICT_TYPE, getDictLabel, getIntDictOptions } from '@/utils/dict'
+
 // 获取当前时间
 var now = new Date()
 // 定义星期数组
@@ -136,21 +147,42 @@ var formatted_date =
 //   name: 1
 // })
 const queryParams = reactive({
-  name: 1
+  pageNo: 1,
+  pageSize: undefined,
+  code: undefined,
+  type: undefined,
+  equipId: undefined,
+  description: undefined,
+  owner: undefined,
+  progress: undefined,
+  remark: undefined,
+  status: undefined,
+  equipname: undefined,
+  createTime: [],
+  submitTime: []
 })
 const queryFormRef = ref() // 搜索的表单
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await EquipMaintenanceRecordApi.getEquipMaintenanceRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+    console.log(list.value)
+  } finally {
+    loading.value = false
+  }
+}
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
 
-//模拟下拉框
-const options = [
-  {
-    value: 1,
-    label: '江苏美乐嘉科技材料有限公司'
-  },
-  {
-    value: 2,
-    label: '江苏美乐嘉科技材料有限公司2'
-  }
-]
 //表格数据
 const tableData = [
   {