소스 검색

子系统维护

lv.wenbin 11 달 전
부모
커밋
8a8c25f6ce
2개의 변경된 파일17개의 추가작업 그리고 2개의 파일을 삭제
  1. 0 1
      ems-ui/src/views/basecfg/device/index.vue
  2. 17 1
      ems-ui/src/views/devmgr/state/index.vue

+ 0 - 1
ems-ui/src/views/basecfg/device/index.vue

@@ -405,7 +405,6 @@ export default {
       listSubsystemAll().then(response =>{
         this.subsystemOptions = response.data;
       })
-      console.log(this.subsystemOptions)
     }
   }
 }

+ 17 - 1
ems-ui/src/views/devmgr/state/index.vue

@@ -52,6 +52,11 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="子系统" prop="subsystemCode">
+            <el-select v-model="queryParams.subsystemCode" >
+              <el-option v-for="item in subsystemOptions" :label="item.systemName" :value="item.systemCode" :key="item.systemCode" />
+            </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>
@@ -66,6 +71,7 @@
           <el-table-column label="设备代码" align="center" prop="deviceCode"/>
           <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
           <el-table-column label="设备状态" align="center" prop="deviceStatus"/>
+          <el-table-column label="子系统" align="center" prop="subsystemName"/>
         </el-table>
 
         <pagination
@@ -114,9 +120,11 @@ import { listDevRecursionByArea, getDevice, delDevice, addDevice, updateDevice }
 import { areaTreeSelect } from "@/api/basecfg/area"
 import { listAllFacs } from "@/api/basecfg/emsfacs"
 import { getDevcType} from '@/api/commonApi'
+import { listSubsystemAll } from '@/api/adapter/subsystem'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
+
 export default {
   name: 'Device',
   components: { Treeselect },
@@ -148,6 +156,7 @@ export default {
       facsOptions: undefined,
       // 设备分类
       devcTypeOptions: undefined,
+      subsystemOptions: undefined,
       defaultProps: {
         children: "children",
         label: "label"
@@ -162,7 +171,8 @@ export default {
         deviceStatus: null,
         areaType: null,
         refArea: null,
-        refFacs: null
+        refFacs: null,
+        subsystemCode: null
       },
       // 表单参数
       form: {},
@@ -188,6 +198,7 @@ export default {
     this.getAreaTree('Zoning');
     this.getFacsOptions("");
     this.getDevcType();
+    this.getSubsystem();
   },
   methods: {
     /** 查询能源设备列表 */
@@ -319,6 +330,11 @@ export default {
       getDevcType().then(response =>{
         this.devcTypeOptions = response.data;
       })
+    },
+    getSubsystem() {
+      listSubsystemAll().then(response =>{
+        this.subsystemOptions = response.data;
+      })
     }
   }
 }