فهرست منبع

样式

Signed-off-by: hsshuxian <3049816743@qq.com>
hsshuxian 4 ماه پیش
والد
کامیت
a30a778cf6
2فایلهای تغییر یافته به همراه49 افزوده شده و 34 حذف شده
  1. 38 29
      ems-ui-cloud/src/views/basecfg/device/index.vue
  2. 11 5
      ems-ui-cloud/src/views/devmgr/attr/index.vue

+ 38 - 29
ems-ui-cloud/src/views/basecfg/device/index.vue

@@ -143,13 +143,6 @@
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <div>
-              <el-form-item label="归属设施" prop="refFacs">
-                <el-select v-model="form.refFacs" placeholder="请选择归属设施" @change="handleFacilityChange">
-                  <el-option v-for="item in facsOptions" :key="item.facsCode" :label="item.facsName"
-                             :value="item.facsCode"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
               <el-form-item label="归属区域" prop="areaCode">
                 <el-select v-model="form.areaCode" placeholder="请选择归属区域" @change="handleAreaChange">
                   <el-option v-for="item in areaOptions" :key="item.id" :label="item.label" :value="item.id"
@@ -162,6 +155,13 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="归属设施" prop="refFacs">
+                <el-select v-model="form.refFacs" placeholder="请选择归属设施" >
+                  <el-option v-for="item in facsOptions" :key="item.facsCode" :label="item.facsName"
+                             :value="item.facsCode"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="安装位置" prop="location">
                 <el-input v-model="form.location" placeholder="请输入安装位置"></el-input>
               </el-form-item>
@@ -593,7 +593,7 @@
 <script>
 import { listDevRecursionByArea, getDevice, delDevice, addDevice, updateDevice } from '@/api/device/device'
 import { areaTreeSelect, getAreaTreeSelect } from '@/api/basecfg/area'
-import { getFacsCategorygetByCode, listAllFacs } from '@/api/basecfg/emsfacs'
+import { getFacsCategorygetByCode, listAllFacs,listFacs } from '@/api/basecfg/emsfacs'
 import { listSubsystemAll } from '@/api/adapter/subsystem'
 import { getModelByCode, listAllModel } from '@/api/basecfg/objModel'
 import { getObjAttr } from '@/api/basecfg/objAttribute'
@@ -754,6 +754,12 @@ export default {
         refFacs: [
           { required: true, message: '归属设施', trigger: 'blur' }
         ],
+        areaCode:[
+          { required: true, message: '归属区域', trigger: 'blur' }
+        ],
+        locationRef:[
+          { required: true, message: '归属子区', trigger: 'blur' }
+        ],
         refArea: [
           { required: true, message: '安装位置', trigger: 'blur' }
         ],
@@ -818,24 +824,11 @@ export default {
       const area = this.areaOptions.find(a => a.id === areaCode);
       return area ? area.label : '未知区域';
     },
-    /** 归属设施*/
-    handleFacilityChange(selectedFacilityCode) {
-      const selectedFacility = this.facsOptions.find(f => f.facsCode === selectedFacilityCode)
-      if (selectedFacility) {
-        this.form.areaName = selectedFacility.refAreaName
-        this.form.areaCode = selectedFacility.refArea
-        this.loadSubAreaOptions(selectedFacility.refArea)
-      }
-    },
-    /** 归属设施*/
-    handleAreaChange(value) {
-      this.form.locationRef = null
-      this.loadSubAreaOptions(value)
-    },
     /**下拉归属区域*/
     loadAreaOptions() {
       getAreaTreeSelect('0', 1).then(response => {
         this.areaOptions = response.data || []
+        console.log("归属区域",this.areaOptions)
       })
     },
     /**下拉归属子区*/
@@ -844,14 +837,30 @@ export default {
         this.subAreaOptions = response.data || []
       })
     },
-    getFacsOptions() {
+
+    /** 归属区域变更时查询归属子区和归属设施 */
+    handleAreaChange(value) {
+      //清空
+      this.form.locationRef = null;
+      this.form.refFacs = null;
+      this.subAreaOptions = [];
+      this.facsOptions = [];
+      // 归属子区
+      this.loadSubAreaOptions(value);
+      // 归属设施
+      this.getFacsOptions(value);
+    },
+
+    /** 查询归属设施 */
+    getFacsOptions(refArea) {
       const getFacsParams = {
-        facsCategory: this.queryParams.deviceCategory,
-        subCategory: this.queryParams.deviceSubCategory
-      }
-      listAllFacs(getFacsParams).then(response => {
-        this.facsOptions = response.data
-      })
+        refArea: refArea,
+        facsCategory: this.queryParams.deviceCategory // 当前标签页的分类
+      };
+      listFacs(getFacsParams).then(response => {
+        this.facsOptions = response.rows || [];
+        console.log("归属设施",this.facsOptions);
+      });
     },
 
     formatDate(date) {

+ 11 - 5
ems-ui-cloud/src/views/devmgr/attr/index.vue

@@ -144,10 +144,15 @@
           </el-form>
           <el-table :data="callLogData" style="width: 100%" :show-header="true" :empty-text="'暂无数据'">
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-            <el-table-column label="对象代码" prop="objCode"></el-table-column>
-            <el-table-column label="模型代码" prop="modelCode"></el-table-column>
-            <el-table-column label="能力标识" prop="abilityKey"></el-table-column>
+            <el-table-column label="对象编号" prop="objCode"></el-table-column>
+            <el-table-column label="对象名称" prop="objName"></el-table-column>
+            <el-table-column label="对象能力" prop="abilityName"></el-table-column>
             <el-table-column label="调用时间" prop="callTime"></el-table-column>
+            <el-table-column label="调用结果" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ formatCallStatus(scope.row.callStatus) }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="text" size="mini" icon="el-icon-info" @click="handleCallLogDetail(scope.row)">详情
@@ -204,8 +209,9 @@
           </el-form>
           <el-table :data="reportLogData" style="width: 100%" :show-header="true" :empty-text="'暂无数据'">
             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-            <el-table-column label="对象代码" prop="objCode"></el-table-column>
-            <el-table-column label="消息描述" prop="msgDesc"></el-table-column>
+            <el-table-column label="对象编号" prop="objCode"></el-table-column>
+            <el-table-column label="对象名称" prop="objName"></el-table-column>
+            <el-table-column label="消息类型" prop="msgDesc"></el-table-column>
             <el-table-column label="上报时间" prop="reportTime" width="180"></el-table-column>
             <el-table-column label="操作" align="center" width="100">
               <template slot-scope="scope">