Browse Source

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

zhangyu 5 years ago
parent
commit
3bda113353

+ 23 - 10
src/components/point/dynamicdata/delRelationDialog.vue

@@ -11,7 +11,9 @@
               <el-table-column label="设备标识" align="right" class-name="bgfff">
                 <el-table-column label="数据源" prop="Datasource" align="right" class-name="bgfff" show-overflow-tooltip></el-table-column>
                 <el-table-column label="位置标签" prop="LocationFlag" align="right" class-name="bgfff" show-overflow-tooltip>
-                  <template slot-scope="scope">{{ scope.row.LocationFlag.toString() }}</template>
+                  <template slot-scope="scope">
+                    <div class="tool-tip">{{scope.row.LocationFlag.toString()}}</div>
+                  </template>
                 </el-table-column>
                 <el-table-column label="设备标识" prop="EquipmentMark" align="right" class-name="bgf5" show-overflow-tooltip></el-table-column>
                 <el-table-column type="selection" class-name="bgf5"></el-table-column>
@@ -20,9 +22,9 @@
           </el-col>
           <el-col :span="6">
             <div class="singleDir pl-10 font-default">设备实例</div>
-            <div class="pl-10 font-default">{{rtableData[0].EquipLocalName}}</div>
-            <div class="pl-10 font-default">{{rtableData[0].BuildLocalName}}-{{rtableData[0].FloorLocalName}}</div>
-            <div class="pl-10 font-default">{{rtableData[0].RoomLocalName}}</div>
+            <div class="pl-10 font-default">{{rtableData[0]?rtableData[0].EquipLocalName:'--'}}</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>
         </el-row>
       </div>
@@ -31,9 +33,9 @@
         <el-row class="bgf5">
           <el-col :span="6">
             <div class="singleDir pr-10 font-default tr">设备标识</div>
-            <div class="pr-10 font-default tr">{{ltableData[0].EquipmentMark}}</div>
-            <div class="pr-10 font-default tr">{{ltableData[0].LocationFlag.toString()}}</div>
-            <div class="pr-10 font-default tr">{{ltableData[0].Datasource}}</div>
+            <div class="pr-10 font-default tr">{{ltableData[0]?ltableData[0].EquipmentMark:'--'}}</div>
+            <div class="pr-10 font-default tr">{{ltableData[0]?ltableData[0].LocationFlag.toString():'--'}}</div>
+            <div class="pr-10 font-default tr">{{ltableData[0]?ltableData[0].Datasource:'--'}}</div>
           </el-col>
           <el-col :span="18">
             <el-table :data="rtableData" style="width: 100%;max-height:400px;" height="calc(100% - 160px)" @selection-change="changeSelection"
@@ -42,7 +44,13 @@
                 <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="ObjectID" class-name="bgfff" show-overflow-tooltip></el-table-column>
-                <el-table-column label="所在建筑楼层" prop="FloorLocalName" class-name="bgfff" show-overflow-tooltip> </el-table-column>
+                <el-table-column label="所在建筑楼层" class-name="bgfff">
+                  <template slot-scope="scope">
+                    <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''" placement="top">
+                      <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}</div>
+                    </el-tooltip>
+                  </template>
+                </el-table-column>
                 <el-table-column label="所在业务空间" prop="RoomLocalName" class-name="bgfff" show-overflow-tooltip></el-table-column>
               </el-table-column>
             </el-table>
@@ -67,15 +75,15 @@ export default {
       loading: false, //loading状态
       dialogWidth: "20%", //弹窗宽度
       selection: [],
-      deleDisabled: false,
+      deleDisabled: true,
       deleParam: []
     };
   },
   methods: {
     //弹窗显示
     showDialog(row) {
-      this.loading = true;
       this.dialogVisible = true;
+      this.loading = true;
       //需先用对象请求接口返回所需对象
       this.getDynamicQueryPrompt(row)
     },
@@ -196,5 +204,10 @@ export default {
   .tr {
     text-align: right;
   }
+  .tool-tip{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 </style>

+ 13 - 2
src/components/point/dynamicdata/equipRules.vue

@@ -46,14 +46,20 @@
         <el-table-column prop="LocationFlag" label="位置标签" min-width="200">
           <template slot-scope="scope">
             <el-tooltip :content="scope.row.LocationFlag.toString()" placement="top">
-              <span>{{scope.row.LocationFlag.toString()}}</span>
+              <div class="tool-tip">{{scope.row.LocationFlag.toString()}}</div>
             </el-tooltip>
           </template>
         </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="FloorLocalName" label="实例所在建筑楼层" show-overflow-tooltip min-width="100"></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:''" placement="top">
+              <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}</div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column prop="RoomLocalName" label="实例所在业务空间" show-overflow-tooltip min-width="200"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
@@ -241,6 +247,11 @@ export default {
     .td-bl {
       border-left: 1px solid #ebeef5;
     }
+    .tool-tip{
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
   }
   .fr {
     padding-top: 10px;

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

@@ -54,8 +54,8 @@
           <el-table-column label="所在建筑楼层">
             <template slot-scope="scope">
               <div v-for="t in scope.row.rightList" :key="t.id">
-                <el-tooltip :content="t.FloorLocalName" placement="top">
-                  <div>{{t.FloorLocalName}}</div>
+                <el-tooltip :content="t.BuildLocalName&&t.FloorLocalName?t.BuildLocalName+'-'+t.FloorLocalName:''" placement="top">
+                  <div>{{t.BuildLocalName&&t.FloorLocalName?t.BuildLocalName+'-'+t.FloorLocalName:''}}</div>
                 </el-tooltip>
               </div>
             </template>
@@ -94,7 +94,7 @@ export default {
       this.tableData = data;
       this.dialogVisible = true;
     },
-    handleClose(done) {},
+    handleClose(done) { },
     //清除关系
     handleDelete(i, t) {
       let param = [];
@@ -112,8 +112,8 @@ export default {
       });
     }
   },
-  mounted() {},
-  created() {}
+  mounted() { },
+  created() { }
 };
 </script>
 <style lang="scss" scoped>

+ 14 - 2
src/views/point/config_point/steps/step4.vue

@@ -27,6 +27,13 @@
                         <js-mind-component ref="jsmind1" @openNode="openNode"></js-mind-component>
                     </el-tab-pane>
                 </el-tabs> -->
+        <!-- 功能停用提示 -->
+        <el-dialog title="提示" :visible.sync="visible" width="25%">
+            <span>功能升级中,暂时不可用......</span>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" type="primary" @click="visible=false">我知道了</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -52,7 +59,8 @@
             return {
                 jsMind: "",
                 activeIndex: 0,
-                mindArr: []
+                mindArr: [],
+                visible: false
             }
         },
         computed: {
@@ -65,7 +73,11 @@
                 return this.$store.getters['layout/projectId']
             }
         },
-        created() {},
+        created() {
+            setTimeout(()=>{
+                this.visible = true
+            },200)
+        },
         mounted() {
             this.clickTabs({
                 index: this.activeIndex

+ 15 - 4
src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -49,7 +49,7 @@
               <el-table-column label="位置标签" align="right">
                 <template slot-scope="scope">
                   <el-tooltip :content="scope.row.LocationFlag.toString()" placement="top">
-                    <span>{{scope.row.LocationFlag.toString()}}</span>
+                    <div class="tool-tip">{{scope.row.LocationFlag.toString()}}</div>
                   </el-tooltip>
                 </template>
               </el-table-column>
@@ -60,7 +60,7 @@
           </div>
           <!-- 智能推荐 -->
           <transition name="el-zoom-in-top">
-            <div class="AIRecom" v-show="leftRecoList.length>0&&leftAI">
+            <div class="AIRecom" v-show="leftRecoList.length&&leftAI&&rArray.length">
               <div class="l-title">
                 可能对应的设备标识
                 <i class="el-icon-close" @click="leftRecoList=[]"></i>
@@ -104,13 +104,19 @@
               </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>
-              <el-table-column prop="FloorLocalName" label="所在建筑楼层" show-overflow-tooltip></el-table-column>
+              <el-table-column label="所在建筑楼层">
+                <template slot-scope="scope">
+                  <el-tooltip :content="scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''" placement="top">
+                    <div class="tool-tip">{{scope.row.BuildLocalName&&scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:''}}</div>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
               <el-table-column prop="RoomLocalName" label="所在业务空间" show-overflow-tooltip></el-table-column>
             </el-table>
           </div>
           <!-- 智能推荐 -->
           <transition name="el-zoom-in-top">
-            <div class="AIRecom" v-show="rightRecoList.length>0&&!leftAI">
+            <div class="AIRecom" v-show="rightRecoList.length&&!leftAI&&lArray.length">
               <div class="r-title">
                 可能对应的设备实例
                 <i class="el-icon-close" @click="rightRecoList=[]"></i>
@@ -638,6 +644,11 @@ export default {
           text-align: right;
         }
       }
+      .tool-tip {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
   }
   .fr {