接口合并

ems-ui/src/api/basecfg/emsfacs.js

@@ -10,18 +10,11 @@ export function listFacs(query) {
 }
 
 // 查询能源设施/系统列表
-export function listAllFacs(areaCode) {
+export function listAllFacs(query) {
   return request({
-    url: '/ems/basecfg/emsfacs/listall?refArea=' + areaCode,
-    method: 'get'
-  });
-}
-
-// 查询能源设施/系统列表
-export function listFacsByCategory(category, subCategory) {
-  return request({
-    url: '/ems/basecfg/emsfacs/listall?facsCategory=' + category + '&subCategory=' + subCategory,
-    method: 'get'
+    url: '/ems/basecfg/emsfacs/listall',
+    method: 'get',
+    params: query
   });
 }
 

ems-ui/src/views/basecfg/device/index.vue

@@ -205,7 +205,7 @@
 <script>
 import { listDevRecursionByArea, getDevice, delDevice, addDevice, updateDevice} from '@/api/device/device'
 import { areaTreeSelect } from "@/api/basecfg/area"
-import { listAllFacs, getFacsCategorygetByCode, listFacsByCategory } from "@/api/basecfg/emsfacs"
+import { getFacsCategorygetByCode, listAllFacs } from '@/api/basecfg/emsfacs'
 import { listSubsystemAll } from '@/api/adapter/subsystem'
 import { getModelByCode } from "@/api/basecfg/objModel";
 import Treeselect from "@riophae/vue-treeselect";
@@ -438,8 +438,12 @@ export default {
     handleAreaType (data) {
       this.form.areaType = data.tier;
     },
-    getFacsOptions (areaCode) {
-      listFacsByCategory(this.queryParams.deviceCategory, this.queryParams.deviceSubCategory).then(response => {
+    getFacsOptions () {
+      const getFacsParams = {
+        facsCategory: this.queryParams.deviceCategory,
+        subCategory: this.queryParams.deviceSubCategory
+      }
+      listAllFacs(getFacsParams).then(response => {
         this.facsOptions = response.data;
       })
     },

ems-ui/src/views/basecfg/flowrel/index.vue

@@ -113,7 +113,6 @@
 
 <script>
 import { listRel, getRel, delRel, addRel, updateRel } from "@/api/basecfg/flowrel";
-import { areaTreeSelect } from "@/api/basecfg/area"
 import { listAllFacs } from "@/api/basecfg/emsfacs"
 import { getEmsClsTree } from "@/api/commonApi"
 import Treeselect from '@riophae/vue-treeselect'
@@ -158,6 +157,9 @@ export default {
         emsCls: null,
         flowDesc: null,
       },
+      queryFacsParams: {
+        areaCode: ''
+      },
       objOptions: [
         { code: 0, name: "设施"},
         { code: 2, name: "设备"},
@@ -182,7 +184,7 @@ export default {
   },
   created() {
     this.getList();
-    this.getAllFacs("");
+    this.getAllFacs();
     this.getEmsCls();
   },
   methods: {
@@ -236,7 +238,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加能源设施能流关系";
-      this.getAllFacs("");
+      this.getAllFacs();
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -247,7 +249,7 @@ export default {
         this.open = true;
         this.title = "修改能源设施能流关系";
       });
-      this.getAllFacs("");
+      this.getAllFacs();
     },
     /** 提交按钮 */
     submitForm() {
@@ -287,8 +289,8 @@ export default {
       };
       return objTypeMap[objType] || '未知';
     },
-    getAllFacs(areaCode) {
-      listAllFacs(areaCode).then(response =>{
+    getAllFacs() {
+      listAllFacs(this.queryFacsParams).then(response =>{
         this.facsOptions = response.data;
       })
     },

ems-ui/src/views/devmgr/el/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="对象类型" prop="objType">
-        <el-select v-model="queryParams.objType" placeholder="请选择对象类型" clearable  >
+        <el-select v-model="queryParams.objType" placeholder="请选择对象类型" clearable>
           <el-option
             v-for="dict in dict.type.device_type"
             :key="dict.value"
@@ -25,7 +25,8 @@
                         v-model="queryParams.recordTime"
                         type="date"
                         value-format="yyyy-MM-dd"
-                        placeholder="请选择日期">
+                        placeholder="请选择日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="维护标题" prop="maintainTitle">
@@ -59,7 +60,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['ems:rbook:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -69,32 +71,36 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['ems:rbook:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="rbookList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="记录编号" align="center" prop="recordCode" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="记录编号" align="center" prop="recordCode"/>
       <el-table-column label="目标对象" align="center" prop="objName">
         <template slot-scope="scope">
-          <span v-if="scope.row.objType">({{ dict.type.device_type[scope.row.objType].label }}) {{ scope.row.objName }}</span>
+          <span v-if="scope.row.objType">({{ dict.type.device_type[scope.row.objType].label }}) {{
+              scope.row.objName
+            }}</span>
           <span v-else>({{ dict.type.device_type[scope.row.objType].label }}){{ scope.row.objName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="安装位置" align="center" prop="insLocation" />
-      <el-table-column label="维护标题" align="center" prop="maintainTitle" />
+      <el-table-column label="安装位置" align="center" prop="insLocation"/>
+      <el-table-column label="维护标题" align="center" prop="maintainTitle"/>
       <el-table-column label="创建时间" align="center" prop="recordTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="维护人" align="center" prop="maintainPerson" />
+      <el-table-column label="维护人" align="center" prop="maintainPerson"/>
       <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-document" @click="handleViewRec(scope.row)">
-            查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-document" @click="handleViewRec(scope.row)">
+            查看
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -110,10 +116,12 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="记录编号" prop="recordCode">
-          <el-input v-model="form.recordCode" placeholder="请输入记录编号" :disabled="isViewOnly" />
+          <el-input v-model="form.recordCode" placeholder="请输入记录编号" :disabled="isViewOnly"/>
         </el-form-item>
-        <el-form-item label="对象类型" >
-          <el-select v-model="form.objType" placeholder="请选择对象类型" @change="changeObjOptions" :disabled="isViewOnly">
+        <el-form-item label="对象类型">
+          <el-select v-model="form.objType" placeholder="请选择对象类型" @change="changeObjOptions"
+                     :disabled="isViewOnly"
+          >
             <el-option
               v-for="dict in dict.type.device_type"
               :key="dict.value"
@@ -122,7 +130,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="    " prop="objCode" v-if="showObjCode" >
+        <el-form-item label="    " prop="objCode" v-if="showObjCode">
           <el-cascader
             v-model="form.objCode"
             :options="AllCode"
@@ -138,17 +146,18 @@
                           type="date"
                           value-format="yyyy-MM-dd"
                           placeholder="请选择日期 yyyy-MM-dd HH:mm:ss"
-                          :disabled="isViewOnly">
+                          :disabled="isViewOnly"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="目标对象" prop="objName" >
-          <el-input v-model="form.objName" placeholder="请输入对象名称" :disabled="isViewOnly" />
+        <el-form-item label="目标对象" prop="objName">
+          <el-input v-model="form.objName" placeholder="请输入对象名称" :disabled="isViewOnly"/>
         </el-form-item>
         <el-form-item label="安装位置" prop="insLocation">
-          <el-input v-model="form.insLocation" placeholder="请输入安装位置" :disabled="isViewOnly" />
+          <el-input v-model="form.insLocation" placeholder="请输入安装位置" :disabled="isViewOnly"/>
         </el-form-item>
         <el-form-item label="维护标题" prop="maintainTitle">
-          <el-input v-model="form.maintainTitle" placeholder="请输入维护标题" :disabled="isViewOnly" />
+          <el-input v-model="form.maintainTitle" placeholder="请输入维护标题" :disabled="isViewOnly"/>
         </el-form-item>
         <el-form-item label="维护内容">
           <!-- 只读模式下显示内容 -->
@@ -157,16 +166,21 @@
           <editor v-else v-model="form.maintainContent" :min-height="192"></editor>
         </el-form-item>
         <el-form-item label="维护人" prop="maintainPerson">
-          <el-input v-model="form.maintainPerson" placeholder="请输入维护人" :disabled="isViewOnly" />
+          <el-input v-model="form.maintainPerson" placeholder="请输入维护人" :disabled="isViewOnly"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- 只在非查看模式显示提交按钮 -->
         <el-button type="primary" v-if="!isViewOnly" @click="submitForm">确 定</el-button>
         <!-- 编辑按钮，点击切换到编辑模式 -->
-        <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit" v-hasPermi="['ems:rbook:edit']">编辑</el-button>
-        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(selectedRow)" v-hasPermi="['ems:rbook:remove']">删除</el-button>
-        <el-button  v-if="isViewOnly" @click="cancel">取 消</el-button>
+        <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit" v-hasPermi="['ems:rbook:edit']">
+          编辑
+        </el-button>
+        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(selectedRow)"
+                   v-hasPermi="['ems:rbook:remove']"
+        >删除
+        </el-button>
+        <el-button v-if="isViewOnly" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
@@ -174,10 +188,10 @@
     <el-dialog :title="title" :visible.sync="addOrUpdateOpen" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="记录编号" prop="recordCode">
-          <el-input v-model="form.recordCode" placeholder="请输入记录编号" />
+          <el-input v-model="form.recordCode" placeholder="请输入记录编号"/>
         </el-form-item>
-        <el-form-item label="对象类型" >
-          <el-select v-model="form.objType" placeholder="请选择对象类型" @change="changeObjOptions" >
+        <el-form-item label="对象类型">
+          <el-select v-model="form.objType" placeholder="请选择对象类型" @change="changeObjOptions">
             <el-option
               v-for="dict in dict.type.device_type"
               :key="dict.value"
@@ -186,7 +200,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="   " prop="objCode"  v-if="showObjCode">
+        <el-form-item label="   " prop="objCode" v-if="showObjCode">
           <el-cascader
             v-model="form.objCode"
             :options="AllCode"
@@ -201,23 +215,23 @@
                           type="date"
                           value-format="yyyy-MM-dd"
                           placeholder="请选择日期 "
-                          >
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="目标对象" prop="objName" >
-          <el-input v-model="form.objName" placeholder="请输入对象名称" />
+        <el-form-item label="目标对象" prop="objName">
+          <el-input v-model="form.objName" placeholder="请输入对象名称"/>
         </el-form-item>
         <el-form-item label="安装位置" prop="insLocation">
-          <el-input v-model="form.insLocation" placeholder="请输入安装位置" />
+          <el-input v-model="form.insLocation" placeholder="请输入安装位置"/>
         </el-form-item>
         <el-form-item label="维护标题" prop="maintainTitle">
-          <el-input v-model="form.maintainTitle" placeholder="请输入维护标题" />
+          <el-input v-model="form.maintainTitle" placeholder="请输入维护标题"/>
         </el-form-item>
         <el-form-item label="维护内容">
           <editor v-model="form.maintainContent" :min-height="192"/>
         </el-form-item>
         <el-form-item label="维护人" prop="maintainPerson">
-          <el-input v-model="form.maintainPerson" placeholder="请输入维护人" />
+          <el-input v-model="form.maintainPerson" placeholder="请输入维护人"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -229,13 +243,14 @@
 </template>
 
 <script>
-import { listRbook, getRbook, delRbook, addRbook, updateRbook } from "@/api/device/rbook";
-import {listAllFacs} from '@/api/basecfg/emsfacs'
-import {devTreeByFacs, listDevice, listDevRecursionByArea} from '@/api/device/device'
-import Treeselect from "@riophae/vue-treeselect";
+import { listRbook, getRbook, delRbook, addRbook, updateRbook } from '@/api/device/rbook'
+import { listAllFacs } from '@/api/basecfg/emsfacs'
+import { devTreeByFacs, listDevice, listDevRecursionByArea } from '@/api/device/device'
+import Treeselect from '@riophae/vue-treeselect'
+
 export default {
-  name: "Rbook",
-  components: {Treeselect},
+  name: 'Rbook',
+  components: { Treeselect },
   dicts: ['device_type'],
   data() {
     return {
@@ -255,7 +270,7 @@ export default {
       // 设备台账表格数据
       rbookList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       addOrUpdateOpen: false,
@@ -281,54 +296,57 @@ export default {
         maintainPerson: null,
         recordTimeRange: []
       },
+      queryFacsParams: {
+        areaCode: ''
+      },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         recordCode: [
-          {required: true, message: "记录编号不能为空", trigger: "blur"}
+          { required: true, message: '记录编号不能为空', trigger: 'blur' }
         ],
         objType: [
-          {required: true, message: "对象类型不能为空", trigger: "change"}
+          { required: true, message: '对象类型不能为空', trigger: 'change' }
         ],
         maintainTitle: [
-          {required: true, message: "维护标题不能为空", trigger: "blur"}
+          { required: true, message: '维护标题不能为空', trigger: 'blur' }
         ],
         recordTime: [
-          {required: true, message: "日期 yyyy-MM-dd 不能为空", trigger: "blur"}
-        ],
-      },
+          { required: true, message: '日期 yyyy-MM-dd 不能为空', trigger: 'blur' }
+        ]
+      }
 
-    };
+    }
 
   },
   created() {
-    this.getList();
+    this.getList()
   },
   // 当对象类型有值时，显示对象代码输入框
   watch: {
     'form.objType'(newVal) {
-      this.showObjCode = !!newVal;
+      this.showObjCode = !!newVal
     }
   },
   methods: {
     /** 查询设备台账列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listRbook(this.queryParams).then(response => {
-        console.log("设备台账搜索参数！！！！！", this.queryParams)
-        this.rbookList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        console.log('设备台账搜索参数！！！！！', this.queryParams)
+        this.rbookList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
 
     // 取消按钮
     cancel() {
       // this.isViewOnly = true; // 切换回只读模式
-      this.addOrUpdateOpen = false;
-      this.open = false;
-      this.reset();
+      this.addOrUpdateOpen = false
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -344,30 +362,29 @@ export default {
         maintainContent: null,
         maintainPerson: null,
         createTime: null,
-        updateTime: null,
-
-      };
-      this.resetForm("form");
-      this.dateRange = [];
+        updateTime: null
+      }
+      this.resetForm('form')
+      this.dateRange = []
     },
     // 搜索建议的方法
     querySearch(queryString, cb) {
       const results = this.rbookList.filter(item => {
-        return item.objName.toLowerCase().indexOf(queryString.toLowerCase()) !== -1;
-      });
+        return item.objName.toLowerCase().indexOf(queryString.toLowerCase()) !== -1
+      })
       // 调用回调函数，返回建议列表
-      cb(results.map(item => ({ value: item.objName })));
+      cb(results.map(item => ({ value: item.objName })))
     },
 
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
 
     // 多选框选中数据
@@ -380,23 +397,24 @@ export default {
     /**对象类型*/
     changeObjOptions(objType) {
       if (objType == 1) {
+        this.queryFacsParams.areaCode = this.areaCode
         // 设施
-        listAllFacs(this.areaCode).then(response => {
-          this.objCodeOptions = response.data;
-          console.log("设施多少数据！！！", this.objCodeOptions);
+        listAllFacs(this.queryFacsParams).then(response => {
+          this.objCodeOptions = response.data
+          console.log('设施多少数据！！！', this.objCodeOptions)
           this.AllCode = this.objCodeOptions.map(item => ({
             value: item.facsCode,
             label: item.facsName
-          }));
-        });
+          }))
+        })
       } else if (objType == 0) {
         // 设备
         devTreeByFacs(this.areaCode).then(response => {
-          this.objCodeOptions = response.data;
-          console.log("设备多少数据！！！", this.objCodeOptions);
-          this.AllCode = this.buildTree(this.objCodeOptions);
+          this.objCodeOptions = response.data
+          console.log('设备多少数据！！！', this.objCodeOptions)
+          this.AllCode = this.buildTree(this.objCodeOptions)
 
-        });
+        })
 
       }
     },
@@ -406,168 +424,170 @@ export default {
           value: item.id,
           label: item.label,
           children: item.children ? this.buildTree(item.children) : undefined
-        };
-        return node;
-      });
+        }
+        return node
+      })
     },
 
     /** 数据自动填补*/
     handleSelect(value) {
-      console.log("value", value);
+
       // 检查 value 是否为数组
       if (Array.isArray(value)) {
         // 检查数组是否至少有一个元素，并且第一个元素的首字母是否为字母
         if (value.length > 0 && /^[a-zA-Z]/.test(value[0][0])) {
-        // 获取能源设施所有信息
-        listAllFacs(this.areaCode).then(response => {
-          const data = response.data;
-          console.log("data", data);
-          // 循环输出
-          for (let i = 0; i < data.length; i++) {
-            if (value.includes(data[i].facsCode)) {
-              this.form.objName = data[i].facsName;
-              this.form.insLocation = data[i].refAreaName;
-              console.log("设施名字", this.form.objName)
-              console.log("设施地址", this.form.insLocation)
-              return;
+          this.queryFacsParams.areaCode = this.areaCode
+
+          // 获取能源设施所有信息
+          listAllFacs(this.queryFacsParams).then(response => {
+            const data = response.data
+            console.log('data', data)
+            // 循环输出
+            for (let i = 0; i < data.length; i++) {
+              if (value.includes(data[i].facsCode)) {
+                this.form.objName = data[i].facsName
+                this.form.insLocation = data[i].refAreaName
+                console.log('设施名字', this.form.objName)
+                console.log('设施地址', this.form.insLocation)
+                return
+              }
             }
-          }
-        });
-        }  else if (value.length > 0) {
+          })
+        } else if (value.length > 0) {
           // 获取能源设备所有信息
           devTreeByFacs(this.areaCode).then(response => {
-            const data = response.data;
-            console.log("data", data);
+            const data = response.data
+            console.log('data', data)
 
             function findDeviceById(data, path = [], ids) {
               for (const item of data) {
-                const currentPath = [...path, {label: item.label, tier: item.tier}];
+                const currentPath = [...path, { label: item.label, tier: item.tier }]
                 if (ids.includes(item.id)) {
                   // 找到 tier 为 'Device' 的层级，并获取最后一个“-”后面的数据
-                  const deviceTierIndex = currentPath.findIndex(p => p.tier === 'Device');
-                  let lastSegment = '';
-                  let deviceLabel = '';
+                  const deviceTierIndex = currentPath.findIndex(p => p.tier === 'Device')
+                  let lastSegment = ''
+                  let deviceLabel = ''
                   if (deviceTierIndex !== -1) {
-                    deviceLabel = currentPath[deviceTierIndex].label;
-                    lastSegment = deviceLabel.split('-').pop();
+                    deviceLabel = currentPath[deviceTierIndex].label
+                    lastSegment = deviceLabel.split('-').pop()
                   }
-                  return {labels: currentPath, lastSegment, deviceLabel, found: true};
+                  return { labels: currentPath, lastSegment, deviceLabel, found: true }
                 }
                 if (item.children && item.children.length) {
-                  const result = findDeviceById(item.children, currentPath, ids);
+                  const result = findDeviceById(item.children, currentPath, ids)
                   if (result.found) {
-                    return result;
+                    return result
                   }
                 }
               }
-              return {labels: [], lastSegment: null, deviceLabel: '', found: false};
+              return { labels: [], lastSegment: null, deviceLabel: '', found: false }
             }
 
-            let lastResult = {labels: [], lastSegment: null, deviceLabel: '', found: false};
+            let lastResult = { labels: [], lastSegment: null, deviceLabel: '', found: false }
             value.forEach(id => {
-              const result = findDeviceById(data, [], [id]);
+              const result = findDeviceById(data, [], [id])
               if (result.found) {
-                lastResult = result;
+                lastResult = result
               }
-            });
+            })
 
             if (lastResult.found) {
               // 构建 insLocation 和 objName
-              let insLocationParts = [lastResult.labels[0].label]; // 第一层的 label
+              let insLocationParts = [lastResult.labels[0].label] // 第一层的 label
               if (lastResult.deviceLabel) {
-                let deviceLabelParts = lastResult.deviceLabel.split('-');
-                deviceLabelParts.pop(); // 移除最后一个“-”后面的数据
-                insLocationParts = insLocationParts.concat(deviceLabelParts.join('-'));
+                let deviceLabelParts = lastResult.deviceLabel.split('-')
+                deviceLabelParts.pop() // 移除最后一个“-”后面的数据
+                insLocationParts = insLocationParts.concat(deviceLabelParts.join('-'))
               }
 
-              this.form.insLocation = insLocationParts.join(' / ');
-              this.form.objName = lastResult.lastSegment;
-              console.log("设备名字", this.form.objName)
-              console.log("设备地址", this.form.insLocation)
+              this.form.insLocation = insLocationParts.join(' / ')
+              this.form.objName = lastResult.lastSegment
+              console.log('设备名字', this.form.objName)
+              console.log('设备地址', this.form.insLocation)
             } else {
-              console.log("没有找到匹配的设备");
+              console.log('没有找到匹配的设备')
             }
-          });
-        }else {
-          console.log("value 为空数组或不满足条件");
+          })
+        } else {
+          console.log('value 为空数组或不满足条件')
         }
       } else {
-        console.log("value 不是数组");
+        console.log('value 不是数组')
       }
     },
 
     /**编辑按钮操作*/
     handleEdit() {
-      this.isViewOnly = false; // 切换到编辑模式
-      this.title = '编辑设备台账';
+      this.isViewOnly = false // 切换到编辑模式
+      this.title = '编辑设备台账'
     },
 
     // /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.addOrUpdateOpen = true;
-      this.title = "添加设备台账";
+      this.reset()
+      this.addOrUpdateOpen = true
+      this.title = '添加设备台账'
     },
     /**查看按钮*/
     handleViewRec(row) {
-      this.selectedRow = row;
-      const id = row.id || this.ids;
+      this.selectedRow = row
+      const id = row.id || this.ids
       getRbook(id).then(response => {
-        this.form = response.data;
-        console.log("this.form",this.form)
-        this.form.objCode = this.form.objCode ? this.form.objCode.split(',') : [];
+        this.form = response.data
+        console.log('this.form', this.form)
+        this.form.objCode = this.form.objCode ? this.form.objCode.split(',') : []
         // 调用 changeObjOptions 来更新 AllCode
-        this.changeObjOptions(this.form.objType);
-        this.open = true;
-        this.title = "查看设备台账";
-        this.isViewOnly = true; // 设置为查看模式
+        this.changeObjOptions(this.form.objType)
+        this.open = true
+        this.title = '查看设备台账'
+        this.isViewOnly = true // 设置为查看模式
         // if (this.form.objType === 1) {
         //   this.form.objType = "设施";
         // } else if (this.form.objType === 0) {
         //   this.form.objType = "设备";
         // }
-      });
+      })
     },
     /** 提交按钮 */
     submitForm() {
       // 确保 objCode 是一个数组
       if (!Array.isArray(this.form.objCode)) {
-        this.form.objCode = [this.form.objCode];
+        this.form.objCode = [this.form.objCode]
       }
-      this.form.objCode = this.form.objCode.join(',');
-      this.$refs["form"].validate(valid => {
+      this.form.objCode = this.form.objCode.join(',')
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updateRbook(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess('修改成功')
               console.log('点击确认后response里面的内容', response)
-              this.open = false;
+              this.open = false
               this.addOrUpdateOpen = false
-              this.getList();
-            });
+              this.getList()
+            })
           } else {
             addRbook(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
               this.addOrUpdateOpen = false
-              this.getList();
-            });
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
 
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除设备台账编号为"' + ids + '"的数据项？').then(function () {
-        return delRbook(ids);
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除设备台账编号为"' + ids + '"的数据项？').then(function() {
+        return delRbook(ids)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
         this.open = false
       }).catch(() => {
-      });
+      })
     },
 
     /** 导出按钮操作 */
@@ -577,5 +597,5 @@ export default {
       }, `rbook_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>

ems-ui/src/views/devmgr/state/index.vue

@@ -210,7 +210,7 @@
 <script>
 import { listDevRecursionByArea } from '@/api/device/device'
 import { areaTreeSelect } from "@/api/basecfg/area"
-import { getFacsCategorygetByCode, listFacsByCategory } from '@/api/basecfg/emsfacs'
+import { getFacsCategorygetByCode, listAllFacs } from '@/api/basecfg/emsfacs'
 import { listSubsystemAll } from '@/api/adapter/subsystem'
 import { getModelByCode } from "@/api/basecfg/objModel";
 import Treeselect from "@riophae/vue-treeselect";
@@ -249,6 +249,7 @@ export default {
       // 设备分类
       devcTypeOptions: undefined,
       subsystemOptions: undefined,
+      subCategoryOptions: undefined,
       defaultProps: {
         children: "children",
         label: "label"
@@ -377,7 +378,11 @@ export default {
       })
     },
     getFacsOptions() {
-      listFacsByCategory(this.queryParams.deviceCategory, this.queryParams.deviceSubCategory).then(response => {
+      const getFacsParams = {
+        facsCategory: this.queryParams.deviceCategory,
+        subCategory: this.queryParams.deviceSubCategory
+      }
+      listAllFacs(getFacsParams).then(response => {
         this.facsOptions = response.data;
       })
     },