yanghao 1 zi în urmă
părinte
comite
4f9e5cf689

+ 1 - 1
.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径  http://192.168.188.79:48080  https://iot.deepoil.cc  http://172.26.0.56:48080
-VITE_BASE_URL='https://iot.deepoil.cc'
+VITE_BASE_URL='http://172.26.0.56:48080'
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

+ 28 - 0
src/api/pms/qhse/index.ts

@@ -300,6 +300,34 @@ export const IotHiddenApi = {
   }
 }
 
+// 隐患排查分类
+export const IotHiddenTypeApi = {
+  // 创建隐患排查分类
+  createHiddenType: async (data) => {
+    return await request.post({ url: `/rq/iot-hazard-type/create`, data })
+  },
+  // 删除隐患排查分类
+  deleteHiddenType: async (id) => {
+    return await request.delete({ url: `/rq/iot-hazard-type/delete?id=${id}` })
+  },
+  // 修改隐患排查分类
+  updateHiddenType: async (data) => {
+    return await request.put({ url: `/rq/iot-hazard-type/update`, data })
+  },
+  // 获取隐患排查分类
+  getHiddenType: async (params) => {
+    return await request.get({ url: `/rq/iot-hazard-type/page`, params })
+  },
+  // 获取上级分类
+  getParentCategory: async () => {
+    return await request.get({ url: `/rq/iot-hazard-type/simple-list` })
+  },
+  // 查询分类详情
+  getHiddenClassify: async (id: number) => {
+    return await request.get({ url: `/rq/iot-hazard-type/get?id=` + id })
+  }
+}
+
 // SOC数据源分析
 export const IotSocApi = {
   // 获得SOC数据源分析分页

+ 12 - 22
src/views/pms/device/completeSet/DeviceCompleteSet.vue

@@ -10,8 +10,8 @@
           :model="queryParams"
           ref="queryFormRef"
           :inline="true"
-          label-width="68px"
-        >
+          @submit.prevent
+          label-width="68px">
           <!-- <el-form-item label="部门名称" prop="deptName" style="margin-left: 20px">
             <el-input
               v-model="queryParams.deptName"
@@ -27,8 +27,7 @@
               placeholder="请输入成套名称"
               clearable
               @keyup.enter="handleQuery"
-              class="!w-200px"
-            />
+              class="!w-200px" />
           </el-form-item>
           <el-form-item>
             <el-button @click="handleAdd" type="primary"
@@ -89,8 +88,7 @@
             :label="t('devicePerson.operation')"
             align="center"
             min-width="120px"
-            action
-          >
+            action>
             <template #default="scope">
               <el-button link type="primary" @click="handleEdit(scope.row)"> 编辑 </el-button>
               <el-button link type="danger" @click="handleDelete(scope.row.id)"> 删除 </el-button>
@@ -102,8 +100,7 @@
           :total="total"
           v-model:page="queryParams.pageNo"
           v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
+          @pagination="getList" />
       </ContentWrap>
     </el-col>
   </el-row>
@@ -129,14 +126,12 @@
               v-model="formData.type"
               placeholder="请选择成套类型"
               clearable
-              class="!w-240px"
-            >
+              class="!w-240px">
               <el-option
                 v-for="dict in getStrDictOptions(DICT_TYPE.DEVICE_GROUP_TYPE)"
                 :key="dict.value"
                 :label="dict.label"
-                :value="dict.value"
-              />
+                :value="dict.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -151,8 +146,7 @@
               node-key="id"
               filterable
               placeholder="请选择所在部门"
-              @change="handleDeptChange"
-            />
+              @change="handleDeptChange" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -164,8 +158,7 @@
               v-model="formData.remark"
               type="textarea"
               placeholder="请输入描述"
-              :rows="2"
-            />
+              :rows="2" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -182,8 +175,7 @@
                 filterable
                 :filter-method="filterDeviceMethod"
                 filter-placeholder="请输入设备名称"
-                @change="rightDeviceChange"
-              >
+                @change="rightDeviceChange">
                 <template #left-empty>
                   <el-empty :image-size="60" :description="isEdit ? '加载中...' : '请选择设备'" />
                 </template>
@@ -204,14 +196,12 @@
               placeholder="请选择主设备"
               clearable
               filterable
-              @change="setMainDevice"
-            >
+              @change="setMainDevice">
               <el-option
                 v-for="device in selectedDevices"
                 :key="device.id"
                 :label="device.label"
-                :value="device.id"
-              />
+                :value="device.id" />
             </el-select>
           </el-form-item>
         </el-col>

+ 8 - 14
src/views/pms/monitor/index.vue

@@ -10,16 +10,15 @@
           :model="queryParams"
           ref="queryFormRef"
           :inline="true"
-          label-width="68px"
-        >
+          @submit.prevent
+          label-width="68px">
           <el-form-item label="成套名称" prop="name">
             <el-input
               v-model="queryParams.name"
               placeholder="请输入成套名称"
               clearable
               @keyup.enter="handleQuery"
-              class="!w-200px"
-            />
+              class="!w-200px" />
           </el-form-item>
           <el-form-item>
             <el-button @click="handleQuery"
@@ -43,8 +42,7 @@
               :sm="12"
               :md="8"
               :lg="6"
-              class="mt-2"
-            >
+              class="mt-2">
               <el-card shadow="hover" class="device-card hhh rounded-sm">
                 <div class="card-header">
                   <div class="flex justify-between w-full">
@@ -55,8 +53,7 @@
                     <el-tag
                       :type="getOnlineStatusTagType(item.ifOnline)"
                       size="small"
-                      class="status-tag"
-                    >
+                      class="status-tag">
                       {{ item.ifOnline ? '在线' : '离线' }}
                     </el-tag>
                   </div>
@@ -69,13 +66,11 @@
                       <el-image
                         v-if="item.type === '1'"
                         :src="img1"
-                        style="width: 30px; height: 30px; margin-left: 40px"
-                      />
+                        style="width: 30px; height: 30px; margin-left: 40px" />
                       <el-image
                         v-else
                         :src="img2"
-                        style="width: 40px; height: 40px; margin-left: 40px"
-                      />
+                        style="width: 40px; height: 40px; margin-left: 40px" />
                     </span>
                   </div>
                   <div class="card-row"
@@ -113,8 +108,7 @@
               :total="total"
               v-model:page="queryParams.pageNo"
               v-model:limit="queryParams.pageSize"
-              @pagination="getList"
-            />
+              @pagination="getList" />
           </div>
         </div>
       </ContentWrap>

+ 153 - 0
src/views/pms/qhse/hiddenClass/hiddenClassifyForm.vue

@@ -0,0 +1,153 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px">
+      <el-form-item label="上级分类" prop="parentId">
+        <el-tree-select
+          v-model="formData.parentId"
+          :data="deptTree"
+          :props="defaultProps"
+          check-strictly
+          placeholder="请选择上级分类"
+          value-key="id"
+          :default-expanded-keys="firstLevelKeys" />
+      </el-form-item>
+      <el-form-item label="分类名称" prop="name">
+        <lang-input v-model="formData.name" placeholder="请输入分类名称" />
+      </el-form-item>
+
+      <el-form-item label="显示排序" prop="sort">
+        <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status" v-if="formType === 'update'">
+        <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-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button 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 { defaultProps, handleTree } from '@/utils/tree'
+import { IotHiddenTypeApi } from '@/api/pms/qhse/index'
+// import * as UserApi from '@/api/system/user'
+import { CommonStatusEnum } from '@/utils/constants'
+import { FormRules } from 'element-plus'
+
+defineOptions({ name: 'IotProductClassifyForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
+const formType = ref('') // 表单的类型:create - 新增;update - 修改
+const formData = ref({
+  id: undefined,
+  code: undefined,
+  parentId: undefined,
+  name: undefined,
+  sort: undefined,
+  status: CommonStatusEnum.ENABLE
+})
+const formRules = reactive<FormRules>({
+  parentId: [{ required: true, message: '上级分类不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const deptTree = ref() // 树形结构
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number, parentId: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  formData.value.sort = 0
+  formData.value.parentId = parentId
+  // 修改时,设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await IotHiddenTypeApi.getHiddenClassify(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 获得分类树
+  await getTree()
+}
+defineExpose({ open }) // 提供 open 方法,用于打开弹窗
+
+/** 提交表单 */
+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 IotHiddenTypeApi.createHiddenType(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await IotHiddenTypeApi.updateHiddenType(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    title: '',
+    parentId: undefined,
+    name: undefined,
+    sort: undefined,
+    leaderUserId: undefined,
+    phone: undefined,
+    email: undefined,
+    status: CommonStatusEnum.ENABLE
+  }
+  formRef.value?.resetFields()
+}
+
+const firstLevelKeys = ref([])
+/** 获得分类树 */
+const getTree = async () => {
+  deptTree.value = []
+  const data = await IotHiddenTypeApi.getParentCategory()
+  let dept: Tree = { id: 0, name: '性质', children: [] }
+  dept.children = handleTree(data)
+  deptTree.value.push(dept)
+  firstLevelKeys.value = deptTree.value.map((node) => node.id)
+}
+</script>

+ 189 - 1
src/views/pms/qhse/hiddenClass/index.vue

@@ -1,3 +1,191 @@
 <template>
-  <div>分类</div>
+  <!-- 搜索工作栏 -->
+  <div class="bg-white px-2 py-2 rounded-sm">
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px">
+      <el-form-item label="分类名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          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="['rq:iot-soc-source: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>
+  </div>
+
+  <!-- 列表 -->
+  <ContentWrap style="border: none; margin-top: 20px">
+    <zm-table
+      :loading="loading"
+      :data="list"
+      row-key="id"
+      :default-expand-all="isExpandAll"
+      v-if="refreshTable"
+      @row-click="handleClick">
+      <zm-table-column prop="name" label="分类名称" :show-overflow-tooltip="true" align="left" />
+      <!--      <el-table-column prop="code" label="分类编码" />-->
+      <zm-table-column prop="sort" label="排序" width="90" />
+      <zm-table-column prop="status" label="状态" width="90" align="center">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </zm-table-column>
+      <zm-table-column prop="remark" label="备注" />
+      <zm-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter" />
+      <zm-table-column label="操作" align="center" action fixed="right" width="120">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['rq:iot-soc-source:update']">
+            修改
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['rq:iot-soc-source:delete']">
+            删除
+          </el-button>
+        </template>
+      </zm-table-column>
+    </zm-table>
+  </ContentWrap>
+
+  <!-- 表单弹窗:添加/修改 -->
+  <ProductClassifyForm 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 { IotHiddenTypeApi } from '@/api/pms/qhse/index'
+import ProductClassifyForm from './hiddenClassifyForm.vue'
+
+defineOptions({ name: 'IotProductClassify' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref() // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  name: undefined,
+  status: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const isExpandAll = ref(true) // 是否展开,默认全部展开
+const refreshTable = ref(true) // 重新渲染表格状态
+const parentId = ref('')
+const handleClick = (node: {}) => {
+  parentId.value = node.id
+}
+/** 查询分类列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await IotHiddenTypeApi.getHiddenType(queryParams)
+    list.value = handleTree(data)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = () => {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  nextTick(() => {
+    refreshTable.value = true
+  })
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryParams.pageNo = 1
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number, parent: number) => {
+  parent = parentId.value
+  formRef.value.open(type, id, parent)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await IotHiddenTypeApi.deleteHiddenType(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 获取用户列表
+  //userList.value = await UserApi.getSimpleUserList()
+})
+</script>
+<style scoped>
+/* 全局样式或 scoped 穿透 */
+:deep(.el-table__body tr) {
+  cursor: pointer; /* 手型光标 */
+}
+
+:deep(.el-table__body tr:hover) {
+  cursor: pointer;
+}
+</style>