巡检工单

src/api/pms/inspect/order/detail/index.ts

@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+// 巡检工单巡检明细 VO
+export interface IotInspectOrderDetailVO {
+  id: number // 主键id
+  orderId: number // 工单id
+  deviceId: number // 设备id
+  itemId: number // 巡检项id
+  ifNormal: boolean // 是否正常
+  description: string // 异常描述
+  picUrl: string // 图片
+  remark: string // 备注
+  deptId: number // 部门id
+}
+
+// 巡检工单巡检明细 API
+export const IotInspectOrderDetailApi = {
+  // 查询巡检工单巡检明细分页
+  getIotInspectOrderDetailPage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-inspect-order-detail/page`, params })
+  },
+
+  // 查询巡检工单巡检明细详情
+  getIotInspectOrderDetail: async (id: number) => {
+    return await request.get({ url: `/rq/iot-inspect-order-detail/get?id=` + id })
+  },
+
+  // 新增巡检工单巡检明细
+  createIotInspectOrderDetail: async (data: IotInspectOrderDetailVO) => {
+    return await request.post({ url: `/rq/iot-inspect-order-detail/create`, data })
+  },
+
+  // 修改巡检工单巡检明细
+  updateIotInspectOrderDetail: async (data: IotInspectOrderDetailVO) => {
+    return await request.put({ url: `/rq/iot-inspect-order-detail/update`, data })
+  },
+
+  // 删除巡检工单巡检明细
+  deleteIotInspectOrderDetail: async (id: number) => {
+    return await request.delete({ url: `/rq/iot-inspect-order-detail/delete?id=` + id })
+  },
+
+  // 导出巡检工单巡检明细 Excel
+  exportIotInspectOrderDetail: async (params) => {
+    return await request.download({ url: `/rq/iot-inspect-order-detail/export-excel`, params })
+  },
+}

src/api/pms/inspect/order/index.ts

@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+// 巡检工单 VO
+export interface IotInspectOrderVO {
+  id: number // 主键id
+  inspectOrderTitle: string // 巡检工单名
+  inspectOrderCode: string // 巡检工单编码
+  status: string // 巡检工单状态
+  remark: string // 备注
+  deptId: number // 部门id
+  deviceIds: string // 设备id
+}
+
+// 巡检工单 API
+export const IotInspectOrderApi = {
+  // 查询巡检工单分页
+  getIotInspectOrderPage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-inspect-order/page`, params })
+  },
+
+  // 查询巡检工单详情
+  getIotInspectOrder: async (id: number) => {
+    return await request.get({ url: `/rq/iot-inspect-order/get?id=` + id })
+  },
+
+  // 新增巡检工单
+  createIotInspectOrder: async (data: IotInspectOrderVO) => {
+    return await request.post({ url: `/rq/iot-inspect-order/create`, data })
+  },
+
+  // 修改巡检工单
+  updateIotInspectOrder: async (data: IotInspectOrderVO) => {
+    return await request.put({ url: `/rq/iot-inspect-order/update`, data })
+  },
+
+  // 删除巡检工单
+  deleteIotInspectOrder: async (id: number) => {
+    return await request.delete({ url: `/rq/iot-inspect-order/delete?id=` + id })
+  },
+
+  // 导出巡检工单 Excel
+  exportIotInspectOrder: async (params) => {
+    return await request.download({ url: `/rq/iot-inspect-order/export-excel`, params })
+  },
+}

src/api/pms/inspect/plan/index.ts

@@ -8,6 +8,8 @@ export interface IotInspectPlanVO {
   planCycle: number // 周期
   planUnit: string // 单位
   charge: string // 负责人
+  charges: [],
+  chargeName: string,
   deviceIds: string // 设备
   remark: string // 备注
   deptId: number // 部门id

src/views/pms/inspect/order/IotInspectOrderForm.vue

@@ -0,0 +1,121 @@
+<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="inspectOrderTitle">
+        <el-input v-model="formData.inspectOrderTitle" placeholder="请输入巡检工单名" />
+      </el-form-item>
+      <el-form-item label="巡检工单编码" prop="inspectOrderCode">
+        <el-input v-model="formData.inspectOrderCode" placeholder="请输入巡检工单编码" />
+      </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="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="部门id" prop="deptId">
+        <el-input v-model="formData.deptId" placeholder="请输入部门id" />
+      </el-form-item>
+      <el-form-item label="设备id" prop="deviceIds">
+        <el-input v-model="formData.deviceIds" placeholder="请输入设备id" />
+      </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 { IotInspectOrderApi, IotInspectOrderVO } from '@/api/pms/inspect/order'
+
+/** 巡检工单 表单 */
+defineOptions({ name: 'IotInspectOrderForm' })
+
+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,
+  inspectOrderTitle: undefined,
+  inspectOrderCode: undefined,
+  status: undefined,
+  remark: undefined,
+  deptId: undefined,
+  deviceIds: undefined,
+})
+const formRules = reactive({
+  inspectOrderTitle: [{ required: true, message: '巡检工单名不能为空', trigger: 'blur' }],
+  inspectOrderCode: [{ required: true, message: '巡检工单编码不能为空', 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 IotInspectOrderApi.getIotInspectOrder(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 IotInspectOrderVO
+    if (formType.value === 'create') {
+      await IotInspectOrderApi.createIotInspectOrder(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await IotInspectOrderApi.updateIotInspectOrder(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    inspectOrderTitle: undefined,
+    inspectOrderCode: undefined,
+    status: undefined,
+    remark: undefined,
+    deptId: undefined,
+    deviceIds: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/pms/inspect/order/detail/IotInspectOrderDetailForm.vue

@@ -0,0 +1,132 @@
+<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="工单id" prop="orderId">
+        <el-input v-model="formData.orderId" placeholder="请输入工单id" />
+      </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="巡检项id" prop="itemId">
+        <el-input v-model="formData.itemId" placeholder="请输入巡检项id" />
+      </el-form-item>
+      <el-form-item label="是否正常" prop="ifNormal">
+        <el-radio-group v-model="formData.ifNormal">
+          <el-radio value="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="异常描述" prop="description">
+        <Editor v-model="formData.description" height="150px" />
+      </el-form-item>
+      <el-form-item label="图片" prop="picUrl">
+        <el-input v-model="formData.picUrl" 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="deptId">
+        <el-input v-model="formData.deptId" placeholder="请输入部门id" />
+      </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 { IotInspectOrderDetailApi, IotInspectOrderDetailVO } from '@/api/pms/inspect/order/detail'
+
+/** 巡检工单巡检明细 表单 */
+defineOptions({ name: 'IotInspectOrderDetailForm' })
+
+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,
+  orderId: undefined,
+  deviceId: undefined,
+  itemId: undefined,
+  ifNormal: undefined,
+  description: undefined,
+  picUrl: undefined,
+  remark: undefined,
+  deptId: undefined,
+})
+const formRules = reactive({
+  orderId: [{ required: true, message: '工单id不能为空', trigger: 'blur' }],
+  deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
+  itemId: [{ required: true, message: '巡检项id不能为空', trigger: 'blur' }],
+  ifNormal: [{ 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 IotInspectOrderDetailApi.getIotInspectOrderDetail(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 IotInspectOrderDetailVO
+    if (formType.value === 'create') {
+      await IotInspectOrderDetailApi.createIotInspectOrderDetail(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await IotInspectOrderDetailApi.updateIotInspectOrderDetail(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    orderId: undefined,
+    deviceId: undefined,
+    itemId: undefined,
+    ifNormal: undefined,
+    description: undefined,
+    picUrl: undefined,
+    remark: undefined,
+    deptId: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/pms/inspect/order/detail/index.vue

@@ -0,0 +1,256 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="工单id" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入工单id"
+          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="巡检项id" prop="itemId">
+        <el-input
+          v-model="queryParams.itemId"
+          placeholder="请输入巡检项id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="是否正常" prop="ifNormal">
+        <el-select
+          v-model="queryParams.ifNormal"
+          placeholder="请选择是否正常"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="图片" prop="picUrl">
+        <el-input
+          v-model="queryParams.picUrl"
+          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="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门id"
+          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-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['rq:iot-inspect-order-detail:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['rq:iot-inspect-order-detail: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="工单id" align="center" prop="orderId" />
+      <el-table-column label="设备id" align="center" prop="deviceId" />
+      <el-table-column label="巡检项id" align="center" prop="itemId" />
+      <el-table-column label="是否正常" align="center" prop="ifNormal" />
+      <el-table-column label="异常描述" align="center" prop="description" />
+      <el-table-column label="图片" align="center" prop="picUrl" />
+      <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="deptId" />
+      <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-inspect-order-detail:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['rq:iot-inspect-order-detail: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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <IotInspectOrderDetailForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { IotInspectOrderDetailApi, IotInspectOrderDetailVO } from '@/api/pms/inspect/order/detail'
+import IotInspectOrderDetailForm from './IotInspectOrderDetailForm.vue'
+
+/** 巡检工单巡检明细 列表 */
+defineOptions({ name: 'IotInspectOrderDetail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<IotInspectOrderDetailVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  orderId: undefined,
+  deviceId: undefined,
+  itemId: undefined,
+  ifNormal: undefined,
+  description: undefined,
+  picUrl: undefined,
+  remark: undefined,
+  createTime: [],
+  deptId: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await IotInspectOrderDetailApi.getIotInspectOrderDetailPage(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 IotInspectOrderDetailApi.deleteIotInspectOrderDetail(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await IotInspectOrderDetailApi.exportIotInspectOrderDetail(queryParams)
+    download.excel(data, '巡检工单巡检明细.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/pms/inspect/order/index.vue

@@ -0,0 +1,243 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="巡检工单名" prop="inspectOrderTitle">
+        <el-input
+          v-model="queryParams.inspectOrderTitle"
+          placeholder="请输入巡检工单名"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="巡检工单编码" prop="inspectOrderCode">
+        <el-input
+          v-model="queryParams.inspectOrderCode"
+          placeholder="请输入巡检工单编码"
+          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="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="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="设备id" prop="deviceIds">
+        <el-input
+          v-model="queryParams.deviceIds"
+          placeholder="请输入设备id"
+          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-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['rq:iot-inspect-order:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['rq:iot-inspect-order: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="inspectOrderTitle" />
+      <el-table-column label="巡检工单编码" align="center" prop="inspectOrderCode" />
+      <el-table-column label="巡检工单状态" align="center" prop="status" />
+      <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="deptId" />
+      <el-table-column label="设备id" align="center" prop="deviceIds" />
+      <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-inspect-order:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['rq:iot-inspect-order: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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <IotInspectOrderForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { IotInspectOrderApi, IotInspectOrderVO } from '@/api/pms/inspect/order'
+import IotInspectOrderForm from './IotInspectOrderForm.vue'
+
+/** 巡检工单 列表 */
+defineOptions({ name: 'IotInspectOrder' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<IotInspectOrderVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  inspectOrderTitle: undefined,
+  inspectOrderCode: undefined,
+  status: undefined,
+  remark: undefined,
+  createTime: [],
+  deptId: undefined,
+  deviceIds: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await IotInspectOrderApi.getIotInspectOrderPage(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 IotInspectOrderApi.deleteIotInspectOrder(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await IotInspectOrderApi.exportIotInspectOrder(queryParams)
+    download.excel(data, '巡检工单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/pms/inspect/plan/IotInspectPlan.vue

@@ -12,7 +12,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="计划名称" prop="planTitle">
-              <el-input v-model="formData.routeName" placeholder="请输入计划名称" />
+              <el-input v-model="formData.planTitle" placeholder="请输入计划名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -33,8 +33,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="负责人" prop="charge">
-              <el-select v-model="formData.charge" multiple filterable clearable style="width: 100%">
+            <el-form-item label="负责人" prop="charges">
+              <el-select
+                v-model="formData.charges"
+                multiple
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in deptUsers"
                   :key="item.id"
@@ -133,19 +137,14 @@
 import * as UserApi from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 import { ref } from 'vue'
-import { IotMaintainMaterialVO } from '@/api/pms/maintain/material'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { handleTree } from '@/utils/tree'
-import * as ProductClassifyApi from '@/api/pms/productclassify'
-import draggable from 'vuedraggable'
 import InspectItemList from '@/views/pms/inspect/route/InspectItemList.vue'
 import InspectRouteList from '@/views/pms/inspect/plan/InspectRouteList.vue'
-import { IotInspectRouteApi, IotInspectRouteVO } from '@/api/pms/inspect/route'
+import { IotInspectRouteVO } from '@/api/pms/inspect/route'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
-import {IotInspectPlanApi} from "@/api/pms/inspect/plan";
-import RouteInspectItemDrawer from "@/views/pms/inspect/plan/RouteInspectItemDrawer.vue";
-
+import { IotInspectPlanApi, IotInspectPlanVO } from '@/api/pms/inspect/plan'
+import RouteInspectItemDrawer from '@/views/pms/inspect/plan/RouteInspectItemDrawer.vue'
 
 /** 维修工单 表单 */
 defineOptions({ name: 'IotMaintainAe' })
@@ -171,6 +170,7 @@ const formData = ref({
   planCycle: undefined,
   planUnit: undefined,
   charge: undefined,
+  charges:[],
   deviceIds: undefined,
   remark: undefined,
   deptId: undefined
@@ -180,7 +180,7 @@ const formRules = reactive({
   planCode: [{ required: true, message: '巡检计划编号不能为空', trigger: 'blur' }],
   planCycle: [{ required: true, message: '周期不能为空', trigger: 'blur' }],
   planUnit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
-  charge: [{ required: true, message: '负责人不能为空', trigger: 'blur' }]
+  charges: [{ required: true, message: '负责人不能为空', trigger: 'blur' }]
 })
 // 拖动状态管理
 const items = ref([])
@@ -209,20 +209,12 @@ const openForm = () => {
 const close = () => {
   delView(unref(currentRoute))
   push({
-    name: 'IotInspectRoute',
+    name: 'IotInspectPlan',
     query: {
       date: new Date().getTime()
     }
   })
 }
-const itemsWithIndex = computed(() => {
-  return items.value.map((item, index) => ({
-    itemId: item.id,
-    item: item.item,
-    standard: item.standard,
-    index: index + 1 // 序号从1开始
-  }))
-})
 const { wsCache } = useCache()
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
@@ -232,18 +224,19 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const newitems = itemsWithIndex
-    debugger
-    formData.value.itemJson = JSON.stringify(newitems.value)
     const user = wsCache.get(CACHE_KEY.USER)
-    formData.value.deptId = user.user.deptId
-    const data = formData.value as unknown as IotInspectRouteVO
+    formData.value.deviceIds = JSON.stringify(list.value)
+    debugger
+    const data = formData.value as unknown as IotInspectPlanVO
     if (formType.value === 'create') {
-      await IotInspectRouteApi.createIotInspectRoute(data)
+      formData.value.deptId = user.user.deptId
+      await IotInspectPlanApi.createIotInspectPlan(data)
       message.success(t('common.createSuccess'))
       close()
     } else {
-      await IotInspectRouteApi.updateIotInspectRoute(data)
+      debugger
+      console.log(JSON.stringify(data.charges))
+      await IotInspectPlanApi.updateIotInspectPlan(data)
       message.success(t('common.updateSuccess'))
       close()
     }
@@ -255,40 +248,16 @@ const submitForm = async () => {
 }
 
 /** 重置表单 */
-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,
-    solution: undefined,
-    maintainStartTime: undefined,
-    maintainEndTime: undefined,
-    remark: undefined,
-    deviceName: undefined,
-    processInstanceId: undefined,
-    auditStatus: undefined,
-    deptId: undefined
-  }
-  formRef.value?.resetFields()
-}
 onMounted(async () => {
   const deptId = useUserStore().getUser.deptId
   deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
   if (id) {
     formType.value = 'update'
-    const iotInspectRoute = await IotInspectPlanApi.getIotInspectPlan(id)
-    formData.value = iotInspectRoute
-    items.value = JSON.parse(iotInspectRoute.itemJson)
+    const iotInspectPlan = await IotInspectPlanApi.getIotInspectPlan(id)
+    formData.value = iotInspectPlan
+    debugger
+    list.value = JSON.parse(iotInspectPlan.deviceIds)
   } else {
-    formData.value.type = 'in'
     formType.value = 'create'
   }
 })

src/views/pms/inspect/plan/index.vue

@@ -1,124 +1,136 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="计划名称" prop="planTitle">
-        <el-input
-          v-model="queryParams.planTitle"
-          placeholder="请输入计划名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="计划编号" prop="planCode">
-        <el-input
-          v-model="queryParams.planCode"
-          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-inspect-plan:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['rq:iot-inspect-plan:export']"
+  <el-row :gutter="20">
+    <el-col :span="4" :xs="24">
+      <ContentWrap class="h-1/1">
+        <DeptTree @node-click="handleDeptNodeClick" />
+      </ContentWrap>
+    </el-col>
+    <el-col :span="20" :xs="24">
+      <ContentWrap>
+        <!-- 搜索工作栏 -->
+        <el-form
+          class="-mb-15px"
+          :model="queryParams"
+          ref="queryFormRef"
+          :inline="true"
+          label-width="68px"
         >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
+          <el-form-item label="计划名称" prop="planTitle">
+            <el-input
+              v-model="queryParams.planTitle"
+              placeholder="请输入计划名称"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
+          <el-form-item label="计划编号" prop="planCode">
+            <el-input
+              v-model="queryParams.planCode"
+              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-inspect-plan:create']"
+            >
+              <Icon icon="ep:plus" class="mr-5px" /> 新增
+            </el-button>
+            <el-button
+              type="success"
+              plain
+              @click="handleExport"
+              :loading="exportLoading"
+              v-hasPermi="['rq:iot-inspect-plan: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="计划标题" align="center" prop="planTitle" />
-      <el-table-column label="计划编号" align="center" prop="planCode" />
-      <el-table-column label="周期" align="center" prop="planCycle" />
-      <el-table-column label="单位" align="center" prop="planUnit" />
-      <el-table-column label="负责人" align="center" prop="charge" />
-      <!--      <el-table-column label="设备" align="center" prop="deviceIds" />-->
-      <el-table-column label="状态" key="status">
-        <template #default="scope">
-          <el-switch
-            v-model="scope.row.status"
-            :active-value="0"
-            :inactive-value="1"
-            @change="handleStatusChange(scope.row)"
+      <!-- 列表 -->
+      <ContentWrap>
+        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+          <el-table-column label="计划标题" align="center" prop="planTitle" />
+          <el-table-column label="计划编号" align="center" prop="planCode" />
+          <el-table-column label="周期" align="center" prop="planCycle" />
+          <el-table-column label="单位" align="center" prop="planUnit" >
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.PMS_INSPECT_UNIT" :value="scope.row.planUnit" />
+            </template>
+          </el-table-column>
+          <el-table-column label="负责人" align="center" prop="chargeName" />
+          <!--      <el-table-column label="设备" align="center" prop="deviceIds" />-->
+          <el-table-column label="状态" key="status">
+            <template #default="scope">
+              <el-switch
+                v-model="scope.row.status"
+                :active-value="0"
+                :inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            :formatter="dateFormatter"
+            width="180px"
           />
-        </template>
-      </el-table-column>
-      <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="deptId" />-->
-      <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-inspect-plan:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['rq:iot-inspect-plan: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>
-
+          <!--      <el-table-column label="部门id" align="center" prop="deptId" />-->
+          <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-inspect-plan:update']"
+              >
+                编辑
+              </el-button>
+              <el-button
+                link
+                type="danger"
+                @click="handleDelete(scope.row.id)"
+                v-hasPermi="['rq:iot-inspect-plan: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>
+    </el-col>
+  </el-row>
   <!-- 表单弹窗：添加/修改 -->
   <IotInspectPlanForm ref="formRef" @success="getList" />
 </template>
@@ -129,6 +141,8 @@ import download from '@/utils/download'
 import { IotInspectPlanApi, IotInspectPlanVO } from '@/api/pms/inspect/plan'
 import IotInspectPlanForm from './IotInspectPlanForm.vue'
 import { CommonStatusEnum } from '@/utils/constants'
+import {DICT_TYPE} from "@/utils/dict";
+import DeptTree from "@/views/system/user/DeptTree.vue";
 const { push } = useRouter() // 路由跳转
 /** 巡检计划 列表 */
 defineOptions({ name: 'IotInspectPlan' })
@@ -154,14 +168,17 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-
+const handleDeptNodeClick = async (row) => {
+  queryParams.deptId = row.id
+  await getList()
+}
 const handleStatusChange = async (row: IotInspectPlanVO) => {
   try {
     // 修改状态的二次确认
     const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用'
-    await message.confirm('确认要"' + text + '""' + row.username + '"巡检计划吗?')
+    await message.confirm('确认要"' + text + '""' + row.planTitle + '"巡检计划吗?')
     // 发起修改状态
-    await IotInspectPlanApi.updateIotInspectPlan(row.id, row.status)
+    await IotInspectPlanApi.updateIotInspectStatus(row.id, row.status)
     // 刷新列表
     await getList()
   } catch {

src/views/pms/inspect/route/IotInspectRoute.vue

@@ -147,7 +147,8 @@ const formData = ref({
   deviceName: undefined,
   itemJson: undefined,
   remark: undefined,
-  deptId: undefined
+  deptId: undefined,
+  deviceCode: undefined
 })
 // 拖动状态管理
 const dragStart = () => {
@@ -167,6 +168,7 @@ const deviceChoose = (row) => {
   formData.value.deviceId = row.id
   formData.value.deviceName = row.deviceName
   formData.value.deptId = row.deptId
+  formData.value.deviceCode = row.deviceCode
   deviceLabel.value = row.deviceName
 }
 const formRules = reactive({