Browse Source

Merge branch 'master' of git.sagacloud.cn:web/ibms

zhangyu 5 years ago
parent
commit
9a7fc17b6c

+ 1 - 1
src/components/point/dynamicdata/applyRulesDialog.vue

@@ -38,7 +38,7 @@
       </el-table-column>
       <el-table-column label="设备实例本地名(本地编码)" class-name="bgf5" align="center">
         <template slot-scope="scope">
-          {{scope.row.EquipLocalName}}({{scope.row.ObjectID}})
+          {{scope.row.ObjectLocalName}}({{scope.row.ObjectID}})
         </template>
       </el-table-column>
       <el-table-column label="信息点" prop="InfomationPoint" align="center"></el-table-column>

+ 2 - 2
src/components/point/dynamicdata/delRelationDialog.vue

@@ -22,7 +22,7 @@
           </el-col>
           <el-col :span="6">
             <div class="singleDir pl-10 font-default">设备实例</div>
-            <div class="pl-10 font-default">{{rtableData[0]?rtableData[0].EquipLocalName:'--'}}</div>
+            <div class="pl-10 font-default">{{rtableData[0]?rtableData[0].ObjectLocalName:'--'}}</div>
             <div class="pl-10 font-default">{{rtableData[0]?rtableData[0].BuildLocalName:'--'}}-{{rtableData[0]?rtableData[0].FloorLocalName:'--'}}</div>
             <div class="pl-10 font-default">{{rtableData[0]?rtableData[0].RoomLocalName:'--'}}</div>
           </el-col>
@@ -42,7 +42,7 @@
               ref="rtable">
               <el-table-column label="设备实例" class-name="bgfff">
                 <el-table-column type="selection" class-name="bgf5"></el-table-column>
-                <el-table-column label="设备实例名称" prop="EquipLocalName" class-name="bgf5" show-overflow-tooltip></el-table-column>
+                <el-table-column label="设备实例名称" prop="ObjectLocalName" class-name="bgf5" show-overflow-tooltip></el-table-column>
                 <el-table-column label="设备实例编码" prop="ObjectID" class-name="bgfff" show-overflow-tooltip></el-table-column>
                 <el-table-column label="所在建筑楼层" class-name="bgfff">
                   <template slot-scope="scope">

+ 1 - 1
src/components/point/dynamicdata/equipRules.vue

@@ -50,7 +50,7 @@
         </el-table-column>
         <el-table-column prop="Datasource" label="数据源" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="SubTypeName" label="数字字典设备类型" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="EquipLocalName" label="对应的设备实例" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
+        <el-table-column prop="ObjectLocalName" label="对应的设备实例" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column label="实例所在建筑楼层" min-width="100">
           <template slot-scope="scope">
             <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''"

+ 2 - 2
src/components/point/dynamicdata/historyDialog.vue

@@ -36,8 +36,8 @@
           <el-table-column label="设备实例名称" width="200px" class-name="bgf5 border-l">
             <template slot-scope="scope">
               <div v-for="t in scope.row.rightList" :key="t.id">
-                <el-tooltip :content="t.EquipLocalName" placement="top">
-                  <div>{{t.EquipLocalName}}</div>
+                <el-tooltip :content="t.ObjectLocalName" placement="top">
+                  <div>{{t.ObjectLocalName}}</div>
                 </el-tooltip>
               </div>
             </template>

+ 22 - 14
src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -84,7 +84,7 @@
         <div class="query-box clearfix">
           <div class="query-item">
             <label>设备实例关键字</label>
-            <el-input placeholder="请输入设备实例关键字" v-model="form.EquipLocalName" @keyup.enter.native="queryRightTable">
+            <el-input placeholder="请输入设备实例关键字" v-model="form.ObjectLocalName" @keyup.enter.native="queryRightTable">
               <i slot="suffix" class="el-input__icon el-icon-search" @click="queryRightTable"></i>
             </el-input>
           </div>
@@ -100,7 +100,7 @@
               @selection-change="rightSelectionChange">
               <el-table-column type="selection" width="35" class-name="bgf5"></el-table-column>
               <el-table-column label="设备实例名称" width="200" class-name="bgf5" show-overflow-tooltip>
-                <template slot-scope="scope">{{ scope.row.EquipLocalName }}</template>
+                <template slot-scope="scope">{{ scope.row.ObjectLocalName }}</template>
               </el-table-column>
               <el-table-column prop="ObjectID" label="设备实例编码" show-overflow-tooltip></el-table-column>
               <el-table-column prop="SubTypeName" label="设备类型" show-overflow-tooltip></el-table-column>
@@ -128,7 +128,7 @@
                   <el-checkbox v-model="t.checked"></el-checkbox>
                   <span>{{(t.Proximity*100).toFixed(2)}}%</span>
                 </p>
-                <p>{{t.EquipLocalName}}</p>
+                <p>{{t.ObjectLocalName}}</p>
                 <p>
                   {{t.BuildLocalName&&t.BuildLocalName!='null'&&t.FloorLocalName&&t.FloorLocalName!='null'?t.BuildLocalName+'-'+t.FloorLocalName:''}}
                 </p>
@@ -179,7 +179,7 @@ export default {
         SubTypeName: [], //数据字典设备类型
         LocationFlag: [], //位置标签
         Datasource: [], //数据源
-        EquipLocalName: "", //设备实例关键字
+        ObjectLocalName: "", //设备实例关键字
         locationVal: [] //所在位置下拉
       }, //查询条件
       leftRecoList: [], //左推荐
@@ -300,22 +300,30 @@ export default {
     },
     //少于20条请求数据-否则删除选中项
     delSelectedRows(lArray, rArray) {
-      for (let i = this.LtableData.length - 1; i >= 0; i--) {
-        for (let j = 0; j < lArray.length; j++) {
-          if (this.LtableData[i].EquipmentMark == lArray[j].EquipmentMark && this.LtableData[i].SubTypeCode == lArray[j].SubTypeCode) {
-            this.LtableData.splice(i, 1)
+      for (let li = this.LtableData.length - 1; li >= 0; li--) {
+        for (let lj = 0; lj < lArray.length; lj++) {
+          if (this.LtableData[li] && (this.LtableData[li].EquipmentMark == lArray[lj].EquipmentMark && this.LtableData[li].SubTypeCode == lArray[lj].SubTypeCode)) {
+            // this.LtableData.splice(i, 1)
+            delete this.LtableData[li]
             continue; //结束当前本轮循环,开始新的一轮循环
           }
         }
       }
-      for (let i = this.RtableData.length - 1; i >= 0; i--) {
-        for (let j = 0; j < rArray.length; j++) {
-          if (this.RtableData[i].ObjectID == rArray[j].ObjectID && this.RtableData[i].SubTypeCode == rArray[j].SubTypeCode) {
-            this.RtableData.splice(i, 1)
+      this.LtableData = this.LtableData.filter(item => {
+        return !(item == 'undefined')
+      })
+      for (let ri = this.RtableData.length - 1; ri >= 0; ri--) {
+        for (let rj = 0; rj < rArray.length; rj++) {
+          if (this.RtableData[ri] && (this.RtableData[ri].ObjectID == rArray[rj].ObjectID && this.RtableData[ri].SubTypeCode == rArray[rj].SubTypeCode)) {
+            // this.RtableData.splice(i, 1)
+            delete this.RtableData[ri]
             continue; //结束当前本轮循环,开始新的一轮循环
           }
         }
       }
+      this.RtableData = this.RtableData.filter(item => {
+        return !(item == 'undefined')
+      })
       if (this.LtableData.length < 20 && this.lPage.Total > 49) {
         this.queryLeftTable()
       }
@@ -385,8 +393,8 @@ export default {
         TypeNameList: [this.typeName]
       };
       //处理查询条件
-      if (this.form.EquipLocalName && this.form.EquipLocalName.length) {
-        param.EquipLocalName = this.form.EquipLocalName;
+      if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
+        param.ObjectLocalName = this.form.ObjectLocalName;
       }
       if (this.form.SubTypeName.length) {
         param.SubTypeNameList = this.form.SubTypeName;