修改唯一码、出入库、传感器管理菜单

src/components/DepartmentCascaDer/index.vue

@@ -0,0 +1,38 @@
+<script setup>
+import { listDept } from '@/api/system/dept'
+const props = defineProps({
+    modelValue: {
+        type: [String, Number],
+        default: ''
+    }
+});
+
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['update:modelValue']);
+const model = computed({
+    get() {
+        return props.modelValue;
+    },
+    set(val) {
+        emit('update:modelValue', val);
+    }
+});
+const departmentList = ref([]);
+function getDepartmentListFun() {
+    listDept().then((response) => {
+        departmentList.value = proxy.handleTree(response.data, "deptId")
+    });
+}
+getDepartmentListFun();
+</script>
+
+<template>
+    <el-cascader :options="departmentList" style="width: 100%;" v-model="model" :props="{
+        children: 'children',
+        label: 'deptName',
+        value: 'deptId'
+    }" @change="(val) => {
+        console.log('111', val);
+
+    }" placeholder="请选择所属部门" />
+</template>

src/untils.js

@@ -0,0 +1,153 @@
+// 等级
+export const levelTypeMenu = [
+  { value: "HIGH", label: "高危/高等级告警" },
+  { value: "MEDIUM", label: "中危/中等级告警" },
+  { value: "LOW", label: "低危/恢复/普通状态变化" },
+  { value: "INFO", label: "信息/普通事件" },
+];
+// 唯一码状态
+export const statusMenu = [
+  {
+    value: 0,
+    label: "初始化创建",
+  },
+  {
+    value: 1,
+    label: "入库单开单",
+  },
+  {
+    value: 2,
+    label: "已入库",
+  },
+  {
+    value: 3,
+    label: "出库单开单",
+  },
+  {
+    value: 4,
+    label: "已出库",
+  },
+  {
+    value: 9,
+    label: "已作废",
+  },
+];
+// 入库单、出库单状态
+const billTypeMenu = [
+  {
+    value: "0",
+    label: "已提交",
+  },
+  {
+    value: "1",
+    label: "已完成",
+  },
+  {
+    value: "4",
+    label: "已取消",
+  },
+];
+
+// 订单状态为0时 再查一次
+const billStatueMenu = [
+  {
+    value: "0",
+    label: "库单已提交",
+  },
+  {
+    value: "1",
+    label: "全部入库",
+  },
+  {
+    value: "2",
+    label: "物料部分",
+  },
+];
+/**
+ * 根据传入数组和id，找到他的label
+ * @param {String} deptId value
+ * @param {Array} list 映射数组
+ * @param {Object} info 映射数组对应的label、name字段名
+ * @returns {String}  label
+ */
+export const getDictLabel = (
+  deptId,
+  list,
+  info = { name: "label", value: "value" },
+) => {
+  const { name, value } = info;
+  return list.find((i) => `${i?.[value]}` === `${deptId}`)?.[name] || "-";
+};
+/**
+ * 根据部门ID，递归查找它的完整层级ID路径 [祖先..., 自己]
+ * @param {Array} tree 部门树
+ * @param {Number} targetDeptId 要找的部门ID
+ * @returns {Array} 完整ID路径
+ */
+export function getDeptIdPath(tree, targetDeptId) {
+  for (const item of tree) {
+    // 如果当前就是目标，返回自己
+    if (item.deptId === targetDeptId) {
+      return [item.deptId];
+    }
+    // 如果有子节点，递归找
+    if (item.children && item.children.length) {
+      const res = getDeptIdPath(item.children, targetDeptId);
+      if (res.length) {
+        return [item.deptId, ...res];
+      }
+    }
+  }
+  return [];
+}
+
+/**
+ * 获取入库/出库单状态展示文本
+ * @param {any} val - 状态
+ * @param {string|number} status - 物料状态
+ * @param {number} flag - 1=出库 0=入库
+ * @returns {string} 状态文本
+ */
+export const getBillType = (val, status, flag) => {
+  const valStr = String(val);
+  const statusStr = String(status);
+
+  if (valStr === "0") {
+    const statusItem = billStatueMenu.find((item) => item.value === statusStr);
+    if (!statusItem) return "";
+
+    const isOut = flag === 1;
+    const stateVal = statusItem.value;
+
+    // 状态 0：前缀拼接 入/出
+    if (stateVal === "0") {
+      return isOut ? "出" + statusItem.label : "入" + statusItem.label;
+    }
+
+    // 状态 2：后缀拼接 入库/出库
+    if (stateVal === "2") {
+      return isOut ? statusItem.label + "出库" : statusItem.label + "入库";
+    }
+
+    // 其他状态直接返回
+    return statusItem.label;
+  }
+
+  // 非0：走普通单据类型菜单
+  return billTypeMenu.find((item) => item.value === valStr)?.label || "";
+};
+// 获取出入库单的状态以及tag颜色
+export const getColor = (val, status) => {
+  if (val == "0") {
+    if (status == "0") {
+      return "color:#e6a23c;font-weight:500;font-size:12px;";
+    }
+    if (status == "2") {
+      return "color:#C0C0C0;font-weight:500;font-size:12px;";
+    }
+  } else if (val == "1") {
+    return "color:#67c23a;font-weight:500;font-size:12px;";
+  } else {
+    return "color:#f56c6c;font-weight:500;font-size:12px;";
+  }
+};

src/views/unique/code/index.vue

@@ -1,129 +1,111 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="唯一码编号" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入唯一码编号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属入库单据号" prop="billNo">
-        <el-input
-          v-model="queryParams.billNo"
-          placeholder="请输入所属入库单据号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目ID" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="RFID编码" prop="rfidCode">
-        <el-input
-          v-model="queryParams.rfidCode"
-          placeholder="请输入RFID编码"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="打印次数" prop="printCount">
-        <el-input
-          v-model="queryParams.printCount"
-          placeholder="请输入打印次数"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否删除" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          placeholder="请输入是否删除"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+  <div class="app-container-page">
+    <el-form :model="queryParams" class="table-form-search" ref="queryRef" :inline="true" v-show="showSearch"
+      label-width="120px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="唯一码编号" prop="code">
+            <el-input v-model="queryParams.code" placeholder="请输入唯一码编号" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="所属入库单据号" prop="billNo">
+            <el-input v-model="queryParams.billNo" placeholder="请输入所属入库单据号" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+              <el-option v-for="dict in statusMenu" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="8">
+          <el-form-item label="项目ID" prop="projectId">
+            <el-input v-model="queryParams.projectId" placeholder="请输入项目ID" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col> -->
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="RFID编码" prop="rfidCode">
+            <el-input v-model="queryParams.rfidCode" placeholder="请输入RFID编码" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="8">
+          <el-form-item label="打印次数" prop="printCount">
+            <el-input v-model="queryParams.printCount" placeholder="请输入打印次数" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col> -->
+        <el-col :span="16" class="searchBtn">
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
     </el-form>
+    <div class="table-list">
+      <el-row :gutter="10" class="mb8">
+        <!-- <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['unique:code:add']">新增</el-button>
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['unique:code:edit']">修改</el-button>
+        </el-col> -->
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['unique:code:remove']">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport"
+            v-hasPermi="['unique:code:export']">导出</el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['unique:code:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['unique:code:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['unique:code:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['unique:code:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="codeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="唯一码编号" align="center" prop="code" />
-      <el-table-column label="所属入库单据号" align="center" prop="billNo" />
-      <el-table-column label="项目ID" align="center" prop="projectId" />
-      <el-table-column label="当前状态" align="center" prop="status" />
-      <el-table-column label="RFID编码" align="center" prop="rfidCode" />
-      <el-table-column label="打印次数" align="center" prop="printCount" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否删除" align="center" prop="isDelete" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['unique:code:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['unique:code:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table v-loading="loading" :data="codeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+        <el-table-column label="唯一码编号" align="center" prop="code" />
+        <el-table-column label="所属入库单据号" align="center" prop="billNo">
+          <template #default="scope">
+            {{ scope.row.billNo || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="项目ID" align="center" prop="projectId" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            {{ getDictLabel(scope.row.status, statusMenu) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="RFID编码" align="center" prop="rfidCode">
+          <template #default="scope">
+            {{ scope.row.rfidCode || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="打印次数" align="center" prop="printCount" />
+        <el-table-column label="备注" align="center" prop="remark">
+          <template #default="scope">
+            {{ scope.row.remark || '-' }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="是否删除" align="center" prop="isDelete" /> -->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['unique:code:edit']">修改</el-button> -->
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['unique:code:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
     <!-- 添加或修改唯一码管理对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="codeRef" :model="form" :rules="rules" label-width="80px">
@@ -161,6 +143,7 @@
 
 <script setup name="Code">
 import { listCode, getCode, delCode, addCode, updateCode } from "@/api/unique/code"
+import { getDictLabel, statusMenu } from '@/untils'
 
 const { proxy } = getCurrentInstance()
 
@@ -296,12 +279,12 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除唯一码管理编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除唯一码管理编号为"' + _ids + '"的数据项？').then(function () {
     return delCode(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */

src/views/worn/inbound/index.vue

@@ -1,158 +1,114 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="入库单号" prop="billNo">
-        <el-input
-          v-model="queryParams.billNo"
-          placeholder="请输入入库单号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库编码" prop="warehouseCode">
-        <el-input
-          v-model="queryParams.warehouseCode"
-          placeholder="请输入仓库编码"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库名称" prop="warehouseName">
-        <el-input
-          v-model="queryParams.warehouseName"
-          placeholder="请输入仓库名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="存储区编码" prop="areaCode">
-        <el-input
-          v-model="queryParams.areaCode"
-          placeholder="请输入存储区编码"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="存储区名称" prop="areaName">
-        <el-input
-          v-model="queryParams.areaName"
-          placeholder="请输入存储区名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库时间" prop="inboundTime">
-        <el-date-picker clearable
-          v-model="queryParams.inboundTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择入库时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="逻辑删除" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          placeholder="请输入逻辑删除"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+  <div class="app-container-page">
+    <el-form :model="queryParams" class="table-form-search" ref="queryRef" :inline="true" v-show="showSearch"
+      label-width="100px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="入库单号" prop="billNo">
+            <el-input v-model="queryParams.billNo" placeholder="请输入入库单号" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库编码" prop="warehouseCode">
+            <el-input v-model="queryParams.warehouseCode" placeholder="请输入仓库编码" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库名称" prop="warehouseName">
+            <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <!-- <el-col :span="8">
+          <el-form-item label="存储区编码" prop="areaCode">
+            <el-input v-model="queryParams.areaCode" placeholder="请输入存储区编码" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="存储区名称" prop="areaName">
+            <el-input v-model="queryParams.areaName" placeholder="请输入存储区名称" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col> -->
+        <el-col :span="8">
+          <el-form-item label="入库时间" prop="inboundTime">
+            <el-date-picker clearable v-model="queryParams.inboundTime" style="width: 100%;" type="date"
+              value-format="YYYY-MM-DD" placeholder="请选择入库时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24" class="searchBtn">
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
+    <div class="table-list">
+      <el-row :gutter="10" class="mb8">
+        <!-- <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd"
+            v-hasPermi="['worn:inboundBill:add']">新增</el-button>
+        </el-col> -->
+        <!-- <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['worn:inboundBill:edit']">修改</el-button>
+        </el-col> -->
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['worn:inboundBill:remove']">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport"
+            v-hasPermi="['worn:inboundBill:export']">导出</el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['worn:inboundBill:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['worn:inboundBill:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['worn:inboundBill:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['worn:inboundBill:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="inboundBillList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="入库单号" align="center" prop="billNo" />
-      <el-table-column label="入库单类型" align="center" prop="billType" />
-      <el-table-column label="仓库编码" align="center" prop="warehouseCode" />
-      <el-table-column label="仓库名称" align="center" prop="warehouseName" />
-      <el-table-column label="存储区编码" align="center" prop="areaCode" />
-      <el-table-column label="存储区名称" align="center" prop="areaName" />
-      <el-table-column label="单据备注" align="center" prop="remark" />
-      <el-table-column label="入库时间" align="center" prop="inboundTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="逻辑删除" align="center" prop="isDelete" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['worn:inboundBill:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['worn:inboundBill:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table v-loading="loading" :data="inboundBillList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="入库单号" align="center" prop="billNo" />
+        <el-table-column label="入库单类型" align="center" prop="billType">
+          <template #default="scope">
+            <span :style="getColor(scope.row.billType, scope.row?.status)">{{ getBillType(scope.row.billType,
+              scope.row?.status, '1')
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库名称" align="center" prop="warehouseName" />
+        <el-table-column label="存储区名称" align="center" prop="areaName" />
+        <el-table-column label="单据备注" align="center" prop="remark" />
+        <el-table-column label="入库时间" align="center" prop="inboundTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['worn:inboundBill:edit']">修改</el-button> -->
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['worn:inboundBill:remove']">删除</el-button>
+              <!-- todo 详情 -->
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
     <!-- 添加或修改入库库存对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="inboundBillRef" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-form ref="inboundBillRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="入库单号" prop="billNo">
           <el-input v-model="form.billNo" placeholder="请输入入库单号" />
         </el-form-item>
-        <el-form-item label="仓库编码" prop="warehouseCode">
-          <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
-        </el-form-item>
         <el-form-item label="仓库名称" prop="warehouseName">
           <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
         </el-form-item>
-        <el-form-item label="存储区编码" prop="areaCode">
-          <el-input v-model="form.areaCode" placeholder="请输入存储区编码" />
-        </el-form-item>
         <el-form-item label="存储区名称" prop="areaName">
           <el-input v-model="form.areaName" placeholder="请输入存储区名称" />
         </el-form-item>
@@ -160,16 +116,10 @@
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="入库时间" prop="inboundTime">
-          <el-date-picker clearable
-            v-model="form.inboundTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择入库时间">
+          <el-date-picker clearable v-model="form.inboundTime" style="width: 100%;" type="date"
+            value-format="YYYY-MM-DD" placeholder="请选择入库时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="逻辑删除" prop="isDelete">
-          <el-input v-model="form.isDelete" placeholder="请输入逻辑删除" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -183,7 +133,7 @@
 
 <script setup name="InboundBill">
 import { listInboundBill, getInboundBill, delInboundBill, addInboundBill, updateInboundBill } from "@/api/worn/inboundBill"
-
+import { getColor, getBillType } from '@/untils'
 const { proxy } = getCurrentInstance()
 
 const inboundBillList = ref([])
@@ -319,12 +269,12 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除入库库存编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除入库库存编号为"' + _ids + '"的数据项？').then(function () {
     return delInboundBill(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */

src/views/worn/mqttCommand/index.vue

@@ -1,127 +1,76 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备ID" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="下发Topic" prop="topic">
-        <el-input
-          v-model="queryParams.topic"
-          placeholder="请输入下发Topic"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="指令类型" prop="command">
-        <el-input
-          v-model="queryParams.command"
-          placeholder="请输入指令类型"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="发送时间" prop="sendTime">
-        <el-date-picker clearable
-          v-model="queryParams.sendTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择发送时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="删除标识" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          placeholder="请输入删除标识"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+  <div class="app-container-page">
+    <el-form class="table-form-search" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
+      label-width="100px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="设备ID" prop="deviceId">
+            <el-input v-model="queryParams.deviceId" placeholder="请输入设备ID" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="下发Topic" prop="topic">
+            <el-input v-model="queryParams.topic" placeholder="请输入下发Topic" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" class="searchBtn">
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
+    <div class="table-list">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd"
+            v-hasPermi="['worn:mqttCommand:add']">新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['worn:mqttCommand:edit']">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['worn:mqttCommand:remove']">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport"
+            v-hasPermi="['worn:mqttCommand:export']">导出</el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['worn:mqttCommand:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['worn:mqttCommand:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['worn:mqttCommand:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['worn:mqttCommand:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="mqttCommandList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="设备ID" align="center" prop="deviceId" />
-      <el-table-column label="下发Topic" align="center" prop="topic" />
-      <el-table-column label="指令类型" align="center" prop="command" />
-      <el-table-column label="指令JSON" align="center" prop="payload" />
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.sendTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="删除标识" align="center" prop="isDelete" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['worn:mqttCommand:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['worn:mqttCommand:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table v-loading="loading" :data="mqttCommandList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" />
+        <el-table-column label="设备ID" align="center" prop="deviceId" />
+        <el-table-column label="下发Topic" align="center" prop="topic" show-overflow-tooltip width="200" />
+        <el-table-column label="指令类型" align="center" prop="command" />
+        <el-table-column label="指令JSON" align="center" prop="payload" show-overflow-tooltip  width="200"/>
+        <el-table-column label="状态" align="center" prop="status" />
+        <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.sendTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['worn:mqttCommand:edit']">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['worn:mqttCommand:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
     <!-- 添加或修改指令管理对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
       <el-form ref="mqttCommandRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="设备ID" prop="deviceId">
           <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
@@ -136,11 +85,7 @@
           <el-input v-model="form.payload" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="发送时间" prop="sendTime">
-          <el-date-picker clearable
-            v-model="form.sendTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择发送时间">
+          <el-date-picker clearable v-model="form.sendTime" type="date" style="width: 100%;" value-format="YYYY-MM-DD" placeholder="请选择发送时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -294,12 +239,12 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除指令管理编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除指令管理编号为"' + _ids + '"的数据项？').then(function () {
     return delMqttCommand(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */

src/views/worn/mqttConfig/index.vue

@@ -1,141 +1,120 @@
 <template>
-  <div class="app-container">
-    <el-form
-      ref="queryRef"
-      :model="queryParams"
-      :inline="true"
-      v-show="showSearch"
-      label-width="120px"
-    >
-      <el-form-item label="项目编码" prop="project">
-        <el-input v-model="queryParams.project" placeholder="请输入项目编码" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="仓库编码" prop="warehouse">
-        <el-input v-model="queryParams.warehouse" placeholder="请输入仓库编码" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="上行 Topic" prop="topicUp">
-        <el-input v-model="queryParams.topicUp" placeholder="请输入上行 Topic" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="下行前缀" prop="topicDownPrefix">
-        <el-input
-          v-model="queryParams.topicDownPrefix"
-          placeholder="请输入下行 Topic 前缀"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属部门ID" prop="deptId">
-        <el-input v-model="queryParams.deptId" placeholder="请输入所属部门ID" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 160px">
-          <el-option label="启用" value="0" />
-          <el-option label="停用" value="1" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+  <div class="app-container-page">
+    <el-form class="table-form-search" ref="queryRef" :model="queryParams" :inline="true" v-show="showSearch"
+      label-width="120px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="项目编码" prop="project">
+            <el-input v-model="queryParams.project" placeholder="请输入项目编码" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库编码" prop="warehouse">
+            <el-input v-model="queryParams.warehouse" placeholder="请输入仓库编码" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="上行 Topic" prop="topicUp">
+            <el-input v-model="queryParams.topicUp" placeholder="请输入上行 Topic" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="下行 Topic" prop="topicDownPrefix">
+            <el-input v-model="queryParams.topicDownPrefix" placeholder="请输入下行 Topic" clearable
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="所属部门" prop="deptId">
+            <DepartmentCascaDer v-model="queryParams.deptId" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+              <el-option label="启用" value="0" />
+              <el-option label="停用" value="1" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24" class="searchBtn">
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['worn:mqttConfig:add']"
-        >
-          新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['worn:mqttConfig:edit']"
-        >
-          修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['worn:mqttConfig:remove']"
-        >
-          删除
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['worn:mqttConfig:export']"
-        >
-          导出
-        </el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
-    </el-row>
-
-    <el-table v-loading="loading" :data="mqttConfigList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="项目编码" align="center" prop="project" />
-      <el-table-column label="仓库编码" align="center" prop="warehouse" />
-      <el-table-column label="所属部门ID" align="center" prop="deptId" />
-      <el-table-column label="上行 Topic" align="center" prop="topicUp" min-width="220" show-overflow-tooltip />
-      <el-table-column
-        label="下行 Topic 前缀"
-        align="center"
-        prop="topicDownPrefix"
-        min-width="240"
-        show-overflow-tooltip
-      />
-      <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope">
-          <el-tag :type="scope.row.status === '0' ? 'success' : 'info'">
-            {{ scope.row.status === '0' ? '启用' : '停用' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['worn:mqttConfig:edit']">
+    <div class="table-list">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['worn:mqttConfig:add']">
+            新增
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['worn:mqttConfig:edit']">
             修改
           </el-button>
-          <el-button
-            link
-            type="primary"
-            icon="Delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['worn:mqttConfig:remove']"
-          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['worn:mqttConfig:remove']">
             删除
           </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['worn:mqttConfig:export']">
+            导出
+          </el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
+      </el-row>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table v-loading="loading" :data="mqttConfigList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" />
+        <el-table-column label="项目编码" align="center" prop="project" />
+        <el-table-column label="仓库编码" align="center" prop="warehouse" />
+
+        <el-table-column label="所属部门" align="center" prop="deptId">
+          <template #default="scope">
+            {{ getDictLabel(scope.row.deptId, departmentList, { name: 'deptName', value: 'deptId' }) }}
+          </template>
+
+        </el-table-column>
+        <el-table-column label="上行 Topic" align="center" prop="topicUp" min-width="220" show-overflow-tooltip />
+        <el-table-column label="下行 Topic" align="center" prop="topicDownPrefix" min-width="240" show-overflow-tooltip />
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <el-tag :type="scope.row.status === '0' ? 'success' : 'info'">
+              {{ scope.row.status === '0' ? '启用' : '停用' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+        <el-table-column label="操作" align="center"  min-width="100">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['worn:mqttConfig:edit']">
+              修改
+            </el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['worn:mqttConfig:remove']">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
 
     <el-dialog :title="title" v-model="open" width="800px" append-to-body>
       <el-form ref="mqttConfigRef" :model="form" :rules="rules" label-width="120px">
@@ -153,8 +132,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="所属部门ID" prop="deptId">
-              <el-input v-model="form.deptId" placeholder="请输入所属部门ID" />
+            <el-form-item label="所属部门" prop="deptId">
+              <DepartmentCascaDer v-model="form.deptId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -173,8 +152,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="下行前缀" prop="topicDownPrefix">
-              <el-input v-model="form.topicDownPrefix" placeholder="请输入下行 Topic 前缀" />
+            <el-form-item label="下行 Topic" prop="topicDownPrefix">
+              <el-input v-model="form.topicDownPrefix" placeholder="请输入下行 Topic" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -197,20 +176,26 @@
 </template>
 
 <script setup name="MqttConfig">
+import { listDept } from '@/api/system/dept'
+import { getDictLabel, getDeptIdPath } from '@/untils'
 import { addMqttConfig, delMqttConfig, getMqttConfig, listMqttConfig, updateMqttConfig } from "@/api/worn/mqttConfig"
+import DepartmentCascaDer from '../../../components/DepartmentCascaDer/index.vue'
 
 const { proxy } = getCurrentInstance()
 
-const mqttConfigList = ref([])
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const ids = ref([])
-const single = ref(true)
-const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
 
+const ids = ref([])
+const mqttConfigList = ref([])
+const departmentList = ref([]);
+
+const open = ref(false)
+const single = ref(true)
+const loading = ref(true)
+const multiple = ref(true)
+const showSearch = ref(true)
+
 const data = reactive({
   form: {},
   queryParams: {
@@ -227,13 +212,21 @@ const data = reactive({
     project: [{ required: true, message: "项目编码不能为空", trigger: "blur" }],
     warehouse: [{ required: true, message: "仓库编码不能为空", trigger: "blur" }],
     topicUp: [{ required: true, message: "上行 Topic 不能为空", trigger: "blur" }],
-    topicDownPrefix: [{ required: true, message: "下行 Topic 前缀不能为空", trigger: "blur" }],
+    topicDownPrefix: [{ required: true, message: "下行 Topic不能为空", trigger: "blur" }],
     status: [{ required: true, message: "状态不能为空", trigger: "change" }]
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
+
+function getDepartmentListFun() {
+  listDept().then((response) => {
+    departmentList.value = response.data
+  });
+}
+getDepartmentListFun()
+
 function getList() {
   loading.value = true
   listMqttConfig(queryParams.value).then(response => {
@@ -271,6 +264,9 @@ function reset() {
 
 function handleQuery() {
   queryParams.value.pageNum = 1
+  if (queryParams.value.deptId) {
+    queryParams.value.deptId = queryParams.value.deptId.at(-1)
+  }
   getList()
 }
 
@@ -295,7 +291,9 @@ function handleUpdate(row) {
   reset()
   const currentId = row?.id || ids.value[0]
   getMqttConfig(currentId).then(response => {
-    form.value = response.data
+    const department = proxy.handleTree(departmentList.value, "deptId")
+    const deptId = getDeptIdPath(department, response.data.deptId)
+    form.value = { ...response.data, deptId }
     if (!form.value.status) {
       form.value.status = "0"
     }
@@ -309,7 +307,7 @@ function submitForm() {
     if (!valid) {
       return
     }
-
+    form.value = { ...form.value, deptId: form.value.deptId.at(-1) }
     const request = form.value.id != null ? updateMqttConfig(form.value) : addMqttConfig(form.value)
     request.then(() => {
       proxy.$modal.msgSuccess(form.value.id != null ? "修改成功" : "新增成功")
@@ -326,7 +324,7 @@ function handleDelete(row) {
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 function handleExport() {

src/views/worn/mqttData/index.vue

@@ -1,137 +1,120 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目" prop="project">
-        <el-input
-          v-model="queryParams.project"
-          placeholder="请输入项目"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库" prop="warehouse">
-        <el-input
-          v-model="queryParams.warehouse"
-          placeholder="请输入仓库"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+  <div class="app-container-page">
+    <el-form :model="queryParams" class="table-form-search" ref="queryRef" :inline="true" v-show="showSearch"
+      label-width="68px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="项目" prop="project">
+            <el-input v-model="queryParams.project" placeholder="请输入项目" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="仓库" prop="warehouse">
+            <el-input v-model="queryParams.warehouse" placeholder="请输入仓库" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" class="searchBtn">
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
+    <div class="table-list">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd"
+            v-hasPermi="['worn:mqttData:add']">新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['worn:mqttData:edit']">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['worn:mqttData:remove']">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport"
+            v-hasPermi="['worn:mqttData:export']">导出</el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['worn:mqttData:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['worn:mqttData:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['worn:mqttData:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['worn:mqttData:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="mqttDataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="设备ID" align="center" prop="deviceId" />
-      <el-table-column label="MQTT Topic" align="center" prop="topic" min-width="180" show-overflow-tooltip />
-      <el-table-column label="项目" align="center" prop="project" min-width="100" show-overflow-tooltip />
-      <el-table-column label="仓库" align="center" prop="warehouse" />
-      <el-table-column label="原始消息" align="center" prop="payload" min-width="300" show-overflow-tooltip />
-      <el-table-column label="解析JSON" align="center" prop="dataJson" min-width="300" show-overflow-tooltip />
-      <el-table-column label="电量" align="center" prop="battery">
-        <template #default="scope">
-          <el-tag v-if="scope.row.battery !== null && scope.row.battery !== undefined && scope.row.battery !== ''" color="#409EFF" style="color: #fff;">{{ scope.row.battery }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="温度" align="center" prop="temperature">
-        <template #default="scope">
-          <el-tag v-if="scope.row.temperature !== null && scope.row.temperature !== undefined && scope.row.temperature !== ''" color="#E6A23C" style="color: #fff;">{{ scope.row.temperature }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="湿度" align="center" prop="humidity">
-        <template #default="scope">
-          <el-tag v-if="scope.row.humidity !== null && scope.row.humidity !== undefined && scope.row.humidity !== ''" color="#00B5D8" style="color: #fff;">{{ scope.row.humidity }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="氨气" align="center" prop="nh3">
-        <template #default="scope">
-          <el-tag v-if="scope.row.nh3 !== null && scope.row.nh3 !== undefined && scope.row.nh3 !== ''" color="#9C27B0" style="color: #fff;">{{ scope.row.nh3 }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="硫化氢" align="center" prop="h2s">
-        <template #default="scope">
-          <el-tag v-if="scope.row.h2s !== null && scope.row.h2s !== undefined && scope.row.h2s !== ''" color="#EC407A" style="color: #fff;">{{ scope.row.h2s }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="烟雾浓度" align="center" prop="concentration">
-        <template #default="scope">
-          <el-tag color="#607D8B" style="color: #fff;">{{ scope.row.concentration ?? 0 }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="水位状态" align="center" prop="waterStatus">
-        <template #default="scope">
-          <el-tag :type="(scope.row.waterStatus === null || scope.row.waterStatus === undefined || scope.row.waterStatus === '' || scope.row.waterStatus === 0) ? 'success' : 'danger'">
-            {{ (scope.row.waterStatus === null || scope.row.waterStatus === undefined || scope.row.waterStatus === '' || scope.row.waterStatus === 0) ? '正常' : '报警' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-<!--      <el-table-column label="删除标识" align="center" prop="isDelete" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['worn:mqttData:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['worn:mqttData:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table v-loading="loading" :data="mqttDataList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" />
+        <el-table-column label="设备ID" align="center" prop="deviceId" />
+        <el-table-column label="MQTT Topic" align="center" prop="topic" min-width="180" show-overflow-tooltip />
+        <el-table-column label="项目" align="center" prop="project" min-width="100" show-overflow-tooltip />
+        <el-table-column label="仓库" align="center" prop="warehouse" />
+        <el-table-column label="原始消息" align="center" prop="payload" min-width="300" show-overflow-tooltip />
+        <el-table-column label="解析JSON" align="center" prop="dataJson" min-width="300" show-overflow-tooltip />
+        <el-table-column label="电量" align="center" prop="battery">
+          <template #default="scope">
+            <el-tag v-if="scope.row.battery !== null && scope.row.battery !== undefined && scope.row.battery !== ''"
+              color="#409EFF" style="color: #fff;">{{ scope.row.battery }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="温度" align="center" prop="temperature">
+          <template #default="scope">
+            <el-tag
+              v-if="scope.row.temperature !== null && scope.row.temperature !== undefined && scope.row.temperature !== ''"
+              color="#E6A23C" style="color: #fff;">{{ scope.row.temperature }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="湿度" align="center" prop="humidity">
+          <template #default="scope">
+            <el-tag v-if="scope.row.humidity !== null && scope.row.humidity !== undefined && scope.row.humidity !== ''"
+              color="#00B5D8" style="color: #fff;">{{ scope.row.humidity }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="氨气" align="center" prop="nh3">
+          <template #default="scope">
+            <el-tag v-if="scope.row.nh3 !== null && scope.row.nh3 !== undefined && scope.row.nh3 !== ''" color="#9C27B0"
+              style="color: #fff;">{{ scope.row.nh3 }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="硫化氢" align="center" prop="h2s">
+          <template #default="scope">
+            <el-tag v-if="scope.row.h2s !== null && scope.row.h2s !== undefined && scope.row.h2s !== ''" color="#EC407A"
+              style="color: #fff;">{{ scope.row.h2s }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="烟雾浓度" align="center" prop="concentration">
+          <template #default="scope">
+            <el-tag color="#607D8B" style="color: #fff;">{{ scope.row.concentration ?? 0 }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="水位状态" align="center" prop="waterStatus">
+          <template #default="scope">
+            <el-tag
+              :type="(scope.row.waterStatus === null || scope.row.waterStatus === undefined || scope.row.waterStatus === '' || scope.row.waterStatus === 0) ? 'success' : 'danger'">
+              {{ (scope.row.waterStatus === null || scope.row.waterStatus === undefined || scope.row.waterStatus === ''
+                ||
+                scope.row.waterStatus === 0) ? '正常' : '报警' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <!--      <el-table-column label="删除标识" align="center" prop="isDelete" />-->
+        <el-table-column label="操作" align="center" fixed="right" width="150">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['worn:mqttData:edit']">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['worn:mqttData:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
     <!-- 添加或修改设备数据对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="mqttDataRef" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-form ref="mqttDataRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="设备ID" prop="deviceId">
           <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
         </el-form-item>
@@ -327,12 +310,12 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除设备数据编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除设备数据编号为"' + _ids + '"的数据项？').then(function () {
     return delMqttData(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */

src/views/worn/mqttDevice/index.vue

@@ -1,108 +1,87 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px" style="flex-wrap: nowrap; white-space: nowrap;">
-      <el-form-item label="设备唯一标识" prop="devEui">
-        <el-input
-          v-model="queryParams.devEui"
-          placeholder="请输入设备唯一标识"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备名称" prop="deviceName">
-        <el-input
-          v-model="queryParams.deviceName"
-          placeholder="请输入设备名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属部门ID" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入所属部门ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+  <div class="app-container-page">
+    <el-form class="table-form-search" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
+      label-width="100px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="设备唯一标识" prop="devEui">
+            <el-input v-model="queryParams.devEui" placeholder="请输入设备唯一标识" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="所属部门" prop="deptId">
+            <DepartmentCascaDer v-model="queryParams.deptId" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+      <el-row>
+        <el-col :span="24" class="searchBtn">
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
     </el-form>
+    <div class="table-list">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd"
+            v-hasPermi="['worn:mqttDevice:add']">新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['worn:mqttDevice:edit']">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['worn:mqttDevice:remove']">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport"
+            v-hasPermi="['worn:mqttDevice:export']">导出</el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['worn:mqttDevice:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['worn:mqttDevice:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['worn:mqttDevice:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['worn:mqttDevice:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="mqttDeviceList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="设备唯一标识" align="center" prop="devEui" />
-      <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="设备类型" align="center" prop="deviceType" />
-      <el-table-column label="所属部门ID" align="center" prop="deptId" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope">
-          <el-tag v-if="scope.row.status === '0'" type="success">正常</el-tag>
-          <el-tag v-else-if="scope.row.status === '1'" type="danger">不可用</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['worn:mqttDevice:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['worn:mqttDevice:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table v-loading="loading" :data="mqttDeviceList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" />
+        <el-table-column label="设备唯一标识" align="center" prop="devEui" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备类型" align="center" prop="deviceType" />
+        <el-table-column label="所属部门" align="center" prop="deptId">
+          <template #default="scope">
+            {{ getDictLabel(scope.row.deptId, departmentList, { name: 'deptName', value: 'deptId' }) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <el-tag v-if="scope.row.status === '0'" type="success">正常</el-tag>
+            <el-tag v-else-if="scope.row.status === '1'" type="danger">不可用</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['worn:mqttDevice:edit']">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['worn:mqttDevice:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
     <!-- 添加或修改MQTT设备对话框 -->
     <el-dialog :title="title" v-model="open" width="700px" append-to-body>
       <el-form ref="mqttDeviceRef" :model="form" :rules="rules" label-width="100px">
@@ -125,8 +104,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所属部门ID" prop="deptId">
-              <el-input v-model="form.deptId" placeholder="请输入所属部门ID" />
+            <el-form-item label="所属部门" prop="deptId">
+              <DepartmentCascaDer v-model="form.deptId" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -149,20 +128,26 @@
 </template>
 
 <script setup name="MqttDevice">
-import { listMqttDevice, getMqttDevice, delMqttDevice, addMqttDevice, updateMqttDevice } from "@/api/worn/mqttDevice"
+import { listDept } from '@/api/system/dept'
+import { getDictLabel, getDeptIdPath } from '@/untils'
+import DepartmentCascaDer from '../../../components/DepartmentCascaDer/index.vue'
+import { listMqttDevice, getMqttDevice, delMqttDevice, addMqttDevice, updateMqttDevice } from "@/api/worn/mqttDevice";
 
 const { proxy } = getCurrentInstance()
 
-const mqttDeviceList = ref([])
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const ids = ref([])
-const single = ref(true)
-const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
+
+const ids = ref([])
+const mqttDeviceList = ref([])
+
+const open = ref(false)
 const isEdit = ref(false)
+const single = ref(true)
+const loading = ref(true)
+const multiple = ref(true)
+const showSearch = ref(true)
+const departmentList = ref([]);// 所属部门
 
 const data = reactive({
   form: {},
@@ -184,6 +169,16 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
+// 所属部门
+function getDepartmentListFun() {
+  listDept().then((response) => {
+    departmentList.value = response.data
+
+  });
+}
+getDepartmentListFun()
+
+
 /** 查询MQTT设备列表 */
 function getList() {
   loading.value = true
@@ -221,6 +216,11 @@ function reset() {
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1
+  console.log(queryParams.value.deptId, 'queryParams.value.deptId');
+
+  if (queryParams.value.deptId) {
+    queryParams.value.deptId = queryParams.value.deptId.at(-1)
+  }
   getList()
 }
 
@@ -247,11 +247,14 @@ function handleAdd() {
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
+
   reset()
   isEdit.value = true
   const _id = row.id || ids.value
   getMqttDevice(_id).then(response => {
-    form.value = response.data
+    const department = proxy.handleTree(departmentList.value, "deptId")
+    const deptId = getDeptIdPath(department, response.data.deptId)
+    form.value = { ...response.data, deptId }
     open.value = true
     title.value = "修改MQTT设备"
   })
@@ -261,6 +264,7 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["mqttDeviceRef"].validate(valid => {
     if (valid) {
+      form.value = { ...form.value, deptId: form.value.deptId.at(-1) }
       if (form.value.id != null) {
         updateMqttDevice(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功")
@@ -281,12 +285,12 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除MQTT设备编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除MQTT设备编号为"' + _ids + '"的数据项？').then(function () {
     return delMqttDevice(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */

src/views/worn/mqttEvent/index.vue

@@ -1,112 +1,76 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备ID" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="事件描述" prop="eventDesc">
-        <el-input
-          v-model="queryParams.eventDesc"
-          placeholder="请输入事件描述"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="等级" prop="level">
-        <el-input
-          v-model="queryParams.level"
-          placeholder="请输入等级"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="删除标识" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          placeholder="请输入删除标识"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+  <div class="app-container-page">
+    <el-form class="table-form-search" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
+      label-width="68px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="设备ID" prop="deviceId">
+            <el-input v-model="queryParams.deviceId" placeholder="请输入设备ID" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="等级" prop="level">
+            <el-select v-model="queryParams.level" placeholder="请选择等级" clearable>
+              <el-option v-for="dict in levelTypeMenu" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" class="searchBtn">
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
+    <div class="table-list">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd"
+            v-hasPermi="['worn:mqttEvent:add']">新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['worn:mqttEvent:edit']">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['worn:mqttEvent:remove']">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport"
+            v-hasPermi="['worn:mqttEvent:export']">导出</el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['worn:mqttEvent:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['worn:mqttEvent:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['worn:mqttEvent:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['worn:mqttEvent:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="mqttEventList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="设备ID" align="center" prop="deviceId" />
-      <el-table-column label="事件类型" align="center" prop="eventType" />
-      <el-table-column label="事件描述" align="center" prop="eventDesc" />
-      <el-table-column label="等级" align="center" prop="level" />
-      <el-table-column label="处理状态" align="center" prop="status" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="删除标识" align="center" prop="isDelete" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['worn:mqttEvent:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['worn:mqttEvent:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table v-loading="loading" :data="mqttEventList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" />
+        <el-table-column label="设备ID" align="center" prop="deviceId" />
+        <el-table-column label="事件类型" align="center" prop="eventType" />
+        <el-table-column label="事件描述" align="center" prop="eventDesc" />
+        <el-table-column label="等级" align="center" prop="level">
+          <template #default="scope">
+            {{ getDictLabel(scope.row.level, levelTypeMenu) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="处理状态" align="center" prop="status" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <!-- <el-table-column label="删除标识" align="center" prop="isDelete" /> -->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['worn:mqttEvent:edit']">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['worn:mqttEvent:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
     <!-- 添加或修改设备事件对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="mqttEventRef" :model="form" :rules="rules" label-width="80px">
@@ -117,14 +81,13 @@
           <el-input v-model="form.eventDesc" placeholder="请输入事件描述" />
         </el-form-item>
         <el-form-item label="等级" prop="level">
-          <el-input v-model="form.level" placeholder="请输入等级" />
+          <el-select v-model="form.level" placeholder="请选择等级" clearable>
+            <el-option v-for="dict in levelTypeMenu" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="删除标识" prop="isDelete">
-          <el-input v-model="form.isDelete" placeholder="请输入删除标识" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -138,8 +101,9 @@
 
 <script setup name="MqttEvent">
 import { listMqttEvent, getMqttEvent, delMqttEvent, addMqttEvent, updateMqttEvent } from "@/api/worn/mqttEvent"
-
+import { levelTypeMenu, getDictLabel } from '@/untils'
 const { proxy } = getCurrentInstance()
+console.log(levelTypeMenu, 'levelTypeMenu');
 
 const mqttEventList = ref([])
 const open = ref(false)
@@ -271,12 +235,12 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除设备事件编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除设备事件编号为"' + _ids + '"的数据项？').then(function () {
     return delMqttEvent(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */

src/views/worn/threshold/index.vue

@@ -1,142 +1,71 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备ID" prop="deviceId">
-        <el-input
-          v-model="queryParams.deviceId"
-          placeholder="请输入设备ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预警最小值" prop="warnMin">
-        <el-input
-          v-model="queryParams.warnMin"
-          placeholder="请输入预警最小值"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预警最大值" prop="warnMax">
-        <el-input
-          v-model="queryParams.warnMax"
-          placeholder="请输入预警最大值"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="报警最小值" prop="alarmMin">
-        <el-input
-          v-model="queryParams.alarmMin"
-          placeholder="请输入报警最小值"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="报警最大值" prop="alarmMax">
-        <el-input
-          v-model="queryParams.alarmMax"
-          placeholder="请输入报警最大值"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否删除" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          placeholder="请输入是否删除"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
+  <div class="app-container-page">
+    <el-form class="table-form-search" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
+      label-width="68px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="设备ID" prop="deviceId">
+            <el-input v-model="queryParams.deviceId" placeholder="请输入设备ID" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16" class="searchBtn">
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
+    <div class="table-list">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd"
+            v-hasPermi="['worn:threshold:add']">新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+            v-hasPermi="['worn:threshold:edit']">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+            v-hasPermi="['worn:threshold:remove']">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport"
+            v-hasPermi="['worn:threshold:export']">导出</el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['worn:threshold:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['worn:threshold:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['worn:threshold:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['worn:threshold:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="thresholdList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="设备ID" align="center" prop="deviceId" />
-      <el-table-column label="指标类型" align="center" prop="metricType" />
-      <el-table-column label="预警最小值" align="center" prop="warnMin" />
-      <el-table-column label="预警最大值" align="center" prop="warnMax" />
-      <el-table-column label="报警最小值" align="center" prop="alarmMin" />
-      <el-table-column label="报警最大值" align="center" prop="alarmMax" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否删除" align="center" prop="isDelete" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['worn:threshold:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['worn:threshold:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <el-table v-loading="loading" :data="thresholdList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" />
+        <el-table-column label="设备ID" align="center" prop="deviceId" />
+        <el-table-column label="指标类型" align="center" prop="metricType" />
+        <el-table-column label="预警最小值" align="center" prop="warnMin" />
+        <el-table-column label="预警最大值" align="center" prop="warnMax" />
+        <el-table-column label="报警最小值" align="center" prop="alarmMin" />
+        <el-table-column label="报警最大值" align="center" prop="alarmMax" />
+        <el-table-column label="单位" align="center" prop="unit" />
+        <el-table-column label="状态" align="center" prop="status" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <!-- <el-table-column label="是否删除" align="center" prop="isDelete" /> -->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['worn:threshold:edit']">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['worn:threshold:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </div>
     <!-- 添加或修改传感器阈值配置对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="thresholdRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="thresholdRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="设备ID" prop="deviceId">
           <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
         </el-form-item>
@@ -158,9 +87,9 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="是否删除" prop="isDelete">
+        <!-- <el-form-item label="是否删除" prop="isDelete">
           <el-input v-model="form.isDelete" placeholder="请输入是否删除" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -313,12 +242,12 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除传感器阈值配置编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除传感器阈值配置编号为"' + _ids + '"的数据项？').then(function () {
     return delThreshold(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 /** 导出按钮操作 */