新增mars岗位菜单 修复地图参数删除操作

src/api/basic/mapconfig/index.ts

@@ -38,9 +38,8 @@ export const updateIsMap = async (data: MapVO) => {
 }
 
 // 删除地图参数配置
-export const deleteIsMapByIds = async (id: number) => {
-  return await request.post({
-    url: '/iscs/map/deleteMapList',
-    params: { ids: id }
+export const deleteIsMapByIds = async (ids) => {
+  return await request.delete({
+    url: '/iscs/map/deleteMapList?ids=' + ids,
   })
 }

src/api/system/marsdept/index.ts

@@ -0,0 +1,62 @@
+import request from '@/config/axios'
+
+export interface MarsDeptVO {
+  workstationId?: number
+  workstationCode: string
+  workstationName: string
+  enableFlag?: string
+  remark?: string
+  createBy?: string
+  createTime?: Date
+  updateBy?: string
+  updateTime?: Date
+}
+
+export interface PageParam {
+  pageNo: number
+  pageSize: number
+  workstationCode?: string
+  workstationName?: string
+  enableFlag?: string
+}
+
+// 查询玛氏岗位列表
+export const listMarsDept = async (params: PageParam) => {
+  return await request.get({ url: '/iscs/workstation/getWorkstationPage', params })
+}
+
+// 查询玛氏岗位列表（排除节点）
+export const listMarsDeptExcludeChild = async (deptId: number) => {
+  return await request.get({ url: '/system/dept/list/exclude/' + deptId })
+}
+
+// 查询玛氏岗位详细
+export const getMarsDept = async (id: number) => {
+  return await request.get({
+    url: '/iscs/workstation/selectWorkstationById',
+    params: { id: id }
+  })
+}
+
+// 新增玛氏岗位
+export const addMarsDept = async (data: MarsDeptVO) => {
+  return await request.post({ url: '/iscs/workstation/insertWorkstation', data })
+}
+
+// 修改玛氏岗位
+export const updateMarsDept = async (data: MarsDeptVO) => {
+  return await request.put({ url: '/iscs/workstation/updateWorkstation', data })
+}
+
+// 修改玛氏岗位 状态
+export const updateMarsDeptStatus = async (data: MarsDeptVO) => {
+  return await request.post({ url: '/iscs/workstation/updateIsWorkstationStatus', data })
+}
+
+// 删除玛氏岗位
+export const delMarsDept = async (ids: number) => {
+  return await request.delete({
+    url: '/iscs/workstation/deleteWorkstationList',
+    params: { ids: ids }
+  })
+}

src/views/Basicdata/mapconfig/index.vue

@@ -18,15 +18,22 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @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="['iscs:map:create']"
         >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+          <Icon icon="ep:plus" class="mr-5px" />
+          新增
         </el-button>
         <el-button
           type="danger"
@@ -35,7 +42,8 @@
           @click="handleDelete"
           v-hasPermi="['iscs:map:delete']"
         >
-          <Icon icon="ep:delete" class="mr-5px" /> 删除
+          <Icon icon="ep:delete" class="mr-5px" />
+          删除
         </el-button>
       </el-form-item>
     </el-form>
@@ -115,7 +123,6 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as MapConfigApi from '@/api/basic/mapconfig'
 import MapConfigForm from './MapConfigForm.vue'
 
-
 defineOptions({ name: 'SystemMap' })
 
 const message = useMessage() // 消息弹窗
@@ -124,7 +131,7 @@ const { t } = useI18n() // 国际化
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数据
-const ids = ref<number[]>([]) // 选中的数据
+const ids = ref() // 选中的数据
 const multiple = ref(true) // 非多个禁用
 const queryParams = reactive({
   pageNo: 1,
@@ -164,18 +171,25 @@ const openForm = (type: string, id?: number) => {
 }
 
 /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+const handleDelete = async (id?: number) => {
   try {
     await message.delConfirm()
-    await MapConfigApi.deleteIsMapByIds(id)
+    // 类型守卫处理
+    const realId = id instanceof PointerEvent
+      ? ids.value
+      : id || ids.value;
+    await MapConfigApi.deleteIsMapByIds(realId)
     message.success(t('common.delSuccess'))
     await getList()
-  } catch {}
+  } catch (error) {
+    console.error('删除失败:', error)
+    message.error(t('common.delFailed'))
+  }
 }
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: any[]) => {
-  ids.value = selection.map(item => item.id)
+  ids.value = selection.map((item) => item.id)
   multiple.value = !selection.length
 }
 

src/views/system/marsdept/MarsForm.vue

@@ -0,0 +1,147 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+    >
+      <el-form-item label="上级岗位" prop="parentId" v-if="formData.parentId !== 0">
+        <el-tree-select
+          v-model="formData.parentId"
+          :data="deptOptions"
+          :props="{ value: 'workstationId', label: 'workstationName', children: 'children' }"
+          placeholder="请选择上级岗位"
+          clearable
+          class="!w-full"
+        />
+      </el-form-item>
+      <el-form-item label="岗位名称" prop="workstationName">
+        <el-input v-model="formData.workstationName" placeholder="请输入岗位名称" />
+      </el-form-item>
+      <el-form-item label="排序" prop="orderNum">
+        <el-input-number v-model="formData.orderNum" :min="0" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="formData.status" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import { handleTree } from '@/utils/tree'
+import * as MarsApi from '@/api/system/marsdept'
+
+defineOptions({ name: 'SystemMarsForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const deptOptions = ref([]) // 岗位树选项
+const formData = ref({
+  workstationId: undefined,
+  parentId: 0,
+  workstationName: '',
+  orderNum: 0,
+  status: CommonStatusEnum.ENABLE
+})
+const formRules = reactive({
+  workstationName: [{ required: true, message: '岗位名称不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number, parentId?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+
+  // 设置父级ID
+  if (parentId) {
+    formData.value.parentId = parentId
+  }
+
+  // 获取岗位树选项
+  await getDeptOptions()
+
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await MarsApi.getMarsDept(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 获取岗位树选项 */
+const getDeptOptions = async () => {
+  try {
+    const data = await MarsApi.listMarsDept({ current: 1, size: -1 })
+    deptOptions.value = handleTree(data.data.records, 'workstationId', 'parentId')
+  } catch (error) {
+    console.error('获取岗位树选项失败:', error)
+  }
+}
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value
+    if (formType.value === 'create') {
+      await MarsApi.addMarsDept(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MarsApi.updateMarsDept(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    workstationId: undefined,
+    parentId: 0,
+    workstationName: '',
+    orderNum: 0,
+    status: CommonStatusEnum.ENABLE
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/system/marsdept/index.vue

@@ -0,0 +1,219 @@
+<template>
+  <!-- 搜索工作栏 -->
+  <ContentWrap>
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="岗位名称" prop="workstationName">
+        <el-input
+          v-model="queryParams.workstationName"
+          placeholder="请输入岗位名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="岗位状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择岗位状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['iscs:workstation:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="danger" plain @click="toggleExpandAll">
+          <Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      row-key="workstationId"
+      :default-expand-all="isExpandAll"
+      v-if="refreshTable"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column prop="workstationId" label="岗位编号" width="130" />
+      <el-table-column prop="workstationName" label="岗位名称" width="260" />
+      <el-table-column prop="orderNum" label="排序" width="200" />
+      <el-table-column prop="status" label="状态" width="150">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="workstationType" label="岗位人员" width="100">
+        <template #default="scope">
+          <el-button link type="primary" @click="handleLookWorkStation(scope.row)">
+            查看
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.workstationId)"
+            v-hasPermi="['iscs:workstation:update']"
+          >
+            修改
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('create', undefined, scope.row.workstationId)"
+            v-hasPermi="['iscs:workstation:create']"
+          >
+            新增
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.workstationId)"
+            v-hasPermi="['iscs:workstation:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <MarsForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { handleTree } from '@/utils/tree'
+import * as MarsApi from '@/api/system/marsdept/index'
+import MarsForm from './MarsForm.vue'
+
+defineOptions({ name: 'SystemMars' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由
+const router = useRouter() // 路由
+
+const loading = ref(true) // 列表的加载中
+const list = ref() // 列表的数据
+const queryParams = reactive({
+  current: 1,
+  size: -1,
+  workstationName: undefined,
+  status: undefined,
+  userId: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const isExpandAll = ref(true) // 是否展开，默认全部展开
+const refreshTable = ref(true) // 重新渲染表格状态
+
+/** 查询岗位列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await MarsApi.listMarsDept(queryParams)
+    list.value = handleTree(data.list)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = () => {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  nextTick(() => {
+    refreshTable.value = true
+  })
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  if (route.query.userId) {
+    queryParams.userId = route.query.userId
+  } else {
+    queryParams.userId = undefined
+  }
+  queryParams.workstationName = undefined
+  queryParams.status = undefined
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number, parentId?: number) => {
+  formRef.value.open(type, id, parentId)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MarsApi.delMarsDept(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 查看岗位人员 */
+const handleLookWorkStation = (row: any) => {
+  router.push(`/user/user?workstationId=${row.workstationId}`)
+}
+
+// 监听路由参数变化 - 移到最后，确保所有函数都已定义
+watch(() => route.query.userId, (val) => {
+  queryParams.userId = val
+  getList()
+}, { immediate: true })
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+})
+</script>