Procházet zdrojové kódy

fix bug system and buildfloor show

haojianlong před 5 roky
rodič
revize
fd6eec1b87

+ 2 - 0
src/components/config_point/step3_edit/index.vue

@@ -215,6 +215,8 @@ export default {
         basicParams.Specialty = this.dictionaryNames[1]
         basicParams.SystemCode = this.dictionaryData[2]
         basicParams.System = this.dictionaryNames[2]
+        basicParams.EquipmentTypeCode = basicParams.SystemCode  //为了配置从动参取值存储
+        basicParams.EquipmentType = basicParams.System
       }
       let updateParams = {
         data: {

+ 2 - 0
src/components/config_point/step3_point/3_temps.vue

@@ -373,6 +373,8 @@ export default {
         basicParams.Specialty = this.dictionaryNames[1]
         basicParams.SystemCode = this.dictionaryData[2]
         basicParams.System = this.dictionaryNames[2]
+        basicParams.EquipmentTypeCode = basicParams.SystemCode //为了配置从动参取值存储
+        basicParams.EquipmentType = basicParams.System
       }
       let otherParams = {}
       switch (type) {

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

@@ -106,10 +106,10 @@
               <el-table-column prop="SubTypeName" :label="`${typeName}类型`" 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:scope.row.BuildLocalName:''"
+                  <el-tooltip :content="scope.row.BuildLocalName?scope.row.BuildLocalName+'-':''+scope.row.FloorLocalName?scope.row.FloorLocalName:''"
                     placement="top">
                     <div class="tool-tip">
-                      {{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}</div>
+                      {{scope.row.BuildLocalName?scope.row.BuildLocalName+'-':''+scope.row.FloorLocalName?scope.row.FloorLocalName:''}}</div>
                   </el-tooltip>
                 </template>
               </el-table-column>

+ 2 - 2
src/views/point/dynamicdata/addRelation/partsRela/index.vue

@@ -107,10 +107,10 @@
               <el-table-column prop="CascadeEquipLocalName" 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:scope.row.BuildLocalName:''"
+                  <el-tooltip :content="scope.row.BuildLocalName?scope.row.BuildLocalName+'-':''+scope.row.FloorLocalName?scope.row.FloorLocalName:''"
                     placement="top">
                     <div class="tool-tip">
-                      {{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}</div>
+                      {{scope.row.BuildLocalName?scope.row.BuildLocalName+'-':''+scope.row.FloorLocalName?scope.row.FloorLocalName:''}}</div>
                   </el-tooltip>
                 </template>
               </el-table-column>

+ 2 - 2
src/views/point/dynamicdata/addRelation/spaceRela/index.vue

@@ -107,10 +107,10 @@
               <!-- <el-table-column prop="CascadeEquipLocalName" 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:scope.row.BuildLocalName:''"
+                  <el-tooltip :content="scope.row.BuildLocalName?scope.row.BuildLocalName+'-':''+scope.row.FloorLocalName?scope.row.FloorLocalName:''"
                     placement="top">
                     <div class="tool-tip">
-                      {{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}</div>
+                      {{scope.row.BuildLocalName?scope.row.BuildLocalName+'-':''+scope.row.FloorLocalName?scope.row.FloorLocalName:''}}</div>
                   </el-tooltip>
                 </template>
               </el-table-column>

+ 2 - 2
src/views/point/dynamicdata/addRelation/systemRela/index.vue

@@ -107,10 +107,10 @@
               <el-table-column prop="CascadeEquipLocalName" 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:scope.row.BuildLocalName:''"
+                  <el-tooltip :content="scope.row.BuildLocalName?scope.row.BuildLocalName+'-':''+scope.row.FloorLocalName?scope.row.FloorLocalName:''"
                     placement="top">
                     <div class="tool-tip">
-                      {{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}</div>
+                      {{scope.row.BuildLocalName?scope.row.BuildLocalName+'-':''+scope.row.FloorLocalName?scope.row.FloorLocalName:''}}</div>
                   </el-tooltip>
                 </template>
               </el-table-column>