cpms优化

ruoyi-admin/src/main/java/com/ruoyi/project/sems/controller/TSpecdevAssetController.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/controller/TSpecdevAssetController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.sems.controller;
+package com.ruoyi.project.asset.controller;
 
  import com.alibaba.fastjson2.JSON;
  import com.ruoyi.common.annotation.Log;
@@ -11,8 +11,8 @@ package com.ruoyi.project.sems.controller;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.sems.domain.TSpecdevAsset;
-import com.ruoyi.project.sems.service.ITSpecdevAssetService;
+import com.ruoyi.project.asset.domain.TSpecdevAsset;
+import com.ruoyi.project.asset.service.ITSpecdevAssetService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -21,8 +21,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
+ import java.io.IOException;
 import java.io.OutputStream;
  import java.nio.file.Files;
  import java.nio.file.Paths;

ruoyi-admin/src/main/java/com/ruoyi/project/sems/controller/TSpecdevFixedAssetController.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/controller/TSpecdevFixedAssetController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.sems.controller;
+package com.ruoyi.project.asset.controller;
 
  import com.alibaba.fastjson2.JSON;
  import com.ruoyi.common.annotation.Log;
@@ -9,8 +9,8 @@ package com.ruoyi.project.sems.controller;
  import com.ruoyi.common.enums.BusinessType;
  import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.sems.domain.TSpecdevFixedAsset;
-import com.ruoyi.project.sems.service.ITSpecdevFixedAssetService;
+import com.ruoyi.project.asset.domain.TSpecdevFixedAsset;
+import com.ruoyi.project.asset.service.ITSpecdevFixedAssetService;
  import com.ruoyi.system.service.ISysDictTypeService;
  import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;

ruoyi-admin/src/main/java/com/ruoyi/project/sems/controller/TSpecdevMainController.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/controller/TSpecdevMainController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.sems.controller;
+package com.ruoyi.project.asset.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.annotation.Log;
@@ -9,10 +9,10 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.sems.domain.TSpecdevMain;
+import com.ruoyi.project.asset.domain.TSpecdevMain;
 import com.ruoyi.project.sems.service.ITSpecdevAqfService;
-import com.ruoyi.project.sems.service.ITSpecdevFixedAssetService;
-import com.ruoyi.project.sems.service.ITSpecdevMainService;
+import com.ruoyi.project.asset.service.ITSpecdevFixedAssetService;
+import com.ruoyi.project.asset.service.ITSpecdevMainService;
 import com.ruoyi.system.service.ISysDictTypeService;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;

ruoyi-admin/src/main/java/com/ruoyi/project/sems/controller/TSpecdevTypemgrController.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/controller/TSpecdevTypemgrController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.sems.controller;
+package com.ruoyi.project.asset.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -9,8 +9,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.sems.domain.TSpecdevTypemgr;
-import com.ruoyi.project.sems.service.ITSpecdevTypemgrService;
+import com.ruoyi.project.asset.domain.TSpecdevTypemgr;
+import com.ruoyi.project.asset.service.ITSpecdevTypemgrService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

ruoyi-admin/src/main/java/com/ruoyi/project/sems/domain/TSpecdevAsset.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/domain/TSpecdevAsset.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.sems.domain;
+package com.ruoyi.project.asset.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;

ruoyi-admin/src/main/java/com/ruoyi/project/sems/domain/TSpecdevFixedAsset.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/domain/TSpecdevFixedAsset.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.sems.domain;
+package com.ruoyi.project.asset.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;

ruoyi-admin/src/main/java/com/ruoyi/project/sems/domain/TSpecdevMain.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/domain/TSpecdevMain.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.sems.domain;
+package com.ruoyi.project.asset.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;

ruoyi-admin/src/main/java/com/ruoyi/project/sems/domain/TSpecdevTypemgr.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/domain/TSpecdevTypemgr.java

@@ -1,4 +1,4 @@
-package com.ruoyi.project.sems.domain;
+package com.ruoyi.project.asset.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

ruoyi-admin/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevAssetMapper.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/mapper/TSpecdevAssetMapper.java

@@ -1,9 +1,9 @@
-package com.ruoyi.project.sems.mapper;
+package com.ruoyi.project.asset.mapper;
 
 import java.util.List;
 
 import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.project.sems.domain.TSpecdevAsset;
+import com.ruoyi.project.asset.domain.TSpecdevAsset;
 
 /**
  * 资产与运营Mapper接口

ruoyi-admin/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevFixedAssetMapper.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/mapper/TSpecdevFixedAssetMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.project.sems.mapper;
+package com.ruoyi.project.asset.mapper;
 
 import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.project.sems.domain.TSpecdevFixedAsset;
+import com.ruoyi.project.asset.domain.TSpecdevFixedAsset;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevMainMapper.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/mapper/TSpecdevMainMapper.java

@@ -1,9 +1,9 @@
-package com.ruoyi.project.sems.mapper;
+package com.ruoyi.project.asset.mapper;
 
 import java.util.List;
 
 import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.project.sems.domain.TSpecdevMain;
+import com.ruoyi.project.asset.domain.TSpecdevMain;
 
 /**
  * 设备总Mapper接口

ruoyi-admin/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevTypemgrMapper.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/mapper/TSpecdevTypemgrMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.project.sems.mapper;
+package com.ruoyi.project.asset.mapper;
 
 import java.util.List;
-import com.ruoyi.project.sems.domain.TSpecdevTypemgr;
+import com.ruoyi.project.asset.domain.TSpecdevTypemgr;
 
 /**
  * 设备类型管理Mapper接口

ruoyi-admin/src/main/java/com/ruoyi/project/sems/service/ITSpecdevAssetService.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/service/ITSpecdevAssetService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.project.sems.service;
+package com.ruoyi.project.asset.service;
 
 import java.util.List;
-import com.ruoyi.project.sems.domain.TSpecdevAsset;
+import com.ruoyi.project.asset.domain.TSpecdevAsset;
 
 /**
  * 资产与运营Service接口

ruoyi-admin/src/main/java/com/ruoyi/project/sems/service/ITSpecdevFixedAssetService.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/service/ITSpecdevFixedAssetService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.project.sems.service;
+package com.ruoyi.project.asset.service;
 
-import com.ruoyi.project.sems.domain.TSpecdevFixedAsset;
+import com.ruoyi.project.asset.domain.TSpecdevFixedAsset;
 
 import java.util.List;
 

ruoyi-admin/src/main/java/com/ruoyi/project/sems/service/ITSpecdevMainService.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/service/ITSpecdevMainService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.project.sems.service;
+package com.ruoyi.project.asset.service;
 
 import java.util.List;
-import com.ruoyi.project.sems.domain.TSpecdevMain;
+import com.ruoyi.project.asset.domain.TSpecdevMain;
 
 /**
  * 设备总Service接口

ruoyi-admin/src/main/java/com/ruoyi/project/sems/service/ITSpecdevTypemgrService.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/service/ITSpecdevTypemgrService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.project.sems.service;
+package com.ruoyi.project.asset.service;
 
 import java.util.List;
-import com.ruoyi.project.sems.domain.TSpecdevTypemgr;
+import com.ruoyi.project.asset.domain.TSpecdevTypemgr;
 
 /**
  * 设备类型管理Service接口

ruoyi-admin/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevAssetServiceImpl.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/service/impl/TSpecdevAssetServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.project.sems.service.impl;
+package com.ruoyi.project.asset.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.sems.mapper.TSpecdevAssetMapper;
-import com.ruoyi.project.sems.domain.TSpecdevAsset;
-import com.ruoyi.project.sems.service.ITSpecdevAssetService;
+import com.ruoyi.project.asset.mapper.TSpecdevAssetMapper;
+import com.ruoyi.project.asset.domain.TSpecdevAsset;
+import com.ruoyi.project.asset.service.ITSpecdevAssetService;
 
 /**
  * 资产与运营Service业务层处理

ruoyi-admin/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevFixedAssetServiceImpl.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/service/impl/TSpecdevFixedAssetServiceImpl.java

@@ -1,8 +1,8 @@
-package com.ruoyi.project.sems.service.impl;
+package com.ruoyi.project.asset.service.impl;
 
-import com.ruoyi.project.sems.domain.TSpecdevFixedAsset;
-import com.ruoyi.project.sems.mapper.TSpecdevFixedAssetMapper;
-import com.ruoyi.project.sems.service.ITSpecdevFixedAssetService;
+import com.ruoyi.project.asset.domain.TSpecdevFixedAsset;
+import com.ruoyi.project.asset.mapper.TSpecdevFixedAssetMapper;
+import com.ruoyi.project.asset.service.ITSpecdevFixedAssetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-admin/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevMainServiceImpl.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/service/impl/TSpecdevMainServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.project.sems.service.impl;
+package com.ruoyi.project.asset.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.sems.mapper.TSpecdevMainMapper;
-import com.ruoyi.project.sems.domain.TSpecdevMain;
-import com.ruoyi.project.sems.service.ITSpecdevMainService;
+import com.ruoyi.project.asset.mapper.TSpecdevMainMapper;
+import com.ruoyi.project.asset.domain.TSpecdevMain;
+import com.ruoyi.project.asset.service.ITSpecdevMainService;
 
 /**
  * 设备总Service业务层处理

ruoyi-admin/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevTypemgrServiceImpl.java → ruoyi-admin/src/main/java/com/ruoyi/project/asset/service/impl/TSpecdevTypemgrServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.project.sems.service.impl;
+package com.ruoyi.project.asset.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.sems.mapper.TSpecdevTypemgrMapper;
-import com.ruoyi.project.sems.domain.TSpecdevTypemgr;
-import com.ruoyi.project.sems.service.ITSpecdevTypemgrService;
+import com.ruoyi.project.asset.mapper.TSpecdevTypemgrMapper;
+import com.ruoyi.project.asset.domain.TSpecdevTypemgr;
+import com.ruoyi.project.asset.service.ITSpecdevTypemgrService;
 
 /**
  * 设备类型管理Service业务层处理

ruoyi-admin/src/main/java/com/ruoyi/project/sems/domain/TSpecdevAqf.java

@@ -18,29 +18,6 @@ public class TSpecdevAqf extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    public TSpecdevAqf() {
-    }
-
-    public TSpecdevAqf(TSpecdevMain main) {
-        this.mainId=main.getId();
-        this.devno = main.getDevno();
-        this.pidNo = main.getPidNo();
-        this.manufacturer = main.getManufacturer();
-        this.model = main.getModel();
-        this.devName = main.getDevName();
-        this.devEnname = main.getDevEnname();
-        this.isPid = main.getIsPid();
-        this.installPosition = main.getInstallPosition();
-        this.funcPosition = main.getFuncPosition();
-        this.assetNo = main.getAssetNo();
-        this.securityRelevant = main.getSecurityRelevant();
-        this.securityRelevantFrom = main.getSecurityRelevantFrom();
-        this.productionYear = main.getProductionYear();
-        this.mainSpecifications = main.getMainSpecifications();
-        this.dataPlate = main.getDataPlate();
-        this.status = Long.valueOf(main.getAssetStatus());
-    }
-
     /** 唯一标识ID */
     private Long id;
 

ruoyi-admin/src/main/resources/mapper/sems/TSpecdevAssetMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.sems.mapper.TSpecdevAssetMapper">
+<mapper namespace="com.ruoyi.project.asset.mapper.TSpecdevAssetMapper">
 
     <resultMap type="TSpecdevAsset" id="TSpecdevAssetResult">
         <result property="id"    column="id"    />

ruoyi-admin/src/main/resources/mapper/sems/TSpecdevFixedAssetMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.sems.mapper.TSpecdevFixedAssetMapper">
+<mapper namespace="com.ruoyi.project.asset.mapper.TSpecdevFixedAssetMapper">
 
     <resultMap type="TSpecdevFixedAsset" id="TSpecdevFixedAssetResult">
         <result property="id"    column="id"    />

ruoyi-admin/src/main/resources/mapper/sems/TSpecdevMainMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.sems.mapper.TSpecdevMainMapper">
+<mapper namespace="com.ruoyi.project.asset.mapper.TSpecdevMainMapper">
 
     <resultMap type="TSpecdevMain" id="TSpecdevMainResult">
         <result property="id"    column="id"    />

ruoyi-admin/src/main/resources/mapper/sems/TSpecdevTypemgrMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.sems.mapper.TSpecdevTypemgrMapper">
+<mapper namespace="com.ruoyi.project.asset.mapper.TSpecdevTypemgrMapper">
 
     <resultMap type="TSpecdevTypemgr" id="TSpecdevTypemgrResult">
         <result property="id"    column="id"    />

ruoyi-ui/src/api/asset/main.js

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询设备总列表
+export function listMain(query) {
+  return request({
+    url: '/sems/main/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备总详细
+export function getMain(id) {
+  return request({
+    url: '/sems/main/' + id,
+    method: 'get'
+  })
+}
+
+// 新增设备总
+export function addMain(data) {
+  return request({
+    url: '/sems/main',
+    method: 'post',
+    data: data
+  })
+}
+
+export function syncAllDev() {
+  return request({
+    url: '/sems/main/syncAllDev',
+    method: 'post'
+  })
+}
+
+// 修改设备总
+export function updateMain(data) {
+  return request({
+    url: '/sems/main',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备总
+export function delMain(id) {
+  return request({
+    url: '/sems/main/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出设备总
+export function exportMain(query) {
+  return request({
+    url: '/sems/main/export',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/api/asset/typemgr.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询设备类型管理列表
+export function listTypemgr(query) {
+  return request({
+    url: '/sems/typemgr/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备类型管理列表(不分页)
+export function listTypemgrAll(query) {
+  return request({
+    url: '/sems/typemgr/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备类型管理详细
+export function getTypemgr(id) {
+  return request({
+    url: '/sems/typemgr/' + id,
+    method: 'get'
+  })
+}
+
+// 新增设备类型管理
+export function addTypemgr(data) {
+  return request({
+    url: '/sems/typemgr',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备类型管理
+export function updateTypemgr(data) {
+  return request({
+    url: '/sems/typemgr',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备类型管理
+export function delTypemgr(id) {
+  return request({
+    url: '/sems/typemgr/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/asset/fixedAsset/index.vue

@@ -503,7 +503,7 @@ export default {
       // 表单校验
       rules: {
         devName: [
-          {required: true, message: 资产描述 + 不能为空, trigger: "blur"}
+          {required: true, message: '资产描述不能为空', trigger: "blur"}
         ],
       }
     };

ruoyi-ui/src/views/asset/specMain/index.vue

@@ -0,0 +1,805 @@
+<template>
+  <div class="app-container">
+    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px">
+      <el-form-item label="设备中文名" prop="devName">
+        <el-input
+            v-model="queryParams.devName"
+            clearable
+            placeholder="请输入设备中文名"
+            size="small"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备英文名" prop="devEnname">
+        <el-input
+            v-model="queryParams.devEnname"
+            clearable
+            placeholder="请输入设备英文名"
+            size="small"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="资产号" prop="assetNo">
+        <el-input
+            v-model="queryParams.assetNo"
+            clearable
+            placeholder="请输入资产号"
+            size="small"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="型号" prop="model">
+        <el-input
+            v-model="queryParams.model"
+            clearable
+            placeholder="请输入型号"
+            size="small"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="全局搜索" prop="fuzzy">
+        <el-input
+            v-model="queryParams.fuzzy"
+            clearable
+            placeholder="请输入要查询的值"
+            size="small"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            v-hasPermi="['sems:main:add']"
+            icon="el-icon-plus"
+            size="mini"
+            type="primary"
+            @click="handleAdd"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            v-hasPermi="['sems:main:edit']"
+            :disabled="single"
+            icon="el-icon-edit"
+            size="mini"
+            type="success"
+            @click="handleUpdate"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            v-hasPermi="['sems:main:remove']"
+            :disabled="multiple"
+            icon="el-icon-delete"
+            size="mini"
+            type="danger"
+            @click="handleDelete"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            v-hasPermi="['sems:main:edit']"
+            icon="el-icon-upload2"
+            size="mini"
+            type="info"
+            @click="handleImport"
+        >导入
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            v-hasPermi="['sems:main:export']"
+            icon="el-icon-download"
+            size="mini"
+            type="warning"
+            @click="handleExport"
+        >导出
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            v-hasPermi="['sems:main:add']"
+            icon="el-icon-refresh"
+            size="mini"
+            type="danger"
+            @click="syncDev"
+        >同步所有设备
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="mainList" :height="clientHeight" border
+              @selection-change="handleSelectionChange">
+      <el-table-column align="center" fixed="left" type="selection" width="55"/>
+      <el-table-column :index="indexMethod" align="center" fixed="left" label="序号" type="index" width="50"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" fixed="left" label="设备中文名" prop="devName"
+                       width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" fixed="left" label="设备英文名" prop="devEnname"
+                       width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" fixed="left" label="位号" prop="devno"/>
+      <el-table-column :formatter="yseOrNoFormat" :show-overflow-tooltip="true" align="center" label="是否在PID上"
+                       prop="isPid"
+                       width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="P&ID图号/其他图号" prop="pidNo" width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="安装位置" prop="installPosition"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="功能位置" prop="funcPosition"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="资产号" prop="assetNo"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="安全相关" prop="securityRelevant"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="安全相关来自于" prop="securityRelevantFrom"
+                       width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="生产厂家" prop="manufacturer"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="生产年份" prop="productionYear"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="型号" prop="model"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="主要规格参数" prop="mainSpecifications"
+                       width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="设备铭牌" prop="dataPlate"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="维修风险" prop="maintenanceRisk"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="生产风险" prop="productionRisk"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="设备分级" prop="devGrade"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="设备来自" prop="devFrom"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="设备类型（一级）" prop="devType1" width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="设备类型（二级）" prop="devType2" width="150"/>
+      <el-table-column :formatter="devStatusFormat" :show-overflow-tooltip="true" align="center" label="资产状态"
+                       prop="assetStatus"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="资料完整度" prop="dataIntegrity"
+                       width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="PM状态" prop="pmStatus"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="资产剩余寿命评估"
+                       prop="assetResidueLifeAssess"
+                       width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="资产整体状态" prop="overallAssetStatus"
+                       width="150"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="是否删除" prop="delFlag"
+                       width="100" :formatter="yseOrNoFormat"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="备注" prop="remarks"/>
+      <el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作" width="140">
+        <template slot-scope="scope">
+          <el-button
+              v-hasPermi="['sems:main:edit']"
+              icon="el-icon-edit"
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row)"
+          >修改
+          </el-button>
+          <el-button
+              v-hasPermi="['sems:main:remove']"
+              icon="el-icon-delete"
+              size="mini"
+              type="text"
+              @click="handleDelete(scope.row)"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+        v-show="total>0"
+        :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.pageNum"
+        :total="total"
+        @pagination="getList"
+    />
+
+    <!-- 添加或修改设备总对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="1400px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备中文名" prop="devName">
+              <el-input v-model="form.devName" placeholder="请输入设备中文名"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备英文名" prop="devEnname">
+              <el-input v-model="form.devEnname" placeholder="请输入设备英文名"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="位号" prop="devno">
+              <el-input v-model="form.devno" placeholder="请输入位号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否在PID上" prop="isPid">
+              <el-radio-group v-model="form.isPid" size="small">
+                <el-radio label="1" size="large">是</el-radio>
+                <el-radio label="0" size="large">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="P&ID图号/其他图号" prop="pidNo">
+              <el-input v-model="form.pidNo" placeholder="请输入P&ID图号/其他图号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装位置" prop="installPosition">
+              <el-input v-model="form.installPosition" placeholder="请输入安装位置"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="功能位置" prop="funcPosition">
+              <el-input v-model="form.funcPosition" placeholder="请输入功能位置"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="资产号" prop="assetNo">
+              <el-input v-model="form.assetNo" placeholder="请输入资产号"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="安全相关" prop="securityRelevant">
+              <el-input v-model="form.securityRelevant" placeholder="请输入安全相关"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安全相关来自于" prop="securityRelevantFrom">
+              <el-input v-model="form.securityRelevantFrom" placeholder="请输入安全相关来自于"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="生产厂家" prop="manufacturer">
+              <el-input v-model="form.manufacturer" placeholder="请输入生产厂家"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="生产年份" prop="productionYear">
+              <el-input v-model="form.productionYear" placeholder="请输入生产年份"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="型号" prop="model">
+              <el-input v-model="form.model" placeholder="请输入型号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="主要规格参数" prop="mainSpecifications">
+              <el-input v-model="form.mainSpecifications" placeholder="请输入主要规格参数"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备铭牌" prop="dataPlate">
+              <el-input v-model="form.dataPlate" placeholder="请输入设备铭牌"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="维修风险" prop="maintenanceRisk">
+              <el-input v-model="form.maintenanceRisk" placeholder="请输入维修风险"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="生产风险" prop="productionRisk">
+              <el-input v-model="form.productionRisk" placeholder="请输入生产风险"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备来自" prop="devFrom">
+              <el-input v-model="form.devFrom" placeholder="请输入设备来自"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备类型（一级）" prop="devType1">
+              <el-select v-model="form.devType1" placeholder="请选择设备类型" clearable
+                         style="width: 100%" @change="getSubType">
+                <el-option
+                    v-for="dict in devTypeOptions"
+                    :key="dict.devType"
+                    :label="dict.devType"
+                    :value="dict.devType"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备类型（二级）" prop="devType2">
+              <el-select v-model="form.devType2" placeholder="请选择设备类型" clearable
+                         style="width: 100%">
+                <el-option
+                    v-for="dict in devType2Options"
+                    :key="dict.devType"
+                    :label="dict.devType"
+                    :value="dict.devType"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="资料完整度" prop="dataIntegrity">
+              <el-input v-model="form.dataIntegrity" placeholder="请输入资料完整度"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="PM状态" prop="pmStatus">
+              <el-input v-model="form.pmStatus" placeholder="请输入PM状态"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="资产剩余寿命评估" prop="assetResidueLifeAssess">
+              <el-input v-model="form.assetResidueLifeAssess" placeholder="请输入资产剩余寿命评估"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="资产整体状态" prop="overallAssetStatus">
+              <el-input v-model="form.overallAssetStatus" placeholder="请输入资产整体状态"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="资产状态" prop="assetStatus">
+              <el-radio-group v-model="form.assetStatus" size="large">
+                <el-radio label="1" size="large">在用</el-radio>
+                <el-radio label="2" size="large">停用</el-radio>
+                <el-radio label="3" size="large">报废</el-radio>
+                <el-radio label="-1" size="large">封存</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model="form.remarks" placeholder="请输入备注"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备分级" prop="devGrade">
+              <el-input v-model="form.devGrade" placeholder="请输入设备分级"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" append-to-body width="400px">
+      <el-upload
+          ref="upload"
+          :action="upload.url + '?updateSupport=' + upload.updateSupport"
+          :auto-upload="false"
+          :disabled="upload.isUploading"
+          :headers="upload.headers"
+          :limit="1"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          accept=".xlsx, .xls"
+          drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div slot="tip" class="el-upload__tip">
+          <!--          <el-checkbox v-model="upload.updateSupport"/>-->
+          <!--          是否更新已经存在的用户数据-->
+          <el-link style="font-size:12px" type="info" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-loading.fullscreen.lock="fullscreenLoading" type="primary" @click="submitFileForm">确 定
+        </el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+      <input :value="upload.type" hidden name="type"/>
+    </form>
+  </div>
+</template>
+
+<script>
+import {addMain, delMain, exportMain, getMain, listMain, syncAllDev, updateMain} from "@/api/asset/main";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {listTypemgrAll} from "@/api/asset/typemgr";
+
+export default {
+  name: "Main",
+  components: {Treeselect},
+  data() {
+    return {
+      devTypeOptions: [],
+      devType2Options: [],
+      yesOrNoOptions: [],
+      devStatusOptions: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 设备总表格数据
+      mainList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight: 300,
+      // 是否显示弹出层
+      open: false,
+      fullscreenLoading: false,
+      // 用户导入参数
+      upload: {
+        downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+        type: "specMain",
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/sems/main/importData"
+      },
+      // 查询参数
+      queryParams: {
+        fuzzy: null,
+        pageNum: 1,
+        pageSize: 20,
+        devName: null,
+        devEnname: null,
+        devno: null,
+        isPid: null,
+        pidNo: null,
+        installPosition: null,
+        funcPosition: null,
+        assetNo: null,
+        securityRelevant: null,
+        securityRelevantFrom: null,
+        manufacturer: null,
+        productionYear: null,
+        model: null,
+        mainSpecifications: null,
+        dataPlate: null,
+        maintenanceRisk: null,
+        productionRisk: null,
+        devGrade: null,
+        devFrom: null,
+        devType1: null,
+        devType2: null,
+        assetStatus: null,
+        dataIntegrity: null,
+        pmStatus: null,
+        assetResidueLifeAssess: null,
+        overallAssetStatus: null,
+        status: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        pidNo: [
+          {required: true, message: 'P&ID图号/其他图号不能为空', trigger: "blur"}
+        ],
+        devno: [
+          {required: true, message: '位号不能为空', trigger: "blur"}
+        ],
+        devType1: [
+          {required: true, message: '设备类型不能为空', trigger: "blur"}
+        ],
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 250
+    })
+    this.getList();
+    this.getTreeselect();
+    this.getDevType1List();
+    this.getDicts("YES_NO").then(response => {
+      this.yesOrNoOptions = response.data;
+    });
+    this.getDicts("spec_dev_status").then(response => {
+      this.devStatusOptions = response.data;
+    });
+  },
+  methods: {
+    getDevType1List() {
+      listTypemgrAll({pid: 0}).then(response => {
+        this.devTypeOptions = response.data;
+      });
+    },
+    getDevType2List(pid) {
+      listTypemgrAll({pid: pid}).then(response => {
+        this.devType2Options = response.data;
+      });
+    },
+    // 是否字典翻译
+    yseOrNoFormat(row, column) {
+      switch (column.property) {
+        case "isPid":
+          return this.selectDictLabel(this.yesOrNoOptions, row.isPid);
+        case "delFlag":
+          return this.selectDictLabel(this.yesOrNoOptions, row.delFlag);
+      }
+    },
+    // 资产状态字典翻译
+    devStatusFormat(row, column) {
+      return this.selectDictLabel(this.devStatusOptions, row.assetStatus);
+    },
+    /** 查询设备总列表 */
+    getList() {
+      this.loading = true;
+      listMain(this.queryParams).then(response => {
+        this.mainList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        devName: null,
+        devEnname: null,
+        devno: null,
+        isPid: null,
+        pidNo: null,
+        installPosition: null,
+        funcPosition: null,
+        assetNo: null,
+        securityRelevant: null,
+        securityRelevantFrom: null,
+        manufacturer: null,
+        productionYear: null,
+        model: null,
+        mainSpecifications: null,
+        dataPlate: null,
+        maintenanceRisk: null,
+        productionRisk: null,
+        devGrade: null,
+        devFrom: null,
+        devType1: null,
+        devType2: null,
+        assetStatus: null,
+        dataIntegrity: null,
+        pmStatus: null,
+        assetResidueLifeAssess: null,
+        overallAssetStatus: null,
+        status: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+      this.devType2Options = [];
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.form.assetStatus = "1";
+      this.open = true;
+      this.title = "添加设备总数据";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMain(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备总数据";
+        for (const item of this.devTypeOptions) {
+          if (item.devType === this.form.devType1)
+            this.getDevType2List(item.id)
+        }
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMain(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMain(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    syncDev() {
+      this.$confirm('是否确认同步所有设备清单?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return syncAllDev();
+      }).then(() => {
+        this.msgSuccess("同步成功");
+        this.getList();
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delMain(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    }
+    ,
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有设备总数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportMain(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    }
+    ,
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    }
+    ,
+    /** 下载模板操作 */
+    importTemplate() {
+      this.$refs['downloadFileForm'].submit()
+    }
+    ,
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    }
+    ,
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.fullscreenLoading = false;
+      if (response.data.length > 0) {
+        let failrow = ''
+        for (let i = 0; i < response.data.length; i++) {
+          failrow += response.data[i] + ','
+        }
+        this.$alert('导入成功条数:' + response.msg + '<br>' + '失败行数:' + failrow, '导入结果', {dangerouslyUseHTMLString: true});
+      } else {
+        this.$alert('导入成功条数:' + response.msg, '导入结果', {dangerouslyUseHTMLString: true});
+      }
+      this.getList();
+    }
+    ,
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+      this.fullscreenLoading = true;
+    }
+    ,
+    getSubType(val) {
+      this.form.devType2 = null;
+      for (const item of this.devTypeOptions) {
+        if (item.devType === val)
+          this.getDevType2List(item.id)
+      }
+    }
+    ,
+    //翻页后继续计算序列值
+    indexMethod(index) {
+      return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + index + 1;
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/asset/typemgr/index.vue

@@ -0,0 +1,335 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="父级设备类型" prop="pid">
+        <el-select v-model="queryParams.pid" placeholder="请选择父级设备类型" clearable>
+          <el-option v-for="item in devTypeList" :key="item.id" :label="item.devType" :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['sems:typemgr:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['sems:typemgr:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['sems:typemgr:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :span-method="mergeMethod" :data="typemgrList"
+              @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="父级设备类型" align="center" prop="pid" :formatter="devTypeFormat"/>
+      <el-table-column label="设备类型" align="center" prop="devType"/>
+      <el-table-column label="备注" align="center" prop="remarks"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['sems:typemgr:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['sems:typemgr:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改设备类型管理对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="设备类型" prop="devType">
+          <el-input v-model="form.devType" placeholder="请输入设备类型"/>
+        </el-form-item>
+        <el-form-item label="上级设备类型" prop="pid">
+          <el-select v-model="form.pid" placeholder="请选择上级设备类型" clearable>
+            <el-option v-for="item in devTypeList" :key="item.id" :label="item.devType" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listTypemgr, getTypemgr, delTypemgr, addTypemgr, updateTypemgr, listTypemgrAll} from "@/api/asset/typemgr";
+
+export default {
+  name: "Typemgr",
+  data() {
+    return {
+      devTypeList: [],
+      // 页面高度
+      clientHeight: 300,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 设备类型管理表格数据
+      typemgrList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        devType: null,
+        pid: null,
+        status: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        devType: [
+          {required: true, message: "主题不能为空", trigger: "change"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDevType1List();
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = (document.body.clientHeight - 80) * 0.8
+    });
+  },
+  methods: {
+    devTypeFormat(row){
+      for(let item of this.devTypeList){
+        if (item.id===row.pid){
+          return item.devType;
+        }else if(row.pid===0){
+          return '设备一级类型'
+        }
+      }
+    },
+    /** 查询设备类型管理列表 */
+    getList() {
+      this.loading = true;
+      listTypemgr(this.queryParams).then(response => {
+        this.typemgrList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        devType: null,
+        pid: null,
+        delFlag: null,
+        status: 0,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    getDevType1List() {
+      listTypemgrAll({pid: 0}).then(response => {
+        this.devTypeList = response.data;
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备类型管理";
+      this.getDevType1List();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTypemgr(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备类型管理";
+        this.getDevType1List();
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTypemgr(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTypemgr(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除数据项？').then(function () {
+        return delTypemgr(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('sems/typemgr/export', {
+        ...this.queryParams
+      }, `typemgr_${new Date().getTime()}.xlsx`)
+    },
+    //合并单元格
+    mergeMethod({row, column, rowIndex, columnIndex}) {
+      // if (columnIndex === 0) {
+      //   const _row = this.setTable(this.unitList).merge[rowIndex];
+      //   const _col = _row > 0 ? 1 : 0;
+      //   return {
+      //     rowspan: _row,
+      //     colspan: _col
+      //   };
+      // }
+      if (columnIndex === 1) {
+        const _row = this.setTable(this.typemgrList).merge[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+    },
+    //单元格整理
+    setTable(tableData) {
+      let spanArr = [],
+        concat = 0;
+      tableData.forEach((item, index) => {
+        if (index === 0) {
+          spanArr.push(1);
+        } else {
+          if (item.pid === tableData[index - 1].pid) {
+            //第一列需合并相同内容的判断条件
+            spanArr[concat] += 1;
+            spanArr.push(0);
+          } else {
+            spanArr.push(1);
+            concat = index;
+          }
+        }
+      });
+      return {
+        merge: spanArr
+      };
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/plant/organization/index.vue

@@ -75,9 +75,7 @@
           <el-descriptions-item label="员工编号">{{ staffData.staffid }}</el-descriptions-item>
           <el-descriptions-item label="员工姓名">{{ staffData.name }}</el-descriptions-item>
           <el-descriptions-item label="性别"></el-descriptions-item>
-          <el-descriptions-item v-hasPermi="['plant:staffmgr:detail']" label="身份证号">{{
-              staffData.idCard
-            }}
+          <el-descriptions-item v-hasPermi="['plant:staffmgr:detail']" label="身份证号">{{ staffData.idCard }}
           </el-descriptions-item>
           <el-descriptions-item label="联系方式">{{ staffData.contact }}</el-descriptions-item>
           <el-descriptions-item label="岗位"></el-descriptions-item>
@@ -177,22 +175,22 @@ export default {
     }
   },
   created() {
-    this.getDicts("ACTUALPOST").then(response => {
+    this.getDicts("actualpost").then(response => {
       this.actualpostOptions = response.data;
     });
-    this.getDicts("STAFF_UNIT").then(response => {
+    this.getDicts("staff_unit").then(response => {
       this.unitOptions = response.data;
     });
-    this.getDicts("TEAM_DIVIDE").then(response => {
+    this.getDicts("team_divide").then(response => {
       this.teamOptions = response.data;
     });
     this.getDicts("sys_user_sex").then(response => {
       this.sexOptions = response.data;
     });
-    this.getDicts("EDUCATION").then(response => {
+    this.getDicts("education").then(response => {
       this.educationOptions = response.data;
     });
-    this.getDicts("SPECIAL_DUTY").then(response => {
+    this.getDicts("special_duty").then(response => {
       this.specialDutyOptions = response.data;
     });
     this.getChartData()