故障上报

src/api/pms/failure/IotFailureReportForm.vue

@@ -1,173 +0,0 @@
-<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="failureCode">
-        <el-input v-model="formData.failureCode" placeholder="请输入故障编码" />
-      </el-form-item>
-      <el-form-item label="故障名称" prop="failureName">
-        <el-input v-model="formData.failureName" placeholder="请输入故障名称" />
-      </el-form-item>
-      <el-form-item label="设备id" prop="deviceId">
-        <el-input v-model="formData.deviceId" placeholder="请输入设备id" />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="是否停机" prop="ifStop">
-        <el-radio-group v-model="formData.ifStop">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="故障时间" prop="failureTime">
-        <el-date-picker
-          v-model="formData.failureTime"
-          type="date"
-          value-format="x"
-          placeholder="选择故障时间"
-        />
-      </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="pic">
-        <el-input v-model="formData.pic" placeholder="请输入图片" />
-      </el-form-item>
-      <el-form-item label="是否解决" prop="ifDeal">
-        <el-radio-group v-model="formData.ifDeal">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="是否需要协助" prop="needHelp">
-        <el-radio-group v-model="formData.needHelp">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="解决办法" prop="solution">
-        <el-input v-model="formData.solution" placeholder="请输入解决办法" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
-      </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 { IotFailureReportApi, IotFailureReportVO } from '@/api/rq/iotfailurereport'
-
-/** 故障上报 表单 */
-defineOptions({ name: 'IotFailureReportForm' })
-
-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,
-  failureCode: undefined,
-  failureName: undefined,
-  deviceId: undefined,
-  status: undefined,
-  ifStop: undefined,
-  failureTime: undefined,
-  failureInfluence: undefined,
-  failureSystem: undefined,
-  description: undefined,
-  pic: undefined,
-  ifDeal: undefined,
-  needHelp: undefined,
-  solution: undefined,
-  remark: undefined,
-})
-const formRules = reactive({
-  failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
-  failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
-  deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
-})
-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 IotFailureReportApi.getIotFailureReport(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 IotFailureReportVO
-    if (formType.value === 'create') {
-      await IotFailureReportApi.createIotFailureReport(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await IotFailureReportApi.updateIotFailureReport(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    failureCode: undefined,
-    failureName: undefined,
-    deviceId: undefined,
-    status: undefined,
-    ifStop: undefined,
-    failureTime: undefined,
-    failureInfluence: undefined,
-    failureSystem: undefined,
-    description: undefined,
-    pic: undefined,
-    ifDeal: undefined,
-    needHelp: undefined,
-    solution: undefined,
-    remark: undefined,
-  }
-  formRef.value?.resetFields()
-}
-</script>

src/api/pms/failure/index.ts

@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+// 故障上报 VO
+export interface IotFailureReportVO {
+  id: number // 主键id
+  failureCode: string // 故障编码
+  failureName: string // 故障名称
+  deviceId: number // 设备id
+  status: string // 状态
+  ifStop: boolean // 是否停机
+  failureTime: Date // 故障时间
+  failureInfluence: string // 故障影响
+  failureSystem: string // 故障系统
+  description: string // 故障描述
+  pic: string // 图片
+  ifDeal: boolean // 是否解决
+  needHelp: boolean // 是否需要协助
+  solution: string // 解决办法
+  remark: string // 备注
+}
+
+// 故障上报 API
+export const IotFailureReportApi = {
+  // 查询故障上报分页
+  getIotFailureReportPage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-failure-report/page`, params })
+  },
+
+  // 查询故障上报详情
+  getIotFailureReport: async (id: number) => {
+    return await request.get({ url: `/rq/iot-failure-report/get?id=` + id })
+  },
+
+  // 新增故障上报
+  createIotFailureReport: async (data: IotFailureReportVO) => {
+    return await request.post({ url: `/rq/iot-failure-report/create`, data })
+  },
+
+  // 修改故障上报
+  updateIotFailureReport: async (data: IotFailureReportVO) => {
+    return await request.put({ url: `/rq/iot-failure-report/update`, data })
+  },
+
+  // 删除故障上报
+  deleteIotFailureReport: async (id: number) => {
+    return await request.delete({ url: `/rq/iot-failure-report/delete?id=` + id })
+  },
+
+  // 导出故障上报 Excel
+  exportIotFailureReport: async (params) => {
+    return await request.download({ url: `/rq/iot-failure-report/export-excel`, params })
+  },
+}

src/api/pms/failure/index.vue

@@ -1,333 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="故障编码" prop="failureCode">
-        <el-input
-          v-model="queryParams.failureCode"
-          placeholder="请输入故障编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="故障名称" prop="failureName">
-        <el-input
-          v-model="queryParams.failureName"
-          placeholder="请输入故障名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="设备id" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否停机" prop="ifStop">
-        <el-select
-          v-model="queryParams.ifStop"
-          placeholder="请选择是否停机"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="故障时间" prop="failureTime">
-        <el-date-picker
-          v-model="queryParams.failureTime"
-          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="故障影响" 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="pic">
-        <el-input
-          v-model="queryParams.pic"
-          placeholder="请输入图片"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="是否解决" prop="ifDeal">
-        <el-select
-          v-model="queryParams.ifDeal"
-          placeholder="请选择是否解决"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否需要协助" prop="needHelp">
-        <el-select
-          v-model="queryParams.needHelp"
-          placeholder="请选择是否需要协助"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="解决办法" prop="solution">
-        <el-input
-          v-model="queryParams.solution"
-          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>
-        <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-failure-report:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['rq:iot-failure-report: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="failureCode" />
-      <el-table-column label="故障名称" align="center" prop="failureName" />
-      <el-table-column label="设备id" align="center" prop="deviceId" />
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="是否停机" align="center" prop="ifStop" />
-      <el-table-column
-        label="故障时间"
-        align="center"
-        prop="failureTime"
-        :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="ifDeal" />
-      <el-table-column label="是否需要协助" align="center" prop="needHelp" />
-      <el-table-column label="解决办法" align="center" prop="solution" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <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-failure-report:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['rq:iot-failure-report: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>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <IotFailureReportForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { IotFailureReportApi, IotFailureReportVO } from '@/api/rq/iotfailurereport'
-import IotFailureReportForm from './IotFailureReportForm.vue'
-
-/** 故障上报 列表 */
-defineOptions({ name: 'IotFailureReport' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<IotFailureReportVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  failureCode: undefined,
-  failureName: undefined,
-  deviceId: undefined,
-  status: undefined,
-  ifStop: undefined,
-  failureTime: [],
-  failureInfluence: undefined,
-  failureSystem: undefined,
-  description: undefined,
-  pic: undefined,
-  ifDeal: undefined,
-  needHelp: undefined,
-  solution: undefined,
-  remark: undefined,
-  createTime: [],
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await IotFailureReportApi.getIotFailureReportPage(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 IotFailureReportApi.deleteIotFailureReport(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await IotFailureReportApi.exportIotFailureReport(queryParams)
-    download.excel(data, '故障上报.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>

src/utils/dict.ts

@@ -107,6 +107,8 @@ export const getDictLabel = (dictType: string, value: any): string => {
 }
 
 export enum DICT_TYPE {
+  PMS_BOOLEAN = "pms_boolean",
+  PMS_FAILURE_STATUS = 'pms_failure_status',
   PMS_FILE_TYPE = 'pms_file_type',
   PMS_DEVICE_STATUS = 'pms_device_status',
   PMS_ASSET_PROPERTY = 'pms_asset_property',

src/views/pms/failure/DeviceList.vue

@@ -0,0 +1,150 @@
+<template>
+  <Dialog v-model="dialogVisible" title="选择品牌" style="width: 1100px; max-height: 800px">
+    <ContentWrap>
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="68px"
+      >
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input
+            v-model="queryParams.deviceName"
+            placeholder="请输入设备名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </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-form-item>
+      </el-form>
+    </ContentWrap>
+    <ContentWrap>
+      <el-table
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        @row-click="handleRowClick"
+      >
+        <el-table-column width="60" label="选择">
+          <template #default="{ row }">
+            <el-radio
+              :model-value="selectedRow?.id"
+              :label="row.id"
+              @click.stop="selectRow(row)"
+              class="no-label-radio"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="资产编码" align="center" prop="deviceCode" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="所在部门" align="center" prop="deptId" />
+        <el-table-column label="设备状态" align="center" prop="deviceStatus">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.PMS_DEVICE_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          width="180"
+          :formatter="dateFormatter"
+        />
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </ContentWrap>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+const emit = defineEmits(['choose']) // 定义 success 事件，用于操作成功后的回调
+const dialogVisible = ref(false) // 弹窗的是否展示
+const loading = ref(true) // 列表的加载中
+const queryFormRef = ref() // 搜索的表单
+const list = ref<IotDeviceVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  label: '',
+  status: undefined,
+  deptId: undefined
+})
+
+const selectedRow = ref(null)
+
+// 处理单选逻辑
+const selectRow = (row) => {
+  selectedRow.value = selectedRow.value?.id === row.id ? null : row
+  emit('choose', row)
+  dialogVisible.value = false
+}
+
+// 点击整行选中
+const handleRowClick = (row) => {
+  selectRow(row)
+}
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+}
+defineExpose({ open })
+const { wsCache } = useCache()
+const getList = async () => {
+  loading.value = true
+  try {
+    const user = wsCache.get(CACHE_KEY.USER)
+    queryParams.deptId = user.user.deptId
+    const data = await IotDeviceApi.getIotDevicePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+const choose = (row: DictDataVO) => {
+  emit('choose', row)
+  dialogVisible.value = false
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 查询字典（精简)列表
+  // dictTypeList.value = await DictTypeApi.getSimpleDictTypeList()
+})
+</script>
+<style lang="scss">
+.no-label-radio .el-radio__label {
+  display: none;
+}
+.no-label-radio .el-radio__inner {
+  margin-right: 0;
+}
+</style>

src/views/pms/failure/IotFailureReportForm.vue

@@ -7,25 +7,42 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="故障编码" prop="failureCode">
-        <el-input v-model="formData.failureCode" placeholder="请输入故障编码" />
-      </el-form-item>
-      <el-form-item label="故障名称" prop="failureName">
-        <el-input v-model="formData.failureName" placeholder="请输入故障名称" />
-      </el-form-item>
-      <el-form-item label="设备id" prop="deviceId">
-        <el-input v-model="formData.deviceId" placeholder="请输入设备id" />
+      <el-row >
+      <el-col :span="12">
+      <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="12">
       <el-form-item label="状态" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
+        <el-select v-model="formData.status" placeholder="请选择">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PMS_FAILURE_STATUS)"
+            :key="dict.label"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
+        </el-col>
+      <el-col :span="12">
       <el-form-item label="是否停机" prop="ifStop">
-        <el-radio-group v-model="formData.ifStop">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
+        <el-select v-model="formData.ifStop" placeholder="请选择">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.label"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
+        </el-col>
+      <el-col :span="12">
       <el-form-item label="故障时间" prop="failureTime">
         <el-date-picker
           v-model="formData.failureTime"
@@ -34,43 +51,74 @@
           placeholder="选择故障时间"
         />
       </el-form-item>
-      <el-form-item label="故障影响" prop="failureInfluence">
-        <el-input v-model="formData.failureInfluence" placeholder="请输入故障影响" />
-      </el-form-item>
+        </el-col>
+      <el-col :span="12">
       <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="pic">
-        <el-input v-model="formData.pic" placeholder="请输入图片" />
-      </el-form-item>
+        </el-col>
+      <el-col :span="12">
       <el-form-item label="是否解决" prop="ifDeal">
-        <el-radio-group v-model="formData.ifDeal">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
+        <el-select v-model="formData.ifDeal" placeholder="请选择">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.label"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
+        </el-col>
+      <el-col :span="12">
       <el-form-item label="是否需要协助" prop="needHelp">
-        <el-radio-group v-model="formData.needHelp">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
+        <el-select v-model="formData.needHelp" placeholder="请选择">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.label"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="图片" prop="pic">
+            <UploadImg v-model="formData.pic" height="60px" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障影响" prop="failureInfluence">
+            <el-input type="textarea" v-model="formData.failureInfluence" placeholder="请输入故障影响" />
+          </el-form-item>
+        </el-col>
+      <el-col :span="12">
       <el-form-item label="解决办法" prop="solution">
-        <el-input v-model="formData.solution" placeholder="请输入解决办法" />
+        <el-input v-model="formData.solution" type="textarea" placeholder="请输入解决办法" />
       </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障描述" prop="description">
+            <el-input type="textarea" v-model="formData.description" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
+        <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
       </el-form-item>
+          </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
+    <DeviceList ref="deviceFormRef" @choose="deviceChoose" />
   </Dialog>
 </template>
 <script setup lang="ts">
 import { IotFailureReportApi, IotFailureReportVO } from '@/api/pms/failure'
+import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from "@/utils/dict";
+import DeviceList from "@/views/pms/failure/DeviceList.vue";
 
 /** 故障上报 表单 */
 defineOptions({ name: 'IotFailureReportForm' })
@@ -82,6 +130,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const deviceLabel = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   failureCode: undefined,
@@ -99,10 +148,21 @@ const formData = ref({
   solution: undefined,
   remark: undefined,
 })
+const deviceChoose = (row) => {
+  formData.value.deviceId = row.id
+  formData.value.deviceName = row.deviceName
+  deviceLabel.value = row.deviceName
+}
+/** 添加/修改操作 */
+const deviceFormRef = ref()
+const openForm = () => {
+  deviceFormRef.value.open()
+}
 const formRules = reactive({
-  failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
-  failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
-  deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
+  // failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
+  // failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
+  deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  // deviceId: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
@@ -113,6 +173,7 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  formData.value.deviceId = null;
   // 修改时，设置数据
   if (id) {
     formLoading.value = true

src/views/pms/failure/index.vue

@@ -26,15 +26,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="设备id" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -45,7 +36,7 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否停机" prop="ifStop">
+      <el-form-item label="是否停机" v-show="ifShow" prop="ifStop">
         <el-select
           v-model="queryParams.ifStop"
           placeholder="请选择是否停机"
@@ -55,7 +46,7 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="故障时间" prop="failureTime">
+      <el-form-item label="故障时间" v-show="ifShow" prop="failureTime">
         <el-date-picker
           v-model="queryParams.failureTime"
           value-format="YYYY-MM-DD HH:mm:ss"
@@ -66,34 +57,7 @@
           class="!w-220px"
         />
       </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="pic">
-        <el-input
-          v-model="queryParams.pic"
-          placeholder="请输入图片"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="是否解决" prop="ifDeal">
+      <el-form-item label="是否解决" v-show="ifShow" prop="ifDeal">
         <el-select
           v-model="queryParams.ifDeal"
           placeholder="请选择是否解决"
@@ -103,35 +67,17 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否需要协助" prop="needHelp">
+      <el-form-item label="是否协助" v-show="ifShow" prop="needHelp">
         <el-select
           v-model="queryParams.needHelp"
-          placeholder="请选择是否需要协助"
+          placeholder="请选择是否协助"
           clearable
           class="!w-240px"
         >
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="解决办法" prop="solution">
-        <el-input
-          v-model="queryParams.solution"
-          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-form-item label="创建时间" v-show="ifShow" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
           value-format="YYYY-MM-DD HH:mm:ss"
@@ -143,13 +89,15 @@
         />
       </el-form-item>
       <el-form-item>
+        <el-button v-if="!ifShow" @click="moreQuery(true)" type="warning"><Icon icon="ep:search" class="mr-5px"/> 更多查询</el-button>
+        <el-button v-if="ifShow" @click="moreQuery(false)" type="danger"><Icon icon="ep:search" class="mr-5px"/> 收起查询</el-button>
         <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-failure-report:create']"
+
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
@@ -169,12 +117,19 @@
   <!-- 列表 -->
   <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="failureCode" />
       <el-table-column label="故障名称" align="center" prop="failureName" />
-      <el-table-column label="设备id" align="center" prop="deviceId" />
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="是否停机" align="center" prop="ifStop" />
+      <el-table-column label="设备" align="center" prop="deviceName" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PMS_FAILURE_STATUS" :value="scope.row.status" />
+        </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"
@@ -182,14 +137,22 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="故障影响" align="center" prop="failureInfluence" />
+<!--      <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="description" />-->
       <el-table-column label="图片" align="center" prop="pic" />
-      <el-table-column label="是否解决" align="center" prop="ifDeal" />
-      <el-table-column label="是否需要协助" align="center" prop="needHelp" />
-      <el-table-column label="解决办法" align="center" prop="solution" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="是否解决" align="center" prop="ifDeal" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.ifDeal" />
+        </template>
+      </el-table-column>
+      <el-table-column label="需要协助" align="center" prop="needHelp" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.needHelp" />
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="解决办法" align="center" prop="solution" />-->
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <el-table-column
         label="创建时间"
         align="center"
@@ -203,7 +166,6 @@
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['rq:iot-failure-report:update']"
           >
             编辑
           </el-button>
@@ -211,7 +173,6 @@
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['rq:iot-failure-report:delete']"
           >
             删除
           </el-button>
@@ -236,13 +197,14 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { IotFailureReportApi, IotFailureReportVO } from '@/api/pms/failure'
 import IotFailureReportForm from './IotFailureReportForm.vue'
+import {DICT_TYPE} from "@/utils/dict";
 
 /** 故障上报 列表 */
 defineOptions({ name: 'IotFailureReport' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const ifShow = ref(false)
 const loading = ref(true) // 列表的加载中
 const list = ref<IotFailureReportVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
@@ -267,7 +229,9 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-
+const moreQuery = (show) => {
+  ifShow.value = show
+}
 /** 查询列表 */
 const getList = async () => {
   loading.value = true