能源设施

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

@@ -8,7 +8,14 @@ export function listModel(query) {
     params: query
   })
 }
-
+// 查询能源对象属性全部列表
+export function listAllModel(query) {
+  return request({
+    url: '/ems/object/model/listAll?objType=' + query,
+    method: 'get',
+    params: query
+  })
+}
 // 查询能源对象属性详细
 export function getModel(id) {
   return request({

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

@@ -124,7 +124,7 @@
     <el-drawer :title=curRow.modelName size="80%" :visible.sync="showDrawer" direction="rtl" >
       <div class="drawer-content" style="padding-left:50px" >
         <el-tabs v-model="subKey" >
-          <el-tab-pane label="对象属性" name="attr">
+          <el-tab-pane label="对象属性" name="attr" >
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAttrAdd" v-hasPermi="['ems:attr:add']">新增
@@ -133,11 +133,11 @@
             </el-row>
             <el-table v-loading="loading" :data="attrList">
               <el-table-column type="selection" width="55" align="center" />
-              <el-table-column label="序号" align="center" prop="id" />
-                     <el-table-column label="模型code" align="center" prop="modelCode" />
+<!--              <el-table-column label="序号" align="center" prop="id" />-->
+<!--              <el-table-column label="模型code" align="center" prop="modelCode" />-->
               <el-table-column label="属性名称" align="center" prop="attrName" />
               <el-table-column label="属性标识" align="center" prop="attrKey" />
-              <el-table-column label="属性值" align="center" prop="attrValue" />
+<!--              <el-table-column label="属性值" align="center" prop="attrValue" />-->
               <el-table-column label="属性单位" align="center" prop="attrUnit" />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
@@ -163,9 +163,9 @@
                 <el-form-item label="属性标识" prop="attrKey">
                   <el-input v-model="attrForm.attrKey" placeholder="请输入属性标识" />
                 </el-form-item>
-                <el-form-item label="属性值" prop="attrValue">
-                  <el-input v-model="attrForm.attrValue" type="textarea" placeholder="请输入内容" />
-                </el-form-item>
+<!--                <el-form-item label="属性值" prop="attrValue">-->
+<!--                  <el-input v-model="attrForm.attrValue" type="textarea" placeholder="请输入内容" />-->
+<!--                </el-form-item>-->
                 <el-form-item label="属性单位" prop="attrUnit">
                   <el-input v-model="attrForm.attrUnit" placeholder="请输入属性单位" />
                 </el-form-item>
@@ -177,7 +177,7 @@
             </el-dialog>
           </el-tab-pane>
 
-          <el-tab-pane label="对象事件" name="second">
+          <el-tab-pane label="对象事件" name="second" >
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleEventAdd" v-hasPermi="['ems:event:add']">新增
@@ -186,16 +186,16 @@
             </el-row>
             <el-table v-loading="loading" :data="eventList">
               <el-table-column type="selection" width="55" align="center" />
-              <el-table-column label="序号" align="center" prop="id" />
-                  <el-table-column label="模型code" align="center" prop="modelCode" />
+    <!--       <el-table-column label="序号" align="center" prop="id" />-->
+    <!--       <el-table-column label="模型code" align="center" prop="modelCode" />-->
               <el-table-column label="事件名称" align="center" prop="eventKey" />
               <el-table-column label="事件类型" align="center" prop="eventType">
                 <template slot-scope="scope">
                   <span>{{ scope.row.eventType === 1 ? '消息上报' : '异常告警' }}</span>
                 </template>
               </el-table-column>
-              <!--              <el-table-column label="事件名称" align="center" prop="eventDesc" />-->
-              <!--              <el-table-column label="事件名称" align="center" prop="eventName" />-->
+              <!-- <el-table-column label="事件名称" align="center" prop="eventDesc" />-->
+              <!-- <el-table-column label="事件名称" align="center" prop="eventName" />-->
               <el-table-column label="事件代码" align="center" prop="eventCode" />
               <el-table-column label="外系统事件代码" align="center" prop="extEventCode" />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -214,21 +214,21 @@
             <!-- 添加或修改事件对话框 -->
             <el-dialog :title="title" :visible.sync="eventOpen" width="500px" append-to-body>
               <el-form ref="eventForm" :model="eventForm" :rules="eventRules" label-width="80px">
-                                <el-form-item label="模型code" prop="modelCode">
-                                  <el-input v-model="eventForm.modelCode" placeholder="请输入模型code" />
-                                </el-form-item>
-                                <el-form-item label="事件名称" prop="eventKey">
-                                  <el-input v-model="eventForm.eventKey" placeholder="请输入事件名称" />
-                                </el-form-item>
+                <el-form-item label="模型code" prop="modelCode">
+                  <el-input v-model="eventForm.modelCode" placeholder="请输入模型code"/>
+                </el-form-item>
+                <el-form-item label="事件名称" prop="eventKey">
+                  <el-input v-model="eventForm.eventKey" placeholder="请输入事件名称" />
+                </el-form-item>
                 <el-form-item label="事件类型" prop="eventType">
                   <el-input v-model="eventForm.eventType" placeholder="请输入事件类型" />
                 </el-form-item>
-                <!--                <el-form-item label="事件名称" prop="eventName">-->
-                <!--                  <el-input v-model="eventForm.eventName" placeholder="请输入事件名称" />-->
-                <!--                </el-form-item>-->
-                <!--                <el-form-item label="事件名称" prop="eventDesc">-->
-                <!--                  <el-input v-model="eventForm.eventDesc" type="textarea" placeholder="请输入内容" />-->
-                <!--                </el-form-item>-->
+                <!--<el-form-item label="事件名称" prop="eventName">-->
+                <!--  <el-input v-model="eventForm.eventName" placeholder="请输入事件名称" />-->
+                <!--</el-form-item>-->
+                <!--<el-form-item label="事件名称" prop="eventDesc">-->
+                <!--  <el-input v-model="eventForm.eventDesc" type="textarea" placeholder="请输入内容" />-->
+                <!--</el-form-item>-->
                 <el-form-item label="事件代码" prop="eventCode">
                   <el-input v-model="eventForm.eventCode" placeholder="请输入事件代码" />
                 </el-form-item>
@@ -243,19 +243,19 @@
             </el-dialog>
           </el-tab-pane>
 
-          <el-tab-pane label="对象能力" name="third">
+          <el-tab-pane label="对象能力" name="third" >
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAbilityAdd" v-hasPermi="['ems:ability:add']">新增
                 </el-button>
               </el-col>
             </el-row>
-            <el-table v-loading="loading" :data="abilityList">
+            <el-table v-loading="loading" :data="abilityList" >
               <el-table-column type="selection" width="55" align="center" />
-              <el-table-column label="序号" align="center" prop="id" />
-                            <el-table-column label="模型code" align="center" prop="modelCode" />
-                            <el-table-column label="能力键" align="center" prop="abilityKey" />
+<!--          <el-table-column label="序号" align="center" prop="id" />-->
+<!--          <el-table-column label="模型code" align="center" prop="modelCode" />-->
               <el-table-column label="能力名称" align="center" prop="abilityName" />
+              <el-table-column label="能力键" align="center" prop="abilityKey" />
               <el-table-column label="能力参数" align="center" prop="abilityParam" />
               <el-table-column label="能力描述" align="center" prop="abilityDesc" />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -271,12 +271,12 @@
             <!-- 添加或修改能力对话框 -->
             <el-dialog :title="title" :visible.sync="abilityOpen" width="500px" append-to-body>
               <el-form ref="abilityForm" :model="abilityForm" :rules="abilityRules" label-width="80px">
-                                <el-form-item label="模型code" prop="modelCode">
-                                  <el-input v-model="abilityForm.modelCode" placeholder="请输入模型code" />
-                                </el-form-item>
-                                <el-form-item label="能力键" prop="abilityKey">
-                                  <el-input v-model="abilityForm.abilityKey" placeholder="请输入能力键" />
-                                </el-form-item>
+                <el-form-item label="模型code" prop="modelCode">
+                  <el-input v-model="abilityForm.modelCode" placeholder="请输入模型code" />
+                </el-form-item>
+                <el-form-item label="能力键" prop="abilityKey">
+                  <el-input v-model="abilityForm.abilityKey" placeholder="请输入能力键" />
+                </el-form-item>
                 <el-form-item label="能力名称" prop="abilityName">
                   <el-input v-model="abilityForm.abilityName" placeholder="请输入能力名称" />
                 </el-form-item>
@@ -431,7 +431,7 @@ export default {
       this.curRow = row
       // this.subKey = this.$options.data().subKey
       // console.log("this.subKey",this.subKey)
-      this.modelCode = row.modelCode; // 更新当前模型代码
+      // this.modelCode = row.modelCode; // 更新当前模型代码
       console.log("模型代码",this.modelCode)
       getModel(this.curRow.id).then(response => {
         const data=response.data;
@@ -467,35 +467,59 @@ export default {
       });
     },
     /** 查询能源对象事件列表 */
-    getEventList() {
+    // getEventList(modelcode) {
+    //   console.log("对象事件!!!!")
+    //   this.loading = true;
+    //   listEvent(this.queryEventParams).then(response => {
+    //     this.eventList = response.rows;
+    //     console.log("对象事件",this.eventList)
+
+    //     this.total = this.eventList.length; // 更新总数为过滤后的总数
+    //     this.loading = false;
+    //   });
+    // },
+    getEventList(modelcode) {
       console.log("对象事件!!!!")
       this.loading = true;
-      listEvent(this.queryEventParams).then(response => {
-        this.eventList = response.rows;
-        this.total = this.eventList.length; // 更新总数为过滤后的总数
+        getModelByCode(modelcode).then(response => {
+          const data=response.data;
+          console.log("data",data);
+          this.attrList=data.attrList
+          this.eventList=data.eventList
+          this.abilityList=data.abilityList
+
+        })
         this.loading = false;
-      });
+
     },
     /** 查询能源对象属性列表 */
-    getAttrList() {
+    getAttrList(modelcode) {
       this.loading = true;
       console.log("对象属性!!!!")
-      listAttr(this.queryAttrParams).then(response => {
-        this.attrList = response.rows;
-        console.log("对象属性", this.attrList)
-        this.total = this.attrList.length; // 更新总数为过滤后的总数
-        this.loading = false;
-      });
+      getModelByCode(modelcode).then(response => {
+        const data=response.data;
+        console.log("data",data);
+        this.attrList=data.attrList
+        this.eventList=data.eventList
+        this.abilityList=data.abilityList
+
+      })
+      this.loading = false;
     },
     /** 查询能源对象能力列表 */
-    getAbilityList() {
+    getAbilityList(modelcode) {
       this.loading = true;
       console.log("对象能力!!!!")
-      listAbility(this.queryAbilityParams).then(response => {
-        this.abilityList = response.rows;;
-        this.total = this.abilityList.length; // 更新总数为过滤后的总数
+      getModelByCode(modelcode).then(response => {
+        const data=response.data;
+        console.log("data",data);
+        this.attrList=data.attrList
+        this.eventList=data.eventList
+        this.abilityList=data.abilityList
+
+      })
         this.loading = false;
-      });
+
     },
 
     // 表单重置
@@ -570,7 +594,8 @@ export default {
       this.$modal.confirm('是否确认删除能源对象属性编号为"' + ids + '"的数据项？').then(function() {
         return delAttr(ids);
       }).then(() => {
-        this.getAttrList();
+        console.log("删除row",row.modelCode);
+        this.getAttrList(row.modelCode);
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
@@ -579,7 +604,8 @@ export default {
       this.$modal.confirm('是否确认删除能源对象事件编号为"' + ids + '"的数据项？').then(function() {
         return delEvent(ids);
       }).then(() => {
-        this.getEventList();
+        console.log("删除row",row.modelCode);
+        this.getEventList(row.modelCode);
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
@@ -588,7 +614,8 @@ export default {
       this.$modal.confirm('是否确认删除能源对象能力编号为"' + ids + '"的数据项？').then(function() {
         return delAbility(ids);
       }).then(() => {
-        this.getAbilityList();
+        console.log("删除row",row.modelCode);
+        this.getAbilityList(row.modelCode);
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
@@ -601,13 +628,14 @@ export default {
             updateAttr(this.attrForm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.attrOpen = false;
-              this.getAttrList();
+              console.log("id",this.attrForm.modelCode)
+              this.getAttrList(this.attrForm.modelCode);
             });
           } else {
             addAttr(this.attrForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.attrOpen = false;
-              this.getAttrList();
+              this.getAttrList(this.attrForm.modelCode);
             });
           }
         }
@@ -620,13 +648,15 @@ export default {
             updateEvent(this.eventForm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.eventOpen = false;
-              this.getEventList();
+              console.log("id",this.eventForm)
+              this.getEventList(this.eventForm.modelCode);
             });
           } else {
             addEvent(this.eventForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.eventOpen = false;
-              this.getEventList();
+              console.log("id",this.eventForm)
+              this.getEventList(this.eventForm.modelCode);
             });
           }
         }
@@ -639,13 +669,13 @@ export default {
             updateAbility(this.abilityForm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.abilityOpen =false;
-              this.getAbilityList();
+              this.getAbilityList(this.abilityForm.modelCode);
             });
           } else {
             addAbility(this.abilityForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.abilityOpen = false;
-              this.getAbilityList();
+              this.getAbilityList(this.abilityForm.modelCode);
             });
           }
         }

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

@@ -110,6 +110,18 @@
                 <el-option v-for="item in facsSubCategoryOptions" :label="item.name" :value="item.code" :key="item.code" />
               </el-select>
             </el-form-item>
+
+            <el-form-item label="设备模型" prop="facsModel">
+              <el-select v-model="form.facsModel" style="width:100%">
+                <el-option
+                  v-for="item in modelList"
+                  :label="item.modelName"
+                  :value="item.modelCode"
+                  :key="item.modelCode"
+                />
+              </el-select>
+            </el-form-item>
+
             <el-form-item label="启用状态" prop="enable">
               <el-select v-model="form.enable" style="width:100%">
                 <el-option v-for="item in enableOptions"
@@ -150,8 +162,8 @@
               <span class="section-title">属性定义</span>
             </div>
             <div v-for="(item, index) in attrData" :key="index">
-              <p>属性名称：{{ item.attrName }}</p>
-              <p>属性标识：{{ item.attrKey }}</p>
+              <p>属性名称:{{ item.attrName }}</p>
+<!--              <p>属性标识：{{ item.attrKey }}</p>-->
               <p>属性值：{{ item.attrValue }}</p>
               <p>属性单位：{{ item.attrUnit }}</p>
               <!-- 在每个条目之后添加横线，除了最后一个条目 -->
@@ -206,7 +218,7 @@ import { listAllFacsCategory } from '@/api/basecfg/facscategory'
 import { areaTreeSelect } from '@/api/basecfg/area'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import {getModelByCode} from '@/api/basecfg/objModel'
+import {getModelByCode, listAllModel, listModel} from '@/api/basecfg/objModel'
 
 export default {
   name: 'Facs',
@@ -229,6 +241,7 @@ export default {
       total: 0,
       // 能源设施/系统表格数据
       facsList: [],
+      modelList:[],
       // 弹出层标题
       title: '',
       // 是否显示弹出层
@@ -266,6 +279,7 @@ export default {
         facsName: null,
         facsCategory: null,
         facsSubCategory: null,
+        facsModel:null,
         enable: null,
         refArea: null,
         createTime: null,
@@ -321,6 +335,7 @@ export default {
     this.getAreaTree('Area')
     this.getAllFacsCategory()
     this.getSubCategorygetByCode()
+    this.getFacsModel()
   },
   methods: {
     /** 查询能源设施/系统列表 */
@@ -466,6 +481,13 @@ export default {
       this.queryParams.facsSubCategory = ''
       this.getSubCategorygetByCode()
       this.handleQuery()
+    },
+    getFacsModel(){
+      listAllModel(1).then(response => {
+        this.modelList = response.data;
+        console.log("ListAllmodel",this.modelList)
+
+      });
     }
   }
 }

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

@@ -104,10 +104,8 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
-        <!-- 设备基本信息 -->
-
 
-        <!-- 详情弹框 -->
+        <!-- 设备基本信息 -->
         <el-dialog :visible.sync="open" title="设备状态详情" custom-class="detail-dialog">
           <div v-if="curRow">
             <!-- 设施基本信息 -->