知识库，工单详情

src/api/pms/information/index.ts

@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+// 故障知识库 VO
+export interface IotInformationDbVO {
+  id: number // 主键id
+  deviceType: string // 设备分类
+  failureInfluence: string // 故障影响
+  failureSystem: string // 故障模块/影响
+  description: string // 描述
+  solutions: string // 解决办法
+  remark: string // 备注
+  processInstanceId: string // 流程实例id
+  auditStatus: number // 审核状态
+}
+
+// 故障知识库 API
+export const IotInformationDbApi = {
+  // 查询故障知识库分页
+  getIotInformationDbPage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-information-db/page`, params })
+  },
+
+  // 查询故障知识库详情
+  getIotInformationDb: async (id: number) => {
+    return await request.get({ url: `/rq/iot-information-db/get?id=` + id })
+  },
+
+  // 新增故障知识库
+  createIotInformationDb: async (data: IotInformationDbVO) => {
+    return await request.post({ url: `/rq/iot-information-db/create`, data })
+  },
+
+  // 修改故障知识库
+  updateIotInformationDb: async (data: IotInformationDbVO) => {
+    return await request.put({ url: `/rq/iot-information-db/update`, data })
+  },
+
+  // 删除故障知识库
+  deleteIotInformationDb: async (id: number) => {
+    return await request.delete({ url: `/rq/iot-information-db/delete?id=` + id })
+  },
+
+  // 导出故障知识库 Excel
+  exportIotInformationDb: async (params) => {
+    return await request.download({ url: `/rq/iot-information-db/export-excel`, params })
+  },
+}

src/router/modules/remaining.ts

@@ -183,7 +183,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
           canTo: true,
           icon: 'ep:add',
           title: '维修工单添加',
-          activeMenu: '/device/base'
+          activeMenu: '/maintain/add'
         }
       },
       {
@@ -196,9 +196,21 @@ const remainingRouter: AppRouteRecordRaw[] = [
           canTo: true,
           icon: 'ep:edit',
           title: '维修工单编辑',
-          activeMenu: '/device/base'
+          activeMenu: '/maintain/edit'
         }
-      }
+      },{
+        path: 'maintain/detail/:id(\\d+)',
+        component: () => import('@/views/pms/maintain/IotMaintainDetail.vue'),
+        name: 'MaintainDetail',
+        meta: {
+          noCache: false,
+          hidden: true,
+          canTo: true,
+          icon: 'ep:add',
+          title: '维修工单详情',
+          activeMenu: '/maintain/detail'
+        }
+      },
     ]
   },
 

src/views/pms/information/IotInformationDbForm.vue

@@ -0,0 +1,131 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="设备分类" prop="deviceType">
+        <el-select v-model="formData.deviceType" placeholder="请选择设备分类">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="故障影响" prop="failureInfluence">
+        <el-input v-model="formData.failureInfluence" placeholder="请输入故障影响" />
+      </el-form-item>
+      <el-form-item label="故障模块/影响" prop="failureSystem">
+        <el-input v-model="formData.failureSystem" placeholder="请输入故障模块/影响" />
+      </el-form-item>
+      <el-form-item label="描述" prop="description">
+        <Editor v-model="formData.description" height="150px" />
+      </el-form-item>
+      <el-form-item label="解决办法" prop="solutions">
+        <el-input v-model="formData.solutions" placeholder="请输入解决办法" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="流程实例id" prop="processInstanceId">
+        <el-input v-model="formData.processInstanceId" placeholder="请输入流程实例id" />
+      </el-form-item>
+      <el-form-item label="审核状态" prop="auditStatus">
+        <el-radio-group v-model="formData.auditStatus">
+          <el-radio value="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { IotInformationDbApi, IotInformationDbVO } from '@/api/pms/information'
+
+/** 故障知识库 表单 */
+defineOptions({ name: 'IotInformationDbForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  deviceType: undefined,
+  failureInfluence: undefined,
+  failureSystem: undefined,
+  description: undefined,
+  solutions: undefined,
+  remark: undefined,
+  processInstanceId: undefined,
+  auditStatus: undefined,
+})
+const formRules = reactive({
+  deviceType: [{ required: true, message: '设备分类不能为空', trigger: 'change' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await IotInformationDbApi.getIotInformationDb(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as IotInformationDbVO
+    if (formType.value === 'create') {
+      await IotInformationDbApi.createIotInformationDb(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await IotInformationDbApi.updateIotInformationDb(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    deviceType: undefined,
+    failureInfluence: undefined,
+    failureSystem: undefined,
+    description: undefined,
+    solutions: undefined,
+    remark: undefined,
+    processInstanceId: undefined,
+    auditStatus: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/pms/information/index.vue

@@ -0,0 +1,257 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="设备分类" prop="deviceType">
+        <el-select
+          v-model="queryParams.deviceType"
+          placeholder="请选择设备分类"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="故障影响" prop="failureInfluence">
+        <el-input
+          v-model="queryParams.failureInfluence"
+          placeholder="请输入故障影响"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="故障模块/影响" prop="failureSystem">
+        <el-input
+          v-model="queryParams.failureSystem"
+          placeholder="请输入故障模块/影响"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="解决办法" prop="solutions">
+        <el-input
+          v-model="queryParams.solutions"
+          placeholder="请输入解决办法"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </el-form-item>
+      <el-form-item label="流程实例id" prop="processInstanceId">
+        <el-input
+          v-model="queryParams.processInstanceId"
+          placeholder="请输入流程实例id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="审核状态" prop="auditStatus">
+        <el-select
+          v-model="queryParams.auditStatus"
+          placeholder="请选择审核状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['rq:iot-information-db:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['rq:iot-information-db:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="主键id" align="center" prop="id" />
+      <el-table-column label="设备分类" align="center" prop="deviceType" />
+      <el-table-column label="故障影响" align="center" prop="failureInfluence" />
+      <el-table-column label="故障模块/影响" align="center" prop="failureSystem" />
+      <el-table-column label="描述" align="center" prop="description" />
+      <el-table-column label="解决办法" align="center" prop="solutions" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="流程实例id" align="center" prop="processInstanceId" />
+      <el-table-column label="审核状态" align="center" prop="auditStatus" />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['rq:iot-information-db:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['rq:iot-information-db:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <IotInformationDbForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { IotInformationDbApi, IotInformationDbVO } from '@/api/pms/information'
+import IotInformationDbForm from './IotInformationDbForm.vue'
+
+/** 故障知识库 列表 */
+defineOptions({ name: 'IotInformationDb' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<IotInformationDbVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  deviceType: undefined,
+  failureInfluence: undefined,
+  failureSystem: undefined,
+  description: undefined,
+  solutions: undefined,
+  remark: undefined,
+  createTime: [],
+  processInstanceId: undefined,
+  auditStatus: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await IotInformationDbApi.getIotInformationDbPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await IotInformationDbApi.deleteIotInformationDb(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await IotInformationDbApi.exportIotInformationDb(queryParams)
+    download.excel(data, '故障知识库.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/pms/maintain/IotMaintain.vue

@@ -5,189 +5,250 @@
       :model="formData"
       :rules="formRules"
       v-loading="formLoading"
-      style="margin-right: 4em;margin-left: 0.5em;margin-top: 1em" label-width="130px"
+      style="margin-right: 4em; margin-left: 0.5em; margin-top: 1em"
+      label-width="130px"
     >
       <div class="base-expandable-content">
-      <el-row>
-        <el-col :span="6">
-          <el-form-item label="设备" prop="deviceName">
-            <el-select
-              v-model="formData.deviceName"
-              :model-value="deviceLabel"
-              placeholder="请选择设备"
-              @click="openForm"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="formData.status"
-          placeholder="请选择状态"
-          clearable
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PMS_MAIN_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="维修类型" prop="type">
-            <el-select
-              disabled
-              v-model="formData.type"
-              placeholder="请选择维修类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in getStrDictOptions(DICT_TYPE.PMS_MAIN_TYPE)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="设备" prop="deviceName">
+              <el-select
+                v-model="formData.deviceName"
+                :model-value="deviceLabel"
+                placeholder="请选择设备"
+                @click="openForm"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-      <el-form-item label="是否停机" prop="ifStop">
-        <el-select
-          v-model="formData.ifStop"
-          placeholder="请选择是否停机"
-          clearable
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PMS_MAIN_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+            </el-form-item>
           </el-col>
-        <el-col :span="6">
-      <el-form-item label="故障时间" prop="failureTime">
-        <el-date-picker
-          style="width: 150%"
-          v-model="formData.failureTime"
-          type="date"
-          value-format="x"
-          placeholder="选择故障时间"
-        />
-      </el-form-item>
+          <el-col :span="6">
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="formData.status" placeholder="请选择状态" clearable>
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.PMS_MAIN_STATUS)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
           </el-col>
-        <el-col :span="6">
-          <el-form-item label="维修开始时间" prop="maintainStartTime">
-            <el-date-picker
-              style="width: 150%"
-              v-model="formData.maintainStartTime"
-              type="date"
-              value-format="x"
-              placeholder="选择维修开始时间"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="维修负责人" prop="maintainPerson">
-            <el-select v-model="formData.maintainPerson" filterable clearable style="width: 100%">
-              <el-option
-                v-for="item in deptUsers"
-                :key="item.id"
-                :label="item.nickname"
-                :value="item.id"
+          <el-col :span="6">
+            <el-form-item label="维修类型" prop="type">
+              <el-select disabled v-model="formData.type" placeholder="请选择维修类型" clearable>
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.PMS_MAIN_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否停机" prop="ifStop">
+              <el-select v-model="formData.ifStop" placeholder="请选择是否停机" clearable>
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="故障时间" prop="failureTime">
+              <el-date-picker
+                style="width: 150%"
+                v-model="formData.failureTime"
+                type="date"
+                value-format="x"
+                placeholder="选择故障时间"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-      <el-form-item label="故障影响" prop="failureInfluence">
-        <el-input v-model="formData.failureInfluence" placeholder="请输入故障影响" />
-      </el-form-item>
+            </el-form-item>
           </el-col>
-        <el-col :span="6">
-      <el-form-item label="故障系统" prop="failureSystem">
-        <el-input v-model="formData.failureSystem" placeholder="请输入故障系统" />
-      </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="维修结束时间" prop="maintainEndTime">
-            <el-date-picker
-              style="width: 150%"
-              v-model="formData.maintainEndTime"
-              type="date"
-              value-format="x"
-              placeholder="选择维修结束时间"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="图片" prop="pic">
-            <!--        <el-input v-model="formData.pic" placeholder="请输入图片" />-->
-            <UploadImg v-model="formData.pic" height="55px" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-      <el-form-item label="故障描述" prop="description">
-        <el-input type="textarea" v-model="formData.description"/>
-      </el-form-item>
-
+          <el-col :span="6">
+            <el-form-item label="维修开始时间" prop="maintainStartTime">
+              <el-date-picker
+                style="width: 150%"
+                v-model="formData.maintainStartTime"
+                type="date"
+                value-format="x"
+                placeholder="选择维修开始时间"
+              />
+            </el-form-item>
           </el-col>
-        <el-col :span="6">
-          <el-form-item label="维修描述" prop="maintainDescription">
-            <el-input type="textarea" v-model="formData.maintainDescription"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-      <el-form-item label="解决办法" prop="solution">
-        <el-input type="textarea" v-model="formData.solution"/>
-      </el-form-item>
+          <el-col :span="6">
+            <el-form-item label="维修负责人" prop="maintainPerson">
+              <el-select v-model="formData.maintainPerson" filterable clearable style="width: 100%">
+                <el-option
+                  v-for="item in deptUsers"
+                  :key="item.id"
+                  :label="item.nickname"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
           </el-col>
-        <el-col :span="6">
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
-      </el-form-item>
+          <el-col :span="6">
+            <el-form-item label="故障影响" prop="failureInfluence">
+              <el-input v-model="formData.failureInfluence" placeholder="请输入故障影响" />
+            </el-form-item>
           </el-col>
-
-      </el-row>
+          <el-col :span="6">
+            <el-form-item label="故障系统" prop="failureSystem">
+              <el-input v-model="formData.failureSystem" placeholder="请输入故障系统" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="维修结束时间" prop="maintainEndTime">
+              <el-date-picker
+                style="width: 150%"
+                v-model="formData.maintainEndTime"
+                type="date"
+                value-format="x"
+                placeholder="选择维修结束时间"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="图片" prop="pic">
+              <!--        <el-input v-model="formData.pic" placeholder="请输入图片" />-->
+              <UploadImg v-model="formData.pic" height="55px" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="故障描述" prop="description">
+              <el-input type="textarea" v-model="formData.description" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="维修描述" prop="maintainDescription">
+              <el-input type="textarea" v-model="formData.maintainDescription" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="解决办法" prop="solution">
+              <el-input type="textarea" v-model="formData.solution" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
   </ContentWrap>
   <ContentWrap>
-    <MaintainMaterial  :deptId="formData.deptId"/>
+    <ContentWrap>
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px"
+      >
+        <el-form-item>
+          <el-button @click="openMaterialForm" type="primary"
+            ><Icon icon="ep:plus" class="mr-5px" /> 选择物料</el-button
+          >
+          <el-button @click="handleView" type="warning"
+            ><Icon icon="ep:plus" class="mr-5px" /> 新增物料</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <!-- 列表 -->
+    <ContentWrap>
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+        <el-table-column label="物料编码" align="center" prop="code" />
+        <el-table-column label="物料名称" align="center" prop="name" />
+        <el-table-column label="单位" align="center" prop="unit" />
+        <el-table-column label="单价" align="center" prop="price" />
+        <el-table-column label="消耗数量" align="center" prop="depleteCount">
+          <template #default="scope">
+            <el-input v-model="scope.row.depleteCount" />
+          </template>
+        </el-table-column>
+        <el-table-column label="总库存数量" align="center" prop="totalCount" />
+        <el-table-column label="备注" align="center" prop="remark">
+          <template #default="scope">
+            <el-input v-model="scope.row.remark" />
+          </template>
+        </el-table-column>
+        <el-table-column label="物料来源" align="center" prop="sourceType" />
+        <el-table-column label="操作" align="center" min-width="120px">
+          <template #default="scope">
+            <div style="display: flex; justify-content: center; align-items: center; width: 100%">
+              <div>
+                <Icon style="vertical-align: middle; color: #ea3434" icon="ep:zoom-out" />
+                <el-button
+                  style="vertical-align: middle"
+                  link
+                  type="danger"
+                  @click="handleDelete(scope.row.code)"
+                >
+                  移除
+                </el-button>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </ContentWrap>
+
+    <!-- 表单弹窗：添加/修改 -->
+    <ChooseMaterial ref="materialFormRef" :deptId="formData.deptId" @choose="selectChoose" />
+    <MaintainMaterialDrawer
+      ref="showDrawer"
+      :model-value="drawerVisible"
+      @update:model-value="(val) => (drawerVisible = val)"
+      @add="handleChildSubmit"
+    />
   </ContentWrap>
   <ContentWrap>
-  <el-form>
-    <el-form-item style="float: right">
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </el-form-item>
-  </el-form>
+    <el-form>
+      <el-form-item style="float: right">
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">保 存</el-button>
+        <el-button @click="close">取 消</el-button>
+      </el-form-item>
+    </el-form>
   </ContentWrap>
   <DeviceList ref="deviceFormRef" @choose="deviceChoose" />
 </template>
 <script setup lang="ts">
 import { IotMaintainApi, IotMaintainVO } from '@/api/pms/maintain'
-import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
-import DeviceList from "@/views/pms/failure/DeviceList.vue";
-import MaintainMaterial from "@/views/pms/maintain/material/index.vue";
-import * as UserApi from "@/api/system/user";
-import {useUserStore} from "@/store/modules/user";
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import DeviceList from '@/views/pms/failure/DeviceList.vue'
+import * as UserApi from '@/api/system/user'
+import { useUserStore } from '@/store/modules/user'
+import ChooseMaterial from '@/views/pms/maintain/material/ChooseMaterial.vue'
+import MaintainMaterialDrawer from '@/views/pms/maintain/material/MaintainMaterialDrawer.vue'
+import { ref } from 'vue'
+import { IotMaintainMaterialVO } from '@/api/pms/maintain/material'
+import { useTagsViewStore } from '@/store/modules/tagsView'
 
 /** 维修工单 表单 */
 defineOptions({ name: 'IotMaintain' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const { delView } = useTagsViewStore() // 视图操作
+const { currentRoute, push } = useRouter()
 const deptUsers = ref<UserApi.UserVO[]>([]) // 用户列表
-const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const deviceLabel = ref('') // 表单的类型：create - 新增；update - 修改
+const drawerVisible = ref<boolean>(false)
+const showDrawer = ref()
+const list = ref<IotMaintainMaterialVO[]>([]) // 列表的数据
+const { params, name } = useRoute() // 查询参数
+const id = params.id
 const formData = ref({
   id: undefined,
   failureCode: undefined,
@@ -210,6 +271,7 @@ const formData = ref({
   auditStatus: undefined,
   deptId: undefined,
   maintainPerson: undefined,
+  maintainDescription: undefined,
 })
 const formRules = reactive({
   deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
@@ -222,36 +284,90 @@ const formRules = reactive({
   maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],
   maintainPerson: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
   deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const deviceChoose = (row) => {
   formData.value.deviceId = row.id
   formData.value.deviceName = row.deviceName
-  formData.value.deptId = row.deptId;
+  formData.value.deptId = row.deptId
   deviceLabel.value = row.deviceName
 }
 const deviceFormRef = ref()
 const openForm = () => {
   deviceFormRef.value.open()
 }
+
+const materialFormRef = ref()
+const openMaterialForm = (type: string, id?: number) => {
+  if (!formData.value.deptId) {
+    message.error('请选择设备')
+    return
+  }
+  materialFormRef.value.open(type, id)
+}
+const close = () => {
+  delView(unref(currentRoute))
+  push({
+    name: 'IotMaintain',
+    query: {
+      date: new Date().getTime()
+    }
+  })
+}
+const handleView = () => {
+  drawerVisible.value = true
+  showDrawer.value.openDrawer()
+}
+const selectChoose = (formData) => {
+  console.log('接收到的数据:', JSON.stringify(formData))
+  list.value.push(formData)
+}
+const handleChildSubmit = (formData) => {
+  const modified = removeOnesFromKeys(formData)
+  list.value.push(modified)
+}
+
+const removeOnesFromKeys = (obj: Record<string, any>) => {
+  return Object.keys(obj).reduce(
+    (acc, key) => {
+      const newKey = key.replace(/1/g, '') // 替换所有 1
+      acc[newKey] = obj[key]
+      return acc
+    },
+    {} as Record<string, any>
+  )
+}
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
+  if (list.value.length > 0) {
+    const length = list.value.filter((item) => {
+      item.depleteCount===null||item.depleteCount===undefined
+    }).length
+    if (length > 0) {
+      message.error('请填写消耗数量')
+    }
+  }
+
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as IotMaintainVO
+    const data = {
+      maintain: formData.value,
+      maintainMaterials: list.value
+    }
     if (formType.value === 'create') {
       await IotMaintainApi.createIotMaintain(data)
       message.success(t('common.createSuccess'))
+      close()
     } else {
       await IotMaintainApi.updateIotMaintain(data)
       message.success(t('common.updateSuccess'))
+      close()
     }
-    dialogVisible.value = false
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -280,19 +396,40 @@ const resetForm = () => {
     deviceName: undefined,
     processInstanceId: undefined,
     auditStatus: undefined,
-    deptId: undefined,
+    deptId: undefined
   }
   formRef.value?.resetFields()
 }
-onMounted(async ()=>{
+onMounted(async () => {
   formData.value.type = 'in'
   const deptId = useUserStore().getUser.deptId
-  deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId);
+  deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
+  if (id){
+    formType.value = 'update'
+  } else {
+    formType.value = 'create';
+  }
 })
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    //await message.delConfirm()
+    // 发起删除
+    // await IotMaintainMaterialApi.deleteIotMaintainMaterial(id)
+    // message.success(t('common.delSuccess'))
+    // // 刷新列表
+    // await getList()
+    const index = list.value.findIndex((item) => item.code === id)
+    debugger
+    if (index !== -1) {
+      // 通过 splice 删除元素
+      list.value.splice(index, 1)
+    }
+  } catch {}
+}
 </script>
 <style scoped>
 .base-expandable-content {
-
   overflow: hidden; /* 隐藏溢出的内容 */
   transition: max-height 0.3s ease; /* 平滑过渡效果 */
 }

src/views/pms/maintain/IotMaintainDetail.vue

@@ -0,0 +1,258 @@
+<template>
+  <ContentWrap v-loading="formLoading">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      v-loading="formLoading"
+      style="margin-right: 4em; margin-left: 0.5em; margin-top: 1em"
+      label-width="130px"
+    >
+      <div class="base-expandable-content">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="设备" prop="deviceName">
+              <el-select
+                disabled
+                v-model="formData.deviceName"
+                placeholder="请选择设备"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="formData.status" placeholder="请选择状态" clearable disabled>
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.PMS_MAIN_STATUS)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="维修类型" prop="type">
+              <el-select disabled v-model="formData.type" placeholder="请选择维修类型" clearable>
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.PMS_MAIN_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否停机" prop="ifStop">
+              <el-select v-model="formData.ifStop" placeholder="请选择是否停机" clearable disabled>
+                <el-option
+                  v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="故障时间" prop="failureTime">
+              <el-date-picker
+                disabled
+                style="width: 150%"
+                v-model="formData.failureTime"
+                type="date"
+                value-format="x"
+                placeholder="选择故障时间"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="维修开始时间" prop="maintainStartTime">
+              <el-date-picker
+                disabled
+                style="width: 150%"
+                v-model="formData.maintainStartTime"
+                type="date"
+                value-format="x"
+                placeholder="选择维修开始时间"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="维修负责人" prop="maintainPerson">
+              <el-select v-model="formData.maintainPerson" filterable clearable style="width: 100%" disabled>
+                <el-option
+                  v-for="item in deptUsers"
+                  :key="item.id"
+                  :label="item.nickname"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="故障影响" prop="failureInfluence">
+              <el-input v-model="formData.failureInfluence" placeholder="请输入故障影响" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="故障系统" prop="failureSystem">
+              <el-input v-model="formData.failureSystem" placeholder="请输入故障系统" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="维修结束时间" prop="maintainEndTime">
+              <el-date-picker
+                disabled
+                style="width: 150%"
+                v-model="formData.maintainEndTime"
+                type="date"
+                value-format="x"
+                placeholder="选择维修结束时间"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="图片" prop="pic" >
+              <UploadImg v-model="formData.pic" height="55px" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="故障描述" prop="description">
+              <el-input type="textarea" v-model="formData.description" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="维修描述" prop="maintainDescription">
+              <el-input type="textarea" v-model="formData.maintainDescription"  disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="解决办法" prop="solution">
+              <el-input type="textarea" v-model="formData.solution" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+  </ContentWrap>
+  <ContentWrap>
+    <!-- 列表 -->
+    <ContentWrap>
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+        <el-table-column label="物料编码" align="center" prop="code" />
+        <el-table-column label="物料名称" align="center" prop="name" />
+        <el-table-column label="单位" align="center" prop="unit" />
+        <el-table-column label="单价" align="center" prop="price" />
+        <el-table-column label="消耗数量" align="center" prop="depleteCount">
+          <template #default="scope">
+            <el-input v-model="scope.row.depleteCount" />
+          </template>
+        </el-table-column>
+        <el-table-column label="总库存数量" align="center" prop="totalCount" />
+        <el-table-column label="备注" align="center" prop="remark">
+          <template #default="scope">
+            <el-input v-model="scope.row.remark" />
+          </template>
+        </el-table-column>
+        <el-table-column label="物料来源" align="center" prop="sourceType" />
+      </el-table>
+    </ContentWrap>
+  </ContentWrap>
+  <ContentWrap>
+    <el-form>
+      <el-form-item style="float: right">
+        <el-button type="info" @click="close">取 消</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+</template>
+<script setup lang="ts">
+import {DICT_TYPE, getBoolDictOptions, getStrDictOptions} from '@/utils/dict'
+import * as UserApi from '@/api/system/user'
+import { ref } from 'vue'
+import {IotMaintainMaterialApi, IotMaintainMaterialVO} from '@/api/pms/maintain/material'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import {IotMaintainApi} from "@/api/pms/maintain";
+
+/** 维修工单 表单 */
+defineOptions({ name: 'IotMaintain' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { delView } = useTagsViewStore() // 视图操作
+const { currentRoute, push } = useRouter()
+const deptUsers = ref<UserApi.UserVO[]>([]) // 用户列表
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const deviceLabel = ref('') // 表单的类型：create - 新增；update - 修改
+const drawerVisible = ref<boolean>(false)
+const showDrawer = ref()
+const list = ref<IotMaintainMaterialVO[]>([]) // 列表的数据
+const { params, name } = useRoute() // 查询参数
+const id = params.id
+const formData = ref({
+  id: undefined,
+  failureCode: undefined,
+  failureName: undefined,
+  deviceId: undefined,
+  status: undefined,
+  type: undefined,
+  ifStop: undefined,
+  failureTime: undefined,
+  failureInfluence: undefined,
+  failureSystem: undefined,
+  description: undefined,
+  pic: undefined,
+  solution: undefined,
+  maintainStartTime: undefined,
+  maintainEndTime: undefined,
+  remark: undefined,
+  deviceName: undefined,
+  processInstanceId: undefined,
+  auditStatus: undefined,
+  deptId: undefined,
+  maintainPerson: undefined,
+  maintainDescription: undefined
+})
+const formRules = reactive({
+  deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '维修类型不能为空', trigger: 'blur' }],
+  ifStop: [{ required: true, message: '是否停机不能为空', trigger: 'blur' }],
+  failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
+  failureTime: [{ required: true, message: '故障时间不能为空', trigger: 'blur' }],
+  maintainStartTime: [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }],
+  maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],
+  maintainPerson: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
+  deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+const close = () => {
+  delView(unref(currentRoute))
+  push({
+    name: 'IotMaintain',
+    query: {
+      date: new Date().getTime()
+    }
+  })
+}
+/** 提交表单 */
+onMounted(async () => {
+  await IotMaintainApi.getIotMaintain(id).then((res) => {
+    formData.value = res
+    UserApi.getUser(formData.value.maintainPerson).then((res) => {
+      debugger
+      formData.value.maintainPerson = res.nickname;
+    })
+  })
+})
+</script>

src/views/pms/maintain/index.vue

@@ -146,9 +146,21 @@
           <el-table-column label="故障编码" align="center" prop="failureCode" />
           <el-table-column label="故障名称" align="center" prop="failureName" />
           <el-table-column label="设备" align="center" prop="deviceName" />
-          <el-table-column label="状态" align="center" prop="status" />
-          <el-table-column label="审核状态" align="center" prop="auditStatus" />
-          <el-table-column label="是否停机" align="center" prop="ifStop" />
+          <el-table-column label="状态" align="center" prop="status" >
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.PMS_MAIN_STATUS" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column label="审核状态" align="center" prop="auditStatus" >
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
+            </template>
+          </el-table-column>
+          <el-table-column label="是否停机" align="center" prop="ifStop" >
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.ifStop" />
+            </template>
+          </el-table-column>
           <el-table-column
             label="故障时间"
             align="center"
@@ -156,11 +168,6 @@
             :formatter="dateFormatter"
             width="180px"
           />
-<!--          <el-table-column label="故障影响" align="center" prop="failureInfluence" />-->
-<!--          <el-table-column label="故障系统" align="center" prop="failureSystem" />-->
-<!--          <el-table-column label="故障描述" align="center" prop="description" />-->
-<!--          <el-table-column label="图片" align="center" prop="pic" />-->
-<!--          <el-table-column label="解决办法" align="center" prop="solution" />-->
           <el-table-column
             label="维修开始时间"
             align="center"
@@ -188,18 +195,16 @@
               <el-button
                 link
                 type="primary"
-                @click="openForm('update', scope.row.id)"
-                v-hasPermi="['rq:iot-maintain:update']"
+                @click="detail(scope.row.id)"
               >
-                编辑
+                查看
               </el-button>
               <el-button
                 link
                 type="danger"
                 @click="handleDelete(scope.row.id)"
-                v-hasPermi="['rq:iot-maintain:delete']"
               >
-                删除
+                填写
               </el-button>
             </template>
           </el-table-column>
@@ -272,6 +277,9 @@ const openForm = (type: string, id?: number) => {
   // 新增
   push({ name: 'MaintainAdd', params:{} })
 }
+const detail = (id?: number) => {
+  push({ name: 'MaintainDetail', params:{id} })
+}
 /** 查询列表 */
 const getList = async () => {
   loading.value = true