Browse Source

设备台账调整

lipenghui 4 months ago
parent
commit
1a7b6936c7

+ 66 - 66
src/api/pms/device/index.ts

@@ -1,66 +1,66 @@
-import request from '@/config/axios'
-
-// 设备台账 VO
-export interface IotDeviceVO {
-  id: number // 主键id
-  deviceCode: string // 资产编码
-  deivceName: string // 设备名称
-  brand: number // 品牌
-  model: number // 规格型号
-  orgId: number // 所在部门
-  deviceStatus: string // 设备状态
-  assetProperty: string // 资产性质
-  picUrl: string // 图片
-  remark: string // 备注
-  manufacturerId: number // 制造商id
-  supplierId: number // 供应商id
-  manDate: Date // 生产日期
-  nameplate: string // 铭牌信息
-  expires: number // 质保到期
-  plPrice: number // 采购/租赁价格
-  plDate: Date // 采购/租赁日期
-  plYear: number // 折旧年限
-  plStartDate: number // 折旧开始日期
-  plMonthed: number // 已提折旧月数
-  plAmounted: number // 已提折旧金额
-  remainAmount: number // 剩余金额
-  infoId: number // 资料分类id
-  infoType: string // 资料类型
-  infoName: string // 资料名称
-  infoRemark: string // 资料备注
-  infoUrl: string // 资料附件
-  templateJson: string // 动态模板信息
-}
-
-// 设备台账 API
-export const IotDeviceApi = {
-  // 查询设备台账分页
-  getIotDevicePage: async (params: any) => {
-    return await request.get({ url: `/rq/iot-device/page`, params })
-  },
-
-  // 查询设备台账详情
-  getIotDevice: async (id: number) => {
-    return await request.get({ url: `/rq/iot-device/get?id=` + id })
-  },
-
-  // 新增设备台账
-  createIotDevice: async (data: IotDeviceVO) => {
-    return await request.post({ url: `/rq/iot-device/create`, data })
-  },
-
-  // 修改设备台账
-  updateIotDevice: async (data: IotDeviceVO) => {
-    return await request.put({ url: `/rq/iot-device/update`, data })
-  },
-
-  // 删除设备台账
-  deleteIotDevice: async (id: number) => {
-    return await request.delete({ url: `/rq/iot-device/delete?id=` + id })
-  },
-
-  // 导出设备台账 Excel
-  exportIotDevice: async (params) => {
-    return await request.download({ url: `/rq/iot-device/export-excel`, params })
-  },
-}
+import request from '@/config/axios'
+
+// 设备台账 VO
+export interface IotDeviceVO {
+  id: number // 主键id
+  deviceCode: string // 资产编码
+  deivceName: string // 设备名称
+  brand: number // 品牌
+  model: number // 规格型号
+  deptId: number // 所在部门
+  deviceStatus: string // 设备状态
+  assetProperty: string // 资产性质
+  picUrl: string // 图片
+  remark: string // 备注
+  manufacturerId: number // 制造商id
+  supplierId: number // 供应商id
+  manDate: Date // 生产日期
+  nameplate: string // 铭牌信息
+  expires: number // 质保到期
+  plPrice: number // 采购/租赁价格
+  plDate: Date // 采购/租赁日期
+  plYear: number // 折旧年限
+  plStartDate: number // 折旧开始日期
+  plMonthed: number // 已提折旧月数
+  plAmounted: number // 已提折旧金额
+  remainAmount: number // 剩余金额
+  infoId: number // 资料分类id
+  infoType: string // 资料类型
+  infoName: string // 资料名称
+  infoRemark: string // 资料备注
+  infoUrl: string // 资料附件
+  templateJson: string // 动态模板信息
+}
+
+// 设备台账 API
+export const IotDeviceApi = {
+  // 查询设备台账分页
+  getIotDevicePage: async (params: any) => {
+    return await request.get({ url: `/rq/iot-device/page`, params })
+  },
+
+  // 查询设备台账详情
+  getIotDevice: async (id: number) => {
+    return await request.get({ url: `/rq/iot-device/get?id=` + id })
+  },
+
+  // 新增设备台账
+  createIotDevice: async (data: IotDeviceVO) => {
+    return await request.post({ url: `/rq/iot-device/create`, data })
+  },
+
+  // 修改设备台账
+  updateIotDevice: async (data: IotDeviceVO) => {
+    return await request.put({ url: `/rq/iot-device/update`, data })
+  },
+
+  // 删除设备台账
+  deleteIotDevice: async (id: number) => {
+    return await request.delete({ url: `/rq/iot-device/delete?id=` + id })
+  },
+
+  // 导出设备台账 Excel
+  exportIotDevice: async (params) => {
+    return await request.download({ url: `/rq/iot-device/export-excel`, params })
+  },
+}

+ 1 - 1
src/api/pms/iotinfo/index.ts

@@ -4,7 +4,7 @@ import request from '@/config/axios'
 export interface IotInfoVO {
   id: number // 主键id
   deviceId: number // 设备id
-  orgId: number // 部门id
+  deptId: number // 部门id
   filename: string // 文件名称
   fileType: string // 文件类型
   filePath: string // 文件路径

+ 1 - 1
src/views/pms/device/DeviceInfo.vue

@@ -30,7 +30,7 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <el-form-item label="所在部门:" prop="orgId">
+              <el-form-item label="所在部门:" prop="deptId">
                 {{ formData.deptName }}
               </el-form-item>
             </el-col>

+ 1 - 1
src/views/pms/device/DeviceUpload.vue

@@ -171,7 +171,7 @@ const queryParams = reactive({
 const formData = ref({
   id: undefined,
   deviceId: undefined,
-  orgId: undefined,
+  deptId: undefined,
   filename: undefined,
   fileType: undefined,
   filePath: undefined,

+ 6 - 6
src/views/pms/device/IotDeviceForm.vue

@@ -36,9 +36,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="所在部门" prop="orgId">
+            <el-form-item label="所在部门" prop="deptId">
               <el-tree-select
-                v-model="formData.orgId"
+                v-model="formData.deptId"
                 :data="deptList"
                 :props="defaultProps"
                 check-strictly
@@ -373,7 +373,7 @@ const formData = ref({
   deviceName: undefined,
   brand: undefined,
   model: undefined,
-  orgId: undefined,
+  deptId: undefined,
   deviceStatus: undefined,
   assetProperty: undefined,
   picUrl: undefined,
@@ -403,7 +403,7 @@ const formRules = reactive({
   deviceCode: [{ required: true, message: '资产编码不能为空', trigger: 'blur' }],
   deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
   brand: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
-  orgId: [{ required: true, message: '所在部门不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '所在部门不能为空', trigger: 'blur' }],
   deviceStatus: [{ required: true, message: '设备状态不能为空', trigger: 'blur' }],
   assetProperty: [{ required: true, message: '资产性质不能为空', trigger: 'blur' }],
   manufacturerId: [{ required: true, message: '制造商id不能为空', trigger: 'blur' }],
@@ -559,7 +559,7 @@ onMounted(async () => {
   productClassifyList.value = handleTree(
     await ProductClassifyApi.IotProductClassifyApi.getSimpleProductClassifyList()
   )
-  console.log(JSON.stringify(productClassifyList.value))
+  formData.value.assetProperty = 'zy'
   // 修改时,设置数据
   if (id) {
     formType.value = 'update';
@@ -589,7 +589,7 @@ const resetForm = () => {
     deviceName: undefined,
     brand: undefined,
     model: undefined,
-    orgId: undefined,
+    deptId: undefined,
     deviceStatus: undefined,
     assetProperty: undefined,
     picUrl: undefined,

+ 190 - 166
src/views/pms/device/index.vue

@@ -1,175 +1,184 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="资产编码" prop="deviceCode">
-        <el-input
-          v-model="queryParams.deviceCode"
-          placeholder="请输入资产编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-200px"
-        />
-      </el-form-item>
-      <el-form-item label="设备名称" prop="deviceName">
-        <el-input
-          v-model="queryParams.deviceName"
-          placeholder="请输入设备名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-200px"
-        />
-      </el-form-item>
-      <el-form-item label="品牌" prop="brand">
-        <el-input
-          v-model="queryParams.brand"
-          placeholder="请输入品牌"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-200px"
-        />
-      </el-form-item>
+  <el-row :gutter="20">
+    <!-- 左侧部门树 -->
+    <el-col :span="4" :xs="24">
+      <ContentWrap class="h-1/1">
+        <DeptTree @node-click="handleDeptNodeClick" />
+      </ContentWrap>
+    </el-col>
+    <el-col :span="20" :xs="24">
+      <ContentWrap>
+        <!-- 搜索工作栏 -->
+        <el-form
+          class="-mb-15px"
+          :model="queryParams"
+          ref="queryFormRef"
+          :inline="true"
+          label-width="68px"
+        >
+          <el-form-item label="资产编码" prop="deviceCode">
+            <el-input
+              v-model="queryParams.deviceCode"
+              placeholder="请输入资产编码"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-200px"
+            />
+          </el-form-item>
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input
+              v-model="queryParams.deviceName"
+              placeholder="请输入设备名称"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-200px"
+            />
+          </el-form-item>
+          <el-form-item label="品牌" prop="brand">
+            <el-input
+              v-model="queryParams.brand"
+              placeholder="请输入品牌"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-200px"
+            />
+          </el-form-item>
 
 
-      <el-form-item v-show="ifShow" label="设备状态" prop="deviceStatus">
-        <el-select
-          v-model="queryParams.deviceStatus"
-          placeholder="设备状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.PMS_DEVICE_STATUS)"
-            :key="dict.id"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+          <el-form-item v-show="ifShow" label="设备状态" prop="deviceStatus">
+            <el-select
+              v-model="queryParams.deviceStatus"
+              placeholder="设备状态"
+              clearable
+              class="!w-240px"
+            >
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.PMS_DEVICE_STATUS)"
+                :key="dict.id"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
 
-      <el-form-item v-show="ifShow" label="资产性质" prop="assetProperty">
-        <el-input
-          v-model="queryParams.assetProperty"
-          placeholder="请输入资产性质"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-200px"
-        />
-      </el-form-item>
+          <el-form-item v-show="ifShow" label="资产性质" prop="assetProperty">
+            <el-input
+              v-model="queryParams.assetProperty"
+              placeholder="请输入资产性质"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-200px"
+            />
+          </el-form-item>
 
 
-      <el-form-item>
-        <el-button v-if="!ifShow" @click="moreQuery(true)" type="warning"><Icon icon="ep:search" class="mr-5px"/> 更多查询</el-button>
-        <el-button v-if="ifShow" @click="moreQuery(false)" type="danger"><Icon icon="ep:search" class="mr-5px"/> 收起查询</el-button>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['rq:iot-device:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['rq:iot-device:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
+          <el-form-item>
+            <el-button v-if="!ifShow" @click="moreQuery(true)" type="warning"><Icon icon="ep:search" class="mr-5px"/> 更多查询</el-button>
+            <el-button v-if="ifShow" @click="moreQuery(false)" type="danger"><Icon icon="ep:search" class="mr-5px"/> 收起查询</el-button>
+            <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+            <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+            <el-button
+              type="primary"
+              plain
+              @click="openForm('create',undefined,queryParams.deptId)"
+              v-hasPermi="['rq:iot-device:create']"
+            >
+              <Icon icon="ep:plus" class="mr-5px" /> 新增
+            </el-button>
+            <el-button
+              type="success"
+              plain
+              @click="handleExport"
+              :loading="exportLoading"
+              v-hasPermi="['rq:iot-device:export']"
+            >
+              <Icon icon="ep:download" class="mr-5px" /> 导出
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </ContentWrap>
 
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="资产编码" align="center" prop="deviceCode" />
-      <el-table-column label="设备名称" align="center" prop="deviceName" >
-        <template #default="scope">
-          <el-link :underline="false" type="primary" @click="handleDetail(scope.row.id)">
-            {{ scope.row.deviceName }}
-          </el-link>
-        </template>
-<!--        <template #default="{ row }">-->
-<!--          <div class="custom-cell">{{ row.deviceName }}</div>-->
-<!--        </template>-->
-      </el-table-column>
-      <el-table-column label="所在部门" align="center" prop="deptName" />
-      <el-table-column label="设备状态" align="center" prop="deviceStatus">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PMS_DEVICE_STATUS" :value="scope.row.deviceStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="资产性质" align="center" prop="assetProperty">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PMS_ASSET_PROPERTY" :value="scope.row.assetProperty" />
-        </template>
-      </el-table-column>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
+      <!-- 列表 -->
+      <ContentWrap>
+        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+          <el-table-column label="资产编码" align="center" prop="deviceCode" />
+          <el-table-column label="设备名称" align="center" prop="deviceName" >
+            <template #default="scope">
+              <el-link :underline="false" type="primary" @click="handleDetail(scope.row.id)">
+                {{ scope.row.deviceName }}
+              </el-link>
+            </template>
+    <!--        <template #default="{ row }">-->
+    <!--          <div class="custom-cell">{{ row.deviceName }}</div>-->
+    <!--        </template>-->
+          </el-table-column>
+          <el-table-column label="所在部门" align="center" prop="deptName" />
+          <el-table-column label="设备状态" align="center" prop="deviceStatus">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.PMS_DEVICE_STATUS" :value="scope.row.deviceStatus" />
+            </template>
+          </el-table-column>
+          <el-table-column label="资产性质" align="center" prop="assetProperty">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.PMS_ASSET_PROPERTY" :value="scope.row.assetProperty" />
+            </template>
+          </el-table-column>
+          <el-form-item label="创建时间" prop="createTime">
+            <el-date-picker
+              v-model="queryParams.createTime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="daterange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+              class="!w-240px"
+            />
+          </el-form-item>
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            :formatter="dateFormatter"
+            width="180px"
+          />
+          <el-table-column label="操作" align="center" min-width="120px">
+            <template #default="scope">
+              <el-button
+                link
+                type="primary"
+                @click="openForm('update', scope.row.id)"
+                v-hasPermi="['rq:iot-device:update']"
+              >
+                编辑
+              </el-button>
+              <el-button
+                link
+                type="danger"
+                @click="handleDelete(scope.row.id)"
+                v-hasPermi="['rq:iot-device:delete']"
+              >
+                删除
+              </el-button>
+              <el-button
+                link
+                type="warning"
+                @click="handleUpload(scope.row.id)"
+              >
+                资料上传
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页 -->
+        <Pagination
+          :total="total"
+          v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
         />
-      </el-form-item>
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['rq:iot-device:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['rq:iot-device:delete']"
-          >
-            删除
-          </el-button>
-          <el-button
-            link
-            type="warning"
-            @click="handleUpload(scope.row.id)"
-          >
-            资料上传
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
+      </ContentWrap>
+    </el-col>
+  </el-row>
   <!-- 表单弹窗:添加/修改 -->
 <!--  <IotDeviceForm ref="formRef" @success="getList" />-->
 </template>
@@ -180,6 +189,9 @@ import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 import IotDeviceForm from './IotDeviceForm.vue'
 import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 import {dateFormatter} from "@/utils/formatTime";
+import PmsTree from "@/views/system/tree/PmsTree.vue";
+import DeptTree from "@/views/system/user/DeptTree.vue";
+import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
 
 /** 设备台账 列表 */
 defineOptions({ name: 'IotDevicePms' })
@@ -200,7 +212,7 @@ const queryParams = reactive({
   deviceName: undefined,
   brand: undefined,
   model: undefined,
-  orgId: undefined,
+  deptId: undefined,
   deviceStatus: undefined,
   assetProperty: undefined,
   picUrl: undefined,
@@ -223,6 +235,7 @@ const queryParams = reactive({
   infoRemark: undefined,
   infoUrl: undefined,
   templateJson: undefined,
+  creator: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -239,6 +252,12 @@ const getList = async () => {
   }
 }
 
+/** 处理部门被点击 */
+const handleDeptNodeClick = async (row) => {
+  queryParams.deptId = row.id
+  await getList()
+}
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
@@ -257,6 +276,7 @@ const resetQuery = () => {
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
   //修改
+  debugger
   if (typeof id === 'number') {
     push({ name: 'DeviceDetailEdit', params: {id } })
     return
@@ -300,9 +320,13 @@ const handleExport = async () => {
     exportLoading.value = false
   }
 }
-
+const { wsCache } = useCache()
 /** 初始化 **/
 onMounted(() => {
+  const user = wsCache.get(CACHE_KEY.USER)
+  console.log(JSON.stringify(user))
+  queryParams.deptId = user.user.deptId
+  debugger
   getList()
 })
 </script>

+ 2 - 2
src/views/pms/iotinfo/IotInfoForm.vue

@@ -56,7 +56,7 @@ const formType = ref('') // 表单的类型:create - 新增;update - 修改
 const formData = ref({
   id: undefined,
   deviceId: undefined,
-  orgId: undefined,
+  deptId: undefined,
   filename: undefined,
   fileType: undefined,
   filePath: undefined,
@@ -128,7 +128,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     deviceId: undefined,
-    orgId: undefined,
+    deptId: undefined,
     filename: undefined,
     fileType: undefined,
     filePath: undefined,

+ 4 - 4
src/views/pms/iotinfo/index.vue

@@ -17,9 +17,9 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="部门id" prop="orgId">
+      <el-form-item label="部门id" prop="deptId">
         <el-input
-          v-model="queryParams.orgId"
+          v-model="queryParams.deptId"
           placeholder="请输入部门id"
           clearable
           @keyup.enter="handleQuery"
@@ -103,7 +103,7 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="主键id" align="center" prop="id" />
       <el-table-column label="设备id" align="center" prop="deviceId" />
-      <el-table-column label="部门id" align="center" prop="orgId" />
+      <el-table-column label="部门id" align="center" prop="deptId" />
       <el-table-column label="文件名称" align="center" prop="filename" />
       <el-table-column label="文件类型" align="center" prop="fileType" />
       <el-table-column label="文件路径" align="center" prop="filePath" />
@@ -168,7 +168,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   deviceId: undefined,
-  orgId: undefined,
+  deptId: undefined,
   filename: undefined,
   fileType: undefined,
   filePath: undefined,

+ 3 - 5
src/views/system/tree/index.vue

@@ -40,10 +40,9 @@
         </ContentWrap>
         <ContentWrap>
           <el-table v-loading="formLoading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-            <!--          <el-table-column label="设备名称" align="center" prop="deviceId" />-->
-            <!--          <el-table-column label="资料分类" align="center" prop="classId" />-->
             <el-table-column label="文件名称" align="center" prop="filename" />
             <el-table-column label="文件类型" align="center" prop="fileType" />
+            <el-table-column label="文件大小" align="center" prop="fileSize" />
             <el-table-column label="查看预览" align="center" prop="filePath" >
               <template #default="scope">
                 <el-button link type="primary" @click="openWeb(scope.row.filePath)"> <Icon size="19" icon="ep:view"  /> </el-button>
@@ -173,7 +172,7 @@ const queryParams = reactive({
 const formData = ref({
   id: undefined,
   deviceId: undefined,
-  orgId: undefined,
+  deptId: undefined,
   filename: undefined,
   fileType: undefined,
   filePath: undefined,
@@ -299,10 +298,9 @@ onMounted(async () => {
 
 .right-tree {
   flex: 1;
-  background: #fff;
   height: 100%;
   overflow: auto;
-  margin-left: 5px;
+  margin-left: 15px;
 }
 
 .divider-tree {

+ 1 - 1
src/views/system/user/DeptTree.vue

@@ -53,7 +53,7 @@ const handleRightClick = (event, { node, data }) => {
   menuX.value = event.clientX;
   menuY.value = event.clientY;
   selectedNode = data; // 存储当前操作的节点数据 ‌:ml-citation{ref="7" data="citationList"}
-  menuVisible.value = true;
+  //menuVisible.value = true;
 };
 
 const handleMenuClick = (action) => {